diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java index 0257f6c..0c1bc1d 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java @@ -9,6 +9,7 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.media.MediaPlayer; +import android.net.Uri; import android.os.Bundle; import android.support.v4.content.ContextCompat; import android.util.Log; @@ -89,6 +90,9 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall progressText = findViewById(R.id.progressText); progressCircle.setMax(maxProgress); + // Play the video + playVideo(videoView, this); + // Set color of loading circle ProgressBar loadingCircle = findViewById(R.id.loadingCircle); loadingCircle.setIndeterminateTintList(ColorStateList.valueOf(Color.RED)); @@ -200,7 +204,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall public void playVideo(VideoView videoView, Context context) { // Set up the video player if (videoView != null) { - videoView.setVideoPath(exerciseVideoUrl); + videoView.setVideoURI(Uri.parse("android.resource://" + context.getPackageName() + "/" + R.raw.arm_raises)); videoView.start(); } else { Log.e("FitnessActivity", "VideoView is null. Check your layout XML."); diff --git a/code/src/Fitbot/app/src/main/res/raw/arm_raises.mp4 b/code/src/Fitbot/app/src/main/res/raw/arm_raises.mp4 new file mode 100644 index 0000000..2d3ebe6 Binary files /dev/null and b/code/src/Fitbot/app/src/main/res/raw/arm_raises.mp4 differ