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

Merge branch 'master' into goal-fiber

Browse Source
This commit is contained in:
Dieter Plaetinck
2024-05-25 09:53:47 +02:00
parent 5d237e1ddf f00dc88678
commit caa2866bdf
17 changed files with 1194 additions and 310 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,