The previous week's values now search back in time until they find a value so if I skip a week (...or month) it'll start me at the last week I actually recorded a value.HEADmaster

4 files changed, 44 insertions, 10 deletions

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 84d130a..91294a1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -13,7 +13,6 @@
         </option>

       </GradleProjectSettings>

     </option>

-    <option name="offlineWork" value="true" />

   </component>

 </project>

 

diff --git a/GymLog/GymLog-GymLog.iml b/GymLog/GymLog-GymLog.iml
index d2d19c7..1d494a7 100644
--- a/GymLog/GymLog-GymLog.iml
+++ b/GymLog/GymLog-GymLog.iml
@@ -13,6 +13,7 @@
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -37,22 +38,22 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
@@ -64,7 +65,25 @@
       <excludeFolder url="file://$MODULE_DIR$/build/exploded-aar" />
       <excludeFolder url="file://$MODULE_DIR$/build/exploded-bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/ndk" />
diff --git a/GymLog/src/main/java/com/mikemiller/gymlog/ActivityFragment.java b/GymLog/src/main/java/com/mikemiller/gymlog/ActivityFragment.java
index 249db8c..44dffa8 100644
--- a/GymLog/src/main/java/com/mikemiller/gymlog/ActivityFragment.java
+++ b/GymLog/src/main/java/com/mikemiller/gymlog/ActivityFragment.java
@@ -4,6 +4,7 @@ import android.app.Fragment;
 import android.content.Context;

 import android.content.Intent;

 import android.content.SharedPreferences;

+import android.graphics.Color;

 import android.os.Bundle;

 import android.os.Environment;

 import android.util.Log;

@@ -175,7 +176,7 @@ public class ActivityFragment extends Fragment {
         if (mStats.containsKey(key)) {

             return new ActivityStats(mStats.get(key));

         } else {

-            return new ActivityStats(0, 0);

+            return new ActivityStats(-5, -5);

         }

     }

     private ActivityStats getActivityStats() {

@@ -184,22 +185,26 @@ public class ActivityFragment extends Fragment {
     }

     private ActivityStats getLastActivityStats() {

         Calendar c = Calendar.getInstance();

-        c.add(Calendar.DAY_OF_MONTH, -7); // subtract a week

-        return getActivityStats(c);

+        ActivityStats lastActivityStats = new ActivityStats(-5, -5);

+        while(lastActivityStats.reps < 0 || lastActivityStats.weight < 0) {

+            c.add(Calendar.DAY_OF_MONTH, -7); // subtract a week

+            lastActivityStats = getActivityStats(c);

+        }

+        return lastActivityStats;

     }

     private void setActivityStats(ActivityStats stats) {

         mStats.put(String.valueOf(Util.getMostRecentMonday().getTimeInMillis()), stats.toString());

         refreshButton();

     }

     public int getWeight() {

-        if (getActivityStats().weight == 0) {

+        if (getActivityStats().weight == -5) {

             return getLastWeight();

         }

 

         return getActivityStats().weight;

     }

     public int getReps() {

-        if (getActivityStats().reps == 0) {

+        if (getActivityStats().reps == -5) {

             return getLastReps();

         }

 

@@ -322,6 +327,16 @@ public class ActivityFragment extends Fragment {
 //        properties.setProperty("reps", String.valueOf(getReps()));

         properties.putAll(mStats);

 

+        if (getWeight() == 0 || getReps() == 0) {

+            Log.d("writing", "0");

+            mSummaryButton.setTextColor(Color.RED);

+        } else if (getWeight() == -5 || getReps() == -5) {

+            Log.d("writing", "-5");

+            mSummaryButton.setTextColor(Color.MAGENTA);

+        } else {

+            mSummaryButton.setTextColor(getResources().getColor(android.R.color.holo_blue_dark));

+        }

+

         try {

             FileOutputStream os = new FileOutputStream(getSaveFile());

             properties.store(os, null);

diff --git a/GymLog/src/main/java/com/mikemiller/gymlog/MainActivity.java b/GymLog/src/main/java/com/mikemiller/gymlog/MainActivity.java
index 4a78fd6..0706bd7 100644
--- a/GymLog/src/main/java/com/mikemiller/gymlog/MainActivity.java
+++ b/GymLog/src/main/java/com/mikemiller/gymlog/MainActivity.java
@@ -55,6 +55,7 @@ public class MainActivity extends FragmentActivity {
                 new Activity("Pendlay Rows", 2, 4, 6, 10, 1),
                 new Activity("Assisted Chin-ups", 3, 4, 6, 10, 1) });
         put(mWednesday, new Activity[]{
+                new Activity("Treadmill", 1, 0, 20, 10, 1),
                 new Activity("Flat Barbell Bench Press", 3, 6, 10, 10, 1),
                 new Activity("Incline Barbell Bench Press", 2, 8, 12, 10, 1),
                 new Activity("Barbell Curls", 3, 0, 8, 0, 0)});