Add MutedVideoView so it does not pause music when playing. Merge 3 P…

…lane Neck Movement into one exercise
mazurio · Sep 13, 2016 · b743a9d · b743a9d
1 parent 04dbca1
commit b743a9d
Show file tree

Hide file tree

Showing 8 changed files with 780 additions and 25 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -40,14 +40,14 @@ android {
     productFlavors {
         pro {
             applicationId 'com.bodyweight.fitness.pro'
-            versionCode 134
-            versionName "1.3.0"
+            versionCode 135
+            versionName "1.3.5"
         }
 
         free {
             applicationId 'com.bodyweight.fitness.free'
-            versionCode 134
-            versionName "1.3.0"
+            versionCode 135
+            versionName "1.3.5"
         }
     }
     buildTypes {

diff --git a/app/src/main/java/com/bodyweight/fitness/view/widget/MutedVideoView.java b/app/src/main/java/com/bodyweight/fitness/view/widget/MutedVideoView.java
diff --git a/app/src/main/res/layout/view_workout.xml b/app/src/main/res/layout/view_workout.xml
@@ -15,7 +15,7 @@
         android:layout_alignParentBottom="true"
         android:background="@color/black">
 
-        <VideoView
+        <com.bodyweight.fitness.view.widget.MutedVideoView
             android:id="@+id/video_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

diff --git a/app/src/main/res/raw/molding_mobility_3_plane_neck_movement.mp4 b/app/src/main/res/raw/molding_mobility_3_plane_neck_movement.mp4
diff --git a/app/src/main/res/raw/molding_mobility_3_plane_neck_movement_1.mp4 b/app/src/main/res/raw/molding_mobility_3_plane_neck_movement_1.mp4
diff --git a/app/src/main/res/raw/molding_mobility_3_plane_neck_movement_2.mp4 b/app/src/main/res/raw/molding_mobility_3_plane_neck_movement_2.mp4
diff --git a/app/src/main/res/raw/molding_mobility_3_plane_neck_movement_3.mp4 b/app/src/main/res/raw/molding_mobility_3_plane_neck_movement_3.mp4
diff --git a/app/src/main/res/raw/molding_mobility_flexibility_routine.json b/app/src/main/res/raw/molding_mobility_flexibility_routine.json
@@ -17,29 +17,11 @@
     },
     {
       "exerciseId": "d01477a3-4c0b-4dd4-903d-452636545ccf",
-      "title": "3 Plane Neck Movement - 1a",
+      "title": "3 Plane Neck Movement",
       "description": "1x(5-10)",
       "type": "exercise",
       "youTubeId": "RaCkkjEG824",
-      "videoId": "molding_mobility_3_plane_neck_movement_1",
-      "defaultSet": "weighted"
-    },
-    {
-      "exerciseId": "e34e89a9-587b-462b-8429-00cf9d733428",
-      "title": "3 Plane Neck Movement - 1b",
-      "description": "1x(5-10)",
-      "type": "exercise",
-      "youTubeId": "RaCkkjEG824",
-      "videoId": "molding_mobility_3_plane_neck_movement_2",
-      "defaultSet": "weighted"
-    },
-    {
-      "exerciseId": "c1bd3f51-ac6e-4182-8896-dc2e193da703",
-      "title": "3 Plane Neck Movement - 1c",
-      "description": "1x(5-10)",
-      "type": "exercise",
-      "youTubeId": "RaCkkjEG824",
-      "videoId": "molding_mobility_3_plane_neck_movement_3",
+      "videoId": "molding_mobility_3_plane_neck_movement",
       "defaultSet": "weighted"
     },
     {