Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/nyc/c4q/AbstractAwesomeClass.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
* Created by amyquispe on 5/19/15.
*/
public abstract class AbstractAwesomeClass implements AwesomeInterface {
private int save = 4;

@Override
public int getData() {
return 0;
return this.save;
}


@Override
public void setData(int someData) {

this.save = someData;
}
}
10 changes: 8 additions & 2 deletions src/main/java/nyc/c4q/AwesomeContainer.java
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
package nyc.c4q;


import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;

/**
* Created by amyquispe on 5/19/15.
*/
public class AwesomeContainer {

public static Collection createAwesomeContainer(){



return null;
}

public static void addAwesomeObject(Collection awesomeContainer){
return;

return ;
}
}
11 changes: 11 additions & 0 deletions src/main/java/nyc/c4q/ConcreteAwesomeClass.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
package nyc.c4q;


import java.util.ArrayList;
import java.util.Collection;

/**
* Created by amyquispe on 5/19/15.
*/
public class ConcreteAwesomeClass extends AbstractAwesomeClass {


public ConcreteAwesomeClass(){

}

public ConcreteAwesomeClass(int startData){



}
}
3 changes: 3 additions & 0 deletions src/main/java/nyc/c4q/Helpers.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
import android.app.Activity;
import android.content.res.Resources;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;

/**
* Created by ehtesh on 5/19/15.
*/
public class Helpers {
public static String getResourceId(View v) {
// http://stackoverflow.com/a/17583380/198348

int id = v.getId();
String idString = "no id";
if (id != View.NO_ID) {
Expand Down
93 changes: 69 additions & 24 deletions src/main/java/nyc/c4q/InitialActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -10,29 +11,73 @@
import android.widget.TextView;

public class InitialActivity extends Activity {
Intent intent = new Intent(this, InitialActivity.class);

public final static String TAG = "C4QTAG";
public int counter = 0;
public SharedPreferences preferences = null;

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);
Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity);


final TextView tvCounter = (TextView) findViewById(R.id.tvCounter);


buttonPlus.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
counter++;
tvCounter.setText(Integer.toString(counter));

}
});

buttonMinus.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
counter--;
tvCounter.setText(Integer.toString(counter));
}
});

buttonTileActivity.setOnClickListener(new View.OnClickListener() {

@Override
public void onClick(View v) {

startActivity(intent);

}
});

}
@Override
public void onSaveInstanceState(Bundle savedInstanceState) {
super.onSaveInstanceState(savedInstanceState);
savedInstanceState.putInt("counter", counter);
saveState();
}

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);
}
}
12 changes: 11 additions & 1 deletion src/main/java/nyc/c4q/SubFunClass.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

}
}
68 changes: 58 additions & 10 deletions src/main/res/layout/activity_initial.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:id="@+id/activity_initial"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="nyc.c4q.InitialActivity"
android:id="@+id/activity_initial">
android:orientation="vertical"
tools:context="nyc.c4q.InitialActivity">


<LinearLayout
android:id="@+id/counterLayout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="2">

<LinearLayout
android:id="@+id/counterButtonsLayout"
android:layout_width="0dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_weight="1">

<Button
android:id="@+id/buttonPlus"
android:layout_width="match_parent"
android:layout_height="0dp"
android:text="+"
android:layout_weight="1"/>

<Button
android:id="@+id/buttonMinus"
android:layout_width="match_parent"
android:layout_height="0dp"
android:text="-"
android:layout_weight="1"/>


</LinearLayout>

<TextView
android:id="@+id/tvCounter"
android:layout_width="0dp"
android:layout_height="match_parent"
android:text="0"
android:textSize="60sp"
android:layout_weight="1" />

</LinearLayout>

<Button
android:id="@+id/buttonTileActivity"
android:layout_width="match_parent"
android:layout_height="0dp"
android:text="TileActivity"
android:layout_weight="1"/>


<TextView
android:id="@+id/text"
<Button
android:id="@+id/buttonEmpty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="InitialActivity"
/>
android:layout_height="0dp"
android:text="Empty"
android:layout_weight="1"/>
</LinearLayout>
75 changes: 69 additions & 6 deletions src/main/res/layout/activity_tile.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,78 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/activity_tile"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="nyc.c4q.TileActivity"
android:id="@+id/activity_tile"
>
android:orientation="horizontal">

<TextView
<LinearLayout
android:id="@+id/leftSide"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">

<LinearLayout
android:id="@+id/redView"
android:layout_weight="40"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="#ffff0000"

android:orientation="horizontal">

</LinearLayout>

<LinearLayout
android:id="@+id/greenView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="#ff00ff00"
android:layout_weight="60"
android:orientation="horizontal">

</LinearLayout>

</LinearLayout>

<LinearLayout
android:id="@+id/rightSide"
android:layout_width="match_parent"
android:text="TileActivity"/>
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:id="@+id/yellowView"
android:orientation="horizontal"
android:layout_weight="33"
android:background="#ffffff00">

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:id="@+id/whiteView"
android:orientation="horizontal"
android:layout_weight="44"
android:background="#ffffffff">

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:id="@+id/blueView"
android:orientation="horizontal"
android:layout_weight="22"
android:background="#ff0000ff">

</LinearLayout>

</LinearLayout>

</LinearLayout>
1 change: 1 addition & 0 deletions src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

Expand Down