From 518c9c3e367bed2c84d1f3a01044d94e98c1bd54 Mon Sep 17 00:00:00 2001
From: tashsmit <tashsmit91@yahoo.com>
Date: Tue, 19 May 2015 20:42:02 -0400
Subject: [PATCH 1/4] what i have so far 8:42

---
 src/main/java/nyc/c4q/InitialActivity.java | 23 ++++++++
 src/main/res/layout/activity_initial.xml   | 66 +++++++++++++++++++++-
 2 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..25cadce 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -9,7 +9,10 @@
 import android.widget.Button;
 import android.widget.TextView;
 
+import org.w3c.dom.Text;
+
 public class InitialActivity extends Activity {
+  int numCounter = 0;
 
   public int counter = 0;
   public SharedPreferences preferences = null;
@@ -19,6 +22,25 @@ public void loadState(){
     Log.d(TAG, "loadState()");
     counter = preferences.getInt("counter", 0);
     Log.d(TAG, "loadState(): counter=="+counter);
+
+
+      Button plus = (Button) findViewById(R.id.buttonPlus);
+      plus.setOnClickListener(new View.OnClickListener() {
+          public void onClick(View v) {
+              numCounter++;
+              TextView counter = (TextView) findViewById(R.id.tvCounter);
+              counter.setText(Integer.toString(numCounter));
+          }
+      });
+
+      Button minus = (Button) findViewById(R.id.buttonMinus);
+      plus.setOnClickListener(new View.OnClickListener() {
+          public void onClick(View v) {
+              numCounter--;
+              TextView counter = (TextView) findViewById(R.id.tvCounter);
+              counter.setText(Integer.toString(numCounter));
+          }
+      });
   }
 
   public void saveState(){
@@ -35,4 +57,5 @@ protected void onCreate(Bundle savedInstanceState) {
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
   }
+
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..7571f6b 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -3,11 +3,70 @@
 <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">
+    android:id="@+id/activity_initial"
+    android:orientation="horizontal">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:id="@+id/counterLayout"
+        android:orientation="horizontal"
+        android:layout_weight="2">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:id="@+id/counterButtonsLayout"
+            android:orientation="vertical"
+            android:layout_weight="1">
+
+            <Button
+                android:layout_width="fill_parent"
+                android:layout_height="0dp"
+                android:id="@+id/buttonPlus"
+                android:text="+"
+                android:layout_weight="1"
+                />
+
+            <Button
+                android:layout_width="fill_parent"
+                android:layout_height="0dp"
+                android:id="@+id/buttonMinus"
+                android:text="-"
+                android:layout_weight="1"
+                />
+
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tvCounter"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:text="0"
+            android:layout_weight="1"
+            />
+
+        </LinearLayout>
+
+
+    <Button
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:id="@+id/buttonTileActivity"
+        android:text="TileActivity"
+        android:layout_weight="1"/>
+
+    <Button
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:id="@+id/buttonEmpty"
+        android:text="Empty"
+        android:layout_weight="1"/>
+
 
     <TextView
         android:id="@+id/text"
@@ -15,4 +74,7 @@
         android:layout_height="match_parent"
         android:text="InitialActivity"
         />
+
+
+
 </LinearLayout>
\ No newline at end of file

From b2b924bd759beccb92c9e65a39f856f4b597162b Mon Sep 17 00:00:00 2001
From: tashsmit <tashsmit91@yahoo.com>
Date: Tue, 19 May 2015 21:23:26 -0400
Subject: [PATCH 2/4] what i have so far 9:23

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    | 10 +-
 src/main/java/nyc/c4q/AwesomeContainer.java   |  1 +
 .../java/nyc/c4q/ConcreteAwesomeClass.java    |  5 +
 src/main/java/nyc/c4q/InitialActivity.java    | 92 ++++++++++---------
 src/main/java/nyc/c4q/SubFunClass.java        | 18 +++-
 src/main/res/layout/activity_initial.xml      | 21 ++---
 6 files changed, 85 insertions(+), 62 deletions(-)

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..5872701 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -5,13 +5,21 @@
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
 
+    int data = 4;
+
+    public AbstractAwesomeClass() {
+        super();
+    }
+
     @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..e2f95b7 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 
 /**
  * Created by amyquispe on 5/19/15.
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index f39acca..4ead7c3 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -4,6 +4,11 @@
  * Created by amyquispe on 5/19/15.
  */
 public class ConcreteAwesomeClass extends AbstractAwesomeClass {
+    @Override
+    public int getData() {
+        return super.getData();
+    }
+
     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 25cadce..4e5c49b 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -12,50 +12,52 @@
 import org.w3c.dom.Text;
 
 public class InitialActivity extends Activity {
-  int numCounter = 0;
-
-  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);
-
-
-      Button plus = (Button) findViewById(R.id.buttonPlus);
-      plus.setOnClickListener(new View.OnClickListener() {
-          public void onClick(View v) {
-              numCounter++;
-              TextView counter = (TextView) findViewById(R.id.tvCounter);
-              counter.setText(Integer.toString(numCounter));
-          }
-      });
-
-      Button minus = (Button) findViewById(R.id.buttonMinus);
-      plus.setOnClickListener(new View.OnClickListener() {
-          public void onClick(View v) {
-              numCounter--;
-              TextView counter = (TextView) findViewById(R.id.tvCounter);
-              counter.setText(Integer.toString(numCounter));
-          }
-      });
-  }
-
-  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);
-  }
+    int numCounter = 0;
+
+    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);
+
+        Log.d(TAG, "onCreate()");
+        Button plus = (Button) findViewById(R.id.buttonPlus);
+        plus.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                numCounter++;
+                Log.d(TAG, "plus.onClick(): counter==" + numCounter);
+                TextView counter = (TextView) findViewById(R.id.tvCounter);
+                counter.setText(Integer.toString(numCounter));
+            }
+        });
+
+        Button minus = (Button) findViewById(R.id.buttonMinus);
+        minus.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                numCounter--;
+                Log.d(TAG, "minus.onClick(): counter==" + numCounter);
+                TextView counter = (TextView) findViewById(R.id.tvCounter);
+                counter.setText(Integer.toString(numCounter));
+            }
+        });
+    }
 
 }
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..7cf62ae 100644
--- a/src/main/java/nyc/c4q/SubFunClass.java
+++ b/src/main/java/nyc/c4q/SubFunClass.java
@@ -3,7 +3,23 @@
 /**
  * Created by amyquispe on 5/19/15.
  */
-public class SubFunClass {
+public class SubFunClass extends SuperFunClass implements AwesomeInterface{
+    @Override
+    public int getData() {
+        return 0;
+    }
+
+    @Override
+    public void setData(int someData) {
+
+    }
+
+    public SubFunClass(String someName) {
+        super(someName);
+    }
+
     public SubFunClass(){
+
+
     }
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 7571f6b..097d05d 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -7,10 +7,10 @@
     android:layout_height="match_parent"
     tools:context="nyc.c4q.InitialActivity"
     android:id="@+id/activity_initial"
-    android:orientation="horizontal">
+    android:orientation="vertical">
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
         android:id="@+id/counterLayout"
         android:orientation="horizontal"
@@ -18,13 +18,13 @@
 
         <LinearLayout
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/counterButtonsLayout"
             android:orientation="vertical"
             android:layout_weight="1">
 
             <Button
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:id="@+id/buttonPlus"
                 android:text="+"
@@ -32,7 +32,7 @@
                 />
 
             <Button
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:id="@+id/buttonMinus"
                 android:text="-"
@@ -47,6 +47,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:text="0"
+            android:textSize="60sp"
             android:layout_weight="1"
             />
 
@@ -67,14 +68,4 @@
         android:text="Empty"
         android:layout_weight="1"/>
 
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="InitialActivity"
-        />
-
-
-
 </LinearLayout>
\ No newline at end of file

From 6329077b4e22fd0b72715f68523f55f9761d5962 Mon Sep 17 00:00:00 2001
From: tashsmit <tashsmit91@yahoo.com>
Date: Tue, 19 May 2015 21:49:49 -0400
Subject: [PATCH 3/4] what i've completed at 9:49

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

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 4e5c49b..5f15070 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -22,14 +22,22 @@ public void loadState() {
         Log.d(TAG, "loadState()");
         counter = preferences.getInt("counter", 0);
         Log.d(TAG, "loadState(): counter==" + counter);
+        SharedPreferences sharedPref= getSharedPreferences("mypref", 0);
+        Integer counter = sharedPref.getInt("counter", numCounter);
     }
 
     public void saveState() {
         Log.d(TAG, "saveState()");
         Log.d(TAG, "saveState(): counter==" + counter);
-        SharedPreferences.Editor editor = preferences.edit();
-        editor.putInt("counter", counter);
+        //SharedPreferences.Editor editor = preferences.edit();
+        //editor.putInt("counter", counter);
+        //editor.commit();
+        SharedPreferences sharedPref= getSharedPreferences("mypref", 0);
+        SharedPreferences.Editor editor= sharedPref.edit();
+        editor.putInt("counter", numCounter);
         editor.commit();
+
+
     }
 
     @Override
@@ -38,6 +46,11 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_initial);
         preferences = getPreferences(Context.MODE_PRIVATE);
 
+        SharedPreferences sharedPref= getSharedPreferences("mypref", 0);
+        Integer counter = sharedPref.getInt("counter", numCounter);
+        numCounter = counter;
+
+
         Log.d(TAG, "onCreate()");
         Button plus = (Button) findViewById(R.id.buttonPlus);
         plus.setOnClickListener(new View.OnClickListener() {

From eff9e82b37b730f7e6031efe3f00c168d848e079 Mon Sep 17 00:00:00 2001
From: tashsmit <tashsmit91@yahoo.com>
Date: Thu, 28 May 2015 14:31:23 -0400
Subject: [PATCH 4/4] recent changes

---
 src/main/AndroidManifest.xml               |  4 +-
 src/main/java/nyc/c4q/InitialActivity.java |  3 +
 src/main/res/layout/activity_initial.xml   |  1 +
 src/main/res/layout/activity_tile.xml      | 65 ++++++++++++++++++++--
 src/main/res/values/strings.xml            |  6 ++
 5 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index ea635f5..f97aa51 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="nyc.c4q" >
 
-    <application android:name=".Unit1AssessmentApplication" >
+    <application android:name=".MyApplication" >
         <activity
             android:name=".InitialActivity"
             android:label="@string/title_activity_initial"
@@ -20,3 +20,5 @@
     </application>
 
 </manifest>
+
+
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 5f15070..cef7e45 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -46,11 +46,13 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_initial);
         preferences = getPreferences(Context.MODE_PRIVATE);
 
+
         SharedPreferences sharedPref= getSharedPreferences("mypref", 0);
         Integer counter = sharedPref.getInt("counter", numCounter);
         numCounter = counter;
 
 
+
         Log.d(TAG, "onCreate()");
         Button plus = (Button) findViewById(R.id.buttonPlus);
         plus.setOnClickListener(new View.OnClickListener() {
@@ -71,6 +73,7 @@ public void onClick(View v) {
                 counter.setText(Integer.toString(numCounter));
             }
         });
+
     }
 
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 097d05d..87dee2c 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -2,6 +2,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index 4e36a11..f60abe1 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -1,15 +1,68 @@
+<?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:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="nyc.c4q.TileActivity"
-    android:id="@+id/activity_tile"
-    >
+    android:orientation="horizontal"
+    android:id="@+id/activity_tile">
+
+    <LinearLayout
+        android:id="@+id/leftSide"
+        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+
+        <view
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:background="@color/red"
+            android:layout_weight="40"
+            android:id="@+id/redView"/>
+
+        <view
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:background="@color/green"
+            android:layout_weight="60"
+            android:id="@+id/greenView"/>
+
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/rightSide"
+        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+
+        <view
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:background="@color/yellow"
+            android:layout_weight="33"
+            android:id="@+id/yelloView"/>
+
+        <view
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:background="@color/white"
+            android:layout_weight="44"
+            android:id="@+id/whiteView"/>
+
+        <view
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:background="@color/blue"
+            android:layout_weight="22"
+            android:id="@+id/blueView"/>
+
+
+     </LinearLayout>
 
-    <TextView
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:text="TileActivity"/>
 
 </LinearLayout>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c174d4f..d57020c 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -4,4 +4,10 @@
     <string name="action_settings">Settings</string>
 
     <string name="hello_world">Hello world!</string>
+    <color name="red">#ff00ff00</color>
+    <color name="green">#ff00ff00</color>
+    <color name="yellow">#ffffff00</color>
+    <color name="white">#ffffffff</color>
+    <color name="blue">#ff0000ff</color>
+
 </resources>