Merge branch 'fix'

lib/pages/setting/controller.dart

@@ -13,9 +13,9 @@ import '../main/index.dart';
 import 'widgets/select_dialog.dart';
 
 class SettingController extends GetxController {
-  Box userInfoCache = GStrorage.userInfo;
-  Box setting = GStrorage.setting;
-  Box localCache = GStrorage.localCache;
+  Box userInfoCache = GStorage.userInfo;
+  Box setting = GStorage.setting;
+  Box localCache = GStorage.localCache;
 
   RxBool userLogin = false.obs;
   RxBool feedBackEnable = false.obs;

lib/pages/setting/extra_setting.dart

@@ -19,8 +19,8 @@ class ExtraSetting extends StatefulWidget {
 }
 
 class _ExtraSettingState extends State<ExtraSetting> {
-  Box setting = GStrorage.setting;
-  static Box localCache = GStrorage.localCache;
+  Box setting = GStorage.setting;
+  static Box localCache = GStorage.localCache;
   late dynamic defaultReplySort;
   late dynamic defaultDynamicType;
   late dynamic enableSystemProxy;

lib/pages/setting/pages/action_menu_set.dart

@@ -13,7 +13,7 @@ class ActionMenuSetPage extends StatefulWidget {
 }
 
 class _ActionMenuSetPageState extends State<ActionMenuSetPage> {
-  Box setting = GStrorage.setting;
+  Box setting = GStorage.setting;
   late List<String> actionTypeSort;
   late List<Map> allLabels;
 

lib/pages/setting/pages/color_select.dart

@@ -142,7 +142,7 @@ class _ColorSelectPageState extends State<ColorSelectPage> {
 }
 
 class ColorSelectController extends GetxController {
-  Box setting = GStrorage.setting;
+  Box setting = GStorage.setting;
   RxBool dynamicColor = true.obs;
   RxInt type = 0.obs;
   late final List<Map<String, dynamic>> colorThemes;

lib/pages/setting/pages/display_mode.dart

@@ -16,7 +16,7 @@ class _SetDiaplayModeState extends State<SetDiaplayMode> {
   List<DisplayMode> modes = <DisplayMode>[];
   DisplayMode? active;
   DisplayMode? preferred;
-  Box setting = GStrorage.setting;
+  Box setting = GStorage.setting;
 
   final ValueNotifier<int> page = ValueNotifier<int>(0);
   late final PageController controller = PageController()

lib/pages/setting/pages/font_size_select.dart

@@ -11,7 +11,7 @@ class FontSizeSelectPage extends StatefulWidget {
 }
 
 class _FontSizeSelectPageState extends State<FontSizeSelectPage> {
-  Box setting = GStrorage.setting;
+  Box setting = GStorage.setting;
   List<double> list = [0.9, 0.95, 1.0, 1.05, 1.1, 1.15, 1.2, 1.25, 1.3];
   late double minsize;
   late double maxSize;

lib/pages/setting/pages/home_tabbar_set.dart

@@ -12,7 +12,7 @@ class TabbarSetPage extends StatefulWidget {
 }
 
 class _TabbarSetPageState extends State<TabbarSetPage> {
-  Box settingStorage = GStrorage.setting;
+  Box settingStorage = GStorage.setting;
   late List defaultTabs;
   late List<String> tabbarSort;
 

lib/pages/setting/pages/navigation_bar_set.dart

@@ -13,7 +13,7 @@ class NavigationBarSetPage extends StatefulWidget {
 }
 
 class _NavigationbarSetPageState extends State<NavigationBarSetPage> {
-  Box settingStorage = GStrorage.setting;
+  Box settingStorage = GStorage.setting;
   late List defaultNavTabs;
   late List<int> navBarSort;
 

lib/pages/setting/pages/play_gesture_set.dart

@@ -16,7 +16,7 @@ class PlayGesturePage extends StatefulWidget {
 }
 
 class _PlayGesturePageState extends State<PlayGesturePage> {
-  Box setting = GStrorage.setting;
+  Box setting = GStorage.setting;
   late int fullScreenGestureMode;
 
   @override

lib/pages/setting/pages/play_speed_set.dart

@@ -14,8 +14,8 @@ class PlaySpeedPage extends StatefulWidget {
 }
 
 class _PlaySpeedPageState extends State<PlaySpeedPage> {
-  Box videoStorage = GStrorage.video;
-  Box settingStorage = GStrorage.setting;
+  Box videoStorage = GStorage.video;
+  Box settingStorage = GStorage.setting;
   late double playSpeedDefault;
   late List<double> playSpeedSystem;
   late double longPressSpeedDefault;

lib/pages/setting/play_setting.dart

@@ -23,7 +23,7 @@ class PlaySetting extends StatefulWidget {
 }
 
 class _PlaySettingState extends State<PlaySetting> {
-  Box setting = GStrorage.setting;
+  Box setting = GStorage.setting;
   late dynamic defaultVideoQa;
   late dynamic defaultLiveQa;
   late dynamic defaultAudioQa;

lib/pages/setting/privacy_setting.dart

@@ -14,7 +14,7 @@ class PrivacySetting extends StatefulWidget {
 
 class _PrivacySettingState extends State<PrivacySetting> {
   bool userLogin = false;
-  Box userInfoCache = GStrorage.userInfo;
+  Box userInfoCache = GStorage.userInfo;
   var userInfo;
 
   @override

lib/pages/setting/recommend_setting.dart

@@ -17,10 +17,10 @@ class RecommendSetting extends StatefulWidget {
 }
 
 class _RecommendSettingState extends State<RecommendSetting> {
-  Box setting = GStrorage.setting;
-  static Box localCache = GStrorage.localCache;
+  Box setting = GStorage.setting;
+  static Box localCache = GStorage.localCache;
   late dynamic defaultRcmdType;
-  Box userInfoCache = GStrorage.userInfo;
+  Box userInfoCache = GStorage.userInfo;
   late dynamic userInfo;
   bool userLogin = false;
   late dynamic accessKeyInfo;
@@ -247,10 +247,9 @@ class _RecommendSettingState extends State<RecommendSetting> {
               '* 其它（如热门视频、手动搜索、链接跳转等）均不受过滤器影响。\n'
               '* 设定较严苛的条件可导致推荐项数锐减或多次请求，请酌情选择。\n'
               '* 后续可能会增加更多过滤条件，敬请期待。',
-              style: Theme.of(context)
-                  .textTheme
-                  .labelSmall!
-                  .copyWith(color: Theme.of(context).colorScheme.outline.withOpacity(0.7)),
+              style: Theme.of(context).textTheme.labelSmall!.copyWith(
+                  color:
+                      Theme.of(context).colorScheme.outline.withOpacity(0.7)),
             ),
           )
         ],

lib/pages/setting/style_setting.dart

@@ -28,7 +28,7 @@ class _StyleSettingState extends State<StyleSetting> {
   final ColorSelectController colorSelectController =
       Get.put(ColorSelectController());
 
-  Box setting = GStrorage.setting;
+  Box setting = GStorage.setting;
   late int picQuality;
   late ThemeType _tempThemeValue;
   late dynamic defaultCustomRows;

lib/pages/setting/widgets/select_item.dart

@@ -19,7 +19,7 @@ class SetSelectItem extends StatefulWidget {
 }
 
 class _SetSelectItemState extends State<SetSelectItem> {
-  Box setting = GStrorage.setting;
+  Box setting = GStorage.setting;
   late dynamic currentVal;
   late int currentIndex;
   late List menus;

lib/pages/setting/widgets/switch_item.dart

@@ -28,7 +28,7 @@ class SetSwitchItem extends StatefulWidget {
 
 class _SetSwitchItemState extends State<SetSwitchItem> {
   // ignore: non_constant_identifier_names
-  Box Setting = GStrorage.setting;
+  Box Setting = GStorage.setting;
   late bool val;
 
   @override