From e4cb95df3ff386f5f513758d1efd58b5667e5296 Mon Sep 17 00:00:00 2001
From: Allison Bojarski <alizinha@gmail.com>
Date: Tue, 19 May 2015 20:52:02 -0400
Subject: [PATCH 1/6] initial commit

---
 src/main/res/layout/activity_initial.xml | 43 ++++++++++++++++++++----
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..662ae23 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -3,16 +3,47 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
+    android:orientation="horizontal"
     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:orientation="horizontal"
+        android:id="@+id/counterLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:text="InitialActivity"
-        />
-</LinearLayout>
\ No newline at end of file
+        >
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/counterButtonsLayout">
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/buttonPlus"
+                android:text="+"/>
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/buttonMinus"
+                android:text="-"/>
+            </LinearLayout>
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/buttonTileActivity"
+            />
+        <TextView
+            android:id="@+id/tvCounter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"/>
+
+
+
+    </LinearLayout>
+
+</LinearLayout>

From dc218ab032d7bd4f48f0e2a89ff4e3eed829e239 Mon Sep 17 00:00:00 2001
From: Allison Bojarski <alizinha@gmail.com>
Date: Tue, 19 May 2015 21:51:16 -0400
Subject: [PATCH 2/6] final commit of assessment

---
 src/main/java/nyc/c4q/InitialActivity.java |  2 +
 src/main/res/layout/activity_initial.xml   | 46 +++++++++++++++-------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..1c5ff25 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -35,4 +35,6 @@ protected void onCreate(Bundle savedInstanceState) {
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
   }
+
+
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 662ae23..fa16771 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -13,37 +13,53 @@
         android:orientation="horizontal"
         android:id="@+id/counterLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2"
         >
+
         <LinearLayout
             android:orientation="vertical"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:id="@+id/counterButtonsLayout">
+            android:id="@+id/counterButtonsLayout"
+            android:layout_weight="1">
             <Button
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:id="@+id/buttonPlus"
-                android:text="+"/>
+                android:text="+"
+                android:layout_weight="1"/>
             <Button
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:id="@+id/buttonMinus"
-                android:text="-"/>
+                android:text="-"
+                android:layout_weight="1"/>
             </LinearLayout>
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/buttonTileActivity"
-            />
+
         <TextView
             android:id="@+id/tvCounter"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="0"/>
+            android:text="0"
+            android:layout_weight="1"/>
 
 
 
     </LinearLayout>
-
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:id="@+id/buttonTileActivity"
+        android:text="TileActivity"
+        android:layout_weight="1"
+        />
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:id="@+id/buttonEmpty"
+        android:text="Empty"
+        android:layout_weight="1"
+        />
 </LinearLayout>
+

From 2c3a4183e06f1cfe19f0a643fa8a1e1901efda76 Mon Sep 17 00:00:00 2001
From: Amy Quispe <quispe.amy@gmail.com>
Date: Mon, 25 May 2015 13:34:46 -0400
Subject: [PATCH 3/6] Update Unit1AssessmentTestsJava.java

fixing types in test04AwesomeContainerContainsAwesomeObject()
---
 src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
index a965446..de10077 100644
--- a/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
+++ b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
@@ -42,9 +42,9 @@ public void test03AbstractAwesomeClassImplementsAwesomeInterface() throws Except
     @Test
     public void test04AwesomeContainerContainsAwesomeObject() throws Exception{
         Collection myList = AwesomeContainer.createAwesomeContainer();
-        assertEquals(myList.getClass(), List.class);
+        assertEquals(myList.getClass(), ArrayList.class);
         AwesomeContainer.addAwesomeObject(myList);
-        assertEquals(((List) myList).get(0).getClass(), AwesomeInterface.class);
+        assertEquals(((ArrayList) myList).get(0).getClass(), ConcreteAwesomeClass.class);
     }
 
 }

From 7c836ac3bf5047b7055ac053c728e7b7873deba5 Mon Sep 17 00:00:00 2001
From: Allison Bojarski <alizinha@gmail.com>
Date: Tue, 19 May 2015 20:52:02 -0400
Subject: [PATCH 4/6] initial commit

---
 src/main/res/layout/activity_initial.xml | 43 ++++++++++++++++++++----
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..662ae23 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -3,16 +3,47 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
+    android:orientation="horizontal"
     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:orientation="horizontal"
+        android:id="@+id/counterLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:text="InitialActivity"
-        />
-</LinearLayout>
\ No newline at end of file
+        >
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/counterButtonsLayout">
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/buttonPlus"
+                android:text="+"/>
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/buttonMinus"
+                android:text="-"/>
+            </LinearLayout>
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/buttonTileActivity"
+            />
+        <TextView
+            android:id="@+id/tvCounter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"/>
+
+
+
+    </LinearLayout>
+
+</LinearLayout>

From 2c3b32a3ca772ea6aad083c3d8791bd4354853b4 Mon Sep 17 00:00:00 2001
From: Allison Bojarski <alizinha@gmail.com>
Date: Tue, 19 May 2015 21:51:16 -0400
Subject: [PATCH 5/6] final commit of assessment

---
 src/main/java/nyc/c4q/InitialActivity.java |  2 +
 src/main/res/layout/activity_initial.xml   | 46 +++++++++++++++-------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..1c5ff25 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -35,4 +35,6 @@ protected void onCreate(Bundle savedInstanceState) {
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
   }
+
+
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 662ae23..fa16771 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -13,37 +13,53 @@
         android:orientation="horizontal"
         android:id="@+id/counterLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2"
         >
+
         <LinearLayout
             android:orientation="vertical"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:id="@+id/counterButtonsLayout">
+            android:id="@+id/counterButtonsLayout"
+            android:layout_weight="1">
             <Button
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:id="@+id/buttonPlus"
-                android:text="+"/>
+                android:text="+"
+                android:layout_weight="1"/>
             <Button
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:id="@+id/buttonMinus"
-                android:text="-"/>
+                android:text="-"
+                android:layout_weight="1"/>
             </LinearLayout>
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/buttonTileActivity"
-            />
+
         <TextView
             android:id="@+id/tvCounter"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="0"/>
+            android:text="0"
+            android:layout_weight="1"/>
 
 
 
     </LinearLayout>
-
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:id="@+id/buttonTileActivity"
+        android:text="TileActivity"
+        android:layout_weight="1"
+        />
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:id="@+id/buttonEmpty"
+        android:text="Empty"
+        android:layout_weight="1"
+        />
 </LinearLayout>
+

From bebb597acbfbf1105ead38b7f38dad77ed17030f Mon Sep 17 00:00:00 2001
From: Allison Bojarski <alizinha@gmail.com>
Date: Tue, 26 May 2015 21:56:28 -0400
Subject: [PATCH 6/6] tuesday assessment part 2

---
 src/main/java/nyc/c4q/InitialActivity.java    | 29 ++++++++++++++++++-
 src/main/java/nyc/c4q/SubFunClass.java        |  8 ++++-
 .../nyc/c4q/Unit1AssessmentTestsAndroid.java  |  2 +-
 .../nyc/c4q/Unit1AssessmentTestsJava.java     |  1 +
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 1c5ff25..5768567 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -11,6 +11,11 @@
 
 public class InitialActivity extends Activity {
 
+    Button buttonPlus;
+    Button buttonMinus;
+    TextView tvCounter;
+
+
   public int counter = 0;
   public SharedPreferences preferences = null;
   public final static String TAG = "C4QTAG";
@@ -34,7 +39,29 @@ protected void onCreate(Bundle savedInstanceState) {
     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);
+    buttonPlus.setOnClickListener(new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            counter++;
+            String number = String.valueOf(counter);
+            tvCounter.setText(number);
+        }
+      });
+    buttonMinus = (Button)findViewById(R.id.buttonMinus);
+    buttonMinus.setOnClickListener(new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            counter--;
+            String number = String.valueOf(counter);
+            tvCounter.setText(number);
+        }
+      });
+  }
 
 }
+
+
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..85747fc 100644
--- a/src/main/java/nyc/c4q/SubFunClass.java
+++ b/src/main/java/nyc/c4q/SubFunClass.java
@@ -3,7 +3,13 @@
 /**
  * Created by amyquispe on 5/19/15.
  */
-public class SubFunClass {
+public class SubFunClass extends SuperFunClass {
     public SubFunClass(){
+        SubFunClass funObject = new SubFunClass();
     }
 }
+
+//    @Test
+//    public void test01SubFunClassInheritsFromSuperFunClass() throws Exception {
+//        SubFunClass funObject = new SubFunClass();
+//        assertThat(funObject, instanceOf(SuperFunClass.class));
\ No newline at end of file
diff --git a/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java b/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
index bae0f78..6812104 100644
--- a/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
+++ b/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
@@ -100,7 +100,7 @@ public void test02ButtonPlusShouldIncreaseTvCounter() throws Exception {
         Button buttonPlus = (Button) Helpers.findViewByIdString(activity, "buttonPlus");
         TextView tvCounter = (TextView) Helpers.findViewByIdString(activity, "tvCounter");
 
-        assertNotNull("TextView(@+id/buttonPlus) should not be null", buttonPlus);
+        assertNotNull("Button(@+id/buttonPlus) should not be null", buttonPlus);
         assertNotNull("TextView(@+id/tvCounter) should not be null", tvCounter);
 
         assertEquals(0, Integer.parseInt((String) tvCounter.getText()));
diff --git a/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
index de10077..ae9b679 100644
--- a/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
+++ b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
@@ -7,6 +7,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;