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
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
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
5f7116ca92
Use correct json key names
2025-09-24 12:26:41 +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
dbd3fa915d
Refactor PlanForm
...
* Date values are now localized
* Remove text controllers since we were setting the values in the plan
object directly as well as setting them in the controllers anyway. Note
that this is still not an ideal solution since if we change something
in the form and close it, the changes are still reflected in the UI, just
not preserved to the server.
* Move basic date sanity cheks to the model
2025-09-12 16:24:56 +02:00
Roland Geider
6cc96310c5
Simplify currentPlan
2025-09-12 14:37:32 +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
Dieter Plaetinck
a0e2659e60
dart format --line-length=100 .
2025-06-27 23:37:56 +02:00
Dieter Plaetinck
450b4da046
fix
2025-06-27 23:08:54 +02:00
Dieter Plaetinck
f18a60bfb5
dart run build_runner build
2025-06-27 20:47:17 +02:00
Dieter Plaetinck
8049bcf617
support NutritionalPlan start & end dates
2025-06-27 20:37:26 +02:00
Roland Geider
70fba34f0c
Better handling of time zones
...
We now send the current time zone to the server when serializing datetime objects.
This was causing entries to be saved some hours wrong or depending on the time, on
a different day.
2025-05-26 11:13:53 +02:00
Roland Geider
1ecbfa88d1
Correctly set the start and end time to null, if this is what comes from the API
2025-04-18 00:40:05 +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
a35336f57c
Allow editing the fit in week toggle as well as start and end dates
2024-11-12 13:31:56 +01:00
Dieter Plaetinck
5c44678557
WIP: use new string id's for nutrition stuff so we can use powersync
2024-11-01 17:48:19 +02:00
Roland Geider
7db93f0b6e
Start implementing new flexible routines
2024-10-30 12:14:26 +01:00
Dieter Plaetinck
51ec089d76
progress reading data, using ivm tables
2024-10-16 22:32:59 +03:00
Roland Geider
99e4961301
Merge branch 'refs/heads/master' into powersync
2024-09-29 14:29:19 +02:00
Dieter Plaetinck
f90609f147
various dcm cleanups
2024-09-18 21:52:21 +03:00
Dieter Plaetinck
25ad580a38
disable prefer-match-file-name for now..
2024-09-18 21:23:18 +03:00
Dieter Plaetinck
ea60e18f18
WIP fixes
2024-09-18 10:33:06 +03:00
Dieter Plaetinck
96b164f612
powersync based nutrition
2024-09-15 23:22:42 +03:00
Dieter Plaetinck
a1295e5649
wip logitem
2024-09-10 22:06:24 +03:00
Dieter Plaetinck
cea3ae15a6
wip
2024-09-10 21:08:45 +03:00
Dieter Plaetinck
1ae3f33edd
use ingredient.license_object_url to link to human readable page
2024-07-12 14:26:09 +03:00
Dieter Plaetinck
d06ecabadf
use ingredientinfo api, for image + new source and remote id fields
...
also update fixtures accordingly
2024-07-12 13:50:04 +03:00
Dieter Plaetinck
54fb7c1c6c
cleanup
2024-07-12 10:09:36 +03:00
Roland Geider
c918e48f7e
Commit generated files
2024-07-10 16:42:40 +02:00
Dieter Plaetinck
6e1d3f9568
dart format --line-length=100 .
...
(except auto generated files)
2024-06-20 15:44:35 +03:00
Dieter Plaetinck
cf351c3690
dcm fix --only-rules=prefer-declaring-const-constructor lib
2024-06-07 14:59:00 +03:00
Dieter Plaetinck
8db1a7c960
dcm fix --only-rules=unnecessary-trailing-comma lib
2024-06-07 14:59:00 +03:00
Dieter Plaetinck
7f74bff32c
dcm fix --only-rules=prefer-trailing-comma lib
2024-06-07 14:59:00 +03:00
Dieter Plaetinck
d5fa2b9c18
fiber rename fixes
2024-05-29 13:04:50 +02:00
Roland Geider
cebb53c31a
Merge branch 'log-fractional-meals'
2024-05-29 11:22:58 +02:00
Roland Geider
7f4dafd5ae
Merge pull request #593 from wger-project/log-fractional-meals
...
log meal: separate confirmation page with portion choice
2024-05-29 11:20:47 +02:00
Dieter Plaetinck
a4bdf70582
consistent, improved deduplication behavior across mealitems and logs
...
deduplicate by ingredient AND amount: so if you use the same
ingredient, but in a different amount, the different amount
will show up
this increases the list of suggestions for editing meals,
and decreases the list logging an ingredient (significantly,
if you often log the same ingredient in the same amount)
2024-05-28 11:58:38 +02:00
Dieter Plaetinck
68799b0112
log meal: separate confirmation page with portion choice
2024-05-27 23:53:22 +02:00
Dieter Plaetinck
caa2866bdf
Merge branch 'master' into goal-fiber
2024-05-25 09:53:47 +02:00
Dieter Plaetinck
eeec221499
add note
2024-05-23 19:59:57 +02:00
Dieter Plaetinck
ad4543f2e6
small refactor
2024-05-23 19:59:57 +02:00
Roland Geider
5d237e1ddf
Consistently use "fiber"
2024-05-23 17:54:50 +02:00
Roland Geider
239e1a1caa
Consistently use "fibers" instead of "fibres"
2024-05-20 22:06:47 +02:00
Dieter Plaetinck
12c1d0044c
support fibers goal
2024-05-18 21:32:29 +02:00
Dieter Plaetinck
6f576b557c
bugfix: 7day averages need to be divided by 7!
2024-05-15 10:52:54 +02:00
Roland Geider
ef78bc55e6
Remove BaseNutritionalValues, this wasn't used anymore
2024-05-12 14:09:05 +02:00
Dieter Plaetinck
9ad969527d
fix
2024-05-08 22:48:26 +02:00
