From 786bae32beb023549d779d19534d924913e050d5 Mon Sep 17 00:00:00 2001
From: charlyn23 <charlyn.buchanan@gmail.com>
Date: Tue, 19 May 2015 22:00:25 -0400
Subject: [PATCH 1/3] did assignment

---
 src/main/java/nyc/c4q/InitialActivity.java | 51 +++++++++++++++++-
 src/main/java/nyc/c4q/SubFunClass.java     |  3 +-
 src/main/res/layout/activity_initial.xml   | 62 +++++++++++++++++++---
 src/main/res/layout/activity_tile.xml      | 20 +++++++
 src/main/res/values/colors.xml             |  5 ++
 5 files changed, 132 insertions(+), 9 deletions(-)
 create mode 100644 src/main/res/values/colors.xml

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..8c17c63 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -9,11 +9,20 @@
 import android.widget.Button;
 import android.widget.TextView;
 
-public class InitialActivity extends Activity {
+import org.w3c.dom.Text;
+
+import java.util.ArrayList;
+
+public class InitialActivity extends Activity implements View.OnClickListener {
 
   public int counter = 0;
   public SharedPreferences preferences = null;
   public final static String TAG = "C4QTAG";
+    TextView tvCounter;
+    Button buttonPlus;
+    Button buttonMinus;
+
+
 
   public void loadState(){
     Log.d(TAG, "loadState()");
@@ -31,8 +40,46 @@ public void saveState(){
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
+      Log.d(TAG, "onCreate()");
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
-  }
+
+      tvCounter = (TextView) findViewById(R.id.tvCounter);
+      buttonPlus = (Button) findViewById(R.id.buttonPlus);
+      buttonMinus = (Button) findViewById(R.id.buttonMinus);
+      Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity);
+      Button buttonEmpty = (Button) findViewById(R.id.buttonEmpty);
+      loadState();
+      }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        saveState();    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        tvCounter.getText();
+    };
+
+
+
+    public void onClick (View v) {
+
+        Log.d(TAG, "onClick()");
+        if(v.getId()==R.id.buttonPlus){
+            counter += 1;
+            Log.d(TAG, "onClick().buttonPlus, counter="+counter);
+            tvCounter.setText(String.valueOf(counter));
+        }
+        if (v.getId()==R.id.buttonMinus) {
+            counter -= 1;
+            Log.d(TAG, "onClick().buttonMinus, counter="+counter);
+            tvCounter.setText(String.valueOf(counter));
+
+        }
+    }
+
 }
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..62a9061 100644
--- a/src/main/java/nyc/c4q/SubFunClass.java
+++ b/src/main/java/nyc/c4q/SubFunClass.java
@@ -4,6 +4,7 @@
  * Created by amyquispe on 5/19/15.
  */
 public class SubFunClass {
-    public SubFunClass(){
+    public SubFunClass (){
+        SubFunClass funObject = new SubFunClass();
     }
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..1c75dc8 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -8,11 +8,61 @@
     android:layout_height="match_parent"
     tools:context="nyc.c4q.InitialActivity"
     android:id="@+id/activity_initial">
-
-    <TextView
-        android:id="@+id/text"
+    <LinearLayout
+        android:orientation="horizontal"
+        android:id="@+id/counterLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="InitialActivity"
-        />
+        android:layout_height="0dp"
+        android:layout_weight="2">
+        <LinearLayout
+            android:id="@+id/counterButtonsLayout"
+            android:orientation="vertical"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:id="@+id/buttonPlus"
+                android:text="+"
+                android:layout_weight="1"
+                android:onClick="onClick"/>
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:id="@+id/buttonMinus"
+                android:text="-"
+                android:layout_weight="1"
+                android:onClick="onClick"
+                />
+            </LinearLayout>
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:id="@+id/tvCounter"
+            android:layout_weight="1"
+            android:textSize="60sp"
+            android:textAlignment="center"
+            android:text="0"/>
+        </LinearLayout>
+        <Button
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:id="@+id/buttonTileActivity"
+            android:text="TileActivity"
+            android:layout_weight="1"
+            android:onClick="onClick"/>
+        <Button
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:id="@+id/buttonEmpty"
+            android:text="Empty"
+            android:layout_weight="1"
+            android:onClick="onClick"/>
+    <!--<TextView-->
+        <!--android:id="@+id/text"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="match_parent"-->
+        <!--android:text="InitialActivity"-->
+        <!--/>-->
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index 4e36a11..8ac8885 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -5,8 +5,28 @@
     android:layout_height="match_parent"
     tools:context="nyc.c4q.TileActivity"
     android:id="@+id/activity_tile"
+    android:orientation="horizontal"
     >
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/leftSide"
+        android:orientation="vertical"
+        android:layout_weight="1"
+        android:background="@color/green"
+        ></LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:id="@+id/rightSide"
+        android:layout_weight="1"
+        android:background="@color/red">
 
+        </LinearLayout>
+    <Button
+        android:layout_width="100dp"
+        android:layout_height="100dp" />
     <TextView
         android:layout_height="match_parent"
         android:layout_width="match_parent"
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
new file mode 100644
index 0000000..8bf9f26
--- /dev/null
+++ b/src/main/res/values/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <color name="red">#ffff0000</color>
+    <color name="green">#ff00ff00</color>
+</resources>
\ No newline at end of file

From b535a01e92e9ddf5eb5902f1ac7fdcccb958cd51 Mon Sep 17 00:00:00 2001
From: charlyn23 <charlyn.buchanan@gmail.com>
Date: Tue, 26 May 2015 21:56:11 -0400
Subject: [PATCH 2/3] worked on Android

---
 src/main/java/nyc/c4q/InitialActivity.java | 25 ++++++++++++--
 src/main/java/nyc/c4q/SubFunClass.java     |  6 +++-
 src/main/res/layout/activity_tile.xml      | 38 +++++++++++++++++++---
 src/main/res/values/colors.xml             |  4 +++
 4 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 8c17c63..b2e6129 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -15,7 +15,7 @@
 
 public class InitialActivity extends Activity implements View.OnClickListener {
 
-  public int counter = 0;
+  public  static int counter = 0;
   public SharedPreferences preferences = null;
   public final static String TAG = "C4QTAG";
     TextView tvCounter;
@@ -51,6 +51,10 @@ protected void onCreate(Bundle savedInstanceState) {
       Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity);
       Button buttonEmpty = (Button) findViewById(R.id.buttonEmpty);
       loadState();
+
+      if (savedInstanceState != null) {
+          int mCurrentCounter = savedInstanceState.getInt(String.valueOf(counter));
+      }
       }
 
     @Override
@@ -62,8 +66,7 @@ protected void onStart() {
     protected void onResume() {
         super.onResume();
         tvCounter.getText();
-    };
-
+    }
 
 
     public void onClick (View v) {
@@ -81,5 +84,21 @@ public void onClick (View v) {
 
         }
     }
+    @Override
+    protected void onSaveInstanceState(Bundle state) {
+//        state.get(String.valueOf(counter));
+
+
+        super.onSaveInstanceState(state);
+//        int mCurrentCounter = getInt(counter);
+        state.putInt("mCurrentCounter", counter);
+        Log.d("InitialActivity", "onSaveInstanceState");
+
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+    }
 
 }
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index 62a9061..aa5669e 100644
--- a/src/main/java/nyc/c4q/SubFunClass.java
+++ b/src/main/java/nyc/c4q/SubFunClass.java
@@ -3,8 +3,12 @@
 /**
  * Created by amyquispe on 5/19/15.
  */
-public class SubFunClass {
+public class SubFunClass extends SuperFunClass {
     public SubFunClass (){
         SubFunClass funObject = new SubFunClass();
     }
+
+    public SubFunClass(String someName) {
+        super(someName);
+    }
 }
diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index 8ac8885..45b0dc0 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -12,17 +12,45 @@
         android:layout_height="match_parent"
         android:id="@+id/leftSide"
         android:orientation="vertical"
-        android:layout_weight="1"
-        android:background="@color/green"
-        ></LinearLayout>
+        android:layout_weight="1">
+        <View
+            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:background="@color/red"
+            android:id="@+id/redView"
+            android:layout_weight="40"></View>
+           <View
+               android:layout_width="match_parent"
+               android:layout_height="0dp"
+               android:id="@+id/greenView"
+               android:background="@color/green"
+               android:layout_weight="60"></View>
+        </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:id="@+id/rightSide"
         android:layout_weight="1"
-        android:background="@color/red">
-
+        >
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:id="@+id/yellowView"
+            android:background="@color/yellow"
+            android:layout_weight="33"></View>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:id="@+id/whiteView"
+            android:background="@color/white"
+            android:layout_weight="44"></View>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:id="@+id/blueView"
+            android:background="@color/blue"
+            android:layout_weight="22"></View>
         </LinearLayout>
     <Button
         android:layout_width="100dp"
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 8bf9f26..a46bad1 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -2,4 +2,8 @@
 <resources>
    <color name="red">#ffff0000</color>
     <color name="green">#ff00ff00</color>
+    <color name="yellow">#ffffff00</color>
+    <color name="white">#ffffffff</color>
+    <color name="blue">#ff0000ff</color>
+
 </resources>
\ No newline at end of file

From ca36a248ba54a443b9f867383e83fb8d7f9e42c6 Mon Sep 17 00:00:00 2001
From: charlyn23 <charlyn.buchanan@gmail.com>
Date: Thu, 28 May 2015 13:53:53 -0400
Subject: [PATCH 3/3] TV Portion Complete

---
 src/main/java/nyc/c4q/InitialActivity.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index b2e6129..126aebe 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -52,9 +52,9 @@ protected void onCreate(Bundle savedInstanceState) {
       Button buttonEmpty = (Button) findViewById(R.id.buttonEmpty);
       loadState();
 
-      if (savedInstanceState != null) {
-          int mCurrentCounter = savedInstanceState.getInt(String.valueOf(counter));
-      }
+      // if (savedInstanceState != null) {
+      //     int mCurrentCounter = savedInstanceState.getInt(String.valueOf(counter));
+      // }
       }
 
     @Override
@@ -76,12 +76,13 @@ public void onClick (View v) {
             counter += 1;
             Log.d(TAG, "onClick().buttonPlus, counter="+counter);
             tvCounter.setText(String.valueOf(counter));
+            saveState();
         }
         if (v.getId()==R.id.buttonMinus) {
             counter -= 1;
             Log.d(TAG, "onClick().buttonMinus, counter="+counter);
             tvCounter.setText(String.valueOf(counter));
-
+            saveState();
         }
     }
     @Override