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

replace MealItemExpandedRow widget with NutritionDiaryheader

Browse Source 
* it is designed to be used along with NutritionDiaryEntry
* and use on nutrition diary page
This commit is contained in:
Dieter Plaetinck
2024-05-15 11:24:20 +02:00
parent f7981e4dfb
commit c0e7a0c66e
3 changed files with 34 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
lib/widgets/nutrition/meal.dart
View File

@@ -152,12 +152,7 @@ class _MealWidgetState extends State<MealWidget> {
if (_viewMode == viewMode.withIngredients || _viewMode == viewMode.withAllDetails)
const Divider(),
if (_viewMode == viewMode.withAllDetails && widget._meal.isRealMeal)
MealItemExpandedRow(
AppLocalizations.of(context).energy,
AppLocalizations.of(context).protein,
AppLocalizations.of(context).carbohydrates,
AppLocalizations.of(context).fat,
),
const NutritionDiaryheader(),
if (_viewMode == viewMode.withIngredients || _viewMode == viewMode.withAllDetails)
if (widget._meal.mealItems.isEmpty && widget._meal.isRealMeal)
const ListTile(title: Text('No ingredients defined yet'))
@@ -166,21 +161,6 @@ class _MealWidgetState extends State<MealWidget> {
if (_viewMode == viewMode.withAllDetails)
Column(
children: [
// if (widget._meal.isRealMeal)
// MealItemExpandedRow(
// AppLocalizations.of(context).kcalValue(
// widget._meal.loggedNutritionalValuesToday.energy.toStringAsFixed(0),
// ),
// AppLocalizations.of(context).gValue(
// widget._meal.loggedNutritionalValuesToday.carbohydrates.toStringAsFixed(0),
// ),
// AppLocalizations.of(context).gValue(
// widget._meal.loggedNutritionalValuesToday.protein.toStringAsFixed(0),
// ),
// AppLocalizations.of(context).gValue(
// widget._meal.loggedNutritionalValuesToday.fat.toStringAsFixed(0),
// ),
// ),
Center(
child: Text(
AppLocalizations.of(context).loggedToday,
@@ -319,50 +299,6 @@ class LogDiaryItemWidget extends StatelessWidget {
}
}
class MealItemExpandedRow extends StatelessWidget {
final String row1;
final String row2;
final String row3;
final String row4;
final Widget? leading;
const MealItemExpandedRow(this.row1, this.row2, this.row3, this.row4, {this.leading});
@override
Widget build(BuildContext context) {
return ListTile(
leading: leading ??
const CircleIconAvatar(
Icon(Icons.image, color: Colors.transparent),
color: Colors.transparent,
),
subtitle: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
// crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.max,
children: [
MutedText(
row1,
textAlign: TextAlign.right,
),
MutedText(
row2,
textAlign: TextAlign.right,
),
MutedText(
row3,
textAlign: TextAlign.right,
),
MutedText(
row4,
textAlign: TextAlign.right,
),
],
),
);
}
}
class MealHeader extends StatelessWidget {
final Meal _meal;
final bool _editing;

1
lib/widgets/nutrition/nutritional_diary_detail.dart
View File

@@ -60,6 +60,7 @@ class NutritionalDiaryDetailWidget extends StatelessWidget {
),
),
const SizedBox(height: 15),
const NutritionDiaryheader(),
...logs.map((e) => Padding(
padding: const EdgeInsets.all(8.0),
child: Column(

32
lib/widgets/nutrition/widgets.dart
View File

@@ -238,6 +238,38 @@ class _IngredientTypeaheadState extends State<IngredientTypeahead> {
}
}
class NutritionDiaryheader extends StatelessWidget {
final Widget? leading;
const NutritionDiaryheader({this.leading});
@override
Widget build(BuildContext context) {
return ListTile(
leading: leading ??
const CircleIconAvatar(
Icon(Icons.image, color: Colors.transparent),
color: Colors.transparent,
),
subtitle: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.max,
children: [
AppLocalizations.of(context).energy,
AppLocalizations.of(context).protein,
AppLocalizations.of(context).carbohydrates,
AppLocalizations.of(context).fat
]
.map((e) => MutedText(
e,
textAlign: TextAlign.right,
))
.toList(),
),
);
}
}
class NutritionDiaryEntry extends StatelessWidget {
const NutritionDiaryEntry({
super.key,