From e5c36b833d8f01e7cec7b5f1d68f97ae5f5f52b9 Mon Sep 17 00:00:00 2001
From: eboves <eboves@gmail.com>
Date: Tue, 19 May 2015 21:59:44 -0400
Subject: [PATCH 1/2] Did what I could

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    |  2 +-
 src/main/java/nyc/c4q/AwesomeContainer.java   |  7 ++
 src/main/java/nyc/c4q/InitialActivity.java    | 77 +++++++++++++------
 src/main/java/nyc/c4q/SubFunClass.java        | 12 ++-
 src/main/java/nyc/c4q/SuperFunClass.java      |  2 +-
 src/main/res/layout/activity_initial.xml      | 68 +++++++++++++---
 6 files changed, 130 insertions(+), 38 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..2b44884 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -7,11 +7,11 @@ public abstract class AbstractAwesomeClass implements AwesomeInterface {
 
     @Override
     public int getData() {
+
         return 0;
     }
 
     @Override
     public void setData(int someData) {
-
     }
 }
diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 64e9fd9..b73a4e0 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 
 /**
@@ -13,6 +14,12 @@ public static Collection createAwesomeContainer(){
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
+
         return;
     }
 }
+//Collection myList = AwesomeContainer.createAwesomeContainer();
+//assertEquals(myList.getClass(), List.class);
+//AwesomeContainer.addAwesomeObject(myList);
+//assertEquals(((List) myList).get(0).getClass(), AwesomeInterface.class);
+//assertEquals(myList.getClass(), List.class);
\ No newline at end of file
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..ce25f7c 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -7,32 +7,59 @@
 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 {
 
-  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);
+
+        Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
+        buttonPlus.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                int numb = 0;
+                numb += 1;
+                TextView textView = (TextView) findViewById(R.id.buttonPlus);
+                textView.setText(numb + "");
+            }
+        });
+
+        Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
+        buttonMinus.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                int numb = 0;
+                numb -= 1;
+                TextView textView = (TextView) findViewById(R.id.buttonMinus);
+                textView.setText(numb + "");
+            }
+        });
+
+
+    }
+
+}
\ 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..e5c24cd 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() {
+        setData(0);
+        return 0;
+    }
+
+    @Override
+    public void setData(int someData) {
+    }
 }
diff --git a/src/main/java/nyc/c4q/SuperFunClass.java b/src/main/java/nyc/c4q/SuperFunClass.java
index 78d8698..cc11585 100644
--- a/src/main/java/nyc/c4q/SuperFunClass.java
+++ b/src/main/java/nyc/c4q/SuperFunClass.java
@@ -3,7 +3,7 @@
 /**
  * Created by amyquispe on 5/19/15.
  */
-public class SuperFunClass {
+public class SuperFunClass  {
     private String name;
 
     public SuperFunClass(){
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..d86da4f 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -1,18 +1,66 @@
 <?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">
 
-    <TextView
-        android:id="@+id/text"
+    <LinearLayout
+        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"
+        android:orientation="horizontal">
+
+        <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="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="wrap_content"
+            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 a3a2b04f2a32d4d42a551a7d9d33d15bcfb11cf4 Mon Sep 17 00:00:00 2001
From: eboves <eboves@gmail.com>
Date: Tue, 26 May 2015 21:50:36 -0400
Subject: [PATCH 2/2] final update

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    |  3 +
 src/main/java/nyc/c4q/AwesomeContainer.java   |  4 ++
 src/main/java/nyc/c4q/InitialActivity.java    | 45 ++++++++++++---
 src/main/res/layout/activity_tile.xml         | 57 +++++++++++++++++--
 4 files changed, 97 insertions(+), 12 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index 2b44884..ef1613a 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -8,6 +8,9 @@ public abstract class AbstractAwesomeClass implements AwesomeInterface {
     @Override
     public int getData() {
 
+
+        setData(0);
+
         return 0;
     }
 
diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index b73a4e0..25d53d3 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -15,6 +15,10 @@ public static Collection createAwesomeContainer(){
 
     public static void addAwesomeObject(Collection awesomeContainer){
 
+
+
+
+
         return;
     }
 }
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index ce25f7c..7e25478 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;
@@ -40,10 +41,10 @@ protected void onCreate(Bundle savedInstanceState) {
         buttonPlus.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                int numb = 0;
-                numb += 1;
-                TextView textView = (TextView) findViewById(R.id.buttonPlus);
-                textView.setText(numb + "");
+                counter += 1;
+                TextView textView = (TextView) findViewById(R.id.tvCounter);
+                textView.setText(counter + "");
+
             }
         });
 
@@ -51,15 +52,43 @@ public void onClick(View view) {
         buttonMinus.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                counter -= 1;
+                TextView textView = (TextView) findViewById(R.id.tvCounter);
+                textView.setText(counter + "");
 
-                int numb = 0;
-                numb -= 1;
-                TextView textView = (TextView) findViewById(R.id.buttonMinus);
-                textView.setText(numb + "");
             }
         });
 
+        Button tileActivity = (Button) findViewById(R.id.buttonTileActivity);
+        tileActivity.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent (getApplicationContext(), TileActivity.class);
+                startActivity(intent);
+            }
+        });
+
+
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putString("saveState", preferences.toString());
 
     }
 
+    @Override
+    protected void onPause() {
+
+        super.onPause();
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        preferences.toString();
+    }
+
 }
\ 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..9f02566 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
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:text="TileActivity"/>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:id="@+id/leftSide"
+        android:layout_weight="1">
+
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="40"
+            android:id="@+id/redView"
+            android:background="#ff0000"/>
+
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="60"
+            android:id="@+id/greenView"
+            android:background="#00ff00"/>
+
+        </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="#ffff00"/>
+
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="44"
+            android:id="@+id/whiteView"
+            android:background="#ffffff"/>
+
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="22"
+            android:id="@+id/blueView"
+            android:background="#0000ff"/>
+
+    </LinearLayout>
 
 </LinearLayout>