From 27cf8504d948667d45c756d920f7faa443f0de07 Mon Sep 17 00:00:00 2001 From: broodjeaap89 Date: Mon, 30 Aug 2021 21:46:10 +0200 Subject: [PATCH] moved ingredients table to main add pizza page, instead of the confirmation dialog --- lib/pages/AddPizzaEventPage.dart | 6 ++---- todo.md | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/pages/AddPizzaEventPage.dart b/lib/pages/AddPizzaEventPage.dart index 4107ad4..b1cd187 100644 --- a/lib/pages/AddPizzaEventPage.dart +++ b/lib/pages/AddPizzaEventPage.dart @@ -106,6 +106,7 @@ class AddPizzaEventPageState extends State { ) ] ), + widget.pizzaRecipe.getIngredientsTable(this.pizzaCount, this.doughBallSize), ] ) ), @@ -232,14 +233,11 @@ class ConfirmPizzaEventState extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Expanded( - flex: 30, + flex: 10, child: Column( children: [ Text(widget.name), Divider(), - Text("Ingredients"), - widget.pizzaRecipe.getIngredientsTable(widget.pizzaCount, widget.doughBallSize), - Divider(), SizedBox( width: double.infinity, height: 50, diff --git a/todo.md b/todo.md index 1157dd7..6474a38 100644 --- a/todo.md +++ b/todo.md @@ -7,4 +7,4 @@ - add decimals to ingredients table when below a certain % or <5g whatever -- move ingredients table when adding a pizza event from confirm date dialog to main add pizza page \ No newline at end of file +- theres a bug when waiting on the confirmation screen for a new pizza event too long, where the scheduled date is in the past \ No newline at end of file