diff --git a/lib/common/widgets/badge.dart b/lib/common/widgets/badge.dart
index 63f3a3027..f71ccf552 100644
--- a/lib/common/widgets/badge.dart
+++ b/lib/common/widgets/badge.dart
@@ -27,7 +27,7 @@ class PBadge extends StatelessWidget {
     this.right,
     this.bottom,
     this.left,
-    this.type = PBadgeType.primary,
+    this.type = .primary,
     this.size = PBadgeSize.medium,
     this.isStack = true,
     this.fontSize = 11,
@@ -49,16 +49,16 @@ class PBadge extends StatelessWidget {
     Color borderColor = Colors.transparent;
 
     switch (type) {
-      case PBadgeType.primary:
+      case .primary:
         bgColor = theme.primary;
         color = theme.onPrimary;
-      case PBadgeType.secondary:
+      case .secondary:
         bgColor = theme.secondaryContainer.withValues(alpha: 0.5);
         color = theme.onSecondaryContainer;
-      case PBadgeType.gray:
+      case .gray:
         bgColor = Colors.black45;
         color = Colors.white;
-      case PBadgeType.error:
+      case .error:
         if (theme.isDark) {
           bgColor = theme.errorContainer;
           color = theme.onErrorContainer;
@@ -66,18 +66,18 @@ class PBadge extends StatelessWidget {
           bgColor = theme.error;
           color = theme.onError;
         }
-      case PBadgeType.line_primary:
+      case .line_primary:
         color = theme.primary;
         bgColor = Colors.transparent;
         borderColor = theme.primary;
-      case PBadgeType.line_secondary:
+      case .line_secondary:
         color = theme.secondary;
         bgColor = Colors.transparent;
         borderColor = theme.secondary;
-      case PBadgeType.free:
+      case .free:
         bgColor = theme.freeColor;
         color = Colors.white;
-      case PBadgeType.shop:
+      case .shop:
         bgColor = theme.secondaryContainer.withValues(alpha: 0.5);
         color = theme.onSurfaceVariant;
     }
diff --git a/lib/common/widgets/flutter/text_field/controller.dart b/lib/common/widgets/flutter/text_field/controller.dart
index 889dbf8a4..7e5ad3509 100644
--- a/lib/common/widgets/flutter/text_field/controller.dart
+++ b/lib/common/widgets/flutter/text_field/controller.dart
@@ -18,7 +18,6 @@
 import 'dart:math';
 
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:flutter/foundation.dart' show kDebugMode;
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -54,7 +53,7 @@ extension TextEditingDeltaExt on TextEditingDelta {
       return (type: e.type, rawText: e.rawText, emote: e.emote, id: e.id);
     }
     return (
-      type: composing.isValid ? RichTextType.composing : RichTextType.text,
+      type: composing.isValid ? .composing : .text,
       rawText: null,
       emote: null,
       id: null,
@@ -63,7 +62,7 @@ extension TextEditingDeltaExt on TextEditingDelta {
 
   bool get isText {
     if (this case final RichTextTypeMixin e) {
-      return e.type == RichTextType.text;
+      return e.type == .text;
     }
     return !composing.isValid;
   }
@@ -85,9 +84,7 @@ class RichTextEditingDeltaInsertion extends TextEditingDeltaInsertion
     this.emote,
     this.id,
     this.rawText,
-  }) : type =
-           type ??
-           (composing.isValid ? RichTextType.composing : RichTextType.text);
+  }) : type = type ?? (composing.isValid ? .composing : .text);
 
   @override
   late final RichTextType type;
@@ -114,9 +111,7 @@ class RichTextEditingDeltaReplacement extends TextEditingDeltaReplacement
     this.emote,
     this.id,
     this.rawText,
-  }) : type =
-           type ??
-           (composing.isValid ? RichTextType.composing : RichTextType.text);
+  }) : type = type ?? (composing.isValid ? .composing : .text);
 
   @override
   late final RichTextType type;
@@ -141,14 +136,14 @@ class RichTextItem {
 
   String get rawText => _rawText ?? text;
 
-  bool get isText => type == RichTextType.text;
+  bool get isText => type == .text;
 
-  bool get isComposing => type == RichTextType.composing;
+  bool get isComposing => type == .composing;
 
   bool get isRich => !isText && !isComposing;
 
   RichTextItem({
-    this.type = RichTextType.text,
+    this.type = .text,
     required this.text,
     this._rawText,
     required this.range,
@@ -159,7 +154,7 @@ class RichTextItem {
   RichTextItem.fromStart(
     this.text, {
     this._rawText,
-    this.type = RichTextType.text,
+    this.type = .text,
     this.emote,
     this.id,
   }) : range = TextRange(start: 0, end: text.length);
@@ -591,7 +586,7 @@ class RichTextEditingController extends TextEditingController {
     }
     final buffer = StringBuffer();
     for (final e in items) {
-      if (e.type == RichTextType.at) {
+      if (e.type == .at) {
         buffer.write(e.text);
       } else {
         buffer.write(e.rawText);
@@ -743,22 +738,22 @@ class RichTextEditingController extends TextEditingController {
       style: style,
       children: items.map((e) {
         switch (e.type) {
-          case RichTextType.text:
+          case .text:
             return TextSpan(text: e.text);
-          case RichTextType.composing:
+          case .composing:
             composingStyle ??=
                 style?.merge(
                   const TextStyle(decoration: TextDecoration.underline),
                 ) ??
                 const TextStyle(decoration: TextDecoration.underline);
             if (composingRegionOutOfRange) {
-              e.type = RichTextType.text;
+              e.type = .text;
             }
             return TextSpan(
               text: e.text,
               style: composingRegionOutOfRange ? null : composingStyle,
             );
-          case RichTextType.at || RichTextType.common:
+          case .at || .common:
             richStyle ??= (style ?? const TextStyle()).copyWith(
               color: Theme.of(context).colorScheme.primary,
             );
@@ -766,7 +761,7 @@ class RichTextEditingController extends TextEditingController {
               text: e.text,
               style: richStyle,
             );
-          case RichTextType.emoji:
+          case .emoji:
             final emote = e.emote;
             if (emote != null) {
               return WidgetSpan(
@@ -777,14 +772,14 @@ class RichTextEditingController extends TextEditingController {
                     src: emote.url,
                     width: 22, // emote.width,
                     height: 22, // emote.height,
-                    type: ImageType.emote,
+                    type: .emote,
                     fit: BoxFit.contain,
                   ),
                 ),
               );
             }
             return TextSpan(text: e.text);
-          case RichTextType.vote:
+          case .vote:
             richStyle ??= (style ?? const TextStyle()).copyWith(
               color: Theme.of(context).colorScheme.primary,
             );
diff --git a/lib/common/widgets/image/network_img_layer.dart b/lib/common/widgets/image/network_img_layer.dart
index 602eb4118..6930603f4 100644
--- a/lib/common/widgets/image/network_img_layer.dart
+++ b/lib/common/widgets/image/network_img_layer.dart
@@ -37,8 +37,8 @@ class NetworkImgLayer extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final isEmote = type == ImageType.emote;
-    final isAvatar = type == ImageType.avatar;
+    final isEmote = type == .emote;
+    final isAvatar = type == .avatar;
     if (src?.isNotEmpty == true) {
       Widget child = _buildImage(context, isEmote: isEmote, isAvatar: isAvatar);
       if (isEmote) {
diff --git a/lib/common/widgets/pendant_avatar.dart b/lib/common/widgets/pendant_avatar.dart
index eab36391c..3fe4258e9 100644
--- a/lib/common/widgets/pendant_avatar.dart
+++ b/lib/common/widgets/pendant_avatar.dart
@@ -3,7 +3,6 @@ import 'package:PiliPlus/common/style.dart';
 import 'package:PiliPlus/common/widgets/extra_hittest_stack.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/models/common/avatar_badge_type.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:flutter/material.dart';
 
@@ -70,7 +69,7 @@ class PendantAvatar extends StatelessWidget {
       src: url,
       width: size,
       height: size,
-      type: ImageType.avatar,
+      type: .avatar,
     );
     if (onTap != null) {
       avatar = GestureDetector(
diff --git a/lib/common/widgets/video_card/video_card_v.dart b/lib/common/widgets/video_card/video_card_v.dart
index 1aee0e2ee..6608cd7f7 100644
--- a/lib/common/widgets/video_card/video_card_v.dart
+++ b/lib/common/widgets/video_card/video_card_v.dart
@@ -5,7 +5,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
 import 'package:PiliPlus/common/widgets/video_popup_menu.dart';
 import 'package:PiliPlus/http/search.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models/home/rcmd/result.dart';
 import 'package:PiliPlus/models/model_rec_video_item.dart';
 import 'package:PiliPlus/models_new/video/video_detail/dimension.dart';
@@ -232,13 +231,13 @@ class VideoCardV extends StatelessWidget {
     return Row(
       children: [
         StatWidget(
-          type: StatType.play,
+          type: .play,
           value: videoItem.stat.view,
         ),
         if (videoItem.goto != 'picture') ...[
           const SizedBox(width: 4),
           StatWidget(
-            type: StatType.danmaku,
+            type: .danmaku,
             value: videoItem.stat.danmu,
           ),
         ],
diff --git a/lib/http/dynamics.dart b/lib/http/dynamics.dart
index 2157cdb69..13f969e47 100644
--- a/lib/http/dynamics.dart
+++ b/lib/http/dynamics.dart
@@ -32,13 +32,13 @@ import 'package:dio/dio.dart';
 abstract final class DynamicsHttp {
   @pragma('vm:notify-debugger-on-exception')
   static Future<LoadingState<DynamicsDataModel>> followDynamic({
-    DynamicsTabType type = DynamicsTabType.all,
+    DynamicsTabType type = .all,
     String? offset,
     int? mid,
     Set<int>? tempBannedList,
   }) async {
     Map<String, dynamic> data = {
-      if (type == DynamicsTabType.up)
+      if (type == .up)
         'host_mid': mid
       else ...{
         'type': type.name,
diff --git a/lib/http/search.dart b/lib/http/search.dart
index b7d0f7031..1ed87c6a9 100644
--- a/lib/http/search.dart
+++ b/lib/http/search.dart
@@ -100,19 +100,19 @@ abstract final class SearchHttp {
         dynamic data;
         try {
           switch (searchType) {
-            case SearchType.video:
+            case .video:
               data = SearchVideoData.fromJson(dataData);
               break;
-            case SearchType.live_room:
+            case .live_room:
               data = SearchLiveData.fromJson(dataData);
               break;
-            case SearchType.bili_user:
+            case .bili_user:
               data = SearchUserData.fromJson(dataData);
               break;
-            case SearchType.media_bangumi || SearchType.media_ft:
+            case .media_bangumi || .media_ft:
               data = SearchPgcData.fromJson(dataData);
               break;
-            case SearchType.article:
+            case .article:
               data = SearchArticleData.fromJson(dataData);
               break;
             // default:
diff --git a/lib/models/common/image_preview_type.dart b/lib/models/common/image_preview_type.dart
index d0649bed3..ae588cf9f 100644
--- a/lib/models/common/image_preview_type.dart
+++ b/lib/models/common/image_preview_type.dart
@@ -10,7 +10,7 @@ class SourceModel {
   final num? size;
 
   const SourceModel({
-    this.sourceType = SourceType.networkImage,
+    this.sourceType = .networkImage,
     required this.url,
     this.liveUrl,
     this.width,
diff --git a/lib/models/common/sponsor_block/segment_model.dart b/lib/models/common/sponsor_block/segment_model.dart
index b723db640..db0b03a11 100644
--- a/lib/models/common/sponsor_block/segment_model.dart
+++ b/lib/models/common/sponsor_block/segment_model.dart
@@ -26,9 +26,9 @@ class SegmentModel implements Comparable<SegmentModel> {
     SkipType skipType;
     if (config != null) {
       skipType = config.blockSettings[segmentType.index].second;
-      if (skipType != SkipType.showOnly) {
+      if (skipType != .showOnly) {
         if (segment.isEq || segment.length < 0) {
-          skipType = SkipType.showOnly;
+          skipType = .showOnly;
         }
       }
     } else {
diff --git a/lib/models/common/sponsor_block/segment_type.dart b/lib/models/common/sponsor_block/segment_type.dart
index 1ca84f600..606574a22 100644
--- a/lib/models/common/sponsor_block/segment_type.dart
+++ b/lib/models/common/sponsor_block/segment_type.dart
@@ -11,9 +11,9 @@ enum SegmentType {
     '付费推广、推荐和直接广告。不是自我推广或免费提及他们喜欢的商品/创作者/网站/产品。',
     Color(0xFF00d400),
     [
-      ActionType.skip,
-      ActionType.mute,
-      ActionType.full,
+      .skip,
+      .mute,
+      .full,
     ],
   ),
   selfpromo(
@@ -22,9 +22,9 @@ enum SegmentType {
     '类似于 “赞助广告” ，但无报酬或是自我推广。包括有关商品、捐赠的部分或合作者的信息。',
     Color(0xFFffff00),
     [
-      ActionType.skip,
-      ActionType.mute,
-      ActionType.full,
+      .skip,
+      .mute,
+      .full,
     ],
   ),
   exclusive_access(
@@ -32,7 +32,7 @@ enum SegmentType {
     '品牌合作',
     '仅用于对整个视频进行标记。适用于展示UP主免费或获得补贴后使用的产品、服务或场地的视频。',
     Color(0xFF008a5c),
-    [ActionType.full],
+    [.full],
   ),
   interaction(
     '三连/互动提醒',
@@ -40,8 +40,8 @@ enum SegmentType {
     '视频中间简短提醒观众来一键三连或关注。 如果片段较长，或是有具体内容，则应分类为自我推广。',
     Color(0xFFcc00ff),
     [
-      ActionType.skip,
-      ActionType.mute,
+      .skip,
+      .mute,
     ],
   ),
   poi_highlight(
@@ -49,7 +49,7 @@ enum SegmentType {
     '精彩时刻',
     '大部分人都在寻找的空降时间。类似于“封面在12:34”的评论。',
     Color(0xFFff1684),
-    [ActionType.poi],
+    [.poi],
   ),
   intro(
     '过场/开场动画',
@@ -57,8 +57,8 @@ enum SegmentType {
     '没有实际内容的间隔片段。可以是暂停、静态帧或重复动画。不适用于包含内容的过场。',
     Color(0xFF00ffff),
     [
-      ActionType.skip,
-      ActionType.mute,
+      .skip,
+      .mute,
     ],
   ),
   outro(
@@ -67,8 +67,8 @@ enum SegmentType {
     '致谢画面或片尾画面。不包含内容的结尾。',
     Color(0xFF0202ed),
     [
-      ActionType.skip,
-      ActionType.mute,
+      .skip,
+      .mute,
     ],
   ),
   preview(
@@ -77,8 +77,8 @@ enum SegmentType {
     '展示此视频或同系列视频将出现的画面集锦，片段中所有内容都将在之后的正片中再次出现。',
     Color(0xFF008fd6),
     [
-      ActionType.skip,
-      ActionType.mute,
+      .skip,
+      .mute,
     ],
   ),
   padding(
@@ -86,7 +86,7 @@ enum SegmentType {
     '填充内容',
     '搬运视频片头片尾的纯粹填充内容，如黑屏或无关画面，与视频主体内容无实际意义和关联。',
     Color(0xFF222222),
-    [ActionType.skip],
+    [.skip],
   ),
   filler(
     '离题闲聊/玩笑',
@@ -94,8 +94,8 @@ enum SegmentType {
     "仅作为填充内容或增添趣味而添加的离题片段，这些内容对理解视频的主要内容并非必需。这不包括提供背景信息或上下文的片段。这是一个非常激进的分类，适用于当你不想看'娱乐性'内容的时候。",
     Color(0xFF7300FF),
     [
-      ActionType.skip,
-      ActionType.mute,
+      .skip,
+      .mute,
     ],
   ),
   music_offtopic(
@@ -103,7 +103,7 @@ enum SegmentType {
     '非音乐',
     '仅用于音乐视频。此分类只能用于音乐视频中未包括于其他分类的部分。',
     Color(0xFFff9900),
-    [ActionType.skip],
+    [.skip],
   ),
   ;
 
@@ -125,32 +125,32 @@ enum SegmentType {
 
 // List<SegmentType> _actionType2SegmentType(ActionType actionType) {
 //   return switch (actionType) {
-//     ActionType.skip => [
-//         SegmentType.sponsor,
-//         SegmentType.selfpromo,
-//         SegmentType.interaction,
-//         SegmentType.intro,
-//         SegmentType.outro,
-//         SegmentType.preview,
-//         SegmentType.filler,
+//     .skip => [
+//         .sponsor,
+//         .selfpromo,
+//         .interaction,
+//         .intro,
+//         .outro,
+//         .preview,
+//         .filler,
 //       ],
-//     ActionType.mute => [
-//         SegmentType.sponsor,
-//         SegmentType.selfpromo,
-//         SegmentType.interaction,
-//         SegmentType.intro,
-//         SegmentType.outro,
-//         SegmentType.preview,
-//         SegmentType.music_offtopic,
-//         SegmentType.filler,
+//     .mute => [
+//         .sponsor,
+//         .selfpromo,
+//         .interaction,
+//         .intro,
+//         .outro,
+//         .preview,
+//         .music_offtopic,
+//         .filler,
 //       ],
-//     ActionType.full => [
-//         SegmentType.sponsor,
-//         SegmentType.selfpromo,
-//         SegmentType.exclusive_access,
+//     .full => [
+//         .sponsor,
+//         .selfpromo,
+//         .exclusive_access,
 //       ],
-//     ActionType.poi => [
-//         SegmentType.poi_highlight,
+//     .poi => [
+//         .poi_highlight,
 //       ],
 //   };
 // }
diff --git a/lib/models/common/theme/theme_type.dart b/lib/models/common/theme/theme_type.dart
index 751695bfd..690cde8c5 100644
--- a/lib/models/common/theme/theme_type.dart
+++ b/lib/models/common/theme/theme_type.dart
@@ -11,14 +11,14 @@ enum ThemeType {
   const ThemeType(this.desc);
 
   ThemeMode get toThemeMode => switch (this) {
-    ThemeType.light => ThemeMode.light,
-    ThemeType.dark => ThemeMode.dark,
-    ThemeType.system => ThemeMode.system,
+    .light => ThemeMode.light,
+    .dark => ThemeMode.dark,
+    .system => ThemeMode.system,
   };
 
   Icon get icon => switch (this) {
-    ThemeType.light => const Icon(MdiIcons.weatherSunny),
-    ThemeType.dark => const Icon(MdiIcons.weatherNight),
-    ThemeType.system => const Icon(MdiIcons.themeLightDark),
+    .light => const Icon(MdiIcons.weatherSunny),
+    .dark => const Icon(MdiIcons.weatherNight),
+    .system => const Icon(MdiIcons.themeLightDark),
   };
 }
diff --git a/lib/pages/article/view.dart b/lib/pages/article/view.dart
index 4dab764db..87b24ea2a 100644
--- a/lib/pages/article/view.dart
+++ b/lib/pages/article/view.dart
@@ -6,9 +6,7 @@ import 'package:PiliPlus/common/widgets/flutter/refresh_indicator.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models/common/image_preview_type.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models/dynamics/result.dart' show DynamicStat;
 import 'package:PiliPlus/pages/article/controller.dart';
 import 'package:PiliPlus/pages/article/widgets/article_ops.dart';
@@ -343,7 +341,7 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
                             () => PBadge(
                               top: 12,
                               right: 12,
-                              type: PBadgeType.gray,
+                              type: .gray,
                               text: '${controller.topIndex.value + 1}/$length',
                             ),
                           ),
@@ -374,7 +372,7 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
                         NetworkImgLayer(
                           width: 40,
                           height: 40,
-                          type: ImageType.avatar,
+                          type: .avatar,
                           src: controller.summary.author?.face,
                         ),
                         const SizedBox(width: 10),
diff --git a/lib/pages/article/widgets/opus_content.dart b/lib/pages/article/widgets/opus_content.dart
index e632bdbb7..fac69a2a5 100644
--- a/lib/pages/article/widgets/opus_content.dart
+++ b/lib/pages/article/widgets/opus_content.dart
@@ -8,7 +8,6 @@ import 'package:PiliPlus/common/widgets/image_grid/image_grid_view.dart';
 import 'package:PiliPlus/common/widgets/image_viewer/hero.dart';
 import 'package:PiliPlus/http/constants.dart';
 import 'package:PiliPlus/models/common/image_preview_type.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models/dynamics/article_content_model.dart'
     show ArticleContentModel, Rich, Style, Word, Node;
 import 'package:PiliPlus/models/dynamics/result.dart';
@@ -58,7 +57,7 @@ class OpusContent extends StatelessWidget {
                 width: size,
                 height: size,
                 src: emoji.url,
-                type: ImageType.emote,
+                type: .emote,
               ),
             );
           default:
diff --git a/lib/pages/article_list/view.dart b/lib/pages/article_list/view.dart
index 5ab69cc68..9d135be14 100644
--- a/lib/pages/article_list/view.dart
+++ b/lib/pages/article_list/view.dart
@@ -3,7 +3,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
 import 'package:PiliPlus/http/constants.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/article/article_list/article.dart';
 import 'package:PiliPlus/models_new/article/article_list/list.dart';
 import 'package:PiliPlus/pages/article_list/controller.dart';
@@ -154,7 +153,7 @@ class _ArticleListPageState extends State<ArticleListPage> with GridMixin {
                             width: 30,
                             height: 30,
                             src: _controller.author!.face,
-                            type: ImageType.avatar,
+                            type: .avatar,
                           ),
                           Flexible(child: Text(_controller.author!.name!)),
                         ],
diff --git a/lib/pages/article_list/widgets/item.dart b/lib/pages/article_list/widgets/item.dart
index 40018e4a4..cd33cde6f 100644
--- a/lib/pages/article_list/widgets/item.dart
+++ b/lib/pages/article_list/widgets/item.dart
@@ -1,7 +1,6 @@
 import 'package:PiliPlus/common/style.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models_new/article/article_list/article.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -85,15 +84,15 @@ class ArticleListItem extends StatelessWidget {
                         StatWidget(
                           value: item.stats?.view,
                           color: theme.colorScheme.outline,
-                          type: StatType.view,
+                          type: .view,
                         ),
                         StatWidget(
-                          type: StatType.like,
+                          type: .like,
                           value: item.stats?.like,
                           color: theme.colorScheme.outline,
                         ),
                         StatWidget(
-                          type: StatType.reply,
+                          type: .reply,
                           value: item.stats?.reply,
                           color: theme.colorScheme.outline,
                         ),
diff --git a/lib/pages/audio/view.dart b/lib/pages/audio/view.dart
index a16c61093..7f4ae5302 100644
--- a/lib/pages/audio/view.dart
+++ b/lib/pages/audio/view.dart
@@ -12,7 +12,6 @@ import 'package:PiliPlus/common/widgets/progress_bar/segment_progress_bar.dart';
 import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/grpc/bilibili/app/listener/v1.pb.dart';
 import 'package:PiliPlus/models/common/image_preview_type.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/pages/audio/controller.dart';
 import 'package:PiliPlus/pages/audio/volume_button.dart';
 import 'package:PiliPlus/pages/video/introduction/ugc/widgets/action_item.dart';
@@ -937,7 +936,7 @@ class _AudioPageState extends State<AudioPage> {
                                 src: audioItem.owner.avatar,
                                 width: 22,
                                 height: 22,
-                                type: ImageType.avatar,
+                                type: .avatar,
                               ),
                             Text(
                               audioItem.owner.name,
diff --git a/lib/pages/blacklist/view.dart b/lib/pages/blacklist/view.dart
index 433120caa..32377ee61 100644
--- a/lib/pages/blacklist/view.dart
+++ b/lib/pages/blacklist/view.dart
@@ -4,7 +4,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
 import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/blacklist/list.dart';
 import 'package:PiliPlus/pages/blacklist/controller.dart';
 import 'package:PiliPlus/utils/date_utils.dart';
@@ -85,7 +84,7 @@ class _BlackListPageState extends State<BlackListPage> {
                     leading: NetworkImgLayer(
                       width: 45,
                       height: 45,
-                      type: ImageType.avatar,
+                      type: .avatar,
                       src: item.face,
                     ),
                     title: Text(
diff --git a/lib/pages/common/publish/common_publish_page.dart b/lib/pages/common/publish/common_publish_page.dart
index b7cebd949..5b410b5b3 100644
--- a/lib/pages/common/publish/common_publish_page.dart
+++ b/lib/pages/common/publish/common_publish_page.dart
@@ -29,7 +29,7 @@ abstract class CommonPublishPageState<T extends CommonPublishPage>
   late final controller = ChatBottomPanelContainerController<PanelType>();
   TextEditingController get editController;
 
-  final Rx<PanelType> panelType = PanelType.none.obs;
+  final Rx<PanelType> panelType = Rx(.none);
   late final RxBool readOnly = false.obs;
   late final RxBool enablePublish = false.obs;
 
@@ -80,8 +80,7 @@ abstract class CommonPublishPageState<T extends CommonPublishPage>
     if (state == AppLifecycleState.resumed) {
       if (mounted &&
           widget.autofocus &&
-          (panelType.value == PanelType.keyboard ||
-              panelType.value == PanelType.none)) {
+          (panelType.value == .keyboard || panelType.value == .none)) {
         controller.restoreChatPanel();
         WidgetsBinding.instance.addPostFrameCallback((_) {
           if (focusNode.hasFocus) {
@@ -101,13 +100,13 @@ abstract class CommonPublishPageState<T extends CommonPublishPage>
   }
 
   void updatePanelType(PanelType type) {
-    final isSwitchToKeyboard = PanelType.keyboard == type;
+    final isSwitchToKeyboard = type == .keyboard;
     bool isUpdated = false;
     switch (type) {
-      case PanelType.keyboard:
+      case .keyboard:
         updateInputView(isReadOnly: false);
         break;
-      case PanelType.emoji || PanelType.more:
+      case .emoji || .more:
         isUpdated = updateInputView(isReadOnly: true);
         break;
       default:
@@ -116,13 +115,9 @@ abstract class CommonPublishPageState<T extends CommonPublishPage>
 
     void updatePanelTypeFunc() {
       controller.updatePanelType(
-        isSwitchToKeyboard
-            ? ChatBottomPanelType.keyboard
-            : ChatBottomPanelType.other,
+        isSwitchToKeyboard ? .keyboard : .other,
         data: type,
-        forceHandleFocus: isSwitchToKeyboard
-            ? ChatBottomHandleFocus.requestFocus
-            : ChatBottomHandleFocus.unfocus,
+        forceHandleFocus: isSwitchToKeyboard ? .requestFocus : .unfocus,
       );
     }
 
@@ -143,8 +138,8 @@ abstract class CommonPublishPageState<T extends CommonPublishPage>
       focusNode.unfocus();
     }
     updateInputView(isReadOnly: false);
-    if (ChatBottomPanelType.none == controller.currentPanelType) return;
-    controller.updatePanelType(ChatBottomPanelType.none);
+    if (controller.currentPanelType == .none) return;
+    controller.updatePanelType(.none);
   }
 
   bool updateInputView({
@@ -178,9 +173,9 @@ abstract class CommonPublishPageState<T extends CommonPublishPage>
       otherPanelWidget: (type) {
         if (type == null) return const SizedBox.shrink();
         switch (type) {
-          case PanelType.emoji:
+          case .emoji:
             return buildEmojiPickerPanel();
-          case PanelType.more:
+          case .more:
             return buildMorePanel(theme);
           default:
             return const SizedBox.shrink();
@@ -188,13 +183,13 @@ abstract class CommonPublishPageState<T extends CommonPublishPage>
       },
       onPanelTypeChange: (panelType, data) {
         switch (panelType) {
-          case ChatBottomPanelType.none:
-            this.panelType.value = PanelType.none;
+          case .none:
+            this.panelType.value = .none;
             break;
-          case ChatBottomPanelType.keyboard:
-            this.panelType.value = PanelType.keyboard;
+          case .keyboard:
+            this.panelType.value = .keyboard;
             break;
-          case ChatBottomPanelType.other:
+          case .other:
             if (data == null) return;
             this.panelType.value = data;
             break;
diff --git a/lib/pages/common/publish/common_rich_text_pub_page.dart b/lib/pages/common/publish/common_rich_text_pub_page.dart
index 7d1cffbfd..92148268e 100644
--- a/lib/pages/common/publish/common_rich_text_pub_page.dart
+++ b/lib/pages/common/publish/common_rich_text_pub_page.dart
@@ -6,7 +6,6 @@ import 'package:PiliPlus/common/widgets/flutter/text_field/controller.dart';
 import 'package:PiliPlus/common/widgets/flutter/text_field/text_field.dart';
 import 'package:PiliPlus/http/msg.dart';
 import 'package:PiliPlus/models/common/image_preview_type.dart';
-import 'package:PiliPlus/models/common/publish_panel_type.dart';
 import 'package:PiliPlus/models/dynamics/result.dart'
     show PicModel, FilePicModel, OpusPicModel;
 import 'package:PiliPlus/models_new/dynamic/dyn_mention/item.dart';
@@ -255,7 +254,7 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
       final isTextEmote = width == null;
       onInsertText(
         isTextEmote ? emote.text! : '\uFFFC',
-        RichTextType.emoji,
+        .emoji,
         rawText: emote.text!,
         emote: isTextEmote
             ? null
@@ -268,7 +267,7 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
     } else if (emote is Emoticon) {
       onInsertText(
         '\uFFFC',
-        RichTextType.emoji,
+        .emoji,
         rawText: emote.emoji!,
         emote: Emote(
           url: emote.url!,
@@ -284,13 +283,13 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
     final list = <Map<String, dynamic>>[];
     for (final e in editController.items) {
       switch (e.type) {
-        case RichTextType.text || RichTextType.composing || RichTextType.common:
+        case .text || .composing || .common:
           list.add({
             "raw_text": e.text,
             "type": 1,
             "biz_id": "",
           });
-        case RichTextType.at:
+        case .at:
           list
             ..add({
               "raw_text": '@${e.rawText}',
@@ -302,13 +301,13 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
               "type": 1,
               "biz_id": "",
             });
-        case RichTextType.emoji:
+        case .emoji:
           list.add({
             "raw_text": e.rawText,
             "type": 9,
             "biz_id": "",
           });
-        case RichTextType.vote:
+        case .vote:
           list
             ..add({
               "raw_text": e.rawText,
@@ -350,7 +349,7 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
   void _onInsertUser(MentionItem e, bool fromClick) {
     onInsertText(
       '@${e.name} ',
-      RichTextType.at,
+      .at,
       rawText: e.name,
       id: e.uid,
       fromClick: fromClick,
@@ -378,7 +377,7 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
       TextEditingDelta delta;
 
       if (selection.isCollapsed) {
-        if (type == RichTextType.at && fromClick == false) {
+        if (type == .at && fromClick == false) {
           delta = RichTextEditingDeltaReplacement(
             oldText: oldValue.text,
             replacementText: text,
@@ -465,14 +464,14 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
 
   Widget get emojiBtn => Obx(
     () {
-      final isEmoji = panelType.value == PanelType.emoji;
+      final isEmoji = panelType.value == .emoji;
       return ToolbarIconButton(
         tooltip: isEmoji ? '输入' : '表情',
         onPressed: () {
           if (isEmoji) {
-            updatePanelType(PanelType.keyboard);
+            updatePanelType(.keyboard);
           } else {
-            updatePanelType(PanelType.emoji);
+            updatePanelType(.emoji);
           }
         },
         icon: isEmoji
@@ -492,14 +491,14 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
 
   Widget get moreBtn => Obx(
     () {
-      final isMore = panelType.value == PanelType.more;
+      final isMore = panelType.value == .more;
       return ToolbarIconButton(
         tooltip: isMore ? '输入' : '更多',
         onPressed: () {
           if (isMore) {
-            updatePanelType(PanelType.keyboard);
+            updatePanelType(.keyboard);
           } else {
-            updatePanelType(PanelType.more);
+            updatePanelType(.more);
           }
         },
         icon: isMore
diff --git a/lib/pages/download/detail/widgets/item.dart b/lib/pages/download/detail/widgets/item.dart
index 46501d93d..30ecf8df2 100644
--- a/lib/pages/download/detail/widgets/item.dart
+++ b/lib/pages/download/detail/widgets/item.dart
@@ -6,7 +6,6 @@ import 'package:PiliPlus/common/widgets/dialog/dialog.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/progress_bar/video_progress_indicator.dart';
 import 'package:PiliPlus/common/widgets/select_mask.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models/common/video/source_type.dart';
 import 'package:PiliPlus/models/common/video/video_quality.dart';
 import 'package:PiliPlus/models_new/download/bili_download_entry_info.dart';
@@ -207,7 +206,7 @@ class DetailItem extends StatelessWidget {
                       text: VideoQuality.fromCode(videoQuality).shortDesc,
                       right: 6.0,
                       top: 6.0,
-                      type: PBadgeType.gray,
+                      type: .gray,
                     ),
                   if (progress != null)
                     ListenableBuilder(
@@ -241,7 +240,7 @@ class DetailItem extends StatelessWidget {
                                             )}',
                                   right: 6,
                                   bottom: 7,
-                                  type: PBadgeType.gray,
+                                  type: .gray,
                                 ),
                               ],
                             ),
@@ -253,7 +252,7 @@ class DetailItem extends StatelessWidget {
                           ),
                           right: 6.0,
                           bottom: 7.0,
-                          type: PBadgeType.gray,
+                          type: .gray,
                         );
                       },
                     )
@@ -264,7 +263,7 @@ class DetailItem extends StatelessWidget {
                       ),
                       right: 6,
                       bottom: 7,
-                      type: PBadgeType.gray,
+                      type: .gray,
                     ),
                   Positioned.fill(
                     child: selectMask(
diff --git a/lib/pages/download/view.dart b/lib/pages/download/view.dart
index b0c7a6c03..a9fbd109d 100644
--- a/lib/pages/download/view.dart
+++ b/lib/pages/download/view.dart
@@ -7,7 +7,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
 import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/common/widgets/select_mask.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models_new/download/download_info.dart';
 import 'package:PiliPlus/pages/download/controller.dart';
 import 'package:PiliPlus/pages/download/detail/view.dart';
@@ -325,7 +324,7 @@ class _DownloadPageState extends State<DownloadPage> with GridMixin {
                     right: 6.0,
                     bottom: 6.0,
                     isBold: false,
-                    type: PBadgeType.gray,
+                    type: .gray,
                   ),
                   if (pageInfo.seasonType case final pgcType?)
                     PBadge(
diff --git a/lib/pages/dynamics/view.dart b/lib/pages/dynamics/view.dart
index 28ea5a802..f40653ddd 100644
--- a/lib/pages/dynamics/view.dart
+++ b/lib/pages/dynamics/view.dart
@@ -104,7 +104,7 @@ class _DynamicsPageState extends State<DynamicsPage>
     );
 
     switch (upPanelPosition) {
-      case UpPanelPosition.top:
+      case .top:
         child = Column(
           children: [
             upPanelPart(theme, isTop: true),
@@ -112,7 +112,7 @@ class _DynamicsPageState extends State<DynamicsPage>
           ],
         );
         actions = [_createDynamicBtn(theme)];
-      case UpPanelPosition.leftFixed:
+      case .leftFixed:
         child = Row(
           children: [
             upPanelPart(theme),
@@ -120,7 +120,7 @@ class _DynamicsPageState extends State<DynamicsPage>
           ],
         );
         actions = [_createDynamicBtn(theme)];
-      case UpPanelPosition.rightFixed:
+      case .rightFixed:
         child = Row(
           children: [
             Expanded(child: child),
diff --git a/lib/pages/dynamics/widgets/live_panel_sub.dart b/lib/pages/dynamics/widgets/live_panel_sub.dart
index 7d863dbf4..a282e7f6a 100644
--- a/lib/pages/dynamics/widgets/live_panel_sub.dart
+++ b/lib/pages/dynamics/widgets/live_panel_sub.dart
@@ -2,7 +2,6 @@ import 'package:PiliPlus/common/assets.dart';
 import 'package:PiliPlus/common/style.dart';
 import 'package:PiliPlus/common/widgets/badge.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models/dynamics/result.dart';
 import 'package:flutter/material.dart';
 
@@ -51,7 +50,7 @@ Widget livePanelSub(
               top: 6,
               right: 65,
               fontSize: 10.5,
-              type: PBadgeType.gray,
+              type: .gray,
             ),
             if (live.liveStatus == 1)
               Positioned(
diff --git a/lib/pages/dynamics/widgets/live_rcmd_panel.dart b/lib/pages/dynamics/widgets/live_rcmd_panel.dart
index a455936d7..a50e44ccf 100644
--- a/lib/pages/dynamics/widgets/live_rcmd_panel.dart
+++ b/lib/pages/dynamics/widgets/live_rcmd_panel.dart
@@ -2,7 +2,6 @@ import 'package:PiliPlus/common/assets.dart';
 import 'package:PiliPlus/common/style.dart';
 import 'package:PiliPlus/common/widgets/badge.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models/dynamics/result.dart';
 import 'package:flutter/material.dart';
 
@@ -45,7 +44,7 @@ Widget liveRcmdPanel(
               top: 6,
               right: 65,
               fontSize: 10.5,
-              type: PBadgeType.gray,
+              type: .gray,
             ),
             if (liveRcmd.liveStatus == 1)
               Positioned(
@@ -63,7 +62,7 @@ Widget liveRcmdPanel(
                 text: '直播结束',
                 top: 6,
                 right: 6,
-                type: PBadgeType.gray,
+                type: .gray,
               ),
             if (liveRcmd.areaName case final areaName?)
               Positioned(
diff --git a/lib/pages/dynamics/widgets/rich_node_panel.dart b/lib/pages/dynamics/widgets/rich_node_panel.dart
index 3bc6d1f68..7e56220f4 100644
--- a/lib/pages/dynamics/widgets/rich_node_panel.dart
+++ b/lib/pages/dynamics/widgets/rich_node_panel.dart
@@ -8,7 +8,6 @@ import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/search.dart';
 import 'package:PiliPlus/models/common/image_preview_type.dart'
     show SourceModel;
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models/dynamics/result.dart';
 import 'package:PiliPlus/pages/dynamics/widgets/vote.dart';
 import 'package:PiliPlus/utils/app_scheme.dart';
@@ -170,7 +169,7 @@ TextSpan? richNode(
               WidgetSpan(
                 child: NetworkImgLayer(
                   src: i.emoji!.url,
-                  type: ImageType.emote,
+                  type: .emote,
                   width: size,
                   height: size,
                 ),
diff --git a/lib/pages/dynamics/widgets/up_panel.dart b/lib/pages/dynamics/widgets/up_panel.dart
index fad16193e..cefef163d 100644
--- a/lib/pages/dynamics/widgets/up_panel.dart
+++ b/lib/pages/dynamics/widgets/up_panel.dart
@@ -1,7 +1,5 @@
 import 'package:PiliPlus/common/assets.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
-import 'package:PiliPlus/models/common/dynamic/up_panel_position.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models/dynamics/up.dart';
 import 'package:PiliPlus/pages/dynamics/controller.dart';
 import 'package:PiliPlus/pages/live_follow/view.dart';
@@ -25,7 +23,7 @@ class UpPanel extends StatefulWidget {
 
 class _UpPanelState extends State<UpPanel> {
   late final controller = widget.dynamicsController;
-  late final isTop = controller.upPanelPosition == UpPanelPosition.top;
+  late final isTop = controller.upPanelPosition == .top;
 
   void toFollowPage() => Get.to(const LiveFollowPage());
 
@@ -171,7 +169,7 @@ class _UpPanelState extends State<UpPanel> {
           width: 38,
           height: 38,
           src: data.face,
-          type: ImageType.avatar,
+          type: .avatar,
         ),
       );
       if (isLive) {
diff --git a/lib/pages/dynamics/widgets/video_panel.dart b/lib/pages/dynamics/widgets/video_panel.dart
index 2f40782f6..e6cef352c 100644
--- a/lib/pages/dynamics/widgets/video_panel.dart
+++ b/lib/pages/dynamics/widgets/video_panel.dart
@@ -3,7 +3,6 @@ import 'package:PiliPlus/common/assets.dart';
 import 'package:PiliPlus/common/style.dart';
 import 'package:PiliPlus/common/widgets/badge.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models/dynamics/result.dart';
 import 'package:PiliPlus/utils/num_utils.dart';
 import 'package:flutter/material.dart';
@@ -65,8 +64,8 @@ Widget videoSeasonWidget(
                   bottom: null,
                   left: null,
                   type: switch (badge) {
-                    '充电专属' => PBadgeType.error,
-                    _ => PBadgeType.primary,
+                    '充电专属' => .error,
+                    _ => .primary,
                   },
                 ),
               Positioned(
diff --git a/lib/pages/dynamics/widgets/vote.dart b/lib/pages/dynamics/widgets/vote.dart
index 2b267c425..ad5224452 100644
--- a/lib/pages/dynamics/widgets/vote.dart
+++ b/lib/pages/dynamics/widgets/vote.dart
@@ -6,7 +6,6 @@ import 'package:PiliPlus/common/widgets/dialog/report.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/http/dynamics.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models/common/image_preview_type.dart';
 import 'package:PiliPlus/models/dynamics/vote_model.dart';
 import 'package:PiliPlus/models_new/followee_votes/vote.dart';
@@ -393,7 +392,7 @@ class _VotePanelState extends State<VotePanel> {
                       PBadge(
                         right: 6,
                         bottom: 8,
-                        type: PBadgeType.primary,
+                        type: .primary,
                         padding: const EdgeInsets.symmetric(
                           horizontal: 3,
                           vertical: 1,
diff --git a/lib/pages/dynamics_create/view.dart b/lib/pages/dynamics_create/view.dart
index 8839b319e..a14b06bc6 100644
--- a/lib/pages/dynamics_create/view.dart
+++ b/lib/pages/dynamics_create/view.dart
@@ -11,7 +11,6 @@ import 'package:PiliPlus/common/widgets/pair.dart';
 import 'package:PiliPlus/common/widgets/time_picker.dart';
 import 'package:PiliPlus/http/dynamics.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/publish_panel_type.dart';
 import 'package:PiliPlus/models/common/reply/reply_option_type.dart';
 import 'package:PiliPlus/models/dynamics/result.dart' show PicModel;
 import 'package:PiliPlus/models/dynamics/vote_model.dart';
@@ -131,7 +130,7 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
   Widget build(BuildContext context) {
     final ThemeData theme = Theme.of(context);
     return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
+      crossAxisAlignment: .start,
       children: [
         _buildAppBar(theme),
         Expanded(
@@ -172,7 +171,7 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
                                 ? const EdgeInsets.symmetric(vertical: 12)
                                 : const EdgeInsets.all(12),
                             visualDensity: VisualDensity.compact,
-                            tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                            tapTargetSize: .shrinkWrap,
                           ),
                           onPressed: _onSelectTopic,
                           child: Text.rich(
@@ -257,7 +256,7 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
                     Obx(() => _buildPubTimeWidget),
                     Column(
                       mainAxisSize: MainAxisSize.min,
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                      crossAxisAlignment: .start,
                       children: [
                         Obx(() => _buildReplyOptionWidget(theme)),
                         const SizedBox(height: 5),
@@ -363,11 +362,8 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
             () => FilledButton.tonal(
               onPressed: enablePublish.value ? onPublishThrottle : null,
               style: FilledButton.styleFrom(
-                tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                padding: const EdgeInsets.symmetric(
-                  horizontal: 20,
-                  vertical: 10,
-                ),
+                tapTargetSize: .shrinkWrap,
+                padding: const .symmetric(horizontal: 20, vertical: 10),
                 visualDensity: VisualDensity.compact,
               ),
               child: Text(_publishTime.value == null ? '发布' : '定时发布'),
@@ -655,7 +651,7 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
     onPressed: () async {
       controller.keepChatPanel();
       final voteItem = editController.items.firstWhereOrNull(
-        (e) => e.type == RichTextType.vote,
+        (e) => e.type == .vote,
       );
       final voteInfo = await Navigator.of(context).push<VoteInfo>(
         GetPageRoute(
@@ -677,7 +673,7 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
             replacedRange: range,
             selection: selection,
             composing: TextRange.empty,
-            type: RichTextType.vote,
+            type: .vote,
             id: voteInfo.voteId.toString(),
             rawText: voteInfo.title,
           );
@@ -688,11 +684,11 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
         } else {
           onInsertText(
             '我发起了一个投票',
-            RichTextType.text,
+            .text,
           );
           onInsertText(
             ' ${voteInfo.title} ',
-            RichTextType.vote,
+            .vote,
             rawText: voteInfo.title,
             id: voteInfo.voteId.toString(),
           );
@@ -708,7 +704,7 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
   Widget _buildEditWidget(ThemeData theme) => Listener(
     onPointerUp: (event) {
       if (readOnly.value) {
-        updatePanelType(PanelType.keyboard);
+        updatePanelType(.keyboard);
       }
     },
     child: Obx(
@@ -853,7 +849,7 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
                 padding: const EdgeInsets.fromLTRB(12, 12, 30, 12),
                 child: Column(
                   spacing: 3,
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  crossAxisAlignment: .stretch,
                   children: [
                     Text('直播预约: ${reserveCard.title}'),
                     Text(
diff --git a/lib/pages/dynamics_mention/widgets/item.dart b/lib/pages/dynamics_mention/widgets/item.dart
index e82f7ab58..5e5df8f8c 100644
--- a/lib/pages/dynamics_mention/widgets/item.dart
+++ b/lib/pages/dynamics_mention/widgets/item.dart
@@ -1,5 +1,4 @@
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/dynamic/dyn_mention/item.dart';
 import 'package:PiliPlus/utils/num_utils.dart';
 import 'package:flutter/material.dart';
@@ -28,7 +27,7 @@ class DynMentionItem extends StatelessWidget {
           src: item.face,
           width: 42,
           height: 42,
-          type: ImageType.avatar,
+          type: .avatar,
         ),
         title: Text(
           item.name!,
diff --git a/lib/pages/dynamics_repost/view.dart b/lib/pages/dynamics_repost/view.dart
index cc8be2dab..273041419 100644
--- a/lib/pages/dynamics_repost/view.dart
+++ b/lib/pages/dynamics_repost/view.dart
@@ -3,7 +3,6 @@ import 'package:PiliPlus/common/widgets/flutter/text_field/text_field.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/http/dynamics.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/publish_panel_type.dart';
 import 'package:PiliPlus/models/dynamics/result.dart';
 import 'package:PiliPlus/pages/common/publish/common_rich_text_pub_page.dart';
 import 'package:PiliPlus/pages/dynamics_mention/controller.dart';
@@ -93,7 +92,7 @@ class _RepostPanelState extends CommonRichTextPubPageState<RepostPanel> {
     Widget page([ScrollController? scrollController]) => Column(
       key: _isMax ? _key : null,
       mainAxisSize: _isMax ? MainAxisSize.max : MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.start,
+      crossAxisAlignment: .start,
       children: [
         if (!_isMax) const SizedBox(height: 10),
         _buildAppBar(theme),
@@ -181,7 +180,7 @@ class _RepostPanelState extends CommonRichTextPubPageState<RepostPanel> {
           Expanded(
             child: Column(
               mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
+              crossAxisAlignment: .start,
               children: [
                 if (_uname?.isNotEmpty == true)
                   Text(
@@ -231,7 +230,7 @@ class _RepostPanelState extends CommonRichTextPubPageState<RepostPanel> {
   Widget _buildEditWidget(ThemeData theme) => Listener(
     onPointerUp: (event) {
       if (readOnly.value) {
-        updatePanelType(PanelType.keyboard);
+        updatePanelType(.keyboard);
       }
     },
     child: Obx(
@@ -322,11 +321,8 @@ class _RepostPanelState extends CommonRichTextPubPageState<RepostPanel> {
                 child: FilledButton.tonal(
                   onPressed: onPublishThrottle,
                   style: FilledButton.styleFrom(
-                    tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                    padding: const EdgeInsets.symmetric(
-                      horizontal: 20,
-                      vertical: 10,
-                    ),
+                    tapTargetSize: .shrinkWrap,
+                    padding: const .symmetric(horizontal: 20, vertical: 10),
                     visualDensity: VisualDensity.compact,
                   ),
                   child: Text(widget.rid != null ? '发布' : '转发'),
diff --git a/lib/pages/dynamics_tab/controller.dart b/lib/pages/dynamics_tab/controller.dart
index 724d188c0..fb81cf069 100644
--- a/lib/pages/dynamics_tab/controller.dart
+++ b/lib/pages/dynamics_tab/controller.dart
@@ -40,7 +40,7 @@ class DynamicsTabController
 
   @override
   Future<void> onRefresh() {
-    if (dynamicsType == DynamicsTabType.all) {
+    if (dynamicsType == .all) {
       mainController.setDynCount();
     }
     offset = '';
@@ -81,7 +81,7 @@ class DynamicsTabController
   }
 
   void onBlock(int index) {
-    if (dynamicsType != DynamicsTabType.up) {
+    if (dynamicsType != .up) {
       loadingState
         ..value.data!.removeAt(index)
         ..refresh();
diff --git a/lib/pages/dynamics_topic/view.dart b/lib/pages/dynamics_topic/view.dart
index 634ecf5ed..bc6969858 100644
--- a/lib/pages/dynamics_topic/view.dart
+++ b/lib/pages/dynamics_topic/view.dart
@@ -7,7 +7,6 @@ import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
 import 'package:PiliPlus/common/widgets/pair.dart';
 import 'package:PiliPlus/common/widgets/sliver/sliver_pinned_header.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/dynamic/dyn_topic_feed/item.dart';
 import 'package:PiliPlus/models_new/dynamic/dyn_topic_top/top_details.dart';
 import 'package:PiliPlus/pages/dynamics/widgets/dynamic_panel.dart';
@@ -202,7 +201,7 @@ class _DynTopicPageState extends State<DynTopicPage> with DynMixin {
                         width: 28,
                         height: 28,
                         src: response.topicCreator!.face!,
-                        type: ImageType.avatar,
+                        type: .avatar,
                       ),
                       Flexible(
                         child: Text(
diff --git a/lib/pages/emote/view.dart b/lib/pages/emote/view.dart
index 7b83a03e7..7ac668816 100644
--- a/lib/pages/emote/view.dart
+++ b/lib/pages/emote/view.dart
@@ -4,7 +4,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/emote/emote.dart';
 import 'package:PiliPlus/models_new/emote/package.dart';
 import 'package:PiliPlus/pages/emote/controller.dart';
@@ -99,7 +98,7 @@ class _EmotePanelState extends State<EmotePanel>
                                         src: item.url,
                                         width: size,
                                         height: size,
-                                        type: ImageType.emote,
+                                        type: .emote,
                                         fit: BoxFit.contain,
                                       ),
                               );
@@ -125,7 +124,7 @@ class _EmotePanelState extends State<EmotePanel>
                                           src: item.url,
                                           width: 65,
                                           height: 65,
-                                          type: ImageType.emote,
+                                          type: .emote,
                                           fit: BoxFit.contain,
                                         ),
                                         Text(
@@ -199,7 +198,7 @@ class _EmotePanelState extends State<EmotePanel>
                                   child: NetworkImgLayer(
                                     width: 24,
                                     height: 24,
-                                    type: ImageType.emote,
+                                    type: .emote,
                                     src: e.url,
                                   ),
                                 ),
diff --git a/lib/pages/episode_panel/view.dart b/lib/pages/episode_panel/view.dart
index 489303530..1cb302e72 100644
--- a/lib/pages/episode_panel/view.dart
+++ b/lib/pages/episode_panel/view.dart
@@ -14,7 +14,6 @@ import 'package:PiliPlus/http/fav.dart';
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/video.dart';
 import 'package:PiliPlus/models/common/episode_panel_type.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models_new/pgc/pgc_info_model/episode.dart' as pgc;
 import 'package:PiliPlus/models_new/video/video_detail/episode.dart' as ugc;
 import 'package:PiliPlus/models_new/video/video_detail/page.dart';
@@ -58,7 +57,7 @@ class EpisodePanel extends CommonSlidePage {
     this.onReverse,
     required this.onChangeEpisode,
     this.onClose,
-  }) : assert(type == EpisodeType.pgc || ugcIntroController != null);
+  }) : assert(type == .pgc || ugcIntroController != null);
 
   final UgcIntroController? ugcIntroController;
   final String heroTag;
@@ -91,8 +90,7 @@ class _EpisodePanelState extends State<EpisodePanel>
 
   late final showTitle = widget.showTitle;
 
-  List<ugc.BaseEpisodeItem> get _getCurrEpisodes =>
-      widget.type == EpisodeType.season
+  List<ugc.BaseEpisodeItem> get _getCurrEpisodes => widget.type == .season
       ? widget.list[_currentTabIndex.value].episodes
       : widget.list[_currentTabIndex.value];
 
@@ -170,7 +168,7 @@ class _EpisodePanelState extends State<EpisodePanel>
     );
     _isReversed = List.filled(widget.list.length, false);
 
-    if (widget.type == EpisodeType.season && Accounts.main.isLogin) {
+    if (widget.type == .season && Accounts.main.isLogin) {
       final favState =
           widget.ugcIntroController?.seasonFavState[widget.seasonId];
       if (favState != null) {
@@ -204,8 +202,7 @@ class _EpisodePanelState extends State<EpisodePanel>
     super.dispose();
   }
 
-  late final _isMulti =
-      widget.type == EpisodeType.season && widget.list.length > 1;
+  late final _isMulti = widget.type == .season && widget.list.length > 1;
 
   @override
   Widget buildPage(ThemeData theme) {
@@ -445,7 +442,7 @@ class _EpisodePanelState extends State<EpisodePanel>
                   if (!showTitle) {
                     _currentItemIndex = index;
                   }
-                  if (widget.type == EpisodeType.season) {
+                  if (widget.type == .season) {
                     try {
                       Get.find<VideoDetailController>(
                         tag: widget.ugcIntroController!.heroTag,
@@ -552,12 +549,12 @@ class _EpisodePanelState extends State<EpisodePanel>
                             children: [
                               StatWidget(
                                 value: view,
-                                type: StatType.play,
+                                type: .play,
                               ),
                               if (danmaku != null)
                                 StatWidget(
                                   value: danmaku,
-                                  type: StatType.danmaku,
+                                  type: .danmaku,
                                 ),
                             ],
                           ),
diff --git a/lib/pages/fav/article/widget/item.dart b/lib/pages/fav/article/widget/item.dart
index 3adf99110..7d0698ad0 100644
--- a/lib/pages/fav/article/widget/item.dart
+++ b/lib/pages/fav/article/widget/item.dart
@@ -2,7 +2,6 @@ import 'package:PiliPlus/common/style.dart';
 import 'package:PiliPlus/common/widgets/button/icon_button.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models_new/fav/fav_article/item.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -86,7 +85,7 @@ class FavArticleItem extends StatelessWidget {
                         Row(
                           children: [
                             StatWidget(
-                              type: StatType.like,
+                              type: .like,
                               value: item.stat!.like,
                               color: theme.colorScheme.outline,
                             ),
diff --git a/lib/pages/follow_type/widgets/item.dart b/lib/pages/follow_type/widgets/item.dart
index 8e081584f..12192ba18 100644
--- a/lib/pages/follow_type/widgets/item.dart
+++ b/lib/pages/follow_type/widgets/item.dart
@@ -1,5 +1,4 @@
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/follow/list.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -37,7 +36,7 @@ class FollowTypeItem extends StatelessWidget {
               NetworkImgLayer(
                 width: 45,
                 height: 45,
-                type: ImageType.avatar,
+                type: .avatar,
                 src: item.face,
               ),
               Expanded(
diff --git a/lib/pages/live_area/view.dart b/lib/pages/live_area/view.dart
index b0a771f9c..528c05318 100644
--- a/lib/pages/live_area/view.dart
+++ b/lib/pages/live_area/view.dart
@@ -5,7 +5,6 @@ import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart';
 import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/live/live_area_list/area_item.dart';
 import 'package:PiliPlus/models_new/live/live_area_list/area_list.dart';
 import 'package:PiliPlus/pages/live_area/controller.dart';
@@ -253,7 +252,7 @@ class _LiveAreaPageState extends State<LiveAreaPage> {
                 width: 45,
                 height: 45,
                 src: item.pic,
-                type: ImageType.emote,
+                type: .emote,
               ),
               const SizedBox(height: 4),
               Text(
diff --git a/lib/pages/live_area_detail/view.dart b/lib/pages/live_area_detail/view.dart
index f3ebd301c..8b998c653 100644
--- a/lib/pages/live_area_detail/view.dart
+++ b/lib/pages/live_area_detail/view.dart
@@ -3,7 +3,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/live/live_area_list/area_item.dart';
 import 'package:PiliPlus/pages/live_area_detail/child/controller.dart';
 import 'package:PiliPlus/pages/live_area_detail/child/view.dart';
@@ -168,7 +167,7 @@ class _LiveAreaDetailPageState extends State<LiveAreaDetailPage> {
             width: 45,
             height: 45,
             src: item.pic,
-            type: ImageType.emote,
+            type: .emote,
           ),
           const SizedBox(height: 4),
           Text(
diff --git a/lib/pages/live_emote/view.dart b/lib/pages/live_emote/view.dart
index 3b92439cd..e44fe9f6f 100644
--- a/lib/pages/live_emote/view.dart
+++ b/lib/pages/live_emote/view.dart
@@ -5,7 +5,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/live/live_emote/datum.dart';
 import 'package:PiliPlus/models_new/live/live_emote/emoticon.dart';
 import 'package:PiliPlus/pages/live_emote/controller.dart';
@@ -131,7 +130,7 @@ class _LiveEmotePanelState extends State<LiveEmotePanel>
                                             src: e.url,
                                             width: 65,
                                             height: 65,
-                                            type: ImageType.emote,
+                                            type: .emote,
                                             fit: BoxFit.contain,
                                           ),
                                           Text(
@@ -157,7 +156,7 @@ class _LiveEmotePanelState extends State<LiveEmotePanel>
                                         src: e.url,
                                         width: width,
                                         height: height,
-                                        type: ImageType.emote,
+                                        type: .emote,
                                         quality: item.pkgType == 3 ? 1 : 80,
                                       ),
                                     ),
@@ -187,7 +186,7 @@ class _LiveEmotePanelState extends State<LiveEmotePanel>
                             child: NetworkImgLayer(
                               width: 24,
                               height: 24,
-                              type: ImageType.emote,
+                              type: .emote,
                               src: item.currentCover,
                             ),
                           ),
diff --git a/lib/pages/live_room/send_danmaku/view.dart b/lib/pages/live_room/send_danmaku/view.dart
index 887c222b0..09cc34404 100644
--- a/lib/pages/live_room/send_danmaku/view.dart
+++ b/lib/pages/live_room/send_danmaku/view.dart
@@ -1,7 +1,6 @@
 import 'package:PiliPlus/common/widgets/flutter/text_field/text_field.dart';
 import 'package:PiliPlus/common/widgets/view_safe_area.dart';
 import 'package:PiliPlus/http/live.dart';
-import 'package:PiliPlus/models/common/publish_panel_type.dart';
 import 'package:PiliPlus/pages/common/publish/common_rich_text_pub_page.dart';
 import 'package:PiliPlus/pages/live_emote/controller.dart';
 import 'package:PiliPlus/pages/live_emote/view.dart';
@@ -34,7 +33,7 @@ class _ReplyPageState extends CommonRichTextPubPageState<LiveSendDmPanel> {
   void initState() {
     super.initState();
     if (widget.fromEmote) {
-      updatePanelType(PanelType.emoji);
+      updatePanelType(.emoji);
     }
   }
 
@@ -95,7 +94,7 @@ class _ReplyPageState extends CommonRichTextPubPageState<LiveSendDmPanel> {
         child: Listener(
           onPointerUp: (event) {
             if (readOnly.value) {
-              updatePanelType(PanelType.keyboard);
+              updatePanelType(.keyboard);
             }
           },
           child: Obx(
diff --git a/lib/pages/live_room/superchat/superchat_card.dart b/lib/pages/live_room/superchat/superchat_card.dart
index 86df93ada..95ae90d0a 100644
--- a/lib/pages/live_room/superchat/superchat_card.dart
+++ b/lib/pages/live_room/superchat/superchat_card.dart
@@ -1,7 +1,6 @@
 import 'dart:async' show Timer;
 
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/live/live_superchat/item.dart';
 import 'package:PiliPlus/pages/member/widget/medal_widget.dart';
 import 'package:PiliPlus/utils/color_utils.dart';
@@ -196,7 +195,7 @@ class _SuperChatCardState extends State<SuperChatCard> {
                   src: item.userInfo.face,
                   width: 45,
                   height: 45,
-                  type: ImageType.avatar,
+                  type: .avatar,
                 ),
                 Expanded(
                   child: Column(
diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart
index 3e13f971c..39dc04e5c 100644
--- a/lib/pages/live_room/view.dart
+++ b/lib/pages/live_room/view.dart
@@ -14,7 +14,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/keep_alive_wrapper.dart';
 import 'package:PiliPlus/common/widgets/route_aware_mixin.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models/common/live/live_contribution_rank_type.dart';
 import 'package:PiliPlus/models_new/live/live_room_info_h5/data.dart';
 import 'package:PiliPlus/models_new/live/live_superchat/item.dart';
@@ -541,7 +540,7 @@ class _LiveRoomPageState extends State<LiveRoomPage>
                       NetworkImgLayer(
                         width: 34,
                         height: 34,
-                        type: ImageType.avatar,
+                        type: .avatar,
                         src: roomInfoH5.anchorInfo!.baseInfo!.face,
                       ),
                       Flexible(
diff --git a/lib/pages/live_search/child/controller.dart b/lib/pages/live_search/child/controller.dart
index dcf800cef..29e6efd1d 100644
--- a/lib/pages/live_search/child/controller.dart
+++ b/lib/pages/live_search/child/controller.dart
@@ -15,13 +15,13 @@ class LiveSearchChildController
   @override
   void checkIsEnd(int length) {
     switch (searchType) {
-      case LiveSearchType.room:
+      case .room:
         if (controller.counts.first != -1 &&
             length >= controller.counts.first) {
           isEnd = true;
         }
         break;
-      case LiveSearchType.user:
+      case .user:
         if (controller.counts[1] != -1 && length >= controller.counts[1]) {
           isEnd = true;
         }
@@ -32,10 +32,10 @@ class LiveSearchChildController
   @override
   List? getDataList(response) {
     switch (searchType) {
-      case LiveSearchType.room:
+      case .room:
         controller.counts[searchType.index] = response.room?.totalRoom ?? 0;
         return response.room?.list;
-      case LiveSearchType.user:
+      case .user:
         controller.counts[searchType.index] = response.user?.totalUser ?? 0;
         return response.user?.list;
     }
diff --git a/lib/pages/live_search/child/view.dart b/lib/pages/live_search/child/view.dart
index eb40aa1d8..e7905bdfd 100644
--- a/lib/pages/live_search/child/view.dart
+++ b/lib/pages/live_search/child/view.dart
@@ -34,7 +34,7 @@ class _LiveSearchChildPageState extends State<LiveSearchChildPage>
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    double padding = widget.searchType == LiveSearchType.room ? 12 : 0;
+    double padding = widget.searchType == .room ? 12 : 0;
     return refreshIndicator(
       onRefresh: _controller.onRefresh,
       child: CustomScrollView(
@@ -60,12 +60,12 @@ class _LiveSearchChildPageState extends State<LiveSearchChildPage>
 
   Widget get _buildLoading {
     return switch (widget.searchType) {
-      LiveSearchType.room => SliverGrid.builder(
+      .room => SliverGrid.builder(
         gridDelegate: roomDelegate,
         itemBuilder: (context, index) => const VideoCardVSkeleton(),
         itemCount: 10,
       ),
-      LiveSearchType.user => SliverGrid.builder(
+      .user => SliverGrid.builder(
         gridDelegate: userDelegate,
         itemBuilder: (context, index) => const MsgFeedTopSkeleton(),
         itemCount: 12,
@@ -94,7 +94,7 @@ class _LiveSearchChildPageState extends State<LiveSearchChildPage>
             ? Builder(
                 builder: (context) {
                   return switch (widget.searchType) {
-                    LiveSearchType.room => SliverGrid.builder(
+                    .room => SliverGrid.builder(
                       gridDelegate: roomDelegate,
                       itemBuilder: (context, index) {
                         if (index == response.length - 1) {
@@ -106,7 +106,7 @@ class _LiveSearchChildPageState extends State<LiveSearchChildPage>
                       },
                       itemCount: response.length,
                     ),
-                    LiveSearchType.user => SliverGrid.builder(
+                    .user => SliverGrid.builder(
                       gridDelegate: userDelegate,
                       itemBuilder: (context, index) {
                         if (index == response.length - 1) {
diff --git a/lib/pages/live_search/controller.dart b/lib/pages/live_search/controller.dart
index 28297e30b..17d098c61 100644
--- a/lib/pages/live_search/controller.dart
+++ b/lib/pages/live_search/controller.dart
@@ -1,4 +1,3 @@
-import 'package:PiliPlus/models/common/live/live_search_type.dart';
 import 'package:PiliPlus/pages/live_search/child/controller.dart';
 import 'package:PiliPlus/utils/extension/scroll_controller_ext.dart';
 import 'package:PiliPlus/utils/id_utils.dart';
@@ -20,11 +19,11 @@ class LiveSearchController extends GetxController
   final RxList<int> counts = <int>[-1, -1].obs;
 
   late final roomCtr = Get.put(
-    LiveSearchChildController(this, LiveSearchType.room),
+    LiveSearchChildController(this, .room),
     tag: Utils.generateRandomString(8),
   );
   late final userCtr = Get.put(
-    LiveSearchChildController(this, LiveSearchType.user),
+    LiveSearchChildController(this, .user),
     tag: Utils.generateRandomString(8),
   );
 
diff --git a/lib/pages/live_search/view.dart b/lib/pages/live_search/view.dart
index 5a3b1d704..fd7e1acc4 100644
--- a/lib/pages/live_search/view.dart
+++ b/lib/pages/live_search/view.dart
@@ -1,7 +1,6 @@
 import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 import 'package:PiliPlus/common/widgets/view_safe_area.dart';
-import 'package:PiliPlus/models/common/live/live_search_type.dart';
 import 'package:PiliPlus/pages/live_search/child/view.dart';
 import 'package:PiliPlus/pages/live_search/controller.dart';
 import 'package:PiliPlus/utils/utils.dart';
@@ -95,11 +94,11 @@ class _LiveSearchPageState extends State<LiveSearchPage> {
                     children: [
                       LiveSearchChildPage(
                         controller: _controller.roomCtr,
-                        searchType: LiveSearchType.room,
+                        searchType: .room,
                       ),
                       LiveSearchChildPage(
                         controller: _controller.userCtr,
-                        searchType: LiveSearchType.user,
+                        searchType: .user,
                       ),
                     ],
                   ),
diff --git a/lib/pages/live_search/widgets/live_search_user.dart b/lib/pages/live_search/widgets/live_search_user.dart
index 9aac2e0bc..cbf1b754b 100644
--- a/lib/pages/live_search/widgets/live_search_user.dart
+++ b/lib/pages/live_search/widgets/live_search_user.dart
@@ -1,6 +1,5 @@
 import 'package:PiliPlus/common/assets.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/live/live_search/user_item.dart';
 import 'package:PiliPlus/utils/num_utils.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
@@ -32,7 +31,7 @@ class LiveSearchUserItem extends StatelessWidget {
               src: item.face,
               width: 42,
               height: 42,
-              type: ImageType.avatar,
+              type: .avatar,
             ),
             const SizedBox(width: 10),
             Column(
diff --git a/lib/pages/match_info/view.dart b/lib/pages/match_info/view.dart
index f5fb67d99..6601d4d6c 100644
--- a/lib/pages/match_info/view.dart
+++ b/lib/pages/match_info/view.dart
@@ -5,7 +5,6 @@ import 'package:PiliPlus/common/widgets/view_safe_area.dart';
 import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart'
     show ReplyInfo;
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/match/match_info/contest.dart';
 import 'package:PiliPlus/models_new/match/match_info/team.dart';
 import 'package:PiliPlus/pages/common/dyn/common_dyn_page.dart';
@@ -90,7 +89,7 @@ class _MatchInfoPageState extends CommonDynPageState<MatchInfoPage> {
                 width: 50,
                 height: 50,
                 src: 'https://i1.hdslb.com${team.logo}',
-                type: ImageType.emote,
+                type: .emote,
               ),
               Text(team.title!),
             ],
@@ -140,7 +139,7 @@ class _MatchInfoPageState extends CommonDynPageState<MatchInfoPage> {
                             width: 50,
                             height: 50,
                             src: 'https://i1.hdslb.com${response.season!.logo}',
-                            type: ImageType.emote,
+                            type: .emote,
                           ),
                         if (response.contestStatus == 2)
                           FilledButton.tonal(
diff --git a/lib/pages/member_article/widget/item.dart b/lib/pages/member_article/widget/item.dart
index 6f8d4f481..8bf4029c6 100644
--- a/lib/pages/member_article/widget/item.dart
+++ b/lib/pages/member_article/widget/item.dart
@@ -2,7 +2,6 @@ import 'package:PiliPlus/common/style.dart';
 import 'package:PiliPlus/common/widgets/image/image_save.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models_new/space/space_article/item.dart';
 import 'package:PiliPlus/utils/app_scheme.dart';
 import 'package:PiliPlus/utils/platform_utils.dart';
@@ -87,12 +86,12 @@ class MemberArticleItem extends StatelessWidget {
                       spacing: 16,
                       children: [
                         StatWidget(
-                          type: StatType.view,
+                          type: .view,
                           value: item.stats?.view,
                           color: outline,
                         ),
                         StatWidget(
-                          type: StatType.reply,
+                          type: .reply,
                           value: item.stats?.reply,
                           color: outline,
                         ),
diff --git a/lib/pages/member_audio/widgets/item.dart b/lib/pages/member_audio/widgets/item.dart
index 68c23ab1c..5229932a8 100644
--- a/lib/pages/member_audio/widgets/item.dart
+++ b/lib/pages/member_audio/widgets/item.dart
@@ -4,7 +4,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
 import 'package:PiliPlus/grpc/bilibili/app/listener/v1.pbenum.dart'
     show PlaylistSource;
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models_new/space/space_audio/item.dart';
 import 'package:PiliPlus/pages/audio/view.dart';
 import 'package:PiliPlus/utils/date_utils.dart';
@@ -82,11 +81,11 @@ class MemberAudioItem extends StatelessWidget {
                         spacing: 16,
                         children: [
                           StatWidget(
-                            type: StatType.listen,
+                            type: .listen,
                             value: item.statistic!.play,
                           ),
                           StatWidget(
-                            type: StatType.reply,
+                            type: .reply,
                             value: item.statistic!.comment,
                           ),
                         ],
diff --git a/lib/pages/member_coin_arc/widgets/item.dart b/lib/pages/member_coin_arc/widgets/item.dart
index 3ade8508c..084a35034 100644
--- a/lib/pages/member_coin_arc/widgets/item.dart
+++ b/lib/pages/member_coin_arc/widgets/item.dart
@@ -5,8 +5,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
 import 'package:PiliPlus/common/widgets/video_card/video_card_v.dart';
 import 'package:PiliPlus/http/search.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models_new/member/coin_like_arc/item.dart';
 import 'package:PiliPlus/utils/date_utils.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
@@ -90,7 +88,7 @@ class MemberCoinLikeItem extends StatelessWidget {
                         PBadge(
                           bottom: 6,
                           right: 6,
-                          type: PBadgeType.gray,
+                          type: .gray,
                           text: DurationUtils.formatDuration(item.duration),
                         ),
                     ],
@@ -113,12 +111,12 @@ class MemberCoinLikeItem extends StatelessWidget {
                   Row(
                     children: [
                       StatWidget(
-                        type: StatType.play,
+                        type: .play,
                         value: item.play,
                       ),
                       const SizedBox(width: 8),
                       StatWidget(
-                        type: StatType.danmaku,
+                        type: .danmaku,
                         value: item.danmaku,
                       ),
                       const Spacer(),
diff --git a/lib/pages/member_home/widgets/video_card_v_member_home.dart b/lib/pages/member_home/widgets/video_card_v_member_home.dart
index 1fbf026cd..38a44395c 100644
--- a/lib/pages/member_home/widgets/video_card_v_member_home.dart
+++ b/lib/pages/member_home/widgets/video_card_v_member_home.dart
@@ -108,7 +108,7 @@ class VideoCardVMemberHome extends StatelessWidget {
                           bottom: 6,
                           right: 7,
                           size: PBadgeSize.small,
-                          type: PBadgeType.gray,
+                          type: .gray,
                           text: DurationUtils.formatDuration(
                             videoItem.duration,
                           ),
@@ -121,8 +121,8 @@ class VideoCardVMemberHome extends StatelessWidget {
                           top: 6,
                           right: 6,
                           type: videoItem.badges!.first.text == '充电专属'
-                              ? PBadgeType.error
-                              : PBadgeType.primary,
+                              ? .error
+                              : .primary,
                         )
                       else if (videoItem.isCooperation == true)
                         const PBadge(
diff --git a/lib/pages/member_opus/widgets/space_opus_item.dart b/lib/pages/member_opus/widgets/space_opus_item.dart
index 84f7e4fde..06fadb423 100644
--- a/lib/pages/member_opus/widgets/space_opus_item.dart
+++ b/lib/pages/member_opus/widgets/space_opus_item.dart
@@ -1,7 +1,5 @@
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models_new/space/space_opus/item.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:flutter/material.dart';
@@ -36,7 +34,7 @@ class SpaceOpusItem extends StatelessWidget {
                       width: constraints.maxWidth,
                       height: constraints.maxWidth * item.cover!.ratio,
                       src: item.cover!.url,
-                      type: ImageType.emote,
+                      type: .emote,
                       quality: 60,
                     ),
                   ),
@@ -56,7 +54,7 @@ class SpaceOpusItem extends StatelessWidget {
                         ),
                       ),
                       child: StatWidget(
-                        type: StatType.like,
+                        type: .like,
                         value: item.stat?.like,
                         color: Colors.white,
                       ),
@@ -80,7 +78,7 @@ class SpaceOpusItem extends StatelessWidget {
               Padding(
                 padding: const EdgeInsets.only(left: 8, bottom: 8, right: 8),
                 child: StatWidget(
-                  type: StatType.like,
+                  type: .like,
                   value: item.stat?.like,
                   color: Theme.of(context).colorScheme.onSurfaceVariant,
                 ),
diff --git a/lib/pages/member_search/child/controller.dart b/lib/pages/member_search/child/controller.dart
index 69bfffe69..0293ee5da 100644
--- a/lib/pages/member_search/child/controller.dart
+++ b/lib/pages/member_search/child/controller.dart
@@ -33,11 +33,11 @@ class MemberSearchChildController extends CommonListController {
   @override
   List? getDataList(response) {
     switch (searchType) {
-      case MemberSearchType.archive:
+      case .archive:
         SearchArchiveReply data = response;
         controller.counts[searchType.index] = data.total.toInt();
         return data.archives;
-      case MemberSearchType.dynamic:
+      case .dynamic:
         DynamicsDataModel data = response;
         offset = data.offset;
         if (data.hasMore == false) {
@@ -57,13 +57,13 @@ class MemberSearchChildController extends CommonListController {
   @override
   Future<LoadingState> customGetData() {
     return switch (searchType) {
-      MemberSearchType.archive => SpaceGrpc.searchArchive(
+      .archive => SpaceGrpc.searchArchive(
         mid: _midInt64,
         pn: page,
         ps: _ps,
         keyword: controller.editingController.text,
       ),
-      MemberSearchType.dynamic => MemberHttp.dynSearch(
+      .dynamic => MemberHttp.dynSearch(
         mid: controller.mid,
         pn: page,
         offset: offset ?? '',
diff --git a/lib/pages/member_search/child/view.dart b/lib/pages/member_search/child/view.dart
index d7e72ac53..cc5046737 100644
--- a/lib/pages/member_search/child/view.dart
+++ b/lib/pages/member_search/child/view.dart
@@ -42,17 +42,17 @@ class _MemberSearchChildPageState extends State<MemberSearchChildPage>
         slivers: [
           SliverPadding(
             padding: EdgeInsets.only(
-              top: widget.searchType == MemberSearchType.archive ? 7 : 0,
+              top: widget.searchType == .archive ? 7 : 0,
               bottom:
                   MediaQuery.viewPaddingOf(context).bottom +
                   MediaQuery.viewInsetsOf(context).bottom +
                   100,
             ),
             sliver: switch (widget.searchType) {
-              MemberSearchType.archive => Obx(
+              .archive => Obx(
                 () => _buildBody(_controller.loadingState.value),
               ),
-              MemberSearchType.dynamic => buildPage(
+              .dynamic => buildPage(
                 Obx(() => _buildBody(_controller.loadingState.value)),
               ),
             },
@@ -64,8 +64,8 @@ class _MemberSearchChildPageState extends State<MemberSearchChildPage>
 
   Widget get _buildLoading {
     return switch (widget.searchType) {
-      MemberSearchType.archive => gridSkeleton,
-      MemberSearchType.dynamic => dynSkeleton,
+      .archive => gridSkeleton,
+      .dynamic => dynSkeleton,
     };
   }
 
@@ -75,7 +75,7 @@ class _MemberSearchChildPageState extends State<MemberSearchChildPage>
       Success(:final response) =>
         response != null && response.isNotEmpty
             ? switch (widget.searchType) {
-                MemberSearchType.archive => SliverGrid.builder(
+                .archive => SliverGrid.builder(
                   gridDelegate: gridDelegate,
                   itemBuilder: (context, index) {
                     if (index == response.length - 1) {
@@ -85,7 +85,7 @@ class _MemberSearchChildPageState extends State<MemberSearchChildPage>
                   },
                   itemCount: response.length,
                 ),
-                MemberSearchType.dynamic =>
+                .dynamic =>
                   GlobalData.dynamicsWaterfallFlow
                       ? SliverWaterfallFlow(
                           gridDelegate: dynGridDelegate,
diff --git a/lib/pages/member_search/child/widgets/search_archive_grpc.dart b/lib/pages/member_search/child/widgets/search_archive_grpc.dart
index 32fadefcb..4bc421be9 100644
--- a/lib/pages/member_search/child/widgets/search_archive_grpc.dart
+++ b/lib/pages/member_search/child/widgets/search_archive_grpc.dart
@@ -6,8 +6,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
 import 'package:PiliPlus/grpc/bilibili/app/interfaces/v1.pb.dart' show Arc;
 import 'package:PiliPlus/http/user.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/utils/date_utils.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
 import 'package:PiliPlus/utils/em.dart';
@@ -99,7 +97,7 @@ class SearchArchiveGrpc extends StatelessWidget {
                                 ),
                                 right: 6.0,
                                 bottom: 6.0,
-                                type: PBadgeType.gray,
+                                type: .gray,
                               ),
                           ],
                         );
@@ -206,11 +204,11 @@ class SearchArchiveGrpc extends StatelessWidget {
             spacing: 8,
             children: [
               StatWidget(
-                type: StatType.play,
+                type: .play,
                 value: arc.stat.view,
               ),
               StatWidget(
-                type: StatType.danmaku,
+                type: .danmaku,
                 value: arc.stat.danmaku,
               ),
             ],
diff --git a/lib/pages/member_search/controller.dart b/lib/pages/member_search/controller.dart
index 0d6aeb24b..51a83b1b4 100644
--- a/lib/pages/member_search/controller.dart
+++ b/lib/pages/member_search/controller.dart
@@ -1,4 +1,3 @@
-import 'package:PiliPlus/models/common/member/search_type.dart';
 import 'package:PiliPlus/pages/member_search/child/controller.dart';
 import 'package:PiliPlus/utils/extension/scroll_controller_ext.dart';
 import 'package:PiliPlus/utils/utils.dart';
@@ -27,11 +26,11 @@ class MemberSearchController extends GetxController
     editingController = TextEditingController();
     tabController = TabController(vsync: this, length: 2);
     arcCtr = Get.put(
-      MemberSearchChildController(this, MemberSearchType.archive),
+      MemberSearchChildController(this, .archive),
       tag: Utils.generateRandomString(8),
     );
     dynCtr = Get.put(
-      MemberSearchChildController(this, MemberSearchType.dynamic),
+      MemberSearchChildController(this, .dynamic),
       tag: Utils.generateRandomString(8),
     );
   }
diff --git a/lib/pages/member_search/view.dart b/lib/pages/member_search/view.dart
index ee2e6a181..67f6274a8 100644
--- a/lib/pages/member_search/view.dart
+++ b/lib/pages/member_search/view.dart
@@ -1,7 +1,6 @@
 import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 import 'package:PiliPlus/common/widgets/view_safe_area.dart';
-import 'package:PiliPlus/models/common/member/search_type.dart';
 import 'package:PiliPlus/pages/member_search/child/view.dart';
 import 'package:PiliPlus/pages/member_search/controller.dart';
 import 'package:PiliPlus/utils/utils.dart';
@@ -98,11 +97,11 @@ class _MemberSearchPageState extends State<MemberSearchPage> {
                         children: [
                           MemberSearchChildPage(
                             controller: _controller.arcCtr,
-                            searchType: MemberSearchType.archive,
+                            searchType: .archive,
                           ),
                           MemberSearchChildPage(
                             controller: _controller.dynCtr,
-                            searchType: MemberSearchType.dynamic,
+                            searchType: .dynamic,
                           ),
                         ],
                       ),
diff --git a/lib/pages/member_shop/widgets/item.dart b/lib/pages/member_shop/widgets/item.dart
index 9cf51f639..e3d405052 100644
--- a/lib/pages/member_shop/widgets/item.dart
+++ b/lib/pages/member_shop/widgets/item.dart
@@ -55,7 +55,7 @@ class MemberShopItem extends StatelessWidget {
                       padding: const EdgeInsets.symmetric(vertical: 2),
                       child: PBadge(
                         text: belowLabels,
-                        type: PBadgeType.shop,
+                        type: .shop,
                         size: PBadgeSize.small,
                         isStack: false,
                         fontSize: 10,
diff --git a/lib/pages/member_upower_rank/view.dart b/lib/pages/member_upower_rank/view.dart
index a7b43edb7..1d0ab0a6e 100644
--- a/lib/pages/member_upower_rank/view.dart
+++ b/lib/pages/member_upower_rank/view.dart
@@ -7,7 +7,6 @@ import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart';
 import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/upower_rank/rank_info.dart';
 import 'package:PiliPlus/pages/member_upower_rank/controller.dart';
 import 'package:PiliPlus/pages/webview/view.dart';
@@ -216,7 +215,7 @@ class _UpowerRankPageState extends State<UpowerRankPage>
                             width: 38,
                             height: 38,
                             src: item.avatar,
-                            type: ImageType.avatar,
+                            type: .avatar,
                           ),
                           Text(
                             item.nickname!,
diff --git a/lib/pages/member_video/widgets/video_card_h_member_video.dart b/lib/pages/member_video/widgets/video_card_h_member_video.dart
index e1159bc4a..081aa8777 100644
--- a/lib/pages/member_video/widgets/video_card_h_member_video.dart
+++ b/lib/pages/member_video/widgets/video_card_h_member_video.dart
@@ -5,8 +5,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/progress_bar/video_progress_indicator.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
 import 'package:PiliPlus/common/widgets/video_popup_menu.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models_new/space/space_archive/item.dart';
 import 'package:PiliPlus/utils/date_utils.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
@@ -122,8 +120,8 @@ class VideoCardHMemberVideo extends StatelessWidget {
                                 right: 6.0,
                                 top: 6.0,
                                 type: videoItem.badges!.first.text == '充电专属'
-                                    ? PBadgeType.error
-                                    : PBadgeType.primary,
+                                    ? .error
+                                    : .primary,
                               ),
                             if (videoItem.history != null) ...[
                               Builder(
@@ -159,7 +157,7 @@ class VideoCardHMemberVideo extends StatelessWidget {
                                           : '${DurationUtils.formatDuration(videoItem.history!.progress)}/${DurationUtils.formatDuration(videoItem.history!.duration)}',
                                       right: 6.0,
                                       bottom: 6.0,
-                                      type: PBadgeType.gray,
+                                      type: .gray,
                                     );
                                   } catch (_) {
                                     return PBadge(
@@ -168,7 +166,7 @@ class VideoCardHMemberVideo extends StatelessWidget {
                                       ),
                                       right: 6.0,
                                       bottom: 6.0,
-                                      type: PBadgeType.gray,
+                                      type: .gray,
                                     );
                                   }
                                 },
@@ -180,7 +178,7 @@ class VideoCardHMemberVideo extends StatelessWidget {
                                 ),
                                 right: 6.0,
                                 bottom: 6.0,
-                                type: PBadgeType.gray,
+                                type: .gray,
                               ),
                           ],
                         );
@@ -248,11 +246,11 @@ class VideoCardHMemberVideo extends StatelessWidget {
             spacing: 8,
             children: [
               StatWidget(
-                type: StatType.play,
+                type: .play,
                 value: videoItem.stat.view,
               ),
               StatWidget(
-                type: StatType.danmaku,
+                type: .danmaku,
                 value: videoItem.stat.danmu,
               ),
             ],
diff --git a/lib/pages/msg_feed_top/at_me/view.dart b/lib/pages/msg_feed_top/at_me/view.dart
index d66b66836..b18ff7853 100644
--- a/lib/pages/msg_feed_top/at_me/view.dart
+++ b/lib/pages/msg_feed_top/at_me/view.dart
@@ -8,7 +8,6 @@ import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/grpc/bilibili/app/im/v1.pbenum.dart'
     show IMSettingType;
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/msg/msg_at/item.dart';
 import 'package:PiliPlus/pages/msg_feed_top/at_me/controller.dart';
 import 'package:PiliPlus/pages/whisper_settings/view.dart';
@@ -116,7 +115,7 @@ class _AtMePageState extends State<AtMePage> {
                       child: NetworkImgLayer(
                         width: 45,
                         height: 45,
-                        type: ImageType.avatar,
+                        type: .avatar,
                         src: item.user?.avatar,
                       ),
                     ),
diff --git a/lib/pages/msg_feed_top/like_detail/view.dart b/lib/pages/msg_feed_top/like_detail/view.dart
index 591dcd6a0..97d985442 100644
--- a/lib/pages/msg_feed_top/like_detail/view.dart
+++ b/lib/pages/msg_feed_top/like_detail/view.dart
@@ -4,7 +4,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
 import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/msg/msg_like_detail/card.dart';
 import 'package:PiliPlus/models_new/msg/msg_like_detail/item.dart';
 import 'package:PiliPlus/pages/msg_feed_top/like_detail/controller.dart';
@@ -115,7 +114,7 @@ class _LikeDetailPageState extends State<LikeDetailPage> {
       leading: NetworkImgLayer(
         width: 45,
         height: 45,
-        type: ImageType.avatar,
+        type: .avatar,
         src: item.user!.avatar,
       ),
       title: Text.rich(
diff --git a/lib/pages/msg_feed_top/like_me/view.dart b/lib/pages/msg_feed_top/like_me/view.dart
index e72285e09..b047a13f6 100644
--- a/lib/pages/msg_feed_top/like_me/view.dart
+++ b/lib/pages/msg_feed_top/like_me/view.dart
@@ -9,7 +9,6 @@ import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/grpc/bilibili/app/im/v1.pbenum.dart'
     show IMSettingType;
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/msg/msg_like/item.dart';
 import 'package:PiliPlus/pages/msg_feed_top/like_me/controller.dart';
 import 'package:PiliPlus/pages/whisper_settings/view.dart';
@@ -171,7 +170,7 @@ class _LikeMePageState extends State<LikeMePage> {
       avatar = NetworkImgLayer(
         width: 45,
         height: 45,
-        type: ImageType.avatar,
+        type: .avatar,
         src: firstUser.avatar,
       );
     } else {
@@ -188,7 +187,7 @@ class _LikeMePageState extends State<LikeMePage> {
                 child: NetworkImgLayer(
                   width: 30,
                   height: 30,
-                  type: ImageType.avatar,
+                  type: .avatar,
                   src: item.users![j].avatar,
                 ),
               ),
diff --git a/lib/pages/msg_feed_top/reply_me/view.dart b/lib/pages/msg_feed_top/reply_me/view.dart
index d7be6622b..c351bc4bb 100644
--- a/lib/pages/msg_feed_top/reply_me/view.dart
+++ b/lib/pages/msg_feed_top/reply_me/view.dart
@@ -8,7 +8,6 @@ import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/grpc/bilibili/app/im/v1.pbenum.dart'
     show IMSettingType;
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/msg/msg_reply/item.dart';
 import 'package:PiliPlus/pages/msg_feed_top/reply_me/controller.dart';
 import 'package:PiliPlus/pages/whisper_settings/view.dart';
@@ -124,7 +123,7 @@ class _ReplyMePageState extends State<ReplyMePage> {
                       child: NetworkImgLayer(
                         width: 45,
                         height: 45,
-                        type: ImageType.avatar,
+                        type: .avatar,
                         src: item.user?.avatar,
                       ),
                     ),
diff --git a/lib/pages/music/video/view.dart b/lib/pages/music/video/view.dart
index 2d6bad63a..d3883bbba 100644
--- a/lib/pages/music/video/view.dart
+++ b/lib/pages/music/video/view.dart
@@ -2,7 +2,6 @@ import 'package:PiliPlus/common/widgets/flutter/refresh_indicator.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/music/bgm_recommend_list.dart';
 import 'package:PiliPlus/pages/music/video/controller.dart';
 import 'package:PiliPlus/pages/music/widget/music_video_card_h.dart';
@@ -84,7 +83,7 @@ class _MusicRecommendPageState extends State<MusicRecommendPage>
             width: 40,
             height: 40,
             src: info.mvCover,
-            type: ImageType.avatar,
+            type: .avatar,
           ),
           Column(
             mainAxisAlignment: MainAxisAlignment.center,
diff --git a/lib/pages/music/view.dart b/lib/pages/music/view.dart
index faecbef9c..099511100 100644
--- a/lib/pages/music/view.dart
+++ b/lib/pages/music/view.dart
@@ -10,9 +10,7 @@ import 'package:PiliPlus/common/widgets/marquee.dart';
 import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/music.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models/common/image_preview_type.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/music/bgm_detail.dart';
 import 'package:PiliPlus/pages/common/dyn/common_dyn_page.dart';
 import 'package:PiliPlus/pages/music/controller.dart';
@@ -85,7 +83,7 @@ class _MusicDetailPageState extends CommonDynPageState<MusicDetailPage> {
                       src: response.mvCover,
                       width: 36,
                       height: 36,
-                      type: ImageType.avatar,
+                      type: .avatar,
                     ),
                     Text(response.musicTitle!),
                   ],
@@ -339,7 +337,7 @@ class _MusicDetailPageState extends CommonDynPageState<MusicDetailPage> {
             src: artist.face,
             width: 15,
             height: 15,
-            type: ImageType.avatar,
+            type: .avatar,
           ),
           child,
         ],
@@ -463,7 +461,7 @@ class _MusicDetailPageState extends CommonDynPageState<MusicDetailPage> {
                             if (!item.musicRank.isNullOrEmpty)
                               PBadge(
                                 text: item.musicRank,
-                                type: PBadgeType.secondary,
+                                type: .secondary,
                                 isStack: false,
                                 fontSize: 11,
                               ),
diff --git a/lib/pages/music/widget/music_video_card_h.dart b/lib/pages/music/widget/music_video_card_h.dart
index 0ac1ff9a1..d1b3e8e34 100644
--- a/lib/pages/music/widget/music_video_card_h.dart
+++ b/lib/pages/music/widget/music_video_card_h.dart
@@ -6,7 +6,6 @@ import 'package:PiliPlus/common/widgets/marquee.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
 import 'package:PiliPlus/http/search.dart';
 import 'package:PiliPlus/models/common/badge_type.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models_new/music/bgm_recommend_list.dart';
 import 'package:PiliPlus/models_new/video/video_detail/dimension.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
@@ -82,7 +81,7 @@ class MusicVideoCardH extends StatelessWidget {
                           ),
                           right: 6.0,
                           bottom: 6.0,
-                          type: PBadgeType.gray,
+                          type: .gray,
                         ),
                       ],
                     );
@@ -118,11 +117,11 @@ class MusicVideoCardH extends StatelessWidget {
             spacing: 8,
             children: [
               StatWidget(
-                type: StatType.play,
+                type: .play,
                 value: videoItem.play,
               ),
               StatWidget(
-                type: StatType.danmaku,
+                type: .danmaku,
                 value: videoItem.danmu,
               ),
             ],
@@ -140,7 +139,7 @@ class MusicVideoCardH extends StatelessWidget {
                       text: label.name,
                       isStack: false,
                       size: PBadgeSize.small,
-                      type: PBadgeType.secondary,
+                      type: .secondary,
                     ),
                 Text(
                   videoItem.upNickName!,
diff --git a/lib/pages/pgc/widgets/pgc_card_v.dart b/lib/pages/pgc/widgets/pgc_card_v.dart
index 1732d3213..15192cf5b 100644
--- a/lib/pages/pgc/widgets/pgc_card_v.dart
+++ b/lib/pages/pgc/widgets/pgc_card_v.dart
@@ -2,7 +2,6 @@ import 'package:PiliPlus/common/style.dart';
 import 'package:PiliPlus/common/widgets/badge.dart';
 import 'package:PiliPlus/common/widgets/image/image_save.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models_new/fav/fav_pgc/list.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:PiliPlus/utils/platform_utils.dart';
@@ -60,7 +59,7 @@ class PgcCardV extends StatelessWidget {
                           text: item.renewalTime,
                           bottom: 6,
                           left: 6,
-                          type: PBadgeType.gray,
+                          type: .gray,
                         ),
                     ],
                   );
diff --git a/lib/pages/pgc/widgets/pgc_card_v_timeline.dart b/lib/pages/pgc/widgets/pgc_card_v_timeline.dart
index b690992de..bf06e8e70 100644
--- a/lib/pages/pgc/widgets/pgc_card_v_timeline.dart
+++ b/lib/pages/pgc/widgets/pgc_card_v_timeline.dart
@@ -2,7 +2,6 @@ import 'package:PiliPlus/common/style.dart';
 import 'package:PiliPlus/common/widgets/badge.dart';
 import 'package:PiliPlus/common/widgets/image/image_save.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models_new/pgc/pgc_timeline/episode.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:PiliPlus/utils/platform_utils.dart';
@@ -58,7 +57,7 @@ class PgcCardVTimeline extends StatelessWidget {
                         text: '${item.pubTime}',
                         left: 6,
                         bottom: 6,
-                        type: PBadgeType.gray,
+                        type: .gray,
                       ),
                     ],
                   );
diff --git a/lib/pages/pgc_index/widgets/pgc_card_v_pgc_index.dart b/lib/pages/pgc_index/widgets/pgc_card_v_pgc_index.dart
index 92d68566e..f4a625218 100644
--- a/lib/pages/pgc_index/widgets/pgc_card_v_pgc_index.dart
+++ b/lib/pages/pgc_index/widgets/pgc_card_v_pgc_index.dart
@@ -2,7 +2,6 @@ import 'package:PiliPlus/common/style.dart';
 import 'package:PiliPlus/common/widgets/badge.dart';
 import 'package:PiliPlus/common/widgets/image/image_save.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models_new/pgc/pgc_index_result/list.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:PiliPlus/utils/platform_utils.dart';
@@ -60,7 +59,7 @@ class PgcCardVPgcIndex extends StatelessWidget {
                         right: null,
                         bottom: 6,
                         left: 6,
-                        type: PBadgeType.gray,
+                        type: .gray,
                       ),
                     ],
                   );
diff --git a/lib/pages/pgc_review/child/view.dart b/lib/pages/pgc_review/child/view.dart
index 2b2ced4bf..3c01fe3df 100644
--- a/lib/pages/pgc_review/child/view.dart
+++ b/lib/pages/pgc_review/child/view.dart
@@ -7,7 +7,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
 import 'package:PiliPlus/common/widgets/sliver/sliver_floating_header.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models/common/pgc_review_type.dart';
 import 'package:PiliPlus/models_new/pgc/pgc_review/list.dart';
 import 'package:PiliPlus/pages/pgc_review/child/controller.dart';
@@ -215,7 +214,7 @@ class _PgcReviewChildPageState extends State<PgcReviewChildPage>
                       height: 34,
                       width: 34,
                       src: item.author!.avatar,
-                      type: ImageType.avatar,
+                      type: .avatar,
                     ),
                     const SizedBox(width: 10),
                     Column(
diff --git a/lib/pages/rank/zone/widget/pgc_rank_item.dart b/lib/pages/rank/zone/widget/pgc_rank_item.dart
index 392f69054..c33fbae12 100644
--- a/lib/pages/rank/zone/widget/pgc_rank_item.dart
+++ b/lib/pages/rank/zone/widget/pgc_rank_item.dart
@@ -2,7 +2,6 @@ import 'package:PiliPlus/common/style.dart';
 import 'package:PiliPlus/common/widgets/image/image_save.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models_new/pgc/pgc_rank/pgc_rank_item_model.dart';
 import 'package:PiliPlus/utils/app_scheme.dart';
 import 'package:PiliPlus/utils/platform_utils.dart';
@@ -76,12 +75,12 @@ class PgcRankItem extends StatelessWidget {
                     Row(
                       children: [
                         StatWidget(
-                          type: StatType.play,
+                          type: .play,
                           value: item.stat!.view,
                         ),
                         const SizedBox(width: 8),
                         StatWidget(
-                          type: StatType.follow,
+                          type: .follow,
                           value: item.stat!.follow,
                         ),
                       ],
diff --git a/lib/pages/search_panel/all/controller.dart b/lib/pages/search_panel/all/controller.dart
index 09410b6dc..1edddeddc 100644
--- a/lib/pages/search_panel/all/controller.dart
+++ b/lib/pages/search_panel/all/controller.dart
@@ -1,6 +1,5 @@
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/search.dart';
-import 'package:PiliPlus/models/common/search/search_type.dart';
 import 'package:PiliPlus/models/search/result.dart';
 import 'package:PiliPlus/pages/search_panel/controller.dart';
 import 'package:PiliPlus/utils/app_scheme.dart';
@@ -31,7 +30,7 @@ class SearchAllController
   bool customHandleResponse(bool isRefresh, Success response) {
     searchResultController?.count[searchType.index] =
         response.response.numResults ?? 0;
-    if (searchType == SearchType.video && !hasJump2Video && isRefresh) {
+    if (searchType == .video && !hasJump2Video && isRefresh) {
       hasJump2Video = true;
       onPushDetail(response.response.list);
     }
diff --git a/lib/pages/search_panel/user/controller.dart b/lib/pages/search_panel/user/controller.dart
index 444aeeeea..e38d07b6b 100644
--- a/lib/pages/search_panel/user/controller.dart
+++ b/lib/pages/search_panel/user/controller.dart
@@ -19,8 +19,8 @@ class SearchUserController
   @override
   void onInit() {
     super.onInit();
-    userType = UserType.all.obs;
-    userOrderType = UserOrderType.def.obs;
+    userType = Rx(.all);
+    userOrderType = Rx(.def);
   }
 
   void onShowFilterDialog(BuildContext context) {
diff --git a/lib/pages/search_panel/video/controller.dart b/lib/pages/search_panel/video/controller.dart
index 7217b222c..d5da1aba8 100644
--- a/lib/pages/search_panel/video/controller.dart
+++ b/lib/pages/search_panel/video/controller.dart
@@ -1,7 +1,6 @@
 import 'dart:math';
 
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/search/search_type.dart';
 import 'package:PiliPlus/models/common/search/video_search_type.dart';
 import 'package:PiliPlus/models/search/result.dart';
 import 'package:PiliPlus/pages/search/widgets/search_text.dart';
@@ -27,8 +26,8 @@ class SearchVideoController
   @override
   void onInit() {
     super.onInit();
-    videoDurationType = VideoDurationType.all;
-    videoZoneType = VideoZoneType.all;
+    videoDurationType = .all;
+    videoZoneType = .all;
     DateTime now = DateTime.now();
     pubBeginDate = DateTime(now.year, now.month, 1, 0, 0, 0);
     pubEndDate = DateTime(now.year, now.month, now.day, 23, 59, 59);
@@ -45,7 +44,7 @@ class SearchVideoController
   bool customHandleResponse(bool isRefresh, Success<SearchVideoData> response) {
     searchResultController?.count[searchType.index] =
         response.response.numResults ?? 0;
-    if (searchType == SearchType.video && !hasJump2Video && isRefresh) {
+    if (searchType == .video && !hasJump2Video && isRefresh) {
       hasJump2Video = true;
       onPushDetail(response.response.list);
     }
@@ -75,8 +74,8 @@ class SearchVideoController
     }
   }
 
-  final Rx<ArchiveFilterType> selectedType = ArchiveFilterType.totalrank.obs;
-  VideoPubTimeType? pubTimeType = VideoPubTimeType.all;
+  final Rx<ArchiveFilterType> selectedType = Rx(.totalrank);
+  VideoPubTimeType? pubTimeType = .all;
   late DateTime pubBeginDate;
   late DateTime pubEndDate;
   bool customPubBeginDate = false;
@@ -178,7 +177,7 @@ class SearchVideoController
                         onTap: (text) {
                           pubTimeType = e;
                           DateTime now = DateTime.now();
-                          if (e == VideoPubTimeType.all) {
+                          if (e == .all) {
                             pubBegin = null;
                             pubEnd = null;
                           } else {
@@ -187,9 +186,9 @@ class SearchVideoController
                                   now.year,
                                   now.month,
                                   now.day -
-                                      (e == VideoPubTimeType.day
+                                      (e == .day
                                           ? 0
-                                          : e == VideoPubTimeType.week
+                                          : e == .week
                                           ? 6
                                           : 179),
                                   0,
diff --git a/lib/pages/search_panel/video/view.dart b/lib/pages/search_panel/video/view.dart
index d7b28050b..70207a780 100644
--- a/lib/pages/search_panel/video/view.dart
+++ b/lib/pages/search_panel/video/view.dart
@@ -55,7 +55,7 @@ class _SearchVideoPanelState
           children: [
             Expanded(
               child: SingleChildScrollView(
-                scrollDirection: Axis.horizontal,
+                scrollDirection: .horizontal,
                 child: Wrap(
                   children: [
                     for (final e in ArchiveFilterType.values)
diff --git a/lib/pages/search_result/view.dart b/lib/pages/search_result/view.dart
index 20497a820..f8aa79032 100644
--- a/lib/pages/search_result/view.dart
+++ b/lib/pages/search_result/view.dart
@@ -155,33 +155,32 @@ class _SearchResultPageState extends State<SearchResultPage>
                 children: SearchType.values
                     .map(
                       (item) => switch (item) {
-                        // SearchType.all => SearchAllPanel(
+                        // .all => SearchAllPanel(
                         //   tag: _tag,
                         //   searchType: item,
                         //   keyword: _searchResultController.keyword,
                         // ),
-                        SearchType.video => SearchVideoPanel(
+                        .video => SearchVideoPanel(
                           tag: _tag,
                           searchType: item,
                           keyword: _searchResultController.keyword,
                         ),
-                        SearchType.media_bangumi ||
-                        SearchType.media_ft => SearchPgcPanel(
+                        .media_bangumi || .media_ft => SearchPgcPanel(
                           tag: _tag,
                           searchType: item,
                           keyword: _searchResultController.keyword,
                         ),
-                        SearchType.live_room => SearchLivePanel(
+                        .live_room => SearchLivePanel(
                           tag: _tag,
                           searchType: item,
                           keyword: _searchResultController.keyword,
                         ),
-                        SearchType.bili_user => SearchUserPanel(
+                        .bili_user => SearchUserPanel(
                           tag: _tag,
                           searchType: item,
                           keyword: _searchResultController.keyword,
                         ),
-                        SearchType.article => SearchArticlePanel(
+                        .article => SearchArticlePanel(
                           tag: _tag,
                           searchType: item,
                           keyword: _searchResultController.keyword,
diff --git a/lib/pages/setting/models/style_settings.dart b/lib/pages/setting/models/style_settings.dart
index 40a852675..dad327d0d 100644
--- a/lib/pages/setting/models/style_settings.dart
+++ b/lib/pages/setting/models/style_settings.dart
@@ -396,7 +396,7 @@ Future<void> _showDynBadgeDialog(
   if (res != null) {
     final mainController = Get.find<MainController>()
       ..dynamicBadgeMode = DynamicBadgeMode.values[res.index];
-    if (mainController.dynamicBadgeMode != DynamicBadgeMode.hidden) {
+    if (mainController.dynamicBadgeMode != .hidden) {
       mainController.getUnreadDynamic();
     }
     await GStorage.setting.put(
@@ -423,7 +423,7 @@ Future<void> _showMsgBadgeDialog(
   if (res != null) {
     final mainController = Get.find<MainController>()
       ..msgBadgeMode = DynamicBadgeMode.values[res.index];
-    if (mainController.msgBadgeMode != DynamicBadgeMode.hidden) {
+    if (mainController.msgBadgeMode != .hidden) {
       mainController.queryUnreadMsg(true);
     } else {
       mainController.msgUnReadCount.value = '';
@@ -448,7 +448,7 @@ Future<void> _showMsgUnReadDialog(
   );
   if (res != null) {
     final mainController = Get.find<MainController>()..msgUnReadTypes = res;
-    if (mainController.msgBadgeMode != DynamicBadgeMode.hidden) {
+    if (mainController.msgBadgeMode != .hidden) {
       mainController.queryUnreadMsg();
     }
     await GStorage.setting.put(
diff --git a/lib/pages/share/view.dart b/lib/pages/share/view.dart
index c0da274d8..1922b7134 100644
--- a/lib/pages/share/view.dart
+++ b/lib/pages/share/view.dart
@@ -1,7 +1,6 @@
 import 'package:PiliPlus/common/widgets/button/icon_button.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/self_sized_horizontal_list.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/pages/contact/view.dart';
 import 'package:PiliPlus/utils/extension/scroll_controller_ext.dart';
 import 'package:PiliPlus/utils/request_utils.dart';
@@ -132,7 +131,7 @@ class _SharePanelState extends State<SharePanel> {
                                         width: 40,
                                         height: 40,
                                         src: item.avatar,
-                                        type: ImageType.avatar,
+                                        type: .avatar,
                                       ),
                                     ),
                                     const SizedBox(height: 2),
diff --git a/lib/pages/sponsor_block/block_mixin.dart b/lib/pages/sponsor_block/block_mixin.dart
index 945cda7d7..77e9d4c82 100644
--- a/lib/pages/sponsor_block/block_mixin.dart
+++ b/lib/pages/sponsor_block/block_mixin.dart
@@ -6,7 +6,6 @@ import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/sponsor_block.dart';
 import 'package:PiliPlus/models/common/sponsor_block/segment_model.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_new/sponsor_block/segment_item.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
 import 'package:PiliPlus/utils/storage_pref.dart';
@@ -20,13 +19,13 @@ import 'package:media_kit/media_kit.dart';
 
 mixin BlockConfigMixin {
   late final pgcSkipType = Pref.pgcSkipType;
-  late final enablePgcSkip = pgcSkipType != SkipType.disable;
+  late final enablePgcSkip = pgcSkipType != .disable;
   late final enableSponsorBlock = Pref.enableSponsorBlock;
   late final enableBlock = enableSponsorBlock || enablePgcSkip;
   late final blockColor = Pref.blockColor;
   late final blockSettings = Pref.blockSettings;
   late final enableList = blockSettings
-      .where((item) => item.second != SkipType.disable)
+      .where((item) => item.second != .disable)
       .map((item) => item.first.name)
       .toSet();
 
@@ -90,16 +89,16 @@ mixin BlockMixin on GetxController {
             // }
             if (msPos <= item.segment.$1 && item.segment.$1 <= msPos + 1000) {
               switch (item.skipType) {
-                case SkipType.alwaysSkip:
+                case .alwaysSkip:
                   onSkip(item, isSeek: false);
                   break;
-                case SkipType.skipOnce:
+                case .skipOnce:
                   if (!item.hasSkipped) {
                     item.hasSkipped = true;
                     onSkip(item, isSeek: false);
                   }
                   break;
-                case SkipType.skipManually:
+                case .skipManually:
                   onAddItem(item);
                   break;
                 default:
@@ -144,8 +143,8 @@ mixin BlockMixin on GetxController {
                       _lastBlockPos = currPos;
 
                       switch (segmentModel.skipType) {
-                        case SkipType.alwaysSkip:
-                        case SkipType.skipOnce:
+                        case .alwaysSkip:
+                        case .skipOnce:
                           segmentModel.hasSkipped = true;
                           if (player!.state.playing) {
                             future = onSkip(
@@ -161,7 +160,7 @@ mixin BlockMixin on GetxController {
                             }, orElse: () => false);
                           }
                           break;
-                        case SkipType.skipManually:
+                        case .skipManually:
                           onAddItem(segmentModel);
                           break;
                         default:
@@ -328,11 +327,11 @@ mixin BlockMixin on GetxController {
     showDialog(
       context: Get.context!,
       builder: (context) => AlertDialog(
-        clipBehavior: Clip.hardEdge,
+        clipBehavior: .hardEdge,
         contentPadding: const EdgeInsets.fromLTRB(0, 10, 0, 10),
         content: SingleChildScrollView(
           child: Column(
-            mainAxisSize: MainAxisSize.min,
+            mainAxisSize: .min,
             children: SegmentType.values
                 .map(
                   (item) => ListTile(
@@ -352,7 +351,7 @@ mixin BlockMixin on GetxController {
                       TextSpan(
                         children: [
                           WidgetSpan(
-                            alignment: PlaceholderAlignment.middle,
+                            alignment: .middle,
                             child: Container(
                               height: 10,
                               width: 10,
@@ -402,7 +401,7 @@ mixin BlockMixin on GetxController {
                       TextSpan(
                         children: [
                           WidgetSpan(
-                            alignment: PlaceholderAlignment.middle,
+                            alignment: .middle,
                             child: Container(
                               height: 10,
                               width: 10,
@@ -437,14 +436,14 @@ mixin BlockMixin on GetxController {
                             width: 36,
                             height: 36,
                             child: IconButton(
-                              tooltip: item.skipType == SkipType.showOnly
+                              tooltip: item.skipType == .showOnly
                                   ? '跳至此片段'
                                   : '跳过此片段',
                               onPressed: () {
                                 Get.back();
                                 onSkip(
                                   item,
-                                  isSkip: item.skipType != SkipType.showOnly,
+                                  isSkip: item.skipType != .showOnly,
                                   isSeek: false,
                                 );
                               },
@@ -453,7 +452,7 @@ mixin BlockMixin on GetxController {
                                 tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                               ),
                               icon: Icon(
-                                item.skipType == SkipType.showOnly
+                                item.skipType == .showOnly
                                     ? Icons.my_location
                                     : MdiIcons.debugStepOver,
                                 size: 18,
diff --git a/lib/pages/sponsor_block/view.dart b/lib/pages/sponsor_block/view.dart
index 2bfe087b6..9183ec099 100644
--- a/lib/pages/sponsor_block/view.dart
+++ b/lib/pages/sponsor_block/view.dart
@@ -376,10 +376,10 @@ class _SponsorBlockPageState extends State<SponsorBlockPage> {
     return Builder(
       builder: (context) {
         Color color = _blockColor[index];
-        final isDisable = item.second == SkipType.disable;
+        final isDisable = item.second == .disable;
         return ListTile(
           dense: true,
-          enabled: item.second != SkipType.disable,
+          enabled: item.second != .disable,
           onTap: () => onSelectColor(context, index, color, item),
           title: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -411,7 +411,7 @@ class _SponsorBlockPageState extends State<SponsorBlockPage> {
                   return PopupMenuButton<SkipType>(
                     initialValue: item.second,
                     onSelected: (e) {
-                      final updateItem = isDisable || e == SkipType.disable;
+                      final updateItem = isDisable || e == .disable;
                       item.second = e;
                       setting.put(
                         SettingBoxKey.blockSettings,
diff --git a/lib/pages/subscription_detail/widget/sub_video_card.dart b/lib/pages/subscription_detail/widget/sub_video_card.dart
index 152e1cf0f..641cea309 100644
--- a/lib/pages/subscription_detail/widget/sub_video_card.dart
+++ b/lib/pages/subscription_detail/widget/sub_video_card.dart
@@ -4,8 +4,6 @@ import 'package:PiliPlus/common/widgets/image/image_save.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
 import 'package:PiliPlus/http/search.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models_new/sub/sub_detail/media.dart';
 import 'package:PiliPlus/utils/date_utils.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
@@ -77,7 +75,7 @@ class SubVideoCardH extends StatelessWidget {
                           ),
                           right: 6.0,
                           bottom: 6.0,
-                          type: PBadgeType.gray,
+                          type: .gray,
                         ),
                       ],
                     );
@@ -121,11 +119,11 @@ class SubVideoCardH extends StatelessWidget {
             spacing: 8,
             children: [
               StatWidget(
-                type: StatType.play,
+                type: .play,
                 value: videoItem.cntInfo?.play,
               ),
               StatWidget(
-                type: StatType.danmaku,
+                type: .danmaku,
                 value: videoItem.cntInfo?.danmaku,
               ),
             ],
diff --git a/lib/pages/video/controller.dart b/lib/pages/video/controller.dart
index 943e3b046..27c4eccd9 100644
--- a/lib/pages/video/controller.dart
+++ b/lib/pages/video/controller.dart
@@ -12,10 +12,8 @@ import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/user.dart';
 import 'package:PiliPlus/http/video.dart';
 import 'package:PiliPlus/models/common/account_type.dart';
-import 'package:PiliPlus/models/common/sponsor_block/action_type.dart';
 import 'package:PiliPlus/models/common/sponsor_block/post_segment_model.dart';
 import 'package:PiliPlus/models/common/sponsor_block/segment_model.dart';
-import 'package:PiliPlus/models/common/sponsor_block/segment_type.dart';
 import 'package:PiliPlus/models/common/video/audio_quality.dart';
 import 'package:PiliPlus/models/common/video/source_type.dart';
 import 'package:PiliPlus/models/common/video/video_decode_type.dart';
@@ -349,9 +347,9 @@ class VideoDetailController extends GetxController
     cover = RxString(args['cover'] ?? '');
     isVertical = args['isVertical'] ?? false;
 
-    sourceType = args['sourceType'] ?? SourceType.normal;
-    isFileSource = sourceType == SourceType.file;
-    isPlayAll = sourceType != SourceType.normal && !isFileSource;
+    sourceType = args['sourceType'] ?? .normal;
+    isFileSource = sourceType == .file;
+    isPlayAll = sourceType != .normal && !isFileSource;
     if (isFileSource) {
       initFileSource(args['entry']);
     } else if (isPlayAll) {
@@ -446,10 +444,10 @@ class VideoDetailController extends GetxController
             ? () => getMediaList(isLoadPrevious: true)
             : null,
         onDelete:
-            sourceType == SourceType.watchLater ||
-                (sourceType == SourceType.fav && args['isOwner'] == true)
+            sourceType == .watchLater ||
+                (sourceType == .fav && args['isOwner'] == true)
             ? (item, index) async {
-                if (sourceType == SourceType.watchLater) {
+                if (sourceType == .watchLater) {
                   final res = await UserHttp.toViewDel(
                     aids: item.aid.toString(),
                   );
@@ -954,8 +952,8 @@ class VideoDetailController extends GetxController
             first: 0,
             second: plPlayerController.position.inMilliseconds / 1000,
           ),
-          category: SegmentType.sponsor,
-          actionType: ActionType.skip,
+          category: .sponsor,
+          actionType: .skip,
         ),
       );
     }
diff --git a/lib/pages/video/download_panel/view.dart b/lib/pages/video/download_panel/view.dart
index 2f933a304..dd77670d4 100644
--- a/lib/pages/video/download_panel/view.dart
+++ b/lib/pages/video/download_panel/view.dart
@@ -4,7 +4,6 @@ import 'package:PiliPlus/common/widgets/badge.dart';
 import 'package:PiliPlus/common/widgets/dialog/dialog.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models/common/video/video_quality.dart';
 import 'package:PiliPlus/models_new/pgc/pgc_info_model/episode.dart' as pgc;
 import 'package:PiliPlus/models_new/pgc/pgc_info_model/result.dart';
@@ -475,12 +474,12 @@ class _DownloadPanelState extends State<DownloadPanel> {
                                     if (view != null)
                                       StatWidget(
                                         value: view,
-                                        type: StatType.play,
+                                        type: .play,
                                       ),
                                     if (danmaku != null)
                                       StatWidget(
                                         value: danmaku,
-                                        type: StatType.danmaku,
+                                        type: .danmaku,
                                       ),
                                   ],
                                 ),
diff --git a/lib/pages/video/introduction/pgc/controller.dart b/lib/pages/video/introduction/pgc/controller.dart
index 32425b240..3f94db870 100644
--- a/lib/pages/video/introduction/pgc/controller.dart
+++ b/lib/pages/video/introduction/pgc/controller.dart
@@ -6,7 +6,6 @@ import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/pgc.dart';
 import 'package:PiliPlus/http/search.dart';
 import 'package:PiliPlus/http/video.dart';
-import 'package:PiliPlus/models/common/video/source_type.dart';
 import 'package:PiliPlus/models/common/video/video_type.dart';
 import 'package:PiliPlus/models_new/pgc/pgc_info_model/episode.dart';
 import 'package:PiliPlus/models_new/pgc/pgc_info_model/result.dart';
@@ -301,7 +300,7 @@ class PgcIntroController extends CommonIntroController {
         queryPgcLikeCoinFav();
       }
 
-      hasLater.value = videoDetailCtr.sourceType == SourceType.watchLater;
+      hasLater.value = videoDetailCtr.sourceType == .watchLater;
       this.cid.value = cid;
       queryOnlineTotal();
       queryVideoIntro(episode as EpisodeItem);
diff --git a/lib/pages/video/introduction/pgc/view.dart b/lib/pages/video/introduction/pgc/view.dart
index 8d94dab63..68fbdf3b9 100644
--- a/lib/pages/video/introduction/pgc/view.dart
+++ b/lib/pages/video/introduction/pgc/view.dart
@@ -8,7 +8,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/image_viewer/hero.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
 import 'package:PiliPlus/models/common/image_preview_type.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/pgc/pgc_info_model/result.dart';
 import 'package:PiliPlus/pages/video/controller.dart';
 import 'package:PiliPlus/pages/video/introduction/pgc/controller.dart';
@@ -323,7 +322,7 @@ class _PgcIntroPageState extends State<PgcIntroPage> {
                 src: avatar,
                 width: 35,
                 height: 35,
-                type: ImageType.avatar,
+                type: .avatar,
               ),
               Column(
                 mainAxisSize: MainAxisSize.min,
diff --git a/lib/pages/video/introduction/pgc/widgets/intro_detail.dart b/lib/pages/video/introduction/pgc/widgets/intro_detail.dart
index 6de31f31a..e50100121 100644
--- a/lib/pages/video/introduction/pgc/widgets/intro_detail.dart
+++ b/lib/pages/video/introduction/pgc/widgets/intro_detail.dart
@@ -3,7 +3,6 @@ import 'package:PiliPlus/common/widgets/keep_alive_wrapper.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 import 'package:PiliPlus/common/widgets/selectable_text.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models_new/pgc/pgc_info_model/result.dart';
 import 'package:PiliPlus/models_new/video/video_tag/data.dart';
 import 'package:PiliPlus/pages/common/slide/common_slide_page.dart';
@@ -136,11 +135,11 @@ class _IntroDetailState extends State<PgcIntroPanel>
           spacing: 6,
           children: [
             StatWidget(
-              type: StatType.play,
+              type: .play,
               value: widget.item.stat!.view,
             ),
             StatWidget(
-              type: StatType.danmaku,
+              type: .danmaku,
               value: widget.item.stat!.danmaku,
             ),
           ],
diff --git a/lib/pages/video/introduction/ugc/controller.dart b/lib/pages/video/introduction/ugc/controller.dart
index f9611a667..444086b7a 100644
--- a/lib/pages/video/introduction/ugc/controller.dart
+++ b/lib/pages/video/introduction/ugc/controller.dart
@@ -10,7 +10,6 @@ import 'package:PiliPlus/http/member.dart';
 import 'package:PiliPlus/http/search.dart';
 import 'package:PiliPlus/http/user.dart';
 import 'package:PiliPlus/http/video.dart';
-import 'package:PiliPlus/models/common/video/source_type.dart';
 import 'package:PiliPlus/models_new/member_card_info/data.dart';
 import 'package:PiliPlus/models_new/relation/data.dart';
 import 'package:PiliPlus/models_new/video/video_ai_conclusion/model_result.dart';
@@ -531,7 +530,7 @@ class UgcIntroController extends CommonIntroController with ReloadMixin {
           } catch (_) {}
         }
 
-        hasLater.value = videoDetailCtr.sourceType == SourceType.watchLater;
+        hasLater.value = videoDetailCtr.sourceType == .watchLater;
         this.bvid = bvid;
         queryVideoIntro();
       } else {
diff --git a/lib/pages/video/introduction/ugc/view.dart b/lib/pages/video/introduction/ugc/view.dart
index ec1897980..d17a01ad5 100644
--- a/lib/pages/video/introduction/ugc/view.dart
+++ b/lib/pages/video/introduction/ugc/view.dart
@@ -8,8 +8,6 @@ import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 import 'package:PiliPlus/common/widgets/selectable_text.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
 import 'package:PiliPlus/http/sponsor_block.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models_new/video/video_detail/data.dart';
 import 'package:PiliPlus/models_new/video/video_detail/staff.dart';
 import 'package:PiliPlus/models_new/video/video_tag/data.dart';
@@ -784,7 +782,7 @@ class _UgcIntroPanelState extends State<UgcIntroPanel> {
             clipBehavior: Clip.none,
             children: [
               NetworkImgLayer(
-                type: ImageType.avatar,
+                type: .avatar,
                 src: item.face,
                 width: 35,
                 height: 35,
@@ -940,12 +938,12 @@ class _UgcIntroPanelState extends State<UgcIntroPanel> {
     spacing: 10,
     children: [
       StatWidget(
-        type: StatType.play,
+        type: .play,
         value: videoDetail.stat?.view,
         color: theme.colorScheme.outline,
       ),
       StatWidget(
-        type: StatType.danmaku,
+        type: .danmaku,
         value: videoDetail.stat?.danmaku,
         color: theme.colorScheme.outline,
       ),
diff --git a/lib/pages/video/medialist/view.dart b/lib/pages/video/medialist/view.dart
index 50373e5b6..998f7d8ea 100644
--- a/lib/pages/video/medialist/view.dart
+++ b/lib/pages/video/medialist/view.dart
@@ -5,7 +5,6 @@ import 'package:PiliPlus/common/widgets/flutter/refresh_indicator.dart';
 import 'package:PiliPlus/common/widgets/image/image_save.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models_new/media_list/media_list.dart';
 import 'package:PiliPlus/models_new/video/video_detail/episode.dart';
 import 'package:PiliPlus/pages/common/slide/common_slide_page.dart';
@@ -260,11 +259,11 @@ class _MediaListPanelState extends State<MediaListPanel>
                                 spacing: 8,
                                 children: [
                                   StatWidget(
-                                    type: StatType.play,
+                                    type: .play,
                                     value: item.cntInfo!.play,
                                   ),
                                   StatWidget(
-                                    type: StatType.danmaku,
+                                    type: .danmaku,
                                     value: item.cntInfo!.danmaku,
                                   ),
                                 ],
diff --git a/lib/pages/video/member/view.dart b/lib/pages/video/member/view.dart
index 7b5712fc8..0c16fbacc 100644
--- a/lib/pages/video/member/view.dart
+++ b/lib/pages/video/member/view.dart
@@ -7,7 +7,6 @@ import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart';
 import 'package:PiliPlus/common/widgets/sliver/sliver_pinned_header.dart';
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/models/common/image_preview_type.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models/common/member/user_info_type.dart';
 import 'package:PiliPlus/models/member/info.dart';
 import 'package:PiliPlus/models_new/space/space_archive/item.dart';
@@ -407,7 +406,7 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
     ),
     child: NetworkImgLayer(
       src: face,
-      type: ImageType.avatar,
+      type: .avatar,
       width: 70,
       height: 70,
     ),
diff --git a/lib/pages/video/note/view.dart b/lib/pages/video/note/view.dart
index 1e67b8ae6..89c089196 100644
--- a/lib/pages/video/note/view.dart
+++ b/lib/pages/video/note/view.dart
@@ -3,7 +3,6 @@ import 'package:PiliPlus/common/widgets/flutter/refresh_indicator.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/video/video_note_list/list.dart';
 import 'package:PiliPlus/pages/common/slide/common_slide_page.dart';
 import 'package:PiliPlus/pages/video/note/controller.dart';
@@ -235,7 +234,7 @@ class _NoteListPageState extends State<NoteListPage>
                   height: 34,
                   width: 34,
                   src: item.author!.face,
-                  type: ImageType.avatar,
+                  type: .avatar,
                 ),
               ),
               const SizedBox(width: 12),
diff --git a/lib/pages/video/post_panel/view.dart b/lib/pages/video/post_panel/view.dart
index 81dfb1010..346d90424 100644
--- a/lib/pages/video/post_panel/view.dart
+++ b/lib/pages/video/post_panel/view.dart
@@ -46,8 +46,7 @@ class PostPanel extends CommonSlidePage {
     } else {
       item.segment.second = value;
     }
-    if (item.category == SegmentType.poi_highlight ||
-        item.actionType == ActionType.full) {
+    if (item.category == .poi_highlight || item.actionType == .full) {
       item.segment.second = value;
     }
   }
@@ -166,7 +165,7 @@ class PostPanel extends CommonSlidePage {
       },
     );
 
-    if (item.category != SegmentType.poi_highlight) {
+    if (item.category != .poi_highlight) {
       return Wrap(
         runSpacing: 8,
         spacing: 16,
@@ -212,8 +211,8 @@ class _PostPanelState extends State<PostPanel>
                       first: 0,
                       second: currentPos(),
                     ),
-                    category: SegmentType.sponsor,
-                    actionType: ActionType.skip,
+                    category: .sponsor,
+                    actionType: .skip,
                   ),
                 );
               });
@@ -345,7 +344,7 @@ class _PostPanelState extends State<PostPanel>
               mainAxisSize: MainAxisSize.min,
               crossAxisAlignment: CrossAxisAlignment.stretch,
               children: [
-                if (item.actionType != ActionType.full)
+                if (item.actionType != .full)
                   PostPanel.segmentWidget(
                     theme,
                     item: item,
@@ -361,8 +360,8 @@ class _PostPanelState extends State<PostPanel>
                       value: () => item.category,
                       onSelected: (e) {
                         bool flag = false;
-                        if (item.category == SegmentType.exclusive_access ||
-                            item.category == SegmentType.poi_highlight) {
+                        if (item.category == .exclusive_access ||
+                            item.category == .poi_highlight) {
                           flag = true;
                         }
                         item.category = e;
@@ -372,14 +371,14 @@ class _PostPanelState extends State<PostPanel>
                           flag = true;
                         }
                         switch (e) {
-                          case SegmentType.poi_highlight:
+                          case .poi_highlight:
                             PostPanel.updateSegment(
                               isFirst: false,
                               item: item,
                               value: item.segment.first,
                             );
                             break;
-                          case SegmentType.exclusive_access:
+                          case .exclusive_access:
                             PostPanel.updateSegment(
                               isFirst: true,
                               item: item,
@@ -406,11 +405,11 @@ class _PostPanelState extends State<PostPanel>
                       value: () => item.actionType,
                       onSelected: (e) {
                         bool flag = false;
-                        if (item.actionType == ActionType.full) {
+                        if (item.actionType == .full) {
                           flag = true;
                         }
                         item.actionType = e;
-                        if (e == ActionType.full) {
+                        if (e == .full) {
                           flag = true;
                           PostPanel.updateSegment(
                             isFirst: true,
diff --git a/lib/pages/video/reply/widgets/reply_item_grpc.dart b/lib/pages/video/reply/widgets/reply_item_grpc.dart
index 56bb5aef4..8a1340601 100644
--- a/lib/pages/video/reply/widgets/reply_item_grpc.dart
+++ b/lib/pages/video/reply/widgets/reply_item_grpc.dart
@@ -17,7 +17,6 @@ import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart'
 import 'package:PiliPlus/http/reply.dart';
 import 'package:PiliPlus/http/video.dart';
 import 'package:PiliPlus/models/common/badge_type.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/pages/dynamics/widgets/vote.dart';
 import 'package:PiliPlus/pages/member/widget/medal_widget.dart';
 import 'package:PiliPlus/pages/save_panel/view.dart';
@@ -307,7 +306,7 @@ class ReplyItemGrpc extends StatelessWidget {
                       text: 'TOP',
                       size: PBadgeSize.small,
                       isStack: false,
-                      type: PBadgeType.line_primary,
+                      type: .line_primary,
                       fontSize: 9,
                       textScaleFactor: 1,
                     ),
@@ -703,7 +702,7 @@ class ReplyItemGrpc extends StatelessWidget {
             WidgetSpan(
               child: NetworkImgLayer(
                 src: emote.url,
-                type: ImageType.emote,
+                type: .emote,
                 width: size,
                 height: size,
               ),
diff --git a/lib/pages/video/reply_new/view.dart b/lib/pages/video/reply_new/view.dart
index d85473481..2edf14978 100644
--- a/lib/pages/video/reply_new/view.dart
+++ b/lib/pages/video/reply_new/view.dart
@@ -3,15 +3,12 @@ import 'dart:math' as math;
 
 import 'package:PiliPlus/common/widgets/button/toolbar_icon_button.dart';
 import 'package:PiliPlus/common/widgets/custom_icon.dart';
-import 'package:PiliPlus/common/widgets/flutter/text_field/controller.dart'
-    show RichTextType;
 import 'package:PiliPlus/common/widgets/flutter/text_field/text_field.dart';
 import 'package:PiliPlus/common/widgets/view_safe_area.dart';
 import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart'
     show ReplyInfo;
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/video.dart';
-import 'package:PiliPlus/models/common/publish_panel_type.dart';
 import 'package:PiliPlus/models/dynamics/result.dart' show FilePicModel;
 import 'package:PiliPlus/pages/common/publish/common_rich_text_pub_page.dart';
 import 'package:PiliPlus/pages/dynamics_mention/controller.dart';
@@ -138,7 +135,7 @@ class _ReplyPageState extends CommonRichTextPubPageState<ReplyPage> {
         child: Listener(
           onPointerUp: (event) {
             if (readOnly.value) {
-              updatePanelType(PanelType.keyboard);
+              updatePanelType(.keyboard);
             }
           },
           child: Obx(
@@ -291,7 +288,7 @@ class _ReplyPageState extends CommonRichTextPubPageState<ReplyPage> {
               if (res != null) {
                 onInsertText(
                   '${res.title} ',
-                  RichTextType.common,
+                  .common,
                   rawText: '${res.url} ',
                 );
               }
@@ -323,7 +320,7 @@ class _ReplyPageState extends CommonRichTextPubPageState<ReplyPage> {
                   );
                   onInsertText(
                     ' ${DurationUtils.formatDuration((plPlayerController.playedTime ?? Duration.zero).inSeconds)} ',
-                    RichTextType.common,
+                    .common,
                   );
                 } catch (e) {
                   debugPrint(e.toString());
@@ -376,7 +373,7 @@ class _ReplyPageState extends CommonRichTextPubPageState<ReplyPage> {
   Future<void> onCustomPublish({List? pictures}) async {
     Map<String, int> atNameToMid = {};
     for (final e in editController.items) {
-      if (e.type == RichTextType.at) {
+      if (e.type == .at) {
         atNameToMid[e.rawText] ??= int.parse(e.id!);
       }
     }
diff --git a/lib/pages/video/reply_search_item/child/controller.dart b/lib/pages/video/reply_search_item/child/controller.dart
index d79ce021b..f169ab9ea 100644
--- a/lib/pages/video/reply_search_item/child/controller.dart
+++ b/lib/pages/video/reply_search_item/child/controller.dart
@@ -25,7 +25,7 @@ class ReplySearchChildController
   Future<LoadingState<SearchItemReply>> customGetData() {
     return ReplyGrpc.searchItem(
       page: page,
-      itemType: searchType == ReplySearchType.video
+      itemType: searchType == .video
           ? SearchItemType.VIDEO
           : SearchItemType.ARTICLE,
       oid: controller.oid,
diff --git a/lib/pages/video/reply_search_item/child/widgets/item.dart b/lib/pages/video/reply_search_item/child/widgets/item.dart
index 8fa693f98..a6fc4afbf 100644
--- a/lib/pages/video/reply_search_item/child/widgets/item.dart
+++ b/lib/pages/video/reply_search_item/child/widgets/item.dart
@@ -4,7 +4,6 @@ import 'package:PiliPlus/common/widgets/image/image_save.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart'
     show SearchItem, SearchItemVideoSubType;
-import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models/common/reply/reply_search_type.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
 import 'package:PiliPlus/utils/platform_utils.dart';
@@ -29,7 +28,7 @@ class ReplySearchItem extends StatelessWidget {
     String? category;
     int? duration;
     switch (type) {
-      case ReplySearchType.video:
+      case .video:
         if (item.video.type == SearchItemVideoSubType.UGC) {
           final ugc = item.video.ugc;
           title = ugc.title;
@@ -42,7 +41,7 @@ class ReplySearchItem extends StatelessWidget {
           cover = pgc.cover;
           category = pgc.category;
         }
-      case ReplySearchType.article:
+      case .article:
         final article = item.article;
         title = article.title;
         cover = article.covers.firstOrNull ?? '';
@@ -88,7 +87,7 @@ class ReplySearchItem extends StatelessWidget {
                             right: 6,
                             bottom: 6,
                             text: DurationUtils.formatDuration(duration),
-                            type: PBadgeType.gray,
+                            type: .gray,
                           ),
                       ],
                     );
diff --git a/lib/pages/video/reply_search_item/controller.dart b/lib/pages/video/reply_search_item/controller.dart
index db90fe799..a9ed85e33 100644
--- a/lib/pages/video/reply_search_item/controller.dart
+++ b/lib/pages/video/reply_search_item/controller.dart
@@ -1,4 +1,3 @@
-import 'package:PiliPlus/models/common/reply/reply_search_type.dart';
 import 'package:PiliPlus/pages/video/reply_search_item/child/controller.dart';
 import 'package:PiliPlus/utils/extension/scroll_controller_ext.dart';
 import 'package:PiliPlus/utils/utils.dart';
@@ -16,11 +15,11 @@ class ReplySearchController extends GetxController
   late final TextEditingController editingController;
 
   late final videoCtr = Get.put(
-    ReplySearchChildController(this, ReplySearchType.video),
+    ReplySearchChildController(this, .video),
     tag: Utils.generateRandomString(8),
   );
   late final articleCtr = Get.put(
-    ReplySearchChildController(this, ReplySearchType.article),
+    ReplySearchChildController(this, .article),
     tag: Utils.generateRandomString(8),
   );
 
diff --git a/lib/pages/video/reply_search_item/view.dart b/lib/pages/video/reply_search_item/view.dart
index d10207055..8e8c62f7f 100644
--- a/lib/pages/video/reply_search_item/view.dart
+++ b/lib/pages/video/reply_search_item/view.dart
@@ -1,7 +1,6 @@
 import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 import 'package:PiliPlus/common/widgets/view_safe_area.dart';
-import 'package:PiliPlus/models/common/reply/reply_search_type.dart';
 import 'package:PiliPlus/pages/video/reply_search_item/child/view.dart';
 import 'package:PiliPlus/pages/video/reply_search_item/controller.dart';
 import 'package:PiliPlus/utils/utils.dart';
@@ -90,11 +89,11 @@ class _ReplySearchPageState extends State<ReplySearchPage> {
                 children: [
                   ReplySearchChildPage(
                     controller: _controller.videoCtr,
-                    searchType: ReplySearchType.video,
+                    searchType: .video,
                   ),
                   ReplySearchChildPage(
                     controller: _controller.articleCtr,
-                    searchType: ReplySearchType.article,
+                    searchType: .article,
                   ),
                 ],
               ),
diff --git a/lib/pages/video/send_danmaku/view.dart b/lib/pages/video/send_danmaku/view.dart
index a42486d53..4e4fbd241 100644
--- a/lib/pages/video/send_danmaku/view.dart
+++ b/lib/pages/video/send_danmaku/view.dart
@@ -2,7 +2,6 @@ import 'package:PiliPlus/common/widgets/button/icon_button.dart';
 import 'package:PiliPlus/common/widgets/view_safe_area.dart';
 import 'package:PiliPlus/http/danmaku.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/publish_panel_type.dart';
 import 'package:PiliPlus/pages/common/publish/common_text_pub_page.dart';
 import 'package:PiliPlus/pages/setting/slide_color_picker.dart';
 import 'package:PiliPlus/utils/storage_pref.dart';
@@ -341,12 +340,12 @@ class _SendDanmakuPanelState extends CommonTextPubPageState<SendDanmakuPanel> {
         children: [
           Obx(
             () {
-              final isEmoji = panelType.value == PanelType.emoji;
+              final isEmoji = panelType.value == .emoji;
               return iconButton(
                 tooltip: '弹幕样式',
                 onPressed: () {
                   updatePanelType(
-                    isEmoji ? PanelType.keyboard : PanelType.emoji,
+                    isEmoji ? .keyboard : .emoji,
                   );
                 },
                 iconSize: 24,
@@ -362,7 +361,7 @@ class _SendDanmakuPanelState extends CommonTextPubPageState<SendDanmakuPanel> {
             child: Listener(
               onPointerUp: (event) {
                 if (readOnly.value) {
-                  updatePanelType(PanelType.keyboard);
+                  updatePanelType(.keyboard);
                 }
               },
               child: Obx(
diff --git a/lib/pages/video/view.dart b/lib/pages/video/view.dart
index 9c9efe516..d0cd53850 100644
--- a/lib/pages/video/view.dart
+++ b/lib/pages/video/view.dart
@@ -11,7 +11,6 @@ import 'package:PiliPlus/common/widgets/route_aware_mixin.dart';
 import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 import 'package:PiliPlus/common/widgets/sliver/sliver_pinned_dynamic_header.dart';
-import 'package:PiliPlus/models/common/episode_panel_type.dart';
 import 'package:PiliPlus/models_new/pgc/pgc_info_model/result.dart';
 import 'package:PiliPlus/models_new/video/video_detail/episode.dart' as ugc;
 import 'package:PiliPlus/models_new/video/video_detail/page.dart';
@@ -1373,7 +1372,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
         //                 SegmentType.values.length,
         //               )],
         //           segment: Pair(first: 0, second: 0),
-        //           skipType: SkipType.alwaysSkip,
+        //           skipType: .alwaysSkip,
         //         ),
         //       );
         //     },
@@ -1637,7 +1636,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                     ugcIntroController: videoDetailController.isUgc
                         ? ugcIntroController
                         : null,
-                    type: EpisodeType.part,
+                    type: .part,
                     list: [videoDetail.pages!],
                     cover: videoDetailController.cover.value,
                     bvid: videoDetailController.bvid,
@@ -1681,7 +1680,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                   ugcIntroController: videoDetailController.isUgc
                       ? ugcIntroController
                       : null,
-                  type: EpisodeType.season,
+                  type: .season,
                   initialTabIndex: videoDetailController.seasonIndex.value,
                   cover: videoDetailController.cover.value,
                   seasonId: videoDetail.ugcSeason!.id,
@@ -1750,10 +1749,10 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
           ? ugcIntroController
           : null,
       type: season != null
-          ? EpisodeType.season
+          ? .season
           : episodes is List<Part>
-          ? EpisodeType.part
-          : EpisodeType.pgc,
+          ? .part
+          : .pgc,
       cover: videoDetailController.cover.value,
       enableSlide: enableSlide,
       initialTabIndex: index ?? 0,
diff --git a/lib/pages/webview/view.dart b/lib/pages/webview/view.dart
index 75132dbdf..c6f8bce39 100644
--- a/lib/pages/webview/view.dart
+++ b/lib/pages/webview/view.dart
@@ -122,22 +122,22 @@ class _WebViewPageState extends State<WebViewPage> {
                 PopupMenuButton(
                   onSelected: (item) async {
                     switch (item) {
-                      case WebviewMenuItem.refresh:
+                      case .refresh:
                         _webViewController?.reload();
                         break;
-                      case WebviewMenuItem.copy:
+                      case .copy:
                         WebUri? uri = await _webViewController?.getUrl();
                         if (uri != null) {
                           Utils.copyText(uri.toString());
                         }
                         break;
-                      case WebviewMenuItem.openInBrowser:
+                      case .openInBrowser:
                         WebUri? uri = await _webViewController?.getUrl();
                         if (uri != null) {
                           PageUtils.launchURL(uri.toString());
                         }
                         break;
-                      case WebviewMenuItem.clearCache:
+                      case .clearCache:
                         try {
                           await InAppWebViewController.clearAllCache();
                           await _webViewController?.clearHistory();
@@ -146,14 +146,14 @@ class _WebViewPageState extends State<WebViewPage> {
                           SmartDialog.showToast(e.toString());
                         }
                         break;
-                      case WebviewMenuItem.goBack:
+                      case .goBack:
                         if (await _webViewController?.canGoBack() == true) {
                           _webViewController?.goBack();
                         } else {
                           Get.back();
                         }
                         break;
-                      case WebviewMenuItem.resetCookie:
+                      case .resetCookie:
                         await LoginUtils.setWebCookie();
                         SmartDialog.showToast('设置成功，刷新或重新打开网页');
                         break;
@@ -170,7 +170,7 @@ class _WebViewPageState extends State<WebViewPage> {
                         ),
                     const PopupMenuDivider(),
                     PopupMenuItem(
-                      value: WebviewMenuItem.goBack,
+                      value: .goBack,
                       child: Text(
                         WebviewMenuItem.goBack.title,
                         style: TextStyle(
diff --git a/lib/pages/whisper/widgets/item.dart b/lib/pages/whisper/widgets/item.dart
index 78fdec6fe..87a3fd5e6 100644
--- a/lib/pages/whisper/widgets/item.dart
+++ b/lib/pages/whisper/widgets/item.dart
@@ -270,7 +270,7 @@ class WhisperSessionItem extends StatelessWidget {
                 if (item.sessionInfo.userLabel.style.borderedLabel.hasText())
                   PBadge(
                     isStack: false,
-                    type: PBadgeType.line_secondary,
+                    type: .line_secondary,
                     size: PBadgeSize.small,
                     fontSize: 10,
                     isBold: false,
diff --git a/lib/pages/whisper_detail/view.dart b/lib/pages/whisper_detail/view.dart
index 608cc0c4f..fd69208ba 100644
--- a/lib/pages/whisper_detail/view.dart
+++ b/lib/pages/whisper_detail/view.dart
@@ -10,8 +10,6 @@ import 'package:PiliPlus/common/widgets/scaffold.dart';
 import 'package:PiliPlus/grpc/bilibili/im/type.pb.dart' show Msg;
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/msg.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
-import 'package:PiliPlus/models/common/publish_panel_type.dart';
 import 'package:PiliPlus/pages/common/publish/common_rich_text_pub_page.dart';
 import 'package:PiliPlus/pages/emote/view.dart';
 import 'package:PiliPlus/pages/whisper_detail/controller.dart';
@@ -69,7 +67,7 @@ class _WhisperDetailPageState
               NetworkImgLayer(
                 width: 34,
                 height: 34,
-                type: ImageType.avatar,
+                type: .avatar,
                 src: _whisperDetailController.face,
               ),
               const SizedBox(width: 6),
@@ -283,9 +281,7 @@ class _WhisperDetailPageState
         children: [
           IconButton(
             onPressed: () => updatePanelType(
-              panelType.value == PanelType.emoji
-                  ? PanelType.keyboard
-                  : PanelType.emoji,
+              panelType.value == .emoji ? .keyboard : .emoji,
             ),
             icon: const Icon(Icons.emoji_emotions),
             tooltip: '表情',
@@ -295,7 +291,7 @@ class _WhisperDetailPageState
               onPointerUp: (event) {
                 // Currently it may be emojiPanel.
                 if (readOnly.value) {
-                  updatePanelType(PanelType.keyboard);
+                  updatePanelType(.keyboard);
                 }
               },
               child: Obx(
diff --git a/lib/pages/whisper_detail/widget/chat_item.dart b/lib/pages/whisper_detail/widget/chat_item.dart
index 47da4304d..e67c467ea 100644
--- a/lib/pages/whisper_detail/widget/chat_item.dart
+++ b/lib/pages/whisper_detail/widget/chat_item.dart
@@ -11,9 +11,7 @@ import 'package:PiliPlus/grpc/bilibili/im/interfaces/v1.pb.dart'
     show EmotionInfo;
 import 'package:PiliPlus/grpc/bilibili/im/type.pb.dart' show Msg, MsgType;
 import 'package:PiliPlus/http/search.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models/common/image_preview_type.dart';
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/utils/app_scheme.dart';
 import 'package:PiliPlus/utils/date_utils.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
@@ -449,7 +447,7 @@ class ChatItem extends StatelessWidget {
                     clipBehavior: Clip.none,
                     children: [
                       NetworkImgLayer(
-                        type: ImageType.emote,
+                        type: .emote,
                         width: constrains.maxWidth,
                         height: constrains.maxWidth / Style.aspectRatio16x9,
                         src: content['cover'],
@@ -457,7 +455,7 @@ class ChatItem extends StatelessWidget {
                       PBadge(
                         left: 6,
                         bottom: 6,
-                        type: PBadgeType.gray,
+                        type: .gray,
                         text: content['times'] == 0
                             ? '--:--'
                             : DurationUtils.formatDuration(content['times']),
@@ -700,7 +698,7 @@ class ChatItem extends StatelessWidget {
                   width: size,
                   height: size,
                   src: emoji['url'],
-                  type: ImageType.emote,
+                  type: .emote,
                 ),
               ),
             );