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 f50de83..5b681fc 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 @@ -183,16 +183,13 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall return false; }); - if (EXERCISE_REP == 10) { - Intent intent = new Intent(FitnessActivity.this, EndScreenActivity.class); - startActivity(intent); - finish(); - } - videoView.setOnCompletionListener(mp -> { if (EXERCISE_VIDEO_REPETITION < ExerciseManager.DEFAULT_EXERCISE_REPETITIONS) { videoView.start(); // start the video again EXERCISE_VIDEO_REPETITION++; + if (progress >= 10) { + runOnUiThread(() -> NavigationManager.navigateToActivity(this, EndScreenActivity.class)); + } } }); });