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 47b8b76..3daf12c 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 @@ -72,8 +72,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall setSpeechBarDisplayStrategy(SpeechBarDisplayStrategy.IMMERSIVE); // Find the VideoView by its ID - VideoView videoView = findViewById(R.id.videoView); -// playVideo(videoView, this); + NavigationManager.setupButtonNavigation(this, R.id.homeButtonFitness, MainActivity.class); NavigationManager.setupButtonNavigation(this, R.id.skipButtonFitness, MainActivity.class); //Needs to skip exercises once those are implemented @@ -139,15 +138,18 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall if (exercise == null) { onFailedFetch.handle(null); } else { - exerciseNameTextView.setText(exercise.name); - exerciseShortDescriptionTextView.setText(exercise.shortDescription); - exerciseDescriptionTextView.setText(exercise.description); - exerciseVideoUrl = exercise.videoUrl; onSuccessfulFetch.handle(exercise); this.runOnUiThread(() -> { exerciseNameTextView.setText(exercise.name); exerciseShortDescriptionTextView.setText(exercise.shortDescription); + exerciseNameTextView.setText(exercise.name); + exerciseShortDescriptionTextView.setText(exercise.shortDescription); +// exerciseDescriptionTextView.setText(exercise.description); + exerciseVideoUrl = exercise.videoUrl; // exerciseDescriptionTextView.setText(exercise.description); + VideoView videoView = findViewById(R.id.videoView); + Log.e("exerciseVideoUrl", "videourl:" + exerciseVideoUrl); + playVideo(videoView, this); }); } })).start();