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

removed shimmer effect due to compatebility with rest of the code

Browse Source
This commit is contained in:
SebasKoedam
2024-06-05 15:07:25 +02:00
parent ab00985863
commit e90abbfe9a
1 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,9 +2,7 @@ package com.example.fitbot.ui.activities;
import android.animation.Animator; import android.animation.Animator;
import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorListenerAdapter;
import android.animation.ArgbEvaluator;
import android.animation.ObjectAnimator; import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
@@ -59,8 +57,6 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
private VideoView videoView; private VideoView videoView;
private QiContext qiContext; private QiContext qiContext;
private ObjectAnimator shimmerAnimator;
private final Object lock = new Object(); private final Object lock = new Object();
// Some nice little messages for the user // Some nice little messages for the user
@@ -101,14 +97,6 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
ProgressBar loadingCircle = findViewById(R.id.loadingCircle); ProgressBar loadingCircle = findViewById(R.id.loadingCircle);
loadingCircle.setIndeterminateTintList(ColorStateList.valueOf(Color.RED)); loadingCircle.setIndeterminateTintList(ColorStateList.valueOf(Color.RED));
// 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);
// Navigation Buttons // Navigation Buttons
NavigationManager.setupButtonNavigation(this, R.id.homeButtonFitness, MainActivity.class); NavigationManager.setupButtonNavigation(this, R.id.homeButtonFitness, MainActivity.class);
NavigationManager.setupButtonNavigation(this, R.id.skipButtonFitness, MainActivity.class); //Needs to skip exercises once those are implemented NavigationManager.setupButtonNavigation(this, R.id.skipButtonFitness, MainActivity.class); //Needs to skip exercises once those are implemented
@@ -182,8 +170,6 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
ProgressBar loadingCircle = findViewById(R.id.loadingCircle); ProgressBar loadingCircle = findViewById(R.id.loadingCircle);
loadingCircle.setVisibility(View.GONE); loadingCircle.setVisibility(View.GONE);
// Stop shimmer animation
stopShimmerAnimation();
if ( videoView.isPlaying() ) if ( videoView.isPlaying() )
{ {
@@ -316,24 +302,4 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
}); });
animator.start(); animator.start();
} }
public void shimmerAnimation(View view) {
ObjectAnimator animator = ObjectAnimator.ofObject(
view,
"backgroundColor",
new ArgbEvaluator(),
ContextCompat.getColor(view.getContext(), R.color.shimmerStartColor),
ContextCompat.getColor(view.getContext(), R.color.shimmerEndColor)
);
animator.setDuration(1200);
animator.setRepeatCount(ValueAnimator.INFINITE);
animator.setRepeatMode(ValueAnimator.REVERSE);
animator.start();
}
public void stopShimmerAnimation() {
if (shimmerAnimator != null && shimmerAnimator.isRunning()) {
shimmerAnimator.cancel();
}
}
} }