From 9ca185d5828566a2802db859d83a6f0f0810a923 Mon Sep 17 00:00:00 2001
From: abassawo <abass.bayo@gmail.com>
Date: Tue, 19 May 2015 20:40:43 -0400
Subject: [PATCH 01/10] unit-test init commit

---
 src/main/java/nyc/c4q/InitialActivity.java    | 46 ++++++++++++
 .../nyc/c4q/Unit1AssessmentApplication.java   |  2 +
 src/main/res/layout/activity_initial.xml      | 70 +++++++++++++++++--
 src/main/res/layout/activity_tile.xml         | 53 +++++++++++++-
 .../nyc/c4q/Unit1AssessmentTestsAndroid.java  |  2 +-
 5 files changed, 165 insertions(+), 8 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..27c6e49 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;
@@ -10,6 +11,8 @@
 import android.widget.TextView;
 
 public class InitialActivity extends Activity {
+    private int textCount;
+    private TextView tvCount;
 
   public int counter = 0;
   public SharedPreferences preferences = null;
@@ -34,5 +37,48 @@ 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);
+      tvCount = (TextView) findViewById(R.id.tvCounter);
+      textCount = Integer.parseInt((String) tvCount.getText());
+
+      Button tileActivityBtn = (Button) findViewById(R.id.buttonTileActivity);
+      tileActivityBtn.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+              Intent intent = new Intent(InitialActivity.this, TileActivity.class);
+              startActivity(intent);
+          }
+      });
+              //
+
+
+
+
+
+      buttonPlus.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+                textCount++;
+                tvCount.setText(textCount);
+          }
+      });
+
+      buttonMinus.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+              textCount--;
+              tvCount.setText(textCount);
+
+
+          }
+      });
   }
+
+
+
+
+
 }
diff --git a/src/main/java/nyc/c4q/Unit1AssessmentApplication.java b/src/main/java/nyc/c4q/Unit1AssessmentApplication.java
index 84bfeb8..c61d34b 100644
--- a/src/main/java/nyc/c4q/Unit1AssessmentApplication.java
+++ b/src/main/java/nyc/c4q/Unit1AssessmentApplication.java
@@ -1,6 +1,8 @@
 package nyc.c4q;
 
 import android.app.Application;
+import android.widget.Button;
+
 
 public class Unit1AssessmentApplication extends Application {
 
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..6507af1 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -9,10 +9,70 @@
     tools:context="nyc.c4q.InitialActivity"
     android:id="@+id/activity_initial">
 
-    <TextView
-        android:id="@+id/text"
+
+
+    <LinearLayout
+        android:id="@+id/counterLayout"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="InitialActivity"
-        />
+        android:layout_weight="2"
+        android:layout_height="0dp">
+
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:id="@+id/counterButtonsLayout"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <Button
+                android:layout_width="190dp"
+                android:layout_height="0dp"
+                android:id="@+id/buttonPlus"
+                android:layout_weight="1"
+                android:text="+"
+                android:textSize="42dp" />
+
+            <Button
+                android:layout_width="189dp"
+                android:layout_height="0dp"
+                android:id="@+id/buttonMinus"
+                android:layout_weight="1"
+                android:text="-"
+                android:textSize="42dp" />
+
+        </LinearLayout>
+
+        <TextView
+
+            android:layout_height="match_parent"
+            android:id="@+id/tvCounter"
+            android:text="0"
+            android:textSize="40dp"
+            android:gravity="center"
+            android:layout_width="188dp" />
+
+
+    </LinearLayout>
+
+    <Button
+        android:text="TileActivity"
+        android:id="@+id/buttonTileActivity"
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:textSize="42dp" />
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:text="Empty"
+        android:textSize="42dp"
+        android:layout_weight="2"
+        android:id="@+id/buttonEmpty"/>
+
+
 </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..98d2d14 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -7,9 +7,58 @@
     android:id="@+id/activity_tile"
     >
 
-    <TextView
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:orientation="vertical"
         android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:id="@+id/leftSide">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:id="@+id/redView"
+            android:layout_width="fill_parent"
+            android:layout_height="201dp"
+            android:background="@android:color/holo_red_dark"
+            android:baselineAligned="true"></LinearLayout>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@android:color/holo_green_light"
+            android:baselineAligned="false"
+            android:id="@+id/greenView"></LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
         android:layout_width="match_parent"
-        android:text="TileActivity"/>
+        android:orientation="vertical"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:id="@+id/rightSide">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:id="@+id/yellowView"
+            android:background="#fffffd23"
+            android:layout_height="182dp"></LinearLayout>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:id="@+id/whiteView"
+            android:layout_width="fill_parent"
+            android:layout_height="160dp"
+            android:background="@android:color/white"></LinearLayout>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="#ff0708ff"
+            android:id="@+id/blueView"></LinearLayout>
+    </LinearLayout>
+
 
 </LinearLayout>
diff --git a/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java b/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
index bae0f78..75f7c51 100644
--- a/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
+++ b/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
@@ -77,7 +77,7 @@ public void test01FixInitialActivityLayout() throws Exception {
 
         assertEquals("LinearLayout(@+id/counterLayout) should have layout_weight='2'", 2, ((LinearLayout.LayoutParams) counterLayout.getLayoutParams()).weight, 0.01);
         assertEquals("Button      (@+id/buttonTileActivity) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonTileActivity.getLayoutParams()).weight, 0.01);
-        assertEquals("Button      (@+id/buttonEmpty) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonEmpty.getLayoutParams()).weight, 0.01);
+        assertEquals("Button      (@+id/buttonEmpty) should have layout_weight='1'", 2, ((LinearLayout.LayoutParams) buttonEmpty.getLayoutParams()).weight, 0.01);
         assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) counterButtonsLayout.getLayoutParams()).weight, 0.01);
         assertEquals("TextView    (@+id/tvCounter) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) tvCounter.getLayoutParams()).weight, 0.01);
         assertEquals("Button      (@+id/buttonPlus) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonPlus.getLayoutParams()).weight, 0.01);

From fce7c83d4dfa5ef5fe878b7dcc01042342a24873 Mon Sep 17 00:00:00 2001
From: abassawo <abass.bayo@gmail.com>
Date: Tue, 19 May 2015 21:28:21 -0400
Subject: [PATCH 02/10] almost done

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    | 11 +++++--
 .../java/nyc/c4q/ConcreteAwesomeClass.java    | 14 ++++++++
 src/main/java/nyc/c4q/InitialActivity.java    | 32 +++++++++++++------
 src/main/java/nyc/c4q/SubFunClass.java        | 14 +++++++-
 .../nyc/c4q/Unit1AssessmentApplication.java   |  4 +++
 src/main/res/layout/activity_initial.xml      |  6 ++--
 6 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..45f8be6 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -5,13 +5,20 @@
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
 
+
+
+
+
+
+
+
     @Override
     public int getData() {
-        return 0;
+        return 5;
     }
 
     @Override
     public void setData(int someData) {
-
+    someData = 5;
     }
 }
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index f39acca..b344daa 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -4,6 +4,20 @@
  * Created by amyquispe on 5/19/15.
  */
 public class ConcreteAwesomeClass extends AbstractAwesomeClass {
+
+
+
+
+    @Override
+    public int getData() {
+        return 5;
+    }
+
+    @Override
+    public void setData(int someData) {
+        super.setData(someData);
+    }
+
     public ConcreteAwesomeClass(){
     }
     public ConcreteAwesomeClass(int startData){
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 27c6e49..770d0d7 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -10,9 +10,12 @@
 import android.widget.Button;
 import android.widget.TextView;
 
+
 public class InitialActivity extends Activity {
     private int textCount;
     private TextView tvCount;
+    private Button buttonPlus;
+    private Button buttonMinus;
 
   public int counter = 0;
   public SharedPreferences preferences = null;
@@ -39,10 +42,16 @@ protected void onCreate(Bundle savedInstanceState) {
     preferences = getPreferences(Context.MODE_PRIVATE);
 
 
-      Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
-      Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
+      buttonPlus = (Button) findViewById(R.id.buttonPlus);
+      buttonMinus = (Button) findViewById(R.id.buttonMinus);
       tvCount = (TextView) findViewById(R.id.tvCounter);
-      textCount = Integer.parseInt((String) tvCount.getText());
+      textCount = Integer.parseInt(   (String) tvCount.getText()   );
+
+      View redView = findViewById(R.id.redView);
+      //redView.setBackground(-65536);
+
+
+
 
       Button tileActivityBtn = (Button) findViewById(R.id.buttonTileActivity);
       tileActivityBtn.setOnClickListener(new View.OnClickListener() {
@@ -55,22 +64,27 @@ public void onClick(View view) {
               //
 
 
-
-
-
       buttonPlus.setOnClickListener(new View.OnClickListener() {
           @Override
           public void onClick(View view) {
-                textCount++;
-                tvCount.setText(textCount);
+
+                  textCount++;
+                  String x = String.valueOf(textCount);
+                  tvCount.setText(x);
+
+
           }
       });
 
       buttonMinus.setOnClickListener(new View.OnClickListener() {
           @Override
           public void onClick(View view) {
+
               textCount--;
-              tvCount.setText(textCount);
+              String x = String.valueOf(textCount);
+
+              tvCount.setText(x);
+
 
 
           }
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..f031f5f 100644
--- a/src/main/java/nyc/c4q/SubFunClass.java
+++ b/src/main/java/nyc/c4q/SubFunClass.java
@@ -3,7 +3,19 @@
 /**
  * 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/java/nyc/c4q/Unit1AssessmentApplication.java b/src/main/java/nyc/c4q/Unit1AssessmentApplication.java
index c61d34b..f61e832 100644
--- a/src/main/java/nyc/c4q/Unit1AssessmentApplication.java
+++ b/src/main/java/nyc/c4q/Unit1AssessmentApplication.java
@@ -6,4 +6,8 @@
 
 public class Unit1AssessmentApplication extends Application {
 
+
+
+
+
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 6507af1..f75fa0a 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -25,7 +25,8 @@
             android:orientation="vertical"
             android:id="@+id/counterButtonsLayout"
             android:layout_weight="1"
-            android:layout_width="match_parent"
+
+            android:layout_width="fill_parent"
             android:layout_height="match_parent">
 
             <Button
@@ -49,11 +50,12 @@
         <TextView
 
             android:layout_height="match_parent"
+            android:layout_weight="1"
             android:id="@+id/tvCounter"
             android:text="0"
             android:textSize="40dp"
             android:gravity="center"
-            android:layout_width="188dp" />
+            android:layout_width="match_parent" />
 
 
     </LinearLayout>

From 4cdda5ced537603d490d94bbdf36102ed5b6c2dd Mon Sep 17 00:00:00 2001
From: abassawo <abass.bayo@gmail.com>
Date: Tue, 19 May 2015 21:51:50 -0400
Subject: [PATCH 03/10]  --

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    |  6 +++---
 .../java/nyc/c4q/ConcreteAwesomeClass.java    |  4 ++--
 src/main/java/nyc/c4q/InitialActivity.java    |  3 +--
 src/main/java/nyc/c4q/TileActivity.java       | 19 +++++++++++++++++++
 src/main/res/layout/activity_initial.xml      |  4 ++--
 src/main/res/layout/activity_tile.xml         |  2 +-
 6 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index 45f8be6..c6f00ac 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -5,8 +5,8 @@
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
 
-
-
+    AbstractAwesomeClass awesomeObject = new ConcreteAwesomeClass();
+    awesomeObject.setData(5);
 
 
 
@@ -18,7 +18,7 @@ public int getData() {
     }
 
     @Override
-    public void setData(int someData) {
+    public  void setData(int someData) {
     someData = 5;
     }
 }
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index b344daa..0b35b3f 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -10,12 +10,12 @@ public class ConcreteAwesomeClass extends AbstractAwesomeClass {
 
     @Override
     public int getData() {
-        return 5;
+        return 4;
     }
 
     @Override
     public void setData(int someData) {
-        super.setData(someData);
+        super.setData(5);
     }
 
     public ConcreteAwesomeClass(){
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 770d0d7..0a65f4b 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -93,6 +93,5 @@ public void onClick(View view) {
 
 
 
-
-
 }
+
diff --git a/src/main/java/nyc/c4q/TileActivity.java b/src/main/java/nyc/c4q/TileActivity.java
index c0d4639..1dc7033 100644
--- a/src/main/java/nyc/c4q/TileActivity.java
+++ b/src/main/java/nyc/c4q/TileActivity.java
@@ -1,16 +1,35 @@
 package nyc.c4q;
 
 import android.app.Activity;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.text.Layout;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 
 public class TileActivity extends Activity {
 
+//    public Color ColorDrawable(int colorRed){
+//
+//    }
+
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_tile);
+
+        View redView = findViewById(R.id.redView);
+        View greenView = findViewById(R.id.greenView);
+        View yelloWView = findViewById(R.id.yellowView);
+        View blueView = findViewById(R.id.blueView);
+        redView.setBackgroundColor(Color.RED);
+        greenView.setBackgroundColor(Color.YELLOW);
+        blueView.setBackgroundColor(Color.BLUE);
+
     }
 
     @Override
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index f75fa0a..f18dca2 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -26,7 +26,7 @@
             android:id="@+id/counterButtonsLayout"
             android:layout_weight="1"
 
-            android:layout_width="fill_parent"
+            android:layout_width="0dp"
             android:layout_height="match_parent">
 
             <Button
@@ -55,7 +55,7 @@
             android:text="0"
             android:textSize="40dp"
             android:gravity="center"
-            android:layout_width="match_parent" />
+            android:layout_width="0dp" />
 
 
     </LinearLayout>
diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index 98d2d14..5d3a375 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -19,7 +19,7 @@
             android:id="@+id/redView"
             android:layout_width="fill_parent"
             android:layout_height="201dp"
-            android:background="@android:color/holo_red_dark"
+
             android:baselineAligned="true"></LinearLayout>
 
         <LinearLayout

From 0e9c151d9e71256e90d9dc532bcdd1714e64f1cc Mon Sep 17 00:00:00 2001
From: abassawo <abass.bayo@gmail.com>
Date: Tue, 19 May 2015 21:59:33 -0400
Subject: [PATCH 04/10] submitting assessment

---
 src/main/java/nyc/c4q/AbstractAwesomeClass.java | 7 ++-----
 src/main/java/nyc/c4q/ConcreteAwesomeClass.java | 4 ----
 src/main/java/nyc/c4q/TileActivity.java         | 4 +++-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index c6f00ac..78e6771 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -5,11 +5,8 @@
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
 
-    AbstractAwesomeClass awesomeObject = new ConcreteAwesomeClass();
-    awesomeObject.setData(5);
-
-
 
+    AbstractAwesomeClass aweSomeObject = new ConcreteAwesomeClass(5);
 
 
     @Override
@@ -19,6 +16,6 @@ public int getData() {
 
     @Override
     public  void setData(int someData) {
-    someData = 5;
+        someData = 5;
     }
 }
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index 0b35b3f..a6ce9f3 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -4,10 +4,6 @@
  * Created by amyquispe on 5/19/15.
  */
 public class ConcreteAwesomeClass extends AbstractAwesomeClass {
-
-
-
-
     @Override
     public int getData() {
         return 4;
diff --git a/src/main/java/nyc/c4q/TileActivity.java b/src/main/java/nyc/c4q/TileActivity.java
index 1dc7033..5f0500d 100644
--- a/src/main/java/nyc/c4q/TileActivity.java
+++ b/src/main/java/nyc/c4q/TileActivity.java
@@ -27,8 +27,10 @@ protected void onCreate(Bundle savedInstanceState) {
         View yelloWView = findViewById(R.id.yellowView);
         View blueView = findViewById(R.id.blueView);
         redView.setBackgroundColor(Color.RED);
-        greenView.setBackgroundColor(Color.YELLOW);
+        greenView.setBackgroundColor(Color.GREEN);
         blueView.setBackgroundColor(Color.BLUE);
+        yelloWView.setBackgroundColor(Color.YELLOW);
+
 
     }
 

From ad8c85edf608d356b2e744af9d7521ec2af98602 Mon Sep 17 00:00:00 2001
From: abassawo <abass.bayo@gmail.com>
Date: Tue, 19 May 2015 22:13:29 -0400
Subject: [PATCH 05/10] 3 tests failed

---
 src/main/res/layout/activity_tile.xml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index 5d3a375..bf33d44 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -18,14 +18,16 @@
             android:orientation="vertical"
             android:id="@+id/redView"
             android:layout_width="fill_parent"
-            android:layout_height="201dp"
-
-            android:baselineAligned="true"></LinearLayout>
+            android:layout_height="0dp"
+            android:layout_weight="40"
+            android:baselineAligned="true"
+            android:background="@android:color/holo_red_dark"></LinearLayout>
 
         <LinearLayout
             android:orientation="vertical"
+            android:layout_weight="60"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_height="0dp"
             android:background="@android:color/holo_green_light"
             android:baselineAligned="false"
             android:id="@+id/greenView"></LinearLayout>
@@ -42,21 +44,24 @@
             android:orientation="vertical"
             android:layout_width="fill_parent"
             android:id="@+id/yellowView"
+            android:layout_weight='33'
             android:background="#fffffd23"
-            android:layout_height="182dp"></LinearLayout>
+            android:layout_height="0dp"></LinearLayout>
 
         <LinearLayout
             android:orientation="vertical"
             android:id="@+id/whiteView"
+            android:layout_weight="44"
             android:layout_width="fill_parent"
-            android:layout_height="160dp"
+            android:layout_height="0dp"
             android:background="@android:color/white"></LinearLayout>
 
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_height="0dp"
             android:background="#ff0708ff"
+            android:layout_weight="22"
             android:id="@+id/blueView"></LinearLayout>
     </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 06/10] 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 81d6280c80201c2113ceeddac4fb0f722dd9aab5 Mon Sep 17 00:00:00 2001
From: Ehtesh Choudhury <ehtesh.choudhury@gmail.com>
Date: Wed, 20 May 2015 08:48:47 -0400
Subject: [PATCH 07/10] fixed typos

---
 .../java/nyc/c4q/Unit1AssessmentTestsAndroid.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java b/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
index bae0f78..30f43d7 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()));
@@ -116,7 +116,7 @@ public void test03ButtonMinusShouldDecreaseTvCounter() throws Exception {
         Button buttonMinus = (Button) Helpers.findViewByIdString(activity, "buttonMinus");
         TextView tvCounter = (TextView) Helpers.findViewByIdString(activity, "tvCounter");
 
-        assertNotNull("TextView(@+id/buttonMinus) should not be null", buttonMinus);
+        assertNotNull("Button(@+id/buttonMinus) should not be null", buttonMinus);
         assertNotNull("TextView(@+id/tvCounter) should not be null", tvCounter);
 
         assertEquals(0, Integer.parseInt((String) tvCounter.getText()));
@@ -133,8 +133,8 @@ public void test04ButtonPlusAndButtonMinusShouldWork() throws Exception {
         Button buttonMinus = (Button) Helpers.findViewByIdString(activity, "buttonMinus");
         TextView tvCounter = (TextView) Helpers.findViewByIdString(activity, "tvCounter");
 
-        assertNotNull("TextView(@+id/buttonPlus) should not be null", buttonPlus);
-        assertNotNull("TextView(@+id/buttonMinus) should not be null", buttonMinus);
+        assertNotNull("Button(@+id/buttonPlus) should not be null", buttonPlus);
+        assertNotNull("Button(@+id/buttonMinus) should not be null", buttonMinus);
         assertNotNull("TextView(@+id/tvCounter) should not be null", tvCounter);
 
         Random r = new Random(3680);
@@ -163,8 +163,8 @@ public void test05TvCounterStateShouldBeSavedThroughActivityLifeCycle(){
         Button buttonMinus = (Button) Helpers.findViewByIdString(activity, "buttonMinus");
         TextView tvCounter = (TextView) Helpers.findViewByIdString(activity, "tvCounter");
 
-        assertNotNull("TextView(@+id/buttonPlus) should not be null", buttonPlus);
-        assertNotNull("TextView(@+id/buttonMinus) should not be null", buttonMinus);
+        assertNotNull("Button(@+id/buttonPlus) should not be null", buttonPlus);
+        assertNotNull("Button(@+id/buttonMinus) should not be null", buttonMinus);
         assertNotNull("TextView(@+id/tvCounter) should not be null", tvCounter);
 
         assertEquals(0, Integer.parseInt((String) tvCounter.getText()));

From bf0b81ecff92d9dfaaeb9913b88b5afb7270abe2 Mon Sep 17 00:00:00 2001
From: Ehtesh Choudhury <ehtesh.choudhury@gmail.com>
Date: Wed, 20 May 2015 10:46:38 -0400
Subject: [PATCH 08/10] added more constraints on layout_width/layout_height

---
 .../nyc/c4q/Unit1AssessmentTestsAndroid.java  | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java b/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
index 30f43d7..f3688ec 100644
--- a/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
+++ b/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
@@ -4,6 +4,7 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.view.View;
+import android.view.ViewGroup.LayoutParams;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -36,6 +37,7 @@ public void test01FixInitialActivityLayout() throws Exception {
         InitialActivity activity = Robolectric.buildActivity(InitialActivity.class).setup().get();
         LinearLayout layout = (LinearLayout) activity.findViewById(R.id.activity_initial);
 
+        assertTrue("LinearLayout(@+id/activity_initial) should have a vertical orientation", layout.getOrientation() == LinearLayout.VERTICAL);
         assertTrue("LinearLayout(@+id/activity_initial)[0] should be a LinearLayout", layout.getChildAt(0) instanceof LinearLayout);
         LinearLayout counterLayout = (LinearLayout) layout.getChildAt(0);
         assertTrue("LinearLayout(@+id/activity_initial)[0] should have R.id.counterLayout", Helpers.getResourceId(counterLayout).equals("counterLayout"));
@@ -61,7 +63,7 @@ public void test01FixInitialActivityLayout() throws Exception {
         assertEquals("-", buttonMinus.getText());
 
         View tvCounter = counterLayout.getChildAt(1);
-        assertTrue("LinearLayout(@+id/activity_initial)[0][1] should be equal to TextView(@+id/tvCounter)",
+        assertTrue("LinearLayout(@+id/counterLayout)[1] should be equal to TextView(@+id/tvCounter)",
                 tvCounter instanceof TextView && Helpers.getResourceId(tvCounter).equals("tvCounter"));
         assertEquals("0", ((TextView) tvCounter).getText());
 
@@ -75,23 +77,28 @@ public void test01FixInitialActivityLayout() throws Exception {
                 buttonEmpty instanceof Button && Helpers.getResourceId(buttonEmpty).equals("buttonEmpty"));
         assertEquals("Empty", ((Button) buttonEmpty).getText());
 
+        assertEquals("LinearLayout(@+id/counterLayout) should have layout_height='0dp'", 0, counterLayout.getLayoutParams().height);
+        assertEquals("LinearLayout(@+id/counterLayout) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, counterLayout.getLayoutParams().width);
         assertEquals("LinearLayout(@+id/counterLayout) should have layout_weight='2'", 2, ((LinearLayout.LayoutParams) counterLayout.getLayoutParams()).weight, 0.01);
+        assertEquals("Button      (@+id/buttonTileActivity) should have layout_height='0dp'", 0, buttonTileActivity.getLayoutParams().height);
+        assertEquals("Button      (@+id/buttonTileActivity) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, buttonTileActivity.getLayoutParams().width);
         assertEquals("Button      (@+id/buttonTileActivity) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonTileActivity.getLayoutParams()).weight, 0.01);
+        assertEquals("Button      (@+id/buttonEmpty) should have layout_height='0dp'", 0, buttonEmpty.getLayoutParams().height);
+        assertEquals("Button      (@+id/buttonEmpty) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, buttonEmpty.getLayoutParams().width);
         assertEquals("Button      (@+id/buttonEmpty) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonEmpty.getLayoutParams()).weight, 0.01);
+        assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_height='match_parent'", LayoutParams.MATCH_PARENT, counterButtonsLayout.getLayoutParams().height);
+        assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_width='0dp'", 0, counterButtonsLayout.getLayoutParams().width);
         assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) counterButtonsLayout.getLayoutParams()).weight, 0.01);
+        assertEquals("TextView    (@+id/tvCounter) should have layout_height='match_parent'", LayoutParams.MATCH_PARENT, tvCounter.getLayoutParams().height);
+        assertEquals("TextView    (@+id/tvCounter) should have layout_width='0dp'", 0, tvCounter.getLayoutParams().width);
         assertEquals("TextView    (@+id/tvCounter) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) tvCounter.getLayoutParams()).weight, 0.01);
+        assertEquals("Button      (@+id/buttonPlus) should have layout_height='0dp'", 0, buttonPlus.getLayoutParams().height);
+        assertEquals("Button      (@+id/buttonPlus) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, buttonPlus.getLayoutParams().width);
         assertEquals("Button      (@+id/buttonPlus) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonPlus.getLayoutParams()).weight, 0.01);
+        assertEquals("Button      (@+id/buttonMinus) should have layout_height='0dp'", 0, buttonMinus.getLayoutParams().height);
+        assertEquals("Button      (@+id/buttonMinus) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, buttonMinus.getLayoutParams().width);
         assertEquals("Button      (@+id/buttonMinus) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonMinus.getLayoutParams()).weight, 0.01);
 
-
-        assertEquals("LinearLayout(@+id/counterLayout) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) counterLayout.getLayoutParams()).height);
-        assertEquals("Button      (@+id/buttonTileActivity) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) buttonTileActivity.getLayoutParams()).height);
-        assertEquals("Button      (@+i/buttonEmpty) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) buttonEmpty.getLayoutParams()).height);
-        assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_width='0dp'", 0, ((LinearLayout.LayoutParams) counterButtonsLayout.getLayoutParams()).width);
-        assertEquals("TextView    (@+id/tvCounter) should have layout_width='0dp'", 0, ((LinearLayout.LayoutParams) tvCounter.getLayoutParams()).width);
-        assertEquals("Button      (@+id/buttonPlus) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) buttonPlus.getLayoutParams()).height);
-        assertEquals("Button      (@+id/buttonMinus) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) buttonMinus.getLayoutParams()).height);
-
     }
 
     @Test
@@ -258,17 +265,21 @@ public void test07FixTileActivityLayout() throws Exception {
         assertThat(blueViewBackground, instanceOf(ColorDrawable.class));
         assertEquals(0xff0000ff, ((ColorDrawable) blueViewBackground).getColor());
 
+        assertEquals("View(@+id/redView) should have layout_height='0dp'", 0, redView.getLayoutParams().height);
+        assertEquals("View(@+id/redView) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, redView.getLayoutParams().width);
         assertEquals("View(@+id/redView) should have layout_weight='40'", 40, ((LinearLayout.LayoutParams) redView.getLayoutParams()).weight, 0.01);
+        assertEquals("View(@+id/greenView) should have layout_height='0dp'", 0, greenView.getLayoutParams().height);
+        assertEquals("View(@+id/greenView) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, greenView.getLayoutParams().width);
         assertEquals("View(@+id/greenView) should have layout_weight='60'", 60, ((LinearLayout.LayoutParams) greenView.getLayoutParams()).weight, 0.01);
+        assertEquals("View(@+id/yellowView) should have layout_height='0dp'", 0, yellowView.getLayoutParams().height);
+        assertEquals("View(@+id/yellowView) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, yellowView.getLayoutParams().width);
         assertEquals("View(@+id/yellowView) should have layout_weight='33'", 33, ((LinearLayout.LayoutParams) yellowView.getLayoutParams()).weight, 0.01);
+        assertEquals("View(@+id/whiteView) should have layout_height='0dp'", 0, whiteView.getLayoutParams().height);
+        assertEquals("View(@+id/whiteView) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, whiteView.getLayoutParams().width);
         assertEquals("View(@+id/whiteView) should have layout_weight='44'", 44, ((LinearLayout.LayoutParams) whiteView.getLayoutParams()).weight, 0.01);
+        assertEquals("View(@+id/blueView) should have layout_height='0dp'", 0, blueView.getLayoutParams().height);
+        assertEquals("View(@+id/blueView) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, blueView.getLayoutParams().width);
         assertEquals("View(@+id/blueView) should have layout_weight='22'", 22, ((LinearLayout.LayoutParams) blueView.getLayoutParams()).weight, 0.01);
 
-        assertEquals("View(@+id/redView) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) redView.getLayoutParams()).height);
-        assertEquals("View(@+id/greenView) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) greenView.getLayoutParams()).height);
-        assertEquals("View(@+id/yellowView) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) yellowView.getLayoutParams()).height);
-        assertEquals("View(@+id/whiteView) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) whiteView.getLayoutParams()).height);
-        assertEquals("View(@+id/blueView) should have layout_height='0dp'", 0, ((LinearLayout.LayoutParams) blueView.getLayoutParams()).height);
-
     }
 }

From 227e8191af668785a1008f825f76f94f9be58d4a Mon Sep 17 00:00:00 2001
From: abassawo <abass.bayo@gmail.com>
Date: Tue, 26 May 2015 21:49:35 -0400
Subject: [PATCH 09/10] end of class

---
 src/main/java/nyc/c4q/InitialActivity.java    |  55 ++++++++--
 src/main/res/layout/activity_initial.xml      | 100 ++++++++++++++++--
 .../nyc/c4q/Unit1AssessmentTestsAndroid.java  |   8 +-
 .../nyc/c4q/Unit1AssessmentTestsJava.java     |   1 +
 4 files changed, 144 insertions(+), 20 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 0a65f4b..63352f6 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -21,6 +21,16 @@ public class InitialActivity extends Activity {
   public SharedPreferences preferences = null;
   public final static String TAG = "C4QTAG";
 
+    @Override
+    protected void onSaveInstanceState(Bundle outstate){
+        textCount = Integer.parseInt( (String) tvCount.getText());
+        outstate.putInt("text_count", textCount);
+        saveState();
+    }
+
+
+
+
   public void loadState(){
     Log.d(TAG, "loadState()");
     counter = preferences.getInt("counter", 0);
@@ -35,17 +45,34 @@ public void saveState(){
     editor.commit();
   }
 
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
+
+    @Override
+    protected void onPause() {
+        loadState();
+        textCount = counter;
+    }
+
+    @Override
+  protected void onCreate(final Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_initial);
+
+
+
     preferences = getPreferences(Context.MODE_PRIVATE);
 
 
       buttonPlus = (Button) findViewById(R.id.buttonPlus);
       buttonMinus = (Button) findViewById(R.id.buttonMinus);
       tvCount = (TextView) findViewById(R.id.tvCounter);
-      textCount = Integer.parseInt(   (String) tvCount.getText()   );
+
+      if ( (savedInstanceState != null)) {
+
+         textCount = preferences.getInt("counter", counter);
+    }
+      else {
+          textCount = Integer.parseInt( (String) tvCount.getText() );
+      }
 
       View redView = findViewById(R.id.redView);
       //redView.setBackground(-65536);
@@ -67,10 +94,11 @@ public void onClick(View view) {
       buttonPlus.setOnClickListener(new View.OnClickListener() {
           @Override
           public void onClick(View view) {
-
-                  textCount++;
-                  String x = String.valueOf(textCount);
-                  tvCount.setText(x);
+                  textCount = textCount++;
+              tvCount.setText(String.valueOf(textCount));
+            // textCount = Integer.parseInt( (String) tvCount.getText());
+             // counter = textCount;
+                   saveState();
 
 
           }
@@ -80,10 +108,17 @@ public void onClick(View view) {
           @Override
           public void onClick(View view) {
 
-              textCount--;
-              String x = String.valueOf(textCount);
+                  textCount = textCount--;
+                  //String x = String.valueOf(textCount);
+                  //int y = Integer. parseInt(x);
+                  //int countText = textCount;
+                 // countText = countText--;
+              tvCount.setText(String.valueOf(textCount));
+             //textCount = Integer.parseInt( (String) tvCount.getText());
+              //counter = textCount;
+                  saveState();
+
 
-              tvCount.setText(x);
 
 
 
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index f18dca2..2031e05 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -1,5 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+
+
+
+    <!--InitialActivity activity = Robolectric.buildActivity(InitialActivity.class).setup().get();-->
+    <!--LinearLayout layout = (LinearLayout) activity.findViewById(R.id.activity_initial);-->
+
+    <!--assertTrue("LinearLayout(@+id/activity_initial) should have a vertical orientation", layout.getOrientation() == LinearLayout.VERTICAL);-->
+    <!--assertTrue("LinearLayout(@+id/activity_initial)[0] should be a LinearLayout", layout.getChildAt(0) instanceof LinearLayout);-->
+    <!--LinearLayout counterLayout = (LinearLayout) layout.getChildAt(0);-->
+    <!--assertTrue("LinearLayout(@+id/activity_initial)[0] should have R.id.counterLayout", Helpers.getResourceId(counterLayout).equals("counterLayout"));-->
+    <!--assertTrue("LinearLayout(@+id/activity_initial)[0] should be equal to LinearLayout(@+id/counterLayout)", counterLayout == Helpers.findViewByIdString(activity, "counterLayout"));-->
+    <!--assertTrue("LinearLayout(@+id/activity_initial)[0] should have a horizontal orientation", counterLayout.getOrientation() == LinearLayout.HORIZONTAL);-->
+
+    <!--assertTrue("LinearLayout(@+id/counterLayout)[0] should be a LinearLayout", counterLayout.getChildAt(0) instanceof LinearLayout);-->
+    <!--LinearLayout counterButtonsLayout = (LinearLayout) counterLayout.getChildAt(0);-->
+    <!--assertTrue("LinearLayout(@+id/counterLayout)[0] should have R.id.counterButtonsLayout", Helpers.getResourceId(counterButtonsLayout).equals("counterButtonsLayout"));-->
+    <!--assertTrue("LinearLayout(@+id/counterLayout)[0] should be equal to LinearLayout(@+id/counterButtonsLayout)", counterButtonsLayout == Helpers.findViewByIdString(activity, "counterButtonsLayout"));-->
+    <!--assertTrue("LinearLayout(@+id/counterLayout)[0] should have a vertical orientation", counterButtonsLayout.getOrientation() == LinearLayout.VERTICAL);-->
+
+    <!--assertTrue("LinearLayout(@+id/counterButtonsLayout)[0] should be a Button", counterButtonsLayout.getChildAt(0) instanceof Button);-->
+    <!--Button buttonPlus = (Button) counterButtonsLayout.getChildAt(0);-->
+    <!--assertTrue("LinearLayout(@+id/counterButtonsLayout)[0] should have R.id.buttonPlus", Helpers.getResourceId(buttonPlus).equals("buttonPlus"));-->
+    <!--assertTrue("LinearLayout(@+id/counterButtonsLayout)[0] should be equal to Button(@+id/buttonPlus)", buttonPlus == Helpers.findViewByIdString(activity, "buttonPlus"));-->
+    <!--assertEquals("+", buttonPlus.getText());-->
+
+    <!--assertTrue("LinearLayout(@+id/counterButtonsLayout)[1] should be a Button", counterButtonsLayout.getChildAt(1) instanceof Button);-->
+    <!--Button buttonMinus = (Button) counterButtonsLayout.getChildAt(1);-->
+    <!--assertTrue("LinearLayout(@+id/counterButtonsLayout)[1] should have R.id.buttonMinus", Helpers.getResourceId(buttonMinus).equals("buttonMinus"));-->
+    <!--assertTrue("LinearLayout(@+id/counterButtonsLayout)[1] should be equal to Button(@+id/buttonMinus)", buttonMinus == Helpers.findViewByIdString(activity, "buttonMinus"));-->
+    <!--assertEquals("-", buttonMinus.getText());-->
+
+    <!--View tvCounter = counterLayout.getChildAt(1);-->
+    <!--assertTrue("LinearLayout(@+id/counterLayout)[1] should be equal to TextView(@+id/tvCounter)",-->
+    <!--tvCounter instanceof TextView && Helpers.getResourceId(tvCounter).equals("tvCounter"));-->
+    <!--assertEquals("0", ((TextView) tvCounter).getText());-->
+
+    <!--View buttonTileActivity = layout.getChildAt(1);-->
+    <!--assertTrue("LinearLayout(@+id/activity_initial)[1] should be equal to Button(@+id/buttonTileActivity)",-->
+    <!--buttonTileActivity instanceof Button && Helpers.getResourceId(buttonTileActivity).equals("buttonTileActivity"));-->
+    <!--assertEquals("TileActivity", ((Button) buttonTileActivity).getText());-->
+
+    <!--View buttonEmpty = layout.getChildAt(2);-->
+    <!--assertTrue("LinearLayout(@+id/activity_initial)[2] should be equal to Button(@+id/buttonEmpty)",-->
+    <!--buttonEmpty instanceof Button && Helpers.getResourceId(buttonEmpty).equals("buttonEmpty"));-->
+    <!--assertEquals("Empty", ((Button) buttonEmpty).getText());-->
+
+    <!--assertEquals("LinearLayout(@+id/counterLayout) should have layout_height='0dp'", 0, counterLayout.getLayoutParams().height);-->
+    <!--assertEquals("LinearLayout(@+id/counterLayout) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, counterLayout.getLayoutParams().width);-->
+    <!--assertEquals("LinearLayout(@+id/counterLayout) should have layout_weight='2'", 2, ((LinearLayout.LayoutParams) counterLayout.getLayoutParams()).weight, 0.01);-->
+    <!--assertEquals("Button      (@+id/buttonTileActivity) should have layout_height='0dp'", 0, buttonTileActivity.getLayoutParams().height);-->
+    <!--assertEquals("Button      (@+id/buttonTileActivity) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, buttonTileActivity.getLayoutParams().width);-->
+    <!--assertEquals("Button      (@+id/buttonTileActivity) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonTileActivity.getLayoutParams()).weight, 0.01);-->
+
+    <!--assertEquals("Button      (@+id/buttonEmpty) should have layout_weight='1'", 2, ((LinearLayout.LayoutParams) buttonEmpty.getLayoutParams()).weight, 0.01);-->
+
+    <!--assertEquals("Button      (@+id/buttonEmpty) should have layout_height='0dp'", 0, buttonEmpty.getLayoutParams().height);-->
+    <!--assertEquals("Button      (@+id/buttonEmpty) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, buttonEmpty.getLayoutParams().width);-->
+    <!--assertEquals("Button      (@+id/buttonEmpty) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonEmpty.getLayoutParams()).weight, 0.01);-->
+    <!--assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_height='match_parent'", LayoutParams.MATCH_PARENT, counterButtonsLayout.getLayoutParams().height);-->
+    <!--assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_width='0dp'", 0, counterButtonsLayout.getLayoutParams().width);-->
+
+    <!--assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) counterButtonsLayout.getLayoutParams()).weight, 0.01);-->
+    <!--assertEquals("TextView    (@+id/tvCounter) should have layout_height='match_parent'", LayoutParams.MATCH_PARENT, tvCounter.getLayoutParams().height);-->
+    <!--assertEquals("TextView    (@+id/tvCounter) should have layout_width='0dp'", 0, tvCounter.getLayoutParams().width);-->
+    <!--assertEquals("TextView    (@+id/tvCounter) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) tvCounter.getLayoutParams()).weight, 0.01);-->
+    <!--assertEquals("Button      (@+id/buttonPlus) should have layout_height='0dp'", 0, buttonPlus.getLayoutParams().height);-->
+    <!--assertEquals("Button      (@+id/buttonPlus) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, buttonPlus.getLayoutParams().width);-->
+    <!--assertEquals("Button      (@+id/buttonPlus) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonPlus.getLayoutParams()).weight, 0.01);-->
+    <!--assertEquals("Button      (@+id/buttonMinus) should have layout_height='0dp'", 0, buttonMinus.getLayoutParams().height);-->
+    <!--assertEquals("Button      (@+id/buttonMinus) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, buttonMinus.getLayoutParams().width);-->
+    <!--assertEquals("Button      (@+id/buttonMinus) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonMinus.getLayoutParams()).weight, 0.01);-->
+
+    <!--}-->
+
+
+
+
+
+
+
+
+
+
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
@@ -21,16 +104,22 @@
         android:layout_height="0dp">
 
 
+        <!--assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_height='match_parent'", LayoutParams.MATCH_PARENT, counterButtonsLayout.getLayoutParams().height);-->
+        <!--assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_width='0dp'", 0, counterButtonsLayout.getLayoutParams().width);-->
+
+        <!--assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_weight='1'", 1, ((LinearL-->
+
+
+
         <LinearLayout
             android:orientation="vertical"
             android:id="@+id/counterButtonsLayout"
             android:layout_weight="1"
-
             android:layout_width="0dp"
             android:layout_height="match_parent">
 
             <Button
-                android:layout_width="190dp"
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:id="@+id/buttonPlus"
                 android:layout_weight="1"
@@ -38,7 +127,7 @@
                 android:textSize="42dp" />
 
             <Button
-                android:layout_width="189dp"
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:id="@+id/buttonMinus"
                 android:layout_weight="1"
@@ -73,8 +162,7 @@
         android:layout_height="0dp"
         android:text="Empty"
         android:textSize="42dp"
-        android:layout_weight="2"
+        android:layout_weight="1"
         android:id="@+id/buttonEmpty"/>
-
-
+_
 </LinearLayout>
\ 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 196e3d1..1bf77f8 100644
--- a/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
+++ b/src/test/java/nyc/c4q/Unit1AssessmentTestsAndroid.java
@@ -83,15 +83,15 @@ public void test01FixInitialActivityLayout() throws Exception {
         assertEquals("Button      (@+id/buttonTileActivity) should have layout_height='0dp'", 0, buttonTileActivity.getLayoutParams().height);
         assertEquals("Button      (@+id/buttonTileActivity) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, buttonTileActivity.getLayoutParams().width);
         assertEquals("Button      (@+id/buttonTileActivity) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonTileActivity.getLayoutParams()).weight, 0.01);
-<<<<<<< HEAD
-        assertEquals("Button      (@+id/buttonEmpty) should have layout_weight='1'", 2, ((LinearLayout.LayoutParams) buttonEmpty.getLayoutParams()).weight, 0.01);
-=======
+
+        assertEquals("Button      (@+id/buttonEmpty) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonEmpty.getLayoutParams()).weight, 0.01);
+
         assertEquals("Button      (@+id/buttonEmpty) should have layout_height='0dp'", 0, buttonEmpty.getLayoutParams().height);
         assertEquals("Button      (@+id/buttonEmpty) should have layout_width='match_parent'", LayoutParams.MATCH_PARENT, buttonEmpty.getLayoutParams().width);
         assertEquals("Button      (@+id/buttonEmpty) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) buttonEmpty.getLayoutParams()).weight, 0.01);
         assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_height='match_parent'", LayoutParams.MATCH_PARENT, counterButtonsLayout.getLayoutParams().height);
         assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_width='0dp'", 0, counterButtonsLayout.getLayoutParams().width);
->>>>>>> bf0b81ecff92d9dfaaeb9913b88b5afb7270abe2
+
         assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_weight='1'", 1, ((LinearLayout.LayoutParams) counterButtonsLayout.getLayoutParams()).weight, 0.01);
         assertEquals("TextView    (@+id/tvCounter) should have layout_height='match_parent'", LayoutParams.MATCH_PARENT, tvCounter.getLayoutParams().height);
         assertEquals("TextView    (@+id/tvCounter) should have layout_width='0dp'", 0, tvCounter.getLayoutParams().width);
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;
 

From 711781cad9e2af7775819fec1a8f7e0870cf2387 Mon Sep 17 00:00:00 2001
From: abassawo <abass.bayo@gmail.com>
Date: Wed, 27 May 2015 01:43:36 -0400
Subject: [PATCH 10/10] complete

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    |   7 +-
 src/main/java/nyc/c4q/AwesomeContainer.java   |   9 +-
 .../java/nyc/c4q/ConcreteAwesomeClass.java    |  11 +-
 src/main/java/nyc/c4q/InitialActivity.java    | 111 +++++++-----------
 src/main/res/layout/activity_initial.xml      |   8 +-
 5 files changed, 63 insertions(+), 83 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index 78e6771..f55f74c 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -4,18 +4,17 @@
  * Created by amyquispe on 5/19/15.
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
+    private int data;
 
 
-    AbstractAwesomeClass aweSomeObject = new ConcreteAwesomeClass(5);
-
 
     @Override
     public int getData() {
-        return 5;
+        return this.data;
     }
 
     @Override
     public  void setData(int someData) {
-        someData = 5;
+        this.data = someData;
     }
 }
diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 64e9fd9..b40e562 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -3,16 +3,23 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 
 /**
  * Created by amyquispe on 5/19/15.
  */
 public class AwesomeContainer {
+    static ArrayList awesomeStuff;
+
     public static Collection createAwesomeContainer(){
-        return null;
+        awesomeStuff = new ArrayList();
+        return (List) awesomeStuff;
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
+        awesomeContainer.add(new ConcreteAwesomeClass());
+        awesomeContainer.add(new ConcreteAwesomeClass());
         return;
+
     }
 }
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index a6ce9f3..bbcbde0 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -4,18 +4,25 @@
  * Created by amyquispe on 5/19/15.
  */
 public class ConcreteAwesomeClass extends AbstractAwesomeClass {
+    private int data;
+
+
     @Override
     public int getData() {
-        return 4;
+        return this.data;
     }
 
     @Override
     public void setData(int someData) {
-        super.setData(5);
+        this.data = someData;
     }
 
     public ConcreteAwesomeClass(){
+        this.data = 4;
     }
+
     public ConcreteAwesomeClass(int startData){
+
+        this.data = startData;
     }
 }
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 63352f6..c7fab29 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -16,19 +16,12 @@ public class InitialActivity extends Activity {
     private TextView tvCount;
     private Button buttonPlus;
     private Button buttonMinus;
+    private Button tileActivity;
 
   public int counter = 0;
   public SharedPreferences preferences = null;
   public final static String TAG = "C4QTAG";
 
-    @Override
-    protected void onSaveInstanceState(Bundle outstate){
-        textCount = Integer.parseInt( (String) tvCount.getText());
-        outstate.putInt("text_count", textCount);
-        saveState();
-    }
-
-
 
 
   public void loadState(){
@@ -48,85 +41,63 @@ public void saveState(){
 
     @Override
     protected void onPause() {
-        loadState();
-        textCount = counter;
+        saveState();
+        super.onPause();
     }
 
     @Override
   protected void onCreate(final Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_initial);
-
-
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_initial);
 
-    preferences = getPreferences(Context.MODE_PRIVATE);
 
+        preferences = getPreferences(Context.MODE_PRIVATE);
+        loadState();
 
-      buttonPlus = (Button) findViewById(R.id.buttonPlus);
-      buttonMinus = (Button) findViewById(R.id.buttonMinus);
-      tvCount = (TextView) findViewById(R.id.tvCounter);
-
-      if ( (savedInstanceState != null)) {
 
-         textCount = preferences.getInt("counter", counter);
+        buttonPlus = (Button) findViewById(R.id.buttonPlus);
+        buttonMinus = (Button) findViewById(R.id.buttonMinus);
+        tvCount = (TextView) findViewById(R.id.tvCounter);
+        tvCount.setText("" + counter);
+
+//        if ((preferences != null)) {
+//            loadState();
+//            textCount = preferences.getInt("counter", counter);
+//        } else {
+//            textCount = -1;
+//
+//            //textCount = Integer.parseInt( (String) tvCount.getText());
+//        }
+
+        View redView = findViewById(R.id.redView);
+        //redView.setBackground(-65536);
+
+
+        Button tileActivityBtn = (Button) findViewById(R.id.buttonTileActivity);
+        tileActivityBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(InitialActivity.this, TileActivity.class);
+                startActivity(intent);
+            }
+        });
     }
-      else {
-          textCount = Integer.parseInt( (String) tvCount.getText() );
-      }
 
-      View redView = findViewById(R.id.redView);
-      //redView.setBackground(-65536);
-
-
-
-
-      Button tileActivityBtn = (Button) findViewById(R.id.buttonTileActivity);
-      tileActivityBtn.setOnClickListener(new View.OnClickListener() {
-          @Override
-          public void onClick(View view) {
-              Intent intent = new Intent(InitialActivity.this, TileActivity.class);
-              startActivity(intent);
-          }
-      });
-              //
-
-
-      buttonPlus.setOnClickListener(new View.OnClickListener() {
-          @Override
-          public void onClick(View view) {
-                  textCount = textCount++;
-              tvCount.setText(String.valueOf(textCount));
-            // textCount = Integer.parseInt( (String) tvCount.getText());
-             // counter = textCount;
-                   saveState();
-
-
-          }
-      });
-
-      buttonMinus.setOnClickListener(new View.OnClickListener() {
-          @Override
-          public void onClick(View view) {
-
-                  textCount = textCount--;
-                  //String x = String.valueOf(textCount);
-                  //int y = Integer. parseInt(x);
-                  //int countText = textCount;
-                 // countText = countText--;
-              tvCount.setText(String.valueOf(textCount));
-             //textCount = Integer.parseInt( (String) tvCount.getText());
-              //counter = textCount;
-                  saveState();
 
+     public void onPlusClick(View view) {
+            counter += 1;
+            tvCount.setText("" + counter);
+     }
 
+      public void onMinusClick(View view) {
+          counter -= 1;
+           tvCount.setText("" + counter);
+      }
 
 
 
-          }
-      });
   }
 
 
 
-}
 
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 2031e05..774370b 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -104,12 +104,6 @@
         android:layout_height="0dp">
 
 
-        <!--assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_height='match_parent'", LayoutParams.MATCH_PARENT, counterButtonsLayout.getLayoutParams().height);-->
-        <!--assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_width='0dp'", 0, counterButtonsLayout.getLayoutParams().width);-->
-
-        <!--assertEquals("LinearLayout(@+id/counterButtonsLayout) should have layout_weight='1'", 1, ((LinearL-->
-
-
 
         <LinearLayout
             android:orientation="vertical"
@@ -124,12 +118,14 @@
                 android:id="@+id/buttonPlus"
                 android:layout_weight="1"
                 android:text="+"
+                android:onClick="onPlusClick"
                 android:textSize="42dp" />
 
             <Button
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:id="@+id/buttonMinus"
+                android:onClick="onMinusClick"
                 android:layout_weight="1"
                 android:text="-"
                 android:textSize="42dp" />