Dieter Plaetinck
6e1d3f9568
dart format --line-length=100 .
...
(except auto generated files)
2024-06-20 15:44:35 +03:00
Roland Geider
d5b172fd57
Merge branch 'master' into HEAD
...
# Conflicts:
# lib/screens/log_meal_screen.dart
# lib/widgets/core/core.dart
# lib/widgets/nutrition/meal.dart
# lib/widgets/nutrition/nutritional_diary_detail.dart
# lib/widgets/nutrition/widgets.dart
2024-06-18 17:46:52 +02:00
Dieter Plaetinck
7f96672b8b
Merge branch 'master' into simplify-tables
2024-06-16 12:27:06 +03:00
Dieter Plaetinck
f220a2e42f
l10n
2024-06-16 12:18:30 +03:00
Dieter Plaetinck
81e664759d
layout tweak
2024-06-16 12:12:32 +03:00
Dieter Plaetinck
70dfac6e74
kcal vs g fix
2024-06-10 23:47:41 +03:00
Dieter Plaetinck
3e459fa694
alignment tweaks
2024-06-10 23:23:01 +03:00
Dieter Plaetinck
cf82faafc5
macros table cleanup step 2
2024-06-10 23:18:58 +03:00
Dieter Plaetinck
34c2123c05
macros table cleanup step 1
2024-06-10 23:18:58 +03:00
Dieter Plaetinck
3d2ef58487
diary table: fix alignments
2024-06-10 23:18:53 +03:00
Dieter Plaetinck
339f24abf1
simplify diary table
2024-06-10 23:18:45 +03:00
Dieter Plaetinck
20ffc83b2a
cleanup
2024-06-10 18:39:15 +03:00
Dieter Plaetinck
17c6e9bca2
consistent & composable :-]
2024-06-10 16:14:50 +03:00
Dieter Plaetinck
82ab3f949d
remove unused LogDiaryItemWidget
2024-06-10 16:13:59 +03:00
Dieter Plaetinck
54a404ca2a
fix diary entries
2024-06-10 15:58:18 +03:00
Dieter Plaetinck
2edf5a5a58
cleanup
2024-06-10 15:58:02 +03:00
Dieter Plaetinck
4b59eeaf86
put trailing at the end, not overlay, so it works on nutrition diary
2024-06-10 15:32:57 +03:00
Dieter Plaetinck
fb7be3c8a3
overhaul macros viewing
...
* fix macros alignments across different UI elements, by relying on
a new standardized NutritionTile
* honor true needed widths based on string lengths of the column names
* show total macros for meal
2024-06-10 15:32:57 +03:00
Dieter Plaetinck
d2ac12bee4
use kcalValue
2024-06-10 10:40:37 +03:00
Dieter Plaetinck
a7012070d8
improve design
2024-06-08 10:15:43 +03:00
Dieter Plaetinck
90ebeec146
also show kcal consumed for "other" logs
2024-06-08 10:09:51 +03:00
Dieter Plaetinck
b7a2830106
show kcal consumed vs planned, on meal tiles
2024-06-07 21:35:08 +03:00
Dieter Plaetinck
266cec8c0c
manual fixes: no-empty-block
2024-06-07 14:59:07 +03:00
Dieter Plaetinck
653c11891d
manual fixes: prefex-explicit-function-type
2024-06-07 14:59:07 +03:00
Dieter Plaetinck
97a4af3b4e
manual fixes: memory leaks due to not disposing
2024-06-07 14:59:00 +03:00
Dieter Plaetinck
420f9ae16d
dcm fix --only-rules=avoid-inferrable-type-arguments lib
2024-06-07 14:59:00 +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
fa2c0ca449
mealtiles read only for logging
2024-06-06 18:24:30 +03:00
Dieter Plaetinck
a209015d41
l10n
2024-06-06 18:17:40 +03:00
Dieter Plaetinck
6f3d690594
mealtile: show macros + replace 'Log' with diary button
2024-06-06 11:22:16 +03:00
Dieter Plaetinck
244d628068
dashboard log meal should go to log meal page
2024-06-05 20:39:07 +03:00
Dieter Plaetinck
5d63c324c3
also replace icon in the dashboard widget expanded view
2024-06-05 20:07:06 +03:00
Dieter Plaetinck
4249abf266
cleanup
2024-06-05 19:55:18 +03:00
Dieter Plaetinck
ac466f0b75
do 'add meal' via 'more' menu, and make it look nicer
2024-06-05 16:48:24 +02:00
Dieter Plaetinck
fc947e9e59
if meals logging gets a snackbar, ingredients logging should too
2024-06-05 16:48:24 +02:00
Dieter Plaetinck
3922549be8
log meals page + new 'log {meal,ingredient} to diary' dashboard buttons
2024-06-05 16:48:24 +02:00
Dieter Plaetinck
6a497718cf
put energy goal above others instead of between basic and advanced goals
2024-05-29 16:37:07 +02: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
Roland Geider
3e138d24dd
Merge pull request #592 from wger-project/ingredient-form-ux
...
IngredientForm UX fixes
2024-05-29 10:48:33 +02:00
Roland Geider
cbd3d431c3
Localize header text
2024-05-29 10:23:32 +02:00
Dieter Plaetinck
686fb44933
filter suggestions by search string
2024-05-28 12:19:53 +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
436ee2a723
hide id
2024-05-27 10:09:20 +02:00
Dieter Plaetinck
ad64eb2c14
cleanup
2024-05-27 09:37:04 +02:00
Dieter Plaetinck
864c6fc82b
properly set/unset value via helper functions. fix #591
2024-05-26 22:10:35 +02:00
