git/slrpg-app
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix: fix error in set preview

Browse source
This commit is contained in:
Patryk Hegenberg 2026-01-07 12:17:01 +01:00
parent 79a7e1c50d
commit 253f694424
1 changed files with 13 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

62
lib/src/features/workout_runner/presentation/screens/battle_screen.dart
View file

@ -628,18 +628,20 @@ class _BattleScreenState extends ConsumerState<BattleScreen> {
}
Widget _buildRestScreen(Map<String, dynamic> 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<BattleScreen> {
);
}
// Widget _buildNextSetPlates(
// Exercise exercise, WorkoutSet set, Map<String, dynamic> 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,