Commit Graph

582 Commits

Author SHA1 Message Date
Roland Geider
910e662243 Correctly show exercise overviews for supersets 2025-12-02 17:21:12 +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
b01a0fe1f7 Updated goldens 2025-12-01 13:14:22 +00: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
ecd0b6c6b4 Add overview page when a workout has been completed 2025-11-26 20:17:02 +01:00
Roland Geider
5f61af3b66 Update generated files 2025-11-20 23:01:20 +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
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
Branislav Nohaj
c6ab5cfa20 Add exercise contribution tests with proper mocks 2025-11-18 13:55:38 +01:00
Branislav Nohaj
be4128e975 Update contribute_exercise_test.mocks.dart 2025-11-18 13:00:18 +01:00
Branislav Nohaj
d795fb0dce Update contribute_exercise_test.mocks.dart
newly generated file
2025-11-18 12:53:25 +01:00
Branislav Nohaj
5854810e1e Updated contribute_exercise_test.dart
few new changes for user verification
2025-11-18 12:52:52 +01:00
Roland Geider
3119429a02 Cleanup, tests, etc 2025-11-17 14:36:47 +01:00
Roland Geider
02a0f89807 update goldens 2025-11-16 18:34:13 +00:00
Roland Geider
8818bf3a5f Simplify test and add tag 2025-11-16 18:48:02 +01:00
Roland Geider
8aa0dea540 Fix tests 2025-11-16 17:17:14 +01:00
Roland Geider
e7c233e613 Add test for recalculateIndices 2025-11-16 14:38:36 +01:00
lenka369
aaa91a4591 Update mock files 2025-11-16 08:53:18 +01:00
Roland Geider
a072692ddd Add smoke and golden test for gym progression tab 2025-11-15 18:40:43 +01:00
Roland Geider
a4909bd99c Rename some tests 2025-11-15 18:20:22 +01:00
Roland Geider
3273415cbd Fix test and move the files around a bit
The tests should mirror the structure of the regular application
2025-11-15 17:38:22 +01:00
Roland Geider
ec8578d43d Add some tests and fix a small bug in uuid handling 2025-11-15 15:59:24 +01:00
Roland Geider
f1f37d3e03 Allow swapping exercises in the gym mode 2025-11-15 01:32:59 +01:00
Roland Geider
66b18b6b3c Further refactoring the gym mode 2025-11-14 14:41:25 +01:00
Roland Geider
9ea6674849 Add test for calculatePages 2025-11-11 23:56:19 +01:00
Roland Geider
202d8eafb1 Recreate generate files and use correct methods 2025-11-11 14:36:11 +01:00
Roland Geider
4d77cff2ef Merge branch 'master' into fork/Oknarb258/master
# Conflicts:
#	test/exercises/contribute_exercise_test.mocks.dart
2025-11-11 14:27:36 +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
Branislav Nohaj
c3a150cfed Update contribute_exercise_test.mocks.dart 2025-11-06 19:04:52 +01:00
Branislav Nohaj
297460e42d dart format contribute_exercise_test.dart 2025-11-05 20:17:13 +01:00
Branislav Nohaj
0bf4de6cc8 Update contribute_exercise_test.dart
reworked tests with new testcases
2025-11-04 16:12:03 +01:00
lenka369
fc48c707e8 Added tests 2025-11-04 05:21:18 +01:00
Roland Geider
079017efac Regenerate contribute_exercise_test.mocks.dart 2025-10-09 18:15:41 +02:00
Roland Geider
39b503e03a Format files as in master 2025-10-09 17:54:24 +02:00
Roland Geider
85ba00b654 Merge branch 'master' into feature/day-type
# Conflicts:
#	lib/models/workouts/day.g.dart
#	lib/models/workouts/day_data.g.dart
#	lib/models/workouts/set_config_data.g.dart
#	lib/models/workouts/slot_data.g.dart
#	lib/models/workouts/slot_entry.g.dart
#	lib/models/workouts/weight_unit.g.dart
#	test/auth/auth_screen_test.mocks.dart
#	test/core/settings_test.mocks.dart
#	test/exercises/contribute_exercise_test.mocks.dart
#	test/gallery/gallery_form_test.mocks.dart
#	test/gallery/gallery_screen_test.mocks.dart
#	test/measurements/measurement_categories_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutrition/nutritional_meal_form_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/nutrition/nutritional_plan_screen_test.mocks.dart
#	test/nutrition/nutritional_plans_screen_test.mocks.dart
#	test/other/base_provider_test.mocks.dart
#	test/routine/day_form_test.mocks.dart
#	test/routine/gym_mode_screen_test.mocks.dart
#	test/routine/gym_mode_session_screen_test.mocks.dart
#	test/routine/repetition_unit_form_widget_test.mocks.dart
#	test/routine/routine_edit_screen_test.mocks.dart
#	test/routine/routine_edit_test.mocks.dart
#	test/routine/routine_form_test.mocks.dart
#	test/routine/routine_logs_screen_test.mocks.dart
#	test/routine/routine_screen_test.mocks.dart
#	test/routine/routines_provider_test.mocks.dart
#	test/routine/routines_screen_test.mocks.dart
#	test/routine/slot_entry_form_test.mocks.dart
#	test/routine/weight_unit_form_widget_test.mocks.dart
#	test/user/provider_test.mocks.dart
#	test/weight/weight_provider_test.mocks.dart
#	test/weight/weight_screen_test.mocks.dart
2025-10-09 17:39:39 +02:00
Roland Geider
93a11a16e4 Recreate generated files and reformat the repo
Seems the default dart formatting rules changed recently, and this was causing
huge diffs in branches
2025-10-09 17:39:02 +02:00
Roland Geider
6146201531 Allow setting the slot entry type as well 2025-10-09 17:28:23 +02:00
Roland Geider
8199205b02 Don't dump all the debug info to the error reporting 2025-10-08 14:42:58 +02:00
Roland Geider
c63057fe35 Reuse AddExerciseTextArea in the image form 2025-10-08 14:05:50 +02:00
Roland Geider
0add2a6bd1 Extract url validator to its own file 2025-10-08 14:03:25 +02:00
Roland Geider
1a78011a7d Refactor image handling in the exercise submission process
Now the images are kept in a single list, instead of having two for
the files themselves and the metadata.
2025-10-08 12:45:37 +02:00
Roland Geider
136d0e0825 Extract some logic to their own widgets 2025-10-06 12:43:05 +02:00
Roland Geider
fa7f670e9f Some light cleanup 2025-10-06 12:31:12 +02:00
Roland Geider
39be6a3edf Allow setting the day type in the edit form 2025-10-06 11:36:27 +02:00
Branislav Nohaj
7bc8463406 dar format was performed 2025-10-04 11:13:10 +02:00
Branislav Nohaj
e9ab11c8bb added better comments 2025-10-04 10:58:36 +02:00
Branislav Nohaj
ed8e9ec744 Added option in mobile app to add more info about image 2025-10-04 10:22:01 +02:00
Roland Geider
a10b7eb9f7 Pass parameter to create new variation and link exercises 2025-09-28 15:03:28 +02:00