From 16b49d069dd6fe461963ffab8bef68eacb2c96ad Mon Sep 17 00:00:00 2001
From: Brandon Rodriguez <brodriguez8774@mail.kvcc.edu>
Date: Sat, 19 Sep 2015 23:12:54 -0400
Subject: [PATCH] Creates basic interface.
---
.idea/misc.xml | 15 +++++++++
.idea/vcs.xml | 2 +-
.../cis298assignment1/CounterActivity.java | 13 ++++++++
app/src/main/res/layout/activity_counter.xml | 33 +++++++++++++++++--
app/src/main/res/values/strings.xml | 4 +++
5 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981..13e6014 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -43,4 +43,19 @@
<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 94a25f7..6564d52 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="$PROJECT_DIR$" vcs="Git" />
+ <mapping directory="" vcs="" />
</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 b9e9b3c..25f0e60 100644
--- a/app/src/main/java/edu/kvcc/cis298/cis298assignment1/CounterActivity.java
+++ b/app/src/main/java/edu/kvcc/cis298/cis298assignment1/CounterActivity.java
@@ -4,13 +4,26 @@ import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
public class CounterActivity extends AppCompatActivity {
+ private Button mCounterButton;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_counter);
+
+ 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();
+ }
+ });
}
@Override
diff --git a/app/src/main/res/layout/activity_counter.xml b/app/src/main/res/layout/activity_counter.xml
index cf23a09..a304d28 100644
--- a/app/src/main/res/layout/activity_counter.xml
+++ b/app/src/main/res/layout/activity_counter.xml
@@ -1,4 +1,5 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<!--<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
@@ -8,4 +9,32 @@
<TextView android:text="@string/hello_world" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
-</RelativeLayout>
+</RelativeLayout>-->
+
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:orientation="vertical" >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="24dp"
+ android:text="@string/counter_text" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+ android:orientation="horizontal" >
+
+ <Button
+ android:id="@+id/counter_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/counter_button" />
+
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2be8183..6c59f11 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,4 +3,8 @@
<string name="hello_world">Hello world!</string>
<string name="action_settings">Settings</string>
+
+ <string name="counter_text">aa</string>
+ <string name="counter_button">Gather</string>
+ <string name="gather_toast">You\'ve gathered 20 things!</string>
</resources>
--
GitLab