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

Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66

Browse Source
This commit is contained in:
Niels Gras
2024-06-05 14:51:38 +02:00
parent 68e688bb0e b0fd9eb89e
commit e63767d828
2 changed files with 17 additions and 4 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

@@ -59,6 +59,8 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
private VideoView videoView;
private QiContext qiContext;
private ObjectAnimator shimmerAnimator;
private final Object lock = new Object();
// Some nice little messages for the user
@@ -99,9 +101,11 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
ProgressBar loadingCircle = findViewById(R.id.loadingCircle);
loadingCircle.setIndeterminateTintList(ColorStateList.valueOf(Color.RED));
// Shimmer animation for loading elements
// Start shimmer animation for loading elements
View shimmerProgressCircle = findViewById(R.id.progressCircle);
View shimmerFitnessTitle = findViewById(R.id.textViewFitnessTitle);
View shimmerFitnessText = findViewById(R.id.textViewFitnessShortDescription);
shimmerAnimation(shimmerProgressCircle);
shimmerAnimation(shimmerFitnessTitle);
shimmerAnimation(shimmerFitnessText);
@@ -164,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);
@@ -178,6 +183,9 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
ProgressBar loadingCircle = findViewById(R.id.loadingCircle);
loadingCircle.setVisibility(View.GONE);
// Stop shimmer animation
stopShimmerAnimation();
Pepper.animate("armraise");
// Start checking for user movement once the video has loaded
@@ -284,7 +292,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
MediaPlayer.create(this, soundId).start();
ObjectAnimator animator = ObjectAnimator.ofFloat(progressCircle, "alpha", 1f, 0f, 1f);
animator.setDuration(500); // Burst duration
animator.setDuration(700); // Burst duration
animator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
@@ -302,10 +310,15 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
ContextCompat.getColor(view.getContext(), R.color.shimmerStartColor),
ContextCompat.getColor(view.getContext(), R.color.shimmerEndColor)
);
animator.setDuration(1000);
animator.setDuration(1200);
animator.setRepeatCount(ValueAnimator.INFINITE);
animator.setRepeatMode(ValueAnimator.REVERSE);
animator.start();
}
public void stopShimmerAnimation() {
if (shimmerAnimator != null && shimmerAnimator.isRunning()) {
shimmerAnimator.cancel();
}
}
}

2
code/src/Fitbot/app/src/main/res/values/colors.xml
View File

@@ -16,6 +16,6 @@
<color name="invertedIconTint">#000000</color>
<color name="transparent">#00000000</color>
<color name="shimmerStartColor">#EFEFEF</color>
<color name="shimmerEndColor">#DDDDDD</color>
<color name="shimmerEndColor">#ADADAD</color>
</resources>