From 63d37175c4377f75b3564e15936a2b12ff69c385 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Sun, 19 May 2024 09:35:07 +0200 Subject: [PATCH] show reminder of macro's on ingredient tiles --- lib/widgets/nutrition/forms.dart | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/widgets/nutrition/forms.dart b/lib/widgets/nutrition/forms.dart index 6bf3fcb0..2280380c 100644 --- a/lib/widgets/nutrition/forms.dart +++ b/lib/widgets/nutrition/forms.dart @@ -28,6 +28,7 @@ import 'package:wger/models/nutrition/meal_item.dart'; 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/widgets.dart'; class MealForm extends StatelessWidget { @@ -210,8 +211,10 @@ class MealItemForm extends StatelessWidget { _mealItem.ingredientId = _listMealItems[index].ingredientId; _mealItem.amount = _listMealItems[index].amount; }, - title: Text(_listMealItems[index].ingredient.name), - subtitle: Text('${_listMealItems[index].amount.toStringAsFixed(0)}$unit'), + title: Text( + '${_listMealItems[index].ingredient.name} (${_listMealItems[index].amount.toStringAsFixed(0)}$unit)'), + subtitle: Text(getShortNutritionValues( + _listMealItems[index].ingredient.nutritionalValues, context)), trailing: const Icon(Icons.copy), ), ); @@ -376,8 +379,10 @@ class IngredientLogForm extends StatelessWidget { _mealItem.ingredientId = diaryEntries[index].ingredientId; _mealItem.amount = diaryEntries[index].amount; }, - title: Text(_plan.diaryEntries[index].ingredient.name), - subtitle: Text('${diaryEntries[index].amount.toStringAsFixed(0)}$unit'), + title: Text( + '${diaryEntries[index].ingredient.name} (${diaryEntries[index].amount.toStringAsFixed(0)}$unit)'), + subtitle: Text(getShortNutritionValues( + diaryEntries[index].ingredient.nutritionalValues, context)), trailing: const Icon(Icons.copy), ), );