diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java
index e3f9c21..65ea220 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 {
+ private int save = 4;
@Override
public int getData() {
- return 0;
+ return this.save;
}
+
@Override
public void setData(int someData) {
-
+ this.save = someData;
}
}
diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java
index 64e9fd9..72e84bb 100644
--- a/src/main/java/nyc/c4q/AwesomeContainer.java
+++ b/src/main/java/nyc/c4q/AwesomeContainer.java
@@ -1,18 +1,24 @@
package nyc.c4q;
+
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
+import java.util.List;
/**
* Created by amyquispe on 5/19/15.
*/
public class AwesomeContainer {
+
public static Collection createAwesomeContainer(){
+
+
+
return null;
}
public static void addAwesomeObject(Collection awesomeContainer){
- return;
+
+ return ;
}
}
diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
index f39acca..92da787 100644
--- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
+++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java
@@ -1,11 +1,22 @@
package nyc.c4q;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
/**
* Created by amyquispe on 5/19/15.
*/
public class ConcreteAwesomeClass extends AbstractAwesomeClass {
+
+
public ConcreteAwesomeClass(){
+
}
+
public ConcreteAwesomeClass(int startData){
+
+
+
}
}
diff --git a/src/main/java/nyc/c4q/Helpers.java b/src/main/java/nyc/c4q/Helpers.java
index 10292fd..8991f74 100644
--- a/src/main/java/nyc/c4q/Helpers.java
+++ b/src/main/java/nyc/c4q/Helpers.java
@@ -3,6 +3,8 @@
import android.app.Activity;
import android.content.res.Resources;
import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
/**
* Created by ehtesh on 5/19/15.
@@ -10,6 +12,7 @@
public class Helpers {
public static String getResourceId(View v) {
// http://stackoverflow.com/a/17583380/198348
+
int id = v.getId();
String idString = "no id";
if (id != View.NO_ID) {
diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java
index 2213b83..c74c402 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,29 +11,73 @@
import android.widget.TextView;
public class InitialActivity extends Activity {
+ Intent intent = new Intent(this, InitialActivity.class);
+
+ public final static String TAG = "C4QTAG";
+ public int counter = 0;
+ public SharedPreferences preferences = null;
+
+ 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);
+
+ Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
+ Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
+ Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity);
+
+
+ final TextView tvCounter = (TextView) findViewById(R.id.tvCounter);
+
+
+ buttonPlus.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ counter++;
+ tvCounter.setText(Integer.toString(counter));
+
+ }
+ });
+
+ buttonMinus.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ counter--;
+ tvCounter.setText(Integer.toString(counter));
+ }
+ });
+
+ buttonTileActivity.setOnClickListener(new View.OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+
+ startActivity(intent);
+
+ }
+ });
+
+ }
+ @Override
+ public void onSaveInstanceState(Bundle savedInstanceState) {
+ super.onSaveInstanceState(savedInstanceState);
+ savedInstanceState.putInt("counter", counter);
+ saveState();
+ }
- 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);
- }
}
diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java
index ef94dce..525fea8 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..372d244 100644
--- a/src/main/res/layout/activity_initial.xml
+++ b/src/main/res/layout/activity_initial.xml
@@ -1,18 +1,66 @@
-
+ android:orientation="vertical"
+ tools:context="nyc.c4q.InitialActivity">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ android:layout_height="0dp"
+ android:text="Empty"
+ android:layout_weight="1"/>
\ 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..49adfea 100644
--- a/src/main/res/layout/activity_tile.xml
+++ b/src/main/res/layout/activity_tile.xml
@@ -1,15 +1,78 @@
-
+ android:orientation="horizontal">
-
+
+
+
+
+
+
+
+
+
+
+
+
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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;