From 9dbfef7be3744e7dc1adb86657beff46a3c08a17 Mon Sep 17 00:00:00 2001
From: Shadow Slim <reinardcox@aol.com>
Date: Tue, 19 May 2015 21:41:46 -0400
Subject: [PATCH 1/3] Nothing to say

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    |  6 +-
 src/main/java/nyc/c4q/AwesomeContainer.java   | 13 +++-
 src/main/java/nyc/c4q/Helpers.java            |  3 +
 src/main/java/nyc/c4q/SubFunClass.java        | 12 +++-
 src/main/res/layout/activity_initial.xml      | 71 +++++++++++++++----
 src/main/res/layout/activity_tile.xml         | 19 +++++
 6 files changed, 106 insertions(+), 18 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..65ea220 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -4,14 +4,16 @@
  * Created by amyquispe on 5/19/15.
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
+    private int save = 4;
 
     @Override
     public int getData() {
-        return 0;
+        return this.save;
     }
 
+
     @Override
     public void setData(int someData) {
-
+        this.save = someData;
     }
 }
diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 64e9fd9..209f23b 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -1,18 +1,25 @@
 package nyc.c4q;
 
+
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 
 /**
  * Created by amyquispe on 5/19/15.
  */
 public class AwesomeContainer {
+
     public static Collection createAwesomeContainer(){
-        return null;
+
+        Collection<AwesomeContainer> myList = new ArrayList<AwesomeContainer>();
+
+
+
+        return myList;
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
-        return;
+
+        return ;
     }
 }
diff --git a/src/main/java/nyc/c4q/Helpers.java b/src/main/java/nyc/c4q/Helpers.java
index 10292fd..8991f74 100644
--- a/src/main/java/nyc/c4q/Helpers.java
+++ b/src/main/java/nyc/c4q/Helpers.java
@@ -3,6 +3,8 @@
 import android.app.Activity;
 import android.content.res.Resources;
 import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
 
 /**
  * Created by ehtesh on 5/19/15.
@@ -10,6 +12,7 @@
 public class Helpers {
     public static String getResourceId(View v) {
         // http://stackoverflow.com/a/17583380/198348
+
         int id = v.getId();
         String idString = "no id";
         if (id != View.NO_ID) {
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..525fea8 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..fb591d5 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -1,18 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
+    android:id="@+id/activity_initial"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="nyc.c4q.InitialActivity"
-    android:id="@+id/activity_initial">
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="InitialActivity"
-        />
+    android:orientation="vertical"
+    tools:context="nyc.c4q.InitialActivity">
+
+
+    <LinearLayout
+        android:id="@+id/counterLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="2">
+
+        <LinearLayout
+            android:id="@+id/counterButtonsLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_weight="1">
+
+            <Button
+                android:id="@+id/buttonPlus"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:text="+"
+                android:layout_weight="1"/>
+
+            <Button
+                android:id="@+id/buttonMinus"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:text="-"
+                android:layout_weight="1"/>
+
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tvCounter"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:text="0"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/buttonTileActivity"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:text="TileActivity"
+        android:layout_weight="1"/>
+
+
+    <Button
+        android:id="@+id/buttonEmpty"
+        android:layout_width="wrap_content"
+        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..babf89a 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -7,6 +7,25 @@
     android:id="@+id/activity_tile"
     >
 
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/leftSide"
+        android:orientation="vertical"
+        android:layout_weight="1">
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/rightSide"
+        android:orientation="vertical"
+        android:layout_weight="1">
+
+    </LinearLayout>
+
+
     <TextView
         android:layout_height="match_parent"
         android:layout_width="match_parent"

From 6d2cc6bc8d91ea345be59df0a975a80012560d36 Mon Sep 17 00:00:00 2001
From: Shadow Slim <reinardcox@aol.com>
Date: Tue, 19 May 2015 21:58:47 -0400
Subject: [PATCH 2/3] updating test

---
 src/main/java/nyc/c4q/AwesomeContainer.java |  5 ++--
 src/main/java/nyc/c4q/InitialActivity.java  | 33 +++++++++++++++++++++
 src/main/res/layout/activity_initial.xml    | 13 ++++----
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 209f23b..72e84bb 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -3,6 +3,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 /**
  * Created by amyquispe on 5/19/15.
@@ -11,11 +12,9 @@ public class AwesomeContainer {
 
     public static Collection createAwesomeContainer(){
 
-        Collection<AwesomeContainer> myList = new ArrayList<AwesomeContainer>();
 
 
-
-        return myList;
+        return null;
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..be3791e 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -34,5 +34,38 @@ 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);
+    final TextView tvCounter = (TextView) findViewById(R.id.tvCounter);
+
+    buttonPlus.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        counter++;
+
+
+        tvCounter.setText(Integer.toString(counter));
+
+      }
+    });
+
+
+    buttonMinus.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        counter--;
+
+
+        tvCounter.setText(Integer.toString(counter));
+
+      }
+    });
+
+
+
+
+
+
   }
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index fb591d5..372d244 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -11,27 +11,27 @@
 
     <LinearLayout
         android:id="@+id/counterLayout"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="2">
 
         <LinearLayout
             android:id="@+id/counterButtonsLayout"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:orientation="vertical"
             android:layout_weight="1">
 
             <Button
                 android:id="@+id/buttonPlus"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:text="+"
                 android:layout_weight="1"/>
 
             <Button
                 android:id="@+id/buttonMinus"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:text="-"
                 android:layout_weight="1"/>
@@ -44,13 +44,14 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:text="0"
+            android:textSize="60sp"
             android:layout_weight="1" />
 
     </LinearLayout>
 
     <Button
         android:id="@+id/buttonTileActivity"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
         android:text="TileActivity"
         android:layout_weight="1"/>
@@ -58,7 +59,7 @@
 
     <Button
         android:id="@+id/buttonEmpty"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
         android:text="Empty"
         android:layout_weight="1"/>

From 513408bc854c694d75af506c3976bb040970486a Mon Sep 17 00:00:00 2001
From: Shadow Slim <reinardcox@aol.com>
Date: Tue, 26 May 2015 22:00:21 -0400
Subject: [PATCH 3/3] Part II: Assesment test.

---
 .../java/nyc/c4q/ConcreteAwesomeClass.java    | 11 +++
 src/main/java/nyc/c4q/InitialActivity.java    | 94 +++++++++++--------
 src/main/res/layout/activity_tile.xml         | 78 +++++++++++----
 .../nyc/c4q/Unit1AssessmentTestsJava.java     |  1 +
 4 files changed, 126 insertions(+), 58 deletions(-)

diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index f39acca..92da787 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -1,11 +1,22 @@
 package nyc.c4q;
 
+
+import java.util.ArrayList;
+import java.util.Collection;
+
 /**
  * Created by amyquispe on 5/19/15.
  */
 public class ConcreteAwesomeClass extends AbstractAwesomeClass {
+
+
     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 be3791e..c74c402 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,62 +11,73 @@
 import android.widget.TextView;
 
 public class InitialActivity extends Activity {
+    Intent intent = new Intent(this, InitialActivity.class);
 
-  public int counter = 0;
-  public SharedPreferences preferences = null;
-  public final static String TAG = "C4QTAG";
+    public final static String TAG = "C4QTAG";
+    public int counter = 0;
+    public SharedPreferences preferences = null;
 
-  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) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_initial);
-    preferences = getPreferences(Context.MODE_PRIVATE);
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_initial);
+        preferences = getPreferences(Context.MODE_PRIVATE);
 
-    Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
-    Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
-    final TextView tvCounter = (TextView) findViewById(R.id.tvCounter);
+        Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
+        Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
+        Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity);
 
-    buttonPlus.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        counter++;
 
+        final TextView tvCounter = (TextView) findViewById(R.id.tvCounter);
 
-        tvCounter.setText(Integer.toString(counter));
 
-      }
-    });
+        buttonPlus.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                counter++;
+                tvCounter.setText(Integer.toString(counter));
 
+            }
+        });
 
-    buttonMinus.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        counter--;
+        buttonMinus.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                counter--;
+                tvCounter.setText(Integer.toString(counter));
+            }
+        });
 
+        buttonTileActivity.setOnClickListener(new View.OnClickListener() {
 
-        tvCounter.setText(Integer.toString(counter));
+            @Override
+            public void onClick(View v) {
 
-      }
-    });
+                startActivity(intent);
 
+            }
+        });
 
+    }
+    @Override
+    public void onSaveInstanceState(Bundle savedInstanceState) {
+        super.onSaveInstanceState(savedInstanceState);
+        savedInstanceState.putInt("counter", counter);
+        saveState();
+    }
 
-
-
-
-  }
 }
diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index babf89a..49adfea 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -1,34 +1,78 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_tile"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="nyc.c4q.TileActivity"
-    android:id="@+id/activity_tile"
-    >
+    android:orientation="horizontal">
 
     <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:id="@+id/leftSide"
-        android:orientation="vertical"
-        android:layout_weight="1">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/redView"
+            android:layout_weight="40"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:background="#ffff0000"
+
+            android:orientation="horizontal">
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/greenView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:background="#ff00ff00"
+            android:layout_weight="60"
+            android:orientation="horizontal">
+
+        </LinearLayout>
 
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:id="@+id/rightSide"
-        android:orientation="vertical"
-        android:layout_weight="1">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical">
 
-    </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:id="@+id/yellowView"
+            android:orientation="horizontal"
+            android:layout_weight="33"
+            android:background="#ffffff00">
 
+        </LinearLayout>
 
-    <TextView
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:text="TileActivity"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:id="@+id/whiteView"
+            android:orientation="horizontal"
+            android:layout_weight="44"
+            android:background="#ffffffff">
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:id="@+id/blueView"
+            android:orientation="horizontal"
+            android:layout_weight="22"
+            android:background="#ff0000ff">
+
+        </LinearLayout>
+
+    </LinearLayout>
 
 </LinearLayout>
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;