From 187cae97e305ce0c185f1ddd2259b077f01e4778 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Mon, 24 Apr 2023 15:59:36 +0200 Subject: [PATCH] Re-add hard coded color to FAB This is a bit more cheerful --- lib/screens/gallery_screen.dart | 7 ++++++- lib/screens/measurement_categories_screen.dart | 7 ++++++- lib/screens/measurement_entries_screen.dart | 9 +++++++-- lib/screens/nutritional_plan_screen.dart | 7 ++++++- lib/screens/nutritional_plans_screen.dart | 7 ++++++- lib/screens/weight_screen.dart | 7 ++++++- lib/screens/workout_plans_screen.dart | 7 ++++++- 7 files changed, 43 insertions(+), 8 deletions(-) diff --git a/lib/screens/gallery_screen.dart b/lib/screens/gallery_screen.dart index a7473d5e..6d01a68c 100644 --- a/lib/screens/gallery_screen.dart +++ b/lib/screens/gallery_screen.dart @@ -21,6 +21,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:provider/provider.dart'; import 'package:wger/helpers/platform.dart'; import 'package:wger/providers/gallery.dart'; +import 'package:wger/theme/theme.dart'; import 'package:wger/widgets/core/app_bar.dart'; import 'package:wger/widgets/gallery/forms.dart'; import 'package:wger/widgets/gallery/overview.dart'; @@ -39,7 +40,11 @@ class GalleryScreen extends StatelessWidget { floatingActionButton: isDesktop ? null : FloatingActionButton( - child: const Icon(Icons.add), + backgroundColor: wgerSecondaryColor, + child: const Icon( + Icons.add, + color: Colors.white, + ), onPressed: () { Navigator.pushNamed( context, diff --git a/lib/screens/measurement_categories_screen.dart b/lib/screens/measurement_categories_screen.dart index 4f85ca6a..88e8c1c9 100644 --- a/lib/screens/measurement_categories_screen.dart +++ b/lib/screens/measurement_categories_screen.dart @@ -21,6 +21,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:provider/provider.dart'; import 'package:wger/providers/measurement.dart'; import 'package:wger/screens/form_screen.dart'; +import 'package:wger/theme/theme.dart'; import 'package:wger/widgets/measurements/categories.dart'; import 'package:wger/widgets/measurements/forms.dart'; @@ -34,7 +35,11 @@ class MeasurementCategoriesScreen extends StatelessWidget { title: Text(AppLocalizations.of(context).measurements), ), floatingActionButton: FloatingActionButton( - child: const Icon(Icons.add), + backgroundColor: wgerSecondaryColor, + child: const Icon( + Icons.add, + color: Colors.white, + ), onPressed: () async { Navigator.pushNamed( context, diff --git a/lib/screens/measurement_entries_screen.dart b/lib/screens/measurement_entries_screen.dart index c0670828..5840858c 100644 --- a/lib/screens/measurement_entries_screen.dart +++ b/lib/screens/measurement_entries_screen.dart @@ -21,6 +21,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:provider/provider.dart'; import 'package:wger/providers/measurement.dart'; import 'package:wger/screens/form_screen.dart'; +import 'package:wger/theme/theme.dart'; import 'package:wger/widgets/measurements/entries.dart'; import 'package:wger/widgets/measurements/forms.dart'; @@ -72,7 +73,7 @@ class MeasurementEntriesScreen extends StatelessWidget { TextButton( child: Text( AppLocalizations.of(context).delete, - style: TextStyle(color: Theme.of(context).errorColor), + style: TextStyle(color: Theme.of(context).colorScheme.error), ), onPressed: () { // Confirmed, delete the workout @@ -115,7 +116,11 @@ class MeasurementEntriesScreen extends StatelessWidget { ], ), floatingActionButton: FloatingActionButton( - child: const Icon(Icons.add), + backgroundColor: wgerSecondaryColor, + child: const Icon( + Icons.add, + color: Colors.white, + ), onPressed: () async { Navigator.pushNamed( context, diff --git a/lib/screens/nutritional_plan_screen.dart b/lib/screens/nutritional_plan_screen.dart index f89abb1c..63236834 100644 --- a/lib/screens/nutritional_plan_screen.dart +++ b/lib/screens/nutritional_plan_screen.dart @@ -22,6 +22,7 @@ import 'package:provider/provider.dart'; import 'package:wger/models/nutrition/nutritional_plan.dart'; import 'package:wger/providers/nutrition.dart'; import 'package:wger/screens/form_screen.dart'; +import 'package:wger/theme/theme.dart'; import 'package:wger/widgets/nutrition/forms.dart'; import 'package:wger/widgets/nutrition/nutritional_plan_detail.dart'; @@ -45,7 +46,11 @@ class NutritionalPlanScreen extends StatelessWidget { return Scaffold( //appBar: getAppBar(nutritionalPlan), floatingActionButton: FloatingActionButton( - child: const Icon(Icons.history_edu), + backgroundColor: wgerSecondaryColor, + child: const Icon( + Icons.history_edu, + color: Colors.white, + ), onPressed: () { Navigator.pushNamed( context, diff --git a/lib/screens/nutritional_plans_screen.dart b/lib/screens/nutritional_plans_screen.dart index ecc67077..b9077c5c 100644 --- a/lib/screens/nutritional_plans_screen.dart +++ b/lib/screens/nutritional_plans_screen.dart @@ -21,6 +21,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:provider/provider.dart'; import 'package:wger/providers/nutrition.dart'; import 'package:wger/screens/form_screen.dart'; +import 'package:wger/theme/theme.dart'; import 'package:wger/widgets/core/app_bar.dart'; import 'package:wger/widgets/nutrition/forms.dart'; import 'package:wger/widgets/nutrition/nutritional_plans_list.dart'; @@ -33,7 +34,11 @@ class NutritionScreen extends StatelessWidget { return Scaffold( appBar: EmptyAppBar(AppLocalizations.of(context).nutritionalPlans), floatingActionButton: FloatingActionButton( - child: const Icon(Icons.add), + backgroundColor: wgerSecondaryColor, + child: const Icon( + Icons.add, + color: Colors.white, + ), onPressed: () async { Navigator.pushNamed( context, diff --git a/lib/screens/weight_screen.dart b/lib/screens/weight_screen.dart index 385ae768..1ad14a30 100644 --- a/lib/screens/weight_screen.dart +++ b/lib/screens/weight_screen.dart @@ -21,6 +21,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:provider/provider.dart'; import 'package:wger/providers/body_weight.dart'; import 'package:wger/screens/form_screen.dart'; +import 'package:wger/theme/theme.dart'; import 'package:wger/widgets/core/app_bar.dart'; import 'package:wger/widgets/weight/entries_list.dart'; import 'package:wger/widgets/weight/forms.dart'; @@ -33,7 +34,11 @@ class WeightScreen extends StatelessWidget { return Scaffold( appBar: EmptyAppBar(AppLocalizations.of(context).weight), floatingActionButton: FloatingActionButton( - child: const Icon(Icons.add), + backgroundColor: wgerSecondaryColor, + child: const Icon( + Icons.add, + color: Colors.white, + ), onPressed: () async { Navigator.pushNamed( context, diff --git a/lib/screens/workout_plans_screen.dart b/lib/screens/workout_plans_screen.dart index 4d3dbfdf..c1a2a6f3 100644 --- a/lib/screens/workout_plans_screen.dart +++ b/lib/screens/workout_plans_screen.dart @@ -22,6 +22,7 @@ import 'package:provider/provider.dart'; import 'package:wger/models/workouts/workout_plan.dart'; import 'package:wger/providers/workout_plans.dart'; import 'package:wger/screens/form_screen.dart'; +import 'package:wger/theme/theme.dart'; import 'package:wger/widgets/workouts/app_bar.dart'; import 'package:wger/widgets/workouts/forms.dart'; import 'package:wger/widgets/workouts/workout_plans_list.dart'; @@ -34,7 +35,7 @@ class WorkoutPlansScreen extends StatelessWidget { return Scaffold( appBar: WorkoutOverviewAppBar(), floatingActionButton: FloatingActionButton( - child: const Icon(Icons.add), + backgroundColor: wgerSecondaryColor, onPressed: () { Navigator.pushNamed( context, @@ -45,6 +46,10 @@ class WorkoutPlansScreen extends StatelessWidget { ), ); }, + child: const Icon( + Icons.add, + color: Colors.white, + ), ), body: Consumer( builder: (context, workoutProvider, child) => WorkoutPlansList(workoutProvider),