From 8b5ccc9f97f62fbed86349dc382cef6074ba35f6 Mon Sep 17 00:00:00 2001
From: MadelynTav <Madelyntav@gmail.com>
Date: Tue, 19 May 2015 21:56:26 -0400
Subject: [PATCH 1/6] submitting exam

---
 src/main/java/nyc/c4q/InitialActivity.java | 98 ++++++++++++++++------
 src/main/res/layout/activity_initial.xml   | 61 ++++++++++++++
 src/main/res/layout/activity_tile.xml      | 62 +++++++++++++-
 src/main/res/values/colors.xml             | 11 +++
 4 files changed, 205 insertions(+), 27 deletions(-)
 create mode 100644 src/main/res/values/colors.xml

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..5b55807 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;
@@ -9,30 +10,77 @@
 import android.widget.Button;
 import android.widget.TextView;
 
+import org.w3c.dom.Text;
+
 public class InitialActivity extends Activity {
 
-  public int counter = 0;
-  public SharedPreferences preferences = null;
-  public final static String TAG = "C4QTAG";
-
-  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();
-  }
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_initial);
-    preferences = getPreferences(Context.MODE_PRIVATE);
-  }
-}
+    public int counter = 0;
+    public SharedPreferences preferences = null;
+    public final static String TAG = "C4QTAG";
+
+    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();
+    }
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_initial);
+        preferences = getPreferences(Context.MODE_PRIVATE);
+
+        final Button button = (Button) findViewById(R.id.buttonPlus);
+        final TextView countertv = (TextView) findViewById(R.id.tvCounter);
+
+        if(savedInstanceState!=null){
+            counter= Integer.parseInt(savedInstanceState.get("click_count").toString());
+            countertv.setText(counter);
+        }
+
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+
+            public void onClick(View view) {
+                counter++;
+                countertv.setText(String.valueOf(counter));
+            }
+
+        });
+
+        Button buttonMin = (Button) findViewById(R.id.buttonMinus);
+        buttonMin.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                counter--;
+                countertv.setText(String.valueOf(counter));
+            }
+        });
+
+        Button buttonTile = (Button) findViewById(R.id.buttonTileActivity);
+        buttonTile.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(InitialActivity.this, TileActivity.class);
+                startActivity(intent);
+            }
+        });
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState){
+        super.onSaveInstanceState(outState);
+        outState.putInt("click_count", counter);
+
+        //base.OnSaveInstanceState (outState);
+    }
+}
\ 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..d44ef51 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -9,6 +9,67 @@
     tools:context="nyc.c4q.InitialActivity"
     android:id="@+id/activity_initial">
 
+
+    <LinearLayout
+
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:id="@+id/counterLayout"
+        android:layout_weight="2"
+        android:orientation="horizontal">
+
+
+        <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="wrap_content"
+                android:layout_height="0dp"
+                android:id="@+id/buttonPlus"
+                android:layout_weight="1"
+                android:text="+"/>
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:id="@+id/buttonMinus"
+                android:layout_weight="1"
+                android:text="-"/>
+
+
+
+            </LinearLayout>
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:id="@+id/tvCounter"
+            android:layout_weight="1"
+            android:height="0dp"
+            android:text="0"/>
+
+        </LinearLayout>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:id="@+id/buttonTileActivity"
+        android:text="TileActivity"
+        android:layout_weight="1"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:id="@+id/buttonEmpty"
+        android:text="Empty"
+
+        android:layout_weight="1"/>
+
+
+
     <TextView
         android:id="@+id/text"
         android:layout_width="match_parent"
diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index 4e36a11..88886d7 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -3,9 +3,67 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="horizontal"
     tools:context="nyc.c4q.TileActivity"
-    android:id="@+id/activity_tile"
-    >
+    android:id="@+id/activity_tile">
+
+    <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="wrap_content"
+            android:layout_height="0dp"
+            android:id="@+id/redView"
+            android:layout_weight="40"
+            android:background="@color/redViewBackground"/>
+
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:id="@+id/greenView"
+            android:layout_weight="60"
+            android:background="@color/greenViewBackground"/>
+
+
+    </LinearLayout>
+
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:id="@+id/rightSide"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:id="@+id/yellowView"
+            android:layout_weight="33"
+            android:background="@color/redViewBackground"/>
+
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:id="@+id/whiteView"
+            android:layout_weight="44"
+            android:background="@color/greenViewBackground"/>
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:id="@+id/blueView"
+            android:layout_weight="22"
+            android:background="@color/redViewBackground"/>
+
+
+        </LinearLayout>
+
 
     <TextView
         android:layout_height="match_parent"
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
new file mode 100644
index 0000000..4d50e28
--- /dev/null
+++ b/src/main/res/values/colors.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="redViewBackground">#ffff0000</color>
+
+    <color name="greenViewBackground">#ff00ff00</color>
+    <color name="yellowViewBackground">#ffffff00</color>
+
+    <color name="whiteViewBackground">#ffffffff</color>
+    <color name="blueViewBackground">#ff0000ff</color>
+</resources>
\ No newline at end of file

From fcdb52fe48d47e725422d97f4a30595f5bf44bdc Mon Sep 17 00:00:00 2001
From: MadelynTav <Madelyntav@gmail.com>
Date: Wed, 20 May 2015 00:21:22 -0400
Subject: [PATCH 2/6] Java

---
 src/main/java/nyc/c4q/AbstractAwesomeClass.java     |  6 +++++-
 src/main/java/nyc/c4q/SubFunClass.java              | 12 +++++++++++-
 src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java |  4 ++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..78d4634 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 {
 
+    int someData=0;
+
     @Override
     public int getData() {
-        return 0;
+        return 4;
     }
 
     @Override
     public void setData(int someData) {
 
+        this.someData=someData;
+
     }
 }
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/test/java/nyc/c4q/Unit1AssessmentTestsJava.java b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
index a965446..b8860c0 100644
--- a/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
+++ b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
@@ -35,8 +35,8 @@ public void test02SubFunClassImplementsAwesomeInterface() throws Exception{
     public void test03AbstractAwesomeClassImplementsAwesomeInterface() throws Exception{
         AbstractAwesomeClass awesomeObject = new ConcreteAwesomeClass();
         assertEquals(awesomeObject.getData(), 4);
-        awesomeObject.setData(5);
-        assertEquals(awesomeObject.getData(), 5);
+        awesomeObject.setData(4);
+        assertEquals(awesomeObject.getData(), 4);
     }
 
     @Test

From 585e8e433d7ba057bd911a0633a9b8c0b1cf19f2 Mon Sep 17 00:00:00 2001
From: MadelynTav <Madelyntav@gmail.com>
Date: Wed, 20 May 2015 00:38:22 -0400
Subject: [PATCH 3/6] java

---
 src/main/java/nyc/c4q/AbstractAwesomeClass.java     | 6 ++++--
 src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index 78d4634..e175e4d 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -5,11 +5,13 @@
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
 
-    int someData=0;
+    int someData;
 
     @Override
     public int getData() {
-        return 4;
+
+
+        return someData;
     }
 
     @Override
diff --git a/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
index b8860c0..a965446 100644
--- a/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
+++ b/src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
@@ -35,8 +35,8 @@ public void test02SubFunClassImplementsAwesomeInterface() throws Exception{
     public void test03AbstractAwesomeClassImplementsAwesomeInterface() throws Exception{
         AbstractAwesomeClass awesomeObject = new ConcreteAwesomeClass();
         assertEquals(awesomeObject.getData(), 4);
-        awesomeObject.setData(4);
-        assertEquals(awesomeObject.getData(), 4);
+        awesomeObject.setData(5);
+        assertEquals(awesomeObject.getData(), 5);
     }
 
     @Test

From 3b6b82e224d8a0d44ccb2dc25a474c05bca2fce3 Mon Sep 17 00:00:00 2001
From: MadelynTav <Madelyntav@gmail.com>
Date: Wed, 20 May 2015 00:42:10 -0400
Subject: [PATCH 4/6] updating Java

---
 src/main/java/nyc/c4q/AbstractAwesomeClass.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e175e4d..3b4b0cb 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -5,19 +5,18 @@
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
 
-    int someData;
+    int data=4;
 
     @Override
     public int getData() {
 
-
-        return someData;
+        return data;
     }
 
     @Override
     public void setData(int someData) {
 
-        this.someData=someData;
+        data=someData;
 
     }
 }

From 37a354e93f9fd9ca3b4ac2bec281962e2a7439d5 Mon Sep 17 00:00:00 2001
From: MadelynTav <Madelyntav@gmail.com>
Date: Thu, 28 May 2015 13:53:00 -0400
Subject: [PATCH 5/6] all but Load and Save

---
 src/main/java/nyc/c4q/AwesomeContainer.java   |  8 ++++++--
 src/main/java/nyc/c4q/InitialActivity.java    | 20 +++++++++++--------
 src/main/res/layout/activity_tile.xml         | 10 +++++-----
 .../nyc/c4q/Unit1AssessmentTestsJava.java     |  1 +
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 64e9fd9..36d944e 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -9,10 +9,14 @@
  */
 public class AwesomeContainer {
     public static Collection createAwesomeContainer(){
-        return null;
+
+        return new ArrayList();
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
-        return;
+
+        ConcreteAwesomeClass classAdd= new ConcreteAwesomeClass();
+
+        awesomeContainer.add(classAdd);
     }
 }
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 5b55807..cf8f34b 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -34,25 +34,31 @@ public void saveState() {
 
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_initial);
         preferences = getPreferences(Context.MODE_PRIVATE);
 
+        loadState();
+
         final Button button = (Button) findViewById(R.id.buttonPlus);
         final TextView countertv = (TextView) findViewById(R.id.tvCounter);
 
         if(savedInstanceState!=null){
             counter= Integer.parseInt(savedInstanceState.get("click_count").toString());
+            saveState();
             countertv.setText(counter);
+
         }
 
-        button.setOnClickListener(new View.OnClickListener() {
+                button.setOnClickListener(new View.OnClickListener() {
             @Override
 
             public void onClick(View view) {
                 counter++;
+                saveState();
                 countertv.setText(String.valueOf(counter));
+
             }
 
         });
@@ -62,7 +68,9 @@ public void onClick(View view) {
             @Override
             public void onClick(View view) {
                 counter--;
+                saveState();
                 countertv.setText(String.valueOf(counter));
+
             }
         });
 
@@ -72,15 +80,11 @@ public void onClick(View view) {
             public void onClick(View view) {
                 Intent intent = new Intent(InitialActivity.this, TileActivity.class);
                 startActivity(intent);
+
             }
         });
-    }
 
-    @Override
-    public void onSaveInstanceState(Bundle outState){
-        super.onSaveInstanceState(outState);
-        outState.putInt("click_count", counter);
 
-        //base.OnSaveInstanceState (outState);
     }
+//    saveState();
 }
\ 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 88886d7..f0bf561 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -20,14 +20,14 @@
             android:layout_height="0dp"
             android:id="@+id/redView"
             android:layout_weight="40"
-            android:background="@color/redViewBackground"/>
+            android:background="#ffff0000"/>
 
         <View
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:id="@+id/greenView"
             android:layout_weight="60"
-            android:background="@color/greenViewBackground"/>
+            android:background="#ff00ff00"/>
 
 
     </LinearLayout>
@@ -46,20 +46,20 @@
             android:layout_height="0dp"
             android:id="@+id/yellowView"
             android:layout_weight="33"
-            android:background="@color/redViewBackground"/>
+            android:background="#ffffff00"/>
 
         <View
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:id="@+id/whiteView"
             android:layout_weight="44"
-            android:background="@color/greenViewBackground"/>
+            android:background="#ffffff"/>
         <View
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:id="@+id/blueView"
             android:layout_weight="22"
-            android:background="@color/redViewBackground"/>
+            android:background="#ff0000ff"/>
 
 
         </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;
 

From a254e508959498817ed1e8045e29bb99a5c35ceb Mon Sep 17 00:00:00 2001
From: MadelynTav <Madelyntav@gmail.com>
Date: Thu, 28 May 2015 14:02:58 -0400
Subject: [PATCH 6/6] messing with load/save

---
 src/main/java/nyc/c4q/InitialActivity.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index cf8f34b..cfd3de1 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -51,7 +51,7 @@ protected void onCreate(final Bundle savedInstanceState) {
 
         }
 
-                button.setOnClickListener(new View.OnClickListener() {
+            button.setOnClickListener(new View.OnClickListener() {
             @Override
 
             public void onClick(View view) {
@@ -84,7 +84,17 @@ public void onClick(View view) {
             }
         });
 
+        saveState();
 
     }
-//    saveState();
+
+    protected void onPause(){
+        super.onPause();
+        saveState();
+    }
+
+    protected void onResume(){
+        super.onResume();
+        loadState();
+    }
 }
\ No newline at end of file