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
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
Dieter Plaetinck
b21c19ae65
various ingredient form UX issues
...
* upon scan completion, give more useful preview of the found ingredient
* use ID field to track whether the form is "loaded" with a valid
ingredient or not
* don't trigger search if an ingredient is loaded, unless user changes
the pattern
* always show meal item preview, whether loaded from recent items, or
from scan result
2024-05-26 22:10:34 +02:00
Dieter Plaetinck
caa2866bdf
Merge branch 'master' into goal-fiber
2024-05-25 09:53:47 +02:00
Dieter Plaetinck
d4d298ad9e
fix tests
2024-05-23 19:59:57 +02:00
Dieter Plaetinck
74002350ba
unify IngredientLogForm and MealItemForm
2024-05-23 19:59:57 +02:00
Dieter Plaetinck
58122d40b5
get ready to support showing images in the ingredient preview
...
note: the image doesn't seem to
be set yet, but at least the UI is now ready for it
2024-05-23 19:59:57 +02:00
Dieter Plaetinck
1c84d91834
convert form to stateful, show ingredient preview
2024-05-23 19:59:57 +02:00
Dieter Plaetinck
63d37175c4
show reminder of macro's on ingredient tiles
2024-05-23 19:59:57 +02:00
Dieter Plaetinck
5ae30e6788
cleaner way to show line of macros
2024-05-23 19:59:57 +02:00
Roland Geider
5d237e1ddf
Consistently use "fiber"
2024-05-23 17:54:50 +02:00
Dieter Plaetinck
a13b389fec
Merge pull request #583 from wger-project/tiny-tweaks
...
Tiny tweaks
2024-05-21 21:09:08 +02:00
Dieter Plaetinck
c8dbb8971e
fix various lint issues
2024-05-21 16:25:21 +02:00
Dieter Plaetinck
d896fab4ad
cleanup
2024-05-21 16:25:21 +02:00
Dieter Plaetinck
cb696cc585
fix non-final field on immutable class
2024-05-21 16:25:21 +02:00
Dieter Plaetinck
abd531be1f
bugfix: show error message when scan fails
...
due to the extra Navigator.pop(), we would immediately close the error
dialog after opening it, rendering it practically invisible.
to handle back button in non-error cases, we now simply accept the null value
2024-05-21 16:25:21 +02:00
Dieter Plaetinck
721dd5e298
fix async gap
2024-05-21 16:25:21 +02:00
Roland Geider
239e1a1caa
Consistently use "fibers" instead of "fibres"
2024-05-20 22:06:47 +02:00
Dieter Plaetinck
55d36eb301
improve design
2024-05-18 22:42:18 +02:00
Dieter Plaetinck
12c1d0044c
support fibers goal
2024-05-18 21:32:29 +02:00
Dieter Plaetinck
72a85e1cae
not needed param
2024-05-17 09:09:03 +02:00
Dieter Plaetinck
234b915ea4
code cleanup
2024-05-15 15:49:17 +02:00
Dieter Plaetinck
594fe0038f
fix
2024-05-15 12:02:42 +02:00
