From 4ec04240a5bde6af5c920a61ab6260e7a93bfc54 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Sat, 10 Jun 2023 14:02:39 +0600 Subject: [PATCH] fix: multiple instance of theme --- lib/main.dart | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index a89ee19c..66a21772 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -195,6 +195,15 @@ class SpotubeState extends ConsumerState { }; }, []); + 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 { ); }, 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(