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

Add common widget for macronutritional goals

Browse Source
This commit is contained in:
Roland Geider
2024-02-01 15:18:44 +01:00
parent 6f9a07159e
commit 9ef0c10896
3 changed files with 63 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/models/nutrition/nutritional_plan.dart
View File

@@ -62,13 +62,13 @@ class NutritionalPlan {
NutritionalPlan({
this.id,
required this.description,
required this.creationDate,
this.onlyLogging = false,
this.goalEnergy,
this.goalProtein,
this.goalCarbohydrates,
this.goalFat,
required this.description,
required this.creationDate,
List<Meal>? meals,
List<Log>? logs,
}) {
@@ -79,6 +79,7 @@ class NutritionalPlan {
NutritionalPlan.empty() {
creationDate = DateTime.now();
description = '';
onlyLogging = false;
}
// Boilerplate

1
lib/screens/nutritional_plan_screen.dart
View File

@@ -81,6 +81,7 @@ class NutritionalPlanScreen extends StatelessWidget {
arguments: FormScreenArguments(
AppLocalizations.of(context).edit,
PlanForm(nutritionalPlan),
hasListView: true,
),
);

116
lib/widgets/nutrition/forms.dart
View File

@@ -379,7 +379,7 @@ class _PlanFormState extends State<PlanForm> {
Widget build(BuildContext context) {
return Form(
key: _form,
child: Column(
child: ListView(
children: [
// Description
TextFormField(
@@ -401,7 +401,6 @@ class _PlanFormState extends State<PlanForm> {
});
widget._plan.onlyLogging = value;
},
dense: false,
),
SwitchListTile(
title: Text(AppLocalizations.of(context).addGoalsToPlan),
@@ -412,14 +411,16 @@ class _PlanFormState extends State<PlanForm> {
_addGoals = !_addGoals;
});
},
dense: false,
),
if (_addGoals)
Column(
children: [
TextFormField(
key: const Key('field-goal-energy'),
decoration: InputDecoration(labelText: AppLocalizations.of(context).goalEnergy),
decoration: InputDecoration(
labelText: AppLocalizations.of(context).goalEnergy,
suffix: Text(AppLocalizations.of(context).kcal),
),
controller: _goalEnergyController,
keyboardType: TextInputType.number,
onSaved: (newValue) {
@@ -437,63 +438,23 @@ class _PlanFormState extends State<PlanForm> {
return null;
},
),
TextFormField(
GoalMacros(
widget: widget,
label: AppLocalizations.of(context).goalProtein,
onSaved: (String value) => widget._plan.goalProtein = double.parse(value),
key: const Key('field-goal-protein'),
decoration: InputDecoration(labelText: AppLocalizations.of(context).goalProtein),
keyboardType: TextInputType.number,
onSaved: (newValue) {
widget._plan.goalProtein = double.parse(newValue!);
},
validator: (value) {
if (value == '') {
return null;
}
try {
double.parse(value!);
} catch (error) {
return AppLocalizations.of(context).enterValidNumber;
}
return null;
},
),
TextFormField(
GoalMacros(
widget: widget,
label: AppLocalizations.of(context).goalCarbohydrates,
onSaved: (String value) => widget._plan.goalCarbohydrates = double.parse(value),
key: const Key('field-goal-carbohydrates'),
decoration:
InputDecoration(labelText: AppLocalizations.of(context).goalCarbohydrates),
keyboardType: TextInputType.number,
onSaved: (newValue) {
widget._plan.goalCarbohydrates = double.parse(newValue!);
},
validator: (value) {
if (value == '') {
return null;
}
try {
double.parse(value!);
} catch (error) {
return AppLocalizations.of(context).enterValidNumber;
}
return null;
},
),
TextFormField(
GoalMacros(
widget: widget,
label: AppLocalizations.of(context).goalFat,
onSaved: (String value) => widget._plan.goalFat = double.parse(value),
key: const Key('field-goal-fat'),
decoration: InputDecoration(labelText: AppLocalizations.of(context).goalFat),
keyboardType: TextInputType.number,
onSaved: (newValue) {
widget._plan.goalFat = double.parse(newValue!);
},
validator: (value) {
if (value == '') {
return null;
}
try {
double.parse(value!);
} catch (error) {
return AppLocalizations.of(context).enterValidNumber;
}
return null;
},
),
],
),
@@ -512,7 +473,8 @@ class _PlanFormState extends State<PlanForm> {
// Save to DB
try {
if (widget._plan.id != null) {
await Provider.of<NutritionPlansProvider>(context, listen: false).editPlan(_plan);
await Provider.of<NutritionPlansProvider>(context, listen: false)
.editPlan(widget._plan);
if (context.mounted) {
Navigator.of(context).pop();
}
@@ -545,3 +507,43 @@ class _PlanFormState extends State<PlanForm> {
);
}
}
class GoalMacros extends StatelessWidget {
GoalMacros({
super.key,
required this.widget,
required this.label,
required this.onSaved,
});
final PlanForm widget;
final String label;
final Function onSaved;
final TextEditingController controller = TextEditingController();
@override
Widget build(BuildContext context) {
return TextFormField(
controller: controller,
decoration: InputDecoration(
labelText: label,
suffixText: AppLocalizations.of(context).g,
),
keyboardType: TextInputType.number,
onSaved: (newValue) {
onSaved(newValue);
},
validator: (value) {
if (value == '') {
return null;
}
try {
double.parse(value!);
} catch (error) {
return AppLocalizations.of(context).enterValidNumber;
}
return null;
},
);
}
}