From f2c668275519fa2da452ee752775e5e4e11d5e57 Mon Sep 17 00:00:00 2001 From: broodjeaap89 Date: Sat, 25 Sep 2021 18:21:52 +0200 Subject: [PATCH] picked a button color --- lib/main.dart | 2 ++ lib/pages/add_pizza_event_page.dart | 13 +++++++++---- lib/pages/add_recipe_url.dart | 2 +- lib/pages/edit_recipe_page.dart | 12 ++++++------ lib/pages/edit_recipe_step_page.dart | 8 ++++---- lib/pages/edit_recipe_sub_step_page.dart | 4 ++-- lib/pages/pizza_event_notification_page.dart | 6 +++--- lib/pages/pizza_event_page.dart | 4 ++-- lib/pages/pizza_events_page.dart | 1 + lib/pages/recipe_step_instruction_page.dart | 4 ++-- lib/pages/recipes_page.dart | 4 ++-- 11 files changed, 34 insertions(+), 26 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index a3abf21..c935319 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -117,6 +117,8 @@ class PizzaPlannerState extends State { headline3: TextStyle(fontSize: 50, color: Color.fromARGB(255, 10, 10, 10)), ), primaryColor: const Color.fromARGB(255, 200, 42, 53), + buttonColor: const Color.fromARGB(255, 200, 42, 53), + highlightColor: const Color.fromARGB(255, 53, 200, 42), ) ); } diff --git a/lib/pages/add_pizza_event_page.dart b/lib/pages/add_pizza_event_page.dart index 5882638..93bef36 100644 --- a/lib/pages/add_pizza_event_page.dart +++ b/lib/pages/add_pizza_event_page.dart @@ -64,7 +64,8 @@ class AddPizzaEventPageState extends State { const Icon(FontAwesome5.hashtag), Expanded( child: Slider( - + activeColor: Theme.of(context).highlightColor, + inactiveColor: Theme.of(context).highlightColor.withOpacity(0.5), value: pizzaCount.toDouble(), min: 1, max: 20, @@ -86,6 +87,8 @@ class AddPizzaEventPageState extends State { const Icon(FontAwesome5.weight_hanging), Expanded( child: Slider( + activeColor: Theme.of(context).highlightColor, + inactiveColor: Theme.of(context).highlightColor.withOpacity(0.5), value: doughBallSize.toDouble(), min: 100, max: 400, @@ -119,6 +122,8 @@ class AddPizzaEventPageState extends State { children: [ Expanded( child: Slider( + activeColor: Theme.of(context).highlightColor, + inactiveColor: Theme.of(context).highlightColor.withOpacity(0.5), value: recipeStep.waitValue!.toDouble(), min: recipeStep.waitMin.toDouble(), max: recipeStep.waitMax.toDouble(), @@ -145,7 +150,7 @@ class AddPizzaEventPageState extends State { width: double.infinity, height: 70, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, child: TextButton( onPressed: () async { @@ -248,7 +253,7 @@ class ConfirmPizzaEventState extends State { width: double.infinity, height: 50, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, child: TextButton( onPressed: () { DatePicker.showDateTimePicker(context, @@ -288,7 +293,7 @@ class ConfirmPizzaEventState extends State { width: double.infinity, height: 70, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, child: TextButton( onPressed: () async { Navigator.pop(context, eventTime); diff --git a/lib/pages/add_recipe_url.dart b/lib/pages/add_recipe_url.dart index 227de27..a3f7422 100644 --- a/lib/pages/add_recipe_url.dart +++ b/lib/pages/add_recipe_url.dart @@ -44,7 +44,7 @@ class AddRecipeURLPageState extends State { Expanded( flex: 5, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, width: double.infinity, child: TextButton( onPressed: () async { diff --git a/lib/pages/edit_recipe_page.dart b/lib/pages/edit_recipe_page.dart index b060ea5..d6533b8 100644 --- a/lib/pages/edit_recipe_page.dart +++ b/lib/pages/edit_recipe_page.dart @@ -87,7 +87,7 @@ class EditRecipePageState extends State { Expanded( flex: 2, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, width: double.infinity, child: TextButton( onPressed: () { @@ -108,7 +108,7 @@ class EditRecipePageState extends State { Expanded( flex: 2, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, width: double.infinity, child: TextButton( onPressed: () { @@ -126,7 +126,7 @@ class EditRecipePageState extends State { ), const Divider(), Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, child: TextButton( onPressed: () { setState(() { @@ -145,7 +145,7 @@ class EditRecipePageState extends State { child: Text("Steps") ), Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, child: TextButton( onPressed: () { setState(() { @@ -161,7 +161,7 @@ class EditRecipePageState extends State { ] + pizzaRecipe.recipeSteps.map((recipeStep) => buildRecipeStepRow(recipeStep)).toList() + [ const Divider(), Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, width: double.infinity, child: TextButton( onPressed: () async { @@ -287,7 +287,7 @@ class EditRecipePageState extends State { Expanded( flex: 4, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, child: TextButton( onPressed: () { FocusScope.of(context).unfocus(); diff --git a/lib/pages/edit_recipe_step_page.dart b/lib/pages/edit_recipe_step_page.dart index d2ce038..8eeff06 100644 --- a/lib/pages/edit_recipe_step_page.dart +++ b/lib/pages/edit_recipe_step_page.dart @@ -66,7 +66,7 @@ class EditRecipeStepPageState extends State { Expanded( flex: 2, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, width: double.infinity, child: TextButton( onPressed: () { @@ -87,7 +87,7 @@ class EditRecipeStepPageState extends State { Expanded( flex: 2, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, width: double.infinity, child: TextButton( onPressed: () { @@ -157,7 +157,7 @@ class EditRecipeStepPageState extends State { const Divider(), const Center(child: Text("Sub Steps")), Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, child: TextButton( onPressed: () { setState(() { @@ -185,7 +185,7 @@ class EditRecipeStepPageState extends State { Expanded( flex: 4, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, child: TextButton( onPressed: () { FocusScope.of(context).unfocus(); diff --git a/lib/pages/edit_recipe_sub_step_page.dart b/lib/pages/edit_recipe_sub_step_page.dart index 07599ba..b682245 100644 --- a/lib/pages/edit_recipe_sub_step_page.dart +++ b/lib/pages/edit_recipe_sub_step_page.dart @@ -58,7 +58,7 @@ class EditRecipeSubStepPageState extends State { Expanded( flex: 2, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, width: double.infinity, child: TextButton( onPressed: () { @@ -79,7 +79,7 @@ class EditRecipeSubStepPageState extends State { Expanded( flex: 2, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, width: double.infinity, child: TextButton( onPressed: () { diff --git a/lib/pages/pizza_event_notification_page.dart b/lib/pages/pizza_event_notification_page.dart index 78207a0..1e5b33a 100644 --- a/lib/pages/pizza_event_notification_page.dart +++ b/lib/pages/pizza_event_notification_page.dart @@ -77,7 +77,7 @@ class PizzaEventNotificationState extends State { Expanded( flex: 10, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, width: double.infinity, child: TextButton( onPressed: () async { @@ -93,7 +93,7 @@ class PizzaEventNotificationState extends State { Expanded( flex: 30, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, width: double.infinity, child: TextButton( onPressed: () async { @@ -123,7 +123,7 @@ class PizzaEventNotificationState extends State { Expanded( flex: 40, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, width: double.infinity, child: TextButton( onPressed: () async { diff --git a/lib/pages/pizza_event_page.dart b/lib/pages/pizza_event_page.dart index 629b140..36652db 100644 --- a/lib/pages/pizza_event_page.dart +++ b/lib/pages/pizza_event_page.dart @@ -49,7 +49,7 @@ class PizzaEventPageState extends State { Text(widget.pizzaEvent.name), Text(getTimeRemainingString(widget.pizzaEvent.dateTime)), Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, child: TextButton( onPressed: () { Navigator.pushNamed(context, RecipePage.route, arguments: widget.pizzaEvent.recipe); @@ -102,7 +102,7 @@ class PizzaEventPageState extends State { ), const Divider(), if (firstStepDue != null) Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, width: double.infinity, child: TextButton( onPressed: () { diff --git a/lib/pages/pizza_events_page.dart b/lib/pages/pizza_events_page.dart index 913898e..501b504 100644 --- a/lib/pages/pizza_events_page.dart +++ b/lib/pages/pizza_events_page.dart @@ -123,6 +123,7 @@ class PizzaEventsState extends State { } }, tooltip: "Add Pizza Plans", + backgroundColor: Theme.of(context).buttonColor, child: Center( child: Row( children: const [ diff --git a/lib/pages/recipe_step_instruction_page.dart b/lib/pages/recipe_step_instruction_page.dart index c28651d..b78ff8e 100644 --- a/lib/pages/recipe_step_instruction_page.dart +++ b/lib/pages/recipe_step_instruction_page.dart @@ -92,7 +92,7 @@ class RecipeStepInstructionState extends State { flex: 15, child: Container( width: double.infinity, - color: Colors.blue, + color: Theme.of(context).buttonColor, child: TextButton( onPressed: () { if (page == 0){ @@ -116,7 +116,7 @@ class RecipeStepInstructionState extends State { flex: 35, child: Container( width: double.infinity, - color: Colors.blue, + color: Theme.of(context).buttonColor, child: TextButton( onPressed: () { if (page == widget.recipeStep.subSteps.length){ diff --git a/lib/pages/recipes_page.dart b/lib/pages/recipes_page.dart index ec6d556..bd1d4e6 100644 --- a/lib/pages/recipes_page.dart +++ b/lib/pages/recipes_page.dart @@ -153,7 +153,7 @@ class RecipesPageState extends State { Expanded( flex: 5, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, width: double.infinity, child: TextButton( onPressed: () async { @@ -193,7 +193,7 @@ class RecipesPageState extends State { Expanded( flex: 5, child: Container( - color: Colors.blue, + color: Theme.of(context).buttonColor, width: double.infinity, child: TextButton( onPressed: () async {