From 8fde16bac17c19f2b4abe7e20532a40461657844 Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Wed, 5 Jun 2024 14:32:37 +0200 Subject: [PATCH 1/3] fix run ui thread --- .../java/com/example/fitbot/ui/activities/FitnessActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 1350a78..9bb7708 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 @@ -162,8 +162,9 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall if (exercise == null) { runOnUiThread(() -> onFailedFetch.handle(null)); } else { + onSuccessfulFetch.handle(exercise); runOnUiThread(() -> { - onSuccessfulFetch.handle(exercise); + exerciseNameTextView.setText(exercise.name); exerciseShortDescriptionTextView.setText(exercise.shortDescription); // exerciseDescriptionTextView.setText(exercise.description); From bbb8e3d84cb8bd0f79446d45ac8a4ef905fbedac Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Wed, 5 Jun 2024 14:44:13 +0200 Subject: [PATCH 2/3] disabled animation stuff --- .../fitbot/ui/activities/FitnessActivity.java | 18 +++++++++--------- 1 file 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 ffa3276..573ffbe 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 @@ -181,16 +181,16 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall 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. +// 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. - animate = AnimateBuilder.with(qiContext) // Create the builder with the context. - .withAnimation(animationarmraise) // Set the animation. - .build(); // Build the animate action. - - Future animateFuture = animate.async().run(); +// Future animateFuture = animate.async().run(); } else { From 68e688bb0e427939cbc8a557f178d038c8b6516d Mon Sep 17 00:00:00 2001 From: Niels Gras Date: Wed, 5 Jun 2024 14:50:50 +0200 Subject: [PATCH 3/3] added pepper animation using class --- .../fitbot/ui/activities/FitnessActivity.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 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 a890a4c..e42fda2 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 @@ -178,23 +178,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall 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 animateFuture = animate.async().run(); - } - else - { - Log.e("FitnessActivity", "VideoView is null. Check your layout XML."); - } + Pepper.animate("armraise"); // Start checking for user movement once the video has loaded this.motionProcessor.startCheckingUserMovement();