From f6de29ffa01c128d2448d8567aa9b0cd1531d856 Mon Sep 17 00:00:00 2001 From: Kilian Sonna <83295418+killianson@users.noreply.github.com> Date: Sat, 15 Apr 2023 16:55:37 +0200 Subject: [PATCH] custom program: workout timer --- .../workoutwarrior/WorkoutActivity.java | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java b/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java index 63beeb0..a3d0bde 100644 --- a/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java +++ b/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java @@ -100,11 +100,17 @@ public class WorkoutActivity extends AppCompatActivity { // Lauch custom program void onNextClickCustomProgram(String[][] exercises) { + /** + * For custom programs: when the button "Suivant" is pressed + */ exerciseIndexToDisplay++; - System.out.println("index : " + exerciseIndexToDisplay); - System.out.println("len : " + exercises.length); + + TextView countdown_text = findViewById(R.id.workout_timer); + countdown_text.setVisibility(View.INVISIBLE); + + countdown.cancel(); + if (exerciseIndexToDisplay >= exercises.length) { - System.out.println("on finish"); finish(); } else { TextView name = findViewById(R.id.workout_todo); @@ -160,6 +166,9 @@ public class WorkoutActivity extends AppCompatActivity { } void displayCustomExercise(String[][] exercises) { + /** + * For custom programs : display the exercise + */ if (exerciseIndexToDisplay >= exercises.length) finish(); next_btn.setOnClickListener(v1 -> onNextClickCustomProgram(exercises)); TextView name = findViewById(R.id.workout_todo); @@ -174,6 +183,23 @@ public class WorkoutActivity extends AppCompatActivity { int resourceId = getResources().getIdentifier(exercises[exerciseIndexToDisplay][2], "drawable", getPackageName()); image.setImageResource(resourceId); image.setVisibility(View.VISIBLE); + + timer = Integer.parseInt(exercises[exerciseIndexToDisplay][3]) * 1000; + System.out.println("timer = " + timer); + + //Check if the user click on "start timer" + Button launch_timer = findViewById(R.id.launch_timer); + launch_timer.setVisibility(View.VISIBLE); + launch_timer.setOnClickListener(view -> { + TextView countdown_text = findViewById(R.id.workout_timer); + countdown_text.setVisibility(View.VISIBLE); + countdown = workout_timer(timer); + countdown.start(); + launch_timer.setVisibility(View.INVISIBLE); + workout_timer_started = true; + workout_timer_counting = true; + }); + timeLeftInMillis = timer; } -- GitLab