From dd37b52e838d45e1b5e60504bd8b8f67918e2606 Mon Sep 17 00:00:00 2001
From: Sam Hos <sam.hos@hva.nl>
Date: Fri, 7 Jun 2024 14:48:13 +0200
Subject: [PATCH] fix that it goes to endscreen at end

---
 .../example/fitbot/ui/activities/FitnessActivity.java    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

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));
+                            }
                         }
                     });
                 });