Commit Graph

1491 Commits

Author SHA1 Message Date
Dieter Plaetinck
fee0e632af Merge pull request #624 from Denpeer/feature/remove-info-button
remove info button and viewmode logic
2024-07-18 17:41:35 +02:00
DVPeer
323f4bfc6b remove info button and viewmode logic 2024-07-18 01:36:17 +07:00
Dieter Plaetinck
dc1f220292 refactor
ingredient details dialog:
 - give it close/continue buttons to load into selection
 - always use image property from loaded ingredient
   this is a bit slower, but:
   * more consistent (no need to support absolute vs relative URL's
     separately)
   * cleaner (no need to pass it thru explicitly)
   * more future proof: we will get rid of the dedicated
     /ingredient/search endpoint which gives us images before we load
     the full ingredient. in the future we will simply load the
     ingredients, completely, all at once.
   * allows for easier code reuse with barcode scan result dialog

barcode scan result dialog:
 - show image and detailed nutrition table
 - support a loading spinner
 - simplify error handling
 - deduplicate code between found & not found
 - share code with ingredient details dialog
2024-07-16 11:34:11 +03:00
Dieter Plaetinck
47a5f4a07f ingredient popup: scroll and shrink image when appropriate 2024-07-12 18:48:42 +03:00
Dieter Plaetinck
4a87c0b5f1 put popup button also in preview section 2024-07-12 18:48:42 +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
d99ca4160f ingredient popup: fix image rendering 2024-07-12 14:26:09 +03:00
Dieter Plaetinck
fea019f51c show source name and link to source, when possible in popup 2024-07-12 14:11:07 +03:00
Dieter Plaetinck
2ef68ce24d cleanup 2024-07-12 14:11:07 +03:00
Dieter Plaetinck
7e7fa387d5 todo's 2024-07-12 14:11:07 +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
2d27281a1d don't show g-per-bodyweight-kg on ingredient details popups 2024-07-12 10:09:36 +03:00
Dieter Plaetinck
395d40ce9a dart fix 2024-07-12 10:09:36 +03:00
Dieter Plaetinck
54fb7c1c6c cleanup 2024-07-12 10:09:36 +03:00
Dieter Plaetinck
de1b7e2229 cleanup 2024-07-12 10:09:36 +03:00
Dieter Plaetinck
b8f8bc4e4a remove test sleep 2024-07-12 10:09:36 +03:00
Dieter Plaetinck
1909f7caab popup ingredient details in typeahead suggestions and recently used 2024-07-12 10:09:36 +03:00
Dieter Plaetinck
e1e27fb1dd for consistency and safety, always use prefs constants 2024-07-11 20:22:25 +03:00
Dieter Plaetinck
02961c49dc dart fix 2024-07-11 19:03:12 +03:00
Dieter Plaetinck
6956fd6a89 dart run build_runner build (to fix syntax errors with new flutter) 2024-07-11 18:59:40 +03:00
Roland Geider
c918e48f7e Commit generated files 2024-07-10 16:42:40 +02:00
florent4014
afe525cfea Translated using Weblate (French)
Currently translated at 100.0% (262 of 262 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/fr/
2024-07-10 16:05:22 +02:00
Roland Geider
5667e99af8 Prettify error headers
These come directly from django and are written with camel case
2024-07-10 16:01:37 +02:00
Roland Geider
9e5a950b33 Remove call to applicationUpdateRequired during registration
This happens in the login method anyway, which is called after the registration
was successfully completed
2024-07-10 15:40:34 +02:00
Marco Rimoldi
11f1249c67 Fixed tooltip typo. 2024-07-10 11:49:42 +02:00
Dimitrys Meliates
eb52e8b446 Translated using Weblate (Greek)
Currently translated at 33.2% (87 of 262 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/el/
2024-06-20 13:19:33 +00:00
Milo Ivir
cda29d3e53 Translated using Weblate (Croatian)
Currently translated at 100.0% (262 of 262 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/hr/
2024-06-20 13:19:33 +00:00
Fjuro
0acf3e6075 Translated using Weblate (Czech)
Currently translated at 100.0% (262 of 262 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/cs/
2024-06-20 13:19:32 +00:00
Oğuz Ersen
f64e199a1b Translated using Weblate (Turkish)
Currently translated at 100.0% (262 of 262 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/tr/
2024-06-20 13:19:32 +00:00
Dieter Plaetinck
87755f16b6 dcm fix --only-rules=unnecessary-trailing-comma lib 2024-06-20 15:55:28 +03:00
Dieter Plaetinck
9a8a7e112a dcm fix --only-rules=prefer-trailing-comma lib 2024-06-20 15:55:02 +03:00
Dieter Plaetinck
11ee38c03d dart fix --apply 2024-06-20 15:47:55 +03:00
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
ecad7bfa8f Merge pull request #604 from wger-project/show-kcal-macros-total-for-meal
kcal/macros total for meals + fix alignments
2024-06-16 12:24:36 +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
c8d67dccce dart fix 2024-06-11 23:27:43 +03:00
Roland Geider
6b2f49e967 Merge pull request #603 from wger-project/show-kcal-consumed-vs-planned-on-meal-tiles
show kcal consumed vs planned, on meal tiles
2024-06-11 18:45:12 +02: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
Milo Ivir
4e8b4efb05 Translated using Weblate (Croatian)
Currently translated at 100.0% (261 of 261 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/hr/
2024-06-10 22:09:20 +02: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