diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java index e3f9c21..f47c2dc 100644 --- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java +++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java @@ -5,13 +5,16 @@ */ public abstract class AbstractAwesomeClass implements AwesomeInterface { + int data = 4; + int someData = 5; + @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..3d47015 100644 --- a/src/main/java/nyc/c4q/AwesomeContainer.java +++ b/src/main/java/nyc/c4q/AwesomeContainer.java @@ -3,16 +3,25 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; +import java.util.List; +import java.util.Objects; /** * Created by amyquispe on 5/19/15. */ public class AwesomeContainer { - public static Collection createAwesomeContainer(){ - return null; + + private static ArrayList myList; + + public static Collection createAwesomeContainer() { + + myList = new ArrayList(); + + return myList; } public static void addAwesomeObject(Collection awesomeContainer){ - return; + ConcreteAwesomeClass cc = new ConcreteAwesomeClass(); + myList.add(cc); } } diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java index f39acca..1134012 100644 --- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java +++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java @@ -4,6 +4,7 @@ * 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/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java index 2213b83..2cb17e6 100644 --- a/src/main/java/nyc/c4q/InitialActivity.java +++ b/src/main/java/nyc/c4q/InitialActivity.java @@ -2,37 +2,103 @@ 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 TextView tvCounter; + + private static final String COUNTER_KEY = "counter"; + + 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); + + + LinearLayout layout = (LinearLayout) findViewById(R.id.activity_initial); + + tvCounter = (TextView) findViewById(R.id.tvCounter); + loadState(); + tvCounter.setText("" + counter); + + Button buttonPlus = (Button) findViewById(R.id.buttonPlus); + buttonPlus.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + counter++; + tvCounter.setText("" + counter); + Log.d("C4QTAG", "onCreate().buttonPlus.inside: " + counter); + } + }); + + Button buttonMinus = (Button) findViewById(R.id.buttonMinus); + buttonMinus.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + counter--; + tvCounter.setText("" + counter); + Log.d("C4QTAG", "onCreate().buttonMinus.inside: " + counter); + } + }); + + Log.d("C4QTAG", "onCreate().outside: " + counter); + + Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity); + buttonTileActivity.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(InitialActivity.this, TileActivity.class); + startActivity(intent); + } + }); + + +// Log.d(TAG, "onCreate() -- savedInstanceState="+savedInstanceState); +// if(savedInstanceState!=null) { +// counter = savedInstanceState.getInt(COUNTER_KEY); +// Log.d(TAG, "onCreate() -- restoring counter, counter="+counter); +// tvCounter.setText("" + counter); +// } + } + +// @Override +// protected void onSaveInstanceState(Bundle outState) { +// Log.d(TAG, "onSaveInstanceState(), counter="+counter); +// Log.d(TAG, "onSaveInstanceState(), before, outState="+outState); +// super.onSaveInstanceState(outState); +// outState.putInt(COUNTER_KEY, counter); +// Log.d(TAG, "onSaveInstanceState(), after, outState="+outState); +// } + + @Override + protected void onPause() { + super.onPause(); + saveState(); + } } diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java index ef94dce..06eb5c5 100644 --- a/src/main/java/nyc/c4q/SubFunClass.java +++ b/src/main/java/nyc/c4q/SubFunClass.java @@ -3,7 +3,19 @@ /** * Created by amyquispe on 5/19/15. */ -public class SubFunClass { +public class SubFunClass extends SuperFunClass implements AwesomeInterface{ + int data; + public SubFunClass(){ } + + @Override + public int getData() { + return data; + } + + @Override + public void setData(int someData) { + data = someData; + } } diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml index 49e22b0..14bad0f 100644 --- a/src/main/res/layout/activity_initial.xml +++ b/src/main/res/layout/activity_initial.xml @@ -1,18 +1,67 @@ - + android:orientation="vertical" + tools:context="nyc.c4q.InitialActivity"> + + + + + +