wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 23:42:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

move nutritional diary table into separate file, clean up a bit

Browse Source
This commit is contained in:
Dieter Plaetinck
2024-05-03 10:54:57 +02:00
parent b756e5e11f
commit 820dee2c0d
2 changed files with 80 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
lib/widgets/nutrition/nutritional_diary_table.dart Normal file
View File

@@ -0,0 +1,63 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:intl/intl.dart';
import 'package:wger/helpers/colors.dart';
import 'package:wger/models/nutrition/nutritional_plan.dart';
import 'package:wger/models/nutrition/nutritional_values.dart';
import 'package:wger/screens/nutritional_diary_screen.dart';
class NutritionalDiaryTable extends StatelessWidget {
const NutritionalDiaryTable({
super.key,
required NutritionalPlan nutritionalPlan,
}) : plan = nutritionalPlan;
final NutritionalPlan plan;
@override
Widget build(BuildContext context) {
return Table(
children: [
nutrionalDiaryHeader(context),
...plan.logEntriesValues.entries
.map((entry) => nutritionDiaryEntry(context, entry.key, entry.value))
],
);
}
TableRow nutrionalDiaryHeader(BuildContext context) {
return TableRow(
children: [
const Text('Date'),
Text('${AppLocalizations.of(context).energyShort} (${AppLocalizations.of(context).kcal})'),
if (plan.goalEnergy != null) Text(AppLocalizations.of(context).difference),
Text('${AppLocalizations.of(context).protein} (${AppLocalizations.of(context).g})'),
Text(
'${AppLocalizations.of(context).carbohydratesShort} (${AppLocalizations.of(context).g})'),
Text('${AppLocalizations.of(context).fatShort} (${AppLocalizations.of(context).g})'),
],
);
}
TableRow nutritionDiaryEntry(
final BuildContext context, final DateTime date, final NutritionalValues values) {
return TableRow(
children: [
GestureDetector(
onTap: () => Navigator.of(context).pushNamed(
NutritionalDiaryScreen.routeName,
arguments: NutritionalDiaryArguments(plan, date),
),
child: Text(
style: TextStyle(color: LIST_OF_COLORS3.first),
DateFormat.Md(Localizations.localeOf(context).languageCode).format(date),
)),
Text(values.energy.toStringAsFixed(0)),
if (plan.goalEnergy != null) Text((values.energy - plan.goalEnergy!).toStringAsFixed(0)),
Text(values.protein.toStringAsFixed(0)),
Text(values.carbohydrates.toStringAsFixed(0)),
Text(values.fat.toStringAsFixed(0)),
],
);
}
}

74
lib/widgets/nutrition/nutritional_plan_detail.dart
View File

@@ -18,18 +18,17 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import 'package:wger/helpers/colors.dart';
import 'package:wger/models/nutrition/nutritional_plan.dart';
import 'package:wger/models/nutrition/nutritional_values.dart';
import 'package:wger/providers/body_weight.dart';
import 'package:wger/screens/form_screen.dart';
import 'package:wger/screens/nutritional_diary_screen.dart';
import 'package:wger/widgets/measurements/charts.dart';
import 'package:wger/widgets/nutrition/charts.dart';
import 'package:wger/widgets/nutrition/forms.dart';
import 'package:wger/widgets/nutrition/meal.dart';
import 'package:wger/widgets/nutrition/nutritional_diary_table.dart';
class NutritionalPlanDetailWidget extends StatelessWidget {
final NutritionalPlan _nutritionalPlan;
@@ -140,25 +139,22 @@ class NutritionalPlanDetailWidget extends StatelessWidget {
),
),
if (_nutritionalPlan.logEntriesValues.isNotEmpty)
Column(
children: [
Text(
AppLocalizations.of(context).nutritionalDiary,
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.titleSmall,
),
SizedBox(
height: 200,
child: SingleChildScrollView(
child: Table(
children: [
nutrionalDiaryHeader(context, _nutritionalPlan),
..._nutritionalPlan.logEntriesValues.entries.map((entry) =>
nutritionDiaryEntry(context, entry.key, entry.value, _nutritionalPlan))
],
),
)),
],
Padding(
padding: const EdgeInsets.only(bottom: 15, left: 15, right: 15),
child: Column(
children: [
Text(
AppLocalizations.of(context).nutritionalDiary,
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.titleLarge,
),
SizedBox(
height: 200,
child: SingleChildScrollView(
child: NutritionalDiaryTable(nutritionalPlan: _nutritionalPlan),
)),
],
),
),
],
));
@@ -317,39 +313,3 @@ class MacronutrientsTable extends StatelessWidget {
);
}
}
TableRow nutrionalDiaryHeader(BuildContext context, final NutritionalPlan plan) {
return TableRow(
children: [
TextButton(onPressed: () {}, child: const Text('')),
Text('${AppLocalizations.of(context).energyShort} (${AppLocalizations.of(context).kcal})'),
if (plan.goalEnergy != null) Text(AppLocalizations.of(context).difference),
Text('${AppLocalizations.of(context).protein} (${AppLocalizations.of(context).g})'),
Text(
'${AppLocalizations.of(context).carbohydratesShort} (${AppLocalizations.of(context).g})'),
Text('${AppLocalizations.of(context).fatShort} (${AppLocalizations.of(context).g})'),
],
);
}
TableRow nutritionDiaryEntry(final BuildContext context, final DateTime date,
final NutritionalValues values, final NutritionalPlan plan) {
return TableRow(
children: [
GestureDetector(
onTap: () => Navigator.of(context).pushNamed(
NutritionalDiaryScreen.routeName,
arguments: NutritionalDiaryArguments(plan, date),
),
child: Text(
style: TextStyle(color: LIST_OF_COLORS3.first),
DateFormat.Md(Localizations.localeOf(context).languageCode).format(date),
)),
Text(values.energy.toStringAsFixed(0)),
if (plan.goalEnergy != null) Text((values.energy - plan.goalEnergy!).toStringAsFixed(0)),
Text(values.protein.toStringAsFixed(0)),
Text(values.carbohydrates.toStringAsFixed(0)),
Text(values.fat.toStringAsFixed(0)),
],
);
}