From 0dec2635472c991d3fea98641264e60ad390b47c Mon Sep 17 00:00:00 2001
From: Yuliya-Kaleda <yulia.koleda1988@gmail.com>
Date: Tue, 19 May 2015 21:59:21 -0400
Subject: [PATCH 1/3] initial commit

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    |  7 ++-
 src/main/java/nyc/c4q/AwesomeContainer.java   | 12 +++-
 .../java/nyc/c4q/ConcreteAwesomeClass.java    |  1 +
 src/main/java/nyc/c4q/InitialActivity.java    | 51 ++++++++++++++++
 src/main/java/nyc/c4q/SubFunClass.java        | 14 ++++-
 src/main/res/layout/activity_initial.xml      | 58 +++++++++++++++++--
 src/main/res/layout/activity_tile.xml         | 56 +++++++++++++++++-
 7 files changed, 185 insertions(+), 14 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..f47c2dc 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -5,13 +5,16 @@
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
 
+    int data = 4;
+    int someData = 5;
+
     @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 64e9fd9..228acdc 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -8,11 +8,17 @@
  * Created by amyquispe on 5/19/15.
  */
 public class AwesomeContainer {
-    public static Collection createAwesomeContainer(){
-        return null;
+
+    private static Collection col;
+
+    public static Collection createAwesomeContainer() {
+
+        col = new ArrayList();
+
+        return col;
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
-        return;
+        awesomeContainer.add(col.getClass());
     }
 }
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index f39acca..1134012 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -4,6 +4,7 @@
  * 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 2213b83..a047111 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -2,11 +2,13 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 public class InitialActivity extends Activity {
@@ -14,6 +16,9 @@ public class InitialActivity extends Activity {
   public int counter = 0;
   public SharedPreferences preferences = null;
   public final static String TAG = "C4QTAG";
+  public TextView tvCounter;
+
+    private static final String COUNTER_KEY = "counter";
 
   public void loadState(){
     Log.d(TAG, "loadState()");
@@ -34,5 +39,51 @@ protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
+
+      LinearLayout layout = (LinearLayout) findViewById(R.id.activity_initial);
+
+      tvCounter = (TextView) findViewById(R.id.tvCounter);
+
+      Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
+      buttonPlus.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+              counter++;
+              tvCounter.setText("" + counter);
+              Log.d("C4QTAG", "onCreate().buttonPlus.inside: " + counter);
+          }
+      });
+
+      Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
+      buttonMinus.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+              counter--;
+              tvCounter.setText("" + counter);
+              Log.d("C4QTAG", "onCreate().buttonMinus.inside: " + counter);
+          }
+      });
+
+      Log.d("C4QTAG", "onCreate().outside: " + counter);
+
+      Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity);
+      buttonTileActivity.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_KEY);
+          tvCounter.setText("" + counter);
+      }
   }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(COUNTER_KEY, counter);
+    }
 }
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..06eb5c5 100644
--- a/src/main/java/nyc/c4q/SubFunClass.java
+++ b/src/main/java/nyc/c4q/SubFunClass.java
@@ -3,7 +3,19 @@
 /**
  * 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 data;
+    }
+
+    @Override
+    public void setData(int someData) {
+        data = someData;
+    }
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..9a75b1c 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -7,12 +7,60 @@
     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"
+    >
+
+    <LinearLayout
+        android:id="@+id/counterLayout"
+        android:layout_weight='2'
+        android:layout_width="wrap_content"
+        android:layout_height='0dp'
+        android:orientation="horizontal">
+
+     <LinearLayout
+         android:id="@+id/counterButtonsLayout"
+         android:orientation="vertical"
+         android:layout_weight='1'
+         android:layout_width='0dp'
+         android:layout_height="match_parent">
+
+    <Button
+        android:id="@+id/buttonPlus"
+        android:layout_width="wrap_content"
+        android:layout_height='0dp'
+        android:layout_weight='1'
+        android:text="+"/>
+
+    <Button
+        android:id="@+id/buttonMinus"
+        android:layout_width="wrap_content"
+        android:layout_height='0dp'
+        android:layout_weight='1'
+        android:text="-"/>
+     </LinearLayout>
+
 
     <TextView
-        android:id="@+id/text"
-        android:layout_width="match_parent"
+        android:id="@+id/tvCounter"
+        android:layout_width='0dp'
         android:layout_height="match_parent"
-        android:text="InitialActivity"
-        />
+        android:layout_weight='1'
+        android:text="0" />
+    </LinearLayout>
+
+
+    <Button
+        android:id="@+id/buttonTileActivity"
+        android:layout_weight='1'
+        android:layout_width="match_parent"
+        android:layout_height='0dp'
+        android:text="TileActivity" />
+
+    <Button
+        android:id="@+id/buttonEmpty"
+        android:layout_weight='1'
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:text="Empty" />
+
 </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..9256745 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -5,11 +5,61 @@
     android:layout_height="match_parent"
     tools:context="nyc.c4q.TileActivity"
     android:id="@+id/activity_tile"
-    >
+    android:orientation="horizontal">
 
-    <TextView
+
+    <LinearLayout
+        android:id="@+id/leftSide"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:orientation="vertical"
+        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:layout_width="match_parent"
-        android:text="TileActivity"/>
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        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 f5a7880da204f32119e506aa04f120779ae2508c Mon Sep 17 00:00:00 2001
From: Yuliya-Kaleda <yulia.koleda1988@gmail.com>
Date: Tue, 26 May 2015 19:20:24 -0400
Subject: [PATCH 2/3] pull down new version of the test

---
 src/main/java/nyc/c4q/AwesomeContainer.java |   2 +-
 src/main/java/nyc/c4q/InitialActivity.java  | 149 +++++++++++---------
 src/main/res/layout/activity_initial.xml    |  69 ++++-----
 3 files changed, 118 insertions(+), 102 deletions(-)

diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 228acdc..199a71f 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -15,7 +15,7 @@ public static Collection createAwesomeContainer() {
 
         col = new ArrayList();
 
-        return col;
+        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 a047111..2cb17e6 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -13,77 +13,92 @@
 
 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;
 
     private static final String COUNTER_KEY = "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();
-  }
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_initial);
-    preferences = getPreferences(Context.MODE_PRIVATE);
-
-      LinearLayout layout = (LinearLayout) findViewById(R.id.activity_initial);
-
-      tvCounter = (TextView) findViewById(R.id.tvCounter);
-
-      Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
-      buttonPlus.setOnClickListener(new View.OnClickListener() {
-          @Override
-          public void onClick(View view) {
-              counter++;
-              tvCounter.setText("" + counter);
-              Log.d("C4QTAG", "onCreate().buttonPlus.inside: " + counter);
-          }
-      });
-
-      Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
-      buttonMinus.setOnClickListener(new View.OnClickListener() {
-          @Override
-          public void onClick(View view) {
-              counter--;
-              tvCounter.setText("" + counter);
-              Log.d("C4QTAG", "onCreate().buttonMinus.inside: " + counter);
-          }
-      });
-
-      Log.d("C4QTAG", "onCreate().outside: " + counter);
-
-      Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity);
-      buttonTileActivity.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_KEY);
-          tvCounter.setText("" + 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();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_initial);
+        preferences = getPreferences(Context.MODE_PRIVATE);
+
+
+        LinearLayout layout = (LinearLayout) findViewById(R.id.activity_initial);
+
+        tvCounter = (TextView) findViewById(R.id.tvCounter);
+        loadState();
+        tvCounter.setText("" + counter);
+
+        Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
+        buttonPlus.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                counter++;
+                tvCounter.setText("" + counter);
+                Log.d("C4QTAG", "onCreate().buttonPlus.inside: " + counter);
+            }
+        });
+
+        Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
+        buttonMinus.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                counter--;
+                tvCounter.setText("" + counter);
+                Log.d("C4QTAG", "onCreate().buttonMinus.inside: " + counter);
+            }
+        });
+
+        Log.d("C4QTAG", "onCreate().outside: " + counter);
+
+        Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity);
+        buttonTileActivity.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(InitialActivity.this, TileActivity.class);
+                startActivity(intent);
+            }
+        });
+
+
+//      Log.d(TAG, "onCreate() -- savedInstanceState="+savedInstanceState);
+//      if(savedInstanceState!=null) {
+//          counter = savedInstanceState.getInt(COUNTER_KEY);
+//          Log.d(TAG, "onCreate() -- restoring counter, counter="+counter);
+//          tvCounter.setText("" + counter);
+//      }
+    }
+
+//    @Override
+//    protected void onSaveInstanceState(Bundle outState) {
+//        Log.d(TAG, "onSaveInstanceState(), counter="+counter);
+//        Log.d(TAG, "onSaveInstanceState(), before, outState="+outState);
+//        super.onSaveInstanceState(outState);
+//        outState.putInt(COUNTER_KEY, counter);
+//        Log.d(TAG, "onSaveInstanceState(), after, outState="+outState);
+//    }
 
     @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(COUNTER_KEY, counter);
+    protected void onPause() {
+        super.onPause();
+        saveState();
     }
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 9a75b1c..14bad0f 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -1,66 +1,67 @@
 <?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"
-    >
+    android:orientation="vertical"
+    tools:context="nyc.c4q.InitialActivity">
 
     <LinearLayout
         android:id="@+id/counterLayout"
-        android:layout_weight='2'
         android:layout_width="wrap_content"
         android:layout_height='0dp'
+        android:layout_weight='2'
         android:orientation="horizontal">
 
-     <LinearLayout
-         android:id="@+id/counterButtonsLayout"
-         android:orientation="vertical"
-         android:layout_weight='1'
-         android:layout_width='0dp'
-         android:layout_height="match_parent">
+        <LinearLayout
+            android:id="@+id/counterButtonsLayout"
+            android:layout_width='0dp'
+            android:layout_height="match_parent"
+            android:layout_weight='1'
+            android:orientation="vertical">
 
-    <Button
-        android:id="@+id/buttonPlus"
-        android:layout_width="wrap_content"
-        android:layout_height='0dp'
-        android:layout_weight='1'
-        android:text="+"/>
+            <Button
+                android:id="@+id/buttonPlus"
+                android:layout_width="wrap_content"
+                android:layout_height='0dp'
+                android:layout_weight='1'
+                android:text="+"
+                android:textSize="60sp" />
 
-    <Button
-        android:id="@+id/buttonMinus"
-        android:layout_width="wrap_content"
-        android:layout_height='0dp'
-        android:layout_weight='1'
-        android:text="-"/>
-     </LinearLayout>
+            <Button
+                android:id="@+id/buttonMinus"
+                android:layout_width="wrap_content"
+                android:layout_height='0dp'
+                android:layout_weight='1'
+                android:text="-"
+                android:textSize="60sp" />
+        </LinearLayout>
 
 
-    <TextView
-        android:id="@+id/tvCounter"
-        android:layout_width='0dp'
-        android:layout_height="match_parent"
-        android:layout_weight='1'
-        android:text="0" />
+        <TextView
+            android:id="@+id/tvCounter"
+            android:layout_width='0dp'
+            android:layout_height="match_parent"
+            android:layout_weight='1'
+            android:text="0"
+            android:textSize="60sp" />
     </LinearLayout>
 
 
     <Button
         android:id="@+id/buttonTileActivity"
-        android:layout_weight='1'
         android:layout_width="match_parent"
         android:layout_height='0dp'
+        android:layout_weight='1'
         android:text="TileActivity" />
 
     <Button
         android:id="@+id/buttonEmpty"
-        android:layout_weight='1'
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_weight='1'
         android:text="Empty" />
 
 </LinearLayout>
\ No newline at end of file

From 2accda21d670ce7b4261dc6c7bb98b45cec9f9df Mon Sep 17 00:00:00 2001
From: Yuliya-Kaleda <yulia.koleda1988@gmail.com>
Date: Tue, 26 May 2015 20:35:57 -0400
Subject: [PATCH 3/3] finished all the tests of the assignment

---
 src/main/java/nyc/c4q/AwesomeContainer.java         | 11 +++++++----
 src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 199a71f..3d47015 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -3,22 +3,25 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * Created by amyquispe on 5/19/15.
  */
 public class AwesomeContainer {
 
-    private static Collection col;
+   private static ArrayList myList;
 
     public static Collection createAwesomeContainer() {
 
-        col = new ArrayList();
+        myList = new ArrayList();
 
-        return null;
+        return myList;
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
-        awesomeContainer.add(col.getClass());
+        ConcreteAwesomeClass cc = new ConcreteAwesomeClass();
+        myList.add(cc);
     }
 }
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;