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

mealtile: show macros + replace 'Log' with diary button

Browse Source
This commit is contained in:
Dieter Plaetinck
2024-06-06 10:44:47 +03:00
parent 244d628068
commit 6f3d690594
5 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_svg_icons/flutter_svg_icons.dart';
import 'package:provider/provider.dart';
import 'package:wger/helpers/consts.dart';
import 'package:wger/models/nutrition/log.dart';
@@ -308,36 +309,20 @@ class MealHeader extends StatelessWidget {
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
title: Row(children: [
Expanded(
child: (_meal.name != '')
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
_meal.name,
style: Theme.of(context).textTheme.titleMedium,
),
if (_meal.time != null)
Text(
_meal.time!.format(context),
style: Theme.of(context).textTheme.headlineSmall,
)
],
)
: Text(
_meal.time != null ? _meal.time!.format(context) : '',
style: Theme.of(context).textTheme.headlineSmall,
),
),
if (_meal.isRealMeal)
Text(
AppLocalizations.of(context).log,
style: Theme.of(context)
.textTheme
.labelLarge
?.copyWith(color: Theme.of(context).colorScheme.primary),
),
const SizedBox(width: 26),
const SizedBox(height: 40, width: 1, child: VerticalDivider()),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
((_meal.time != null) ? '${_meal.time!.format(context)} ' : '') + _meal.name,
style: Theme.of(context).textTheme.titleMedium,
),
if (_meal.isRealMeal)
Text(
getShortNutritionValues(_meal.plannedNutritionalValues, context),
style: Theme.of(context).textTheme.titleSmall,
),
],
)),
]),
trailing: Row(
mainAxisSize: MainAxisSize.min,
@@ -363,7 +348,9 @@ class MealHeader extends StatelessWidget {
onPressed: () {
_toggleEditing();
},
)
),
if (_meal.isRealMeal) const SizedBox(width: 5),
if (_meal.isRealMeal) const SvgIcon(icon: SvgIconData('assets/icons/meal-diary.svg')),
],
),
onTap: _meal.isRealMeal

BIN
test/nutrition/goldens/nutritional_plan_1_default_view.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 69 KiB

BIN
test/nutrition/goldens/nutritional_plan_2_one_meal_with_ingredients.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 64 KiB

BIN
test/nutrition/goldens/nutritional_plan_3_both_meals_with_ingredients.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 63 KiB

4
test/nutrition/nutritional_plan_screen_test.dart
View File

@@ -134,7 +134,7 @@ void main() {
await tester.tap(find.byType(TextButton));
await tester.pumpAndSettle();
expect(find.text('5:00 PM'), findsOneWidget);
expect(find.textContaining('5:00 PM'), findsOneWidget);
});
testWidgets('Tests the localization of times - DE', (WidgetTester tester) async {
@@ -142,6 +142,6 @@ void main() {
await tester.tap(find.byType(TextButton));
await tester.pumpAndSettle();
expect(find.text('17:00'), findsOneWidget);
expect(find.textContaining('17:00'), findsOneWidget);
});
}