From 9a768c130a27ec68879803624da1d360a30d5441 Mon Sep 17 00:00:00 2001 From: Kaelan Willauer Date: Mon, 12 Apr 2021 10:13:53 -0700 Subject: [PATCH] fixed bugggg --- .../com/zybooks/pizzaparty/MainActivity.java | 26 ++++++++++++------- app/src/main/res/layout/activity_main.xml | 4 +-- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/zybooks/pizzaparty/MainActivity.java b/app/src/main/java/com/zybooks/pizzaparty/MainActivity.java index 7f122ed..65fc3b7 100644 --- a/app/src/main/java/com/zybooks/pizzaparty/MainActivity.java +++ b/app/src/main/java/com/zybooks/pizzaparty/MainActivity.java @@ -52,7 +52,8 @@ public class MainActivity extends AppCompatActivity { @Override public void afterTextChanged(Editable s) { - mNumPizzasTextView.setText(""); + Log.d(TAG, "afterTextChanged was called"); + // mNumPizzasTextView.setText(""); } }); @@ -61,13 +62,14 @@ public class MainActivity extends AppCompatActivity { R.array.hunger_array, android.R.layout.simple_spinner_item); adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); mHowHungrySpinner.setAdapter(adapter); - mHowHungrySpinner.setSelection(0,false); + // mHowHungrySpinner.setSelection(0,false); // does not work as intended? mHowHungrySpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { String item = (String)parent.getItemAtPosition(position); Toast.makeText(MainActivity.this, item, Toast.LENGTH_SHORT).show(); - mNumPizzasTextView.setText(""); + Log.d(TAG, "onItemSelected was called"); + // mNumPizzasTextView.setText(""); } @Override @@ -88,13 +90,17 @@ public class MainActivity extends AppCompatActivity { } // Get hunger level selection - int checkedId = mHowHungrySpinner.getId(); // I didn't know what to do after updating to mHowHungrySpinner - PizzaCalculator.HungerLevel hungerLevel = PizzaCalculator.HungerLevel.RAVENOUS; - if (checkedId == R.id.hunger_spinner) { - hungerLevel = PizzaCalculator.HungerLevel.LIGHT; - } - else if (checkedId == R.id.hunger_spinner) { - hungerLevel = PizzaCalculator.HungerLevel.MEDIUM; + PizzaCalculator.HungerLevel hungerLevel = PizzaCalculator.HungerLevel.LIGHT; + switch (mHowHungrySpinner.getSelectedItemPosition()) { + case 1: + hungerLevel = PizzaCalculator.HungerLevel.MEDIUM; + break; + case 2: + hungerLevel = PizzaCalculator.HungerLevel.RAVENOUS; + break; + default: + hungerLevel = PizzaCalculator.HungerLevel.LIGHT; + break; } // Get the number of pizzas needed diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a16a700..7d6ac45 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -53,11 +53,11 @@ -- GitLab