wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 23:42:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,443 Commits 30 Branches 39 Tags
accc2e7293c3da92965e6d41b749ec3cb327e5ae
Commit Graph

1393 Commits

Author SHA1 Message Date
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
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
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
ad4543f2e6 small refactor 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
df5e2ca145 make errors selectable/copy-pasteable and scrollable when they're large 
there seems to be no downside to this, short errors look the same
 2024-05-17 09:07:49 +02:00
Dieter Plaetinck
234b915ea4 code cleanup 2024-05-15 15:49:17 +02:00
Milo Ivir
4b021633c2 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-05-15 13:28:03 +00:00
Fjuro
d27e46e3ef 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-15 13:28:03 +00:00
Chung-Wei Chung
44bba47a32 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 15.0% (39 of 259 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/zh_Hant/
 2024-05-15 13:28:02 +00:00