From e6e707791e690733b4b9e2d9e30025f88b4711bd Mon Sep 17 00:00:00 2001
From: Pooja Pasawala <pooja@basicer.com>
Date: Tue, 19 May 2015 19:59:45 -0400
Subject: [PATCH 1/7] Fix java test 01 and 02.

---
 src/main/java/nyc/c4q/SubFunClass.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..215b1d1 100644
--- a/src/main/java/nyc/c4q/SubFunClass.java
+++ b/src/main/java/nyc/c4q/SubFunClass.java
@@ -3,7 +3,21 @@
 /**
  * Created by amyquispe on 5/19/15.
  */
-public class SubFunClass {
+
+public class SubFunClass extends SuperFunClass implements AwesomeInterface{
+    int data;
+
     public SubFunClass(){
+        super("OMG");
+    }
+
+    public int getData() {
+        return data;
     }
+
+    public void setData(int someData) {
+        this.data = someData;
+    }
+
+
 }

From 4b7bd2d12f2d5f76638c9ada194f2d6dbad249a8 Mon Sep 17 00:00:00 2001
From: Pooja Pasawala <pooja@basicer.com>
Date: Tue, 19 May 2015 20:59:08 -0400
Subject: [PATCH 2/7] InitialActivity layout looks as it should

---
 src/main/res/layout/activity_initial.xml | 74 ++++++++++++++++++++++--
 1 file changed, 69 insertions(+), 5 deletions(-)

diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..713e701 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -4,15 +4,79 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
+    android:padding="0dp"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="nyc.c4q.InitialActivity"
     android:id="@+id/activity_initial">
 
-    <TextView
-        android:id="@+id/text"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="InitialActivity"
-        />
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:layout_weight="1">
+
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:text="+"
+                android:id="@+id/buttonPlus"
+                android:layout_weight="1"
+                android:onClick="add"
+                android:textSize="100sp"
+                android:gravity="center"/>
+
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:text="-"
+                android:id="@+id/buttonMinus"
+                android:layout_weight="1"
+                android:onClick="subtract"
+                android:textSize="100sp"
+                android:gravity="center"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:id="@+id/tvCounter"
+            android:layout_weight="1"
+            android:textSize="100sp"
+            android:gravity="center"
+            android:text="0"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        android:layout_weight="1">
+
+        <Button
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:id="@+id/thing1"
+            android:textSize="30sp"
+            android:text="TileActivity"/>
+
+        <Button
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:id="@+id/thing2"
+            android:textSize="30sp"
+            android:text="Empty"/>
+
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file

From b2864d55c5a09a01f5a6a03aa3ec32a28a2d4e7a Mon Sep 17 00:00:00 2001
From: Pooja Pasawala <pooja@basicer.com>
Date: Tue, 19 May 2015 21:47:11 -0400
Subject: [PATCH 3/7] remove onclick from plus and minus buttons

---
 src/main/res/layout/activity_initial.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 713e701..0ee3684 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -28,7 +28,6 @@
                 android:text="+"
                 android:id="@+id/buttonPlus"
                 android:layout_weight="1"
-                android:onClick="add"
                 android:textSize="100sp"
                 android:gravity="center"/>
 
@@ -38,7 +37,6 @@
                 android:text="-"
                 android:id="@+id/buttonMinus"
                 android:layout_weight="1"
-                android:onClick="subtract"
                 android:textSize="100sp"
                 android:gravity="center"/>
 

From d74f7e3992056d9abe73bdbb606c375b913f9dc9 Mon Sep 17 00:00:00 2001
From: Pooja Pasawala <pooja@basicer.com>
Date: Tue, 19 May 2015 21:47:49 -0400
Subject: [PATCH 4/7] Add answer for Android tests 02, 03, and 04 (make plus
 and minus buttons work).

---
 src/main/java/nyc/c4q/InitialActivity.java | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..0f388a9 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -8,6 +8,7 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
+import java.util.ArrayList;
 
 public class InitialActivity extends Activity {
 
@@ -34,5 +35,32 @@ protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
+
+      final TextView tvCounter = (TextView) findViewById(R.id.tvCounter);
+
+      Button plusButton = (Button) findViewById(R.id.buttonPlus);
+      Button minusButton = (Button) findViewById(R.id.buttonMinus);
+
+      ArrayList<Button> buttons = new ArrayList<Button>();
+      buttons.add(plusButton);
+      buttons.add(minusButton);
+
+      for (Button button : buttons) {
+          button.setOnClickListener(new View.OnClickListener(){
+              @Override
+              public void onClick(View view) {
+                  switch (view.getId()) {
+                      case R.id.buttonPlus:
+                          counter += 1;
+                          tvCounter.setText(counter+"");
+                          break;
+                      case R.id.buttonMinus:
+                          counter -= 1;
+                          tvCounter.setText(counter+"");
+                          break;
+                  }
+              }
+          });
+      }
   }
 }

From 36f0ca7e424bd8b909b1a7c4f5940addddf12c3c Mon Sep 17 00:00:00 2001
From: Pooja Pasawala <pooja@basicer.com>
Date: Tue, 19 May 2015 21:56:42 -0400
Subject: [PATCH 5/7] Fix InitialActivity Layout and add answer to android test
 01.

---
 src/main/res/layout/activity_initial.xml | 38 ++++++++++--------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 0ee3684..8b0cb16 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -14,13 +14,15 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:orientation="horizontal"
-        android:layout_weight="1">
+        android:layout_weight="2"
+        android:id="@+id/counterLayout">
 
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:orientation="vertical"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:id="@+id/counterButtonsLayout">
 
             <Button
                 android:layout_width="match_parent"
@@ -53,28 +55,20 @@
 
     </LinearLayout>
 
-    <LinearLayout
+    <Button
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:orientation="vertical"
-        android:layout_weight="1">
+        android:layout_weight="1"
+        android:textSize="30sp"
+        android:text="TileActivity"
+        android:id="@+id/buttonTileActivity"/>
 
-        <Button
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:id="@+id/thing1"
-            android:textSize="30sp"
-            android:text="TileActivity"/>
-
-        <Button
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:id="@+id/thing2"
-            android:textSize="30sp"
-            android:text="Empty"/>
-
-    </LinearLayout>
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:textSize="30sp"
+        android:text="Empty"
+        android:id="@+id/buttonEmpty"/>
 
 </LinearLayout>
\ No newline at end of file

From 2f9a1514fff9da15853628b42dcec570818c775c Mon Sep 17 00:00:00 2001
From: Pooja Pasawala <pooja@basicer.com>
Date: Tue, 19 May 2015 21:59:02 -0400
Subject: [PATCH 6/7] in the middle of trying to fix java test 03.

---
 src/main/java/nyc/c4q/ConcreteAwesomeClass.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index f39acca..0ba40b4 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -4,8 +4,22 @@
  * Created by amyquispe on 5/19/15.
  */
 public class ConcreteAwesomeClass extends AbstractAwesomeClass {
+    int data;
+
     public ConcreteAwesomeClass(){
+        this.data = 4;
     }
     public ConcreteAwesomeClass(int startData){
+        this.data = startData;
     }
+
+//    @Override
+//    public int getData() {
+//        return data;
+//    }
+//
+//    @Override
+//    public void setData(int someData) {
+//        this.data = someData;
+//    }
 }

From cc56cd32aeecce132f188d0c747dc2de17d73dd1 Mon Sep 17 00:00:00 2001
From: Pooja Pasawala <pooja@basicer.com>
Date: Wed, 20 May 2015 09:58:04 -0400
Subject: [PATCH 7/7] Solution java test 03.

---
 .../java/nyc/c4q/AbstractAwesomeClass.java     |  5 +++--
 .../java/nyc/c4q/ConcreteAwesomeClass.java     | 18 +++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..88c345e 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 {
+    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/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index 0ba40b4..56129fc 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -13,13 +13,13 @@ public ConcreteAwesomeClass(int startData){
         this.data = startData;
     }
 
-//    @Override
-//    public int getData() {
-//        return data;
-//    }
-//
-//    @Override
-//    public void setData(int someData) {
-//        this.data = someData;
-//    }
+    @Override
+    public int getData() {
+        return data;
+    }
+
+    @Override
+    public void setData(int someData) {
+        this.data = someData;
+    }
 }