From 1097a49540d8f07a82e0ccc07003a4c362bcd000 Mon Sep 17 00:00:00 2001
From: jaellysbales <jaellysbales@gmail.com>
Date: Tue, 19 May 2015 20:43:19 -0400
Subject: [PATCH 1/4] Making intermediate commit

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    |  5 +-
 src/main/java/nyc/c4q/InitialActivity.java    | 73 +++++++++++++------
 src/main/java/nyc/c4q/SubFunClass.java        | 12 ++-
 src/main/res/layout/activity_initial.xml      | 72 ++++++++++++++++--
 4 files changed, 127 insertions(+), 35 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..1adbf0e 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -4,14 +4,15 @@
  * Created by amyquispe on 5/19/15.
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
+    private int data;
 
     @Override
     public int getData() {
-        return 0;
+        return this.data;
     }
 
     @Override
     public void setData(int someData) {
-
+        this.data = someData;
     }
 }
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..1477c76 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -11,28 +11,53 @@
 
 public class InitialActivity extends Activity {
 
-  public int counter = 0;
-  public SharedPreferences preferences = null;
-  public final static String TAG = "C4QTAG";
-
-  public void loadState(){
-    Log.d(TAG, "loadState()");
-    counter = preferences.getInt("counter", 0);
-    Log.d(TAG, "loadState(): counter=="+counter);
-  }
-
-  public void saveState(){
-    Log.d(TAG, "saveState()");
-    Log.d(TAG, "saveState(): counter=="+counter);
-    SharedPreferences.Editor editor = preferences.edit();
-    editor.putInt("counter", counter);
-    editor.commit();
-  }
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_initial);
-    preferences = getPreferences(Context.MODE_PRIVATE);
-  }
+    public int counter = 0;
+    public SharedPreferences preferences = null;
+    public final static String TAG = "C4QTAG";
+
+    public void loadState() {
+        Log.d(TAG, "loadState()");
+        counter = preferences.getInt("counter", 0);
+        Log.d(TAG, "loadState(): counter==" + counter);
+    }
+
+    public void saveState() {
+        Log.d(TAG, "saveState()");
+        Log.d(TAG, "saveState(): counter==" + counter);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putInt("counter", counter);
+        editor.commit();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_initial);
+        preferences = getPreferences(Context.MODE_PRIVATE);
+
+        Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
+        Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
+
+        buttonPlus.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                counter++;
+                TextView tvCounter = (TextView) findViewById(R.id.tvCounter);
+                tvCounter.setText(String.valueOf(counter));
+            }
+        });
+
+        buttonMinus.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                counter--;
+                TextView tvCounter = (TextView) findViewById(R.id.tvCounter);
+                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..d0559c7 100644
--- a/src/main/java/nyc/c4q/SubFunClass.java
+++ b/src/main/java/nyc/c4q/SubFunClass.java
@@ -3,7 +3,17 @@
 /**
  * Created by amyquispe on 5/19/15.
  */
-public class SubFunClass {
+public class SubFunClass extends SuperFunClass implements AwesomeInterface {
     public SubFunClass(){
     }
+
+    @Override
+    public int getData() {
+        return 0;
+    }
+
+    @Override
+    public void setData(int someData) {
+
+    }
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..3f16594 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -1,18 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
+    android:id="@+id/activity_initial"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="nyc.c4q.InitialActivity"
-    android:id="@+id/activity_initial">
+    android:orientation="vertical"
+    tools:context="nyc.c4q.InitialActivity">
+
+    <LinearLayout
+        android:id="@+id/counterLayout"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:id="@+id/counterButtonsLayout"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <Button
+                android:id="@+id/buttonPlus"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:onClick="onClick"
+                android:text="+" />
+
+            <Button
+                android:id="@+id/buttonMinus"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:onClick="onClick"
+                android:text="-" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tvCounter"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="0"
+            android:textColor="#ffff"/>
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/buttonTileActivity"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="TileActivity" />
+
+    <Button
+        android:id="@+id/buttonEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="Empty" />
 
     <TextView
         android:id="@+id/text"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="InitialActivity"
-        />
+        android:layout_height="wrap_content"
+        android:text="InitialActivity" />
+
 </LinearLayout>
\ No newline at end of file

From fec124961ea796f8331c10a791b91926aca29a35 Mon Sep 17 00:00:00 2001
From: jaellysbales <jaellysbales@gmail.com>
Date: Tue, 19 May 2015 21:52:01 -0400
Subject: [PATCH 2/4] Final submission

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    |  4 ++--
 src/main/java/nyc/c4q/InitialActivity.java    |  9 ++++++++
 src/main/res/layout/activity_initial.xml      | 21 +++++++++----------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index 1adbf0e..7d9e707 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -8,11 +8,11 @@ public abstract class AbstractAwesomeClass implements AwesomeInterface {
 
     @Override
     public int getData() {
-        return this.data;
+        return data;
     }
 
     @Override
     public void setData(int someData) {
         this.data = someData;
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 1477c76..9fb0eed 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
@@ -37,6 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
         Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
+        Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity);
 
         buttonPlus.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -56,6 +58,13 @@ public void onClick(View view) {
             }
         });
 
+        buttonTileActivity.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(InitialActivity.this, TileActivity.class);
+                startActivity(intent);
+            }
+        });
 
     }
 
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 3f16594..eb3ed52 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -28,7 +28,8 @@
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 android:onClick="onClick"
-                android:text="+" />
+                android:text="+"
+                android:textSize="80sp"/>
 
             <Button
                 android:id="@+id/buttonMinus"
@@ -36,7 +37,8 @@
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 android:onClick="onClick"
-                android:text="-" />
+                android:text="-"
+                android:textSize="80sp"/>
 
         </LinearLayout>
 
@@ -47,7 +49,8 @@
             android:layout_weight="1"
             android:gravity="center"
             android:text="0"
-            android:textColor="#ffff"/>
+            android:textColor="#ffff"
+            android:textSize="80sp"/>
 
     </LinearLayout>
 
@@ -56,19 +59,15 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:text="TileActivity" />
+        android:text="TileActivity"
+        android:textSize="30sp"/>
 
     <Button
         android:id="@+id/buttonEmpty"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:text="Empty" />
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="InitialActivity" />
+        android:text="Empty"
+        android:textSize="30sp"/>
 
 </LinearLayout>
\ No newline at end of file

From c943ac40689f4c5b3bfec64544416bf76606b937 Mon Sep 17 00:00:00 2001
From: jaellysbales <jaellysbales@gmail.com>
Date: Tue, 26 May 2015 21:24:23 -0400
Subject: [PATCH 3/4] Committing progress

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    |  4 +-
 src/main/java/nyc/c4q/InitialActivity.java    | 14 +++-
 src/main/res/layout/activity_tile.xml         | 67 ++++++++++++++++++-
 src/main/res/values/colors.xml                |  8 +++
 4 files changed, 86 insertions(+), 7 deletions(-)
 create mode 100644 src/main/res/values/colors.xml

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index 7d9e707..f69772f 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -4,11 +4,11 @@
  * Created by amyquispe on 5/19/15.
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
-    private int data;
+    private int data = 4;
 
     @Override
     public int getData() {
-        return data;
+        return this.data;
     }
 
     @Override
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 9fb0eed..c5d0c67 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -17,9 +17,17 @@ public class InitialActivity extends Activity {
     public final static String TAG = "C4QTAG";
 
     public void loadState() {
-        Log.d(TAG, "loadState()");
-        counter = preferences.getInt("counter", 0);
-        Log.d(TAG, "loadState(): counter==" + counter);
+
+        if (preferences != null) {
+            Log.d(TAG, "loadState()");
+            counter = preferences.getInt("counter", counter);
+            Log.d(TAG, "loadState(): counter==" + counter);
+        }
+        else {
+            Log.d(TAG, "loadState()");
+            counter = preferences.getInt("counter", 0);
+            Log.d(TAG, "loadState(): counter==" + counter);
+        }
     }
 
     public void saveState() {
diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index 4e36a11..37f45f0 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -5,10 +5,73 @@
     android:layout_height="match_parent"
     tools:context="nyc.c4q.TileActivity"
     android:id="@+id/activity_tile"
-    >
+    android:orientation="horizontal">
 
-    <TextView
+    <LinearLayout
+        android:id="@+id/leftSide"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:id="@+id/redView"
+            android:background="@color/red"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="40">
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/greenView"
+            android:background="@color/green"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="60">
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/rightSide"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/yellowView"
+            android:background="@color/yellow"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="33">
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/whiteView"
+            android:background="@color/white"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="44">
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/blueView"
+            android:background="@color/blue"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="22">
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <TextView
+        android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:text="TileActivity"/>
 
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
new file mode 100644
index 0000000..08e1d92
--- /dev/null
+++ b/src/main/res/values/colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="red" type="color">#ffff0000</item>
+    <item name="green" type="color">#ff00ff00</item>
+    <item name="yellow" type="color">#ffffff00</item>
+    <item name="white" type="color">#ffffffff</item>
+    <item name="blue" type="color">#ff0000ff</item>
+</resources>
\ No newline at end of file

From b8797382065ce97cf6f6401304e43b8df0005fbc Mon Sep 17 00:00:00 2001
From: jaellysbales <jaellysbales@gmail.com>
Date: Tue, 26 May 2015 21:56:49 -0400
Subject: [PATCH 4/4] Final submission

---
 src/main/java/nyc/c4q/InitialActivity.java | 24 +++++-----
 src/main/res/layout/activity_tile.xml      | 52 ++++++++++------------
 2 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index c5d0c67..23941a2 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -17,17 +17,9 @@ public class InitialActivity extends Activity {
     public final static String TAG = "C4QTAG";
 
     public void loadState() {
-
-        if (preferences != null) {
-            Log.d(TAG, "loadState()");
-            counter = preferences.getInt("counter", counter);
-            Log.d(TAG, "loadState(): counter==" + counter);
-        }
-        else {
-            Log.d(TAG, "loadState()");
-            counter = preferences.getInt("counter", 0);
-            Log.d(TAG, "loadState(): counter==" + counter);
-        }
+        Log.d(TAG, "loadState()");
+        counter = preferences.getInt("counter", 0);
+        Log.d(TAG, "loadState(): counter=="+counter);
     }
 
     public void saveState() {
@@ -40,6 +32,8 @@ public void saveState() {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        // want to check bundle if counter is null? if not, restore.
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_initial);
         preferences = getPreferences(Context.MODE_PRIVATE);
@@ -73,8 +67,14 @@ public void onClick(View view) {
                 startActivity(intent);
             }
         });
-
     }
 
+    // Wasn't able to finish this part.
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
 
+        Bundle b = new Bundle();
+        b.putString("counter", String.valueOf(counter));
+    }
 }
diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index 37f45f0..6fc8059 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -1,36 +1,33 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_tile"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="nyc.c4q.TileActivity"
-    android:id="@+id/activity_tile"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    tools:context="nyc.c4q.TileActivity">
 
     <LinearLayout
         android:id="@+id/leftSide"
-        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="1">
+        android:layout_weight="1"
+        android:orientation="vertical">
 
         <LinearLayout
             android:id="@+id/redView"
-            android:background="@color/red"
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="40">
-        </LinearLayout>
+            android:layout_weight="40"
+            android:background="@color/red"
+            android:orientation="vertical"></LinearLayout>
 
         <LinearLayout
             android:id="@+id/greenView"
-            android:background="@color/green"
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="60">
-        </LinearLayout>
+            android:layout_weight="60"
+            android:background="@color/green"
+            android:orientation="vertical"></LinearLayout>
 
     </LinearLayout>
 
@@ -43,36 +40,33 @@
 
         <LinearLayout
             android:id="@+id/yellowView"
-            android:background="@color/yellow"
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="33">
-        </LinearLayout>
+            android:layout_weight="33"
+            android:background="@color/yellow"
+            android:orientation="vertical"></LinearLayout>
 
         <LinearLayout
             android:id="@+id/whiteView"
-            android:background="@color/white"
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="44">
-        </LinearLayout>
+            android:layout_weight="44"
+            android:background="@color/white"
+            android:orientation="vertical"></LinearLayout>
 
         <LinearLayout
             android:id="@+id/blueView"
-            android:background="@color/blue"
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="22">
-        </LinearLayout>
+            android:layout_weight="22"
+            android:background="@color/blue"
+            android:orientation="vertical"></LinearLayout>
 
     </LinearLayout>
 
     <TextView
-        android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:text="TileActivity"/>
+        android:layout_height="wrap_content"
+        android:text="TileActivity" />
 
 </LinearLayout>