Commit Graph

61 Commits

Author SHA1 Message Date
Roland Geider
52892db9b1 Allow passing the language to the fetch request
This allows us to use the trophy translations from the server.
2025-12-23 15:41:47 +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
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
ae6db6ee07 Move to riverpod three
Needed to downgrade build_runner and mockito for now
2025-11-11 13:22:18 +01: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
39be6a3edf Allow setting the day type in the edit form 2025-10-06 11:36:27 +02:00
Roland Geider
ccbaf0b42a Allow multiple weight entries per day 2025-09-26 12:21:50 +02:00
Roland Geider
530efd366e Some renaming 2025-09-24 12:31:28 +02:00
Roland Geider
84c29eb209 Use the regular ingredient endpoint, instead of the special search one 2025-09-24 01:35:03 +02:00
Roland Geider
a7ee4ff5b3 Merge pull request #855 from wger-project/nutrition-plan-stats
Nutrition plan stats
2025-09-22 16:19:04 +02:00
Roland Geider
798406eaa9 Make routineId nullable in session and related files
Sessions can be added ad-hoc, without needing to be part of any specific
routine.
2025-09-16 14:47:47 +02:00
Roland Geider
ac043baa68 Merge branch 'master' into nutrition-plan-stats
# Conflicts:
#	lib/models/nutrition/nutritional_plan.g.dart
#	lib/widgets/measurements/charts.dart
#	lib/widgets/measurements/entries.dart
#	lib/widgets/weight/weight_overview.dart
2025-09-03 15:25:17 +02:00
Roland Geider
bea40c9a3c Correctly parse the localized weight values in the form 2025-08-13 19:54:32 +02:00
Dieter Plaetinck
40dbb76988 fix tests 2025-06-28 21:59:26 +02:00
Dieter Plaetinck
a0e2659e60 dart format --line-length=100 . 2025-06-27 23:37:56 +02:00
Dieter Plaetinck
f18a60bfb5 dart run build_runner build 2025-06-27 20:47:17 +02:00
Shininess8816
97e63e3fc5 flutter pub run build_runner build && dart format --line-length=100 . 2025-05-08 22:36:14 +01:00
Roland Geider
9ebaf58fea Refactor routine handling for the dashboard widgets
This makes sure that edits to the routine (such as changing the order
of the days, etc.) are properly reflected in the dashboard.
2025-05-03 15:39:46 +02:00
Roland Geider
d071d143df Update flutter to 3.29
The translations are not stored in a synthetic package anymore, but the
files are just copied to a specific folder so it can be more easily imported

Also, flutter_barcode_scanner was replaced by simple_barcode_scanner since
the first hasn't been updated in 3 years and was already causing problems
for some time
2025-03-18 17:28:19 +01:00
Roland Geider
079db5d5e0 Recreate generated files 2025-01-24 15:07:51 +01:00
Roland Geider
a770c97573 Add smoke test for the routine edit form 2025-01-21 20:58:57 +01:00
Roland Geider
3a398d0f36 Simplify arguments for routine objects and add a smoke test 2025-01-18 19:37:33 +01:00
Roland Geider
23119e68d5 Allow users to reorder the days and the slots within the days 2024-11-15 16:44:41 +01:00
Roland Geider
277628f329 Merge branch 'master' into feature/flexible-routines
# Conflicts:
#	test/weight/weight_screen_test.mocks.dart
2024-11-14 20:30:19 +01:00
Roland Geider
4673bb5a64 Update screenshots 2024-11-09 13:08:29 +01:00
Roland Geider
9ff2bba13a Load the new DayData entries and the regular data objects from structure endpoint 2024-10-30 23:19:10 +01:00
Roland Geider
a79b6d6b4e Start implementing new flexible routines 2024-10-30 19:17:51 +01:00
Roland Geider
7db93f0b6e Start implementing new flexible routines 2024-10-30 12:14:26 +01:00
Dieter Plaetinck
85c245d67d dcm fix --only-rules=unnecessary-trailing-comma lib test test_data 2024-09-18 16:01:10 +03:00
Dieter Plaetinck
66ced6ccc4 dcm fix --only-rules=prefer-trailing-comma lib test test_data integration_test 2024-09-18 16:00:43 +03:00
Dieter Plaetinck
a589d87fad dcm fix --only-rules=avoid-redundant-async 2024-09-18 15:52:55 +03:00
Dieter Plaetinck
3dc1c4e79e fix tests 2024-09-11 23:00:04 +03:00
Dieter Plaetinck
a64a50f425 fix tests 2024-09-07 19:51:29 +03:00
Dieter Plaetinck
11ee38c03d dart fix --apply 2024-06-20 15:47:55 +03:00
Roland Geider
5d237e1ddf Consistently use "fiber" 2024-05-23 17:54:50 +02:00
Roland Geider
9c7b65bc49 Allow users to quickly increment the body weight 2024-02-17 18:48:48 +01:00
Roland Geider
003038e67d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	test/weight/weight_screen_test.dart
2024-01-23 16:42:25 +01:00
Roland Geider
d4e4f3384a Use the user's preferred unit for body weight 2024-01-23 16:33:32 +01:00
Roland Geider
3f46277c75 Fix test
Since we're mocking the provider no entries are actually being deleted anywhere
2024-01-23 14:58:53 +01:00
Roland Geider
28826bd874 Merge branch 'master' into ux_fixes_problem
# Conflicts:
#	flatpak/scripts/flatpak_shared.dart
#	flatpak/scripts/manifest_generator.dart
2024-01-23 14:38:46 +01:00
Roland Geider
41555c4bce Recreate generated files 2024-01-22 17:01:23 +01:00
Roland Geider
e67d992385 Add (for now) simple settings page to reset the exercise cache
This should be expanded later to allow to re-fetch all available exercises, etc.
2024-01-11 22:13:11 +01:00
Roland Geider
d51b6d7d87 Merge branch 'master' into feat/data-persistence
# Conflicts:
#	lib/main.dart
#	lib/providers/exercises.dart
#	lib/widgets/workouts/day.dart
#	pubspec.lock
#	pubspec.yaml
2024-01-09 15:37:48 +01:00
Roland Geider
65ba2275ae Run "dart format --line-length=100 ." to make the diff smaller 2023-12-23 16:40:05 +01:00
Abhishek Saini
c69c639fac fix(drift): built a model for exercise and fixes in fromSql type converter 2023-12-23 14:28:38 +05:30
Miroslav Mazel
95ea711e97 Weight entries - buggy test 2023-11-25 00:57:27 +01:00
Roland Geider
29a6839a61 Run dart fix on the code base 2023-11-19 18:49:35 +01:00