From d489c0272fcee14c3167cb6aa320afb96126cad5 Mon Sep 17 00:00:00 2001
From: hoshikoo <hoshikooki@gmail.com>
Date: Tue, 19 May 2015 19:08:56 -0400
Subject: [PATCH 1/8] initial commit

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 80a6578..1d2e6df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@ target
 build
 .gradle
 local.properties
-*~
\ No newline at end of file
+*~

From 547b02d18c9ee1df5cab4eec6d21c20a12455d4b Mon Sep 17 00:00:00 2001
From: hoshikoo <hoshikooki@gmail.com>
Date: Tue, 19 May 2015 20:59:56 -0400
Subject: [PATCH 2/8] finish android 1 & 2

---
 .../java/nyc/c4q/AbstractAwesomeClass.java    |  2 +
 .../java/nyc/c4q/ConcreteAwesomeClass.java    | 12 ++++
 src/main/java/nyc/c4q/InitialActivity.java    |  6 +-
 src/main/java/nyc/c4q/MyOnClickListner.java   | 29 +++++++++
 src/main/java/nyc/c4q/SubFunClass.java        | 13 +++-
 src/main/java/nyc/c4q/SuperFunClass.java      |  1 +
 .../nyc/c4q/Unit1AssessmentApplication.java   |  3 +-
 src/main/res/layout/activity_initial.xml      | 62 ++++++++++++++++++-
 8 files changed, 124 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/nyc/c4q/MyOnClickListner.java

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..bd13ab7 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -7,6 +7,8 @@ public abstract class AbstractAwesomeClass implements AwesomeInterface {
 
     @Override
     public int getData() {
+
+
         return 0;
     }
 
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index f39acca..c647707 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -5,7 +5,19 @@
  */
 public class ConcreteAwesomeClass extends AbstractAwesomeClass {
     public ConcreteAwesomeClass(){
+
     }
     public ConcreteAwesomeClass(int startData){
+        startData = 4;
+    }
+
+    @Override
+    public int getData() {
+        return super.getData();
+    }
+
+    @Override
+    public void setData(int someData) {
+        super.setData(someData);
     }
 }
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..ddd6e4d 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -5,7 +5,6 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
@@ -34,5 +33,10 @@ protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
+
+      TextView tvCounter = (TextView)findViewById(R.id.tvCounter);
+
+      Button buttonPlus = ((Button)this.findViewById(R.id.buttonPlus));
+      buttonPlus.setOnClickListener(new MyOnClickListner(tvCounter));
   }
 }
diff --git a/src/main/java/nyc/c4q/MyOnClickListner.java b/src/main/java/nyc/c4q/MyOnClickListner.java
new file mode 100644
index 0000000..637da8f
--- /dev/null
+++ b/src/main/java/nyc/c4q/MyOnClickListner.java
@@ -0,0 +1,29 @@
+package nyc.c4q;
+
+import android.view.View;
+import android.widget.TextView;
+
+/**
+ * Created by Hoshiko on 5/19/15.
+ */
+public class MyOnClickListner implements View.OnClickListener{
+    int count = 0;
+    static int totalCount=0;
+    TextView textView;
+    TextView textViewTotal;
+
+    public MyOnClickListner(TextView textView){
+        this.textView = textView;
+
+    }
+
+
+    @Override
+    public void onClick (View view){
+        count++;
+        totalCount++;
+        textView.setText(""+count);
+
+    }
+}
+
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..df0f18a 100644
--- a/src/main/java/nyc/c4q/SubFunClass.java
+++ b/src/main/java/nyc/c4q/SubFunClass.java
@@ -3,7 +3,18 @@
 /**
  * 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/main/java/nyc/c4q/SuperFunClass.java b/src/main/java/nyc/c4q/SuperFunClass.java
index 78d8698..af92d0e 100644
--- a/src/main/java/nyc/c4q/SuperFunClass.java
+++ b/src/main/java/nyc/c4q/SuperFunClass.java
@@ -4,6 +4,7 @@
  * Created by amyquispe on 5/19/15.
  */
 public class SuperFunClass {
+
     private String name;
 
     public SuperFunClass(){
diff --git a/src/main/java/nyc/c4q/Unit1AssessmentApplication.java b/src/main/java/nyc/c4q/Unit1AssessmentApplication.java
index 84bfeb8..b1cc24f 100644
--- a/src/main/java/nyc/c4q/Unit1AssessmentApplication.java
+++ b/src/main/java/nyc/c4q/Unit1AssessmentApplication.java
@@ -2,6 +2,7 @@
 
 import android.app.Application;
 
-public class Unit1AssessmentApplication extends Application {
+public class Unit1AssessmentApplication extends Application  {
+
 
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..45da3af 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -9,10 +9,70 @@
     tools:context="nyc.c4q.InitialActivity"
     android:id="@+id/activity_initial">
 
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:id="@+id/counterLayout"
+        android:orientation="horizontal"
+        android:layout_weight="2">
+
+
+        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:id="@+id/counterButtonsLayout"
+            android:orientation="vertical"
+            android:layout_weight="1">
+
+
+
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:id="@+id/buttonPlus"
+                android:text="+"
+                android:layout_weight="1"/>
+
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:id="@+id/buttonMinus"
+                android:text="-"
+                android:layout_weight="1"/>
+        </LinearLayout>
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:id="@+id/tvCounter"
+                android:layout_weight="1"
+                android:text="0"/>
+
+    </LinearLayout>
+
+
+        <Button
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:id="@+id/buttonTileActivity"
+            android:text="TileActivity"
+            android:layout_weight="1"
+            />
+
+        <Button
+            android:layout_width="match_parent"
+            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"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         android:text="InitialActivity"
         />
+
+
 </LinearLayout>
\ No newline at end of file

From 1a91d1203d89a79fdd3f965e28fc12432d3d2d4c Mon Sep 17 00:00:00 2001
From: hoshikoo <hoshikooki@gmail.com>
Date: Tue, 19 May 2015 21:23:11 -0400
Subject: [PATCH 3/8] add android 3 and java 1&2

---
 .../java/nyc/c4q/ConcreteAwesomeClass.java    |  9 ++++--
 src/main/java/nyc/c4q/InitialActivity.java    |  3 ++
 .../java/nyc/c4q/MyOnClickListnerMinus.java   | 30 +++++++++++++++++++
 3 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/nyc/c4q/MyOnClickListnerMinus.java

diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index c647707..f454fc5 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -4,20 +4,23 @@
  * Created by amyquispe on 5/19/15.
  */
 public class ConcreteAwesomeClass extends AbstractAwesomeClass {
+
+    int startData;
+
     public ConcreteAwesomeClass(){
 
     }
     public ConcreteAwesomeClass(int startData){
-        startData = 4;
+        this.startData=startData;
     }
 
     @Override
     public int getData() {
-        return super.getData();
+        return startData;
     }
 
     @Override
     public void setData(int someData) {
-        super.setData(someData);
+       this.startData = someData;
     }
 }
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index ddd6e4d..9837894 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -38,5 +38,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
       Button buttonPlus = ((Button)this.findViewById(R.id.buttonPlus));
       buttonPlus.setOnClickListener(new MyOnClickListner(tvCounter));
+
+      Button buttonMinus = ((Button)this.findViewById(R.id.buttonMinus));
+      buttonMinus.setOnClickListener(new MyOnClickListnerMinus(tvCounter));
   }
 }
diff --git a/src/main/java/nyc/c4q/MyOnClickListnerMinus.java b/src/main/java/nyc/c4q/MyOnClickListnerMinus.java
new file mode 100644
index 0000000..a99fe09
--- /dev/null
+++ b/src/main/java/nyc/c4q/MyOnClickListnerMinus.java
@@ -0,0 +1,30 @@
+package nyc.c4q;
+
+import android.view.View;
+import android.widget.TextView;
+
+/**
+ * Created by Hoshiko on 5/19/15.
+ */
+public class MyOnClickListnerMinus implements View.OnClickListener{
+    int count = 0;
+
+    TextView textView;
+
+
+    public MyOnClickListnerMinus(TextView textView){
+        this.textView = textView;
+
+    }
+
+
+    @Override
+    public void onClick (View view){
+        count--;
+
+        textView.setText(""+count);
+
+    }
+
+
+}

From 3c3943badffa6bea4edaeffee096245f01426421 Mon Sep 17 00:00:00 2001
From: hoshikoo <hoshikooki@gmail.com>
Date: Tue, 19 May 2015 21:55:24 -0400
Subject: [PATCH 4/8] add android 4

---
 src/main/java/nyc/c4q/InitialActivity.java  | 50 +++++++++++++++++++--
 src/main/java/nyc/c4q/MyOnClickListner.java |  2 +-
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 9837894..0f53b4b 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -5,15 +5,18 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
 public class InitialActivity extends Activity {
-
+  private static final String TOTAL_COUNT = "Total_Count";
+  private String totalCount = "";
   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);
@@ -31,15 +34,54 @@ public void saveState(){
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
+
+      Log.d(TAG, "onCreate(), counter="+counter);
+
+//    if (savedInstanceState != null) {
+//        counter = savedInstanceState.get(TOTAL_COUNT);
+//    }
+
+
+
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
 
-      TextView tvCounter = (TextView)findViewById(R.id.tvCounter);
+      final TextView tvCounter = (TextView)findViewById(R.id.tvCounter);
 
       Button buttonPlus = ((Button)this.findViewById(R.id.buttonPlus));
-      buttonPlus.setOnClickListener(new MyOnClickListner(tvCounter));
+
+      buttonPlus.setOnClickListener(new View.OnClickListener() {
+
+          @Override
+          public void onClick(View view) {
+              counter++;
+              Log.d(TAG, "buttonPlus.onClick(), counter="+counter);
+              tvCounter.setText(""+counter);
+          }
+      });
+//      buttonPlus.setOnClickListener(new MyOnClickListner(tvCounter));
 
       Button buttonMinus = ((Button)this.findViewById(R.id.buttonMinus));
-      buttonMinus.setOnClickListener(new MyOnClickListnerMinus(tvCounter));
+      buttonMinus.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+              counter--;
+              Log.d(TAG, "buttonMinus.onClick(), counter="+counter);
+              tvCounter.setText(""+counter);
+          }
+      });
+//      buttonMinus.setOnClickListener(new MyOnClickListnerMinus(tvCounter));
+
+      totalCount = ""+counter;
   }
+
+
+
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putInt(TOTAL_COUNT, counter);
+    }
 }
diff --git a/src/main/java/nyc/c4q/MyOnClickListner.java b/src/main/java/nyc/c4q/MyOnClickListner.java
index 637da8f..67b2e14 100644
--- a/src/main/java/nyc/c4q/MyOnClickListner.java
+++ b/src/main/java/nyc/c4q/MyOnClickListner.java
@@ -21,7 +21,7 @@ public MyOnClickListner(TextView textView){
     @Override
     public void onClick (View view){
         count++;
-        totalCount++;
+
         textView.setText(""+count);
 
     }

From e7f9a8ec08ea729df998fb017d0235a668f950c5 Mon Sep 17 00:00:00 2001
From: hoshikoo <hoshikooki@gmail.com>
Date: Tue, 19 May 2015 21:58:08 -0400
Subject: [PATCH 5/8] some android 5

---
 src/main/java/nyc/c4q/InitialActivity.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 0f53b4b..3f9dae2 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -37,9 +37,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
       Log.d(TAG, "onCreate(), counter="+counter);
 
-//    if (savedInstanceState != null) {
-//        counter = savedInstanceState.get(TOTAL_COUNT);
-//    }
+    if (savedInstanceState != null) {
+        counter = (Integer)savedInstanceState.get(TOTAL_COUNT);
+    }
 
 
 

From 431513d5ce167cb9e186cc107759f82308704e89 Mon Sep 17 00:00:00 2001
From: hoshikoo <hoshikooki@gmail.com>
Date: Tue, 26 May 2015 20:16:24 -0400
Subject: [PATCH 6/8] finish Java 3 & 4

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

diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index bd13ab7..9a7e964 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -5,15 +5,15 @@
  */
 public abstract class AbstractAwesomeClass implements AwesomeInterface {
 
+    int data = 4;
+
     @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..dbb22f6 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -9,10 +9,13 @@
  */
 public class AwesomeContainer {
     public static Collection createAwesomeContainer(){
-        return null;
+      Collection c = new ArrayList();
+      return  c;
     }
 
     public static void addAwesomeObject(Collection awesomeContainer){
-        return;
+        ConcreteAwesomeClass cac = new ConcreteAwesomeClass();
+        awesomeContainer.add(cac);
+
     }
 }
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index f454fc5..7fecf8e 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -5,22 +5,13 @@
  */
 public class ConcreteAwesomeClass extends AbstractAwesomeClass {
 
-    int startData;
 
     public ConcreteAwesomeClass(){
 
     }
     public ConcreteAwesomeClass(int startData){
-        this.startData=startData;
-    }
 
-    @Override
-    public int getData() {
-        return startData;
     }
 
-    @Override
-    public void setData(int someData) {
-       this.startData = someData;
-    }
+
 }
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 ff9e30dba00e65ff0f997a1ccf95703c11a92558 Mon Sep 17 00:00:00 2001
From: hoshikoo <hoshikooki@gmail.com>
Date: Tue, 26 May 2015 22:08:24 -0400
Subject: [PATCH 7/8] add android 6

---
 src/main/java/nyc/c4q/InitialActivity.java | 37 ++++++++++++++++++----
 src/main/java/nyc/c4q/TileActivity.java    |  7 ++++
 src/main/res/layout/activity_tile.xml      | 24 ++++++++++++++
 3 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 3f9dae2..aeac766 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;
@@ -10,6 +11,7 @@
 import android.widget.TextView;
 
 public class InitialActivity extends Activity {
+  Button button;
   private static final String TOTAL_COUNT = "Total_Count";
   private String totalCount = "";
   public int counter = 0;
@@ -35,14 +37,17 @@ public void saveState(){
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
-      Log.d(TAG, "onCreate(), counter="+counter);
+     // Log.d(TAG, "onCreate(), counter="+counter);
 
     if (savedInstanceState != null) {
-        counter = (Integer)savedInstanceState.get(TOTAL_COUNT);
+        this.loadState();
+
     }
 
 
 
+
+
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
 
@@ -73,15 +78,33 @@ public void onClick(View view) {
 //      buttonMinus.setOnClickListener(new MyOnClickListnerMinus(tvCounter));
 
       totalCount = ""+counter;
-  }
 
 
+      button=(Button)findViewById(R.id.buttonTileActivity);
 
+      button.setOnClickListener(new View.OnClickListener() {
+
+          @Override
+          public void onClick(View v) {
+//
+//              startActivity(new Intent("TileActivity"));
+              Intent i = new Intent(getApplicationContext(), TileActivity.class);
+              startActivity(i);
+          }
+      });
 
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
 
-        outState.putInt(TOTAL_COUNT, counter);
+  }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        this.saveState();
     }
+//    @Override
+//    protected void onSaveInstanceState(Bundle savedInstanceState) {
+//        super.onSaveInstanceState(savedInstanceState);
+//        saveState();
+////        savedInstanceState.putString(TOTAL_COUNT,totalCount);
+//    }
 }
diff --git a/src/main/java/nyc/c4q/TileActivity.java b/src/main/java/nyc/c4q/TileActivity.java
index c0d4639..dfaef1d 100644
--- a/src/main/java/nyc/c4q/TileActivity.java
+++ b/src/main/java/nyc/c4q/TileActivity.java
@@ -1,16 +1,23 @@
 package nyc.c4q;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
 
 public class TileActivity extends Activity {
 
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_tile);
+
+
     }
 
     @Override
diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index 4e36a11..fb1fe95 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -5,11 +5,35 @@
     android:layout_height="match_parent"
     tools:context="nyc.c4q.TileActivity"
     android:id="@+id/activity_tile"
+    android:orientation="horizontal"
     >
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/leftSide"
+        android:orientation="vertical"
+        android:layout_weight="1"
+        >
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/rightSide"
+        android:orientation="vertical"
+        android:layout_weight="1"
+        >
+    </LinearLayout>
 
     <TextView
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         android:text="TileActivity"/>
 
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/buttonTileActivity"/>
+
 </LinearLayout>

From dc8c4bcd092b5ea64612127c98f7f736fe3df156 Mon Sep 17 00:00:00 2001
From: hoshikoo <hoshikooki@gmail.com>
Date: Wed, 27 May 2015 01:24:08 -0400
Subject: [PATCH 8/8] finish android

---
 src/main/java/nyc/c4q/InitialActivity.java | 25 ++------
 src/main/java/nyc/c4q/TileActivity.java    |  4 +-
 src/main/res/layout/activity_tile.xml      | 69 ++++++++++++++++++----
 src/main/res/values/myresources.xml        |  9 +++
 4 files changed, 75 insertions(+), 32 deletions(-)
 create mode 100644 src/main/res/values/myresources.xml

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index aeac766..27e63c9 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -37,23 +37,17 @@ public void saveState(){
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
-     // Log.d(TAG, "onCreate(), counter="+counter);
-
-    if (savedInstanceState != null) {
-        this.loadState();
-
-    }
-
-
-
-
+    // Log.d(TAG, "onCreate(), counter="+counter);
 
     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)this.findViewById(R.id.buttonPlus));
+      tvCounter.setText(""+counter);
 
       buttonPlus.setOnClickListener(new View.OnClickListener() {
 
@@ -86,8 +80,6 @@ public void onClick(View view) {
 
           @Override
           public void onClick(View v) {
-//
-//              startActivity(new Intent("TileActivity"));
               Intent i = new Intent(getApplicationContext(), TileActivity.class);
               startActivity(i);
           }
@@ -101,10 +93,5 @@ protected void onStop() {
         super.onStop();
         this.saveState();
     }
-//    @Override
-//    protected void onSaveInstanceState(Bundle savedInstanceState) {
-//        super.onSaveInstanceState(savedInstanceState);
-//        saveState();
-////        savedInstanceState.putString(TOTAL_COUNT,totalCount);
-//    }
+
 }
diff --git a/src/main/java/nyc/c4q/TileActivity.java b/src/main/java/nyc/c4q/TileActivity.java
index dfaef1d..b5a3e35 100644
--- a/src/main/java/nyc/c4q/TileActivity.java
+++ b/src/main/java/nyc/c4q/TileActivity.java
@@ -7,17 +7,15 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
+import android.widget.TextView;
 
 public class TileActivity extends Activity {
 
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_tile);
-
-
     }
 
     @Override
diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index fb1fe95..df3a253 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -8,32 +8,81 @@
     android:orientation="horizontal"
     >
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
         android:id="@+id/leftSide"
         android:orientation="vertical"
         android:layout_weight="1"
         >
+
+        <View
+            android:layout_weight="40"
+            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:id="@+id/redView"
+
+            android:background="#ffff0000"
+            >
+
+            <!--android:background="@drawable/red_color"-->
+
+         </View>
+
+        <View
+            android:layout_weight="60"
+            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:id="@+id/greenView"
+            android:background="#ff00ff00">
+
+        </View>
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
         android:id="@+id/rightSide"
         android:orientation="vertical"
         android:layout_weight="1"
         >
+
+        <View
+            android:layout_weight="33"
+            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:id="@+id/yellowView"
+            android:background="#ffffff00">
+
+        </View>
+
+        <View
+            android:layout_weight="44"
+            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:id="@+id/whiteView"
+            android:background="#ffffffff">
+
+        </View>
+
+        <View
+            android:layout_weight="22"
+            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:id="@+id/blueView"
+            android:background="#ff0000ff">
+
+        </View>
     </LinearLayout>
 
-    <TextView
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:text="TileActivity"/>
+    <!--<TextView-->
+        <!--android:layout_height="match_parent"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:text="TileActivity"/>-->
 
 
-    <Button
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/buttonTileActivity"/>
+    <!--<Button-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="match_parent"-->
+        <!--android:id="@+id/buttonTileActivity"/>-->
 
 </LinearLayout>
diff --git a/src/main/res/values/myresources.xml b/src/main/res/values/myresources.xml
new file mode 100644
index 0000000..890f60c
--- /dev/null
+++ b/src/main/res/values/myresources.xml
@@ -0,0 +1,9 @@
+
+<resources>
+    <drawable name="red_color">#ff0000</drawable>
+    <drawable name="green_color">#00ff00</drawable>
+
+    <drawable name="yellow_color">#ffff00</drawable>
+    <drawable name="white_color">#ffffff</drawable>
+    <drawable name="blue_color">#0000ff</drawable>
+</resources>
\ No newline at end of file