Skip to content
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

Jump to bottom

finish assessment #20

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

finish assessment #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6cacf70
finish assessment
ahhhlvin May 20, 2015
2c3a418
Update Unit1AssessmentTestsJava.java
amyquispe May 25, 2015
81d6280
fixed typos
shurane May 20, 2015
bf0b81e
added more constraints on layout_width/layout_height
shurane May 20, 2015
6ab1198
Merge branch 'master' of github.com:shurane/unit-1-assessment
ahhhlvin May 26, 2015
923b597
finished all required tests in assessment
ahhhlvin May 27, 2015
f88423b
more updates
ahhhlvin 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
14 changes: 10 additions & 4 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 @@ -5,13 +5,19 @@
*/
public abstract class AbstractAwesomeClass implements AwesomeInterface {

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



@Override
public void setData(int someData) {
this.data = someData;
}


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

}
9 changes: 7 additions & 2 deletions 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,21 @@
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;


ArrayList<Object> myList = new ArrayList<Object>();

return myList;
}

public static void addAwesomeObject(Collection awesomeContainer){
return;
awesomeContainer.add(new ConcreteAwesomeClass());
}
}
13 changes: 13 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 @@ -4,8 +4,21 @@
* Created by amyquispe on 5/19/15.
*/
public class ConcreteAwesomeClass extends AbstractAwesomeClass {


public ConcreteAwesomeClass(){
}
public ConcreteAwesomeClass(int startData){
setData(startData);

}

@Override
public int getData() {
return super.getData();
}




}
125 changes: 101 additions & 24 deletions 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,37 +2,114 @@

import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;

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 TextView tvCounter;

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);
tvCounter = (TextView) findViewById(R.id.tvCounter);


if (savedInstanceState != null) {
tvCounter.setText(savedInstanceState.getString("counter").toString());
}


Button buttonPlus = (Button) findViewById(R.id.buttonPlus);
buttonPlus.setOnClickListener(new View.OnClickListener() {

@Override
public void onClick(View view) {
counter++;
tvCounter.setText(String.valueOf(counter));
savePreferences("counter", tvCounter.getText().toString());
}

});


Button buttonMinus = (Button) findViewById(R.id.buttonMinus);
buttonMinus.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
counter--;
tvCounter.setText(String.valueOf(counter));
savePreferences("counter", tvCounter.getText().toString());
}
});


Button buttonTileActivity = (Button) findViewById(R.id.buttonTileActivity);
buttonTileActivity.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent nextStartedActivity = new Intent(getApplicationContext(), TileActivity.class);
startActivity(nextStartedActivity);
}
});


loadSavedPreferences();

}


@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);


outState.putString("counter", tvCounter.getText().toString());

}



private void savePreferences(String key, String value) {

SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
SharedPreferences.Editor editor = sharedPreferences.edit();
editor.putString("counter", tvCounter.getText().toString());
editor.commit();
}

private void loadSavedPreferences() {

SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
tvCounter.setText(sharedPreferences.getString("counter", tvCounter.getText().toString()));

}

}
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) {

}
}
75 changes: 70 additions & 5 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 @@ -7,12 +7,77 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="nyc.c4q.InitialActivity"
android:id="@+id/activity_initial">
android:id="@+id/activity_initial"
>

<TextView
android:id="@+id/text"

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





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


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


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

</LinearLayout>

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





</LinearLayout>

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


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




</LinearLayout>
60 changes: 58 additions & 2 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 @@ -5,11 +5,67 @@
android:layout_height="match_parent"
tools:context="nyc.c4q.TileActivity"
android:id="@+id/activity_tile"
android:orientation="horizontal"
>

<TextView



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


<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="40"
android:background="@color/red"
android:id="@+id/redView" />

<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="60"
android:background="@color/green"
android:id="@+id/greenView" />

</LinearLayout>

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


<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="33"
android:background="@color/yellow"
android:id="@+id/yellowView" />

<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="44"
android:background="@color/white"
android:id="@+id/whiteView" />

<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="22"
android:background="@color/blue"
android:id="@+id/blueView" />

</LinearLayout>



</LinearLayout>
12 changes: 12 additions & 0 deletions src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,16 @@
<string name="action_settings">Settings</string>

<string name="hello_world">Hello world!</string>
<string name="zero">0</string>

<color name="white">#ffffffff</color>
<color name="yellow">#ffffff00</color>
<color name="blue">#ff0000ff</color>



<color name="red">#FFFF0000</color>
<color name="green">#ff00ff00</color>


</resources>
Loading