Merge remote-tracking branch 'origin/main'

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

@@ -55,6 +55,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
     private static String exerciseVideoUrl;
     private Animate animate;
     private VideoView videoView;
+    private QiContext qiContext;
 
     private final Object lock = new Object();
 
@@ -131,22 +132,6 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
             motionProcessor.setRecording(true, 10);
             motionProcessor.startListening();
 
-            if ( videoView.isPlaying() )
-            {
-                Animation animationarmraise = AnimationBuilder.with(qiContext) // Create the builder with the context.
-                        .withResources(R.raw.armraise) // Set the animation resource.
-                        .build(); // Build the animation.
-
-                animate = AnimateBuilder.with(qiContext) // Create the builder with the context.
-                        .withAnimation(animationarmraise) // Set the animation.
-                        .build(); // Build the animate action.
-
-                Future<Void> animateFuture = animate.async().run();
-            }
-            else
-            {
-                Log.e("FitnessActivity", "VideoView is null. Check your layout XML.");
-            }
 
         }, (n) -> {
             int randomMessageIndex = (int) Math.floor(Math.random() * EXERCISE_NOT_FOUND_MESSAGES.length);
@@ -184,6 +169,25 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
                         if (what == MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START) {
                             ProgressBar loadingCircle = findViewById(R.id.loadingCircle);
                             loadingCircle.setVisibility(View.GONE);
+
+                            if ( videoView.isPlaying() )
+                            {
+                                QiContext qiContext = null;
+                                Animation animationarmraise = AnimationBuilder.with(qiContext) // Create the builder with the context.
+                                        .withResources(R.raw.armraise) // Set the animation resource.
+                                        .build(); // Build the animation.
+
+                                animate = AnimateBuilder.with(qiContext) // Create the builder with the context.
+                                        .withAnimation(animationarmraise) // Set the animation.
+                                        .build(); // Build the animate action.
+
+                                Future<Void> animateFuture = animate.async().run();
+                            }
+                            else
+                            {
+                                Log.e("FitnessActivity", "VideoView is null. Check your layout XML.");
+                            }
+
                             return true;
                         }
                         return false;