diff --git a/.gitignore b/.gitignore index 80a6578..1d2e6df 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ target build .gradle local.properties -*~ \ No newline at end of file +*~ diff --git a/src/main/java/nyc/c4q/AbstractAwesomeClass.java b/src/main/java/nyc/c4q/AbstractAwesomeClass.java index e3f9c21..9a7e964 100644 --- a/src/main/java/nyc/c4q/AbstractAwesomeClass.java +++ b/src/main/java/nyc/c4q/AbstractAwesomeClass.java @@ -5,13 +5,15 @@ */ public abstract class AbstractAwesomeClass implements AwesomeInterface { + int data = 4; + @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..dbb22f6 100644 --- a/src/main/java/nyc/c4q/AwesomeContainer.java +++ b/src/main/java/nyc/c4q/AwesomeContainer.java @@ -9,10 +9,13 @@ */ public class AwesomeContainer { public static Collection createAwesomeContainer(){ - return null; + Collection c = new ArrayList(); + return c; } public static void addAwesomeObject(Collection awesomeContainer){ - return; + ConcreteAwesomeClass cac = new ConcreteAwesomeClass(); + awesomeContainer.add(cac); + } } diff --git a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java index f39acca..7fecf8e 100644 --- a/src/main/java/nyc/c4q/ConcreteAwesomeClass.java +++ b/src/main/java/nyc/c4q/ConcreteAwesomeClass.java @@ -4,8 +4,14 @@ * 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..27e63c9 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,11 +11,14 @@ import android.widget.TextView; public class InitialActivity extends Activity { - + Button button; + private static final String TOTAL_COUNT = "Total_Count"; + private String totalCount = ""; 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); @@ -32,7 +36,62 @@ public void saveState(){ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + // Log.d(TAG, "onCreate(), counter="+counter); + setContentView(R.layout.activity_initial); preferences = getPreferences(Context.MODE_PRIVATE); + loadState(); + + final TextView tvCounter = (TextView)findViewById(R.id.tvCounter); + + + Button buttonPlus = ((Button)this.findViewById(R.id.buttonPlus)); + tvCounter.setText(""+counter); + + buttonPlus.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View view) { + counter++; + Log.d(TAG, "buttonPlus.onClick(), counter="+counter); + tvCounter.setText(""+counter); + } + }); +// buttonPlus.setOnClickListener(new MyOnClickListner(tvCounter)); + + Button buttonMinus = ((Button)this.findViewById(R.id.buttonMinus)); + buttonMinus.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + counter--; + Log.d(TAG, "buttonMinus.onClick(), counter="+counter); + tvCounter.setText(""+counter); + } + }); +// buttonMinus.setOnClickListener(new MyOnClickListnerMinus(tvCounter)); + + totalCount = ""+counter; + + + button=(Button)findViewById(R.id.buttonTileActivity); + + button.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View v) { + Intent i = new Intent(getApplicationContext(), TileActivity.class); + startActivity(i); + } + }); + + } + + @Override + protected void onStop() { + super.onStop(); + this.saveState(); + } + } diff --git a/src/main/java/nyc/c4q/MyOnClickListner.java b/src/main/java/nyc/c4q/MyOnClickListner.java new file mode 100644 index 0000000..67b2e14 --- /dev/null +++ b/src/main/java/nyc/c4q/MyOnClickListner.java @@ -0,0 +1,29 @@ +package nyc.c4q; + +import android.view.View; +import android.widget.TextView; + +/** + * Created by Hoshiko on 5/19/15. + */ +public class MyOnClickListner implements View.OnClickListener{ + int count = 0; + static int totalCount=0; + TextView textView; + TextView textViewTotal; + + public MyOnClickListner(TextView textView){ + this.textView = textView; + + } + + + @Override + public void onClick (View view){ + count++; + + textView.setText(""+count); + + } +} + diff --git a/src/main/java/nyc/c4q/MyOnClickListnerMinus.java b/src/main/java/nyc/c4q/MyOnClickListnerMinus.java new file mode 100644 index 0000000..a99fe09 --- /dev/null +++ b/src/main/java/nyc/c4q/MyOnClickListnerMinus.java @@ -0,0 +1,30 @@ +package nyc.c4q; + +import android.view.View; +import android.widget.TextView; + +/** + * Created by Hoshiko on 5/19/15. + */ +public class MyOnClickListnerMinus implements View.OnClickListener{ + int count = 0; + + TextView textView; + + + public MyOnClickListnerMinus(TextView textView){ + this.textView = textView; + + } + + + @Override + public void onClick (View view){ + count--; + + textView.setText(""+count); + + } + + +} diff --git a/src/main/java/nyc/c4q/SubFunClass.java b/src/main/java/nyc/c4q/SubFunClass.java index ef94dce..df0f18a 100644 --- a/src/main/java/nyc/c4q/SubFunClass.java +++ b/src/main/java/nyc/c4q/SubFunClass.java @@ -3,7 +3,18 @@ /** * 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/SuperFunClass.java b/src/main/java/nyc/c4q/SuperFunClass.java index 78d8698..af92d0e 100644 --- a/src/main/java/nyc/c4q/SuperFunClass.java +++ b/src/main/java/nyc/c4q/SuperFunClass.java @@ -4,6 +4,7 @@ * Created by amyquispe on 5/19/15. */ public class SuperFunClass { + private String name; public SuperFunClass(){ diff --git a/src/main/java/nyc/c4q/TileActivity.java b/src/main/java/nyc/c4q/TileActivity.java index c0d4639..b5a3e35 100644 --- a/src/main/java/nyc/c4q/TileActivity.java +++ b/src/main/java/nyc/c4q/TileActivity.java @@ -1,12 +1,17 @@ package nyc.c4q; import android.app.Activity; +import android.content.Intent; import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; +import android.view.View; +import android.widget.Button; +import android.widget.TextView; public class TileActivity extends Activity { + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/src/main/java/nyc/c4q/Unit1AssessmentApplication.java b/src/main/java/nyc/c4q/Unit1AssessmentApplication.java index 84bfeb8..b1cc24f 100644 --- a/src/main/java/nyc/c4q/Unit1AssessmentApplication.java +++ b/src/main/java/nyc/c4q/Unit1AssessmentApplication.java @@ -2,6 +2,7 @@ import android.app.Application; -public class Unit1AssessmentApplication extends Application { +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..45da3af 100644 --- a/src/main/res/layout/activity_initial.xml +++ b/src/main/res/layout/activity_initial.xml @@ -9,10 +9,70 @@ tools:context="nyc.c4q.InitialActivity" android:id="@+id/activity_initial"> + + + + + + + +