diff --git a/lib/widgets/dashboard/widgets.dart b/lib/widgets/dashboard/widgets.dart index 93297d4a..4d37b167 100644 --- a/lib/widgets/dashboard/widgets.dart +++ b/lib/widgets/dashboard/widgets.dart @@ -42,6 +42,7 @@ import 'package:wger/widgets/measurements/charts.dart'; import 'package:wger/widgets/measurements/forms.dart'; import 'package:wger/widgets/nutrition/charts.dart'; import 'package:wger/widgets/nutrition/forms.dart'; +import 'package:wger/widgets/nutrition/helpers.dart'; import 'package:wger/widgets/weight/forms.dart'; import 'package:wger/widgets/workouts/forms.dart'; @@ -83,23 +84,7 @@ class _DashboardNutritionWidgetState extends State { //textAlign: TextAlign.left, ), ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - mainAxisSize: MainAxisSize.min, - children: [ - MutedText( - '${AppLocalizations.of(context).energyShort} ${meal.plannedNutritionalValues.energy.toStringAsFixed(0)}${AppLocalizations.of(context).kcal}'), - const MutedText(' / '), - MutedText( - '${AppLocalizations.of(context).proteinShort} ${meal.plannedNutritionalValues.protein.toStringAsFixed(0)}${AppLocalizations.of(context).g}'), - const MutedText(' / '), - MutedText( - '${AppLocalizations.of(context).carbohydratesShort} ${meal.plannedNutritionalValues.carbohydrates.toStringAsFixed(0)}${AppLocalizations.of(context).g}'), - const MutedText(' / '), - MutedText( - '${AppLocalizations.of(context).fatShort} ${meal.plannedNutritionalValues.fat.toStringAsFixed(0)}${AppLocalizations.of(context).g} '), - ], - ), + MutedText(getShortNutritionValues(meal.plannedNutritionalValues, context)), IconButton( icon: const Icon(Icons.history_edu), color: wgerPrimaryButtonColor, diff --git a/lib/widgets/nutrition/helpers.dart b/lib/widgets/nutrition/helpers.dart index 222e8765..766386b1 100644 --- a/lib/widgets/nutrition/helpers.dart +++ b/lib/widgets/nutrition/helpers.dart @@ -40,3 +40,12 @@ List getMutedNutritionalValues(NutritionalValues values, BuildContext co textAlign: TextAlign.right, ), ]; + +String getShortNutritionValues(NutritionalValues values, BuildContext context) { + final loc = AppLocalizations.of(context); + final e = '${loc.energyShort} ${loc.kcalValue(values.energy.toStringAsFixed(0))}'; + final p = '${loc.proteinShort} ${loc.gValue(values.protein.toStringAsFixed(0))}'; + final c = '${loc.carbohydratesShort} ${loc.gValue(values.carbohydrates.toStringAsFixed(0))}'; + final f = '${loc.fatShort} ${loc.gValue(values.fat.toStringAsFixed(0))}'; + return '$e / $p / $c / $f'; +}