Merge branch 'master' into simplify-tables

Dieterbe · Dieterbe · commit 7f96672b8b04 · 2024-06-16T12:27:06.000+03:00
diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb
@@ -397,7 +397,7 @@
     "description": "Text for registration button"
   },
   "fiber": "الألياف",
-  "@fibres": {},
+  "@fiber": {},
   "aboutDescription": "شكرًا لاستخدامك وقر! وقر مشروع تعاوني مفتوح المصدر، تم إنشاؤه بواسطة عشّاق اللياقة البدنية من جميع أنحاء العالم.",
   "@aboutDescription": {
     "description": "Text in the about dialog"
diff --git a/lib/l10n/app_ca.arb b/lib/l10n/app_ca.arb
@@ -473,7 +473,7 @@
     "description": "Message shown when the user has no logged weight entries"
   },
   "fiber": "Fibra",
-  "@fibres": {},
+  "@fiber": {},
   "sodium": "Sodi",
   "@sodium": {},
   "delete": "Esborra",
diff --git a/lib/l10n/app_cs.arb b/lib/l10n/app_cs.arb
@@ -113,7 +113,7 @@
   "@save": {},
   "addIngredient": "Přidat přísadu",
   "@addIngredient": {},
-  "logIngredient": "Uložit do výživového deníku",
+  "logIngredient": "Zaznamenat ingredienci do nutričního diáře",
   "@logIngredient": {},
   "searchIngredient": "Hledat přísadu",
   "@searchIngredient": {
@@ -376,7 +376,7 @@
   "@supersetWith": {
     "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
   },
-  "logMeal": "Zaznamenat toto jídlo",
+  "logMeal": "Zaznamenat do nutričního diáře",
   "@logMeal": {},
   "muscles": "Svaly",
   "@muscles": {
@@ -901,5 +901,9 @@
   "goalMacro": "Makro cíle",
   "@goalMacro": {
     "description": "The goal for macronutrients"
-  }
+  },
+  "ingredientLogged": "Ingredience zaznamenána do diáře",
+  "@ingredientLogged": {},
+  "selectMealToLog": "Vyberte jídlo k záznamu do diáře",
+  "@selectMealToLog": {}
 }
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
@@ -61,7 +61,7 @@
   "sodium": "Natrium",
   "@sodium": {},
   "fiber": "Ballaststoff",
-  "@fibres": {},
+  "@fiber": {},
   "saturatedFat": "Gesättigte Fettsäuren",
   "@saturatedFat": {},
   "fat": "Fett",
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -122,6 +122,7 @@
   "@searchExercise": {
     "description": "Label on set form. Selected exercises are added to the set"
   },
+  "noIngredientsDefined": "No ingredients defined yet",
   "noMatchingExerciseFound": "No matching exercises found",
   "@noMatchingExerciseFound": {
     "description": "Message returned if no exercises match the searched string"
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
@@ -131,7 +131,7 @@
   "sodium": "Sodio",
   "@sodium": {},
   "fiber": "Fibra",
-  "@fibres": {},
+  "@fiber": {},
   "saturatedFat": "Grasas saturadas",
   "@saturatedFat": {},
   "fat": "Grasas",
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
@@ -70,7 +70,7 @@
   "sodium": "Sodium",
   "@sodium": {},
   "fiber": "fiber",
-  "@fibres": {},
+  "@fiber": {},
   "saturatedFat": "Graisses saturées",
   "@saturatedFat": {},
   "fat": "Graisses",
diff --git a/lib/l10n/app_he.arb b/lib/l10n/app_he.arb
@@ -276,7 +276,7 @@
   "saturatedFat": "שומן רווי",
   "@saturatedFat": {},
   "fiber": "סיבים",
-  "@fibres": {},
+  "@fiber": {},
   "sodium": "נתרן",
   "@sodium": {},
   "amount": "כמות",
diff --git a/lib/l10n/app_hi.arb b/lib/l10n/app_hi.arb
diff --git a/lib/l10n/app_hr.arb b/lib/l10n/app_hr.arb
@@ -317,7 +317,7 @@
   },
   "addIngredient": "Dodaj sastojak",
   "@addIngredient": {},
-  "logMeal": "Zapiši ovaj obrok",
+  "logMeal": "Zapiši obrok u dnevnik prehrane",
   "@logMeal": {},
   "value": "Vrijednost",
   "@value": {
@@ -515,7 +515,7 @@
   "@recentlyUsedIngredients": {
     "description": "A message when a user adds a new ingredient to a meal."
   },
-  "logIngredient": "Spremi u dnevnik prehrane",
+  "logIngredient": "Zapiši sastojak u dnevnik prehrane",
   "@logIngredient": {},
   "searchIngredient": "Traži sastojak",
   "@searchIngredient": {
@@ -901,5 +901,9 @@
   "goalMacro": "Ciljevi za makronutrijente",
   "@goalMacro": {
     "description": "The goal for macronutrients"
-  }
+  },
+  "selectMealToLog": "Odaberi obrok za zapis u dnevnik",
+  "@selectMealToLog": {},
+  "ingredientLogged": "Sastojak je upisan u dnevnik",
+  "@ingredientLogged": {}
 }
diff --git a/lib/l10n/app_id.arb b/lib/l10n/app_id.arb
@@ -371,7 +371,7 @@
   "saturatedFat": "Saturated fat",
   "@saturatedFat": {},
   "fiber": "Fibre",
-  "@fibres": {},
+  "@fiber": {},
   "sodium": "Sodium",
   "@sodium": {},
   "amount": "Amount",
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
@@ -64,7 +64,7 @@
   "sodium": "Sodio",
   "@sodium": {},
   "fiber": "Fibre",
-  "@fibres": {},
+  "@fiber": {},
   "saturatedFat": "Grassi saturi",
   "@saturatedFat": {},
   "fat": "Grassi",
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
@@ -370,7 +370,7 @@
   "saturatedFat": "Saturated fat",
   "@saturatedFat": {},
   "fiber": "Fibre",
-  "@fibres": {},
+  "@fiber": {},
   "sodium": "Sodium",
   "@sodium": {},
   "amount": "Amount",
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
@@ -415,7 +415,7 @@
   "saturatedFat": "Tłuszcz nasycony",
   "@saturatedFat": {},
   "fiber": "Błonnik",
-  "@fibres": {},
+  "@fiber": {},
   "sodium": "Sód",
   "@sodium": {},
   "amount": "Ilość",
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
@@ -180,7 +180,7 @@
     "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
   },
   "fiber": "Fibra",
-  "@fibres": {},
+  "@fiber": {},
   "sodium": "Sódio",
   "@sodium": {},
   "amount": "Quantidade",
diff --git a/lib/l10n/app_pt_BR.arb b/lib/l10n/app_pt_BR.arb
@@ -272,7 +272,7 @@
   "difference": "Diferença",
   "@difference": {},
   "fiber": "Fibra",
-  "@fibres": {},
+  "@fiber": {},
   "aboutDescription": "Obrigado por usar o Wger! Wger é um projeto colaborativo de código aberto, feito por entusiastas do fitness de todo o mundo.",
   "@aboutDescription": {
     "description": "Text in the about dialog"
diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arb
@@ -205,7 +205,7 @@
   "@plateCalculator": {
     "description": "Label used for the plate calculator in the gym mode"
   },
-  "logIngredient": "Beslenme günlüğüne kaydet",
+  "logIngredient": "Malzemeyi beslenme günlüğüne kaydet",
   "@logIngredient": {},
   "comment": "Yorum",
   "@comment": {
@@ -257,7 +257,7 @@
   "@addMeal": {},
   "mealLogged": "Yemek günlüğe kaydedildi",
   "@mealLogged": {},
-  "logMeal": "Bu yemeği kaydet",
+  "logMeal": "Yemeği beslenme günlüğüne kaydet",
   "@logMeal": {},
   "addIngredient": "Malzeme ekle",
   "@addIngredient": {},
@@ -841,5 +841,9 @@
   "deficit": "eksiklik",
   "@deficit": {
     "description": "Caloric deficit (either planned or unplanned)"
-  }
+  },
+  "ingredientLogged": "Malzeme günlüğe kaydedildi",
+  "@ingredientLogged": {},
+  "selectMealToLog": "Günlüğe kaydetmek için bir yemek seçin",
+  "@selectMealToLog": {}
 }
diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
@@ -402,7 +402,7 @@
   "saturatedFat": "Насичені жири",
   "@saturatedFat": {},
   "fiber": "Волокна",
-  "@fibres": {},
+  "@fiber": {},
   "sodium": "Натрій",
   "@sodium": {},
   "amount": "Сума",
diff --git a/lib/screens/log_meal_screen.dart b/lib/screens/log_meal_screen.dart
@@ -22,7 +22,7 @@ import 'package:provider/provider.dart';
 import 'package:wger/models/nutrition/meal.dart';
 import 'package:wger/providers/nutrition.dart';
 import 'package:wger/widgets/nutrition/meal.dart';
-import 'package:wger/widgets/nutrition/widgets.dart';
+import 'package:wger/widgets/nutrition/nutrition_tiles.dart';
 
 class LogMealArguments {
   final Meal meal;
@@ -51,7 +51,7 @@ class _LogMealScreenState extends State<LogMealScreen> {
 
     return Scaffold(
       appBar: AppBar(
-        title: Text('Log meal to diary'),
+        title: Text(AppLocalizations.of(context).logMeal),
       ),
       body: Consumer<NutritionPlansProvider>(
         builder: (context, nutritionProvider, child) => SingleChildScrollView(
@@ -64,13 +64,13 @@ class _LogMealScreenState extends State<LogMealScreen> {
               children: [
                 Text(meal.name, style: Theme.of(context).textTheme.headlineSmall),
                 if (meal.mealItems.isEmpty)
-                  const ListTile(title: Text('No ingredients defined yet'))
+                  ListTile(title: Text(AppLocalizations.of(context).noIngredientsDefined))
                 else
                   Column(
                     children: [
-                      const NutritionDiaryheader(),
-                      ...meal.mealItems
-                          .map((item) => MealItemWidget(item, viewMode.withAllDetails, false)),
+                      const DiaryheaderTile(),
+                      ...meal.mealItems.map(
+                          (item) => MealItemEditableFullTile(item, viewMode.withAllDetails, false)),
                       const SizedBox(height: 32),
                       Text(
                         'Portion: ${portionPct.round()} %',
diff --git a/lib/theme/theme.dart b/lib/theme/theme.dart
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'dart:ui';
 
 import 'package:flex_color_scheme/flex_color_scheme.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/widgets/core/core.dart b/lib/widgets/core/core.dart
@@ -21,10 +21,12 @@ import 'package:flutter/material.dart';
 class MutedText extends StatelessWidget {
   final String _text;
   final TextAlign textAlign;
+  final TextOverflow? overflow;
 
   const MutedText(
     this._text, {
     this.textAlign = TextAlign.left,
+    this.overflow,
   });
 
   @override
@@ -33,6 +35,7 @@ class MutedText extends StatelessWidget {
       _text,
       style: TextStyle(color: Theme.of(context).colorScheme.outline),
       textAlign: textAlign,
+      overflow: overflow,
     );
   }
 }
diff --git a/lib/widgets/nutrition/forms.dart b/lib/widgets/nutrition/forms.dart
@@ -31,6 +31,7 @@ import 'package:wger/models/nutrition/nutritional_plan.dart';
 import 'package:wger/providers/nutrition.dart';
 import 'package:wger/screens/nutritional_plan_screen.dart';
 import 'package:wger/widgets/nutrition/helpers.dart';
+import 'package:wger/widgets/nutrition/nutrition_tiles.dart';
 import 'package:wger/widgets/nutrition/widgets.dart';
 
 class MealForm extends StatelessWidget {
@@ -341,7 +342,7 @@ class IngredientFormState extends State<IngredientForm> {
                       builder: (BuildContext context, AsyncSnapshot<Ingredient> snapshot) {
                         if (snapshot.hasData) {
                           _mealItem.ingredient = snapshot.data!;
-                          return MealItemTile(
+                          return MealItemValuesTile(
                             ingredient: _mealItem.ingredient,
                             nutritionalValues: _mealItem.nutritionalValues,
                           );
diff --git a/lib/widgets/nutrition/helpers.dart b/lib/widgets/nutrition/helpers.dart
@@ -19,28 +19,59 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:wger/models/nutrition/meal.dart';
 import 'package:wger/models/nutrition/nutritional_values.dart';
 import 'package:wger/widgets/core/core.dart';
 
-List<Widget> getMutedNutritionalValues(NutritionalValues values, BuildContext context) => [
-      MutedText(
-        AppLocalizations.of(context).kcalValue(values.energy.toStringAsFixed(0)),
-        textAlign: TextAlign.right,
-      ),
-      MutedText(
-        AppLocalizations.of(context).gValue(values.protein.toStringAsFixed(0)),
-        textAlign: TextAlign.right,
-      ),
-      MutedText(
-        AppLocalizations.of(context).gValue(values.carbohydrates.toStringAsFixed(0)),
-        textAlign: TextAlign.right,
-      ),
-      MutedText(
-        AppLocalizations.of(context).gValue(values.fat.toStringAsFixed(0)),
-        textAlign: TextAlign.right,
-      ),
+List<String> getNutritionColumnNames(BuildContext context) => [
+      AppLocalizations.of(context).energy,
+      AppLocalizations.of(context).protein,
+      AppLocalizations.of(context).carbohydrates,
+      AppLocalizations.of(context).fat,
     ];
 
+List<String> getNutritionalValues(NutritionalValues values, BuildContext context) => [
+      AppLocalizations.of(context).kcalValue(values.energy.toStringAsFixed(0)),
+      AppLocalizations.of(context).gValue(values.protein.toStringAsFixed(0)),
+      AppLocalizations.of(context).gValue(values.carbohydrates.toStringAsFixed(0)),
+      AppLocalizations.of(context).gValue(values.fat.toStringAsFixed(0)),
+    ];
+
+List<int> getNutritionColumnFlexes(BuildContext context) {
+  return getNutritionColumnNames(context).map((e) {
+    final l = e.characters.length;
+    // if the word is really small (e.g. "fat"),
+    // we still want to have a minimum value to keep some spacing,
+    // especially because column values might become like "123 g"
+    return (l <= 3) ? 4 : l;
+  }).toList();
+}
+
+List<Widget> muted(List<String> children) => children
+    .map((e) => MutedText(
+          e,
+          textAlign: TextAlign.right,
+          overflow: TextOverflow.ellipsis,
+        ))
+    .toList();
+
+// return a row of elements in the standard macros spacing
+Row getNutritionRow(BuildContext context, List<Widget> children) {
+  return Row(
+    mainAxisSize: MainAxisSize.max,
+    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+    children: children.indexed
+        .map(
+          (e) => Flexible(
+            fit: FlexFit.tight,
+            flex: getNutritionColumnFlexes(context)[e.$1],
+            child: e.$2,
+          ),
+        )
+        .toList(),
+  );
+}
+
 String getShortNutritionValues(NutritionalValues values, BuildContext context) {
   final loc = AppLocalizations.of(context);
   final e = '${loc.energyShort} ${loc.kcalValue(values.energy.toStringAsFixed(0))}';
@@ -49,3 +80,18 @@ String getShortNutritionValues(NutritionalValues values, BuildContext context) {
   final f = '${loc.fatShort} ${loc.gValue(values.fat.toStringAsFixed(0))}';
   return '$e / $p / $c / $f';
 }
+
+String getKcalConsumed(Meal meal, BuildContext context) {
+  final consumed =
+      meal.diaryEntriesToday.map((e) => e.nutritionalValues.energy).fold(0.0, (a, b) => a + b);
+  return AppLocalizations.of(context).kcalValue(consumed.toStringAsFixed(0));
+}
+
+String getKcalConsumedVsPlanned(Meal meal, BuildContext context) {
+  final planned = meal.plannedNutritionalValues.energy;
+  final consumed =
+      meal.diaryEntriesToday.map((e) => e.nutritionalValues.energy).fold(0.0, (a, b) => a + b);
+  final loc = AppLocalizations.of(context);
+
+  return '${consumed.toStringAsFixed(0)} / ${planned.toStringAsFixed(0)} ${loc.kcal}';
+}
diff --git a/lib/widgets/nutrition/meal.dart b/lib/widgets/nutrition/meal.dart
diff --git a/lib/widgets/nutrition/nutrition_tile.dart b/lib/widgets/nutrition/nutrition_tile.dart
diff --git a/lib/widgets/nutrition/nutrition_tiles.dart b/lib/widgets/nutrition/nutrition_tiles.dart
diff --git a/lib/widgets/nutrition/nutritional_diary_detail.dart b/lib/widgets/nutrition/nutritional_diary_detail.dart
diff --git a/lib/widgets/nutrition/widgets.dart b/lib/widgets/nutrition/widgets.dart
diff --git a/test/nutrition/goldens/nutritional_plan_1_default_view.png b/test/nutrition/goldens/nutritional_plan_1_default_view.png
diff --git a/test/nutrition/goldens/nutritional_plan_2_one_meal_with_ingredients.png b/test/nutrition/goldens/nutritional_plan_2_one_meal_with_ingredients.png
diff --git a/test/nutrition/goldens/nutritional_plan_3_both_meals_with_ingredients.png b/test/nutrition/goldens/nutritional_plan_3_both_meals_with_ingredients.png
