diff --git a/lib/widgets/nutrition/helpers.dart b/lib/widgets/nutrition/helpers.dart index 8879b661..27e45761 100644 --- a/lib/widgets/nutrition/helpers.dart +++ b/lib/widgets/nutrition/helpers.dart @@ -141,7 +141,7 @@ void showIngredientDetails(BuildContext context, int id, {String? image}) { child: MacronutrientsTable( nutritionalGoals: goals!, plannedValuesPercentage: goals.energyPercentage(), - nutritionalGoalsGperKg: null, + showGperKg: false, ), ), ], diff --git a/lib/widgets/nutrition/macro_nutrients_table.dart b/lib/widgets/nutrition/macro_nutrients_table.dart index 4d81c081..c5bc5c4b 100644 --- a/lib/widgets/nutrition/macro_nutrients_table.dart +++ b/lib/widgets/nutrition/macro_nutrients_table.dart @@ -7,13 +7,15 @@ class MacronutrientsTable extends StatelessWidget { super.key, required this.nutritionalGoals, required this.plannedValuesPercentage, - required this.nutritionalGoalsGperKg, + this.nutritionalGoalsGperKg, + this.showGperKg = true, }); static const double tablePadding = 7; final NutritionalGoals nutritionalGoals; final NutritionalGoals plannedValuesPercentage; final NutritionalGoals? nutritionalGoalsGperKg; + final bool showGperKg; @override Widget build(BuildContext context) { @@ -42,7 +44,8 @@ class MacronutrientsTable extends StatelessWidget { ), 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), + if (showGperKg) + Text(perkg != null ? perkg.toStringAsFixed(1) : '', textAlign: TextAlign.right), ], ); } @@ -62,7 +65,7 @@ class MacronutrientsTable extends StatelessWidget { columnHeader(true, loc.macronutrients), columnHeader(false, loc.total), columnHeader(false, loc.percentEnergy), - columnHeader(false, loc.gPerBodyKg), + if (showGperKg) columnHeader(false, loc.gPerBodyKg), ], ), macroRow(0, false, loc.energy, (NutritionalGoals ng) => ng.energy),