diff --git a/app/src/main/java/edu/kvcc/cis298/cis298assignment1/CounterActivity.java b/app/src/main/java/edu/kvcc/cis298/cis298assignment1/CounterActivity.java index 932a59264959349eb25d07deb933aaa193788279..6c73838950559f8eee9cd1f749be17f8b328d1f3 100644 --- a/app/src/main/java/edu/kvcc/cis298/cis298assignment1/CounterActivity.java +++ b/app/src/main/java/edu/kvcc/cis298/cis298assignment1/CounterActivity.java @@ -11,7 +11,8 @@ import android.widget.Toast; public class CounterActivity extends AppCompatActivity { - private Button mCounterButton; + private Button mGatherButton; + private Button mMinusButton; private TextView mTextView; @Override @@ -21,8 +22,8 @@ public class CounterActivity extends AppCompatActivity { mTextView = (TextView) findViewById(R.id.text_view); - mCounterButton = (Button) findViewById(R.id.counter_button); - mCounterButton.setOnClickListener(new View.OnClickListener() { + mGatherButton = (Button) findViewById(R.id.gather_button); + mGatherButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -39,6 +40,21 @@ public class CounterActivity extends AppCompatActivity { } } }); + + mMinusButton = (Button) findViewById(R.id.minus_button); + mMinusButton.setOnClickListener(new View.OnClickListener(){ + @Override + public void onClick(View v) { + + String theText = mTextView.getText().toString(); + int theValue = Integer.parseInt(theText); + + theValue--; + + String theResult = Integer.toString(theValue); + mTextView.setText(theResult); + } + }); } @Override diff --git a/app/src/main/res/layout/activity_counter.xml b/app/src/main/res/layout/activity_counter.xml index 2378dbc9bcc8d75a7b5f17511fbe0cb8a9cd42a5..611fd78f325d48ae4a55a8a1118d78c9fc8f3bd9 100644 --- a/app/src/main/res/layout/activity_counter.xml +++ b/app/src/main/res/layout/activity_counter.xml @@ -31,10 +31,16 @@ android:orientation="horizontal" > <Button - android:id="@+id/counter_button" + android:id="@+id/gather_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/counter_button" /> + android:text="@string/gather_button" /> + + <Button + android:id="@+id/minus_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/minus_button" /> </LinearLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a5e5f2678d4ca7ee51b2c6793b9e881ea750d05f..6c2b41311e851495deea76233696bb8aecc8be9f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,6 +5,7 @@ <string name="action_settings">Settings</string> <string name="counter_text">0</string> - <string name="counter_button">Gather</string> + <string name="gather_button">Gather</string> + <string name="minus_button">Oops</string> <string name="gather_toast">You\'ve gathered 20 things!</string> </resources>