Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 into 55-als-gebruiker-wil-ik-oefeningen-te-zien-krijgen-met-een-instructie-video-zodat-ik-weet-wat-ik

code/src/Fitbot/app/build.gradle

@@ -7,7 +7,7 @@ android {
 
     defaultConfig {
         applicationId "com.example.fitbot"
-        minSdk 29
+        minSdk 23
         targetSdk 29
         versionCode 1
         versionName "1.0"

code/src/Fitbot/app/src/main/java/com/example/fitbot/sports/Animations.java

@@ -1,4 +1,4 @@
-package com.example.fitbot;
+package com.example.fitbot.sports;
 
 import android.support.v7.app.AppCompatActivity;
 
@@ -7,6 +7,7 @@ import com.aldebaran.qi.sdk.builder.AnimateBuilder;
 import com.aldebaran.qi.sdk.builder.AnimationBuilder;
 import com.aldebaran.qi.sdk.object.actuation.Animate;
 import com.aldebaran.qi.sdk.object.actuation.Animation;
+import com.example.fitbot.ui.activities.MainActivity;
 
 public class Animations extends AppCompatActivity {
 

code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java

@@ -1,15 +1,19 @@
 package com.example.fitbot.ui.activities;
 
 import android.net.Uri;
+import static com.example.fitbot.sports.Animations.Animate;
+
 import android.os.Bundle;
 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.EndScreenActivity;
 import com.example.fitbot.R;
+import com.example.fitbot.sports.Animations;
 
 public class FitnessActivity extends RobotActivity implements RobotLifecycleCallbacks {
 
@@ -29,10 +33,15 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
         }
 
 
+        QiSDK.register(this, this);
+
+    }
 
     @Override
     public void onRobotFocusGained(QiContext qiContext) {
         // Implement your logic when the robot focus is gained
+        Animate("bicepcurl", qiContext);
+
     }
 
     @Override
@@ -44,5 +53,12 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
     public void onRobotFocusRefused(String reason) {
         // Implement your logic when the robot focus is refused
     }
+
+    @Override
+    protected void onDestroy() {
+        QiSDK.unregister(this, this);
+
+        super.onDestroy();
+    }
 }
 

code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java

@@ -1,5 +1,7 @@
 package com.example.fitbot.ui.activities;
 
+import static com.example.fitbot.sports.Animations.Animate;
+
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.bluetooth.BluetoothAdapter;