-
-
Notifications
You must be signed in to change notification settings - Fork 257
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #593 from wger-project/log-fractional-meals
log meal: separate confirmation page with portion choice
- Loading branch information
Showing
5 changed files
with
196 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| /* | ||
| * This file is part of wger Workout Manager <https://github.com/wger-project>. | ||
| * Copyright (C) 2020, 2021 wger Team | ||
| * | ||
| * wger Workout Manager is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * wger Workout Manager is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| import 'package:flutter/material.dart'; | ||
| import 'package:flutter/services.dart'; | ||
| import 'package:flutter_gen/gen_l10n/app_localizations.dart'; | ||
| import 'package:provider/provider.dart'; | ||
| import 'package:wger/models/nutrition/meal.dart'; | ||
| import 'package:wger/models/nutrition/meal_item.dart'; | ||
| import 'package:wger/providers/nutrition.dart'; | ||
| import 'package:wger/widgets/nutrition/meal.dart'; | ||
| import 'package:wger/widgets/nutrition/widgets.dart'; | ||
|
|
||
| class LogMealArguments { | ||
| final Meal meal; | ||
|
|
||
| LogMealArguments(this.meal); | ||
| } | ||
|
|
||
| class LogMealScreen extends StatefulWidget { | ||
| static const routeName = '/log-meal'; | ||
|
|
||
| @override | ||
| State<LogMealScreen> createState() => _LogMealScreenState(); | ||
| } | ||
|
|
||
| class _LogMealScreenState extends State<LogMealScreen> { | ||
| late TextEditingController _controller; | ||
| int portionPct = 100; | ||
|
|
||
| @override | ||
| void initState() { | ||
| super.initState(); | ||
| _controller = TextEditingController(); | ||
| } | ||
|
|
||
| @override | ||
| void dispose() { | ||
| _controller.dispose(); | ||
| super.dispose(); | ||
| } | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| final args = ModalRoute.of(context)!.settings.arguments as LogMealArguments; | ||
| _controller.text = portionPct.toString(); | ||
| final meal = args.meal.copyWith( | ||
| mealItems: args.meal.mealItems | ||
| .map((mealItem) => mealItem.copyWith(amount: mealItem.amount * portionPct / 100)) | ||
| .toList()); | ||
|
|
||
| return Scaffold( | ||
| appBar: AppBar( | ||
| title: Text('Log meal to diary'), | ||
| ), | ||
| body: Consumer<NutritionPlansProvider>( | ||
| builder: (context, nutritionProvider, child) => SingleChildScrollView( | ||
| child: Padding( | ||
| padding: const EdgeInsets.all(8.0), | ||
| child: Column( | ||
| children: [ | ||
| Text(meal.name, style: Theme.of(context).textTheme.headlineSmall), | ||
| if (meal.mealItems.isEmpty) | ||
| const ListTile(title: Text('No ingredients defined yet')) | ||
| else | ||
| Column( | ||
| children: [ | ||
| const NutritionDiaryheader(), | ||
| ...meal.mealItems | ||
| .map((item) => MealItemWidget(item, viewMode.withAllDetails, false)), | ||
| Row( | ||
| children: [ | ||
| Text('Portion size'), | ||
| Expanded( | ||
| child: TextField( | ||
| maxLength: 4, | ||
| maxLengthEnforcement: MaxLengthEnforcement.enforced, | ||
| keyboardType: TextInputType.number, | ||
| decoration: InputDecoration( | ||
| hintText: 'Enter the portion size as a percent', | ||
| ), | ||
| controller: _controller, | ||
| onChanged: (value) { | ||
| var v = int.tryParse(value); | ||
| if (v == null) return; | ||
| setState(() { | ||
| portionPct = v; | ||
| }); | ||
| }, | ||
| ), | ||
| ), | ||
| ], | ||
| ), | ||
| ], | ||
| ), | ||
| Row( | ||
| mainAxisAlignment: MainAxisAlignment.end, | ||
| children: [ | ||
| if (meal.mealItems.isNotEmpty) | ||
| TextButton( | ||
| child: const Text('Log'), | ||
| onPressed: () async { | ||
| await Provider.of<NutritionPlansProvider>(context, listen: false) | ||
| .logMealToDiary(meal); | ||
| // ignore: use_build_context_synchronously | ||
| ScaffoldMessenger.of(context).showSnackBar( | ||
| SnackBar( | ||
| content: Text( | ||
| // ignore: use_build_context_synchronously | ||
| AppLocalizations.of(context).mealLogged, | ||
| textAlign: TextAlign.center, | ||
| ), | ||
| ), | ||
| ); | ||
| Navigator.of(context).pop(); | ||
| }, | ||
| ), | ||
| TextButton( | ||
| child: Text(MaterialLocalizations.of(context).cancelButtonLabel), | ||
| onPressed: () => Navigator.of(context).pop(), | ||
| ), | ||
| ], | ||
| ), | ||
| ], | ||
| ), | ||
| ), | ||
| ), | ||
| ), | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters