Merge branch 'remy' into 'main'

patch timer

See merge request !30

app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java

@@ -8,6 +8,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.Vibrator;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageButton;
@@ -214,6 +215,7 @@ public class WorkoutActivity extends AppCompatActivity {
                         countdown.onFinish();
                     }
                 }
+
             }
 
             @Override
@@ -225,18 +227,19 @@ public class WorkoutActivity extends AppCompatActivity {
 
     @SuppressLint("SetTextI18n")
     private void onNextClick() {
-        if (set_countDownTimer != null) {
-            set_countDownTimer.cancel();
-            set_countDownTimer.onFinish();
+        try {
+            countdown.cancel();
+            TextView countdown_text = findViewById(R.id.workout_timer);
+            countdown_text.setText("");
+        } catch (Exception e){
+            Log.d("Exception", "onNextClick: " + e);
         }
 
-        System.out.println("counting : " + workout_timer_counting + countdown);
-        if (workout_timer_counting && countdown != null) {
-            countdown.cancel();
-            countdown.onFinish();
-            countdown = null;
-            System.out.println("countdown = " + countdown);
-            workout_timer_counting = false;
+
+        if (set_countDownTimer != null) {
+            set_countDownTimer.cancel();
+            //set_countDownTimer.onFinish();
+            workout_timer_started = false;
         }
 
         TextView name = findViewById(R.id.workout_todo);