Smikkelbakje/J1B4-Fitbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Luca Warmenhoven
2024-06-05 15:07:17 +02:00
parent 3ed4db39c0 e63767d828
commit 9eadbf3ad3
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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() )
{
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.");
}
Pepper.animate("armraise");
// Start checking for user movement once the video has loaded
this.motionProcessor.startListening();