Brighten up some accent colors in the dark theme (#268)

* Brighten up some accent colors in the dark theme Fixes #267
ubuntu · Jan 28, 2023 · e75843e · e75843e
1 parent 8768db5
commit e75843e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/example/lib/view/home_page.dart b/example/lib/view/home_page.dart
@@ -69,13 +69,9 @@ class HomePageState extends State<HomePage> {
         ),
         actions: [
           PopupMenuButton<Color>(
-            onSelected: (value) {},
-            child: SizedBox(
-              width: 40,
-              child: Icon(
-                Icons.color_lens,
-                color: Theme.of(context).primaryColor,
-              ),
+            icon: Icon(
+              Icons.color_lens,
+              color: Theme.of(context).primaryColor,
             ),
             itemBuilder: (context) {
               return [

diff --git a/lib/src/themes/common_themes.dart b/lib/src/themes/common_themes.dart
@@ -165,10 +165,7 @@ ElevatedButtonThemeData _getElevatedButtonThemeData({
   return ElevatedButtonThemeData(
     style: ElevatedButton.styleFrom(
       backgroundColor: color,
-      foregroundColor: textColor ??
-          (ThemeData.estimateBrightnessForColor(color) == Brightness.light
-              ? Colors.black
-              : Colors.white),
+      foregroundColor: textColor ?? contrastColor(color),
       visualDensity: _commonButtonStyle.visualDensity,
       elevation: 0,
       shadowColor: Colors.transparent,
@@ -371,12 +368,12 @@ ThemeData createYaruLightTheme({
     error: YaruColors.error,
     brightness: Brightness.light,
     primary: primaryColor,
-    onPrimary: Colors.white,
+    onPrimary: contrastColor(primaryColor),
     primaryContainer: YaruColors.porcelain,
     onPrimaryContainer: YaruColors.inkstone,
     inversePrimary: YaruColors.inkstone,
     secondary: elevatedButtonColor ?? primaryColor,
-    onSecondary: Colors.white,
+    onSecondary: contrastColor(elevatedButtonColor ?? primaryColor),
     secondaryContainer:
         elevatedButtonColor?.withOpacity(0.4) ?? primaryColor.withOpacity(0.4),
     onSecondaryContainer: elevatedButtonTextColor ?? YaruColors.jet,
@@ -443,7 +440,7 @@ ThemeData createYaruLightTheme({
     appBarTheme: _createLightAppBar(colorScheme),
     floatingActionButtonTheme: FloatingActionButtonThemeData(
       backgroundColor: elevatedButtonColor ?? primaryColor,
-      foregroundColor: elevatedButtonTextColor ?? Colors.white,
+      foregroundColor: contrastColor(elevatedButtonColor ?? primaryColor),
     ),
     bottomNavigationBarTheme: BottomNavigationBarThemeData(
       selectedItemColor: colorScheme.primary,
@@ -467,7 +464,7 @@ ThemeData createYaruLightTheme({
     ),
     badgeTheme: BadgeThemeData(
       backgroundColor: elevatedButtonColor ?? colorScheme.primary,
-      textColor: elevatedButtonTextColor ?? Colors.white,
+      textColor: contrastColor(elevatedButtonColor ?? primaryColor),
     ),
   );
 }
@@ -486,11 +483,11 @@ ThemeData createYaruDarkTheme({
     brightness: Brightness.dark,
     primary: primaryColor,
     primaryContainer: YaruColors.coolGrey,
-    onPrimary: YaruColors.porcelain,
+    onPrimary: contrastColor(primaryColor),
     onPrimaryContainer: YaruColors.porcelain,
     inversePrimary: YaruColors.porcelain,
     secondary: elevatedButtonColor ?? primaryColor,
-    onSecondary: Colors.white,
+    onSecondary: contrastColor(elevatedButtonColor ?? primaryColor),
     secondaryContainer:
         elevatedButtonColor?.withOpacity(0.4) ?? primaryColor.withOpacity(0.4),
     onSecondaryContainer:
@@ -559,7 +556,7 @@ ThemeData createYaruDarkTheme({
     appBarTheme: _createDarkAppBarTheme(colorScheme),
     floatingActionButtonTheme: FloatingActionButtonThemeData(
       backgroundColor: elevatedButtonColor ?? primaryColor,
-      foregroundColor: elevatedButtonTextColor ?? Colors.white,
+      foregroundColor: contrastColor(elevatedButtonColor ?? primaryColor),
     ),
     bottomNavigationBarTheme: BottomNavigationBarThemeData(
       selectedItemColor: colorScheme.primary,
@@ -582,11 +579,18 @@ ThemeData createYaruDarkTheme({
     ),
     badgeTheme: BadgeThemeData(
       backgroundColor: elevatedButtonColor ?? colorScheme.primary,
-      textColor: elevatedButtonTextColor ?? Colors.white,
+      textColor: contrastColor(elevatedButtonColor ?? primaryColor),
     ),
   );
 }
 
+Color contrastColor(Color color) => ThemeData.estimateBrightnessForColor(
+          color,
+        ) ==
+        Brightness.light
+    ? Colors.black
+    : Colors.white;
+
 PopupMenuThemeData _createPopupMenuThemeData(
   ColorScheme colorScheme,
   Brightness brightness,

diff --git a/lib/src/themes/xubuntu.dart b/lib/src/themes/xubuntu.dart
@@ -8,5 +8,5 @@ final yaruXubuntuLight = createYaruLightTheme(
 );
 
 final yaruXubuntuDark = createYaruDarkTheme(
-  primaryColor: _primaryColor,
+  primaryColor: _primaryColor.shade500,
 );
diff --git a/lib/src/themes/yaru.dart b/lib/src/themes/yaru.dart
@@ -18,7 +18,7 @@ final yaruSageLight = createYaruLightTheme(
 );
 
 final yaruSageDark = createYaruDarkTheme(
-  primaryColor: YaruColors.sage,
+  primaryColor: YaruColors.sage.shade500,
 );
 
 final yaruPrussianGreenLight = createYaruLightTheme(
@@ -42,7 +42,7 @@ final yaruBarkLight = createYaruLightTheme(
 );
 
 final yaruBarkDark = createYaruDarkTheme(
-  primaryColor: YaruColors.bark,
+  primaryColor: YaruColors.bark.shade500,
 );
 
 final yaruViridianLight = createYaruLightTheme(