opt: enum

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

lib/utils/accounts/account.dart

@@ -1,3 +1,4 @@
+import 'package:PiliPlus/models/common/account_type.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:cookie_jar/cookie_jar.dart';

lib/utils/accounts/account_adapter.dart

@@ -1,5 +1,5 @@
+import 'package:PiliPlus/models/common/account_type.dart';
 import 'package:PiliPlus/utils/accounts/account.dart';
-import 'package:PiliPlus/utils/storage.dart';
 import 'package:cookie_jar/cookie_jar.dart';
 import 'package:hive/hive.dart';
 

lib/utils/accounts/account_manager/account_mgr.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 
 import 'package:PiliPlus/http/api.dart';
 import 'package:PiliPlus/http/constants.dart';
+import 'package:PiliPlus/models/common/account_type.dart';
 import 'package:PiliPlus/utils/accounts/account.dart';
 import 'package:PiliPlus/utils/extension.dart';
 import 'package:PiliPlus/utils/storage.dart';

lib/utils/accounts/account_type_adapter.dart

@@ -1,5 +1,5 @@
+import 'package:PiliPlus/models/common/account_type.dart';
 import 'package:PiliPlus/utils/extension.dart';
-import 'package:PiliPlus/utils/storage.dart' show AccountType;
 import 'package:hive/hive.dart';
 
 class AccountTypeAdapter extends TypeAdapter<AccountType> {

lib/utils/app_scheme.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:PiliPlus/http/search.dart';
-import 'package:PiliPlus/models/common/reply_type.dart';
+import 'package:PiliPlus/models/common/reply/reply_type.dart';
 import 'package:PiliPlus/pages/video/reply_reply/view.dart';
 import 'package:PiliPlus/utils/extension.dart';
 import 'package:PiliPlus/utils/id_utils.dart';

lib/utils/extension.dart

@@ -1,5 +1,6 @@
 import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/hero_dialog_route.dart';
 import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart';
+import 'package:PiliPlus/models/common/image_preview_type.dart';
 import 'package:floating/floating.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';

lib/utils/login_utils.dart

@@ -3,8 +3,8 @@ import 'dart:math';
 import 'package:PiliPlus/grpc/grpc_repo.dart';
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/user.dart';
-import 'package:PiliPlus/models/common/dynamics_type.dart';
-import 'package:PiliPlus/models/common/tab_type.dart' hide tabsConfig;
+import 'package:PiliPlus/models/common/dynamic/dynamics_type.dart';
+import 'package:PiliPlus/models/common/home_tab_type.dart' hide tabsConfig;
 import 'package:PiliPlus/models/user/info.dart';
 import 'package:PiliPlus/models/user/stat.dart';
 import 'package:PiliPlus/pages/bangumi/controller.dart';
@@ -91,14 +91,14 @@ class LoginUtils {
       } catch (_) {}
 
       try {
-        Get.find<BangumiController>(tag: TabType.bangumi.name)
+        Get.find<BangumiController>(tag: HomeTabType.bangumi.name)
           ..isLogin.value = true
           ..mid = data.mid
           ..queryBangumiFollow();
       } catch (_) {}
 
       try {
-        Get.find<BangumiController>(tag: TabType.cinema.name)
+        Get.find<BangumiController>(tag: HomeTabType.cinema.name)
           ..isLogin.value = true
           ..mid = data.mid
           ..queryBangumiFollow();
@@ -164,14 +164,14 @@ class LoginUtils {
     }
 
     try {
-      Get.find<BangumiController>(tag: TabType.bangumi.name)
+      Get.find<BangumiController>(tag: HomeTabType.bangumi.name)
         ..mid = null
         ..isLogin.value = false
         ..followState.value = LoadingState.loading();
     } catch (_) {}
 
     try {
-      Get.find<BangumiController>(tag: TabType.cinema.name)
+      Get.find<BangumiController>(tag: HomeTabType.cinema.name)
         ..mid = null
         ..isLogin.value = false
         ..followState.value = LoadingState.loading();

lib/utils/page_utils.dart

@@ -5,6 +5,7 @@ import 'package:PiliPlus/grpc/grpc_repo.dart';
 import 'package:PiliPlus/http/dynamics.dart';
 import 'package:PiliPlus/http/search.dart';
 import 'package:PiliPlus/models/bangumi/info.dart';
+import 'package:PiliPlus/models/common/image_preview_type.dart';
 import 'package:PiliPlus/models/common/search_type.dart';
 import 'package:PiliPlus/models/dynamics/result.dart';
 import 'package:PiliPlus/models/live/item.dart';

lib/utils/storage.dart

@@ -6,21 +6,25 @@ import 'package:PiliPlus/common/widgets/pair.dart';
 import 'package:PiliPlus/common/widgets/refresh_indicator.dart'
     show kDragContainerExtentPercentage, displacement;
 import 'package:PiliPlus/http/constants.dart';
-import 'package:PiliPlus/models/common/dynamic_badge_mode.dart';
+import 'package:PiliPlus/models/common/account_type.dart';
+import 'package:PiliPlus/models/common/dynamic/dynamic_badge_mode.dart';
+import 'package:PiliPlus/models/common/dynamic/up_panel_position.dart';
+import 'package:PiliPlus/models/common/home_tab_type.dart';
+import 'package:PiliPlus/models/common/member/tab_type.dart';
+import 'package:PiliPlus/models/common/msg/msg_unread_type.dart';
 import 'package:PiliPlus/models/common/sponsor_block/segment_type.dart';
 import 'package:PiliPlus/models/common/sponsor_block/skip_type.dart';
-import 'package:PiliPlus/models/common/tab_type.dart';
-import 'package:PiliPlus/models/common/theme_type.dart';
-import 'package:PiliPlus/models/common/up_panel_position.dart';
-import 'package:PiliPlus/models/live/quality.dart';
+import 'package:PiliPlus/models/common/theme/theme_type.dart';
+import 'package:PiliPlus/models/common/video/CDN.dart';
+import 'package:PiliPlus/models/common/video/audio_quality.dart';
+import 'package:PiliPlus/models/common/video/live_quality.dart';
+import 'package:PiliPlus/models/common/video/subtitle_pref_type.dart';
+import 'package:PiliPlus/models/common/video/video_decode_type.dart';
+import 'package:PiliPlus/models/common/video/video_quality.dart';
 import 'package:PiliPlus/models/model_owner.dart';
 import 'package:PiliPlus/models/user/danmaku_rule.dart';
 import 'package:PiliPlus/models/user/danmaku_rule_adapter.dart';
 import 'package:PiliPlus/models/user/info.dart';
-import 'package:PiliPlus/models/video/play/CDN.dart';
-import 'package:PiliPlus/models/video/play/quality.dart';
-import 'package:PiliPlus/models/video/play/subtitle.dart';
-import 'package:PiliPlus/pages/member/controller.dart' show MemberTabType;
 import 'package:PiliPlus/pages/mine/controller.dart';
 import 'package:PiliPlus/plugin/pl_player/models/bottom_progress_behavior.dart';
 import 'package:PiliPlus/plugin/pl_player/models/fullscreen_mode.dart';
@@ -54,7 +58,7 @@ class GStorage {
 
   static List<String> get tabbarSort =>
       List<String>.from(setting.get(SettingBoxKey.tabbarSort,
-          defaultValue: TabType.values.map((item) => item.name).toList()));
+          defaultValue: HomeTabType.values.map((item) => item.name).toList()));
 
   static List<Pair<SegmentType, SkipType>> get blockSettings {
     List<int> list = List<int>.from(setting.get(
@@ -137,7 +141,7 @@ class GStorage {
 
   static String get defaultSubtitlePreference =>
       setting.get(SettingBoxKey.subtitlePreference,
-          defaultValue: SubtitlePreference.values.first.code);
+          defaultValue: SubtitlePrefType.values.first.code);
 
   static bool get useRelativeSlide =>
       setting.get(SettingBoxKey.useRelativeSlide, defaultValue: false);
@@ -167,12 +171,12 @@ class GStorage {
 
   static String get defaultDecode => setting.get(
         SettingBoxKey.defaultDecode,
-        defaultValue: VideoDecodeFormats.values.last.code,
+        defaultValue: VideoDecodeFormatType.values.last.code,
       );
 
   static String get secondDecode => setting.get(
         SettingBoxKey.secondDecode,
-        defaultValue: VideoDecodeFormats.values[1].code,
+        defaultValue: VideoDecodeFormatType.values[1].code,
       );
 
   static String get hardwareDecoding => setting.get(
@@ -973,14 +977,3 @@ class Accounts {
     return accountMode[key]!;
   }
 }
-
-enum AccountType {
-  main,
-  heartbeat,
-  recommend,
-  video,
-}
-
-extension AccountTypeExt on AccountType {
-  String get title => const ['主账号', '记录观看', '推荐', '视频取流'][index];
-}

lib/utils/video_utils.dart

@@ -1,5 +1,5 @@
+import 'package:PiliPlus/models/common/video/CDN.dart';
 import 'package:PiliPlus/models/live/room_info.dart';
-import 'package:PiliPlus/models/video/play/CDN.dart';
 import 'package:PiliPlus/models/video/play/url.dart';
 import 'package:PiliPlus/utils/extension.dart';
 import 'package:PiliPlus/utils/storage.dart';