fix: multiple instance of theme

KRTirtho · Jun 10, 2023 · 4ec0424 · 4ec0424
1 parent bf04962
commit 4ec0424
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -195,6 +195,15 @@ class SpotubeState extends ConsumerState<Spotube> {
       };
     }, []);
 
+    final lightTheme = useMemoized(
+      () => theme(paletteColor ?? accentMaterialColor, Brightness.light),
+      [paletteColor, accentMaterialColor],
+    );
+    final darkTheme = useMemoized(
+      () => theme(paletteColor ?? accentMaterialColor, Brightness.dark),
+      [paletteColor, accentMaterialColor],
+    );
+
     return MaterialApp.router(
       supportedLocales: L10n.all,
       locale: locale.languageCode == "system" ? null : locale,
@@ -216,8 +225,8 @@ class SpotubeState extends ConsumerState<Spotube> {
         );
       },
       themeMode: themeMode,
-      theme: theme(paletteColor ?? accentMaterialColor, Brightness.light),
-      darkTheme: theme(paletteColor ?? accentMaterialColor, Brightness.dark),
+      theme: lightTheme,
+      darkTheme: darkTheme,
       shortcuts: {
         ...WidgetsApp.defaultShortcuts.map((key, value) {
           return MapEntry(