From ddc17e7fc46e3c81572d3f0f6301dde16822059c Mon Sep 17 00:00:00 2001
From: John Gomez <jgomez818@gmail.com>
Date: Tue, 19 May 2015 21:34:46 -0400
Subject: [PATCH 1/2] unit 1 assessment

---
 src/main/java/nyc/c4q/AwesomeContainer.java |  7 +++
 src/main/java/nyc/c4q/InitialActivity.java  | 29 ++++++++++
 src/main/java/nyc/c4q/SubFunClass.java      | 12 +++-
 src/main/res/layout/activity_initial.xml    | 61 +++++++++++++++++++--
 src/main/res/layout/activity_tile.xml       | 47 ++++++++++++++++
 5 files changed, 151 insertions(+), 5 deletions(-)

diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 64e9fd9..c8d158c 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.Objects;
 
 /**
  * Created by amyquispe on 5/19/15.
  */
 public class AwesomeContainer {
+
     public static Collection createAwesomeContainer(){
+
         return null;
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
+
+       Object awesomeObject = new Object();
+
+
         return;
     }
 }
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..e34e75a 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;
@@ -34,5 +35,33 @@ protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
+
+      saveState();
+      loadState();
+
+      Button tileActivityButton = (Button)findViewById(R.id.buttonTileActivity);
+      tileActivityButton.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+              Intent intent = new Intent(InitialActivity.this, TileActivity.class);
+              startActivity(intent);
+          }
+      });
+
   }
+    public void buttonPlus(View v){
+        TextView tvcounter = (TextView) findViewById(R.id.tvCounter);
+        counter = Integer.parseInt(tvcounter.getText().toString());
+                counter++;
+            tvcounter.setText(String.valueOf(counter));
+
+    }
+    public void buttonMinus(View v){
+        TextView tvcounter = (TextView) findViewById(R.id.tvCounter);
+        counter = Integer.parseInt(tvcounter.getText().toString());
+        counter--;
+        tvcounter.setText(String.valueOf(counter));
+
+    }
+
 }
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..80aa846 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..04c283b 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -9,10 +9,63 @@
     tools:context="nyc.c4q.InitialActivity"
     android:id="@+id/activity_initial">
 
-    <TextView
-        android:id="@+id/text"
+    <LinearLayout
+        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_height="0dp"
+        android:layout_weight="2"
+        tools:context="nyc.c4q.InitialActivity"
+        android:id="@+id/counterLayout">
+
+        <LinearLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:tools="http://schemas.android.com/tools"
+            android:orientation="vertical"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            tools:context="nyc.c4q.InitialActivity"
+            android:layout_weight="1"
+            android:id="@+id/counterButtonsLayout">
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:text="+"
+                android:onClick="buttonPlus"
+                android:id="@+id/buttonPlus"/>
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:onClick="buttonMinus"
+                android:text="-"
+                android:id="@+id/buttonMinus"/>
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="0"
+            android:id="@+id/tvCounter"
+            />
+
+    </LinearLayout>
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="TileActivity"
+        android:id="@+id/buttonTileActivity"/>
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="Empty"
+        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..4f87207 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -6,6 +6,53 @@
     tools:context="nyc.c4q.TileActivity"
     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"
+        >
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="40"
+            android:id="@+id/redView"
+            android:background="#ffff0000"/>
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="60"
+            android:id="@+id/greenView"
+            android:background="#ff00ff00"/>
+
+        </LinearLayout>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/rightSide"
+        android:orientation="vertical"
+        android:layout_weight="1">
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="33"
+            android:id="@+id/yellowView"
+            android:background="#ffffff00"/>
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="44"
+            android:background="#ffffffff"
+            android:id="@+id/whiteView"/>
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="22"
+            android:background="#ff0000ff"
+            android:id="@+id/blueView"/>
+
+        </LinearLayout>
 
     <TextView
         android:layout_height="match_parent"

From 559d788bf4bc4535be572251da08f72fac65d578 Mon Sep 17 00:00:00 2001
From: John Gomez <jgomez818@gmail.com>
Date: Tue, 26 May 2015 21:50:30 -0400
Subject: [PATCH 2/2] finished java

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    |  8 ++-
 src/main/java/nyc/c4q/AwesomeContainer.java   |  9 ++-
 .../java/nyc/c4q/ConcreteAwesomeClass.java    |  2 +
 src/main/java/nyc/c4q/InitialActivity.java    | 33 +++++----
 src/main/res/layout-land/activity_initial.xml | 71 +++++++++++++++++++
 src/main/res/layout/activity_tile.xml         |  4 --
 .../nyc/c4q/Unit1AssessmentTestsJava.java     |  1 +
 7 files changed, 106 insertions(+), 22 deletions(-)
 create mode 100644 src/main/res/layout-land/activity_initial.xml

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..348398d 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 {
-
+    int data;
     @Override
     public int getData() {
-        return 0;
+        return data;
     }
 
     @Override
     public void setData(int someData) {
-
+        data = someData;
     }
+
+
 }
diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index c8d158c..f697102 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -11,14 +11,17 @@
 public class AwesomeContainer {
 
     public static Collection createAwesomeContainer(){
-
-        return null;
+        ArrayList myList = new ArrayList();
+        addAwesomeObject(myList);
+        return myList;
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
 
-       Object awesomeObject = new Object();
+        ConcreteAwesomeClass awesomeStuff = new ConcreteAwesomeClass();
+
 
+        awesomeContainer.add(awesomeStuff);
 
         return;
     }
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index f39acca..0844e51 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -5,7 +5,9 @@
  */
 public class ConcreteAwesomeClass extends AbstractAwesomeClass {
     public ConcreteAwesomeClass(){
+        this.setData(4);
     }
     public ConcreteAwesomeClass(int startData){
     }
+
 }
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index e34e75a..b09387e 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -19,7 +19,7 @@ public class InitialActivity extends Activity {
   public void loadState(){
     Log.d(TAG, "loadState()");
     counter = preferences.getInt("counter", 0);
-    Log.d(TAG, "loadState(): counter=="+counter);
+    Log.d(TAG, "loadState(): counter==" + counter);
   }
 
   public void saveState(){
@@ -36,19 +36,21 @@ protected void onCreate(Bundle savedInstanceState) {
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
 
-      saveState();
-      loadState();
-
-      Button tileActivityButton = (Button)findViewById(R.id.buttonTileActivity);
-      tileActivityButton.setOnClickListener(new View.OnClickListener() {
-          @Override
-          public void onClick(View view) {
-              Intent intent = new Intent(InitialActivity.this, TileActivity.class);
-              startActivity(intent);
-          }
-      });
+      if (savedInstanceState != null) {
+          counter = savedInstanceState.getInt("counter", counter);
+      } else {
+          Button tileActivityButton = (Button) findViewById(R.id.buttonTileActivity);
+          tileActivityButton.setOnClickListener(new View.OnClickListener() {
+              @Override
+              public void onClick(View view) {
+                  Intent intent = new Intent(InitialActivity.this, TileActivity.class);
+                  startActivity(intent);
+              }
+          });
+      }
 
   }
+
     public void buttonPlus(View v){
         TextView tvcounter = (TextView) findViewById(R.id.tvCounter);
         counter = Integer.parseInt(tvcounter.getText().toString());
@@ -64,4 +66,11 @@ public void buttonMinus(View v){
 
     }
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        loadState();
+        saveState();
+        outState.putInt("counter", counter);
+    }
 }
diff --git a/src/main/res/layout-land/activity_initial.xml b/src/main/res/layout-land/activity_initial.xml
new file mode 100644
index 0000000..04c283b
--- /dev/null
+++ b/src/main/res/layout-land/activity_initial.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="nyc.c4q.InitialActivity"
+    android:id="@+id/activity_initial">
+
+    <LinearLayout
+        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="0dp"
+        android:layout_weight="2"
+        tools:context="nyc.c4q.InitialActivity"
+        android:id="@+id/counterLayout">
+
+        <LinearLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:tools="http://schemas.android.com/tools"
+            android:orientation="vertical"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            tools:context="nyc.c4q.InitialActivity"
+            android:layout_weight="1"
+            android:id="@+id/counterButtonsLayout">
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:text="+"
+                android:onClick="buttonPlus"
+                android:id="@+id/buttonPlus"/>
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:onClick="buttonMinus"
+                android:text="-"
+                android:id="@+id/buttonMinus"/>
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="0"
+            android:id="@+id/tvCounter"
+            />
+
+    </LinearLayout>
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="TileActivity"
+        android:id="@+id/buttonTileActivity"/>
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="Empty"
+        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 4f87207..d1f1837 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -54,9 +54,5 @@
 
         </LinearLayout>
 
-    <TextView
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:text="TileActivity"/>
 
 </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;