diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java index e3f9c21..f69772f 100644 --- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java +++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java @@ -4,14 +4,15 @@ * Created by amyquispe on 5/19/15. */ public abstract class AbstractAwesomeClass implements AwesomeInterface { + private int data = 4; @Override public int getData() { - return 0; + return this.data; } @Override public void setData(int someData) { - + this.data = someData; } -} +} \ 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..23941a2 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; @@ -11,28 +12,69 @@ 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) { + // want to check bundle if counter is null? if not, restore. + + 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); + + buttonPlus.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + counter++; + TextView tvCounter = (TextView) findViewById(R.id.tvCounter); + tvCounter.setText(String.valueOf(counter)); + } + }); + + buttonMinus.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + counter--; + TextView tvCounter = (TextView) findViewById(R.id.tvCounter); + tvCounter.setText(String.valueOf(counter)); + } + }); + + buttonTileActivity.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(InitialActivity.this, TileActivity.class); + startActivity(intent); + } + }); + } + + // Wasn't able to finish this part. + @Override + protected void onDestroy() { + super.onDestroy(); + + Bundle b = new Bundle(); + b.putString("counter", String.valueOf(counter)); + } } 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..eb3ed52 100644 --- a/src/main/res/layout/activity_initial.xml +++ b/src/main/res/layout/activity_initial.xml @@ -1,18 +1,73 @@ - + android:orientation="vertical" + tools:context="nyc.c4q.InitialActivity"> - + android:layout_height="0dp" + android:layout_weight="2" + android:orientation="horizontal"> + + + +