From 5311bc33a3d7eeff3c316e96dde057ec54d176f4 Mon Sep 17 00:00:00 2001
From: Brandon Rodriguez <brodriguez8774@mail.kvcc.edu>
Date: Mon, 21 Sep 2015 15:41:00 -0400
Subject: [PATCH] Version 1.0 Adds Subtract button.
---
.../cis298assignment1/CounterActivity.java | 22 ++++++++++++++++---
app/src/main/res/layout/activity_counter.xml | 10 +++++++--
app/src/main/res/values/strings.xml | 3 ++-
3 files changed, 29 insertions(+), 6 deletions(-)
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 932a592..6c73838 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 2378dbc..611fd78 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 a5e5f26..6c2b413 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>
--
GitLab