增加主题功能

lib/base/theme.dart

@@ -7,17 +7,21 @@ import 'package:qinglong_app/utils/codeeditor_theme.dart';
 import 'package:qinglong_app/utils/sp_utils.dart';
 
 var themeProvider = ChangeNotifierProvider((ref) => ThemeViewModel());
-const Color _primaryColor = Color(0xFF299343);
+Color _primaryColor = const Color(0xFF299343);
-
-get primaryColor => _primaryColor;
 
 class ThemeViewModel extends ChangeNotifier {
-  ThemeData currentTheme = lightTheme;
+  late ThemeData darkTheme;
+  late ThemeData lightTheme;
+  late ThemeData currentTheme;
+
   bool _isInDarkMode = false;
+  Color primaryColor = const Color(0xFF299343);
 
   ThemeColors themeColor = LightThemeColors();
 
   ThemeViewModel() {
+    darkTheme = getDartTheme();
+    lightTheme = getLightTheme();
     var brightness = SchedulerBinding.instance!.window.platformBrightness;
     _isInDarkMode = brightness == Brightness.dark;
     changeThemeReal(_isInDarkMode, false);
@@ -47,146 +51,151 @@ class ThemeViewModel extends ChangeNotifier {
   void changeTheme() {
     changeThemeReal(!SpUtil.getBool(spTheme, defValue: false), true);
   }
-}
 
-ThemeData darkTheme = ThemeData.dark().copyWith(
+  ThemeData getLightTheme() {
-  brightness: Brightness.dark,
+    return ThemeData.light().copyWith(
-  primaryColor: const Color(0xffffffff),
+      brightness: Brightness.light,
-  scaffoldBackgroundColor: Colors.black,
+      primaryColor: _primaryColor,
-  appBarTheme: const AppBarTheme(
+      colorScheme: ColorScheme.light(
-    backgroundColor: Colors.black,
+        secondary: _primaryColor,
-    titleTextStyle: TextStyle(
+        primary: _primaryColor,
-      color: Colors.white,
+      ),
-      fontSize: 18,
+      scaffoldBackgroundColor: const Color(0xfff5f5f5),
-    ),
+      inputDecorationTheme: InputDecorationTheme(
-  ),
+        labelStyle: TextStyle(color: _primaryColor),
-  inputDecorationTheme: const InputDecorationTheme(
+        focusedBorder: UnderlineInputBorder(
-    labelStyle: TextStyle(color: _primaryColor),
+          borderSide: BorderSide(
-    focusedBorder: UnderlineInputBorder(
+            color: _primaryColor,
-      borderSide: BorderSide(
+          ),
+        ),
+        border: const UnderlineInputBorder(
+          borderSide: BorderSide(
+            color: Color(0xff999999),
+          ),
+        ),
+        enabledBorder: const UnderlineInputBorder(
+          borderSide: BorderSide(
+            color: Color(0xff999999),
+          ),
+        ),
+      ),
+      appBarTheme: AppBarTheme(
+        backgroundColor: _primaryColor,
+        titleTextStyle: const TextStyle(
+          color: Colors.white,
+          fontSize: 18,
+        ),
+      ),
+      bottomNavigationBarTheme: BottomNavigationBarThemeData(
+        selectedItemColor: _primaryColor,
+      ),
+      buttonTheme: ButtonThemeData(
+        buttonColor: _primaryColor,
+      ),
+      progressIndicatorTheme: ProgressIndicatorThemeData(
         color: _primaryColor,
       ),
-    ),
+      tabBarTheme: TabBarTheme(
-    border: UnderlineInputBorder(
+        labelStyle: const TextStyle(
-      borderSide: BorderSide(
+          fontSize: 14,
-        color: Color(0xff999999),
+        ),
+        unselectedLabelStyle: const TextStyle(
+          fontSize: 14,
+        ),
+        labelColor: _primaryColor,
+        unselectedLabelColor: const Color(0xff999999),
+        indicator: UnderlineTabIndicator(
+          borderSide: BorderSide(color: _primaryColor),
+        ),
       ),
-    ),
+      toggleableActiveColor: _primaryColor,
-    enabledBorder: UnderlineInputBorder(
+      checkboxTheme: CheckboxThemeData(
-      borderSide: BorderSide(
+        checkColor: MaterialStateProperty.resolveWith(
-        color: Color(0xff999999),
+          (Set<MaterialState> states) {
+            if (states.contains(MaterialState.disabled)) {
+              return Colors.transparent;
+            }
+            if (states.contains(MaterialState.selected)) {
+              return Colors.white;
+            }
+            return Colors.black;
+          },
+        ),
       ),
-    ),
+      cupertinoOverrideTheme: NoDefaultCupertinoThemeData(
-  ),
+        brightness: Brightness.light,
-  tabBarTheme: const TabBarTheme(
+        primaryColor: _primaryColor,
-    labelStyle: TextStyle(
+        scaffoldBackgroundColor: const Color(0xfff5f5f5),
-      fontSize: 14,
-    ),
-    unselectedLabelStyle: TextStyle(
-      fontSize: 14,
-    ),
-    labelColor: Color(0xffffffff),
-    unselectedLabelColor: Color(0xff999999),
-  ),
-  colorScheme: const ColorScheme.light(
-    secondary: _primaryColor,
-    primary: _primaryColor,
-  ),
-  toggleableActiveColor: _primaryColor,
-  checkboxTheme: CheckboxThemeData(
-    checkColor: MaterialStateProperty.resolveWith(
-      (Set<MaterialState> states) {
-        if (states.contains(MaterialState.disabled)) {
-          return Colors.transparent;
-        }
-        if (states.contains(MaterialState.selected)) {
-          return Colors.white;
-        }
-        return Colors.white;
-      },
-    ),
-  ),
-  cupertinoOverrideTheme: const NoDefaultCupertinoThemeData(
-    brightness: Brightness.dark,
-    primaryColor: Color(0xffffffff),
-    scaffoldBackgroundColor: Colors.black,
-  ),
-);
-ThemeData lightTheme = ThemeData.light().copyWith(
-  brightness: Brightness.light,
-  primaryColor: _primaryColor,
-  colorScheme: const ColorScheme.light(
-    secondary: _primaryColor,
-    primary: _primaryColor,
-  ),
-  scaffoldBackgroundColor: const Color(0xfff5f5f5),
-  inputDecorationTheme: const InputDecorationTheme(
-    labelStyle: TextStyle(color: _primaryColor),
-    focusedBorder: UnderlineInputBorder(
-      borderSide: BorderSide(
-        color: _primaryColor,
       ),
-    ),
+    );
-    border: UnderlineInputBorder(
+  }
-      borderSide: BorderSide(
+
-        color: Color(0xff999999),
+  ThemeData getDartTheme() {
+    return ThemeData.dark().copyWith(
+      brightness: Brightness.dark,
+      primaryColor: const Color(0xffffffff),
+      scaffoldBackgroundColor: Colors.black,
+      appBarTheme: const AppBarTheme(
+        backgroundColor: Colors.black,
+        titleTextStyle: TextStyle(
+          color: Colors.white,
+          fontSize: 18,
+        ),
       ),
-    ),
+      inputDecorationTheme: InputDecorationTheme(
-    enabledBorder: UnderlineInputBorder(
+        labelStyle: TextStyle(color: _primaryColor),
-      borderSide: BorderSide(
+        focusedBorder: UnderlineInputBorder(
-        color: Color(0xff999999),
+          borderSide: BorderSide(
+            color: _primaryColor,
+          ),
+        ),
+        border: const UnderlineInputBorder(
+          borderSide: BorderSide(
+            color: Color(0xff999999),
+          ),
+        ),
+        enabledBorder: const UnderlineInputBorder(
+          borderSide: BorderSide(
+            color: Color(0xff999999),
+          ),
+        ),
       ),
-    ),
+      tabBarTheme: const TabBarTheme(
-  ),
+        labelStyle: TextStyle(
-  appBarTheme: const AppBarTheme(
+          fontSize: 14,
-    backgroundColor: _primaryColor,
+        ),
-    titleTextStyle: TextStyle(
+        unselectedLabelStyle: TextStyle(
-      color: Colors.white,
+          fontSize: 14,
-      fontSize: 18,
+        ),
-    ),
+        labelColor: Color(0xffffffff),
-  ),
+        unselectedLabelColor: Color(0xff999999),
-  bottomNavigationBarTheme: const BottomNavigationBarThemeData(
+      ),
-    selectedItemColor: _primaryColor,
+      colorScheme: ColorScheme.light(
-  ),
+        secondary: _primaryColor,
-  buttonTheme: const ButtonThemeData(
+        primary: _primaryColor,
-    buttonColor: _primaryColor,
+      ),
-  ),
+      toggleableActiveColor: _primaryColor,
-  progressIndicatorTheme: const ProgressIndicatorThemeData(
+      checkboxTheme: CheckboxThemeData(
-    color: _primaryColor,
+        checkColor: MaterialStateProperty.resolveWith(
-  ),
+          (Set<MaterialState> states) {
-  tabBarTheme: const TabBarTheme(
+            if (states.contains(MaterialState.disabled)) {
-    labelStyle: TextStyle(
+              return Colors.transparent;
-      fontSize: 14,
+            }
-    ),
+            if (states.contains(MaterialState.selected)) {
-    unselectedLabelStyle: TextStyle(
+              return Colors.white;
-      fontSize: 14,
+            }
-    ),
+            return Colors.white;
-    labelColor: _primaryColor,
+          },
-    unselectedLabelColor: Color(0xff999999),
+        ),
-    indicator: UnderlineTabIndicator(
+      ),
-      borderSide: BorderSide(color: _primaryColor),
+      cupertinoOverrideTheme: const NoDefaultCupertinoThemeData(
-    ),
+        brightness: Brightness.dark,
-  ),
+        primaryColor: Color(0xffffffff),
-  toggleableActiveColor: _primaryColor,
+        scaffoldBackgroundColor: Colors.black,
-  checkboxTheme: CheckboxThemeData(
+      ),
-    checkColor: MaterialStateProperty.resolveWith(
+    );
-      (Set<MaterialState> states) {
+  }
-        if (states.contains(MaterialState.disabled)) {
+}
-          return Colors.transparent;
-        }
-        if (states.contains(MaterialState.selected)) {
-          return Colors.white;
-        }
-        return Colors.black;
-      },
-    ),
-  ),
-  cupertinoOverrideTheme: const NoDefaultCupertinoThemeData(
-    brightness: Brightness.light,
-    primaryColor: _primaryColor,
-    scaffoldBackgroundColor: Color(0xfff5f5f5),
-  ),
-);
 
 abstract class ThemeColors {
   Color settingBgColor();

lib/module/env/env_detail_page.dart

@@ -249,7 +249,7 @@ class _TaskDetailPageState extends ConsumerState<EnvDetailPage> {
             child: Text(
               "确定",
               style: TextStyle(
-                color: primaryColor,
+                color: ref.watch(themeProvider).primaryColor,
               ),
             ),
             onPressed: () async {

lib/module/env/env_page.dart

@@ -238,11 +238,11 @@ class EnvItemCell extends StatelessWidget {
                               ),
                               decoration: BoxDecoration(
                                 borderRadius: BorderRadius.circular(5),
-                                border: Border.all(color: primaryColor, width: 1),
+                                border: Border.all(color: ref.watch(themeProvider).primaryColor, width: 1),
                               ),
                               child: Text(
                                 "$index",
-                                style: TextStyle(color: primaryColor, fontSize: 12),
+                                style: TextStyle(color: ref.watch(themeProvider).primaryColor, fontSize: 12),
                               ),
                             ),
                             const SizedBox(
@@ -332,7 +332,7 @@ class EnvItemCell extends StatelessWidget {
             child: Text(
               "确定",
               style: TextStyle(
-                color: primaryColor,
+                color: ref.watch(themeProvider).primaryColor,
               ),
             ),
             onPressed: () {

lib/module/login/login_page.dart

@@ -115,7 +115,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
                                   if (debugBtnIsShow()) {
                                     dismissDebugBtn();
                                   } else {
-                                    showDebugBtn(context, btnColor: primaryColor);
+                                    showDebugBtn(context, btnColor: ref.watch(themeProvider).primaryColor);
                                   }
                                   WidgetsBinding.instance?.endOfFrame;
                                 },
@@ -327,7 +327,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
                             padding: const EdgeInsets.symmetric(
                               vertical: 5,
                             ),
-                            color: canClickLoginBtn() ? primaryColor : primaryColor.withOpacity(0.4),
+                            color: canClickLoginBtn() ? ref.watch(themeProvider).primaryColor : ref.watch(themeProvider).primaryColor.withOpacity(0.4),
                             child: isLoading
                                 ? const CupertinoActivityIndicator()
                                 : const Text(
@@ -476,7 +476,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
                   child: Text(
                     "确定",
                     style: TextStyle(
-                      color: primaryColor,
+                      color: ref.watch(themeProvider).primaryColor,
                     ),
                   ),
                   onPressed: () async {

lib/module/others/about_page.dart

@@ -91,7 +91,7 @@ class _AboutPageState extends ConsumerState<AboutPage> {
               child: Text(
                 "Telegram频道",
                 style: TextStyle(
-                  color: primaryColor,
+                  color: ref.watch(themeProvider).primaryColor,
                   fontSize: 16,
                 ),
               ),
@@ -107,7 +107,7 @@ class _AboutPageState extends ConsumerState<AboutPage> {
                   child: Text(
                     "版本更新",
                     style: TextStyle(
-                      color: primaryColor,
+                      color: ref.watch(themeProvider).primaryColor,
                       fontSize: 16,
                     ),
                   ),
@@ -122,7 +122,7 @@ class _AboutPageState extends ConsumerState<AboutPage> {
                   child: Text(
                     "项目地址",
                     style: TextStyle(
-                      color: primaryColor,
+                      color: ref.watch(themeProvider).primaryColor,
                       fontSize: 16,
                     ),
                   ),

lib/module/others/dependencies/dependency_page.dart

@@ -231,7 +231,7 @@ class DependencyCell extends ConsumerWidget {
                         bean.status == 1
                             ? Icon(
                                 CupertinoIcons.checkmark_circle,
-                                color: primaryColor,
+                                color: ref.watch(themeProvider).primaryColor,
                                 size: 16,
                               )
                             : (bean.status == 2
@@ -348,7 +348,7 @@ class DependencyCell extends ConsumerWidget {
             child: Text(
               "确定",
               style: TextStyle(
-                color: primaryColor,
+                color: ref.watch(themeProvider).primaryColor,
               ),
             ),
             onPressed: () {

lib/module/others/login_log/login_log_page.dart

@@ -86,7 +86,7 @@ class _LoginLogPageState extends ConsumerState<LoginLogPage> with LazyLoadState<
                     trailing: item.status == 0
                         ? Icon(
                             CupertinoIcons.checkmark_circle,
-                            color: primaryColor,
+                            color: ref.watch(themeProvider).primaryColor,
                             size: 16,
                           )
                         : const Icon(

lib/module/others/other_page.dart

@@ -357,7 +357,7 @@ class _OtherPageState extends ConsumerState<OtherPage> {
                             child: Text(
                               "确定",
                               style: TextStyle(
-                                color: primaryColor,
+                                color: ref.watch(themeProvider).primaryColor,
                               ),
                             ),
                             onPressed: () {

lib/module/others/scripts/script_detail_page.dart

@@ -98,7 +98,7 @@ class _ScriptDetailPageState extends ConsumerState<ScriptDetailPage> with LazyLo
                     child: Text(
                       "确定",
                       style: TextStyle(
-                        color: primaryColor,
+                        color: ref.watch(themeProvider).primaryColor,
                       ),
                     ),
                     onPressed: () async {

lib/module/task/task_detail/task_detail_page.dart

@@ -385,7 +385,7 @@ class _TaskDetailPageState extends ConsumerState<TaskDetailPage> {
             child: Text(
               "确定",
               style: TextStyle(
-                color: primaryColor,
+                color: ref.watch(themeProvider).primaryColor,
               ),
             ),
             onPressed: () async {

lib/module/task/task_page.dart

@@ -447,7 +447,7 @@ class TaskItemCell extends StatelessWidget {
             child: Text(
               "确定",
               style: TextStyle(
-                color: primaryColor,
+                color: ref.watch(themeProvider).primaryColor,
               ),
             ),
             onPressed: () {