diff --git a/lib/base/theme.dart b/lib/base/theme.dart index 5150117..5784e6f 100644 --- a/lib/base/theme.dart +++ b/lib/base/theme.dart @@ -9,13 +9,15 @@ import 'package:qinglong_app/utils/codeeditor_theme.dart'; import 'package:qinglong_app/utils/sp_utils.dart'; var themeProvider = ChangeNotifierProvider((ref) => ThemeViewModel()); -Color _primaryColor = const Color(0xFF299343); + +const commonColor = Color(0xFF299343); +Color _primaryColor = commonColor; class ThemeViewModel extends ChangeNotifier { late ThemeData currentTheme; bool _isInDarkMode = false; - Color primaryColor = const Color(0xFF299343); + Color primaryColor = commonColor; ThemeColors themeColor = LightThemeColors(); diff --git a/lib/base/userinfo_viewmodel.dart b/lib/base/userinfo_viewmodel.dart index 3da7a1f..97c7c7b 100644 --- a/lib/base/userinfo_viewmodel.dart +++ b/lib/base/userinfo_viewmodel.dart @@ -1,6 +1,7 @@ import 'package:qinglong_app/utils/sp_utils.dart'; import 'sp_const.dart'; +import 'theme.dart'; class UserInfoViewModel { String? _token; @@ -8,13 +9,13 @@ class UserInfoViewModel { String? _userName; String? _passWord; bool _useSecertLogined = false; - int _primaryColor = 0xFF299343; + int _primaryColor = commonColor.value; UserInfoViewModel() { String userInfoJson = SpUtil.getString(spUserInfo); _userName = SpUtil.getString(spUserName); _passWord = SpUtil.getString(spPassWord); - _primaryColor = SpUtil.getInt(spCustomColor, defValue: 0xFF299343); + _primaryColor = SpUtil.getInt(spCustomColor, defValue: commonColor.value); _useSecertLogined = SpUtil.getBool(spSecretLogined, defValue: false); _host = SpUtil.getString(spHost, defValue: ''); diff --git a/lib/module/others/theme_page.dart b/lib/module/others/theme_page.dart index 80b4f50..01ff3b4 100644 --- a/lib/module/others/theme_page.dart +++ b/lib/module/others/theme_page.dart @@ -23,7 +23,7 @@ class _ThemePageState extends ConsumerState { void initState() { super.initState(); _primaryColor = ref.read(themeProvider).primaryColor; - colors.add(const Color(0xFF299343)); + colors.add(commonColor); colors.addAll([ Colors.red, Colors.pink,