Roland Geider
|
54b40696da
|
Postmerge fixes
|
2025-10-19 15:23:17 +02:00 |
|
Roland Geider
|
98f2fb0096
|
Merge branch 'master' into powersync
# Conflicts:
# Gemfile.lock
# android/settings.gradle
# fastlane/report.xml
# integration_test/1_dashboard.dart
# integration_test/2_workout.dart
# integration_test/3_gym_mode.dart
# integration_test/5_nutritional_plan.dart
# integration_test/6_weight.dart
# lib/helpers/i18n.dart
# lib/helpers/ui.dart
# lib/main.dart
# lib/models/nutrition/meal.g.dart
# lib/models/nutrition/nutritional_plan.dart
# lib/providers/auth.dart
# lib/providers/nutrition.dart
# lib/screens/add_exercise_screen.dart
# lib/screens/auth_screen.dart
# lib/screens/dashboard.dart
# lib/screens/exercises_screen.dart
# lib/screens/home_tabs_screen.dart
# lib/screens/log_meal_screen.dart
# lib/screens/log_meals_screen.dart
# lib/screens/nutritional_plan_screen.dart
# lib/screens/routine_list_screen.dart
# lib/screens/workout_plan_screen.dart
# lib/widgets/add_exercise/steps/step1basics.dart
# lib/widgets/add_exercise/steps/step5images.dart
# lib/widgets/add_exercise/steps/step_2_variations.dart
# lib/widgets/add_exercise/steps/step_3_description.dart
# lib/widgets/add_exercise/steps/step_4_translations.dart
# lib/widgets/core/about.dart
# lib/widgets/core/settings.dart
# lib/widgets/dashboard/calendar.dart
# lib/widgets/dashboard/widgets.dart
# lib/widgets/exercises/exercises.dart
# lib/widgets/gallery/overview.dart
# lib/widgets/measurements/categories_card.dart
# lib/widgets/measurements/charts.dart
# lib/widgets/measurements/entries.dart
# lib/widgets/measurements/forms.dart
# lib/widgets/measurements/helpers.dart
# lib/widgets/nutrition/charts.dart
# lib/widgets/nutrition/forms.dart
# lib/widgets/nutrition/helpers.dart
# lib/widgets/nutrition/meal.dart
# lib/widgets/nutrition/nutritional_diary_table.dart
# lib/widgets/nutrition/nutritional_plan_detail.dart
# lib/widgets/nutrition/nutritional_plans_list.dart
# lib/widgets/nutrition/widgets.dart
# lib/widgets/routines/charts.dart
# lib/widgets/routines/workout_logs.dart
# lib/widgets/weight/forms.dart
# lib/widgets/weight/weight_overview.dart
# lib/widgets/workouts/app_bar.dart
# lib/widgets/workouts/day.dart
# lib/widgets/workouts/forms.dart
# lib/widgets/workouts/gym_mode.dart
# lib/widgets/workouts/workout_plan_detail.dart
# lib/widgets/workouts/workout_plans_list.dart
# linux/flutter/generated_plugin_registrant.cc
# linux/flutter/generated_plugins.cmake
# pubspec.lock
# pubspec.yaml
# test/auth/auth_screen_test.dart
# test/core/settings_test.dart
# test/core/settings_test.mocks.dart
# test/nutrition/nutritional_meal_form_test.mocks.dart
# test/nutrition/nutritional_meal_item_form_test.dart
# test/nutrition/nutritional_plan_form_test.mocks.dart
# test/nutrition/nutritional_plan_screen_test.dart
# test/nutrition/nutritional_plans_screen_test.dart
# test/routine/repetition_unit_form_widget_test.dart
# test/routine/routine_screen_test.dart
# test/routine/routines_screen_test.dart
# test/routine/weight_unit_form_widget_test.dart
# test/workout/gym_mode_screen_test.dart
# test/workout/workout_day_form_test.dart
# test/workout/workout_form_test.dart
# test/workout/workout_set_form_test.dart
|
2025-10-19 14:48:15 +02:00 |
|
Roland Geider
|
64dc10cdb2
|
Fix import for localization strings
|
2025-10-19 14:23:58 +02:00 |
|
Roland Geider
|
08a22e5ab0
|
Allow selecting start dates for routines in the future
|
2025-10-17 18:53:31 +02:00 |
|
Roland Geider
|
547a259df8
|
Rename parameter
|
2025-10-17 18:28:46 +02:00 |
|
Roland Geider
|
119bd4c115
|
Merge pull request #955 from GaecKo/feature/end_workout_button
Feature/end_workout_button in "jump to" section
|
2025-10-17 18:28:26 +02:00 |
|
Roland Geider
|
3a37c3fb1c
|
Move form to its own widget
This is cleaner and will allow us to get better errors in case they happen,
see e.g. #936
|
2025-10-17 17:28:59 +02:00 |
|
Arthur De Neyer
|
0533e8e927
|
NavigationHeader: made totalPages parameter facultative
|
2025-10-17 17:09:29 +02:00 |
|
Arthur De Neyer
|
a93431fae1
|
tests: adapted to new constructor
|
2025-10-17 16:51:21 +02:00 |
|
Arthur De Neyer
|
2822ba755e
|
NavigationHeader constructor: optimized and reduced attributes
|
2025-10-17 16:51:09 +02:00 |
|
Roland Geider
|
c551b176fb
|
Merge pull request #950 from wger-project/feature/day-type
Set day and set types
|
2025-10-17 00:13:50 +02:00 |
|
Roland Geider
|
b0d1bce9aa
|
Consistently show the day and type name
|
2025-10-16 23:48:15 +02:00 |
|
Roland Geider
|
bc6a5ebdbf
|
Make common widget for when an image format is not supported
|
2025-10-16 22:03:40 +02:00 |
|
Roland Geider
|
0a427e50ff
|
Make sure the plate weights don't wrap in the calculator
|
2025-10-16 21:59:56 +02:00 |
|
Roland Geider
|
b4c77bf238
|
Move plate calculator visibility logic to the exercise itself
|
2025-10-16 21:59:56 +02:00 |
|
Arthur De Neyer
|
a2e665269e
|
test; 1st try at solving issue, will need to verify it works in GitHub Actions
|
2025-10-15 23:59:25 +02:00 |
|
Arthur De Neyer
|
a0c13b60c9
|
fixed attribute name in session page
|
2025-10-15 23:50:19 +02:00 |
|
Arthur De Neyer
|
914d810d72
|
Merge branch 'master' of github.com:GaecKo/flutter into feature/end_workout_button
|
2025-10-15 23:43:06 +02:00 |
|
Roland Geider
|
34a013ad92
|
Merge pull request #954 from 3mpee3mpee/feature/avif-cleanup
AVIF: cleanup for non used translations as we are using more generic messages (imageFormatNotSupported and imageFormatNotSupportedDetail)
|
2025-10-15 15:39:45 +02:00 |
|
Arthur De Neyer
|
bc8b8fea31
|
dart formating
|
2025-10-13 23:41:40 +02:00 |
|
Arthur De Neyer
|
354a8c381c
|
feat: add end workout button to 'jump to' section
|
2025-10-13 23:36:10 +02:00 |
|
Max Pylypenko
|
d7ff88e688
|
avif: cleanup for non used translations as we are using more generic messages (imageFormatNotSupported and imageFormatNotSupportedDetail)
|
2025-10-14 00:16:26 +07:00 |
|
Roland Geider
|
df3750755c
|
Merge pull request #952 from 3mpee3mpee/feature/avif
AVIF: updated gallery widget to display message for non supported avif image type
|
2025-10-12 21:24:45 +02:00 |
|
Max Pylypenko
|
1da04e29d2
|
avif: updated images to display generic error for non supported image types + translations
|
2025-10-13 00:14:49 +07:00 |
|
Max Pylypenko
|
51c41c800e
|
avif: updated gallery widget to display message for non supported avif image type
|
2025-10-12 00:46:37 +07:00 |
|
Roland Geider
|
1f6d22d85a
|
Tweak a bit how and when the types are shown
|
2025-10-09 23:11:10 +02: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
|
993e7a6bae
|
Merge pull request #949 from rishad13/master
Refactor event type enum and improve loadEvents documentation
|
2025-10-09 14:31:46 +02:00 |
|
rishad.n
|
9a801bd2b2
|
Refactor event type enum and improve loadEvents documentation
|
2025-10-09 17:19:57 +05:30 |
|
Roland Geider
|
bd37415b8e
|
Remove controllers, these are not needed anymore
|
2025-10-08 14:49:35 +02:00 |
|
Roland Geider
|
655a3d11d5
|
Move helper methods to own widgets
|
2025-10-08 14:48:59 +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
|
4b9afa5c98
|
Actually send the correct image fields to the server
|
2025-10-08 14:34:23 +02:00 |
|
Roland Geider
|
cb9d2a0e97
|
Add other build folders to .gitignore
|
2025-10-08 14:10:21 +02:00 |
|
Roland Geider
|
bb2fbc2c73
|
Rename files to follow naming schema of all others
|
2025-10-08 14:07:51 +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
|
6b6afbb528
|
Update Podfile.lock
|
2025-10-08 12:46:34 +02:00 |
|
Roland Geider
|
a76ca9ae36
|
Update license notice localization
This keeps the main info text in one block, otherwise translating these
can get tricky
|
2025-10-08 12:45:37 +02:00 |
|
Roland Geider
|
949ad02ab6
|
Add generated files
It seems a recent update changes the way dart code is formatted
|
2025-10-08 12:45:37 +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 |
|
dependabot[bot]
|
50b63a4749
|
Bump astral-sh/setup-uv from 6 to 7
Bumps [astral-sh/setup-uv](https://github.com/astral-sh/setup-uv) from 6 to 7.
- [Release notes](https://github.com/astral-sh/setup-uv/releases)
- [Commits](https://github.com/astral-sh/setup-uv/compare/v6...v7)
---
updated-dependencies:
- dependency-name: astral-sh/setup-uv
dependency-version: '7'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2025-10-08 11:09:23 +02:00 |
|
Roland Geider
|
2494effe64
|
Use existing material localizations for "cancel" and use lower case for "add"
|
2025-10-06 14:13:27 +02:00 |
|
dependabot[bot]
|
bad5e68fb6
|
Bump build_runner from 2.8.0 to 2.9.0
Bumps [build_runner](https://github.com/dart-lang/build) from 2.8.0 to 2.9.0.
- [Release notes](https://github.com/dart-lang/build/releases)
- [Commits](https://github.com/dart-lang/build/compare/build_runner-v2.8.0...build_runner-v2.9.0)
---
updated-dependencies:
- dependency-name: build_runner
dependency-version: 2.9.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2025-10-06 13:53:25 +02:00 |
|
Roland Geider
|
ad15da0de4
|
Merge pull request #944 from wger-project/dependabot/pub/sqlite3_flutter_libs-0.5.40
Bump sqlite3_flutter_libs from 0.5.39 to 0.5.40
|
2025-10-06 13:52:54 +02:00 |
|
Roland Geider
|
136d0e0825
|
Extract some logic to their own widgets
|
2025-10-06 12:43:05 +02:00 |
|