diff options
Diffstat (limited to 'GymLog/src')
| -rw-r--r-- | GymLog/src/main/java/com/mikemiller/gymlog/ActivityFragment.java | 7 | ||||
| -rw-r--r-- | GymLog/src/main/java/com/mikemiller/gymlog/MainActivity.java | 17 |
2 files changed, 14 insertions, 10 deletions
diff --git a/GymLog/src/main/java/com/mikemiller/gymlog/ActivityFragment.java b/GymLog/src/main/java/com/mikemiller/gymlog/ActivityFragment.java index d113f3f..be5078e 100644 --- a/GymLog/src/main/java/com/mikemiller/gymlog/ActivityFragment.java +++ b/GymLog/src/main/java/com/mikemiller/gymlog/ActivityFragment.java @@ -188,10 +188,10 @@ public class ActivityFragment extends Fragment { mStats.put(String.valueOf(Util.getMostRecentMonday().getTimeInMillis()), stats.toString());
refreshButton();
}
- private int getWeight() {
+ public int getWeight() {
return getActivityStats().weight;
}
- private int getReps() {
+ public int getReps() {
return getActivityStats().reps;
}
private int getLastWeight() {
@@ -240,6 +240,9 @@ public class ActivityFragment extends Fragment { b.putSerializable("activity", activity);
f.setArguments(b);
+ f.mActivity = activity;
+ f.loadFromFile();
+
return f;
}
diff --git a/GymLog/src/main/java/com/mikemiller/gymlog/MainActivity.java b/GymLog/src/main/java/com/mikemiller/gymlog/MainActivity.java index 5f6029f..f479fc7 100644 --- a/GymLog/src/main/java/com/mikemiller/gymlog/MainActivity.java +++ b/GymLog/src/main/java/com/mikemiller/gymlog/MainActivity.java @@ -65,7 +65,7 @@ public class MainActivity extends FragmentActivity { mEpisodeFragment = SimpleCounterFragment.newInstance("Whose Line"); - //String summary = getWeekSummary(); + String summary = getWeekSummary(); //Log.d("Summary", summary); } @@ -103,21 +103,22 @@ public class MainActivity extends FragmentActivity { Activity mondayActivity = mDaysOfWeekToActivity.get(mMonday)[0]; - SharedPreferences activity_data = getSharedPreferences(mondayActivity.getSharedPreferencesName(), Context.MODE_APPEND); - long dateSavedMillis = activity_data.getLong("dateSaved", 0); - Calendar c = Util.getMostRecentMondayFrom(dateSavedMillis); + ActivityFragment mondayActivityFragment = ActivityFragment.newInstance(mondayActivity); + + //long dateSavedMillis = mondayActivity.getDateSaved(); + Calendar c = Util.getMostRecentMondayFrom(Calendar.getInstance().getTimeInMillis()); //System.out.println("Date " + c.getTime()); SimpleDateFormat simpleDate = new SimpleDateFormat("MM/dd/yyyy"); String mondayDateString = simpleDate.format(c.getTime()); - String summary = mondayDateString + "\t"; for(Activity activity : allActivities) { - activity_data = getSharedPreferences(activity.getSharedPreferencesName(), Context.MODE_APPEND); - int weight = activity_data.getInt("weight", 0); - int reps = activity_data.getInt("reps", 0); + ActivityFragment activityFragment = ActivityFragment.newInstance(activity); + + int weight = activityFragment.getWeight(); + int reps = activityFragment.getReps(); summary += weight + "x"; summary += reps + "\t"; |