support fibers goal

Author: Dieterbe

lib/l10n/app_en.arb

@@ -284,6 +284,7 @@
   "goalProtein": "Protein goal",
   "goalCarbohydrates": "Carbohydrates goal",
   "goalFat": "Fat goal",
+  "goalFiber": "Fiber goal",
   "anErrorOccurred": "An Error Occurred!",
   "@anErrorOccurred": {},
   "weight": "Weight",

lib/models/nutrition/nutritional_plan.dart

@@ -55,6 +55,9 @@ class NutritionalPlan {
   @JsonKey(required: true, name: 'goal_fat')
   late num? goalFat;
 
+  @JsonKey(required: true, name: 'goal_fibers')
+  late num? goalFibers;
+
   @JsonKey(includeFromJson: false, includeToJson: false, defaultValue: [])
   List<Meal> meals = [];
 
@@ -70,6 +73,7 @@ class NutritionalPlan {
     this.goalProtein,
     this.goalCarbohydrates,
     this.goalFat,
+    this.goalFibers,
     List<Meal>? meals,
     List<Log>? diaryEntries,
   }) {
@@ -84,6 +88,7 @@ class NutritionalPlan {
     goalEnergy = null;
     goalProtein = null;
     goalCarbohydrates = null;
+    goalFibers = null;
     goalFat = null;
   }
 
@@ -103,19 +108,24 @@ class NutritionalPlan {
         goalCarbohydrates != null;
   }
 
+  bool get hasAnyAdvancedGoals {
+    return goalFibers != null;
+  }
+
   /// Calculations
   ///
   /// note that (some of) this is already done on the server. It might be better
   /// to read it from there, but on the other hand we might want to do more locally
   /// so that a mostly offline mode is possible.
   NutritionalGoals get nutritionalGoals {
     // If there are set goals, they take preference over any meals
-    if (hasAnyGoals) {
+    if (hasAnyGoals || hasAnyAdvancedGoals) {
       return NutritionalGoals(
         energy: goalEnergy?.toDouble(),
         fat: goalFat?.toDouble(),
         protein: goalProtein?.toDouble(),
         carbohydrates: goalCarbohydrates?.toDouble(),
+        fibres: goalFibers?.toDouble(),
       );
     }
     // if there are no set goals and no defined meals, the goals are still undefined

lib/models/nutrition/nutritional_plan.g.dart

@@ -198,7 +198,6 @@ class _DashboardNutritionWidgetState extends State<DashboardNutritionWidget> {
                     ...getContent(),
                     Container(
                       padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 15),
-                      height: 206,
                       child: FlNutritionalPlanGoalWidget(nutritionalPlan: _plan!),
                     ),
                   ],

lib/widgets/dashboard/widgets.dart

@@ -99,7 +99,8 @@ class FlNutritionalPlanGoalWidgetState extends State<FlNutritionalPlanGoalWidget
         if (goals.carbohydrates != null && goals.carbohydrates! > 0)
           today.carbohydrates / goals.carbohydrates!,
         if (goals.fat != null && goals.fat! > 0) today.fat / goals.fat!,
-        if (goals.energy != null && goals.energy! > 0) today.energy / goals.energy!
+        if (goals.energy != null && goals.energy! > 0) today.energy / goals.energy!,
+        if (goals.fibres != null && goals.fibres! > 0) today.fibres / goals.fibres!,
       ].reduce(max);
 
       final normWidth = constraints.maxWidth / maxVal;
@@ -130,6 +131,15 @@ class FlNutritionalPlanGoalWidgetState extends State<FlNutritionalPlanGoalWidget
               AppLocalizations.of(context).kcal)),
           const SizedBox(height: 2),
           _diyGauge(context, normWidth, goals.energy, today.energy),
+          // optionally display the advanced macro goals:
+          if (goals.fibres != null)
+            Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
+              const SizedBox(height: 8),
+              Text(fmtMacro(AppLocalizations.of(context).fibres, today.fibres, goals.fibres,
+                  AppLocalizations.of(context).g)),
+              const SizedBox(height: 2),
+              _diyGauge(context, normWidth, goals.fibres, today.fibres),
+            ]),
         ],
       );
     });
@@ -257,6 +267,7 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
       2 => AppLocalizations.of(context).sugars,
       3 => AppLocalizations.of(context).fat,
       4 => AppLocalizations.of(context).saturatedFat,
+      5 => AppLocalizations.of(context).fibres,
       _ => '',
     };
     return SideTitleWidget(
@@ -389,6 +400,8 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
                     barchartGroup(2, barsSpace, barsWidth, 'carbohydratesSugar'),
                     barchartGroup(3, barsSpace, barsWidth, 'fat'),
                     barchartGroup(4, barsSpace, barsWidth, 'fatSaturated'),
+                    if (widget._nutritionalPlan.nutritionalGoals.fibres != null)
+                      barchartGroup(5, barsSpace, barsWidth, 'fibres'),
                   ],
                 ),
               ),

lib/widgets/nutrition/charts.dart

@@ -391,6 +391,15 @@ class IngredientLogForm extends StatelessWidget {
   }
 }
 
+enum GoalType {
+  meals('Based on my meals'),
+  basic('Set basic macros'),
+  advanced('Set advanced macros');
+
+  const GoalType(this.label);
+  final String label;
+}
+
 class PlanForm extends StatefulWidget {
   late NutritionalPlan _plan;
 
@@ -406,17 +415,26 @@ class _PlanFormState extends State<PlanForm> {
   final _form = GlobalKey<FormState>();
 
   bool _onlyLogging = true;
-  bool _addGoals = false;
+  GoalType _goalType = GoalType.meals;
 
   final _descriptionController = TextEditingController();
+  final TextEditingController colorController = TextEditingController();
+
+  GoalType? selectedGoal;
 
   @override
   void initState() {
     super.initState();
 
     _onlyLogging = widget._plan.onlyLogging;
-    _addGoals = widget._plan.hasAnyGoals;
     _descriptionController.text = widget._plan.description;
+    if (widget._plan.hasAnyAdvancedGoals) {
+      _goalType = GoalType.advanced;
+    } else if (widget._plan.hasAnyGoals) {
+      _goalType = GoalType.basic;
+    } else {
+      _goalType = GoalType.meals;
+    }
   }
 
   @override
@@ -446,23 +464,36 @@ class _PlanFormState extends State<PlanForm> {
               widget._plan.onlyLogging = value;
             },
           ),
-          SwitchListTile(
-            title: Text(AppLocalizations.of(context).addGoalsToPlan),
-            subtitle: Text(AppLocalizations.of(context).addGoalsToPlanHelpText),
-            value: _addGoals,
-            onChanged: (value) {
+          DropdownButtonFormField<GoalType>(
+            value: _goalType,
+            items: GoalType.values
+                .map(
+                  (e) => DropdownMenuItem<GoalType>(value: e, child: Text(e.label)),
+                )
+                .toList(),
+            onChanged: (GoalType? g) {
               setState(() {
-                _addGoals = !_addGoals;
+                if (g == null) {
+                  return;
+                }
+                switch (g) {
+                  case GoalType.meals:
+                    widget._plan.goalEnergy = null;
+                    widget._plan.goalProtein = null;
+                    widget._plan.goalCarbohydrates = null;
+                    widget._plan.goalFat = null;
+                    widget._plan.goalFibers = null;
+                  case GoalType.basic:
+                    widget._plan.goalFibers = null;
+                    break;
+                  default:
+                    break;
+                }
+                _goalType = g;
               });
-              if (!value) {
-                widget._plan.goalEnergy = null;
-                widget._plan.goalProtein = null;
-                widget._plan.goalCarbohydrates = null;
-                widget._plan.goalFat = null;
-              }
             },
           ),
-          if (_addGoals)
+          if (_goalType == GoalType.basic || _goalType == GoalType.advanced)
             Column(
               children: [
                 GoalMacros(
@@ -496,6 +527,14 @@ class _PlanFormState extends State<PlanForm> {
               ],
             ),
 
+          if (_goalType == GoalType.advanced)
+            GoalMacros(
+              val: widget._plan.goalFibers?.toString(),
+              label: AppLocalizations.of(context).goalFiber,
+              suffix: AppLocalizations.of(context).g,
+              onSave: (double value) => widget._plan.goalFibers = value,
+              key: const Key('field-goal-fibers'),
+            ),
           ElevatedButton(
             key: const Key(SUBMIT_BUTTON_KEY_NAME),
             child: Text(AppLocalizations.of(context).save),