From 3d2ef58487b8f7d4e1136c6bc5dfa400f3a0f10f Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Mon, 10 Jun 2024 22:42:41 +0300 Subject: [PATCH] diary table: fix alignments --- .../nutrition/nutritional_diary_detail.dart | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/widgets/nutrition/nutritional_diary_detail.dart b/lib/widgets/nutrition/nutritional_diary_detail.dart index fe4f0d4e..e746701d 100644 --- a/lib/widgets/nutrition/nutritional_diary_detail.dart +++ b/lib/widgets/nutrition/nutritional_diary_detail.dart @@ -89,11 +89,12 @@ class NutritionDiaryTable extends StatelessWidget { Widget build(BuildContext context) { final loc = AppLocalizations.of(context); - Widget columnHeader(String title) => Padding( + Widget columnHeader(bool left, String title) => Padding( padding: const EdgeInsets.symmetric(vertical: tablePadding), child: Text( title, style: const TextStyle(fontWeight: FontWeight.bold), + textAlign: left ? TextAlign.left : TextAlign.right, ), ); @@ -104,9 +105,9 @@ class NutritionDiaryTable extends StatelessWidget { padding: EdgeInsets.symmetric(vertical: tablePadding, horizontal: indent * 12), child: Text(title), ), - Text(AppLocalizations.of(context).gValue(get(planned).toStringAsFixed(0))), - Text(AppLocalizations.of(context).gValue(get(logged).toStringAsFixed(0))), - Text((get(logged) - get(planned)).toStringAsFixed(0)), + Text(loc.gValue(get(planned).toStringAsFixed(0)), textAlign: TextAlign.right), + Text(loc.gValue(get(logged).toStringAsFixed(0)), textAlign: TextAlign.right), + Text((get(logged) - get(planned)).toStringAsFixed(0), textAlign: TextAlign.right), ], ); @@ -118,10 +119,10 @@ class NutritionDiaryTable extends StatelessWidget { columnWidths: const {0: FractionColumnWidth(0.4)}, children: [ TableRow(children: [ - columnHeader(loc.macronutrients), - columnHeader(loc.planned), - columnHeader(loc.logged), - columnHeader(loc.difference), + columnHeader(true, loc.macronutrients), + columnHeader(false, loc.planned), + columnHeader(false, loc.logged), + columnHeader(false, loc.difference), ]), macroRow(0, loc.energy, (NutritionalValues nv) => nv.energy), macroRow(0, loc.protein, (NutritionalValues nv) => nv.protein),