From 253f694424a5cac053b6a2050b582e5119aa9227 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Wed, 7 Jan 2026 12:17:01 +0100 Subject: [PATCH] fix: fix error in set preview --- .../presentation/screens/battle_screen.dart | 62 ++++--------------- 1 file changed, 13 insertions(+), 49 deletions(-) diff --git a/lib/src/features/workout_runner/presentation/screens/battle_screen.dart b/lib/src/features/workout_runner/presentation/screens/battle_screen.dart index 44ffa4e..df755d1 100644 --- a/lib/src/features/workout_runner/presentation/screens/battle_screen.dart +++ b/lib/src/features/workout_runner/presentation/screens/battle_screen.dart @@ -628,18 +628,20 @@ class _BattleScreenState extends ConsumerState { } Widget _buildRestScreen(Map inventory) { - WorkoutSet? nextSet; - Exercise? nextExerciseInfo; + // WorkoutSet? nextSet; + // Exercise? nextExerciseInfo; - if (_currentSetIndex + 1 < _exercises[_currentExerciseIndex].sets.length) { - nextExerciseInfo = _exercises[_currentExerciseIndex]; - nextSet = nextExerciseInfo.sets[_currentSetIndex + 1]; - } else if (_currentExerciseIndex + 1 < _exercises.length) { - nextExerciseInfo = _exercises[_currentExerciseIndex + 1]; - if (nextExerciseInfo.sets.isNotEmpty) { - nextSet = nextExerciseInfo.sets.first; - } - } + // if (_currentSetIndex + 1 < _exercises[_currentExerciseIndex].sets.length) { + // nextExerciseInfo = _exercises[_currentExerciseIndex]; + // nextSet = nextExerciseInfo.sets[_currentSetIndex + 1]; + // } else if (_currentExerciseIndex + 1 < _exercises.length) { + // nextExerciseInfo = _exercises[_currentExerciseIndex + 1]; + // if (nextExerciseInfo.sets.isNotEmpty) { + // nextSet = nextExerciseInfo.sets.first; + // } + // } + final nextExerciseInfo = _exercises[_currentExerciseIndex]; + final nextSet = nextExerciseInfo.sets[_currentSetIndex]; return Container( decoration: const BoxDecoration( @@ -760,44 +762,6 @@ class _BattleScreenState extends ConsumerState { ); } - // Widget _buildNextSetPlates( - // Exercise exercise, WorkoutSet set, Map inventory) { - // final isTwoSided = exercise.exerciseId == 'squat' || - // exercise.exerciseId == 'row' || - // exercise.exerciseId == 'bench' || - // exercise.exerciseId == 'rdl' || - // exercise.exerciseId == 'ohp' || - // exercise.exerciseId == 'curl'; - - // if (!isTwoSided) return const SizedBox.shrink(); - - // final barWeight = (inventory['bar_weight'] as num?)?.toDouble() ?? 20.0; - // final platesList = (inventory['plates'] as List?) - // ?.map((e) => (e as num).toDouble()) - // .toList() ?? - // []; - - // final plateResult = PlateCalculator.calculate( - // targetWeight: set.targetWeightTotal, - // barWeight: barWeight, - // availablePlates: platesList, - // availableBands: {}, - // isTwoSided: true, - // ); - - // return Padding( - // padding: const EdgeInsets.only(top: 12.0), - // child: SizedBox( - // height: 50, - // child: PlateVisualizer( - // plateConfiguration: plateResult.plateConfiguration, - // isTwoSided: true, - // exerciseName: '', - // ), - // ), - // ); - // } - Widget _buildWorkoutScreen( Exercise currentExercise, WorkoutSet currentSet,