fix: textTheme should have onBackground color by default

codingpot · Jun 20, 2021 · b4d6c23 · b4d6c23
1 parent a23d1d7
commit b4d6c23
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/client/lib/custom_theme.dart b/client/lib/custom_theme.dart
@@ -14,19 +14,24 @@ const _kHeadline1 = TextStyle(fontFamily: 'PermanentMarker', fontSize: 25);
 class CustomTheme extends ChangeNotifier {
   static ThemeData get lightTheme {
     final themeData = ThemeData();
-
-    return themeData.copyWith(
-        textTheme: themeData.textTheme.copyWith(headline1: _kHeadline1));
+    final colorScheme = themeData.colorScheme
+        .copyWith(onPrimary: Colors.white, onBackground: Colors.black87);
+    return _themeData(themeData, colorScheme);
   }
 
   static ThemeData get darkTheme {
     final themeData = ThemeData.dark();
-    final textTheme = themeData.textTheme;
+    final colorScheme = themeData.colorScheme
+        .copyWith(onPrimary: Colors.white, onBackground: Colors.white);
+    return _themeData(themeData, colorScheme);
+  }
+
+  static ThemeData _themeData(ThemeData baseTheme, ColorScheme colorScheme) {
+    final textTheme = baseTheme.textTheme
+        .copyWith(headline1: _kHeadline1)
+        .apply(displayColor: colorScheme.onBackground);
 
-    return themeData.copyWith(
-        textTheme: textTheme.copyWith(
-            headline1: textTheme.headline1?.merge(_kHeadline1) ??
-                _kHeadline1.copyWith(color: Colors.white)));
+    return baseTheme.copyWith(colorScheme: colorScheme, textTheme: textTheme);
   }
 
   bool _isDarkMode = false;
@@ -41,4 +46,4 @@ class CustomTheme extends ChangeNotifier {
   Icon get icon => _isDarkMode
       ? const Icon(Icons.dark_mode_outlined)
       : const Icon(Icons.light_mode_outlined);
-}
+}