diff --git a/lib/http/ua_type.dart b/lib/http/ua_type.dart
index 9af2f5a29..10dc27e38 100644
--- a/lib/http/ua_type.dart
+++ b/lib/http/ua_type.dart
@@ -6,7 +6,8 @@ enum UaType {
   ),
   pc(
     'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.2 Safari/605.1.15',
-  );
+  )
+  ;
 
   static UaType get platformUA => Utils.isMobile ? mob : pc;
 
diff --git a/lib/models/common/account_type.dart b/lib/models/common/account_type.dart
index 03a1974d1..475f9917a 100644
--- a/lib/models/common/account_type.dart
+++ b/lib/models/common/account_type.dart
@@ -2,7 +2,8 @@ enum AccountType {
   main('主账号'),
   heartbeat('记录观看'),
   recommend('推荐'),
-  video('视频取流');
+  video('视频取流')
+  ;
 
   final String title;
   const AccountType(this.title);
diff --git a/lib/models/common/audio_normalization.dart b/lib/models/common/audio_normalization.dart
index 5c21932d8..e81bd72e6 100644
--- a/lib/models/common/audio_normalization.dart
+++ b/lib/models/common/audio_normalization.dart
@@ -3,7 +3,8 @@ enum AudioNormalization {
   // ref https://github.com/KRTirtho/spotube/commit/da10ab2e291d4ba4d3082b9a6ae535639fb8f1b7
   dynaudnorm('预设 dynaudnorm', 'dynaudnorm=g=5:f=250:r=0.9:p=0.5'),
   loudnorm('预设 loudnorm', 'loudnorm=I=-16:LRA=11:TP=-1.5'),
-  custom('自定义参数');
+  custom('自定义参数')
+  ;
 
   final String title;
   final String param;
diff --git a/lib/models/common/avatar_badge_type.dart b/lib/models/common/avatar_badge_type.dart
index 02a1f8ef5..7baecf179 100644
--- a/lib/models/common/avatar_badge_type.dart
+++ b/lib/models/common/avatar_badge_type.dart
@@ -4,7 +4,8 @@ enum BadgeType {
   none(),
   vip('大会员'),
   person('认证个人', Color(0xFFFFCC00)),
-  institution('认证机构', Colors.lightBlueAccent);
+  institution('认证机构', Colors.lightBlueAccent)
+  ;
 
   final String? desc;
   final Color? color;
diff --git a/lib/models/common/dm_block_type.dart b/lib/models/common/dm_block_type.dart
index 9924df1fb..53adb78dc 100644
--- a/lib/models/common/dm_block_type.dart
+++ b/lib/models/common/dm_block_type.dart
@@ -1,7 +1,8 @@
 enum DmBlockType {
   keyword('关键词'),
   regex('正则'),
-  uid('用户');
+  uid('用户')
+  ;
 
   final String label;
   const DmBlockType(this.label);
diff --git a/lib/models/common/dynamic/dynamic_badge_mode.dart b/lib/models/common/dynamic/dynamic_badge_mode.dart
index 044c6e9ec..2beabe1bc 100644
--- a/lib/models/common/dynamic/dynamic_badge_mode.dart
+++ b/lib/models/common/dynamic/dynamic_badge_mode.dart
@@ -1,7 +1,8 @@
 enum DynamicBadgeMode {
   hidden('隐藏'),
   point('红点'),
-  number('数字');
+  number('数字')
+  ;
 
   final String desc;
   const DynamicBadgeMode(this.desc);
diff --git a/lib/models/common/dynamic/dynamics_type.dart b/lib/models/common/dynamic/dynamics_type.dart
index dc71a080d..7065cb0dc 100644
--- a/lib/models/common/dynamic/dynamics_type.dart
+++ b/lib/models/common/dynamic/dynamics_type.dart
@@ -3,7 +3,8 @@ enum DynamicsTabType {
   video('投稿'),
   pgc('番剧'),
   article('专栏'),
-  up('UP');
+  up('UP')
+  ;
 
   final String label;
   const DynamicsTabType(this.label);
diff --git a/lib/models/common/dynamic/up_panel_position.dart b/lib/models/common/dynamic/up_panel_position.dart
index 22714814f..0fc276cf5 100644
--- a/lib/models/common/dynamic/up_panel_position.dart
+++ b/lib/models/common/dynamic/up_panel_position.dart
@@ -3,7 +3,8 @@ enum UpPanelPosition {
   leftFixed('左侧常驻'),
   rightFixed('右侧常驻'),
   leftDrawer('左侧抽屉'),
-  rightDrawer('右侧抽屉');
+  rightDrawer('右侧抽屉')
+  ;
 
   final String label;
   const UpPanelPosition(this.label);
diff --git a/lib/models/common/episode_panel_type.dart b/lib/models/common/episode_panel_type.dart
index 5b1ad381b..da6135452 100644
--- a/lib/models/common/episode_panel_type.dart
+++ b/lib/models/common/episode_panel_type.dart
@@ -1,7 +1,8 @@
 enum EpisodeType {
   part('分P'),
   season('合集'),
-  pgc('剧集');
+  pgc('剧集')
+  ;
 
   final String title;
   const EpisodeType(this.title);
diff --git a/lib/models/common/fav_order_type.dart b/lib/models/common/fav_order_type.dart
index 3ad6990eb..1c1e63907 100644
--- a/lib/models/common/fav_order_type.dart
+++ b/lib/models/common/fav_order_type.dart
@@ -1,7 +1,8 @@
 enum FavOrderType {
   mtime('最近收藏'),
   view('最多播放'),
-  pubtime('最近投稿');
+  pubtime('最近投稿')
+  ;
 
   final String label;
 
diff --git a/lib/models/common/fav_type.dart b/lib/models/common/fav_type.dart
index e1719b6b0..7d4aebfc3 100644
--- a/lib/models/common/fav_type.dart
+++ b/lib/models/common/fav_type.dart
@@ -13,7 +13,8 @@ enum FavTabType {
   article('专栏', FavArticlePage()),
   note('笔记', FavNotePage()),
   topic('话题', FavTopicPage()),
-  cheese('课堂', FavCheesePage());
+  cheese('课堂', FavCheesePage())
+  ;
 
   final String title;
   final Widget page;
diff --git a/lib/models/common/follow_order_type.dart b/lib/models/common/follow_order_type.dart
index 821a0e16a..0af6718fd 100644
--- a/lib/models/common/follow_order_type.dart
+++ b/lib/models/common/follow_order_type.dart
@@ -1,6 +1,7 @@
 enum FollowOrderType {
   def('', '最近关注'),
-  attention('attention', '最常访问');
+  attention('attention', '最常访问')
+  ;
 
   final String type;
   final String title;
diff --git a/lib/models/common/home_tab_type.dart b/lib/models/common/home_tab_type.dart
index 1f7e88b16..fdf50bd7d 100644
--- a/lib/models/common/home_tab_type.dart
+++ b/lib/models/common/home_tab_type.dart
@@ -19,7 +19,8 @@ enum HomeTabType implements EnumWithLabel {
   hot('热门'),
   rank('分区'),
   bangumi('番剧'),
-  cinema('影视');
+  cinema('影视')
+  ;
 
   @override
   final String label;
diff --git a/lib/models/common/member/tab_type.dart b/lib/models/common/member/tab_type.dart
index 3ad376621..beca12648 100644
--- a/lib/models/common/member/tab_type.dart
+++ b/lib/models/common/member/tab_type.dart
@@ -8,7 +8,8 @@ enum MemberTabType {
   favorite('收藏'),
   bangumi('番剧'),
   cheese('课堂'),
-  shop('小店');
+  shop('小店')
+  ;
 
   static bool showMemberShop = Pref.showMemberShop;
 
diff --git a/lib/models/common/msg/msg_unread_type.dart b/lib/models/common/msg/msg_unread_type.dart
index 37da73979..d0c88fe2a 100644
--- a/lib/models/common/msg/msg_unread_type.dart
+++ b/lib/models/common/msg/msg_unread_type.dart
@@ -3,7 +3,8 @@ enum MsgUnReadType {
   reply('回复我的'),
   at('@我'),
   like('收到的赞'),
-  sysMsg('系统通知');
+  sysMsg('系统通知')
+  ;
 
   final String title;
   const MsgUnReadType(this.title);
diff --git a/lib/models/common/nav_bar_config.dart b/lib/models/common/nav_bar_config.dart
index 6e183f232..920374458 100644
--- a/lib/models/common/nav_bar_config.dart
+++ b/lib/models/common/nav_bar_config.dart
@@ -22,7 +22,8 @@ enum NavigationBarType implements EnumWithLabel {
     Icon(Icons.person_outline, size: 21),
     Icon(Icons.person, size: 21),
     MinePage(),
-  );
+  )
+  ;
 
   @override
   final String label;
diff --git a/lib/models/common/pgc_review_type.dart b/lib/models/common/pgc_review_type.dart
index f652401ee..4c9f6e63e 100644
--- a/lib/models/common/pgc_review_type.dart
+++ b/lib/models/common/pgc_review_type.dart
@@ -2,7 +2,8 @@ import 'package:PiliPlus/http/api.dart';
 
 enum PgcReviewType {
   long(label: '长评', api: Api.pgcReviewL),
-  short(label: '短评', api: Api.pgcReviewS);
+  short(label: '短评', api: Api.pgcReviewS)
+  ;
 
   final String label;
   final String api;
@@ -14,7 +15,8 @@ enum PgcReviewType {
 
 enum PgcReviewSortType {
   def('默认', 0),
-  latest('最新', 1);
+  latest('最新', 1)
+  ;
 
   final int sort;
   final String label;
diff --git a/lib/models/common/rank_type.dart b/lib/models/common/rank_type.dart
index b37485421..73fd8a176 100644
--- a/lib/models/common/rank_type.dart
+++ b/lib/models/common/rank_type.dart
@@ -19,7 +19,8 @@ enum RankType {
   documentary('记录', seasonType: 3),
   movie('电影', seasonType: 2),
   tv('剧集', seasonType: 5),
-  variety('综艺', seasonType: 7);
+  variety('综艺', seasonType: 7)
+  ;
 
   final String label;
   final int? rid;
diff --git a/lib/models/common/reply/reply_option_type.dart b/lib/models/common/reply/reply_option_type.dart
index 858370b97..122231f53 100644
--- a/lib/models/common/reply/reply_option_type.dart
+++ b/lib/models/common/reply/reply_option_type.dart
@@ -4,7 +4,8 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
 enum ReplyOptionType {
   allow('允许评论'),
   close('关闭评论'),
-  choose('精选评论');
+  choose('精选评论')
+  ;
 
   final String title;
   const ReplyOptionType(this.title);
diff --git a/lib/models/common/reply/reply_sort_type.dart b/lib/models/common/reply/reply_sort_type.dart
index 392515c1e..2772b34b5 100644
--- a/lib/models/common/reply/reply_sort_type.dart
+++ b/lib/models/common/reply/reply_sort_type.dart
@@ -1,6 +1,7 @@
 enum ReplySortType {
   time('最新评论', '最新'),
-  hot('最热评论', '最热');
+  hot('最热评论', '最热')
+  ;
 
   final String title;
   final String label;
diff --git a/lib/models/common/search/article_search_type.dart b/lib/models/common/search/article_search_type.dart
index 8d2b0de8c..29f8273e9 100644
--- a/lib/models/common/search/article_search_type.dart
+++ b/lib/models/common/search/article_search_type.dart
@@ -3,7 +3,8 @@ enum ArticleOrderType {
   pubdate('最新发布'),
   click('最多点击'),
   attention('最多喜欢'),
-  scores('最多评论');
+  scores('最多评论')
+  ;
 
   String get order => name;
   final String label;
@@ -19,7 +20,8 @@ enum ArticleZoneType {
   interest('兴趣', 29),
   novel('轻小说', 16),
   tech('科技', 17),
-  note('笔记', 41);
+  note('笔记', 41)
+  ;
 
   final String label;
   final int categoryId;
diff --git a/lib/models/common/search/search_type.dart b/lib/models/common/search/search_type.dart
index a5b063329..72d91f73c 100644
--- a/lib/models/common/search/search_type.dart
+++ b/lib/models/common/search/search_type.dart
@@ -18,7 +18,8 @@ enum SearchType {
   // 用户：bili_user
   bili_user('用户'),
   // 专栏：article
-  article('专栏');
+  article('专栏')
+  ;
   // 相簿：photo
   // photo
 
diff --git a/lib/models/common/search/user_search_type.dart b/lib/models/common/search/user_search_type.dart
index c116f7512..28a03045d 100644
--- a/lib/models/common/search/user_search_type.dart
+++ b/lib/models/common/search/user_search_type.dart
@@ -3,7 +3,8 @@ enum UserOrderType {
   fansDesc('粉丝数由高到低', 0, 'fans'),
   fansAsc('粉丝数由低到高', 1, 'fans'),
   levelDesc('Lv等级由高到低', 0, 'level'),
-  levelAsc('Lv等级由低到高', 1, 'level');
+  levelAsc('Lv等级由低到高', 1, 'level')
+  ;
 
   final String label;
   final int orderSort;
@@ -15,7 +16,8 @@ enum UserType {
   all('全部用户'),
   up('UP主'),
   common('普通用户'),
-  verified('认证用户');
+  verified('认证用户')
+  ;
 
   final String label;
   const UserType(this.label);
diff --git a/lib/models/common/search/video_search_type.dart b/lib/models/common/search/video_search_type.dart
index 44d34fb42..bee53bbf0 100644
--- a/lib/models/common/search/video_search_type.dart
+++ b/lib/models/common/search/video_search_type.dart
@@ -2,7 +2,8 @@ enum VideoPubTimeType {
   all('不限'),
   day('最近一天'),
   week('最近一周'),
-  halfYear('最近半年');
+  halfYear('最近半年')
+  ;
 
   final String label;
   const VideoPubTimeType(this.label);
@@ -13,7 +14,8 @@ enum VideoDurationType {
   tenMins('0-10分钟'),
   halfHour('10-30分钟'),
   hour('30-60分钟'),
-  hourPlus('60分钟+');
+  hourPlus('60分钟+')
+  ;
 
   final String label;
   const VideoDurationType(this.label);
@@ -41,7 +43,8 @@ enum VideoZoneType {
   cinephile('影视', tids: 181),
   documentary('记录', tids: 177),
   movie('电影', tids: 23),
-  tv('电视', tids: 11);
+  tv('电视', tids: 11)
+  ;
 
   final String label;
   final int? tids;
@@ -55,7 +58,8 @@ enum ArchiveFilterType {
   pubdate('新发布'),
   dm('弹幕多'),
   stow('收藏多'),
-  scores('评论多');
+  scores('评论多')
+  ;
   // 专栏
   // attention('最多喜欢'),
 
diff --git a/lib/models/common/setting_type.dart b/lib/models/common/setting_type.dart
index 864f25c60..882e3b211 100644
--- a/lib/models/common/setting_type.dart
+++ b/lib/models/common/setting_type.dart
@@ -6,7 +6,8 @@ enum SettingType {
   styleSetting('外观设置'),
   extraSetting('其它设置'),
   webdavSetting('WebDAV 设置'),
-  about('关于');
+  about('关于')
+  ;
 
   final String title;
   const SettingType(this.title);
diff --git a/lib/models/common/sponsor_block/action_type.dart b/lib/models/common/sponsor_block/action_type.dart
index d7becd4e0..5efd5d5c6 100644
--- a/lib/models/common/sponsor_block/action_type.dart
+++ b/lib/models/common/sponsor_block/action_type.dart
@@ -2,7 +2,8 @@ enum ActionType {
   skip('跳过'),
   mute('静音'),
   full('整个视频'),
-  poi('精彩时刻');
+  poi('精彩时刻')
+  ;
 
   final String title;
   const ActionType(this.title);
diff --git a/lib/models/common/sponsor_block/segment_type.dart b/lib/models/common/sponsor_block/segment_type.dart
index 593985430..7fde68d43 100644
--- a/lib/models/common/sponsor_block/segment_type.dart
+++ b/lib/models/common/sponsor_block/segment_type.dart
@@ -97,7 +97,8 @@ enum SegmentType {
     '仅用于对整个视频进行标记。适用于展示UP主免费或获得补贴后使用的产品、服务或场地的视频。',
     Color(0xFF008a5c),
     [ActionType.full],
-  );
+  )
+  ;
 
   /// from https://github.com/hanydd/BilibiliSponsorBlock/blob/master/public/_locales/zh_CN/messages.json
   final String title;
diff --git a/lib/models/common/sponsor_block/skip_type.dart b/lib/models/common/sponsor_block/skip_type.dart
index e66646e7d..92ce89e81 100644
--- a/lib/models/common/sponsor_block/skip_type.dart
+++ b/lib/models/common/sponsor_block/skip_type.dart
@@ -3,7 +3,8 @@ enum SkipType {
   skipOnce('跳过一次'),
   skipManually('手动跳过'),
   showOnly('仅显示'),
-  disable('禁用');
+  disable('禁用')
+  ;
 
   final String title;
   const SkipType(this.title);
diff --git a/lib/models/common/stat_type.dart b/lib/models/common/stat_type.dart
index 228530f84..c7a7eb9bc 100644
--- a/lib/models/common/stat_type.dart
+++ b/lib/models/common/stat_type.dart
@@ -7,7 +7,8 @@ enum StatType {
   reply(Icons.comment_outlined, '评论'),
   follow(Icons.favorite_border, '关注'),
   play(Icons.play_circle_outlined, '播放'),
-  listen(Icons.headset_outlined, '播放');
+  listen(Icons.headset_outlined, '播放')
+  ;
 
   final IconData iconData;
   final String label;
diff --git a/lib/models/common/super_resolution_type.dart b/lib/models/common/super_resolution_type.dart
index 357a0652d..e7e1bee27 100644
--- a/lib/models/common/super_resolution_type.dart
+++ b/lib/models/common/super_resolution_type.dart
@@ -1,7 +1,8 @@
 enum SuperResolutionType {
   disable('禁用'),
   efficiency('效率'),
-  quality('画质');
+  quality('画质')
+  ;
 
   final String title;
   const SuperResolutionType(this.title);
diff --git a/lib/models/common/theme/theme_type.dart b/lib/models/common/theme/theme_type.dart
index 990a53626..e3aefe1de 100644
--- a/lib/models/common/theme/theme_type.dart
+++ b/lib/models/common/theme/theme_type.dart
@@ -4,7 +4,8 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
 enum ThemeType {
   light('浅色'),
   dark('深色'),
-  system('跟随系统');
+  system('跟随系统')
+  ;
 
   final String desc;
   const ThemeType(this.desc);
diff --git a/lib/models/common/video/audio_quality.dart b/lib/models/common/video/audio_quality.dart
index 61e351f15..5ced8c6ea 100644
--- a/lib/models/common/video/audio_quality.dart
+++ b/lib/models/common/video/audio_quality.dart
@@ -6,7 +6,8 @@ enum AudioQuality {
   dolby(30250, '杜比全景声'),
   k192(30280, '192K'),
   k132(30232, '132K'),
-  k64(30216, '64K');
+  k64(30216, '64K')
+  ;
 
   final int code;
   final String desc;
diff --git a/lib/models/common/video/cdn_type.dart b/lib/models/common/video/cdn_type.dart
index 238b6bc5e..9bccbf35d 100644
--- a/lib/models/common/video/cdn_type.dart
+++ b/lib/models/common/video/cdn_type.dart
@@ -24,7 +24,8 @@ enum CDNService {
   aliov('aliov（阿里云海外）', 'upos-sz-mirroraliov.bilivideo.com'),
   cosov('cosov（腾讯云海外）', 'upos-sz-mirrorcosov.bilivideo.com'),
   hwov('hwov（华为云海外）', 'upos-sz-mirrorhwov.bilivideo.com'),
-  hk_bcache('hk_bcache（Bilibili海外）', 'cn-hk-eq-bcache-01.bilivideo.com');
+  hk_bcache('hk_bcache（Bilibili海外）', 'cn-hk-eq-bcache-01.bilivideo.com')
+  ;
 
   String get code => name;
   static final fromCode = values.byName;
diff --git a/lib/models/common/video/live_quality.dart b/lib/models/common/video/live_quality.dart
index 62c861d68..e368c2237 100644
--- a/lib/models/common/video/live_quality.dart
+++ b/lib/models/common/video/live_quality.dart
@@ -6,7 +6,8 @@ enum LiveQuality {
   bluRay(400, '蓝光'),
   superHD(250, '超清'),
   smooth(150, '高清'),
-  flunt(80, '流畅');
+  flunt(80, '流畅')
+  ;
 
   final int code;
   final String desc;
diff --git a/lib/models/common/video/source_type.dart b/lib/models/common/video/source_type.dart
index 5d4f19037..19d9a77ad 100644
--- a/lib/models/common/video/source_type.dart
+++ b/lib/models/common/video/source_type.dart
@@ -26,7 +26,8 @@ enum SourceType {
     extraId: 4,
     playlistSource: PlaylistSource.MEDIA_LIST,
   ),
-  file;
+  file
+  ;
 
   final int? mediaType;
   final int? extraId;
diff --git a/lib/models/common/video/subtitle_pref_type.dart b/lib/models/common/video/subtitle_pref_type.dart
index 9eae7cca6..3fc75216b 100644
--- a/lib/models/common/video/subtitle_pref_type.dart
+++ b/lib/models/common/video/subtitle_pref_type.dart
@@ -2,7 +2,8 @@ enum SubtitlePrefType {
   off('默认不显示字幕'),
   on('优先选择非自动生成(ai)字幕'),
   withoutAi('跳过自动生成(ai)字幕，选择第一个可用字幕'),
-  auto('静音时等同第二项，非静音时等同第三项');
+  auto('静音时等同第二项，非静音时等同第三项')
+  ;
 
   final String desc;
   const SubtitlePrefType(this.desc);
diff --git a/lib/models/common/video/video_decode_type.dart b/lib/models/common/video/video_decode_type.dart
index fa8f15098..f2f57d55a 100644
--- a/lib/models/common/video/video_decode_type.dart
+++ b/lib/models/common/video/video_decode_type.dart
@@ -4,7 +4,8 @@ enum VideoDecodeFormatType {
   DVH1(['dvh1']),
   AV1(['av01']),
   HEVC(['hev1', 'hvc1']),
-  AVC(['avc1']);
+  AVC(['avc1'])
+  ;
 
   String get description => name;
   final List<String> codes;
diff --git a/lib/models/common/video/video_quality.dart b/lib/models/common/video/video_quality.dart
index 37f37b445..4a09062b6 100644
--- a/lib/models/common/video/video_quality.dart
+++ b/lib/models/common/video/video_quality.dart
@@ -11,7 +11,8 @@ enum VideoQuality {
   high720(64, '720P 准高清', '720P'),
   clear480(32, '480P 标清', '480P'),
   fluent360(16, '360P 流畅', '360P'),
-  speed240(6, '240P 极速', '240P');
+  speed240(6, '240P 极速', '240P')
+  ;
 
   final int code;
   final String desc;
diff --git a/lib/models/common/video/video_type.dart b/lib/models/common/video/video_type.dart
index a85c03a89..d56476970 100644
--- a/lib/models/common/video/video_type.dart
+++ b/lib/models/common/video/video_type.dart
@@ -13,7 +13,8 @@ enum VideoType {
     type: 10,
     replyType: 33,
     api: Api.pugvUrl,
-  );
+  )
+  ;
 
   final int type;
   final String api;
diff --git a/lib/models/common/webview_menu_type.dart b/lib/models/common/webview_menu_type.dart
index 92a9d211a..4758938e9 100644
--- a/lib/models/common/webview_menu_type.dart
+++ b/lib/models/common/webview_menu_type.dart
@@ -4,7 +4,8 @@ enum WebviewMenuItem {
   openInBrowser('浏览器中打开'),
   clearCache('清除缓存'),
   resetCookie('重新设置Cookie'),
-  goBack('返回');
+  goBack('返回')
+  ;
 
   final String title;
   const WebviewMenuItem(this.title);
diff --git a/lib/models_new/download/bili_download_entry_info.dart b/lib/models_new/download/bili_download_entry_info.dart
index 8312b5e70..cfc884e8b 100644
--- a/lib/models_new/download/bili_download_entry_info.dart
+++ b/lib/models_new/download/bili_download_entry_info.dart
@@ -465,7 +465,8 @@ enum DownloadStatus {
   failDanmaku('获取弹幕失败'),
   failPlayUrl('获取播放地址失败'),
   pause('暂停中'),
-  wait('等待中');
+  wait('等待中')
+  ;
 
   final String message;
   const DownloadStatus(this.message);
diff --git a/lib/pages/video/introduction/ugc/widgets/menu_row.dart b/lib/pages/video/introduction/ugc/widgets/menu_row.dart
index ac8a2d4b9..d5dfa2a55 100644
--- a/lib/pages/video/introduction/ugc/widgets/menu_row.dart
+++ b/lib/pages/video/introduction/ugc/widgets/menu_row.dart
@@ -52,8 +52,8 @@ class ActionRowLineItem extends StatelessWidget {
                       ? theme.colorScheme.onSecondaryContainer
                       : theme.colorScheme.outline,
                 )
-              else if (icon != null)
-                icon!,
+              else
+                ?icon,
               AnimatedOpacity(
                 opacity: isLoading ? 0 : 1,
                 duration: const Duration(milliseconds: 200),
diff --git a/lib/plugin/pl_player/models/bottom_progress_behavior.dart b/lib/plugin/pl_player/models/bottom_progress_behavior.dart
index 0fdb94861..d0c93e916 100644
--- a/lib/plugin/pl_player/models/bottom_progress_behavior.dart
+++ b/lib/plugin/pl_player/models/bottom_progress_behavior.dart
@@ -2,7 +2,8 @@ enum BtmProgressBehavior {
   alwaysShow('始终展示'),
   alwaysHide('始终隐藏'),
   onlyShowFullScreen('仅全屏时展示'),
-  onlyHideFullScreen('仅全屏时隐藏');
+  onlyHideFullScreen('仅全屏时隐藏')
+  ;
 
   final String desc;
   const BtmProgressBehavior(this.desc);
diff --git a/lib/plugin/pl_player/models/fullscreen_mode.dart b/lib/plugin/pl_player/models/fullscreen_mode.dart
index 3de8bb9f1..968d8260a 100644
--- a/lib/plugin/pl_player/models/fullscreen_mode.dart
+++ b/lib/plugin/pl_player/models/fullscreen_mode.dart
@@ -13,7 +13,8 @@ enum FullScreenMode {
   // 屏幕长宽比 < kScreenRatio 或为竖屏视频时竖屏，否则横屏
   ratio('屏幕长宽比<$kScreenRatio或为竖屏视频时竖屏，否则横屏'),
   // 强制重力转屏（仅安卓）
-  gravity('忽略系统方向锁定，强制按重力转屏（仅安卓）');
+  gravity('忽略系统方向锁定，强制按重力转屏（仅安卓）')
+  ;
 
   final String desc;
   const FullScreenMode(this.desc);
diff --git a/lib/plugin/pl_player/models/hwdec_type.dart b/lib/plugin/pl_player/models/hwdec_type.dart
index 58636b146..8339170f7 100644
--- a/lib/plugin/pl_player/models/hwdec_type.dart
+++ b/lib/plugin/pl_player/models/hwdec_type.dart
@@ -31,7 +31,8 @@ enum HwDecType {
   amf('amf', 'AMF (AMD独占)'),
   amfCopy('amf-copy', 'AMF (AMD独占) (非直通)'),
   qsv('qsv', 'Quick Sync Video (Intel独占)'),
-  qsvCopy('qsv-copy', 'Quick Sync Video (Intel独占) (非直通)');
+  qsvCopy('qsv-copy', 'Quick Sync Video (Intel独占) (非直通)')
+  ;
 
   final String hwdec;
   final String desc;
diff --git a/lib/plugin/pl_player/models/play_repeat.dart b/lib/plugin/pl_player/models/play_repeat.dart
index 5ceaea91f..6da79dd74 100644
--- a/lib/plugin/pl_player/models/play_repeat.dart
+++ b/lib/plugin/pl_player/models/play_repeat.dart
@@ -3,7 +3,8 @@ enum PlayRepeat {
   listOrder('顺序播放'),
   singleCycle('单个循环'),
   listCycle('列表循环'),
-  autoPlayRelated('自动连播');
+  autoPlayRelated('自动连播')
+  ;
 
   final String desc;
   const PlayRepeat(this.desc);
diff --git a/lib/plugin/pl_player/models/play_speed.dart b/lib/plugin/pl_player/models/play_speed.dart
index af343724c..7b508ee83 100644
--- a/lib/plugin/pl_player/models/play_speed.dart
+++ b/lib/plugin/pl_player/models/play_speed.dart
@@ -8,7 +8,8 @@ enum PlaySpeed {
   onePointSevenFive(1.75),
 
   two(2.0),
-  three(3.0);
+  three(3.0)
+  ;
 
   final double value;
   const PlaySpeed(this.value);
diff --git a/lib/plugin/pl_player/models/video_fit_type.dart b/lib/plugin/pl_player/models/video_fit_type.dart
index 768731944..88b470b22 100644
--- a/lib/plugin/pl_player/models/video_fit_type.dart
+++ b/lib/plugin/pl_player/models/video_fit_type.dart
@@ -9,7 +9,8 @@ enum VideoFitType {
   none('原始', boxFit: BoxFit.none),
   scaleDown('限制', boxFit: BoxFit.scaleDown),
   ratio_4x3('4:3', aspectRatio: 4 / 3),
-  ratio_16x9('16:9', aspectRatio: 16 / 9);
+  ratio_16x9('16:9', aspectRatio: 16 / 9)
+  ;
 
   final String desc;
   final BoxFit boxFit;
diff --git a/lib/plugin/pl_player/widgets/mpv_convert_webp.dart b/lib/plugin/pl_player/widgets/mpv_convert_webp.dart
index 5f74e4fd8..c8d07c88b 100644
--- a/lib/plugin/pl_player/widgets/mpv_convert_webp.dart
+++ b/lib/plugin/pl_player/widgets/mpv_convert_webp.dart
@@ -150,7 +150,8 @@ enum WebpPreset {
   photo('photo', '照片', '户外摄影，自然光环境'),
   drawing('drawing', '绘图', '手绘或线稿，高对比度细节'),
   icon('icon', '图标', '小型彩色图像'),
-  text('text', '文本', '文字类');
+  text('text', '文本', '文字类')
+  ;
 
   final String flag;
   final String name;