From a33065f59083f81d81f1db2760687c3c4b604f2f Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Wed, 15 Nov 2023 18:35:46 +0100 Subject: [PATCH 1/2] Make the top navigation blue again --- lib/theme/theme.dart | 52 ++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/lib/theme/theme.dart b/lib/theme/theme.dart index 3589f6b3..f7fc5041 100644 --- a/lib/theme/theme.dart +++ b/lib/theme/theme.dart @@ -34,18 +34,14 @@ const Color wgerSecondaryColorLight = Color(0xffF6B4BA); const Color wgerTertiaryColor = Color(0xFF6CA450); const FlexSubThemesData wgerSubThemeData = FlexSubThemesData( - fabSchemeColor: SchemeColor.secondary, - inputDecoratorBorderType: FlexInputBorderType.underline, - inputDecoratorIsFilled: false, - useTextTheme: true, - appBarBackgroundSchemeColor: SchemeColor.background, - appBarScrolledUnderElevation: 4, - navigationBarBackgroundSchemeColor: SchemeColor.primary, - navigationBarSelectedIconSchemeColor: SchemeColor.onPrimary, - navigationBarUnselectedIconSchemeColor: SchemeColor.onPrimary, - navigationBarIndicatorSchemeColor: SchemeColor.onPrimary, - navigationBarIndicatorOpacity: 0.24, - navigationBarHeight: 56); + fabSchemeColor: SchemeColor.secondary, + inputDecoratorBorderType: FlexInputBorderType.underline, + inputDecoratorIsFilled: false, + useTextTheme: true, + appBarScrolledUnderElevation: 4, + navigationBarIndicatorOpacity: 0.24, + navigationBarHeight: 56, +); const String wgerDisplayFont = 'RobotoCondensed'; const List displayFontBoldWeight = [FontVariation('wght', 600)]; @@ -117,23 +113,31 @@ const wgerTextTheme = TextTheme( fontFamily: wgerDisplayFont, fontVariations: displayFontBoldWeight, ), - titleMedium: TextStyle(fontFamily: wgerDisplayFont, fontVariations: displayFontBoldWeight), - titleSmall: TextStyle(fontFamily: wgerDisplayFont, fontVariations: displayFontBoldWeight), + titleMedium: TextStyle( + fontFamily: wgerDisplayFont, + fontVariations: displayFontBoldWeight, + ), + titleSmall: TextStyle( + fontFamily: wgerDisplayFont, + fontVariations: displayFontBoldWeight, + ), ); final wgerLightTheme = FlexThemeData.light( - colorScheme: schemeLight, - useMaterial3: true, - appBarStyle: FlexAppBarStyle.surface, - subThemesData: wgerSubThemeData, - textTheme: wgerTextTheme); + colorScheme: schemeLight, + useMaterial3: true, + appBarStyle: FlexAppBarStyle.primary, + subThemesData: wgerSubThemeData, + textTheme: wgerTextTheme, +); final wgerDarkTheme = FlexThemeData.dark( - colorScheme: schemeDark, - useMaterial3: true, - appBarStyle: FlexAppBarStyle.surface, - subThemesData: wgerSubThemeData, - textTheme: wgerTextTheme); + colorScheme: schemeDark, + useMaterial3: true, + appBarStyle: FlexAppBarStyle.surface, + subThemesData: wgerSubThemeData, + textTheme: wgerTextTheme, +); final wgerLightThemeHc = FlexThemeData.light( colorScheme: schemeLightHc, From ab669e0dc2892317592240b8ae0083e1a521189a Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Wed, 15 Nov 2023 21:04:34 +0100 Subject: [PATCH 2/2] Make dark theme more readable --- lib/theme/theme.dart | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/theme/theme.dart b/lib/theme/theme.dart index f7fc5041..66eae3ee 100644 --- a/lib/theme/theme.dart +++ b/lib/theme/theme.dart @@ -60,7 +60,7 @@ final ColorScheme schemeLight = SeedColorScheme.fromSeeds( // Make a dark ColorScheme from the seeds. final ColorScheme schemeDark = SeedColorScheme.fromSeeds( -// primary: wgerPrimaryColor, + // primary: wgerPrimaryColor, primaryKey: wgerPrimaryColor, secondaryKey: wgerSecondaryColor, secondary: wgerSecondaryColor, @@ -134,24 +134,24 @@ final wgerLightTheme = FlexThemeData.light( final wgerDarkTheme = FlexThemeData.dark( colorScheme: schemeDark, useMaterial3: true, - appBarStyle: FlexAppBarStyle.surface, subThemesData: wgerSubThemeData, textTheme: wgerTextTheme, ); final wgerLightThemeHc = FlexThemeData.light( - colorScheme: schemeLightHc, - useMaterial3: true, - appBarStyle: FlexAppBarStyle.surface, - subThemesData: wgerSubThemeData, - textTheme: wgerTextTheme); + colorScheme: schemeLightHc, + useMaterial3: true, + appBarStyle: FlexAppBarStyle.primary, + subThemesData: wgerSubThemeData, + textTheme: wgerTextTheme, +); final wgerDarkThemeHc = FlexThemeData.dark( - colorScheme: schemeDarkHc, - useMaterial3: true, - appBarStyle: FlexAppBarStyle.surface, - subThemesData: wgerSubThemeData, - textTheme: wgerTextTheme); + colorScheme: schemeDarkHc, + useMaterial3: true, + subThemesData: wgerSubThemeData, + textTheme: wgerTextTheme, +); CalendarStyle getWgerCalendarStyle(ThemeData theme) { return CalendarStyle(