Skip to content

Commit 601be2c

Browse files
committed
fix(nutrition): decouple MealEditingToolbar visibility from ViewMode
- revert translation changes in charts and cleanup meal logs - fix for the Meal test
1 parent 5c7d4cb commit 601be2c

3 files changed

Lines changed: 10 additions & 17 deletions

File tree

lib/widgets/nutrition/charts.dart

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
337337
final logged7DayAvg = widget._nutritionalPlan.loggedNutritionalValues7DayAvg;
338338

339339
final [colorPlanned, colorLoggedToday, colorLogged7Day] = LIST_OF_COLORS3;
340-
final i18n = AppLocalizations.of(context);
341340

342341
BarChartGroupData barchartGroup(
343342
int x,
@@ -434,18 +433,18 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
434433
borderData: FlBorderData(show: false),
435434
groupsSpace: 30,
436435
barGroups: [
437-
barchartGroup(0, barsSpace, barsWidth, i18n.protein),
438-
barchartGroup(1, barsSpace, barsWidth, i18n.carbohydrates),
436+
barchartGroup(0, barsSpace, barsWidth, 'protein'),
437+
barchartGroup(1, barsSpace, barsWidth, 'carbohydrates'),
439438
barchartGroup(
440439
2,
441440
barsSpace,
442441
barsWidth,
443-
i18n.carbohydratesSugar,
442+
'carbohydratesSugar',
444443
),
445-
barchartGroup(3, barsSpace, barsWidth, i18n.fat),
446-
barchartGroup(4, barsSpace, barsWidth, i18n.saturatedFat),
444+
barchartGroup(3, barsSpace, barsWidth, 'fat'),
445+
barchartGroup(4, barsSpace, barsWidth, 'fatSaturated'),
447446
if (widget._nutritionalPlan.nutritionalGoals.fiber != null)
448-
barchartGroup(5, barsSpace, barsWidth, i18n.fiber),
447+
barchartGroup(5, barsSpace, barsWidth, 'fiber'),
449448
],
450449
),
451450
),

lib/widgets/nutrition/meal.dart

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,12 +304,11 @@ class MealIngredientsSection extends ConsumerWidget {
304304
Widget build(BuildContext context, WidgetRef ref) {
305305
return Column(
306306
children: [
307+
if (editing)
308+
MealEditingToolbar(
309+
meal: meal,
310+
),
307311
if (showIngredientsDetails(viewMode)) ...[
308-
if (editing)
309-
MealEditingToolbar(
310-
meal: meal,
311-
),
312-
313312
const Divider(),
314313
const DiaryheaderTile(),
315314
_buildIngredientList(context),

test/nutrition/meal_test.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ void main() {
7171
await tester.tap(find.byIcon(Icons.edit));
7272
await tester.pumpAndSettle();
7373

74-
// Reveal the ingredients section by entering details view mode.
75-
// The toolbar is hidden in ViewMode.base, so we must toggle it.
76-
await tester.tap(find.byIcon(Icons.info_outline));
77-
await tester.pumpAndSettle();
78-
7974
final addButton = tester.widget<TextButton>(
8075
find.ancestor(
8176
of: find.byIcon(Icons.add),

0 commit comments

Comments
 (0)