diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java index e3f9c21..ef1613a 100644 --- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java +++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java @@ -7,11 +7,14 @@ public abstract class AbstractAwesomeClass implements AwesomeInterface { @Override public int getData() { + + + setData(0); + return 0; } @Override public void setData(int someData) { - } } diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java index 64e9fd9..25d53d3 100644 --- a/src/main/java/nyc/c4q/AwesomeContainer.java +++ b/src/main/java/nyc/c4q/AwesomeContainer.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Iterator; /** @@ -13,6 +14,16 @@ public static Collection createAwesomeContainer(){ } public static void addAwesomeObject(Collection awesomeContainer){ + + + + + return; } } +//Collection myList = AwesomeContainer.createAwesomeContainer(); +//assertEquals(myList.getClass(), List.class); +//AwesomeContainer.addAwesomeObject(myList); +//assertEquals(((List) myList).get(0).getClass(), AwesomeInterface.class); +//assertEquals(myList.getClass(), List.class); \ No newline at end of file diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java index 2213b83..7e25478 100644 --- a/src/main/java/nyc/c4q/InitialActivity.java +++ b/src/main/java/nyc/c4q/InitialActivity.java @@ -2,37 +2,93 @@ import android.app.Activity; import android.content.Context; +import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.util.Log; import android.view.View; import android.widget.Button; +import android.widget.LinearLayout; import android.widget.TextView; 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(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_initial); + preferences = getPreferences(Context.MODE_PRIVATE); + + Button buttonPlus = (Button) findViewById(R.id.buttonPlus); + buttonPlus.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + counter += 1; + TextView textView = (TextView) findViewById(R.id.tvCounter); + textView.setText(counter + ""); + + } + }); + + Button buttonMinus = (Button) findViewById(R.id.buttonMinus); + buttonMinus.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + counter -= 1; + TextView textView = (TextView) findViewById(R.id.tvCounter); + textView.setText(counter + ""); + + } + }); + + Button tileActivity = (Button) findViewById(R.id.buttonTileActivity); + tileActivity.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent (getApplicationContext(), TileActivity.class); + startActivity(intent); + } + }); + + + } + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + + outState.putString("saveState", preferences.toString()); + + } + + @Override + protected void onPause() { + + super.onPause(); + } + + @Override + protected void onRestoreInstanceState(Bundle savedInstanceState) { + super.onRestoreInstanceState(savedInstanceState); + preferences.toString(); + } + +} \ 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..e5c24cd 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() { + setData(0); + 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..cc11585 100644 --- a/src/main/java/nyc/c4q/SuperFunClass.java +++ b/src/main/java/nyc/c4q/SuperFunClass.java @@ -3,7 +3,7 @@ /** * Created by amyquispe on 5/19/15. */ -public class SuperFunClass { +public class SuperFunClass { private String name; public SuperFunClass(){ diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml index 49e22b0..d86da4f 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:layout_weight="2" + android:orientation="horizontal"> + + + +