From dda7988dbde85595186c088b035b104101e4fc38 Mon Sep 17 00:00:00 2001
From: Jorge Reina <jorgereina1986@gmail.com>
Date: Tue, 19 May 2015 21:56:32 -0400
Subject: [PATCH 1/3] test

---
 src/main/java/nyc/c4q/InitialActivity.java | 39 +++++++++++++
 src/main/res/layout/activity_initial.xml   | 67 ++++++++++++++++++----
 2 files changed, 96 insertions(+), 10 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..7635451 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;
@@ -31,8 +32,46 @@ public void saveState(){
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
+      Log.d(TAG, "onCreate()");
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_initial);
     preferences = getPreferences(Context.MODE_PRIVATE);
+      Button plus = (Button) findViewById(R.id.buttonPlus);
+      Button minus = (Button) findViewById(R.id.buttonMinus);
+      Button tile = (Button) findViewById(R.id.buttonTileActivity);
+      final TextView screen = (TextView) findViewById(R.id.tvCounter);
+
+
+
+
+
+      plus.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+              for(counter = 0; counter < 10 ; counter++)
+                  screen.setText(counter+"");
+
+
+              Log.d(TAG, "plus.onClick(), counter="+counter);
+          }
+      });
+      minus.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+
+              Log.d(TAG, "minus.onClick(), counter="+counter);
+
+          }
+      });
+      tile.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+
+              Log.d(TAG, "tile.onClick()");
+              Intent mainIntent = new Intent(InitialActivity.this,
+                      TileActivity.class);
+              startActivity(mainIntent);
+          }
+      });
   }
 }
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..009213f 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -1,18 +1,65 @@
 <?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_width="match_parent"
+        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="-" />
 
-    <TextView
-        android:id="@+id/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="match_parent"
-        android:text="InitialActivity"
-        />
+        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 3ac3886d983b8cced9bf9210e299a46ed4e00a15 Mon Sep 17 00:00:00 2001
From: Jorge Reina <jorgereina1986@gmail.com>
Date: Tue, 19 May 2015 22:00:54 -0400
Subject: [PATCH 2/3] test1

---
 src/main/java/nyc/c4q/InitialActivity.java | 2 ++
 src/main/res/layout/activity_tile.xml      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 7635451..7defb65 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -58,6 +58,8 @@ public void onClick(View view) {
       minus.setOnClickListener(new View.OnClickListener() {
           @Override
           public void onClick(View view) {
+              for(counter = 0; counter < 10 ; counter--)
+                  screen.setText(counter+"");
 
               Log.d(TAG, "minus.onClick(), counter="+counter);
 
diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index 4e36a11..39df80b 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -5,6 +5,7 @@
     android:layout_height="match_parent"
     tools:context="nyc.c4q.TileActivity"
     android:id="@+id/activity_tile"
+    android:orientation="horizontal"
     >
 
     <TextView

From fad776d7dc218de14c84e552b2d974b5873c296b Mon Sep 17 00:00:00 2001
From: Jorge Reina <jorgereina1986@gmail.com>
Date: Tue, 26 May 2015 21:58:57 -0400
Subject: [PATCH 3/3] second try

---
 src/main/java/nyc/c4q/InitialActivity.java | 50 +++++++++++---
 src/main/java/nyc/c4q/SubFunClass.java     | 13 +++-
 src/main/res/layout/activity_initial.xml   |  6 +-
 src/main/res/layout/activity_tile.xml      | 78 +++++++++++++++++++---
 4 files changed, 127 insertions(+), 20 deletions(-)

diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 7defb65..0facb47 100644
--- a/src/main/java/nyc/c4q/InitialActivity.java
+++ b/src/main/java/nyc/c4q/InitialActivity.java
@@ -20,6 +20,7 @@ public void loadState(){
     Log.d(TAG, "loadState()");
     counter = preferences.getInt("counter", 0);
     Log.d(TAG, "loadState(): counter=="+counter);
+
   }
 
   public void saveState(){
@@ -28,9 +29,22 @@ public void saveState(){
     SharedPreferences.Editor editor = preferences.edit();
     editor.putInt("counter", counter);
     editor.commit();
+
   }
 
-  @Override
+    @Override
+    protected void onPause() {
+        super.onPause();
+        
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        loadState();
+    }
+
+    @Override
   protected void onCreate(Bundle savedInstanceState) {
       Log.d(TAG, "onCreate()");
     super.onCreate(savedInstanceState);
@@ -43,26 +57,26 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
 
-
-
       plus.setOnClickListener(new View.OnClickListener() {
           @Override
           public void onClick(View view) {
-              for(counter = 0; counter < 10 ; counter++)
-                  screen.setText(counter+"");
+              Log.d(TAG, "plus.onClick(), counter="+counter);
+
+              counter+=1;
+              screen.setText(counter+"");
 
 
-              Log.d(TAG, "plus.onClick(), counter="+counter);
           }
       });
       minus.setOnClickListener(new View.OnClickListener() {
           @Override
           public void onClick(View view) {
-              for(counter = 0; counter < 10 ; counter--)
-                  screen.setText(counter+"");
-
               Log.d(TAG, "minus.onClick(), counter="+counter);
 
+              counter-=1;
+              screen.setText(counter+"");
+
+
           }
       });
       tile.setOnClickListener(new View.OnClickListener() {
@@ -76,4 +90,22 @@ public void onClick(View view) {
           }
       });
   }
+
+    @Override
+    protected void onSaveInstanceState(Bundle savedInstanceState) {
+        super.onSaveInstanceState(savedInstanceState);
+
+        TextView screen = (TextView) findViewById(R.id.tvCounter);
+        String myText= screen.getText().toString();
+
+        savedInstanceState.putString("MyString",myText);
+
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+
+        savedInstanceState.getString("MyString");
+    }
 }
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..6b1a15c 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/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 009213f..321ba1d 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -43,7 +43,11 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="0" />
+            android:text="0"
+            android:freezesText="true"
+            android:textSize="130dp"
+            android:gravity="center_horizontal"
+            android:layout_gravity="center"/>
 
     </LinearLayout>
 
diff --git a/src/main/res/layout/activity_tile.xml b/src/main/res/layout/activity_tile.xml
index 39df80b..77ea047 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -1,16 +1,76 @@
-<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:id="@+id/activity_tile"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="nyc.c4q.TileActivity"
-    android:id="@+id/activity_tile"
     android:orientation="horizontal"
-    >
+    tools:context="nyc.c4q.TileActivity">
+
+    <LinearLayout
+        android:id="@+id/leftSide"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <View
+            android:id="@+id/redView"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:background="#ffff0000"
+            android:layout_weight="40">
+
+        </View>
+        <View
+            android:id="@+id/greenView"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:background="#ff00ff00"
+            android:layout_weight="60">
+
+        </View>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/rightSide"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <View
+            android:id="@+id/yellowView"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:background="#ffffff00"
+            android:layout_weight="33">
+
+        </View>
+
+
+        <View
+            android:id="@+id/whiteView"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:background="#ffffff"
+            android:layout_weight="44">
+
+        </View>
+
+
+        <View
+            android:id="@+id/blueView"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:background="#ff0000ff"
+            android:layout_weight="22">
+
+        </View>
+
+
+
+    </LinearLayout>
 
-    <TextView
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:text="TileActivity"/>
 
 </LinearLayout>