Gym mode improvements #989
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Needed to downgrade build_runner and mockito for now
This makes the widgets in the gym mode smaller and we can remove a lot of prop drilling that was necessary
The tests should mirror the structure of the regular application
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.
While these are not real ad-hoc workouts, at least it's a first step
Now, the LogPage gets all it's info from the state.
Exercise names are not repeated anymore (again) and we use a bottom sheet now instead of a modal dialog
Note that this shouldn't actually happen, we should find a proper solution
This keeps the progression saved as well as any changed exercises
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
rolandgeider
force-pushed
the
feature/gym-mode
branch
from
03147f3 to
02a0f89
Compare
rolandgeider
force-pushed
the
feature/gym-mode
branch
from
983ab9f to
3119429
Compare
Copilot finished reviewing on behalf of
rolandgeider
November 17, 2025 14:13
Contributor
There was a problem hiding this comment.
Pull Request Overview
This pull request implements significant improvements to the gym mode functionality by refactoring the business logic into a centralized gym state provider. The changes enable more flexible workout tracking with options to customize the workout experience.
Key Changes:
- Refactored gym mode to use Riverpod state management, centralizing business logic in
GymStateProvider - Added user controls to hide/show exercise overviews and timer pages during workouts
- Implemented workout progress tracking with visual indicators and a new progress menu
- Added functionality to swap or add exercises during workouts for more ad-hoc adjustments
- Made time fields optional in the session form
Reviewed Changes
Copilot reviewed 75 out of 78 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
pubspec.yaml |
Upgraded flutter_riverpod to 3.0.3 and added riverpod_annotation/riverpod_generator dependencies |
pubspec.lock |
Updated dependency lock file with new package versions including build_runner downgrade to 2.7.0 |
test/widgets/routines/plate_calculator_test.dart |
Refactored test to use ProviderContainer for improved test isolation |
test/providers/plate_calculator_test.dart |
Updated test to use ProviderContainer pattern |
test/providers/gym_state_test.dart |
Added comprehensive tests for new GymStateNotifier functionality |
test/routine/gym_mode/*.dart |
Restructured gym mode tests with updated mock files and new test structure |
lib/widgets/routines/gym_mode/workout_menu.dart |
New widget implementing workout navigation and progress tracking menus |
lib/widgets/routines/gym_mode/timer.dart |
Simplified timer widgets by removing redundant parameters |
lib/widgets/routines/gym_mode/start_page.dart |
Added gym mode options and refactored to use GymStateProvider |
lib/widgets/routines/gym_mode/session_page.dart |
Converted to ConsumerWidget using GymStateProvider |
lib/widgets/routines/gym_mode/navigation.dart |
Simplified navigation components with state management integration |
lib/widgets/routines/gym_mode/log_page.dart |
Refactored to use GymStateProvider for log management |
lib/widgets/routines/gym_mode/exercise_overview.dart |
Converted to ConsumerWidget with simplified interface |
lib/widgets/routines/forms/session.dart |
Added clear buttons to time input fields |
Multiple .mocks.dart files |
Removed deprecated invalid_use_of_internal_member ignore directive |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
# 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
Improvements to the gym mode. The code has been split up so that the business logic lives in the gym provider.
New features:
Related Issue(s)
Closes #990
Closes #958
Closes #802
Closes #16
Closes wger-project/wger#2033
Helps somewhat with wger-project/wger#1949
Please check that the PR fulfills these requirements
(run
dart format .)///).