diff --git a/app/src/androidTest/kotlin/com/bodyweight/fitness/MainActivityTest.kt b/app/src/androidTest/kotlin/com/bodyweight/fitness/MainActivityTest.kt index 9cd3d780..bdd07133 100644 --- 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(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(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(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 index 344d9fe9..948b5c5d 100644 --- 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 new file mode 100644 index 00000000..19404f54 Binary files /dev/null and b/app/src/main/res/raw/bodyweight_fitness_left_side_plank.mp4 differ diff --git a/app/src/main/res/raw/bodyweight_fitness_recommended_routine.json b/app/src/main/res/raw/bodyweight_fitness_recommended_routine.json index d5fdcc9a..c47badce 100644 --- 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/app/src/main/res/raw/bodyweight_fitness_side_plank.mp4 b/app/src/main/res/raw/bodyweight_fitness_right_side_plank.mp4 similarity index 100% rename from app/src/main/res/raw/bodyweight_fitness_side_plank.mp4 rename to app/src/main/res/raw/bodyweight_fitness_right_side_plank.mp4