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 48907b2..8435614 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 @@ -260,7 +260,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall public void incrementProgress(View view) { if (progress < maxProgress) { progress++; - triggerColorBurst(false); + triggerColorBurst(true); updateProgress(); } } @@ -274,8 +274,10 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall if (isGoodRep) { progressCircle.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progress_circle_good)); + new MediaPlayer().create(this, R.raw.good_sound).start(); } else { progressCircle.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progress_circle_bad)); + new MediaPlayer().create(this, R.raw.wrong_sound).start(); } ObjectAnimator animator = ObjectAnimator.ofFloat(progressCircle, "alpha", 1f, 0f, 1f); diff --git a/code/src/Fitbot/app/src/main/res/raw/good_sound.mp3 b/code/src/Fitbot/app/src/main/res/raw/good_sound.mp3 new file mode 100644 index 0000000..9fe5526 Binary files /dev/null and b/code/src/Fitbot/app/src/main/res/raw/good_sound.mp3 differ diff --git a/code/src/Fitbot/app/src/main/res/raw/wrong_sound.wav b/code/src/Fitbot/app/src/main/res/raw/wrong_sound.wav new file mode 100644 index 0000000..bdd516d Binary files /dev/null and b/code/src/Fitbot/app/src/main/res/raw/wrong_sound.wav differ