From 6cacf704d852c72bc00c792cd9f125d21008f424 Mon Sep 17 00:00:00 2001
From: ahhhlvin <alvkuang@gmail.com>
Date: Tue, 19 May 2015 21:59:04 -0400
Subject: [PATCH 1/6] finish assessment

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    |  8 +-
 src/main/java/nyc/c4q/AwesomeContainer.java   |  5 +-
 .../java/nyc/c4q/ConcreteAwesomeClass.java    | 13 ++++
 src/main/java/nyc/c4q/InitialActivity.java    | 58 +++++++++++++-
 src/main/java/nyc/c4q/SubFunClass.java        | 12 ++-
 src/main/res/layout/activity_initial.xml      | 75 +++++++++++++++++--
 src/main/res/layout/activity_tile.xml         | 60 ++++++++++++++-
 src/main/res/values/strings.xml               | 12 +++
 8 files changed, 229 insertions(+), 14 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..153edf9 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -5,13 +5,17 @@
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
 
+    public int data;
+
     @Override
     public int getData() {
-        return 0;
+        return 4;
     }
 
     @Override
     public void setData(int someData) {
-
+       this.data = someData;
     }
+
+
 }
diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 64e9fd9..453741f 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -3,16 +3,19 @@
 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 {
     public static Collection createAwesomeContainer(){
+
+
         return null;
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
-        return;
+        awesomeContainer.add(awesomeContainer);
     }
 }
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index f39acca..a06d8db 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -4,8 +4,21 @@
  * Created by amyquispe on 5/19/15.
  */
 public class ConcreteAwesomeClass extends AbstractAwesomeClass {
+
+
     public ConcreteAwesomeClass(){
     }
     public ConcreteAwesomeClass(int startData){
+       setData(startData);
+
+    }
+
+    @Override
+    public int getData() {
+        return super.getData();
     }
+
+
+
+
 }
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..4a04c4e 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;
@@ -14,8 +15,9 @@ public class InitialActivity extends Activity {
   public int counter = 0;
   public SharedPreferences preferences = null;
   public final static String TAG = "C4QTAG";
+  public TextView tvCounter;
 
-  public void loadState(){
+    public void loadState(){
     Log.d(TAG, "loadState()");
     counter = preferences.getInt("counter", 0);
     Log.d(TAG, "loadState(): counter=="+counter);
@@ -31,8 +33,58 @@ public void saveState(){
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_initial);
+     tvCounter = (TextView) findViewById(R.id.tvCounter);
+
+
+      if (savedInstanceState != null) {
+          tvCounter.setText(savedInstanceState.getString("counter"));
+      }
+
+      super.onCreate(savedInstanceState);
+
+
+      setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
+
+
+      Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
+      buttonPlus.setOnClickListener(new View.OnClickListener() {
+
+          @Override
+          public void onClick(View view) {
+              counter++;
+              tvCounter.setText(String.valueOf(counter));
+          }
+
+      });
+
+
+      Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
+      buttonMinus.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+              counter--;
+              tvCounter.setText(String.valueOf(counter));
+          }
+      });
+
+
+      Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity);
+      buttonTileActivity.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+              Intent nextStartedActivity = new Intent(getApplicationContext(), TileActivity.class);
+              startActivity(nextStartedActivity);
+          }
+      });
+
+
   }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+//        outState.putString("counter", tvCounter.getText().toString());
+
+        super.onSaveInstanceState(outState);
+    }
 }
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..d0559c7 100644
--- a/src/main/java/nyc/c4q/SubFunClass.java
+++ b/src/main/java/nyc/c4q/SubFunClass.java
@@ -3,7 +3,17 @@
 /**
  * Created by amyquispe on 5/19/15.
  */
-public class SubFunClass {
+public class SubFunClass extends SuperFunClass implements AwesomeInterface {
     public SubFunClass(){
     }
+
+    @Override
+    public int getData() {
+        return 0;
+    }
+
+    @Override
+    public void setData(int someData) {
+
+    }
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..b4f09a5 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -7,12 +7,77 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="nyc.c4q.InitialActivity"
-    android:id="@+id/activity_initial">
+    android:id="@+id/activity_initial"
+    >
 
-    <TextView
-        android:id="@+id/text"
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:orientation="horizontal"
+            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:id="@+id/counterButtonsLayout">
+
+
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:text="+"
+                android:layout_weight="1"
+                android:id="@+id/buttonPlus"/>
+
+
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:text="-"
+                android:layout_weight="1"
+                android:id="@+id/buttonMinus"/>
+
+        </LinearLayout>
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:text="@string/zero"
+                android:layout_weight="1"
+                android:id="@+id/tvCounter"/>
+
+
+
+
+
+        </LinearLayout>
+
+    <Button
+        android:id="@+id/buttonTileActivity"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="InitialActivity"
+        android:layout_height="0dp"
+        android:text="TileActivity"
+        android:layout_weight="1"
         />
+
+
+    <Button
+        android:id="@+id/buttonEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:text="Empty"
+        android:layout_weight="1"
+        />
+
+
+
+
 </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..2d48d90 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -5,11 +5,67 @@
     android:layout_height="match_parent"
     tools:context="nyc.c4q.TileActivity"
     android:id="@+id/activity_tile"
+    android:orientation="horizontal"
     >
 
-    <TextView
+
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:id="@+id/leftSide"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="40"
+                android:background="@color/red"
+                android:id="@+id/redView" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="60"
+                android:background="@color/green"
+                android:id="@+id/greenView" />
+
+        </LinearLayout>
+
+    <LinearLayout
         android:layout_width="match_parent"
-        android:text="TileActivity"/>
+        android:layout_height="match_parent"
+        android:id="@+id/rightSide"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="33"
+            android:background="@color/yellow"
+            android:id="@+id/yellowView" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="44"
+            android:background="@color/white"
+            android:id="@+id/whiteView" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="22"
+            android:background="@color/blue"
+            android:id="@+id/blueView" />
+
+    </LinearLayout>
+
+
 
 </LinearLayout>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c174d4f..4d22de5 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -4,4 +4,16 @@
     <string name="action_settings">Settings</string>
 
     <string name="hello_world">Hello world!</string>
+    <string name="zero">0</string>
+
+    <color name="white">#ffffffff</color>
+    <color name="yellow">#ffffff00</color>
+    <color name="blue">#ff0000ff</color>
+
+
+
+    <color name="red">#FFFF0000</color>
+    <color name="green">#ff00ff00</color>
+
+
 </resources>

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 2/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 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 3/6] 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 4/6] 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 923b5972f861f5985e41f9bf12b85d9dffeb0f93 Mon Sep 17 00:00:00 2001
From: ahhhlvin <alvkuang@gmail.com>
Date: Tue, 26 May 2015 20:20:48 -0400
Subject: [PATCH 5/6] finished all required tests in assessment

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    |  14 +-
 src/main/java/nyc/c4q/AwesomeContainer.java   |   6 +-
 src/main/java/nyc/c4q/InitialActivity.java    | 130 +++++++++++-------
 .../nyc/c4q/Unit1AssessmentTestsJava.java     |   1 +
 4 files changed, 91 insertions(+), 60 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index 153edf9..f45c476 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -5,17 +5,19 @@
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
 
-    public int data;
+    int data = 4;
+
 
-    @Override
-    public int getData() {
-        return 4;
-    }
 
     @Override
     public void setData(int someData) {
-       this.data = someData;
+        this.data = someData;
     }
 
 
+    @Override
+    public int getData() {
+        return data;
+    }
+
 }
diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 453741f..a042542 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -12,10 +12,12 @@ public class AwesomeContainer {
     public static Collection createAwesomeContainer(){
 
 
-        return null;
+        ArrayList<Object> myList = new ArrayList<Object>();
+
+        return myList;
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
-        awesomeContainer.add(awesomeContainer);
+        awesomeContainer.add(new ConcreteAwesomeClass());
     }
 }
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 4a04c4e..b583756 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -5,6 +5,7 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -12,79 +13,104 @@
 
 public class InitialActivity extends Activity {
 
-  public int counter = 0;
-  public SharedPreferences preferences = null;
-  public final static String TAG = "C4QTAG";
-  public TextView tvCounter;
+    public int counter = 0;
+    public SharedPreferences preferences = null;
+    public final static String TAG = "C4QTAG";
+    public TextView tvCounter;
 
-    public void loadState(){
-    Log.d(TAG, "loadState()");
-    counter = preferences.getInt("counter", 0);
-    Log.d(TAG, "loadState(): counter=="+counter);
-  }
+    public void loadState() {
+        Log.d(TAG, "loadState()");
+        counter = preferences.getInt("counter", 0);
+        Log.d(TAG, "loadState(): counter==" + counter);
+    }
 
-  public void saveState(){
-    Log.d(TAG, "saveState()");
-    Log.d(TAG, "saveState(): counter=="+counter);
-    SharedPreferences.Editor editor = preferences.edit();
-    editor.putInt("counter", counter);
-    editor.commit();
-  }
+    public void saveState() {
+        Log.d(TAG, "saveState()");
+        Log.d(TAG, "saveState(): counter==" + counter);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putInt("counter", counter);
+        editor.commit();
+    }
 
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-     tvCounter = (TextView) findViewById(R.id.tvCounter);
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
 
 
-      if (savedInstanceState != null) {
-          tvCounter.setText(savedInstanceState.getString("counter"));
-      }
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_initial);
+        preferences = getPreferences(Context.MODE_PRIVATE);
+        tvCounter = (TextView) findViewById(R.id.tvCounter);
 
-      super.onCreate(savedInstanceState);
 
+        if (savedInstanceState != null) {
+            tvCounter.setText(savedInstanceState.getString("counter").toString());
+        }
 
-      setContentView(R.layout.activity_initial);
-    preferences = getPreferences(Context.MODE_PRIVATE);
 
+        Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
+        buttonPlus.setOnClickListener(new View.OnClickListener() {
 
-      Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
-      buttonPlus.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                counter++;
+                tvCounter.setText(String.valueOf(counter));
+                savePreferences("counter", tvCounter.getText().toString());
+            }
 
-          @Override
-          public void onClick(View view) {
-              counter++;
-              tvCounter.setText(String.valueOf(counter));
-          }
+        });
 
-      });
 
+        Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
+        buttonMinus.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                counter--;
+                tvCounter.setText(String.valueOf(counter));
+                savePreferences("counter", tvCounter.getText().toString());
+            }
+        });
 
-      Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
-      buttonMinus.setOnClickListener(new View.OnClickListener() {
-          @Override
-          public void onClick(View view) {
-              counter--;
-              tvCounter.setText(String.valueOf(counter));
-          }
-      });
 
+        Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity);
+        buttonTileActivity.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent nextStartedActivity = new Intent(getApplicationContext(), TileActivity.class);
+                startActivity(nextStartedActivity);
+            }
+        });
 
-      Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity);
-      buttonTileActivity.setOnClickListener(new View.OnClickListener() {
-          @Override
-          public void onClick(View view) {
-              Intent nextStartedActivity = new Intent(getApplicationContext(), TileActivity.class);
-              startActivity(nextStartedActivity);
-          }
-      });
 
+        loadSavedPreferences();
+
+    }
 
-  }
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
-//        outState.putString("counter", tvCounter.getText().toString());
-
         super.onSaveInstanceState(outState);
+
+
+        outState.putString("counter", tvCounter.getText().toString());
+
     }
+
+
+
+    private void savePreferences(String key, String value) {
+
+        SharedPreferences sharedPreferences = PreferenceManager
+                .getDefaultSharedPreferences(this);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        editor.putString("counter", tvCounter.getText().toString());
+        editor.commit();
+    }
+
+    private void loadSavedPreferences() {
+
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        tvCounter.setText(sharedPreferences.getString("counter", tvCounter.getText().toString()));
+
+    }
+
 }
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 f88423bf19518f30007b0759e23e7a3f899c6f90 Mon Sep 17 00:00:00 2001
From: ahhhlvin <alvkuang@gmail.com>
Date: Tue, 26 May 2015 21:14:11 -0400
Subject: [PATCH 6/6] more updates

---
 src/main/java/nyc/c4q/InitialActivity.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index b583756..6c9316f 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -99,8 +99,7 @@ protected void onSaveInstanceState(Bundle outState) {
 
     private void savePreferences(String key, String value) {
 
-        SharedPreferences sharedPreferences = PreferenceManager
-                .getDefaultSharedPreferences(this);
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         SharedPreferences.Editor editor = sharedPreferences.edit();
         editor.putString("counter", tvCounter.getText().toString());
         editor.commit();