diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..348398d 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -4,14 +4,16 @@
* Created by amyquispe on 5/19/15.
*/
public abstract class AbstractAwesomeClass implements AwesomeInterface {
-
+ int data;
@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..f697102 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -3,16 +3,26 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
+import java.util.Objects;
/**
* Created by amyquispe on 5/19/15.
*/
public class AwesomeContainer {
+
public static Collection createAwesomeContainer(){
- return null;
+ ArrayList myList = new ArrayList();
+ addAwesomeObject(myList);
+ return myList;
}
public static void addAwesomeObject(Collection awesomeContainer){
+
+ ConcreteAwesomeClass awesomeStuff = new ConcreteAwesomeClass();
+
+
+ awesomeContainer.add(awesomeStuff);
+
return;
}
}
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index f39acca..0844e51 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -5,7 +5,9 @@
*/
public class ConcreteAwesomeClass extends AbstractAwesomeClass {
public ConcreteAwesomeClass(){
+ this.setData(4);
}
public ConcreteAwesomeClass(int startData){
}
+
}
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..b09387e 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;
@@ -18,7 +19,7 @@ public class InitialActivity extends Activity {
public void loadState(){
Log.d(TAG, "loadState()");
counter = preferences.getInt("counter", 0);
- Log.d(TAG, "loadState(): counter=="+counter);
+ Log.d(TAG, "loadState(): counter==" + counter);
}
public void saveState(){
@@ -34,5 +35,42 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_initial);
preferences = getPreferences(Context.MODE_PRIVATE);
+
+ if (savedInstanceState != null) {
+ counter = savedInstanceState.getInt("counter", counter);
+ } else {
+ Button tileActivityButton = (Button) findViewById(R.id.buttonTileActivity);
+ tileActivityButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent intent = new Intent(InitialActivity.this, TileActivity.class);
+ startActivity(intent);
+ }
+ });
+ }
+
}
+
+ public void buttonPlus(View v){
+ TextView tvcounter = (TextView) findViewById(R.id.tvCounter);
+ counter = Integer.parseInt(tvcounter.getText().toString());
+ counter++;
+ tvcounter.setText(String.valueOf(counter));
+
+ }
+ public void buttonMinus(View v){
+ TextView tvcounter = (TextView) findViewById(R.id.tvCounter);
+ counter = Integer.parseInt(tvcounter.getText().toString());
+ counter--;
+ tvcounter.setText(String.valueOf(counter));
+
+ }
+
+ @Override
+ protected void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ loadState();
+ saveState();
+ outState.putInt("counter", counter);
+ }
}
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..80aa846 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() {
+ return 0;
+ }
+
+ @Override
+ public void setData(int someData) {
+
+ }
}
diff --git a/src/main/res/layout-land/activity_initial.xml b/src/main/res/layout-land/activity_initial.xml
new file mode 100644
index 0000000..04c283b
--- /dev/null
+++ b/src/main/res/layout-land/activity_initial.xml
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..04c283b 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -9,10 +9,63 @@
tools:context="nyc.c4q.InitialActivity"
android:id="@+id/activity_initial">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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..d1f1837 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -6,10 +6,53 @@
tools:context="nyc.c4q.TileActivity"
android:id="@+id/activity_tile"
>
+
+
+
+
+
+
+
+
+
+
+
-
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;