wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleaner way to show line of macros

Browse Source
This commit is contained in:
Dieter Plaetinck
2024-05-19 08:52:20 +02:00
parent cdc9cbd658
commit 5ae30e6788
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/widgets/dashboard/widgets.dart
View File

@@ -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<DashboardNutritionWidget> {
//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,

9
lib/widgets/nutrition/helpers.dart
View File

@@ -40,3 +40,12 @@ List<Widget> 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';
}