diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 5f8ec245f3d11153c93f94910ddc88977820f74a..17dccf9d07ee0e913a0bd33a314d052ad017ddc3 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,7 +5,7 @@ <GradleProjectSettings> <option name="distributionType" value="LOCAL" /> <option name="externalProjectPath" value="$PROJECT_DIR$" /> - <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.4" /> + <option name="gradleHome" value="C:\Users\brodriguez8774\AndroidStudio\gradle\gradle-2.4" /> <option name="gradleJvm" value="1.8" /> <option name="modules"> <set> diff --git a/.idea/misc.xml b/.idea/misc.xml index 13e60141ef45611842312e768b215b8deeecab1d..5d19981032aa01b060f5a568641d7a8840cc90dc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -43,19 +43,4 @@ <component name="ProjectType"> <option name="id" value="Android" /> </component> - <component name="masterDetails"> - <states> - <state key="ScopeChooserConfigurable.UI"> - <settings> - <splitter-proportions> - <option name="proportions"> - <list> - <option value="0.2" /> - </list> - </option> - </splitter-proportions> - </settings> - </state> - </states> - </component> </project> \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 6564d52db279c4ae8d882aacf5aa89a85e7a04de..94a25f7f4cb416c083d265558da75d457237d671 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="VcsDirectoryMappings"> - <mapping directory="" vcs="" /> + <mapping directory="$PROJECT_DIR$" vcs="Git" /> </component> </project> \ No newline at end of file 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 25f0e60a3cbd646a34a124db70415069138f55fc..932a59264959349eb25d07deb933aaa193788279 100644 --- a/app/src/main/java/edu/kvcc/cis298/cis298assignment1/CounterActivity.java +++ b/app/src/main/java/edu/kvcc/cis298/cis298assignment1/CounterActivity.java @@ -6,22 +6,37 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.Button; +import android.widget.TextView; import android.widget.Toast; public class CounterActivity extends AppCompatActivity { private Button mCounterButton; + private TextView mTextView; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_counter); + mTextView = (TextView) findViewById(R.id.text_view); + mCounterButton = (Button) findViewById(R.id.counter_button); mCounterButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Toast.makeText(CounterActivity.this, R.string.gather_toast, Toast.LENGTH_SHORT).show(); + + String theText = mTextView.getText().toString(); + int theValue = Integer.parseInt(theText); + + theValue++; + + String theResult = Integer.toString(theValue); + mTextView.setText(theResult); + + if (theValue == 20) { + Toast.makeText(CounterActivity.this, R.string.gather_toast, Toast.LENGTH_SHORT).show(); + } } }); } diff --git a/app/src/main/res/layout/activity_counter.xml b/app/src/main/res/layout/activity_counter.xml index a304d280db5eed4478ae8dd866b176ba0a895319..2378dbc9bcc8d75a7b5f17511fbe0cb8a9cd42a5 100644 --- a/app/src/main/res/layout/activity_counter.xml +++ b/app/src/main/res/layout/activity_counter.xml @@ -19,6 +19,7 @@ android:orientation="vertical" > <TextView + android:id="@+id/text_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="24dp" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6c59f11bc448684179603768c86a44b887717e68..a5e5f2678d4ca7ee51b2c6793b9e881ea750d05f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,7 +4,7 @@ <string name="hello_world">Hello world!</string> <string name="action_settings">Settings</string> - <string name="counter_text">aa</string> + <string name="counter_text">0</string> <string name="counter_button">Gather</string> <string name="gather_toast">You\'ve gathered 20 things!</string> </resources>