Commit Graph

2116 Commits

Author SHA1 Message Date
Roland Geider
ffc2f1a674 Allow some options for the user to control the timer between sets 2025-12-02 22:32:14 +01:00
Anupthor007
55259e7483 feat: add configurable sound & vibration when countdown finishes (Fixes #1012) 2025-12-02 20:45:49 +01:00
Roland Geider
910e662243 Correctly show exercise overviews for supersets 2025-12-02 17:21:12 +01:00
Roland Geider
556713319c Correctly calculate the total number of pages 2025-12-02 16:55:25 +01:00
Roland Geider
56cdffb010 Merge branch 'master' into feature/gym-mode
# Conflicts:
#	integration_test/3_gym_mode.dart
#	ios/Podfile.lock
#	lib/screens/gym_mode.dart
#	pubspec.yaml
2025-12-02 12:35:32 +01:00
Roland Geider
60cb00945c Small cleanups and optimizations 2025-12-01 23:00:23 +01:00
Roland Geider
559eb26631 Make the app work better on wider screens 2025-12-01 13:44:25 +01:00
Roland Geider
b291329350 Add workout stats screen to the screenshot / integration tests
Still need to decide if we want to keep the start page one, since it's
a bit... bare
2025-11-27 16:29:51 +01:00
Roland Geider
aeb01a517b Refactor widgets used in logs
We should try to reuse as many as possible in the end-of-gym-mode logs and in
the routine log page
2025-11-27 15:08:06 +01:00
Roland Geider
142799d870 Fix localization 2025-11-27 13:28:20 +01:00
Roland Geider
ecd0b6c6b4 Add overview page when a workout has been completed 2025-11-26 20:17:02 +01:00
Roland Geider
f2fae3d888 Handle case where the reps and weight forms are empty 2025-11-26 12:35:36 +01:00
Roland Geider
9fa4597f8c Remove unused variables 2025-11-26 12:35:12 +01:00
Roland Geider
5f61af3b66 Update generated files 2025-11-20 23:01:20 +01:00
Roland Geider
fcc0b683d4 Properly update the rir value when copying from old logs 2025-11-19 20:03:43 +01:00
Roland Geider
9f66815e10 Merge branch 'master' into feature/gym-mode
# Conflicts:
#	lib/widgets/routines/gym_mode/navigation.dart
#	pubspec.lock
#	test/exercises/contribute_exercise_image_test.mocks.dart
#	test/exercises/contribute_exercise_test.mocks.dart
#	test/nutrition/nutritional_meal_form_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
2025-11-19 19:18:45 +01:00
lenka369
27c80ed550 prevent duplicate ingredients in cache 2025-11-18 23:34:12 +01:00
lenka369
dcdfcba631 Merge branch 'wger-project:master' into master 2025-11-18 18:50:23 +01:00
Roland Geider
ce983c2db1 Merge pull request #991 from wger-project/fix/timezone-handling
Properly handle timezones (again)
2025-11-18 17:42:02 +01:00
Roland Geider
fc881c4929 Properly handle timezones
This should (hopefully 🤞) take care of problems saving entries with timezone
information.
2025-11-18 16:30:52 +01:00
Roland Geider
3119429a02 Cleanup, tests, etc 2025-11-17 14:36:47 +01:00
Roland Geider
067fa7455f Revert to showDialog
The modal sheet was causing problems when using the autocompleter,
there were overflows and even if we fixed that, there wasn't enough space
to comfortably use it
2025-11-16 15:57:07 +01:00
Roland Geider
bd727c949b When adding exercises only one is added 2025-11-16 15:50:23 +01:00
Roland Geider
9bb417bd3f Don't recalculate the pages if it's not needed
This keeps the progression saved as well as any changed exercises
2025-11-16 15:48:15 +01:00
Roland Geider
925175b0e5 Handle case where no page can be found
Note that this shouldn't actually happen, we should find a proper solution
2025-11-16 15:19:51 +01:00
Roland Geider
689591195f Polish workout progression dialog
Exercise names are not repeated anymore (again) and we use a bottom sheet now
instead of a modal dialog
2025-11-16 15:16:09 +01:00
lenka369
aaa91a4591 Update mock files 2025-11-16 08:53:18 +01:00
Roland Geider
d094c407c9 Remove dependency of SlotData
Now, the LogPage gets all it's info from the state.
2025-11-16 00:34:46 +01:00
Roland Geider
c26e3828f8 Allow adding additional exercises to the workout
While these are not real ad-hoc workouts, at least it's a first step
2025-11-15 23:44:42 +01:00
Roland Geider
a072692ddd Add smoke and golden test for gym progression tab 2025-11-15 18:40:43 +01:00
Roland Geider
033213abbb Allow opening the workout progress dialog from the progress indicator
This is easier to open with the thumbs and also makes logical sense. When
opening the workout menu from here, the default tab is the progress one, not
the overview.
2025-11-15 18:10:14 +01:00
Roland Geider
0bfb063552 Disable exercise swap button if set is fully logged 2025-11-15 17:39:14 +01:00
Roland Geider
ec8578d43d Add some tests and fix a small bug in uuid handling 2025-11-15 15:59:24 +01:00
lenka369
cf3dc58b27 Merge branch 'wger-project:master' into master 2025-11-15 02:31:12 +01:00
Roland Geider
f1f37d3e03 Allow swapping exercises in the gym mode 2025-11-15 01:32:59 +01:00
Roland Geider
03cd945bfc Move the workout progression to the main navigation menu 2025-11-14 23:46:00 +01:00
Roland Geider
317ae250f3 Remove the exercise ID, this is not used anymore 2025-11-14 23:45:16 +01:00
Roland Geider
742d8dac88 Properly render the current progression of the workout 2025-11-14 21:39:53 +01:00
Roland Geider
66b18b6b3c Further refactoring the gym mode 2025-11-14 14:41:25 +01:00
Roland Geider
e62e5d630a Show current workout in gym mode 2025-11-13 17:25:04 +01:00
Roland Geider
9ea6674849 Add test for calculatePages 2025-11-11 23:56:19 +01:00
Roland Geider
5d37b55736 Localize gym mode setting options 2025-11-11 23:55:56 +01:00
Roland Geider
2e5384728d Allow clearing the times for workout sessions 2025-11-11 23:55:37 +01:00
Roland Geider
06cfa3a649 Move more logic to the gym mode provider
This makes the widgets in the gym mode smaller and we can remove
a lot of prop drilling that was necessary
2025-11-11 22:15:14 +01:00
Roland Geider
694615596f Allow the user to control the gym mode 2025-11-11 15:47:01 +01:00
Roland Geider
202d8eafb1 Recreate generate files and use correct methods 2025-11-11 14:36:11 +01:00
Roland Geider
ae6db6ee07 Move to riverpod three
Needed to downgrade build_runner and mockito for now
2025-11-11 13:22:18 +01:00
Roland Geider
f6a073766a Improve and consolidate the image error handler 2025-11-10 20:23:52 +01:00
lenka369
fc48c707e8 Added tests 2025-11-04 05:21:18 +01:00
lenka369
ed938cd3d2 Replaced print statements with logger 2025-11-03 10:03:37 +01:00