Merge remote-tracking branch 'origin/main'

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

@@ -168,6 +168,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
             } else {
                 onSuccessfulFetch.handle(exercise);
                 runOnUiThread(() -> {
+
                     exerciseNameTextView.setText(exercise.name);
                     exerciseShortDescriptionTextView.setText(exercise.shortDescription);
                     // exerciseDescriptionTextView.setText(exercise.description);
@@ -185,23 +186,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
                             // Stop shimmer animation
                             stopShimmerAnimation();
 
-                            if ( videoView.isPlaying() )
+                            Pepper.animate("armraise");
-                            {
-                                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.");
-                            }
 
                             // Start checking for user movement once the video has loaded
                             this.motionProcessor.startListening();