From 66cbf9f5fae77ed42ace87217663e6848527dbc2 Mon Sep 17 00:00:00 2001 From: Aman Raj Date: Tue, 29 Mar 2022 21:40:11 +0530 Subject: [PATCH 1/5] changed hardcoded color to theme headline color --- .../lib/pages/onboarding/knowledge_panel_page_template.dart | 4 +--- .../smooth_app/lib/pages/onboarding/preferences_page.dart | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/smooth_app/lib/pages/onboarding/knowledge_panel_page_template.dart b/packages/smooth_app/lib/pages/onboarding/knowledge_panel_page_template.dart index c67214120473..5150aa2cd18b 100644 --- a/packages/smooth_app/lib/pages/onboarding/knowledge_panel_page_template.dart +++ b/packages/smooth_app/lib/pages/onboarding/knowledge_panel_page_template.dart @@ -85,9 +85,7 @@ class _KnowledgePanelPageTemplateState ), child: Text( widget.headerTitle, - style: Theme.of(context).textTheme.headline2!.apply( - color: Colors.black, - ), + style: Theme.of(context).textTheme.headline2, ), ), KnowledgePanelProductCards([knowledgePanelWidget]), diff --git a/packages/smooth_app/lib/pages/onboarding/preferences_page.dart b/packages/smooth_app/lib/pages/onboarding/preferences_page.dart index beadc15396eb..23cfc14c78e3 100644 --- a/packages/smooth_app/lib/pages/onboarding/preferences_page.dart +++ b/packages/smooth_app/lib/pages/onboarding/preferences_page.dart @@ -79,9 +79,7 @@ class _HelperState extends State<_Helper> { ), child: Text( appLocalizations.productDataUtility, - style: Theme.of(context).textTheme.headline2!.apply( - color: Colors.black, - ), + style: Theme.of(context).textTheme.headline2, ), ), Container( From 6e42e743373de55fa26f3fafc92500fb6003486d Mon Sep 17 00:00:00 2001 From: Aman Raj Date: Tue, 29 Mar 2022 21:41:46 +0530 Subject: [PATCH 2/5] button color chaned to theme color --- .../smooth_app/lib/pages/onboarding/next_button.dart | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/packages/smooth_app/lib/pages/onboarding/next_button.dart b/packages/smooth_app/lib/pages/onboarding/next_button.dart index 6da4346fe03c..db5fd47affea 100644 --- a/packages/smooth_app/lib/pages/onboarding/next_button.dart +++ b/packages/smooth_app/lib/pages/onboarding/next_button.dart @@ -6,7 +6,6 @@ import 'package:smooth_app/data_models/user_preferences.dart'; import 'package:smooth_app/database/local_database.dart'; import 'package:smooth_app/generic_lib/design_constants.dart'; import 'package:smooth_app/pages/onboarding/onboarding_flow_navigator.dart'; -import 'package:smooth_app/themes/smooth_theme.dart'; /// Next button showed at the bottom of the onboarding flow. class NextButton extends StatelessWidget { @@ -32,11 +31,7 @@ class NextButton extends StatelessWidget { Expanded( child: TextButton( style: TextButton.styleFrom( - backgroundColor: SmoothTheme.getColor( - Theme.of(context).colorScheme, - SmoothTheme.MATERIAL_COLORS[SmoothTheme.COLOR_TAG_BLUE]!, - ColorDestination.BUTTON_BACKGROUND, - ), + backgroundColor: Theme.of(context).cardColor, shape: const RoundedRectangleBorder( borderRadius: ANGULAR_BORDER_RADIUS), primary: Colors.white, @@ -49,10 +44,7 @@ class NextButton extends StatelessWidget { }, child: Text( appLocalizations.next_label, - style: Theme.of(context) - .textTheme - .headline3! - .apply(color: Colors.white), + style: Theme.of(context).textTheme.headline3, ), ), ), From 22a1a9516aa80159c3e578dad920add7d0acfc5d Mon Sep 17 00:00:00 2001 From: Aman Raj Date: Tue, 29 Mar 2022 21:42:07 +0530 Subject: [PATCH 3/5] made consent analytics page honor dark theme --- .../pages/onboarding/consent_analytics_page.dart | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/packages/smooth_app/lib/pages/onboarding/consent_analytics_page.dart b/packages/smooth_app/lib/pages/onboarding/consent_analytics_page.dart index 70cde4dde089..2d5640965211 100644 --- a/packages/smooth_app/lib/pages/onboarding/consent_analytics_page.dart +++ b/packages/smooth_app/lib/pages/onboarding/consent_analytics_page.dart @@ -19,7 +19,6 @@ class ConsentAnalytics extends StatelessWidget { final UserPreferences userPreferences = context.watch(); final AppLocalizations appLocalizations = AppLocalizations.of(context)!; const Color shadowColor = Color.fromARGB(144, 0, 0, 0); - const Color bodyColor = Color.fromARGB(174, 19, 18, 18); const String assetName = 'assets/onboarding/analytics.svg'; return Scaffold( body: Column( @@ -41,10 +40,7 @@ class ConsentAnalytics extends StatelessWidget { alignment: Alignment.center, child: Text( appLocalizations.consent_analytics_title, - style: Theme.of(context) - .textTheme - .headline2! - .apply(color: Colors.black), + style: Theme.of(context).textTheme.headline2, ), ), @@ -57,10 +53,7 @@ class ConsentAnalytics extends StatelessWidget { child: Text( appLocalizations.consent_analytics_body1, textAlign: TextAlign.center, - style: Theme.of(context) - .textTheme - .displaySmall! - .apply(color: bodyColor), + style: Theme.of(context).textTheme.displaySmall, ), ), SizedBox(height: size.height * 0.03), @@ -72,10 +65,7 @@ class ConsentAnalytics extends StatelessWidget { child: Text( appLocalizations.consent_analytics_body2, textAlign: TextAlign.center, - style: Theme.of(context) - .textTheme - .displaySmall! - .apply(color: bodyColor), + style: Theme.of(context).textTheme.displaySmall, ), ), From 0f32f104c534ea577b4c1d8c349c0f870665c234 Mon Sep 17 00:00:00 2001 From: Aman Raj Date: Tue, 29 Mar 2022 22:06:28 +0530 Subject: [PATCH 4/5] Revert "made consent analytics page honor dark theme" This reverts commit 22a1a9516aa80159c3e578dad920add7d0acfc5d. --- .../pages/onboarding/consent_analytics_page.dart | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/smooth_app/lib/pages/onboarding/consent_analytics_page.dart b/packages/smooth_app/lib/pages/onboarding/consent_analytics_page.dart index 2d5640965211..70cde4dde089 100644 --- a/packages/smooth_app/lib/pages/onboarding/consent_analytics_page.dart +++ b/packages/smooth_app/lib/pages/onboarding/consent_analytics_page.dart @@ -19,6 +19,7 @@ class ConsentAnalytics extends StatelessWidget { final UserPreferences userPreferences = context.watch(); final AppLocalizations appLocalizations = AppLocalizations.of(context)!; const Color shadowColor = Color.fromARGB(144, 0, 0, 0); + const Color bodyColor = Color.fromARGB(174, 19, 18, 18); const String assetName = 'assets/onboarding/analytics.svg'; return Scaffold( body: Column( @@ -40,7 +41,10 @@ class ConsentAnalytics extends StatelessWidget { alignment: Alignment.center, child: Text( appLocalizations.consent_analytics_title, - style: Theme.of(context).textTheme.headline2, + style: Theme.of(context) + .textTheme + .headline2! + .apply(color: Colors.black), ), ), @@ -53,7 +57,10 @@ class ConsentAnalytics extends StatelessWidget { child: Text( appLocalizations.consent_analytics_body1, textAlign: TextAlign.center, - style: Theme.of(context).textTheme.displaySmall, + style: Theme.of(context) + .textTheme + .displaySmall! + .apply(color: bodyColor), ), ), SizedBox(height: size.height * 0.03), @@ -65,7 +72,10 @@ class ConsentAnalytics extends StatelessWidget { child: Text( appLocalizations.consent_analytics_body2, textAlign: TextAlign.center, - style: Theme.of(context).textTheme.displaySmall, + style: Theme.of(context) + .textTheme + .displaySmall! + .apply(color: bodyColor), ), ), From e63d503379cc9d68077beb773ded0cb453096d6f Mon Sep 17 00:00:00 2001 From: Aman Raj Date: Wed, 30 Mar 2022 09:38:43 +0530 Subject: [PATCH 5/5] container color accoriding to theme --- packages/smooth_app/lib/pages/onboarding/next_button.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/smooth_app/lib/pages/onboarding/next_button.dart b/packages/smooth_app/lib/pages/onboarding/next_button.dart index db5fd47affea..04ab20b68661 100644 --- a/packages/smooth_app/lib/pages/onboarding/next_button.dart +++ b/packages/smooth_app/lib/pages/onboarding/next_button.dart @@ -6,6 +6,7 @@ import 'package:smooth_app/data_models/user_preferences.dart'; import 'package:smooth_app/database/local_database.dart'; import 'package:smooth_app/generic_lib/design_constants.dart'; import 'package:smooth_app/pages/onboarding/onboarding_flow_navigator.dart'; +import 'package:smooth_app/themes/theme_provider.dart'; /// Next button showed at the bottom of the onboarding flow. class NextButton extends StatelessWidget { @@ -22,7 +23,9 @@ class NextButton extends StatelessWidget { // Side padding is 8% of total widtha. final double sidePadding = screenSize.width * .08; return Container( - color: Theme.of(context).appBarTheme.backgroundColor, + color: ThemeProvider(userPreferences).darkTheme + ? Theme.of(context).backgroundColor + : Theme.of(context).appBarTheme.backgroundColor, padding: EdgeInsets.symmetric( vertical: VERY_LARGE_SPACE, horizontal: sidePadding,