From 46ba5dbdbd71d042c7e4eff7342ac8f139c8fc94 Mon Sep 17 00:00:00 2001 From: SebasKoedam Date: Mon, 3 Jun 2024 16:25:35 +0200 Subject: [PATCH] video will now be displayed with link from database --- .../fitbot/ui/activities/FitnessActivity.java | 13 +++++-------- .../app/src/main/res/layout/activity_fitness.xml | 5 ++++- 2 files changed, 9 insertions(+), 9 deletions(-) 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 fb84abd..faa10b9 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 @@ -40,6 +40,8 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall private TextView exerciseShortDescriptionTextView; private TextView exerciseDescriptionTextView; + private static String exerciseVideoUrl; + // Some nice little messages for the user private static final String[] EXERCISE_NOT_FOUND_MESSAGES = new String[]{ "Ik heb momenteel helaas wat moeite met het ophalen van oefeningen, sorry.", @@ -69,6 +71,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall this.exerciseDescriptionTextView = findViewById(R.id.textViewDialogDescription); this.exerciseShortDescriptionTextView = findViewById(R.id.textViewFitnessShortDescription); + // Find the VideoView by its ID VideoView videoView = findViewById(R.id.videoView); playVideo(videoView, this); @@ -139,6 +142,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall exerciseNameTextView.setText(exercise.name); exerciseShortDescriptionTextView.setText(exercise.shortDescription); exerciseDescriptionTextView.setText(exercise.description); + exerciseVideoUrl = exercise.videoUrl; onSuccessfulFetch.handle(exercise); } })).start(); @@ -153,14 +157,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall public static void playVideo(VideoView videoView, Context context) { // Set up the video player if (videoView != null) { - Uri videoUri = Uri.parse("android.resource://" + context.getPackageName() + "/" + R.raw.bicepvideo); - videoView.setVideoURI(videoUri); - - videoView.setOnCompletionListener(mp -> { - // Repeat the video when it finishes playing - videoView.start(); - }); - + videoView.setVideoPath(exerciseVideoUrl); videoView.start(); } else { Log.e("FitnessActivity", "VideoView is null. Check your layout XML."); diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml b/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml index 1eb25a3..ea324d5 100644 --- a/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml +++ b/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml @@ -47,7 +47,10 @@ android:layout_width="300dp" android:layout_height="300dp" android:layout_centerInParent="true" - android:layout_margin="50dp" /> + android:layout_marginStart="50dp" + android:layout_marginTop="50dp" + android:layout_marginEnd="50dp" + android:layout_marginBottom="50dp" />