Commit Graph

2524 Commits

Author SHA1 Message Date
Dieter Plaetinck
6e1d3f9568 dart format --line-length=100 .
(except auto generated files)
2024-06-20 15:44:35 +03:00
Roland Geider
b051220bf6 Temporarily disable automatic linting 2024-06-18 17:53:48 +02:00
Roland Geider
210851a25b Merge pull request #602 from wger-project/enable-dcm
Enable dcm + initial set of adjustments
2024-06-18 17:52:30 +02: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
Roland Geider
9222837be2 Update Gemfile.lock 2024-06-18 17:41:28 +02:00
Roland Geider
949a45dbeb Merge pull request #608 from wger-project/release-1.7.5
Bump version to 1.7.5+46
2024-06-16 16:43:19 +02:00
Github-Actions
526f796337 Bump version to 1.7.5+46 2024-06-16 14:35:47 +00:00
Roland Geider
f642d32c16 Update screenshots 1.7.5 2024-06-16 15:58:24 +02:00
Dieter Plaetinck
e9ff3ecac8 Merge pull request #606 from wger-project/simplify-tables
Simplify tables code + small fixes and tweaks
2024-06-16 12:31:18 +03: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
1c6d96e732 update goldens 2024-06-16 12:21:33 +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
Roland Geider
43f9d5c53f Merge pull request #605 from wger-project/feature/weblate
Translations update from Hosted Weblate
2024-06-11 18:37:06 +02:00
Dieter Plaetinck
70dfac6e74 kcal vs g fix 2024-06-10 23:47:41 +03:00
Dieter Plaetinck
57f424547b update goldens 2024-06-10 23:23:33 +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
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
82a6e8e6ab update goldens 2024-06-10 15:32:57 +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
Roland Geider
ecda5f1228 Merge pull request #601 from wger-project/feature/weblate
Translations update from Hosted Weblate
2024-06-08 11:47:26 +02: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
Fjuro
c93d7c580e Translated using Weblate (Czech)
Currently translated at 100.0% (261 of 261 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/cs/
2024-06-07 22:09:09 +02:00
Oğuz Ersen
c740cdcb59 Translated using Weblate (Turkish)
Currently translated at 100.0% (261 of 261 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/tr/
2024-06-07 22:09:09 +02:00
Dieter Plaetinck
b7a2830106 show kcal consumed vs planned, on meal tiles 2024-06-07 21:35:08 +03:00
Dieter Plaetinck
74289d9b00 dcm fix --only-rules=avoid-unnecessary-return lib 2024-06-07 14:59:11 +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
2ff90a0e9c enable DCM 2024-06-07 14:58:59 +03:00
Anonymous
d949d292dd Translated using Weblate (Portuguese (Brazil))
Currently translated at 76.2% (199 of 261 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/pt_BR/
2024-06-06 21:21:38 +02:00