Skip to content

unit 1 assessment #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lighterletter wants to merge 3 commits into
base: master
Choose a base branch
from
Open

unit 1 assessment #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddc17e7
unit 1 assessment
lighterletter May 20, 2015
b189210
Merge branch 'master' of https://github.com/accesscode-2-1/unit-1-ass…
lighterletter May 26, 2015
559d788
finished java
lighterletter May 27, 2015
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
8 changes: 5 additions & 3 deletions src/main/java/nyc/c4q/AbstractAwesomeClass.java
View file
Open in desktop
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 {

int data;
@Override
public int getData() {
return 0;
return data;
}

@Override
public void setData(int someData) {

data = someData;
}


}
12 changes: 11 additions & 1 deletion src/main/java/nyc/c4q/AwesomeContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,26 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.Objects;

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

public static Collection createAwesomeContainer(){
return null;
ArrayList myList = new ArrayList();
addAwesomeObject(myList);
return myList;
}

public static void addAwesomeObject(Collection awesomeContainer){

ConcreteAwesomeClass awesomeStuff = new ConcreteAwesomeClass();


awesomeContainer.add(awesomeStuff);

return;
}
}
2 changes: 2 additions & 0 deletions src/main/java/nyc/c4q/ConcreteAwesomeClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
*/
public class ConcreteAwesomeClass extends AbstractAwesomeClass {
public ConcreteAwesomeClass(){
this.setData(4);
}
public ConcreteAwesomeClass(int startData){
}

}
40 changes: 39 additions & 1 deletion src/main/java/nyc/c4q/InitialActivity.java
View file
Open in desktop
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 @@ -18,7 +19,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(){
Expand All @@ -34,5 +35,42 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_initial);
preferences = getPreferences(Context.MODE_PRIVATE);

if (savedInstanceState != null) {
counter = savedInstanceState.getInt("counter", counter);
} else {
Button tileActivityButton = (Button) findViewById(R.id.buttonTileActivity);
tileActivityButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent(InitialActivity.this, TileActivity.class);
startActivity(intent);
}
});
}

}

public void buttonPlus(View v){
TextView tvcounter = (TextView) findViewById(R.id.tvCounter);
counter = Integer.parseInt(tvcounter.getText().toString());
counter++;
tvcounter.setText(String.valueOf(counter));

}
public void buttonMinus(View v){
TextView tvcounter = (TextView) findViewById(R.id.tvCounter);
counter = Integer.parseInt(tvcounter.getText().toString());
counter--;
tvcounter.setText(String.valueOf(counter));

}

@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
loadState();
saveState();
outState.putInt("counter", counter);
}
}
12 changes: 11 additions & 1 deletion src/main/java/nyc/c4q/SubFunClass.java
View file
Open in desktop
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) {

}
}
71 changes: 71 additions & 0 deletions src/main/res/layout-land/activity_initial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>

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

<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="2"
tools:context="nyc.c4q.InitialActivity"
android:id="@+id/counterLayout">

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

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

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="0"
android:id="@+id/tvCounter"
/>

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

</LinearLayout>
61 changes: 57 additions & 4 deletions src/main/res/layout/activity_initial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,63 @@
tools:context="nyc.c4q.InitialActivity"
android:id="@+id/activity_initial">

<TextView
android:id="@+id/text"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="InitialActivity"
android:layout_height="0dp"
android:layout_weight="2"
tools:context="nyc.c4q.InitialActivity"
android:id="@+id/counterLayout">

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

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

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="0"
android:id="@+id/tvCounter"
/>

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

</LinearLayout>
51 changes: 47 additions & 4 deletions src/main/res/layout/activity_tile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,53 @@
tools:context="nyc.c4q.TileActivity"
android:id="@+id/activity_tile"
>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/leftSide"
android:orientation="vertical"
android:layout_weight="1"
>
<View
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="40"
android:id="@+id/redView"
android:background="#ffff0000"/>
<View
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="60"
android:id="@+id/greenView"
android:background="#ff00ff00"/>

</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/rightSide"
android:orientation="vertical"
android:layout_weight="1">
<View
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="33"
android:id="@+id/yellowView"
android:background="#ffffff00"/>
<View
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="44"
android:background="#ffffffff"
android:id="@+id/whiteView"/>
<View
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="22"
android:background="#ff0000ff"
android:id="@+id/blueView"/>

</LinearLayout>

<TextView
android:layout_height="match_parent"
android:layout_width="match_parent"
android:text="TileActivity"/>

</LinearLayout>
1 change: 1 addition & 0 deletions src/test/java/nyc/c4q/Unit1AssessmentTestsJava.java
View file
Open in desktop
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