diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 3f1e32ed..eea7b645 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -296,6 +296,10 @@ "@energy": { "description": "Energy in a meal, ingredient etc. e.g. in kJ" }, + "energyShort": "E", + "@energyShort": { + "description": "The first letter or short name of the word 'Energy', used in overviews" + }, "kcal": "kcal", "@kcal": { "description": "Energy in a meal in kilocalories, kcal" @@ -329,12 +333,24 @@ }, "protein": "Protein", "@protein": {}, + "proteinShort": "P", + "@proteinShort": { + "description" : "The first letter or short name of the word 'Protein', used in overviews" + }, "carbohydrates": "Carbohydrates", "@carbohydrates": {}, + "carbohydratesShort": "C", + "@carbohydratesShort": { + "description" : "The first letter or short name of the word 'Carbohydrates', used in overviews" + }, "sugars": "Sugars", "@sugars": {}, "fat": "Fat", "@fat": {}, + "fatShort": "F", + "@fatShort": { + "description" : "The first letter or short name of the word 'Fat', used in overviews" + }, "saturatedFat": "Saturated fat", "@saturatedFat": {}, "fibres": "Fibre", diff --git a/lib/widgets/dashboard/widgets.dart b/lib/widgets/dashboard/widgets.dart index f0b6bc40..3b71ce02 100644 --- a/lib/widgets/dashboard/widgets.dart +++ b/lib/widgets/dashboard/widgets.dart @@ -37,7 +37,6 @@ import 'package:wger/widgets/core/charts.dart'; import 'package:wger/widgets/core/core.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'; @@ -81,16 +80,16 @@ class _DashboardNutritionWidgetState extends State { mainAxisSize: MainAxisSize.min, children: [ MutedText( - '${getFirstWord(AppLocalizations.of(context).energy)} ${meal.nutritionalValues.energy.toStringAsFixed(0)}${AppLocalizations.of(context).kcal}'), + '${AppLocalizations.of(context).energyShort} ${meal.nutritionalValues.energy.toStringAsFixed(0)}${AppLocalizations.of(context).kcal}'), MutedText(' / '), MutedText( - '${getFirstWord(AppLocalizations.of(context).protein)} ${meal.nutritionalValues.protein.toStringAsFixed(0)}${AppLocalizations.of(context).g}'), + '${AppLocalizations.of(context).proteinShort} ${meal.nutritionalValues.protein.toStringAsFixed(0)}${AppLocalizations.of(context).g}'), MutedText(' / '), MutedText( - '${getFirstWord(AppLocalizations.of(context).carbohydrates)} ${meal.nutritionalValues.carbohydrates.toStringAsFixed(0)}${AppLocalizations.of(context).g}'), + '${AppLocalizations.of(context).carbohydratesShort} ${meal.nutritionalValues.carbohydrates.toStringAsFixed(0)}${AppLocalizations.of(context).g}'), MutedText(' / '), MutedText( - '${getFirstWord(AppLocalizations.of(context).fat)} ${meal.nutritionalValues.fat.toStringAsFixed(0)}${AppLocalizations.of(context).g} '), + '${AppLocalizations.of(context).fatShort} ${meal.nutritionalValues.fat.toStringAsFixed(0)}${AppLocalizations.of(context).g} '), ], ), IconButton( diff --git a/lib/widgets/nutrition/helpers.dart b/lib/widgets/nutrition/helpers.dart index 3de7865b..582282b4 100644 --- a/lib/widgets/nutrition/helpers.dart +++ b/lib/widgets/nutrition/helpers.dart @@ -48,7 +48,3 @@ List getMutedNutritionalValues(NutritionalValues values, BuildContext co ]; return out; } - -String getFirstWord(String macroNutrientName) => macroNutrientName.isNotEmpty - ? macroNutrientName.trim().split(' ').map((l) => l[0]).join() - : ''; diff --git a/lib/widgets/nutrition/nutritional_plan_detail.dart b/lib/widgets/nutrition/nutritional_plan_detail.dart index f43fbd28..529637a8 100644 --- a/lib/widgets/nutrition/nutritional_plan_detail.dart +++ b/lib/widgets/nutrition/nutritional_plan_detail.dart @@ -28,7 +28,6 @@ import 'package:wger/screens/nutritional_diary_screen.dart'; import 'package:wger/theme/theme.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/nutrition/meal.dart'; class NutritionalPlanDetailWidget extends StatelessWidget { @@ -226,13 +225,13 @@ class NutritionalPlanDetailWidget extends StatelessWidget { children: [ TextButton(onPressed: () {}, child: const Text('')), Text( - '${getFirstWord(AppLocalizations.of(context).energy)} (${AppLocalizations.of(context).kcal})'), + '${AppLocalizations.of(context).energyShort} (${AppLocalizations.of(context).kcal})'), Text( - '${getFirstWord(AppLocalizations.of(context).protein)} (${AppLocalizations.of(context).g})'), + '${AppLocalizations.of(context).proteinShort} (${AppLocalizations.of(context).g})'), Text( - '${getFirstWord(AppLocalizations.of(context).carbohydrates)} (${AppLocalizations.of(context).g})'), + '${AppLocalizations.of(context).carbohydratesShort} (${AppLocalizations.of(context).g})'), Text( - '${getFirstWord(AppLocalizations.of(context).fat)} (${AppLocalizations.of(context).g})'), + '${AppLocalizations.of(context).fatShort} (${AppLocalizations.of(context).g})'), ], ), ),