Split side planks (#56)

* Fix gradle error This is the error which is fixed by this change: Error:(47, 69) Cannot access 'getStartWorkoutButtonText': it is private in 'HomeViewPresenter' * Fix `unresolved reference` errors * Split side planks into separate exercises This allows users to track each side independently. Fixes #55. * Add mirrored right side plank video for left side * Keep original side plank exercise id This prevents historical side plank data from being lost.
mazurio · Jan 7, 2017 · e93141a · e93141a
1 parent 02903b5
commit e93141a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/app/src/androidTest/kotlin/com/bodyweight/fitness/MainActivityTest.kt b/app/src/androidTest/kotlin/com/bodyweight/fitness/MainActivityTest.kt
@@ -17,11 +17,9 @@ class MainActivityTest : ActivityInstrumentationTestCase2<MainActivity>(MainActi
     }
 
     fun testExerciseSetup() {
-        onView(withId(R.id.toolbar_exercise_title))
+        onView(withId(R.id.title))
                 .check(matches(withText("Shoulder Rolls")))
-        onView(withId(R.id.toolbar_section_title))
-                .check(matches(withText("Dynamic Stretches")))
-        onView(withId(R.id.toolbar_exercise_description))
+        onView(withId(R.id.description))
                 .check(matches(withText("1x(5-10)")))
 
         onView(withId(R.id.prev_exercise_button))
@@ -31,11 +29,9 @@ class MainActivityTest : ActivityInstrumentationTestCase2<MainActivity>(MainActi
 
         onView(withId(R.id.next_exercise_button)).perform(click())
 
-        onView(withId(R.id.toolbar_exercise_title))
+        onView(withId(R.id.title))
                 .check(matches(withText("Scapular Shrugs")))
-        onView(withId(R.id.toolbar_section_title))
-                .check(matches(withText("Dynamic Stretches")))
-        onView(withId(R.id.toolbar_exercise_description))
+        onView(withId(R.id.description))
                 .check(matches(withText("1x(5-10)")))
 
         onView(withId(R.id.prev_exercise_button))
@@ -49,11 +45,9 @@ class MainActivityTest : ActivityInstrumentationTestCase2<MainActivity>(MainActi
         onView(withId(R.id.next_exercise_button)).perform(click())
         onView(withId(R.id.next_exercise_button)).perform(click())
 
-        onView(withId(R.id.toolbar_exercise_title))
-                .check(matches(withText("Front and Side Leg Swings")))
-        onView(withId(R.id.toolbar_section_title))
-                .check(matches(withText("Dynamic Stretches")))
-        onView(withId(R.id.toolbar_exercise_description))
+        onView(withId(R.id.title))
+                .check(matches(withText("Front Leg Swings")))
+        onView(withId(R.id.description))
                 .check(matches(withText("1x(5-10)")))
 
         onView(withId(R.id.prev_exercise_button))

diff --git a/app/src/main/kotlin/com/bodyweight/fitness/view/HomeViewPresenter.kt b/app/src/main/kotlin/com/bodyweight/fitness/view/HomeViewPresenter.kt
@@ -107,7 +107,7 @@ class HomeViewPresenter : AbstractPresenter() {
         view.setNumberOfWorkoutsLast30Days("$last30Days ${getNumberOfWorkoutsPostfix(last30Days)}")
     }
 
-    private fun getStartWorkoutButtonText(repositoryRoutineForTodayExists: Boolean, isRoutineCompleted: Boolean): String {
+    public fun getStartWorkoutButtonText(repositoryRoutineForTodayExists: Boolean, isRoutineCompleted: Boolean): String {
         if (repositoryRoutineForTodayExists) {
             if (isRoutineCompleted) {
                 return "Review Workout"

diff --git a/app/src/main/res/raw/bodyweight_fitness_left_side_plank.mp4 b/app/src/main/res/raw/bodyweight_fitness_left_side_plank.mp4
diff --git a/app/src/main/res/raw/bodyweight_fitness_recommended_routine.json b/app/src/main/res/raw/bodyweight_fitness_recommended_routine.json
@@ -116,11 +116,20 @@
     },
     {
       "exerciseId": "exercise8",
-      "title": "Side Plank (Both Sides)",
+      "title": "Left Side Plank",
       "description": "1x(10-60s) hold",
       "type": "exercise",
       "youTubeId": "xIFWxQgFMiE",
-      "videoId": "bodyweight_fitness_side_plank",
+      "videoId": "bodyweight_fitness_left_side_plank",
+      "defaultSet": "timed"
+    },
+    {
+      "exerciseId": "f4f27acd-fd69-40f8-a459-a9f02c56ed03",
+      "title": "Right Side Plank",
+      "description": "1x(10-60s) hold",
+      "type": "exercise",
+      "youTubeId": "xIFWxQgFMiE",
+      "videoId": "bodyweight_fitness_right_side_plank",
       "defaultSet": "timed"
     },
     {

diff --git a/...res/raw/bodyweight_fitness_side_plank.mp4 → ...w/bodyweight_fitness_right_side_plank.mp4 b/...res/raw/bodyweight_fitness_side_plank.mp4 → ...w/bodyweight_fitness_right_side_plank.mp4