diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..3b4b0cb 100644
--- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java
+++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
@@ -5,13 +5,18 @@
*/
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..36d944e 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -9,10 +9,14 @@
*/
public class AwesomeContainer {
public static Collection createAwesomeContainer(){
- return null;
+
+ return new ArrayList();
}
public static void addAwesomeObject(Collection awesomeContainer){
- return;
+
+ ConcreteAwesomeClass classAdd= new ConcreteAwesomeClass();
+
+ awesomeContainer.add(classAdd);
}
}
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..cfd3de1 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;
@@ -9,30 +10,91 @@
import android.widget.Button;
import android.widget.TextView;
+import org.w3c.dom.Text;
+
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(final Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_initial);
+ preferences = getPreferences(Context.MODE_PRIVATE);
+
+ loadState();
+
+ final Button button = (Button) findViewById(R.id.buttonPlus);
+ final TextView countertv = (TextView) findViewById(R.id.tvCounter);
+
+ if(savedInstanceState!=null){
+ counter= Integer.parseInt(savedInstanceState.get("click_count").toString());
+ saveState();
+ countertv.setText(counter);
+
+ }
+
+ button.setOnClickListener(new View.OnClickListener() {
+ @Override
+
+ public void onClick(View view) {
+ counter++;
+ saveState();
+ countertv.setText(String.valueOf(counter));
+
+ }
+
+ });
+
+ Button buttonMin = (Button) findViewById(R.id.buttonMinus);
+ buttonMin.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ counter--;
+ saveState();
+ countertv.setText(String.valueOf(counter));
+
+ }
+ });
+
+ Button buttonTile = (Button) findViewById(R.id.buttonTileActivity);
+ buttonTile.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent intent = new Intent(InitialActivity.this, TileActivity.class);
+ startActivity(intent);
+
+ }
+ });
+
+ saveState();
+
+ }
+
+ protected void onPause(){
+ super.onPause();
+ saveState();
+ }
+
+ protected void onResume(){
+ super.onResume();
+ loadState();
+ }
+}
\ 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..d0559c7 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/activity_initial.xml b/src/main/res/layout/activity_initial.xml
index 49e22b0..d44ef51 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -9,6 +9,67 @@
tools:context="nyc.c4q.InitialActivity"
android:id="@+id/activity_initial">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:id="@+id/activity_tile">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #ffff0000
+
+ #ff00ff00
+ #ffffff00
+
+ #ffffffff
+ #ff0000ff
+
\ No newline at end of file
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;