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
Roland Geider
6b2a7e5e3b
Merge pull request #600 from wger-project/feature/weblate
...
Translations update from Hosted Weblate
2024-06-06 19:54:09 +02:00
Roland Geider
bd8c5b2425
Merge pull request #599 from wger-project/ux-friendly-log-meals-to-diary
...
improve UX of logging meals to diary
2024-06-06 19:53:25 +02:00
Dieter Plaetinck
fa2c0ca449
mealtiles read only for logging
2024-06-06 18:24:30 +03:00
Dieter Plaetinck
9a7d876b97
consistent terms: log, not save
2024-06-06 18:17:46 +03:00
Dieter Plaetinck
a209015d41
l10n
2024-06-06 18:17:40 +03:00
lightningcpu
3a7268a260
Translated using Weblate (Russian)
...
Currently translated at 98.4% (255 of 259 strings)
Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/ru/
2024-06-06 15:09:16 +00:00
Milo Ivir
5148009b6e
Translated using Weblate (Croatian)
...
Currently translated at 100.0% (259 of 259 strings)
Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/hr/
2024-06-06 15:09:15 +00:00
Dieter Plaetinck
fa7ecfa3f9
clearer title
2024-06-06 11:30:01 +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
0766f83f82
move 'add meal' out of 'more' into its own dedicated button
2024-06-05 19:55:18 +03:00
Dieter Plaetinck
378a0fe55f
remove images
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
b88360aef3
FAB's for logging meal and logging ingredient
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
hugoalh
493f52bd26
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (259 of 259 strings)
Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/zh_Hant/
2024-06-05 08:09:14 +02:00
Yi-Han Hsiung
508ed3d77c
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 66.7% (173 of 259 strings)
Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/zh_Hans/
2024-06-05 08:09:14 +02:00
Oğuz Ersen
bb778dda89
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (259 of 259 strings)
Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/tr/
2024-05-31 17:09:15 +00:00
Fjuro
5f6a3451e1
Translated using Weblate (Czech)
...
Currently translated at 100.0% (259 of 259 strings)
Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/cs/
2024-05-30 01:22:35 +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
Dieter Plaetinck
67cd2276ea
use slider for portion size, layout tweaks
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
e043b29a7f
Remove duplicated text
2024-05-29 11:22:54 +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
Tsz Hong CHAN
1133c5c418
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (259 of 259 strings)
Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/zh_Hant/
2024-05-24 15:11:55 +02:00
Tsz Hong CHAN
bc56e38ac4
Translated using Weblate (Japanese)
...
Currently translated at 66.7% (173 of 259 strings)
Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/ja/
2024-05-24 15:11:55 +02:00
Tsz Hong CHAN
98953de985
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 64.4% (167 of 259 strings)
Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/zh_Hans/
2024-05-24 15:11:55 +02:00
Dieter Plaetinck
eeec221499
add note
2024-05-23 19:59:57 +02:00
