wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: add end workout button to 'jump to' section

Browse Source
This commit is contained in:
Arthur De Neyer
2025-10-13 23:32:39 +02:00
parent 93a11a16e4
commit 354a8c381c
8 changed files with 60 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/l10n/app_en.arb
View File

@@ -1028,6 +1028,7 @@
"@indicatorAvg": {
"description": "added for localization of Class Indicator's field text"
},
"endWorkout": "End Workout",
"themeMode": "Theme mode",
"darkMode": "Always dark mode",
"lightMode": "Always light mode",

3
lib/widgets/routines/gym_mode/exercise_overview.dart
View File

@@ -25,12 +25,14 @@ class ExerciseOverview extends StatelessWidget {
final Exercise _exercise;
final double _ratioCompleted;
final Map<Exercise, int> _exercisePages;
final int _totalPages;
const ExerciseOverview(
this._controller,
this._exercise,
this._ratioCompleted,
this._exercisePages,
this._totalPages,
);
@override
@@ -40,6 +42,7 @@ class ExerciseOverview extends StatelessWidget {
NavigationHeader(
_exercise.getTranslation(Localizations.localeOf(context).languageCode).name,
_controller,
_totalPages,
exercisePages: _exercisePages,
),
Expanded(

22
lib/widgets/routines/gym_mode/gym_mode.dart
View File

@@ -46,6 +46,7 @@ class GymMode extends ConsumerStatefulWidget {
class _GymModeState extends ConsumerState<GymMode> {
var _totalElements = 1;
var _totalPages = 1;
late Future<int> _initData;
bool _initialPageJumped = false;
@@ -103,6 +104,12 @@ class _GymModeState extends ConsumerState<GymMode> {
void _calculatePages() {
for (final slot in widget._dayDataGym.slots) {
_totalElements += slot.setConfigs.length;
// add 1 for each exercise
_totalPages += 1;
for (final config in slot.setConfigs) {
// add nrOfSets * 2, 1 for log page and 1 for timer
_totalPages += (config.nrOfSets! * 2).toInt();
}
}
_exercisePages.clear();
var currentPage = 1;
@@ -128,7 +135,7 @@ class _GymModeState extends ConsumerState<GymMode> {
final routinesProvider = context.read<RoutinesProvider>();
var currentElement = 1;
final List<Widget> out = [];
for (final slotData in widget._dayDataGym.slots) {
var firstPage = true;
for (final config in slotData.setConfigs) {
@@ -143,10 +150,11 @@ class _GymModeState extends ConsumerState<GymMode> {
exercise,
ratioCompleted,
state.exercisePages,
_totalPages
),
);
}
out.add(
LogPage(
_controller,
@@ -156,7 +164,8 @@ class _GymModeState extends ConsumerState<GymMode> {
routinesProvider.findById(widget._dayDataGym.day!.routineId),
ratioCompleted,
state.exercisePages,
widget._iteration,
_totalPages,
widget._iteration
),
);
@@ -168,16 +177,16 @@ class _GymModeState extends ConsumerState<GymMode> {
config.restTime!.toInt(),
ratioCompleted,
state.exercisePages,
_totalPages
),
);
} else {
out.add(TimerWidget(_controller, ratioCompleted, state.exercisePages));
out.add(TimerWidget(_controller, ratioCompleted, state.exercisePages, _totalPages));
}
firstPage = false;
}
}
return out;
}
@@ -201,13 +210,14 @@ class _GymModeState extends ConsumerState<GymMode> {
});
final List<Widget> children = [
StartPage(_controller, widget._dayDataDisplay, _exercisePages),
StartPage(_controller, widget._dayDataDisplay, _exercisePages, _totalPages),
...getContent(),
SessionPage(
context.read<RoutinesProvider>().findById(widget._dayDataGym.day!.routineId),
_controller,
ref.read(gymStateProvider).startTime,
_exercisePages,
_totalPages,
dayId: widget._dayDataGym.day!.id!,
),
];

3
lib/widgets/routines/gym_mode/log_page.dart
View File

@@ -48,6 +48,7 @@ class LogPage extends ConsumerStatefulWidget {
final double _ratioCompleted;
final Map<Exercise, int> _exercisePages;
final Log _log;
final int _totalPages;
LogPage(
this._controller,
@@ -57,6 +58,7 @@ class LogPage extends ConsumerStatefulWidget {
this._workoutPlan,
this._ratioCompleted,
this._exercisePages,
this._totalPages,
int? iteration,
) : _log = Log.fromSetConfigData(_configData)
..routineId = _workoutPlan.id!
@@ -266,6 +268,7 @@ class _LogPageState extends ConsumerState<LogPage> {
NavigationHeader(
widget._exercise.getTranslation(Localizations.localeOf(context).languageCode).name,
widget._controller,
widget._totalPages,
exercisePages: widget._exercisePages,
),

24
lib/widgets/routines/gym_mode/navigation.dart
View File

@@ -15,6 +15,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import 'package:flutter/material.dart';
import 'package:wger/helpers/consts.dart';
import 'package:wger/l10n/generated/app_localizations.dart';
@@ -78,14 +79,32 @@ class NavigationHeader extends StatelessWidget {
final PageController _controller;
final String _title;
final Map<Exercise, int> exercisePages;
final int _totalPages;
final bool hideEndWorkoutButton;
const NavigationHeader(
this._title,
this._controller, {
required this.exercisePages,
this._controller,
this._totalPages, {
required this.exercisePages,
this.hideEndWorkoutButton = false
});
Widget getDialog(BuildContext context) {
final TextButton? endWorkoutButton = !hideEndWorkoutButton ?
TextButton(
child: Text(AppLocalizations.of(context).endWorkout),
onPressed: () {
_controller.animateToPage(
_totalPages,
duration: DEFAULT_ANIMATION_DURATION,
curve: DEFAULT_ANIMATION_CURVE,
);
Navigator.of(context).pop();
},
) : null;
return AlertDialog(
title: Text(
AppLocalizations.of(context).jumpTo,
@@ -113,6 +132,7 @@ class NavigationHeader extends StatelessWidget {
),
),
actions: [
?endWorkoutButton,
TextButton(
child: Text(MaterialLocalizations.of(context).closeButtonLabel),
onPressed: () {

6
lib/widgets/routines/gym_mode/session_page.dart
View File

@@ -31,12 +31,14 @@ class SessionPage extends StatelessWidget {
final WorkoutSession _session;
final PageController _controller;
final Map<Exercise, int> _exercisePages;
final int _totalElements;
SessionPage(
this._routine,
this._controller,
TimeOfDay start,
this._exercisePages, {
this._exercisePages,
this._totalElements, {
int? dayId,
}) : _session = _routine.sessions
.map((sessionApi) => sessionApi.session)
@@ -59,7 +61,9 @@ class SessionPage extends StatelessWidget {
NavigationHeader(
AppLocalizations.of(context).workoutSession,
_controller,
_totalElements,
exercisePages: _exercisePages,
hideEndWorkoutButton: true,
),
Expanded(child: Container()),
Padding(

5
lib/widgets/routines/gym_mode/start_page.dart
View File

@@ -9,8 +9,9 @@ class StartPage extends StatelessWidget {
final PageController _controller;
final DayData _dayData;
final Map<Exercise, int> _exercisePages;
final int _totalPages;
const StartPage(this._controller, this._dayData, this._exercisePages);
const StartPage(this._controller, this._dayData, this._exercisePages, this._totalPages);
@override
Widget build(BuildContext context) {
@@ -19,7 +20,9 @@ class StartPage extends StatelessWidget {
NavigationHeader(
AppLocalizations.of(context).todaysWorkout,
_controller,
_totalPages,
exercisePages: _exercisePages,
hideEndWorkoutButton: true,
),
Expanded(
child: ListView(

6
lib/widgets/routines/gym_mode/timer.dart
View File

@@ -28,11 +28,13 @@ class TimerWidget extends StatefulWidget {
final PageController _controller;
final double _ratioCompleted;
final Map<Exercise, int> _exercisePages;
final _totalPages;
const TimerWidget(
this._controller,
this._ratioCompleted,
this._exercisePages,
this._totalPages
);
@override
@@ -72,6 +74,7 @@ class _TimerWidgetState extends State<TimerWidget> {
NavigationHeader(
AppLocalizations.of(context).pause,
widget._controller,
widget._totalPages,
exercisePages: widget._exercisePages,
),
Expanded(
@@ -93,12 +96,14 @@ class TimerCountdownWidget extends StatefulWidget {
final double _ratioCompleted;
final int _seconds;
final Map<Exercise, int> _exercisePages;
final int _totalPages;
const TimerCountdownWidget(
this._controller,
this._seconds,
this._ratioCompleted,
this._exercisePages,
this._totalPages
);
@override
@@ -137,6 +142,7 @@ class _TimerCountdownWidgetState extends State<TimerCountdownWidget> {
NavigationHeader(
AppLocalizations.of(context).pause,
widget._controller,
widget._totalPages,
exercisePages: widget._exercisePages,
),
Expanded(