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

fix diary entries

Browse Source
This commit is contained in:
Dieter Plaetinck
2024-06-10 15:58:18 +03:00
parent 2edf5a5a58
commit 54a404ca2a
2 changed files with 25 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
lib/widgets/nutrition/nutrition_tiles.dart
View File

@@ -74,46 +74,28 @@ class DiaryEntryTile extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
DateFormat.Hm(Localizations.localeOf(context).languageCode).format(diaryEntry.datetime),
style: const TextStyle(fontWeight: FontWeight.bold),
),
const SizedBox(width: 8),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'${AppLocalizations.of(context).gValue(diaryEntry.amount.toStringAsFixed(0))} ${diaryEntry.ingredient.name}',
overflow: TextOverflow.ellipsis,
),
const SizedBox(height: 4),
Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
...getMutedNutritionalValues(diaryEntry.nutritionalValues, context),
],
),
const SizedBox(height: 12),
],
),
),
if (nutritionalPlan != null)
IconButton(
tooltip: AppLocalizations.of(context).delete,
onPressed: () {
Provider.of<NutritionPlansProvider>(context, listen: false)
.deleteLog(diaryEntry.id!, nutritionalPlan!.id!);
},
icon: const Icon(Icons.delete_outline),
iconSize: ICON_SIZE_SMALL,
),
],
return NutritionTile(
leading: Text(
DateFormat.Hm(Localizations.localeOf(context).languageCode).format(diaryEntry.datetime),
style: const TextStyle(fontWeight: FontWeight.bold),
),
title: Text(
'${AppLocalizations.of(context).gValue(diaryEntry.amount.toStringAsFixed(0))} ${diaryEntry.ingredient.name}',
overflow: TextOverflow.ellipsis,
),
subtitle: getNutritionRow(
context, getMutedNutritionalValues(diaryEntry.nutritionalValues, context)),
trailing: (nutritionalPlan == null)
? null
: IconButton(
tooltip: AppLocalizations.of(context).delete,
onPressed: () {
Provider.of<NutritionPlansProvider>(context, listen: false)
.deleteLog(diaryEntry.id!, nutritionalPlan!.id!);
},
icon: const Icon(Icons.delete_outline),
iconSize: ICON_SIZE_SMALL,
),
);
}
}

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

@@ -61,14 +61,9 @@ class NutritionalDiaryDetailWidget extends StatelessWidget {
),
const SizedBox(height: 15),
const DiaryheaderTile(),
...logs.map((e) => Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
DiaryEntryTile(diaryEntry: e, nutritionalPlan: _nutritionalPlan),
],
),
)),
...logs.map(
(e) => DiaryEntryTile(diaryEntry: e, nutritionalPlan: _nutritionalPlan),
),
],
);
}