split custom colors

Author: MoofyWoofy

lib/config/custom_colors.dart

@@ -1,17 +1,14 @@
 import 'package:flutter/material.dart' show Color, ThemeExtension, immutable;
 
 @immutable
-class CustomColors extends ThemeExtension<CustomColors> {
-  const CustomColors({
+class GameColors extends ThemeExtension<GameColors> {
+  const GameColors({
     required this.initial,
     required this.green,
     required this.yellow,
     required this.notInWord,
     required this.borderInactive,
     required this.borderActive,
-    required this.historyGreen,
-    required this.historyRed,
-    required this.historyYellow,
   });
 
   /// Initial color for keyboard
@@ -32,50 +29,79 @@ class CustomColors extends ThemeExtension<CustomColors> {
   /// Border colors for tile
   final Color? borderActive;
 
-  final Color? historyGreen;
-  final Color? historyRed;
-  final Color? historyYellow;
-
   @override
-  CustomColors copyWith({
+  GameColors copyWith({
     Color? initial,
     Color? green,
     Color? yellow,
     Color? notInWord,
     Color? borderInactive,
     Color? borderActive,
-    Color? historyGreen,
-    Color? historyRed,
-    Color? historyYellow,
   }) {
-    return CustomColors(
+    return GameColors(
       initial: initial ?? this.initial,
       green: green ?? this.green,
       yellow: yellow ?? this.yellow,
       notInWord: notInWord ?? this.notInWord,
       borderInactive: borderInactive ?? this.borderInactive,
       borderActive: borderActive ?? this.borderActive,
-      historyGreen: historyGreen ?? this.historyGreen,
-      historyRed: historyRed ?? this.historyRed,
-      historyYellow: historyYellow ?? this.historyYellow,
     );
   }
 
   @override
-  CustomColors lerp(CustomColors? other, double t) {
-    if (other is! CustomColors) {
+  GameColors lerp(GameColors? other, double t) {
+    if (other is! GameColors) {
       return this;
     }
-    return CustomColors(
+    return GameColors(
       initial: Color.lerp(initial, other.initial, t),
       green: Color.lerp(green, other.green, t),
       yellow: Color.lerp(yellow, other.yellow, t),
       notInWord: Color.lerp(notInWord, other.notInWord, t),
       borderInactive: Color.lerp(borderInactive, other.borderInactive, t),
       borderActive: Color.lerp(borderActive, other.borderActive, t),
-      historyGreen: Color.lerp(historyGreen, other.historyGreen, t),
-      historyRed: Color.lerp(historyRed, other.historyGreen, t),
-      historyYellow: Color.lerp(historyYellow, other.historyGreen, t),
+    );
+  }
+}
+
+class HistoryColors extends ThemeExtension<HistoryColors> {
+  const HistoryColors({
+    required this.green,
+    required this.yellow,
+    required this.red,
+  });
+
+  /// When user guessed word correctly
+  final Color? green;
+
+  /// When game is incomplete
+  final Color? yellow;
+
+  /// When user did not guess word correctly
+  final Color? red;
+
+  @override
+  HistoryColors copyWith({
+    Color? green,
+    Color? yellow,
+    Color? red,
+  }) {
+    return HistoryColors(
+      green: green ?? this.green,
+      yellow: yellow ?? this.yellow,
+      red: red ?? this.red,
+    );
+  }
+
+  @override
+  HistoryColors lerp(HistoryColors? other, double t) {
+    if (other is! HistoryColors) {
+      return this;
+    }
+    return HistoryColors(
+      green: Color.lerp(green, other.green, t),
+      yellow: Color.lerp(yellow, other.yellow, t),
+      red: Color.lerp(red, other.red, t),
     );
   }
 }

lib/config/themes.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:red_owl/config/shared.dart' show CustomColors;
+import 'package:red_owl/config/shared.dart' show GameColors, HistoryColors;
 
 final lightTheme = ThemeData(
   colorScheme: ColorScheme.fromSeed(
@@ -8,17 +8,19 @@ final lightTheme = ThemeData(
   ),
   brightness: Brightness.light,
   extensions: const <ThemeExtension<dynamic>>[
-    CustomColors(
+    GameColors(
       initial: Color.fromRGBO(211, 214, 218, 1),
       yellow: Color.fromRGBO(201, 180, 88, 1),
       green: Color.fromRGBO(106, 170, 100, 1),
       notInWord: Color.fromRGBO(120, 124, 126, 1),
       borderInactive: Color.fromRGBO(211, 214, 218, 1),
       borderActive: Color.fromRGBO(135, 138, 140, 1),
-      historyGreen: Color.fromRGBO(72, 199, 142, 1),
-      historyRed: Color.fromRGBO(255, 82, 113, 1),
-      historyYellow: Color.fromRGBO(255, 193, 0, 1),
     ),
+    HistoryColors(
+      green: Color.fromRGBO(72, 199, 142, 1),
+      red: Color.fromRGBO(255, 82, 113, 1),
+      yellow: Color.fromRGBO(255, 193, 0, 1),
+    )
   ],
 );
 
@@ -29,16 +31,18 @@ final darkTheme = ThemeData(
   ),
   brightness: Brightness.dark,
   extensions: const <ThemeExtension<dynamic>>[
-    CustomColors(
+    GameColors(
       initial: Color.fromRGBO(129, 131, 132, 1),
       yellow: Color.fromRGBO(181, 159, 59, 1),
       green: Color.fromRGBO(83, 141, 78, 1),
       notInWord: Color.fromRGBO(58, 58, 60, 1),
       borderInactive: Color.fromRGBO(58, 58, 60, 1),
       borderActive: Color.fromRGBO(86, 87, 88, 1),
-      historyGreen: Color.fromRGBO(0, 76, 48, 1),
-      historyRed: Color.fromRGBO(101, 10, 30, 1),
-      historyYellow: Color.fromRGBO(180, 145, 0, 1),
     ),
+    HistoryColors(
+      green: Color.fromRGBO(0, 76, 48, 1),
+      red: Color.fromRGBO(101, 10, 30, 1),
+      yellow: Color.fromRGBO(180, 145, 0, 1),
+    )
   ],
 );

lib/routes/game/game_page.dart

@@ -3,7 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter/services.dart'
     show KeyDownEvent, KeyRepeatEvent, KeyUpEvent, ServicesBinding;
 import 'package:red_owl/config/shared.dart'
-    show CustomColors, LetterStatus, animationTiming, keyboardStatus;
+    show GameColors, LetterStatus, animationTiming, keyboardStatus;
 import 'package:red_owl/riverpod/shared.dart' show gridProvider;
 import 'package:red_owl/routes/game/widgets/shared.dart';
 import 'package:red_owl/util/shared.dart' show dateToString;
@@ -68,29 +68,29 @@ class _WordlePageState extends ConsumerState<WordlePage> {
                 children: [
                   HelpTile(
                       background: Theme.of(context)
-                          .extension<CustomColors>()!
+                          .extension<GameColors>()!
                           .notInWord!,
                       letter: 'S'),
                   const SizedBox(width: 5),
                   HelpTile(
                       background: Theme.of(context)
-                          .extension<CustomColors>()!
+                          .extension<GameColors>()!
                           .notInWord!,
                       letter: 'T'),
                   const SizedBox(width: 5),
                   HelpTile(
                       background:
-                          Theme.of(context).extension<CustomColors>()!.green!,
+                          Theme.of(context).extension<GameColors>()!.green!,
                       letter: 'A'),
                   const SizedBox(width: 5),
                   HelpTile(
                       background:
-                          Theme.of(context).extension<CustomColors>()!.yellow!,
+                          Theme.of(context).extension<GameColors>()!.yellow!,
                       letter: 'R'),
                   const SizedBox(width: 5),
                   HelpTile(
                       background: Theme.of(context)
-                          .extension<CustomColors>()!
+                          .extension<GameColors>()!
                           .notInWord!,
                       letter: 'E'),
                 ],

lib/routes/game/widgets/letter.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:red_owl/config/shared.dart' show CustomColors, LetterStatus;
+import 'package:red_owl/config/shared.dart' show GameColors, LetterStatus;
 import 'package:red_owl/riverpod/shared.dart';
 
 class Letter extends ConsumerWidget {
@@ -14,20 +14,20 @@ class Letter extends ConsumerWidget {
     var grid = ref.watch(gridProvider);
     switch (grid.keyboardStatus[letter]) {
       case LetterStatus.initial:
-        backgroundColor = Theme.of(context).extension<CustomColors>()?.initial;
+        backgroundColor = Theme.of(context).extension<GameColors>()?.initial;
         break;
       case LetterStatus.green:
-        backgroundColor = Theme.of(context).extension<CustomColors>()?.green;
+        backgroundColor = Theme.of(context).extension<GameColors>()?.green;
         textColor = Colors.white;
         break;
       case LetterStatus.yellow:
-        backgroundColor = Theme.of(context).extension<CustomColors>()?.yellow;
+        backgroundColor = Theme.of(context).extension<GameColors>()?.yellow;
         textColor = Colors.white;
         break;
       case LetterStatus.notInWord:
       case null:
         backgroundColor =
-            Theme.of(context).extension<CustomColors>()?.notInWord;
+            Theme.of(context).extension<GameColors>()?.notInWord;
         textColor = Colors.white;
         break;
     }

lib/routes/game/widgets/tile.dart

@@ -4,7 +4,7 @@ import 'dart:math' as math;
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:red_owl/config/shared.dart'
-    show CustomColors, LetterStatus, SharedPreferencesKeys, animationTiming;
+    show GameColors, LetterStatus, SharedPreferencesKeys, animationTiming;
 import 'package:red_owl/riverpod/shared.dart' show gridProvider;
 import 'package:red_owl/models/shared.dart' show Grid;
 import 'package:red_owl/util/shared.dart'
@@ -48,7 +48,7 @@ class _TileState extends ConsumerState<Tile>
   Widget build(BuildContext context) {
     Grid grid = ref.watch(gridProvider);
     Color borderColor =
-        Theme.of(context).extension<CustomColors>()!.borderInactive!;
+        Theme.of(context).extension<GameColors>()!.borderInactive!;
     bool hasFlipAnimationPlayed = widget.hasFlipAnimationPlayed;
 
     if (widget.index < grid.tiles.length) {
@@ -88,22 +88,22 @@ class _TileState extends ConsumerState<Tile>
         case LetterStatus.initial:
           backgroundColor = null;
           borderColor =
-              Theme.of(context).extension<CustomColors>()!.borderActive!;
+              Theme.of(context).extension<GameColors>()!.borderActive!;
           break;
         case LetterStatus.green:
-          backgroundColor = Theme.of(context).extension<CustomColors>()!.green!;
+          backgroundColor = Theme.of(context).extension<GameColors>()!.green!;
           borderColor = Colors.transparent;
           textColor = Colors.white;
           break;
         case LetterStatus.yellow:
           backgroundColor =
-              Theme.of(context).extension<CustomColors>()!.yellow!;
+              Theme.of(context).extension<GameColors>()!.yellow!;
           borderColor = Colors.transparent;
           textColor = Colors.white;
           break;
         case LetterStatus.notInWord:
           backgroundColor =
-              Theme.of(context).extension<CustomColors>()!.notInWord!;
+              Theme.of(context).extension<GameColors>()!.notInWord!;
           borderColor = Colors.transparent;
           textColor = Colors.white;
           break;
@@ -112,7 +112,7 @@ class _TileState extends ConsumerState<Tile>
       // Set default values to variables so that tile rebuilds.
       // By default it does not when Navigator pops settingsPage back to GamePage
       backgroundColor = null;
-      borderColor = Theme.of(context).extension<CustomColors>()!.borderActive!;
+      borderColor = Theme.of(context).extension<GameColors>()!.borderActive!;
       hasFlipAnimationPlayed = false;
     }
 

lib/routes/stats/stats_page.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:red_owl/config/shared.dart'
-    show CustomColors, SharedPreferencesKeys;
+    show HistoryColors, SharedPreferencesKeys;
 import 'package:red_owl/routes/stats/widgets/shared.dart';
 import 'package:red_owl/util/shared.dart'
     show SharedPreferenceService, getWinRate;
@@ -48,8 +48,8 @@ Check out my Wordle! stats!
                       text: 'Green',
                       style: TextStyle(
                           backgroundColor: Theme.of(context)
-                              .extension<CustomColors>()!
-                              .historyGreen),
+                              .extension<HistoryColors>()!
+                              .green),
                     ),
                     TextSpan(
                       text: ' means you guessed correctly.',
@@ -67,8 +67,8 @@ Check out my Wordle! stats!
                       text: 'Yellow',
                       style: TextStyle(
                           backgroundColor: Theme.of(context)
-                              .extension<CustomColors>()!
-                              .historyYellow),
+                              .extension<HistoryColors>()!
+                              .yellow),
                     ),
                     TextSpan(
                       text: ' means the game was incomplete.',
@@ -86,8 +86,8 @@ Check out my Wordle! stats!
                       text: 'Red',
                       style: TextStyle(
                           backgroundColor: Theme.of(context)
-                              .extension<CustomColors>()!
-                              .historyRed),
+                              .extension<HistoryColors>()!
+                              .red),
                     ),
                     TextSpan(
                       text: " means you didn't guess the word.",
@@ -105,21 +105,21 @@ Check out my Wordle! stats!
                 dateString: '2024-05-23',
                 word: 'BURNT',
                 backgroundColor:
-                    Theme.of(context).extension<CustomColors>()!.historyGreen!,
+                    Theme.of(context).extension<HistoryColors>()!.green!,
               ),
               const SizedBox(height: 8),
               HistoryTile(
                 dateString: '2024-05-22',
                 word: 'WHISK',
                 backgroundColor:
-                    Theme.of(context).extension<CustomColors>()!.historyYellow!,
+                    Theme.of(context).extension<HistoryColors>()!.yellow!,
               ),
               const SizedBox(height: 8),
               HistoryTile(
                 dateString: '2024-05-21',
                 word: 'IDEAS',
                 backgroundColor:
-                    Theme.of(context).extension<CustomColors>()!.historyRed!,
+                    Theme.of(context).extension<HistoryColors>()!.red!,
               ),
             ],
           ),

lib/routes/stats/widgets/history.dart

@@ -1,6 +1,6 @@
 import 'package:drift/drift.dart';
 import 'package:flutter/material.dart';
-import 'package:red_owl/config/shared.dart' show CustomColors;
+import 'package:red_owl/config/shared.dart' show HistoryColors;
 import 'package:red_owl/database/database.dart';
 import 'package:red_owl/routes/stats/widgets/history_tile.dart';
 import 'package:red_owl/util/shared.dart' show dateToString;
@@ -67,15 +67,15 @@ class _HistoryState extends State<History> {
             switch (gameState) {
               case GameState.won:
                 backgroundColor =
-                    Theme.of(context).extension<CustomColors>()!.historyGreen!;
+                    Theme.of(context).extension<HistoryColors>()!.green!;
                 break;
               case GameState.lost:
                 backgroundColor =
-                    Theme.of(context).extension<CustomColors>()!.historyRed!;
+                    Theme.of(context).extension<HistoryColors>()!.red!;
                 break;
               case GameState.incomplete:
                 backgroundColor =
-                    Theme.of(context).extension<CustomColors>()!.historyYellow!;
+                    Theme.of(context).extension<HistoryColors>()!.yellow!;
                 break;
             }