From e5d40f94cadcc92c9cca4340cc8bcfde912c3ae9 Mon Sep 17 00:00:00 2001
From: RosmaryFC <Rosmaryfc@hotmail.com>
Date: Tue, 19 May 2015 20:43:31 -0400
Subject: [PATCH 1/4] Initial commit

---
 src/main/java/nyc/c4q/InitialActivity.java | 17 ++++++
 src/main/res/layout/activity_initial.xml   | 63 +++++++++++++++++++---
 2 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..b25646d 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -34,5 +34,22 @@ protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
+
+      final TextView tvCounter = (TextView) findViewById(R.id.tvCounter);
+
+      Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
+      buttonPlus.setOnClickListener(new View.OnClickListener() {
+
+          @Override
+          public void onClick(View view) {
+              int counterInt = Integer.parseInt(tvCounter.getText().toString());
+              counterInt += 1;
+              tvCounter.setText(Integer.toString(counterInt));
+          }
+      });
   }
 }
+
+//              for(int i = 1; i <10 ; i++){
+//
+//              }
\ No newline at end of file
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..bc8909e 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -4,15 +4,64 @@
     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">
+    tools:context="nyc.c4q.InitialActivity">
 
-    <TextView
-        android:id="@+id/text"
+    <LinearLayout
+        android:orientation="horizontal"
+        android:id="@+id/counterLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="InitialActivity"
-        />
+        android:layout_height="0dp"
+        android:layout_weight="2">
+
+        <LinearLayout
+            android:id="@+id/counterButtonsLayout"
+            android:orientation="vertical"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <Button
+                android:id="@+id/buttonPlus"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:text="+"/>
+
+            <Button
+                android:id="@+id/buttonMinus"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:text="-"/>
+
+
+            </LinearLayout>
+
+        <TextView
+            android:id="@+id/tvCounter"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="0"/>
+
+
+        </LinearLayout>
+
+    <Button
+        android:id="@+id/buttonTileActivity"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="TileActivity"/>
+
+    <Button
+        android:id="@+id/buttonEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="Empty"/>
+
 </LinearLayout>
\ No newline at end of file

From 955c078bab46467b197ff3a74095557736fb7fa4 Mon Sep 17 00:00:00 2001
From: RosmaryFC <Rosmaryfc@hotmail.com>
Date: Tue, 19 May 2015 21:58:00 -0400
Subject: [PATCH 2/4] handing in test

---
 src/main/java/nyc/c4q/InitialActivity.java | 40 +++++++++++++---
 src/main/java/nyc/c4q/SubFunClass.java     | 15 +++++-
 src/main/res/layout/activity_tile.xml      | 53 +++++++++++++++++++++-
 3 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index b25646d..9443163 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;
@@ -35,21 +36,46 @@ protected void onCreate(Bundle savedInstanceState) {
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
 
+      loadState();
+
       final TextView tvCounter = (TextView) findViewById(R.id.tvCounter);
 
       Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
       buttonPlus.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+//              int counterInt = Integer.parseInt(tvCounter.getText().toString());
+//              counterInt += 1;
+//              tvCounter.setText(Integer.toString(counterInt));
+
+              counter += 1;
+              tvCounter.setText(Integer.toString(counter));
+              saveState();
+          }
+      });
+
+      Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
+      buttonMinus.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+//              int counterInt = Integer.parseInt(tvCounter.getText().toString());
+//              counterInt -= 1;
+//              tvCounter.setText(Integer.toString(counterInt));
 
+              counter -= 1;
+              tvCounter.setText(Integer.toString(counter));
+              saveState();
+          }
+      });
+
+      Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity);
+      buttonTileActivity.setOnClickListener(new View.OnClickListener() {
           @Override
           public void onClick(View view) {
-              int counterInt = Integer.parseInt(tvCounter.getText().toString());
-              counterInt += 1;
-              tvCounter.setText(Integer.toString(counterInt));
+              Intent activityTile = new Intent(InitialActivity.this, TileActivity.class);
+              startActivity(activityTile);
           }
       });
+
   }
 }
-
-//              for(int i = 1; i <10 ; i++){
-//
-//              }
\ No newline at end of file
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..7a9afd5 100644
--- a/src/main/java/nyc/c4q/SubFunClass.java
+++ b/src/main/java/nyc/c4q/SubFunClass.java
@@ -3,7 +3,20 @@
 /**
  * Created by amyquispe on 5/19/15.
  */
-public class SubFunClass {
+public class SubFunClass extends SuperFunClass implements AwesomeInterface{
+    int Data;
+
     public SubFunClass(){
     }
+
+    @Override
+    public int getData() {
+
+        return this.Data;
+    }
+
+    @Override
+    public void setData(int someData) {
+        someData = this.Data;
+    }
 }
diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index 4e36a11..1cfd11f 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -4,12 +4,61 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="nyc.c4q.TileActivity"
+    android:orientation="horizontal"
     android:id="@+id/activity_tile"
     >
 
-    <TextView
+    <LinearLayout
+        android:id="@+id/leftSide"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_weight="1">
+
+        <View
+            android:id="@+id/redView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="40"
+            android:background="#ffff0000"/>
+
+        <View
+            android:id="@+id/greenView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="60"
+            android:background="#ff00ff00"/>
+
+        </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/rightSide"
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:text="TileActivity"/>
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+
+        <View
+            android:id="@+id/yellowView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="33"
+            android:background="#ffffff00"/>
+
+        <View
+            android:id="@+id/whiteView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="44"
+            android:background="#ffffffff"/>
+
+        <View
+            android:id="@+id/blueView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="22"
+            android:background="#ff0000ff"/>
+
+        </LinearLayout>
 
 </LinearLayout>

From bfbb3d9d46d63f888b30d870f43d65dae3af0675 Mon Sep 17 00:00:00 2001
From: RosmaryFC <Rosmaryfc@hotmail.com>
Date: Tue, 26 May 2015 21:16:18 -0400
Subject: [PATCH 3/4] answered java test 03

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    |  4 +++-
 src/main/java/nyc/c4q/AwesomeContainer.java   |  6 ++---
 .../java/nyc/c4q/ConcreteAwesomeClass.java    |  3 +++
 src/main/java/nyc/c4q/InitialActivity.java    | 24 +++++++------------
 .../nyc/c4q/Unit1AssessmentTestsJava.java     |  8 +++----
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..cd73fa4 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 {
+    public int someData = 4;
 
     @Override
     public int getData() {
-        return 0;
+        return this.someData;
     }
 
     @Override
     public void setData(int someData) {
+        this.someData = someData;
 
     }
 }
diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 64e9fd9..1a41e08 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -1,15 +1,15 @@
 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 awesomeContainer;
+
     public static Collection createAwesomeContainer(){
-        return null;
+        return awesomeContainer;
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index f39acca..7953f14 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -4,8 +4,11 @@
  * Created by amyquispe on 5/19/15.
  */
 public class ConcreteAwesomeClass extends AbstractAwesomeClass {
+    public int startData;
+
     public ConcreteAwesomeClass(){
     }
     public ConcreteAwesomeClass(int startData){
+        this.startData = startData;
     }
 }
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 9443163..b9b187d 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -36,36 +36,27 @@ protected void onCreate(Bundle savedInstanceState) {
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
 
-      loadState();
+    final TextView tvCounter = (TextView) findViewById(R.id.tvCounter);
 
-      final TextView tvCounter = (TextView) findViewById(R.id.tvCounter);
 
-      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) {
-//              int counterInt = Integer.parseInt(tvCounter.getText().toString());
-//              counterInt += 1;
-//              tvCounter.setText(Integer.toString(counterInt));
 
               counter += 1;
               tvCounter.setText(Integer.toString(counter));
-              saveState();
           }
       });
 
-      Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
-      buttonMinus.setOnClickListener(new View.OnClickListener() {
+    Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
+    buttonMinus.setOnClickListener(new View.OnClickListener() {
           @Override
           public void onClick(View view) {
-//              int counterInt = Integer.parseInt(tvCounter.getText().toString());
-//              counterInt -= 1;
-//              tvCounter.setText(Integer.toString(counterInt));
 
               counter -= 1;
               tvCounter.setText(Integer.toString(counter));
-              saveState();
-          }
+        }
       });
 
       Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity);
@@ -77,5 +68,8 @@ public void onClick(View view) {
           }
       });
 
+
   }
+
+
 }
diff --git a/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
index a965446..0a297c2 100644
--- a/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
+++ b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
@@ -26,13 +26,13 @@ public void test01SubFunClassInheritsFromSuperFunClass() throws Exception {
     }
 
     @Test
-    public void test02SubFunClassImplementsAwesomeInterface() throws Exception{
+    public void test02SubFunClassImplementsAwesomeInterface() throws Exception {
         SubFunClass funObject = new SubFunClass();
         assertThat(funObject, instanceOf(AwesomeInterface.class));
     }
 
-   @Test
-    public void test03AbstractAwesomeClassImplementsAwesomeInterface() throws Exception{
+    @Test
+    public void test03AbstractAwesomeClassImplementsAwesomeInterface() throws Exception {
         AbstractAwesomeClass awesomeObject = new ConcreteAwesomeClass();
         assertEquals(awesomeObject.getData(), 4);
         awesomeObject.setData(5);
@@ -40,7 +40,7 @@ public void test03AbstractAwesomeClassImplementsAwesomeInterface() throws Except
     }
 
     @Test
-    public void test04AwesomeContainerContainsAwesomeObject() throws Exception{
+    public void test04AwesomeContainerContainsAwesomeObject() throws Exception {
         Collection myList = AwesomeContainer.createAwesomeContainer();
         assertEquals(myList.getClass(), List.class);
         AwesomeContainer.addAwesomeObject(myList);

From a18ccbcfcd811e43634241175d2e681bc8ae4129 Mon Sep 17 00:00:00 2001
From: RosmaryFC <Rosmaryfc@hotmail.com>
Date: Tue, 26 May 2015 21:45:21 -0400
Subject: [PATCH 4/4] completed android test 05

---
 src/main/java/nyc/c4q/InitialActivity.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index b9b187d..ad25a54 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -36,8 +36,13 @@ protected void onCreate(Bundle savedInstanceState) {
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
 
+      loadState();
+
+
     final TextView tvCounter = (TextView) findViewById(R.id.tvCounter);
 
+      tvCounter.setText(Integer.toString(counter));
+
 
     Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
     buttonPlus.setOnClickListener(new View.OnClickListener() {
@@ -71,5 +76,9 @@ public void onClick(View view) {
 
   }
 
-
+    @Override
+    protected void onDestroy() {
+        saveState();
+        super.onDestroy();
+    }
 }