kcal vs g fix

Author: Dieterbe

lib/widgets/nutrition/macro_nutrients_table.dart

@@ -32,19 +32,15 @@ class MacronutrientsTable extends StatelessWidget {
       final goal = get(nutritionalGoals);
       final pct = get(plannedValuesPercentage);
       final perkg = nutritionalGoalsGperKg == null ? null : get(nutritionalGoalsGperKg!);
+      final valFn = g ? loc.gValue : loc.kcalValue;
+
       return TableRow(
         children: [
           Padding(
             padding: EdgeInsets.symmetric(vertical: tablePadding, horizontal: indent * 12),
             child: Text(title),
           ),
-          Text(
-              goal == null
-                  ? ''
-                  : (g
-                      ? loc.gValue(goal.toStringAsFixed(0))
-                      : loc.kcalValue(goal.toStringAsFixed(0))),
-              textAlign: TextAlign.right),
+          Text(goal != null ? valFn(goal.toStringAsFixed(0)) : '', textAlign: TextAlign.right),
           Text(pct != null ? pct.toStringAsFixed(1) : '', textAlign: TextAlign.right),
           Text(perkg != null ? perkg.toStringAsFixed(1) : '', textAlign: TextAlign.right),
         ],

lib/widgets/nutrition/nutritional_diary_detail.dart

@@ -98,18 +98,20 @@ class NutritionDiaryTable extends StatelessWidget {
           ),
         );
 
-    TableRow macroRow(int indent, String title, double Function(NutritionalValues nv) get) =>
-        TableRow(
-          children: [
-            Padding(
-              padding: EdgeInsets.symmetric(vertical: tablePadding, horizontal: indent * 12),
-              child: Text(title),
-            ),
-            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),
-          ],
-        );
+    TableRow macroRow(int indent, bool g, String title, double Function(NutritionalValues nv) get) {
+      final valFn = g ? loc.gValue : loc.kcalValue;
+      return TableRow(
+        children: [
+          Padding(
+            padding: EdgeInsets.symmetric(vertical: tablePadding, horizontal: indent * 12),
+            child: Text(title),
+          ),
+          Text(valFn(get(planned).toStringAsFixed(0)), textAlign: TextAlign.right),
+          Text(valFn(get(logged).toStringAsFixed(0)), textAlign: TextAlign.right),
+          Text((get(logged) - get(planned)).toStringAsFixed(0), textAlign: TextAlign.right),
+        ],
+      );
+    }
 
     return Table(
       defaultVerticalAlignment: TableCellVerticalAlignment.middle,
@@ -124,14 +126,14 @@ class NutritionDiaryTable extends StatelessWidget {
           columnHeader(false, loc.logged),
           columnHeader(false, loc.difference),
         ]),
-        macroRow(0, loc.energy, (NutritionalValues nv) => nv.energy),
-        macroRow(0, loc.protein, (NutritionalValues nv) => nv.protein),
-        macroRow(0, loc.carbohydrates, (NutritionalValues nv) => nv.carbohydrates),
-        macroRow(1, loc.sugars, (NutritionalValues nv) => nv.carbohydratesSugar),
-        macroRow(0, loc.fat, (NutritionalValues nv) => nv.fat),
-        macroRow(1, loc.saturatedFat, (NutritionalValues nv) => nv.fatSaturated),
-        macroRow(0, loc.fiber, (NutritionalValues nv) => nv.fiber),
-        macroRow(0, loc.sodium, (NutritionalValues nv) => nv.sodium),
+        macroRow(0, false, loc.energy, (NutritionalValues nv) => nv.energy),
+        macroRow(0, true, loc.protein, (NutritionalValues nv) => nv.protein),
+        macroRow(0, true, loc.carbohydrates, (NutritionalValues nv) => nv.carbohydrates),
+        macroRow(1, true, loc.sugars, (NutritionalValues nv) => nv.carbohydratesSugar),
+        macroRow(0, true, loc.fat, (NutritionalValues nv) => nv.fat),
+        macroRow(1, true, loc.saturatedFat, (NutritionalValues nv) => nv.fatSaturated),
+        macroRow(0, true, loc.fiber, (NutritionalValues nv) => nv.fiber),
+        macroRow(0, true, loc.sodium, (NutritionalValues nv) => nv.sodium),
       ],
     );
   }