From 38398efea4c0462b4b93e9e597beda9920022754 Mon Sep 17 00:00:00 2001 From: a-mabe Date: Fri, 22 Mar 2024 16:42:57 -0400 Subject: [PATCH] Fix exercise names not shown --- lib/start_workout/workout.dart | 4 +--- lib/utils/functions.dart | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/start_workout/workout.dart b/lib/start_workout/workout.dart index 5aa1b85..fa31cf5 100644 --- a/lib/start_workout/workout.dart +++ b/lib/start_workout/workout.dart @@ -124,9 +124,7 @@ class CountDownTimerState extends State case 'warmup': return "Warm-up"; case 'work': - String exercise = workoutArgument.numExercises == exercises.length - ? exercises[interval] - : "Work"; + String exercise = exercises.isNotEmpty ? exercises[interval] : "Work"; flipCurrentWorkInterval = true; return exercise; case 'rest': diff --git a/lib/utils/functions.dart b/lib/utils/functions.dart index efbdd9b..8919906 100644 --- a/lib/utils/functions.dart +++ b/lib/utils/functions.dart @@ -148,7 +148,7 @@ List listItems(List exercises, Workout workoutArg) { if (workoutArg.workTime > 0) { listItems.add( ListTileModel( - action: "Work", + action: exercises.isNotEmpty ? exercises[interval - 1] : "Work", showMinutes: workoutArg.showMinutes, interval: interval, total: workoutArg.numExercises,