From 60fa1cec2cb97ab8e36c456537fdafc455ee376a Mon Sep 17 00:00:00 2001 From: Niels Gras Date: Wed, 22 May 2024 14:47:01 +0200 Subject: [PATCH] Fixed crashing errors --- .../fitbot/ui/activities/FitnessActivity.java | 52 ++++++++++++------- 1 file changed, 32 insertions(+), 20 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 2fca666..10ba5f8 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 @@ -1,21 +1,17 @@ package com.example.fitbot.ui.activities; -import android.content.Context; +import android.net.Uri; import android.os.Bundle; -import android.util.AttributeSet; import android.util.Log; -import android.view.View; +import android.widget.MediaController; +import android.widget.VideoView; import com.aldebaran.qi.sdk.QiContext; import com.aldebaran.qi.sdk.QiSDK; import com.aldebaran.qi.sdk.RobotLifecycleCallbacks; import com.aldebaran.qi.sdk.design.activity.RobotActivity; -import com.example.fitbot.ui.activities.EndScreenActivity; import com.example.fitbot.R; import com.example.fitbot.sports.Animations; -import com.example.fitbot.R; -import com.example.fitbot.exercise.Exercise; -import com.example.fitbot.exercise.EMuscleGroup; import com.example.fitbot.ui.components.PersonalMotionPreviewElement; import com.example.fitbot.util.path.GesturePath; @@ -23,13 +19,31 @@ import org.joml.Vector3f; public class FitnessActivity extends RobotActivity implements RobotLifecycleCallbacks { - PersonalMotionPreviewElement personalMotionPreviewElement; +// PersonalMotionPreviewElement personalMotionPreviewElement; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + // Set the content view to the appropriate layout setContentView(R.layout.activity_fitness); + // Find the VideoView by its ID + VideoView videoView = findViewById(R.id.videoView); + + if (videoView != null) { + videoView.setVideoURI(Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.bicepvideo)); + + MediaController mediaController = new MediaController(this); + videoView.setMediaController(mediaController); + videoView.start(); + } else { + Log.e("FitnessActivity", "VideoView is null. Check your layout XML."); + } + + com.example.fitbot.util.ButtonNavigation.setupButtonNavigation(this, R.id.homeButton, MainActivity.class); + com.example.fitbot.util.ButtonNavigation.setupButtonNavigation(this, R.id.buttonComplete, EndScreenActivity.class); + GesturePath.Builder gesturePathBuilder = new GesturePath.Builder(); gesturePathBuilder.addVector(new Vector3f(-.5f, -.5f, -.5f)); @@ -44,22 +58,21 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall gesturePathBuilder.addVector(new Vector3f(-.5f, .5f, .5f)); gesturePathBuilder.addVector(new Vector3f(-.5f, .5f, -.5f)); - - personalMotionPreviewElement = findViewById(R.id.personalMotionPreviewElement); - personalMotionPreviewElement.post(() -> { - Log.i("FitnessActivity", "PersonalMotionPreviewElement.post()"); - - Exercise exercise = new Exercise(EMuscleGroup.ARMS, "Bicep Curls", "Oefening voor de biceps.", gesturePathBuilder.build(), 1); - - personalMotionPreviewElement.initialize(exercise); - }); + // Uncomment and fix if needed for personalMotionPreviewElement + // personalMotionPreviewElement = findViewById(R.id.personalMotionPreviewElement); + // personalMotionPreviewElement.post(() -> { + // Log.i("FitnessActivity", "PersonalMotionPreviewElement.post()"); + // + // Exercise exercise = new Exercise(EMuscleGroup.ARMS, "Bicep Curls", "Oefening voor de biceps.", gesturePathBuilder.build(), 1); + // + // personalMotionPreviewElement.initialize(exercise); + // }); } @Override public void onRobotFocusGained(QiContext qiContext) { // Implement your logic when the robot focus is gained Animations.Animate("bicepcurl", qiContext); - } @Override @@ -75,7 +88,6 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall @Override protected void onDestroy() { QiSDK.unregister(this, this); - super.onDestroy(); } -} +} \ No newline at end of file