diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java index e3f9c21..e0f3b08 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 someData=4; @Override public int getData() { - return 0; + return someData; } @Override public void setData(int someData) { - + this.someData = someData; } } diff --git a/src/main/java/nyc/c4q/AwesomeContainer.java b/src/main/java/nyc/c4q/AwesomeContainer.java index 64e9fd9..23b5319 100644 --- a/src/main/java/nyc/c4q/AwesomeContainer.java +++ b/src/main/java/nyc/c4q/AwesomeContainer.java @@ -8,7 +8,74 @@ * Created by amyquispe on 5/19/15. */ public class AwesomeContainer { + public static Collection createAwesomeContainer(){ + Collection awesomeContainer = new Collection() { + @Override + public boolean add(ConcreteAwesomeClass object) { + return false; + } + + @Override + public boolean addAll(Collection collection) { + return false; + } + + @Override + public void clear() { + + } + + @Override + public boolean contains(Object object) { + return false; + } + + @Override + public boolean containsAll(Collection collection) { + return false; + } + + @Override + public boolean isEmpty() { + return false; + } + + @Override + public Iterator iterator() { + return null; + } + + @Override + public boolean remove(Object object) { + return false; + } + + @Override + public boolean removeAll(Collection collection) { + return false; + } + + @Override + public boolean retainAll(Collection collection) { + return false; + } + + @Override + public int size() { + return 0; + } + + @Override + public Object[] toArray() { + return new Object[0]; + } + + @Override + public T[] toArray(T[] array) { + return null; + } + }; return null; } diff --git a/src/main/java/nyc/c4q/InitialActivity.java b/src/main/java/nyc/c4q/InitialActivity.java index 2213b83..0477430 100644 --- a/src/main/java/nyc/c4q/InitialActivity.java +++ b/src/main/java/nyc/c4q/InitialActivity.java @@ -6,11 +6,15 @@ import android.os.Bundle; import android.util.Log; import android.view.View; +import android.view.View.OnClickListener; import android.widget.Button; import android.widget.TextView; public class InitialActivity extends Activity { + Button buttonPlus,buttonMinus; + TextView tvCounter; + public int counter = 0; public SharedPreferences preferences = null; public final static String TAG = "C4QTAG"; @@ -18,7 +22,7 @@ public class InitialActivity extends Activity { public void loadState(){ Log.d(TAG, "loadState()"); counter = preferences.getInt("counter", 0); - Log.d(TAG, "loadState(): counter=="+counter); + Log.d(TAG, "loadState(): counter==" + counter); } public void saveState(){ @@ -34,5 +38,36 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_initial); preferences = getPreferences(Context.MODE_PRIVATE); + + tvCounter = (TextView) findViewById(R.id.tvCounter); + + buttonPlus = (Button)findViewById(R.id.buttonPlus); + buttonPlus.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + counter++; + String number = String.valueOf(counter); + tvCounter.setText(number); + + } + }); + + buttonMinus = (Button)findViewById(R.id.buttonMinus); + buttonMinus.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + counter--; + String number = String.valueOf(counter); + tvCounter.setText(number); + } + }); + + + + + + } + + } diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java index ef94dce..80aa846 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/java/nyc/c4q/Unit1AssessmentApplication.java b/src/main/java/nyc/c4q/Unit1AssessmentApplication.java index 84bfeb8..4afd817 100644 --- a/src/main/java/nyc/c4q/Unit1AssessmentApplication.java +++ b/src/main/java/nyc/c4q/Unit1AssessmentApplication.java @@ -1,7 +1,11 @@ package nyc.c4q; import android.app.Application; +import android.os.Bundle; +import android.widget.Button; +import android.widget.TextView; public class Unit1AssessmentApplication extends Application { + } diff --git a/src/main/res/layout/activity_initial.xml b/src/main/res/layout/activity_initial.xml index 49e22b0..e3096e0 100644 --- a/src/main/res/layout/activity_initial.xml +++ b/src/main/res/layout/activity_initial.xml @@ -9,10 +9,65 @@ tools:context="nyc.c4q.InitialActivity" android:id="@+id/activity_initial"> - + android:layout_height="0dp" + android:layout_weight="2"> + + + +