diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index f96e9d3..a590e83 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -16,9 +16,6 @@
-
diff --git a/src/main/java/nyc/c4q/ListActivity.java b/src/main/java/nyc/c4q/ListActivity.java
index 08894ac..e81580f 100644
--- a/src/main/java/nyc/c4q/ListActivity.java
+++ b/src/main/java/nyc/c4q/ListActivity.java
@@ -4,42 +4,52 @@
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
+import android.widget.Button;
import android.widget.ListView;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+
public class ListActivity extends Activity {
public ListView list;
+ public Button buttonNme;
+ public Button buttonColor;
+ boolean isFirst;
+
public static final Person[] PEOPLE = {
- new Person("Hannah", "Abbott", House.Hufflepuff),
- new Person("Katie", "Bell", House.Gryffindor),
- new Person("Susan", "Bones", House.Hufflepuff),
- new Person("Terry", "Boot", House.Ravenclaw),
- new Person("Lavender", "Brown", House.Gryffindor),
- new Person("Cho", "Chang", House.Ravenclaw),
- new Person("Michael", "Corner", House.Ravenclaw),
- new Person("Colin", "Creevey", House.Gryffindor),
- new Person("Marietta", "Edgecombe", House.Ravenclaw),
- new Person("Justin", "Finch-Fletchley", House.Hufflepuff),
- new Person("Seamus", "Finnigan", House.Gryffindor),
- new Person("Anthony", "Goldstein", House.Ravenclaw),
- new Person("Hermione", "Granger", House.Gryffindor),
- new Person("Angelina", "Johnson", House.Gryffindor),
- new Person("Lee", "Jordan", House.Gryffindor),
- new Person("Neville", "Longbottom", House.Gryffindor),
- new Person("Luna", "Lovegood", House.Ravenclaw),
- new Person("Ernie", "Macmillan", House.Hufflepuff),
- new Person("Parvati", "Patil", House.Gryffindor),
- new Person("Padma", "Patil", House.Ravenclaw),
- new Person("Harry", "Potter", House.Gryffindor),
- new Person("Zacharias", "Smith", House.Hufflepuff),
- new Person("Alicia", "Spinnet", House.Gryffindor),
- new Person("Dean", "Thomas", House.Gryffindor),
- new Person("Fred", "Weasley", House.Gryffindor),
- new Person("George", "Weasley", House.Gryffindor),
- new Person("Ginny", "Weasley", House.Gryffindor),
- new Person("Ron", "Weasley", House.Gryffindor)
+ new Person("Hannah", "Abbott", House.Hufflepuff),
+ new Person("Katie", "Bell", House.Gryffindor),
+ new Person("Susan", "Bones", House.Hufflepuff),
+ new Person("Terry", "Boot", House.Ravenclaw),
+ new Person("Lavender", "Brown", House.Gryffindor),
+ new Person("Cho", "Chang", House.Ravenclaw),
+ new Person("Michael", "Corner", House.Ravenclaw),
+ new Person("Colin", "Creevey", House.Gryffindor),
+ new Person("Marietta", "Edgecombe", House.Ravenclaw),
+ new Person("Justin", "Finch-Fletchley", House.Hufflepuff),
+ new Person("Seamus", "Finnigan", House.Gryffindor),
+ new Person("Anthony", "Goldstein", House.Ravenclaw),
+ new Person("Hermione", "Granger", House.Gryffindor),
+ new Person("Angelina", "Johnson", House.Gryffindor),
+ new Person("Lee", "Jordan", House.Gryffindor),
+ new Person("Neville", "Longbottom", House.Gryffindor),
+ new Person("Luna", "Lovegood", House.Ravenclaw),
+ new Person("Ernie", "Macmillan", House.Hufflepuff),
+ new Person("Parvati", "Patil", House.Gryffindor),
+ new Person("Padma", "Patil", House.Ravenclaw),
+ new Person("Harry", "Potter", House.Gryffindor),
+ new Person("Zacharias", "Smith", House.Hufflepuff),
+ new Person("Alicia", "Spinnet", House.Gryffindor),
+ new Person("Dean", "Thomas", House.Gryffindor),
+ new Person("Fred", "Weasley", House.Gryffindor),
+ new Person("George", "Weasley", House.Gryffindor),
+ new Person("Ginny", "Weasley", House.Gryffindor),
+ new Person("Ron", "Weasley", House.Gryffindor)
};
@Override
@@ -48,6 +58,20 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_list);
list = (ListView) findViewById(R.id.list);
+ buttonNme = (Button) findViewById(R.id.button_name);
+ buttonColor = (Button) findViewById(R.id.button_color);
+
+
+ if (isFirst) {
+ Arrays.sort(PEOPLE, new Comparator() {
+ @Override
+ public int compare(Person person, Person personTwo) {
+ return person.lastName.compareTo(personTwo.lastName);
+ }
+ });
+
+
+ }
}
}
diff --git a/src/main/java/nyc/c4q/PaceCalculatorActivity.java b/src/main/java/nyc/c4q/PaceCalculatorActivity.java
index 5c0616e..e177049 100644
--- a/src/main/java/nyc/c4q/PaceCalculatorActivity.java
+++ b/src/main/java/nyc/c4q/PaceCalculatorActivity.java
@@ -1,14 +1,108 @@
package nyc.c4q;
+import android.app.FragmentManager;
import android.support.v4.app.FragmentActivity;
import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
public class PaceCalculatorActivity extends FragmentActivity {
+ private EditText inputDistance;
+ private EditText inputTimeMin;
+ private EditText inputTimeSec;
+ private EditText inputPaceMin;
+ private EditText inputPaceSec;
+ private Button buttonCalculate;
+ float time;
+ float pace;
+ float distance;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_pace_calculator);
+ android.support.v4.app.FragmentManager fm = getSupportFragmentManager();
+ PaceCalculatorFragment paceFragment = (PaceCalculatorFragment) getSupportFragmentManager().findFragmentById(R.id.paceFragment);
+
+
+
+ inputDistance = (EditText) findViewById(R.id.input_distance);
+ inputTimeMin = (EditText) findViewById(R.id.input_time_min);
+ inputTimeSec = (EditText) findViewById(R.id.input_time_sec);
+ inputPaceMin = (EditText) findViewById(R.id.input_pace_min);
+ inputPaceSec = (EditText) findViewById(R.id.input_pace_sec);
+ buttonCalculate = (Button) findViewById(R.id.button_calculate);
+
+
+ try {
+
+ String distanceString = inputDistance.getText().toString();
+ String timeMin = inputTimeMin.getText().toString();
+ String timeSec = inputTimeSec.getText().toString();
+ String paceMin = inputPaceMin.getText().toString();
+ String paceSec = inputPaceSec.getText().toString();
+
+ if (timeMin.matches("((-|\\\\+)?[0-9]+(\\\\.[0-9]+)?)+") && timeSec.matches("((-|\\\\+)?[0-9]+(\\\\.[0-9]+)?)+")
+ && paceMin.matches("((-|\\\\+)?[0-9]+(\\\\.[0-9]+)?)+") && paceSec.matches("((-|\\\\+)?[0-9]+(\\\\.[0-9]+)?)+")) {
+ buttonCalculate.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ calculateDistance();
+ }
+ });
+ }
+ } catch (NullPointerException ex) {
+ Log.d("invalid", "Invalid input");
+ }
+
+ }
+
+ public void calculateDistance() {
+
+ String timeMin = inputTimeMin.getText().toString();
+ String timeSec = inputTimeSec.getText().toString();
+ String paceMin = inputPaceMin.getText().toString();
+ String paceSec = inputPaceSec.getText().toString();
+
+ time = Float.parseFloat(timeMin + "." + timeSec);
+ Log.d("what", Float.toString(time));
+ pace = Float.parseFloat(paceMin + "." + paceSec);
+ Log.d("what2", Float.toString(pace));
+ distance = time / pace;
+ Log.d("what3", Float.toString(distance));
+
+ inputDistance.setText(String.valueOf("%1f" + distance));
+
+ }
+
+ public void calculatePace() {
+
+ String distanceString = inputDistance.getText().toString();
+ String timeMin = inputTimeMin.getText().toString();
+ String timeSec = inputTimeSec.getText().toString();
+ String paceMin = inputPaceMin.getText().toString();
+ String paceSec = inputPaceSec.getText().toString();
+
+ time = Float.parseFloat(timeMin + "." + timeSec);
+ distance = Float.parseFloat(distanceString);
+ pace = time / distance;
+ }
+
+ public void calculateTime() {
+
+ String distanceString = inputDistance.getText().toString();
+ String timeMin = inputTimeMin.getText().toString();
+ String timeSec = inputTimeSec.getText().toString();
+ String paceMin = inputPaceMin.getText().toString();
+ String paceSec = inputPaceSec.getText().toString();
+
+ pace = Float.parseFloat(paceMin + "." + paceSec);
+ distance = Float.parseFloat(distanceString);
+ time = pace * distance;
+
}
}
diff --git a/src/main/java/nyc/c4q/PaceCalculatorFragment.java b/src/main/java/nyc/c4q/PaceCalculatorFragment.java
new file mode 100644
index 0000000..cd110cb
--- /dev/null
+++ b/src/main/java/nyc/c4q/PaceCalculatorFragment.java
@@ -0,0 +1,21 @@
+package nyc.c4q;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Created by c4q-anthony-mcbride on 8/30/15.
+ */
+public class PaceCalculatorFragment extends Fragment {
+ @Nullable
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+ View view = inflater.inflate(R.layout.fragment_pace_calculator, container, false);
+ return view;
+ }
+}
diff --git a/src/main/java/nyc/c4q/Person.java b/src/main/java/nyc/c4q/Person.java
index 2f2f167..d9f2220 100644
--- a/src/main/java/nyc/c4q/Person.java
+++ b/src/main/java/nyc/c4q/Person.java
@@ -1,6 +1,8 @@
package nyc.c4q;
-public class Person {
+import java.util.Comparator;
+
+public class Person implements Comparator {
public String firstName;
public String lastName;
public House house;
@@ -10,4 +12,10 @@ public Person(String firstName, String lastName, House house) {
this.lastName = lastName;
this.house = house;
}
+
+
+ @Override
+ public int compare(Person person, Person t1) {
+ return 0;
+ }
}
diff --git a/src/main/res/layout/activity_pace_calculator.xml b/src/main/res/layout/activity_pace_calculator.xml
index ed76b3e..2fa5725 100644
--- a/src/main/res/layout/activity_pace_calculator.xml
+++ b/src/main/res/layout/activity_pace_calculator.xml
@@ -4,5 +4,25 @@
android:id="@+id/activity_pace_calculator"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="nyc.c4q.PaceCalculatorActivity"
- />
+ tools:context="nyc.c4q.PaceCalculatorActivity">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/res/layout/fragment_pace_calculator.xml b/src/main/res/layout/fragment_pace_calculator.xml
index a56410f..b586ac9 100644
--- a/src/main/res/layout/fragment_pace_calculator.xml
+++ b/src/main/res/layout/fragment_pace_calculator.xml
@@ -105,8 +105,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="@dimen/activity_vertical_margin"
- android:text="@string/calculate"
- android:onClick="button_calculate_onClick"
- />
+ android:text="@string/calculate" />
diff --git a/src/main/res/raw/books.json b/src/main/res/raw/books.json
index 8cc9673..79b378e 100644
--- a/src/main/res/raw/books.json
+++ b/src/main/res/raw/books.json
@@ -838,7 +838,7 @@
"isbn": "0439554934",
"isbn13": "9780439554930",
"publisher": "Scholastic",
- "publishyear": 2003.
+ "publishyear": 2003,
"checkedout": true,
"checkedoutby": 38,
"checkoutdateyear": 2015,
diff --git a/src/test/java/nyc/c4q/Part1PaceCalculatorTests.java b/src/test/java/nyc/c4q/Part1PaceCalculatorTests.java
index ad87eac..b7d395e 100644
--- a/src/test/java/nyc/c4q/Part1PaceCalculatorTests.java
+++ b/src/test/java/nyc/c4q/Part1PaceCalculatorTests.java
@@ -66,6 +66,7 @@ public void test02CheckDistanceCalculation() {
buttonCalculate.callOnClick();
Assertions.assertThat(inputDistance).containsText("4.8");
+
}
@Test