opt.: primaryColor

lib/app.dart

@@ -3,15 +3,23 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:toolbox/core/extension/context.dart';
 import 'package:toolbox/core/extension/locale.dart';
-import 'package:toolbox/view/page/full_screen.dart';
 
 import 'core/utils/ui.dart';
 import 'data/res/build_data.dart';
 import 'data/res/color.dart';
 import 'data/store/setting.dart';
 import 'locator.dart';
+import 'view/page/full_screen.dart';
 import 'view/page/home.dart';
 
+/// After upgrading to flutter 3.13,
+/// the shadow color of the drawer is white (maybe a bug).
+/// Only on [iOS].
+/// TODO: remember to remove it after the bug is fixed.
+const _drawerTheme = DrawerThemeData(
+  shadowColor: Colors.black12,
+);
+
 class MyApp extends StatelessWidget {
   MyApp({Key? key}) : super(key: key);
 
@@ -19,50 +27,54 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return DynamicColorBuilder(builder: (light, dark) {
-      setTransparentNavigationBar(context);
-      _setupPrimaryColor(context, light, dark);
+    setTransparentNavigationBar(context);
+    final child = _wrapTheme(context);
+    if (_setting.useSystemPrimaryColor.fetch()) {
+      return _wrapSystemColor(context, child);
+    }
+    return child;
+  }
 
-      return ValueListenableBuilder<int>(
-        valueListenable: _setting.themeMode.listenable(),
-        builder: (_, tMode, __) {
-          final isAMOLED = tMode >= 0 && tMode <= ThemeMode.values.length - 1;
-          // Issue #57
-          // if not [ok] -> [AMOLED] mode, use [ThemeMode.dark]
-          final themeMode = isAMOLED ? ThemeMode.values[tMode] : ThemeMode.dark;
-          final locale = _setting.locale.fetch().toLocale;
-          final darkTheme = ThemeData(
+  Widget _wrapTheme(BuildContext context) {
+    return ValueListenableBuilder<int>(
+      valueListenable: _setting.themeMode.listenable(),
+      builder: (_, tMode, __) {
+        final isAMOLED = tMode >= 0 && tMode <= ThemeMode.values.length - 1;
+        // Issue #57
+        // if not [ok] -> [AMOLED] mode, use [ThemeMode.dark]
+        final themeMode = isAMOLED ? ThemeMode.values[tMode] : ThemeMode.dark;
+        final locale = _setting.locale.fetch().toLocale;
+        final darkTheme = ThemeData(
+          useMaterial3: true,
+          brightness: Brightness.dark,
+          colorSchemeSeed: primaryColor,
+          drawerTheme: _drawerTheme,
+        );
+
+        return MaterialApp(
+          debugShowCheckedModeBanner: false,
+          locale: locale,
+          localizationsDelegates: S.localizationsDelegates,
+          supportedLocales: S.supportedLocales,
+          title: BuildData.name,
+          themeMode: themeMode,
+          theme: ThemeData(
             useMaterial3: true,
-            brightness: Brightness.dark,
             colorSchemeSeed: primaryColor,
+          ),
+          darkTheme: isAMOLED ? darkTheme : _getAmoledTheme(darkTheme),
+          home: _setting.fullScreen.fetch()
+              ? const FullScreenPage()
+              : const HomePage(),
+        );
+      },
+    );
+  }
 
-            /// After upgrading to flutter 3.13,
-            /// the shadow color of the drawer is white (maybe a bug).
-            /// Only on [iOS].
-            /// TODO: remember to remove it after the bug is fixed.
-            drawerTheme: const DrawerThemeData(
-              shadowColor: Colors.black12,
-            ),
-          );
-
-          return MaterialApp(
-            debugShowCheckedModeBanner: false,
-            locale: locale,
-            localizationsDelegates: S.localizationsDelegates,
-            supportedLocales: S.supportedLocales,
-            title: BuildData.name,
-            themeMode: themeMode,
-            theme: ThemeData(
-              useMaterial3: true,
-              colorSchemeSeed: primaryColor,
-            ),
-            darkTheme: isAMOLED ? darkTheme : _getAmoledTheme(darkTheme),
-            home: _setting.fullScreen.fetch()
-                ? const FullScreenPage()
-                : const HomePage(),
-          );
-        },
-      );
+  Widget _wrapSystemColor(BuildContext context, Widget child) {
+    return DynamicColorBuilder(builder: (light, dark) {
+      _setupPrimaryColor(context, light, dark);
+      return child;
     });
   }
 
@@ -71,14 +83,10 @@ class MyApp extends StatelessWidget {
     ColorScheme? light,
     ColorScheme? dark,
   ) {
-    if (_setting.useSystemPrimaryColor.fetch()) {
-      if (context.isDark && light != null) {
-        primaryColor = light.primary;
-      } else if (!context.isDark && dark != null) {
-        primaryColor = dark.primary;
-      }
-    } else {
-      primaryColor = Color(_setting.primaryColor.fetch());
+    if (context.isDark && light != null) {
+      primaryColor = light.primary;
+    } else if (!context.isDark && dark != null) {
+      primaryColor = dark.primary;
     }
   }
 }
@@ -86,6 +94,7 @@ class MyApp extends StatelessWidget {
 ThemeData _getAmoledTheme(ThemeData darkTheme) => darkTheme.copyWith(
       scaffoldBackgroundColor: Colors.black,
       dialogBackgroundColor: Colors.black,
+      drawerTheme: _drawerTheme.copyWith(backgroundColor: Colors.black),
       appBarTheme: const AppBarTheme(backgroundColor: Colors.black),
       dialogTheme: const DialogTheme(backgroundColor: Colors.black),
       bottomSheetTheme: