diff --git a/analysis_options.yaml b/analysis_options.yaml
index d8d17f548..4ec45e6ab 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -9,6 +9,9 @@
 # packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml
 
+formatter:
+  trailing_commas: preserve
+
 linter:
   # The lint rules applied to this project can be customized in the
   # section below to disable rules from the `package:flutter_lints/flutter.yaml`
diff --git a/lib/common/constants.dart b/lib/common/constants.dart
index 81466c73c..93d5572ec 100644
--- a/lib/common/constants.dart
+++ b/lib/common/constants.dart
@@ -37,8 +37,9 @@ class Constants {
   static const String statisticsApp =
       '{"appId":1,"platform":3,"version":"8.43.0","abtest":""}';
 
-  static final urlRegex =
-      RegExp(r'https?://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]');
+  static final urlRegex = RegExp(
+    r'https?://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]',
+  );
 
   static const goodsUrlPrefix = "https://gaoneng.bilibili.com/tetris";
 
@@ -49,7 +50,7 @@ class Constants {
     'Anime4K_Upscale_CNN_x2_VL.glsl',
     'Anime4K_AutoDownscalePre_x2.glsl',
     'Anime4K_AutoDownscalePre_x4.glsl',
-    'Anime4K_Upscale_CNN_x2_M.glsl'
+    'Anime4K_Upscale_CNN_x2_M.glsl',
   ];
 
   // 超分辨率滤镜 (轻量)
@@ -60,225 +61,225 @@ class Constants {
     'Anime4K_Upscale_CNN_x2_M.glsl',
     'Anime4K_AutoDownscalePre_x2.glsl',
     'Anime4K_AutoDownscalePre_x4.glsl',
-    'Anime4K_Upscale_CNN_x2_S.glsl'
+    'Anime4K_Upscale_CNN_x2_S.glsl',
   ];
 
   //内容来自 https://passport.bilibili.com/web/generic/country/list
   static List<Map<String, dynamic>> get internationalDialingPrefix => [
-        {"id": 1, "cname": "中国大陆", "country_id": "86"},
-        {"id": 5, "cname": "中国香港特别行政区", "country_id": "852"},
-        {"id": 2, "cname": "中国澳门特别行政区", "country_id": "853"},
-        {"id": 3, "cname": "中国台湾", "country_id": "886"},
-        {"id": 4, "cname": "美国", "country_id": "1"},
-        {"id": 6, "cname": "比利时", "country_id": "32"},
-        {"id": 7, "cname": "澳大利亚", "country_id": "61"},
-        {"id": 8, "cname": "法国", "country_id": "33"},
-        {"id": 9, "cname": "加拿大", "country_id": "1"},
-        {"id": 10, "cname": "日本", "country_id": "81"},
-        {"id": 11, "cname": "新加坡", "country_id": "65"},
-        {"id": 12, "cname": "韩国", "country_id": "82"},
-        {"id": 13, "cname": "马来西亚", "country_id": "60"},
-        {"id": 14, "cname": "英国", "country_id": "44"},
-        {"id": 15, "cname": "意大利", "country_id": "39"},
-        {"id": 16, "cname": "德国", "country_id": "49"},
-        {"id": 18, "cname": "俄罗斯", "country_id": "7"},
-        {"id": 19, "cname": "新西兰", "country_id": "64"}, //common:1-19
-        {"id": 153, "cname": "瓦利斯群岛和富图纳群岛", "country_id": "1681"},
-        {"id": 152, "cname": "葡萄牙", "country_id": "351"},
-        {"id": 151, "cname": "帕劳", "country_id": "680"},
-        {"id": 150, "cname": "诺福克岛", "country_id": "672"},
-        {"id": 149, "cname": "挪威", "country_id": "47"},
-        {"id": 148, "cname": "纽埃岛", "country_id": "683"},
-        {"id": 147, "cname": "尼日利亚", "country_id": "234"},
-        {"id": 146, "cname": "尼日尔", "country_id": "227"},
-        {"id": 145, "cname": "尼加拉瓜", "country_id": "505"},
-        {"id": 144, "cname": "尼泊尔", "country_id": "977"},
-        {"id": 143, "cname": "瑙鲁", "country_id": "674"},
-        {"id": 154, "cname": "格鲁吉亚", "country_id": "995"},
-        {"id": 155, "cname": "瑞典", "country_id": "46"},
-        {"id": 165, "cname": "沙特阿拉伯", "country_id": "966"},
-        {"id": 164, "cname": "桑给巴尔岛", "country_id": "259"},
-        {"id": 163, "cname": "塞舌尔共和国", "country_id": "248"},
-        {"id": 162, "cname": "塞浦路斯", "country_id": "357"},
-        {"id": 161, "cname": "塞内加尔", "country_id": "221"},
-        {"id": 160, "cname": "塞拉利昂", "country_id": "232"},
-        {"id": 159, "cname": "萨摩亚，东部", "country_id": "684"},
-        {"id": 158, "cname": "萨摩亚，西部", "country_id": "685"},
-        {"id": 157, "cname": "萨尔瓦多", "country_id": "503"},
-        {"id": 156, "cname": "瑞士", "country_id": "41"},
-        {"id": 166, "cname": "圣多美和普林西比", "country_id": "239"},
-        {"id": 142, "cname": "塞尔维亚", "country_id": "381"},
-        {"id": 141, "cname": "南非", "country_id": "27"},
-        {"id": 128, "cname": "毛里塔尼亚", "country_id": "222"},
-        {"id": 127, "cname": "毛里求斯", "country_id": "230"},
-        {"id": 126, "cname": "马歇尔岛", "country_id": "692"},
-        {"id": 125, "cname": "马提尼克岛", "country_id": "596"},
-        {"id": 124, "cname": "马其顿", "country_id": "389"},
-        {"id": 123, "cname": "马里亚纳岛", "country_id": "1670"},
-        {"id": 122, "cname": "马里", "country_id": "223"},
-        {"id": 121, "cname": "马拉维", "country_id": "265"},
-        {"id": 120, "cname": "马耳他", "country_id": "356"},
-        {"id": 119, "cname": "马尔代夫", "country_id": "960"},
-        {"id": 129, "cname": "蒙古", "country_id": "976"},
-        {"id": 130, "cname": "蒙特塞拉特岛", "country_id": "1664"},
-        {"id": 140, "cname": "纳米比亚", "country_id": "264"},
-        {"id": 139, "cname": "墨西哥", "country_id": "52"},
-        {"id": 138, "cname": "莫桑比克", "country_id": "258"},
-        {"id": 137, "cname": "摩纳哥", "country_id": "377"},
-        {"id": 136, "cname": "摩洛哥", "country_id": "212"},
-        {"id": 135, "cname": "摩尔多瓦", "country_id": "373"},
-        {"id": 134, "cname": "缅甸", "country_id": "95"},
-        {"id": 133, "cname": "密克罗尼西亚", "country_id": "691"},
-        {"id": 132, "cname": "秘鲁", "country_id": "51"},
-        {"id": 131, "cname": "孟加拉国", "country_id": "880"},
-        {"id": 118, "cname": "马达加斯加", "country_id": "261"},
-        {"id": 167, "cname": "圣卢西亚", "country_id": "1784"},
-        {"id": 216, "cname": "智利", "country_id": "56"},
-        {"id": 203, "cname": "牙买加", "country_id": "1876"},
-        {"id": 202, "cname": "叙利亚", "country_id": "963"},
-        {"id": 201, "cname": "匈牙利", "country_id": "36"},
-        {"id": 200, "cname": "科特迪瓦", "country_id": "225"},
-        {"id": 199, "cname": "希腊", "country_id": "30"},
-        {"id": 198, "cname": "西班牙", "country_id": "34"},
-        {"id": 197, "cname": "乌兹别克斯坦", "country_id": "998"},
-        {"id": 196, "cname": "乌拉圭", "country_id": "598"},
-        {"id": 195, "cname": "乌克兰", "country_id": "380"},
-        {"id": 194, "cname": "乌干达", "country_id": "256"},
-        {"id": 204, "cname": "亚美尼亚", "country_id": "374"},
-        {"id": 205, "cname": "也门", "country_id": "967"},
-        {"id": 215, "cname": "直布罗陀", "country_id": "350"},
-        {"id": 214, "cname": "乍得", "country_id": "235"},
-        {"id": 213, "cname": "赞比亚", "country_id": "260"},
-        {"id": 212, "cname": "越南", "country_id": "84"},
-        {"id": 211, "cname": "约旦", "country_id": "962"},
-        {"id": 210, "cname": "印尼", "country_id": "62"},
-        {"id": 209, "cname": "印度", "country_id": "91"},
-        {"id": 208, "cname": "以色列", "country_id": "972"},
-        {"id": 207, "cname": "伊朗", "country_id": "98"},
-        {"id": 206, "cname": "伊拉克", "country_id": "964"},
-        {"id": 193, "cname": "文莱", "country_id": "673"},
-        {"id": 192, "cname": "委内瑞拉", "country_id": "58"},
-        {"id": 191, "cname": "维珍群岛(英属)", "country_id": "1284"},
-        {"id": 178, "cname": "泰国", "country_id": "66"},
-        {"id": 177, "cname": "索马里", "country_id": "252"},
-        {"id": 176, "cname": "所罗门群岛", "country_id": "677"},
-        {"id": 175, "cname": "苏里南", "country_id": "597"},
-        {"id": 174, "cname": "苏丹", "country_id": "249"},
-        {"id": 173, "cname": "斯威士兰", "country_id": "268"},
-        {"id": 172, "cname": "斯洛文尼亚", "country_id": "386"},
-        {"id": 171, "cname": "斯洛伐克", "country_id": "421"},
-        {"id": 170, "cname": "斯里兰卡", "country_id": "94"},
-        {"id": 169, "cname": "圣皮埃尔和密克隆群岛", "country_id": "508"},
-        {"id": 179, "cname": "坦桑尼亚", "country_id": "255"},
-        {"id": 180, "cname": "汤加", "country_id": "676"},
-        {"id": 190, "cname": "维珍群岛(美属)", "country_id": "1340"},
-        {"id": 189, "cname": "瓦努阿图", "country_id": "678"},
-        {"id": 188, "cname": "托克劳岛", "country_id": "690"},
-        {"id": 187, "cname": "土库曼斯坦", "country_id": "993"},
-        {"id": 186, "cname": "土耳其", "country_id": "90"},
-        {"id": 185, "cname": "图瓦卢", "country_id": "688"},
-        {"id": 184, "cname": "突尼斯", "country_id": "216"},
-        {"id": 183, "cname": "阿森松岛", "country_id": "247"},
-        {"id": 182, "cname": "特立尼达和多巴哥", "country_id": "1868"},
-        {"id": 181, "cname": "特克斯和凯科斯", "country_id": "1649"},
-        {"id": 168, "cname": "圣马力诺", "country_id": "378"},
-        {"id": 67, "cname": "法属圭亚那", "country_id": "594"},
-        {"id": 54, "cname": "不丹", "country_id": "975"},
-        {"id": 53, "cname": "博茨瓦纳", "country_id": "267"},
-        {"id": 52, "cname": "伯利兹", "country_id": "501"},
-        {"id": 51, "cname": "玻利维亚", "country_id": "591"},
-        {"id": 50, "cname": "波兰", "country_id": "48"},
-        {"id": 49, "cname": "波黑", "country_id": "387"},
-        {"id": 48, "cname": "波多黎各", "country_id": "1787"},
-        {"id": 47, "cname": "冰岛", "country_id": "354"},
-        {"id": 46, "cname": "贝宁", "country_id": "229"},
-        {"id": 45, "cname": "保加利亚", "country_id": "359"},
-        {"id": 55, "cname": "布基纳法索", "country_id": "226"},
-        {"id": 56, "cname": "布隆迪", "country_id": "257"},
-        {"id": 66, "cname": "法属波利尼西亚", "country_id": "689"},
-        {"id": 65, "cname": "法罗岛", "country_id": "298"},
-        {"id": 64, "cname": "厄立特里亚", "country_id": "291"},
-        {"id": 63, "cname": "厄瓜多尔", "country_id": "593"},
-        {"id": 62, "cname": "多米尼加代表", "country_id": "1809"},
-        {"id": 61, "cname": "多米尼加", "country_id": "1767"},
-        {"id": 60, "cname": "多哥", "country_id": "228"},
-        {"id": 59, "cname": "迪戈加西亚岛", "country_id": "246"},
-        {"id": 58, "cname": "丹麦", "country_id": "45"},
-        {"id": 57, "cname": "赤道几内亚", "country_id": "240"},
-        {"id": 44, "cname": "百慕大群岛", "country_id": "1441"},
-        {"id": 43, "cname": "白俄罗斯", "country_id": "375"},
-        {"id": 42, "cname": "巴西", "country_id": "55"},
-        {"id": 29, "cname": "爱尔兰", "country_id": "353"},
-        {"id": 28, "cname": "埃塞俄比亚", "country_id": "251"},
-        {"id": 27, "cname": "埃及", "country_id": "20"},
-        {"id": 26, "cname": "阿塞拜疆", "country_id": "994"},
-        {"id": 25, "cname": "阿曼", "country_id": "968"},
-        {"id": 24, "cname": "阿联酋", "country_id": "971"},
-        {"id": 23, "cname": "阿根廷", "country_id": "54"},
-        {"id": 22, "cname": "阿富汗", "country_id": "93"},
-        {"id": 21, "cname": "阿尔及利亚", "country_id": "213"},
-        {"id": 20, "cname": "阿尔巴尼亚", "country_id": "355"},
-        {"id": 30, "cname": "爱沙尼亚", "country_id": "372"},
-        {"id": 31, "cname": "安道尔", "country_id": "376"},
-        {"id": 41, "cname": "巴拿马", "country_id": "507"},
-        {"id": 40, "cname": "巴林", "country_id": "973"},
-        {"id": 39, "cname": "巴拉圭", "country_id": "595"},
-        {"id": 38, "cname": "巴基斯坦", "country_id": "92"},
-        {"id": 37, "cname": "巴哈马群岛", "country_id": "1242"},
-        {"id": 36, "cname": "巴布亚新几内亚", "country_id": "675"},
-        {"id": 35, "cname": "巴巴多斯", "country_id": "1246"},
-        {"id": 34, "cname": "奥地利", "country_id": "43"},
-        {"id": 33, "cname": "安提瓜岛和巴布达", "country_id": "1268"},
-        {"id": 32, "cname": "安哥拉", "country_id": "244"},
-        {"id": 68, "cname": "非洲中部", "country_id": "236"},
-        {"id": 117, "cname": "罗马尼亚", "country_id": "40"},
-        {"id": 104, "cname": "科威特", "country_id": "965"},
-        {"id": 103, "cname": "科摩罗", "country_id": "269"},
-        {"id": 102, "cname": "开曼群岛", "country_id": "1345"},
-        {"id": 101, "cname": "卡塔尔", "country_id": "974"},
-        {"id": 100, "cname": "喀麦隆", "country_id": "237"},
-        {"id": 99, "cname": "聚会岛", "country_id": "262"},
-        {"id": 98, "cname": "津巴布韦", "country_id": "263"},
-        {"id": 97, "cname": "捷克", "country_id": "420"},
-        {"id": 96, "cname": "柬埔寨", "country_id": "855"},
-        {"id": 95, "cname": "加蓬", "country_id": "241"},
-        {"id": 105, "cname": "克罗地亚", "country_id": "385"},
-        {"id": 106, "cname": "肯尼亚", "country_id": "254"},
-        {"id": 116, "cname": "卢旺达", "country_id": "250"},
-        {"id": 115, "cname": "卢森堡", "country_id": "352"},
-        {"id": 114, "cname": "利比亚", "country_id": "218"},
-        {"id": 113, "cname": "利比里亚", "country_id": "231"},
-        {"id": 112, "cname": "立陶宛", "country_id": "370"},
-        {"id": 111, "cname": "黎巴嫩", "country_id": "961"},
-        {"id": 110, "cname": "老挝", "country_id": "856"},
-        {"id": 109, "cname": "莱索托", "country_id": "266"},
-        {"id": 108, "cname": "拉脱维亚", "country_id": "371"},
-        {"id": 107, "cname": "库克岛", "country_id": "682"},
-        {"id": 94, "cname": "加纳", "country_id": "233"},
-        {"id": 93, "cname": "几内亚比绍", "country_id": "245"},
-        {"id": 92, "cname": "几内亚", "country_id": "224"},
-        {"id": 79, "cname": "格林纳达", "country_id": "1473"},
-        {"id": 78, "cname": "哥斯达黎加", "country_id": "506"},
-        {"id": 77, "cname": "哥伦比亚", "country_id": "57"},
-        {"id": 76, "cname": "刚果(金)", "country_id": "243"},
-        {"id": 75, "cname": "刚果", "country_id": "242"},
-        {"id": 74, "cname": "冈比亚", "country_id": "220"},
-        {"id": 73, "cname": "福克兰岛", "country_id": "500"},
-        {"id": 72, "cname": "佛得角", "country_id": "238"},
-        {"id": 71, "cname": "芬兰", "country_id": "358"},
-        {"id": 70, "cname": "斐济", "country_id": "679"},
-        {"id": 80, "cname": "格陵兰岛", "country_id": "299"},
-        {"id": 81, "cname": "古巴", "country_id": "53"},
-        {"id": 91, "cname": "吉尔吉斯斯坦", "country_id": "996"},
-        {"id": 90, "cname": "吉布提", "country_id": "253"},
-        {"id": 89, "cname": "基里巴斯", "country_id": "686"},
-        {"id": 88, "cname": "维克岛", "country_id": "1808"},
-        {"id": 87, "cname": "洪都拉斯", "country_id": "504"},
-        {"id": 86, "cname": "荷兰", "country_id": "31"},
-        {"id": 85, "cname": "朝鲜", "country_id": "850"},
-        {"id": 84, "cname": "海地", "country_id": "509"},
-        {"id": 83, "cname": "关岛", "country_id": "1671"},
-        {"id": 82, "cname": "瓜德罗普岛", "country_id": "590"},
-        {"id": 69, "cname": "菲律宾", "country_id": "63"}
-      ];
+    {"id": 1, "cname": "中国大陆", "country_id": "86"},
+    {"id": 5, "cname": "中国香港特别行政区", "country_id": "852"},
+    {"id": 2, "cname": "中国澳门特别行政区", "country_id": "853"},
+    {"id": 3, "cname": "中国台湾", "country_id": "886"},
+    {"id": 4, "cname": "美国", "country_id": "1"},
+    {"id": 6, "cname": "比利时", "country_id": "32"},
+    {"id": 7, "cname": "澳大利亚", "country_id": "61"},
+    {"id": 8, "cname": "法国", "country_id": "33"},
+    {"id": 9, "cname": "加拿大", "country_id": "1"},
+    {"id": 10, "cname": "日本", "country_id": "81"},
+    {"id": 11, "cname": "新加坡", "country_id": "65"},
+    {"id": 12, "cname": "韩国", "country_id": "82"},
+    {"id": 13, "cname": "马来西亚", "country_id": "60"},
+    {"id": 14, "cname": "英国", "country_id": "44"},
+    {"id": 15, "cname": "意大利", "country_id": "39"},
+    {"id": 16, "cname": "德国", "country_id": "49"},
+    {"id": 18, "cname": "俄罗斯", "country_id": "7"},
+    {"id": 19, "cname": "新西兰", "country_id": "64"}, //common:1-19
+    {"id": 153, "cname": "瓦利斯群岛和富图纳群岛", "country_id": "1681"},
+    {"id": 152, "cname": "葡萄牙", "country_id": "351"},
+    {"id": 151, "cname": "帕劳", "country_id": "680"},
+    {"id": 150, "cname": "诺福克岛", "country_id": "672"},
+    {"id": 149, "cname": "挪威", "country_id": "47"},
+    {"id": 148, "cname": "纽埃岛", "country_id": "683"},
+    {"id": 147, "cname": "尼日利亚", "country_id": "234"},
+    {"id": 146, "cname": "尼日尔", "country_id": "227"},
+    {"id": 145, "cname": "尼加拉瓜", "country_id": "505"},
+    {"id": 144, "cname": "尼泊尔", "country_id": "977"},
+    {"id": 143, "cname": "瑙鲁", "country_id": "674"},
+    {"id": 154, "cname": "格鲁吉亚", "country_id": "995"},
+    {"id": 155, "cname": "瑞典", "country_id": "46"},
+    {"id": 165, "cname": "沙特阿拉伯", "country_id": "966"},
+    {"id": 164, "cname": "桑给巴尔岛", "country_id": "259"},
+    {"id": 163, "cname": "塞舌尔共和国", "country_id": "248"},
+    {"id": 162, "cname": "塞浦路斯", "country_id": "357"},
+    {"id": 161, "cname": "塞内加尔", "country_id": "221"},
+    {"id": 160, "cname": "塞拉利昂", "country_id": "232"},
+    {"id": 159, "cname": "萨摩亚，东部", "country_id": "684"},
+    {"id": 158, "cname": "萨摩亚，西部", "country_id": "685"},
+    {"id": 157, "cname": "萨尔瓦多", "country_id": "503"},
+    {"id": 156, "cname": "瑞士", "country_id": "41"},
+    {"id": 166, "cname": "圣多美和普林西比", "country_id": "239"},
+    {"id": 142, "cname": "塞尔维亚", "country_id": "381"},
+    {"id": 141, "cname": "南非", "country_id": "27"},
+    {"id": 128, "cname": "毛里塔尼亚", "country_id": "222"},
+    {"id": 127, "cname": "毛里求斯", "country_id": "230"},
+    {"id": 126, "cname": "马歇尔岛", "country_id": "692"},
+    {"id": 125, "cname": "马提尼克岛", "country_id": "596"},
+    {"id": 124, "cname": "马其顿", "country_id": "389"},
+    {"id": 123, "cname": "马里亚纳岛", "country_id": "1670"},
+    {"id": 122, "cname": "马里", "country_id": "223"},
+    {"id": 121, "cname": "马拉维", "country_id": "265"},
+    {"id": 120, "cname": "马耳他", "country_id": "356"},
+    {"id": 119, "cname": "马尔代夫", "country_id": "960"},
+    {"id": 129, "cname": "蒙古", "country_id": "976"},
+    {"id": 130, "cname": "蒙特塞拉特岛", "country_id": "1664"},
+    {"id": 140, "cname": "纳米比亚", "country_id": "264"},
+    {"id": 139, "cname": "墨西哥", "country_id": "52"},
+    {"id": 138, "cname": "莫桑比克", "country_id": "258"},
+    {"id": 137, "cname": "摩纳哥", "country_id": "377"},
+    {"id": 136, "cname": "摩洛哥", "country_id": "212"},
+    {"id": 135, "cname": "摩尔多瓦", "country_id": "373"},
+    {"id": 134, "cname": "缅甸", "country_id": "95"},
+    {"id": 133, "cname": "密克罗尼西亚", "country_id": "691"},
+    {"id": 132, "cname": "秘鲁", "country_id": "51"},
+    {"id": 131, "cname": "孟加拉国", "country_id": "880"},
+    {"id": 118, "cname": "马达加斯加", "country_id": "261"},
+    {"id": 167, "cname": "圣卢西亚", "country_id": "1784"},
+    {"id": 216, "cname": "智利", "country_id": "56"},
+    {"id": 203, "cname": "牙买加", "country_id": "1876"},
+    {"id": 202, "cname": "叙利亚", "country_id": "963"},
+    {"id": 201, "cname": "匈牙利", "country_id": "36"},
+    {"id": 200, "cname": "科特迪瓦", "country_id": "225"},
+    {"id": 199, "cname": "希腊", "country_id": "30"},
+    {"id": 198, "cname": "西班牙", "country_id": "34"},
+    {"id": 197, "cname": "乌兹别克斯坦", "country_id": "998"},
+    {"id": 196, "cname": "乌拉圭", "country_id": "598"},
+    {"id": 195, "cname": "乌克兰", "country_id": "380"},
+    {"id": 194, "cname": "乌干达", "country_id": "256"},
+    {"id": 204, "cname": "亚美尼亚", "country_id": "374"},
+    {"id": 205, "cname": "也门", "country_id": "967"},
+    {"id": 215, "cname": "直布罗陀", "country_id": "350"},
+    {"id": 214, "cname": "乍得", "country_id": "235"},
+    {"id": 213, "cname": "赞比亚", "country_id": "260"},
+    {"id": 212, "cname": "越南", "country_id": "84"},
+    {"id": 211, "cname": "约旦", "country_id": "962"},
+    {"id": 210, "cname": "印尼", "country_id": "62"},
+    {"id": 209, "cname": "印度", "country_id": "91"},
+    {"id": 208, "cname": "以色列", "country_id": "972"},
+    {"id": 207, "cname": "伊朗", "country_id": "98"},
+    {"id": 206, "cname": "伊拉克", "country_id": "964"},
+    {"id": 193, "cname": "文莱", "country_id": "673"},
+    {"id": 192, "cname": "委内瑞拉", "country_id": "58"},
+    {"id": 191, "cname": "维珍群岛(英属)", "country_id": "1284"},
+    {"id": 178, "cname": "泰国", "country_id": "66"},
+    {"id": 177, "cname": "索马里", "country_id": "252"},
+    {"id": 176, "cname": "所罗门群岛", "country_id": "677"},
+    {"id": 175, "cname": "苏里南", "country_id": "597"},
+    {"id": 174, "cname": "苏丹", "country_id": "249"},
+    {"id": 173, "cname": "斯威士兰", "country_id": "268"},
+    {"id": 172, "cname": "斯洛文尼亚", "country_id": "386"},
+    {"id": 171, "cname": "斯洛伐克", "country_id": "421"},
+    {"id": 170, "cname": "斯里兰卡", "country_id": "94"},
+    {"id": 169, "cname": "圣皮埃尔和密克隆群岛", "country_id": "508"},
+    {"id": 179, "cname": "坦桑尼亚", "country_id": "255"},
+    {"id": 180, "cname": "汤加", "country_id": "676"},
+    {"id": 190, "cname": "维珍群岛(美属)", "country_id": "1340"},
+    {"id": 189, "cname": "瓦努阿图", "country_id": "678"},
+    {"id": 188, "cname": "托克劳岛", "country_id": "690"},
+    {"id": 187, "cname": "土库曼斯坦", "country_id": "993"},
+    {"id": 186, "cname": "土耳其", "country_id": "90"},
+    {"id": 185, "cname": "图瓦卢", "country_id": "688"},
+    {"id": 184, "cname": "突尼斯", "country_id": "216"},
+    {"id": 183, "cname": "阿森松岛", "country_id": "247"},
+    {"id": 182, "cname": "特立尼达和多巴哥", "country_id": "1868"},
+    {"id": 181, "cname": "特克斯和凯科斯", "country_id": "1649"},
+    {"id": 168, "cname": "圣马力诺", "country_id": "378"},
+    {"id": 67, "cname": "法属圭亚那", "country_id": "594"},
+    {"id": 54, "cname": "不丹", "country_id": "975"},
+    {"id": 53, "cname": "博茨瓦纳", "country_id": "267"},
+    {"id": 52, "cname": "伯利兹", "country_id": "501"},
+    {"id": 51, "cname": "玻利维亚", "country_id": "591"},
+    {"id": 50, "cname": "波兰", "country_id": "48"},
+    {"id": 49, "cname": "波黑", "country_id": "387"},
+    {"id": 48, "cname": "波多黎各", "country_id": "1787"},
+    {"id": 47, "cname": "冰岛", "country_id": "354"},
+    {"id": 46, "cname": "贝宁", "country_id": "229"},
+    {"id": 45, "cname": "保加利亚", "country_id": "359"},
+    {"id": 55, "cname": "布基纳法索", "country_id": "226"},
+    {"id": 56, "cname": "布隆迪", "country_id": "257"},
+    {"id": 66, "cname": "法属波利尼西亚", "country_id": "689"},
+    {"id": 65, "cname": "法罗岛", "country_id": "298"},
+    {"id": 64, "cname": "厄立特里亚", "country_id": "291"},
+    {"id": 63, "cname": "厄瓜多尔", "country_id": "593"},
+    {"id": 62, "cname": "多米尼加代表", "country_id": "1809"},
+    {"id": 61, "cname": "多米尼加", "country_id": "1767"},
+    {"id": 60, "cname": "多哥", "country_id": "228"},
+    {"id": 59, "cname": "迪戈加西亚岛", "country_id": "246"},
+    {"id": 58, "cname": "丹麦", "country_id": "45"},
+    {"id": 57, "cname": "赤道几内亚", "country_id": "240"},
+    {"id": 44, "cname": "百慕大群岛", "country_id": "1441"},
+    {"id": 43, "cname": "白俄罗斯", "country_id": "375"},
+    {"id": 42, "cname": "巴西", "country_id": "55"},
+    {"id": 29, "cname": "爱尔兰", "country_id": "353"},
+    {"id": 28, "cname": "埃塞俄比亚", "country_id": "251"},
+    {"id": 27, "cname": "埃及", "country_id": "20"},
+    {"id": 26, "cname": "阿塞拜疆", "country_id": "994"},
+    {"id": 25, "cname": "阿曼", "country_id": "968"},
+    {"id": 24, "cname": "阿联酋", "country_id": "971"},
+    {"id": 23, "cname": "阿根廷", "country_id": "54"},
+    {"id": 22, "cname": "阿富汗", "country_id": "93"},
+    {"id": 21, "cname": "阿尔及利亚", "country_id": "213"},
+    {"id": 20, "cname": "阿尔巴尼亚", "country_id": "355"},
+    {"id": 30, "cname": "爱沙尼亚", "country_id": "372"},
+    {"id": 31, "cname": "安道尔", "country_id": "376"},
+    {"id": 41, "cname": "巴拿马", "country_id": "507"},
+    {"id": 40, "cname": "巴林", "country_id": "973"},
+    {"id": 39, "cname": "巴拉圭", "country_id": "595"},
+    {"id": 38, "cname": "巴基斯坦", "country_id": "92"},
+    {"id": 37, "cname": "巴哈马群岛", "country_id": "1242"},
+    {"id": 36, "cname": "巴布亚新几内亚", "country_id": "675"},
+    {"id": 35, "cname": "巴巴多斯", "country_id": "1246"},
+    {"id": 34, "cname": "奥地利", "country_id": "43"},
+    {"id": 33, "cname": "安提瓜岛和巴布达", "country_id": "1268"},
+    {"id": 32, "cname": "安哥拉", "country_id": "244"},
+    {"id": 68, "cname": "非洲中部", "country_id": "236"},
+    {"id": 117, "cname": "罗马尼亚", "country_id": "40"},
+    {"id": 104, "cname": "科威特", "country_id": "965"},
+    {"id": 103, "cname": "科摩罗", "country_id": "269"},
+    {"id": 102, "cname": "开曼群岛", "country_id": "1345"},
+    {"id": 101, "cname": "卡塔尔", "country_id": "974"},
+    {"id": 100, "cname": "喀麦隆", "country_id": "237"},
+    {"id": 99, "cname": "聚会岛", "country_id": "262"},
+    {"id": 98, "cname": "津巴布韦", "country_id": "263"},
+    {"id": 97, "cname": "捷克", "country_id": "420"},
+    {"id": 96, "cname": "柬埔寨", "country_id": "855"},
+    {"id": 95, "cname": "加蓬", "country_id": "241"},
+    {"id": 105, "cname": "克罗地亚", "country_id": "385"},
+    {"id": 106, "cname": "肯尼亚", "country_id": "254"},
+    {"id": 116, "cname": "卢旺达", "country_id": "250"},
+    {"id": 115, "cname": "卢森堡", "country_id": "352"},
+    {"id": 114, "cname": "利比亚", "country_id": "218"},
+    {"id": 113, "cname": "利比里亚", "country_id": "231"},
+    {"id": 112, "cname": "立陶宛", "country_id": "370"},
+    {"id": 111, "cname": "黎巴嫩", "country_id": "961"},
+    {"id": 110, "cname": "老挝", "country_id": "856"},
+    {"id": 109, "cname": "莱索托", "country_id": "266"},
+    {"id": 108, "cname": "拉脱维亚", "country_id": "371"},
+    {"id": 107, "cname": "库克岛", "country_id": "682"},
+    {"id": 94, "cname": "加纳", "country_id": "233"},
+    {"id": 93, "cname": "几内亚比绍", "country_id": "245"},
+    {"id": 92, "cname": "几内亚", "country_id": "224"},
+    {"id": 79, "cname": "格林纳达", "country_id": "1473"},
+    {"id": 78, "cname": "哥斯达黎加", "country_id": "506"},
+    {"id": 77, "cname": "哥伦比亚", "country_id": "57"},
+    {"id": 76, "cname": "刚果(金)", "country_id": "243"},
+    {"id": 75, "cname": "刚果", "country_id": "242"},
+    {"id": 74, "cname": "冈比亚", "country_id": "220"},
+    {"id": 73, "cname": "福克兰岛", "country_id": "500"},
+    {"id": 72, "cname": "佛得角", "country_id": "238"},
+    {"id": 71, "cname": "芬兰", "country_id": "358"},
+    {"id": 70, "cname": "斐济", "country_id": "679"},
+    {"id": 80, "cname": "格陵兰岛", "country_id": "299"},
+    {"id": 81, "cname": "古巴", "country_id": "53"},
+    {"id": 91, "cname": "吉尔吉斯斯坦", "country_id": "996"},
+    {"id": 90, "cname": "吉布提", "country_id": "253"},
+    {"id": 89, "cname": "基里巴斯", "country_id": "686"},
+    {"id": 88, "cname": "维克岛", "country_id": "1808"},
+    {"id": 87, "cname": "洪都拉斯", "country_id": "504"},
+    {"id": 86, "cname": "荷兰", "country_id": "31"},
+    {"id": 85, "cname": "朝鲜", "country_id": "850"},
+    {"id": 84, "cname": "海地", "country_id": "509"},
+    {"id": 83, "cname": "关岛", "country_id": "1671"},
+    {"id": 82, "cname": "瓜德罗普岛", "country_id": "590"},
+    {"id": 69, "cname": "菲律宾", "country_id": "63"},
+  ];
 }
diff --git a/lib/common/skeleton/dynamic_card.dart b/lib/common/skeleton/dynamic_card.dart
index 4c43e453a..94063e3d2 100644
--- a/lib/common/skeleton/dynamic_card.dart
+++ b/lib/common/skeleton/dynamic_card.dart
@@ -47,7 +47,7 @@ class DynamicCardSkeleton extends StatelessWidget {
                       height: 11,
                     ),
                   ],
-                )
+                ),
               ],
             ),
             Container(
@@ -102,19 +102,20 @@ class DynamicCardSkeleton extends StatelessWidget {
                     ),
                     style: TextButton.styleFrom(
                       padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
-                      foregroundColor:
-                          theme.colorScheme.outline.withValues(alpha: 0.2),
+                      foregroundColor: theme.colorScheme.outline.withValues(
+                        alpha: 0.2,
+                      ),
                     ),
                     label: Text(
                       i == 0
                           ? '转发'
                           : i == 1
-                              ? '评论'
-                              : '点赞',
+                          ? '评论'
+                          : '点赞',
                     ),
-                  )
+                  ),
               ],
-            )
+            ),
           ],
         ),
       ),
diff --git a/lib/common/skeleton/media_bangumi.dart b/lib/common/skeleton/media_bangumi.dart
index 681e3524b..eb26f30c2 100644
--- a/lib/common/skeleton/media_bangumi.dart
+++ b/lib/common/skeleton/media_bangumi.dart
@@ -16,7 +16,11 @@ class _MediaPgcSkeletonState extends State<MediaPgcSkeleton> {
     return Skeleton(
       child: Padding(
         padding: const EdgeInsets.fromLTRB(
-            StyleString.safeSpace, 7, StyleString.safeSpace, 7),
+          StyleString.safeSpace,
+          7,
+          StyleString.safeSpace,
+          7,
+        ),
         child: Row(
           children: [
             Container(
@@ -62,8 +66,9 @@ class _MediaPgcSkeletonState extends State<MediaPgcSkeleton> {
                       width: 90,
                       height: 35,
                       decoration: BoxDecoration(
-                        borderRadius:
-                            const BorderRadius.all(Radius.circular(20)),
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(20),
+                        ),
                         color: bgColor,
                       ),
                     ),
diff --git a/lib/common/skeleton/skeleton.dart b/lib/common/skeleton/skeleton.dart
index 40f6560f9..874652c89 100644
--- a/lib/common/skeleton/skeleton.dart
+++ b/lib/common/skeleton/skeleton.dart
@@ -74,14 +74,14 @@ class ShimmerState extends State<Shimmer> with SingleTickerProviderStateMixin {
   }
 
   LinearGradient get gradient => LinearGradient(
-        colors: widget.linearGradient.colors,
-        stops: widget.linearGradient.stops,
-        begin: widget.linearGradient.begin,
-        end: widget.linearGradient.end,
-        transform: _SlidingGradientTransform(
-          slidePercent: _shimmerController.value,
-        ),
-      );
+    colors: widget.linearGradient.colors,
+    stops: widget.linearGradient.stops,
+    begin: widget.linearGradient.begin,
+    end: widget.linearGradient.end,
+    transform: _SlidingGradientTransform(
+      slidePercent: _shimmerController.value,
+    ),
+  );
 
   bool get isSized =>
       (context.findRenderObject() as RenderBox?)?.hasSize ?? false;
diff --git a/lib/common/skeleton/space_opus.dart b/lib/common/skeleton/space_opus.dart
index b07062643..e62e15c42 100644
--- a/lib/common/skeleton/space_opus.dart
+++ b/lib/common/skeleton/space_opus.dart
@@ -20,7 +20,8 @@ class SpaceOpusSkeleton extends StatelessWidget {
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Container(
-                  height: (0.68 + 0.82 * Utils.random.nextDouble()) *
+                  height:
+                      (0.68 + 0.82 * Utils.random.nextDouble()) *
                       constraints.maxWidth,
                   color: surface,
                 ),
@@ -33,8 +34,11 @@ class SpaceOpusSkeleton extends StatelessWidget {
                 Container(
                   height: 10,
                   color: surface,
-                  margin:
-                      const EdgeInsets.only(left: 10, right: 10, bottom: 10),
+                  margin: const EdgeInsets.only(
+                    left: 10,
+                    right: 10,
+                    bottom: 10,
+                  ),
                   width: constraints.maxWidth,
                 ),
               ],
diff --git a/lib/common/skeleton/video_card_h.dart b/lib/common/skeleton/video_card_h.dart
index 90a2a143f..7210ef4c0 100644
--- a/lib/common/skeleton/video_card_h.dart
+++ b/lib/common/skeleton/video_card_h.dart
@@ -68,7 +68,7 @@ class VideoCardHSkeleton extends StatelessWidget {
                           height: 13,
                         ),
                       ],
-                    )
+                    ),
                   ],
                 ),
               ),
diff --git a/lib/common/skeleton/video_reply.dart b/lib/common/skeleton/video_reply.dart
index bf0ed16d6..e04088c0e 100644
--- a/lib/common/skeleton/video_reply.dart
+++ b/lib/common/skeleton/video_reply.dart
@@ -26,14 +26,18 @@ class VideoReplySkeleton extends StatelessWidget {
                   width: 80,
                   height: 13,
                   color: bgColor,
-                )
+                ),
               ],
             ),
           ),
           Container(
             width: double.infinity,
-            margin:
-                const EdgeInsets.only(top: 4, left: 57, right: 6, bottom: 6),
+            margin: const EdgeInsets.only(
+              top: 4,
+              left: 57,
+              right: 6,
+              bottom: 6,
+            ),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
@@ -71,9 +75,9 @@ class VideoReplySkeleton extends StatelessWidget {
                       margin: const EdgeInsets.only(bottom: 4),
                       color: bgColor,
                     ),
-                    const SizedBox(width: 8)
+                    const SizedBox(width: 8),
                   ],
-                )
+                ),
               ],
             ),
           ),
diff --git a/lib/common/widgets/badge.dart b/lib/common/widgets/badge.dart
index 3a7c8f836..1936dea03 100644
--- a/lib/common/widgets/badge.dart
+++ b/lib/common/widgets/badge.dart
@@ -75,13 +75,16 @@ class PBadge extends StatelessWidget {
         bgColor = Colors.transparent;
         borderColor = theme.secondary;
       case PBadgeType.free:
-        bgColor =
-            Get.isDarkMode ? const Color(0xFFD66011) : const Color(0xFFFF7F24);
+        bgColor = Get.isDarkMode
+            ? const Color(0xFFD66011)
+            : const Color(0xFFFF7F24);
         color = Colors.white;
     }
 
-    late EdgeInsets paddingStyle =
-        const EdgeInsets.symmetric(vertical: 2, horizontal: 3);
+    late EdgeInsets paddingStyle = const EdgeInsets.symmetric(
+      vertical: 2,
+      horizontal: 3,
+    );
     BorderRadius br = size == PBadgeSize.small
         ? const BorderRadius.all(Radius.circular(3))
         : const BorderRadius.all(Radius.circular(4));
diff --git a/lib/common/widgets/color_palette.dart b/lib/common/widgets/color_palette.dart
index 49c3aff30..5008e67ac 100644
--- a/lib/common/widgets/color_palette.dart
+++ b/lib/common/widgets/color_palette.dart
@@ -21,11 +21,11 @@ class ColorPalette extends StatelessWidget {
     final primaryContainer = Color(Hct.from(hct.hue, 30.0, 50.0).toInt());
     final checkbox = Color(Hct.from(hct.hue, 30.0, 40.0).toInt());
     Widget coloredBox(Color color) => Expanded(
-          child: ColoredBox(
-            color: color,
-            child: const SizedBox.expand(),
-          ),
-        );
+      child: ColoredBox(
+        color: color,
+        child: const SizedBox.expand(),
+      ),
+    );
     Widget child = ClipOval(
       child: Column(
         children: [
diff --git a/lib/common/widgets/custom_sliver_persistent_header_delegate.dart b/lib/common/widgets/custom_sliver_persistent_header_delegate.dart
index b010f5b56..993f69b90 100644
--- a/lib/common/widgets/custom_sliver_persistent_header_delegate.dart
+++ b/lib/common/widgets/custom_sliver_persistent_header_delegate.dart
@@ -7,8 +7,8 @@ class CustomSliverPersistentHeaderDelegate
     required this.bgColor,
     double extent = 45,
     this.needRebuild,
-  })  : _minExtent = extent,
-        _maxExtent = extent;
+  }) : _minExtent = extent,
+       _maxExtent = extent;
   final double _minExtent;
   final double _maxExtent;
   final Widget child;
@@ -17,7 +17,10 @@ class CustomSliverPersistentHeaderDelegate
 
   @override
   Widget build(
-      BuildContext context, double shrinkOffset, bool overlapsContent) {
+    BuildContext context,
+    double shrinkOffset,
+    bool overlapsContent,
+  ) {
     //创建child子组件
     //shrinkOffset：child偏移值minExtent~maxExtent
     //overlapsContent：SliverPersistentHeader覆盖其他子组件返回true，否则返回false
diff --git a/lib/common/widgets/custom_toast.dart b/lib/common/widgets/custom_toast.dart
index 196e32c7b..7c6a64b40 100644
--- a/lib/common/widgets/custom_toast.dart
+++ b/lib/common/widgets/custom_toast.dart
@@ -12,12 +12,14 @@ class CustomToast extends StatelessWidget {
   Widget build(BuildContext context) {
     final ThemeData theme = Theme.of(context);
     return Container(
-      margin:
-          EdgeInsets.only(bottom: MediaQuery.paddingOf(context).bottom + 30),
+      margin: EdgeInsets.only(
+        bottom: MediaQuery.paddingOf(context).bottom + 30,
+      ),
       padding: const EdgeInsets.symmetric(horizontal: 17, vertical: 10),
       decoration: BoxDecoration(
-        color:
-            theme.colorScheme.primaryContainer.withValues(alpha: toastOpacity),
+        color: theme.colorScheme.primaryContainer.withValues(
+          alpha: toastOpacity,
+        ),
         borderRadius: const BorderRadius.all(Radius.circular(20)),
       ),
       child: Text(
@@ -47,19 +49,22 @@ class LoadingWidget extends StatelessWidget {
         color: theme.dialogBackgroundColor,
         borderRadius: const BorderRadius.all(Radius.circular(15)),
       ),
-      child: Column(mainAxisSize: MainAxisSize.min, children: [
-        //loading animation
-        CircularProgressIndicator(
-          strokeWidth: 3,
-          valueColor: AlwaysStoppedAnimation(onSurfaceVariant),
-        ),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          //loading animation
+          CircularProgressIndicator(
+            strokeWidth: 3,
+            valueColor: AlwaysStoppedAnimation(onSurfaceVariant),
+          ),
 
-        //msg
-        Container(
-          margin: const EdgeInsets.only(top: 20),
-          child: Text(msg, style: TextStyle(color: onSurfaceVariant)),
-        ),
-      ]),
+          //msg
+          Container(
+            margin: const EdgeInsets.only(top: 20),
+            child: Text(msg, style: TextStyle(color: onSurfaceVariant)),
+          ),
+        ],
+      ),
     );
   }
 }
diff --git a/lib/common/widgets/custom_tooltip.dart b/lib/common/widgets/custom_tooltip.dart
index cf374cf3a..e08cde428 100644
--- a/lib/common/widgets/custom_tooltip.dart
+++ b/lib/common/widgets/custom_tooltip.dart
@@ -108,8 +108,10 @@ class CustomTooltipState extends State<CustomTooltip>
   }
 
   Widget _buildCustomTooltipOverlay(BuildContext context) {
-    final OverlayState overlayState =
-        Overlay.of(context, debugRequiredFor: widget);
+    final OverlayState overlayState = Overlay.of(
+      context,
+      debugRequiredFor: widget,
+    );
     final RenderBox box = this.context.findRenderObject()! as RenderBox;
     final Offset target = box.localToGlobal(
       box.size.center(Offset.zero),
@@ -238,8 +240,10 @@ class _CustomMultiTooltipPositionDelegate extends MultiChildLayoutDelegate {
         }
 
         if (hasChild('overlay')) {
-          final overlaySize =
-              layoutChild('overlay', BoxConstraints.loose(size));
+          final overlaySize = layoutChild(
+            'overlay',
+            BoxConstraints.loose(size),
+          );
           Offset offset = positionDependentBox(
             type: type,
             size: size,
@@ -268,8 +272,10 @@ class _CustomMultiTooltipPositionDelegate extends MultiChildLayoutDelegate {
         }
 
         if (hasChild('overlay')) {
-          final overlaySize =
-              layoutChild('overlay', BoxConstraints.loose(size));
+          final overlaySize = layoutChild(
+            'overlay',
+            BoxConstraints.loose(size),
+          );
           Offset offset = positionDependentBox(
             type: type,
             size: size,
@@ -353,8 +359,9 @@ Offset positionDependentBox({
           target.dy + verticalOffset + childSize.height <= size.height - margin;
       final bool fitsAbove =
           target.dy - verticalOffset - childSize.height >= margin;
-      final bool tooltipBelow =
-          fitsAbove == fitsBelow ? preferBelow : fitsBelow;
+      final bool tooltipBelow = fitsAbove == fitsBelow
+          ? preferBelow
+          : fitsBelow;
       final double y;
       if (tooltipBelow) {
         y = math.min(target.dy + verticalOffset, size.height - margin);
@@ -367,12 +374,17 @@ Offset positionDependentBox({
           // child.
           ? flexibleSpace / 2.0
           : clampDouble(
-              target.dx - childSize.width / 2, margin, flexibleSpace - margin);
+              target.dx - childSize.width / 2,
+              margin,
+              flexibleSpace - margin,
+            );
       return Offset(x, y);
     case TooltipType.right:
       final double dy = math.max(margin, target.dy - childSize.height / 2);
       final double dx = math.min(
-          target.dx + horizontslOffset, size.width - childSize.width - margin);
+        target.dx + horizontslOffset,
+        size.width - childSize.width - margin,
+      );
       return Offset(dx, dy);
   }
 }
diff --git a/lib/common/widgets/dialog/dialog.dart b/lib/common/widgets/dialog/dialog.dart
index bc89da12d..99823fd61 100644
--- a/lib/common/widgets/dialog/dialog.dart
+++ b/lib/common/widgets/dialog/dialog.dart
@@ -15,8 +15,8 @@ void showConfirmDialog({
         content: content is String
             ? Text(content)
             : content is Widget
-                ? content
-                : null,
+            ? content
+            : null,
         actions: [
           TextButton(
             onPressed: Get.back,
@@ -99,7 +99,7 @@ void showPgcFollowDialog({
               Get.back();
               onUpdateStatus(-1);
             },
-          )
+          ),
         ],
       ),
     ),
diff --git a/lib/common/widgets/dialog/report.dart b/lib/common/widgets/dialog/report.dart
index 46c7475aa..6da40b676 100644
--- a/lib/common/widgets/dialog/report.dart
+++ b/lib/common/widgets/dialog/report.dart
@@ -8,7 +8,7 @@ void autoWrapReportDialog(
   BuildContext context,
   Map<String, Map<int, String>> options,
   Future<Map> Function(int reasonType, String? reasonDesc, bool banUid)
-      onSuccess,
+  onSuccess,
 ) {
   int? reasonType;
   String? reasonDesc;
@@ -22,8 +22,11 @@ void autoWrapReportDialog(
           title: const Text('举报'),
           titlePadding: const EdgeInsets.only(left: 22, top: 16, right: 22),
           contentPadding: const EdgeInsets.symmetric(vertical: 5),
-          actionsPadding:
-              const EdgeInsets.only(left: 16, right: 16, bottom: 10),
+          actionsPadding: const EdgeInsets.only(
+            left: 16,
+            right: 16,
+            bottom: 10,
+          ),
           content: Form(
             key: key,
             child: Column(
@@ -56,7 +59,8 @@ void autoWrapReportDialog(
                           ),
                           if (reasonType == 0)
                             ReasonField(
-                                onChanged: (value) => reasonDesc = value),
+                              onChanged: (value) => reasonDesc = value,
+                            ),
                         ],
                       ),
                     ),
@@ -65,7 +69,9 @@ void autoWrapReportDialog(
                 Padding(
                   padding: const EdgeInsets.only(left: 14, top: 6),
                   child: CheckBoxText(
-                      text: '拉黑该用户', onChanged: (value) => banUid = value),
+                    text: '拉黑该用户',
+                    onChanged: (value) => banUid = value,
+                  ),
                 ),
               ],
             ),
@@ -211,33 +217,33 @@ class _CheckBoxTextState extends State<CheckBoxText> {
 class ReportOptions {
   // from https://s1.hdslb.com/bfs/seed/jinkela/comment-h5/static/js/605.chunks.js
   static Map<String, Map<int, String>> get commentReport => const {
-        '违反法律法规': {9: '违法违规', 2: '色情', 10: '低俗', 12: '赌博诈骗', 23: '违法信息外链'},
-        '谣言类不实信息': {19: '涉政谣言', 22: '虚假不实信息', 20: '涉社会事件谣言'},
-        '侵犯个人权益': {7: '人身攻击', 15: '侵犯隐私'},
-        '有害社区环境': {
-          1: '垃圾广告',
-          4: '引战',
-          5: '剧透',
-          3: '刷屏',
-          8: '视频不相关',
-          18: '违规抽奖',
-          17: '青少年不良信息',
-        },
-        '其他': {0: '其他'},
-      };
+    '违反法律法规': {9: '违法违规', 2: '色情', 10: '低俗', 12: '赌博诈骗', 23: '违法信息外链'},
+    '谣言类不实信息': {19: '涉政谣言', 22: '虚假不实信息', 20: '涉社会事件谣言'},
+    '侵犯个人权益': {7: '人身攻击', 15: '侵犯隐私'},
+    '有害社区环境': {
+      1: '垃圾广告',
+      4: '引战',
+      5: '剧透',
+      3: '刷屏',
+      8: '视频不相关',
+      18: '违规抽奖',
+      17: '青少年不良信息',
+    },
+    '其他': {0: '其他'},
+  };
 
   static Map<String, Map<int, String>> get dynamicReport => const {
-        '': {
-          4: '垃圾广告',
-          8: '引战',
-          1: '色情',
-          5: '人身攻击',
-          3: '违法信息',
-          9: '涉政谣言',
-          10: '涉社会事件谣言',
-          12: '虚假不实信息',
-          13: '违法信息外链',
-          0: '其他',
-        },
-      };
+    '': {
+      4: '垃圾广告',
+      8: '引战',
+      1: '色情',
+      5: '人身攻击',
+      3: '违法信息',
+      9: '涉政谣言',
+      10: '涉社会事件谣言',
+      12: '虚假不实信息',
+      13: '违法信息外链',
+      0: '其他',
+    },
+  };
 }
diff --git a/lib/common/widgets/disabled_icon.dart b/lib/common/widgets/disabled_icon.dart
index b9991c7a5..f51e95ffb 100644
--- a/lib/common/widgets/disabled_icon.dart
+++ b/lib/common/widgets/disabled_icon.dart
@@ -14,9 +14,9 @@ class DisabledIcon<T extends Widget> extends SingleChildRenderObjectWidget {
     this.color,
     double? lineLengthScale,
     StrokeCap? strokeCap,
-  })  : lineLengthScale = lineLengthScale ?? 0.9,
-        strokeCap = strokeCap ?? StrokeCap.butt,
-        super(child: child);
+  }) : lineLengthScale = lineLengthScale ?? 0.9,
+       strokeCap = strokeCap ?? StrokeCap.butt,
+       super(child: child);
 
   @override
   RenderObject createRenderObject(BuildContext context) {
@@ -60,16 +60,17 @@ class RenderMaskedIcon extends RenderProxyBox {
     // );
 
     final path = Path.combine(
-        PathOperation.union,
-        Path() // bottom
-          ..moveTo(rect.left, rect.bottom)
-          ..lineTo(rect.left, rect.top + sqrt2Width)
-          ..lineTo(rect.right - sqrt2Width, rect.bottom)
-          ..close(),
-        Path() // top
-          ..moveTo(rect.right, rect.top)
-          ..lineTo(rect.right, rect.bottom - sqrt2Width)
-          ..lineTo(rect.left + sqrt2Width, rect.top));
+      PathOperation.union,
+      Path() // bottom
+        ..moveTo(rect.left, rect.bottom)
+        ..lineTo(rect.left, rect.top + sqrt2Width)
+        ..lineTo(rect.right - sqrt2Width, rect.bottom)
+        ..close(),
+      Path() // top
+        ..moveTo(rect.right, rect.top)
+        ..lineTo(rect.right, rect.bottom - sqrt2Width)
+        ..lineTo(rect.left + sqrt2Width, rect.top),
+    );
 
     canvas
       ..save()
diff --git a/lib/common/widgets/draggable_sheet/draggable_scrollable_sheet_dyn.dart b/lib/common/widgets/draggable_sheet/draggable_scrollable_sheet_dyn.dart
index e8e541080..59585f9ef 100644
--- a/lib/common/widgets/draggable_sheet/draggable_scrollable_sheet_dyn.dart
+++ b/lib/common/widgets/draggable_sheet/draggable_scrollable_sheet_dyn.dart
@@ -104,16 +104,19 @@ class DraggableScrollableController extends ChangeNotifier {
   /// When calling [animateTo] in widget tests, `await`ing the returned
   /// [Future] may cause the test to hang and timeout. Instead, use
   /// [WidgetTester.pumpAndSettle].
-  Future<void> animateTo(double size,
-      {required Duration duration, required Curve curve}) async {
+  Future<void> animateTo(
+    double size, {
+    required Duration duration,
+    required Curve curve,
+  }) async {
     _assertAttached();
     assert(size >= 0 && size <= 1);
     assert(duration != Duration.zero);
     final AnimationController animationController =
         AnimationController.unbounded(
-      vsync: _attachedController!.position.context.vsync,
-      value: _attachedController!.extent.currentSize,
-    );
+          vsync: _attachedController!.position.context.vsync,
+          value: _attachedController!.extent.currentSize,
+        );
     _animationControllers.add(animationController);
     _attachedController!.position.goIdle();
     // This disables any snapping until the next user interaction with the sheet.
@@ -134,8 +137,11 @@ class DraggableScrollableController extends ChangeNotifier {
       );
     });
     await animationController.animateTo(
-      clampDouble(size, _attachedController!.extent.minSize,
-          _attachedController!.extent.maxSize),
+      clampDouble(
+        size,
+        _attachedController!.extent.minSize,
+        _attachedController!.extent.maxSize,
+      ),
       duration: duration,
       curve: curve,
     );
@@ -291,12 +297,13 @@ class DraggableScrollableSheet extends StatefulWidget {
     this.controller,
     this.shouldCloseOnMinExtent = true,
     required this.builder,
-  })  : assert(minChildSize >= 0.0),
-        assert(maxChildSize <= 1.0),
-        assert(minChildSize <= initialChildSize),
-        assert(initialChildSize <= maxChildSize),
-        assert(snapAnimationDuration == null ||
-            snapAnimationDuration > Duration.zero);
+  }) : assert(minChildSize >= 0.0),
+       assert(maxChildSize <= 1.0),
+       assert(minChildSize <= initialChildSize),
+       assert(initialChildSize <= maxChildSize),
+       assert(
+         snapAnimationDuration == null || snapAnimationDuration > Duration.zero,
+       );
 
   /// The initial fractional value of the parent container's height to use when
   /// displaying the widget.
@@ -414,14 +421,14 @@ class _DraggableSheetExtent {
     bool? hasDragged,
     bool? hasChanged,
     this.shouldCloseOnMinExtent = true,
-  })  : assert(minSize >= 0),
-        assert(maxSize <= 1),
-        assert(minSize <= initialSize),
-        assert(initialSize <= maxSize),
-        _currentSize = currentSize ?? ValueNotifier<double>(initialSize),
-        availablePixels = double.infinity,
-        hasDragged = hasDragged ?? false,
-        hasChanged = hasChanged ?? false {
+  }) : assert(minSize >= 0),
+       assert(maxSize <= 1),
+       assert(minSize <= initialSize),
+       assert(initialSize <= maxSize),
+       _currentSize = currentSize ?? ValueNotifier<double>(initialSize),
+       availablePixels = double.infinity,
+       hasDragged = hasDragged ?? false,
+       hasChanged = hasChanged ?? false {
     assert(debugMaybeDispatchCreated('widgets', '_DraggableSheetExtent', this));
   }
 
@@ -569,8 +576,9 @@ class _DraggableScrollableSheetState extends State<DraggableScrollableSheet> {
       initialSize: widget.initialChildSize,
       shouldCloseOnMinExtent: widget.shouldCloseOnMinExtent,
     );
-    _scrollController =
-        _DraggableScrollableSheetScrollController(extent: _extent);
+    _scrollController = _DraggableScrollableSheetScrollController(
+      extent: _extent,
+    );
     widget.controller?._attach(_scrollController);
   }
 
@@ -621,17 +629,17 @@ class _DraggableScrollableSheetState extends State<DraggableScrollableSheet> {
       valueListenable: _extent._currentSize,
       builder: (BuildContext context, double currentSize, Widget? child) =>
           LayoutBuilder(
-        builder: (BuildContext context, BoxConstraints constraints) {
-          _extent.availablePixels =
-              widget.maxChildSize * constraints.biggest.height;
-          final Widget sheet = FractionallySizedBox(
-            heightFactor: currentSize,
-            alignment: Alignment.bottomCenter,
-            child: child,
-          );
-          return widget.expand ? SizedBox.expand(child: sheet) : sheet;
-        },
-      ),
+            builder: (BuildContext context, BoxConstraints constraints) {
+              _extent.availablePixels =
+                  widget.maxChildSize * constraints.biggest.height;
+              final Widget sheet = FractionallySizedBox(
+                heightFactor: currentSize,
+                alignment: Alignment.bottomCenter,
+                child: child,
+              );
+              return widget.expand ? SizedBox.expand(child: sheet) : sheet;
+            },
+          ),
       child: widget.builder(context, _scrollController),
     );
   }
@@ -675,9 +683,11 @@ class _DraggableScrollableSheetState extends State<DraggableScrollableSheet> {
       // this runs-we can't use the previous extent's available pixels as it may
       // have changed when the widget was updated.
       WidgetsBinding.instance.addPostFrameCallback((Duration timeStamp) {
-        for (int index = 0;
-            index < _scrollController.positions.length;
-            index++) {
+        for (
+          int index = 0;
+          index < _scrollController.positions.length;
+          index++
+        ) {
           final _DraggableScrollableSheetScrollPosition position =
               _scrollController.positions.elementAt(index)
                   as _DraggableScrollableSheetScrollPosition;
@@ -688,14 +698,17 @@ class _DraggableScrollableSheetState extends State<DraggableScrollableSheet> {
   }
 
   String _snapSizeErrorMessage(int invalidIndex) {
-    final List<String> snapSizesWithIndicator =
-        widget.snapSizes!.asMap().keys.map((int index) {
-      final String snapSizeString = widget.snapSizes![index].toString();
-      if (index == invalidIndex) {
-        return '>>> $snapSizeString <<<';
-      }
-      return snapSizeString;
-    }).toList();
+    final List<String> snapSizesWithIndicator = widget.snapSizes!
+        .asMap()
+        .keys
+        .map((int index) {
+          final String snapSizeString = widget.snapSizes![index].toString();
+          if (index == invalidIndex) {
+            return '>>> $snapSizeString <<<';
+          }
+          return snapSizeString;
+        })
+        .toList();
     return "Invalid snapSize '${widget.snapSizes![invalidIndex]}' at index $invalidIndex of:\n"
         '  $snapSizesWithIndicator';
   }
@@ -755,11 +768,16 @@ class _DraggableScrollableSheetScrollController extends ScrollController {
     // Just animate really fast.
     // Avoid doing it at all if the offset is already 0.0.
     if (offset != 0.0) {
-      animateTo(0.0,
-          duration: const Duration(milliseconds: 1), curve: Curves.linear);
+      animateTo(
+        0.0,
+        duration: const Duration(milliseconds: 1),
+        curve: Curves.linear,
+      );
     }
     extent.updateSize(
-        extent.initialSize, position.context.notificationContext!);
+      extent.initialSize,
+      position.context.notificationContext!,
+    );
   }
 
   @override
@@ -901,9 +919,12 @@ class _DraggableScrollableSheetScrollPosition
 
     final AnimationController ballisticController =
         AnimationController.unbounded(
-      debugLabel: objectRuntimeType(this, '_DraggableScrollableSheetPosition'),
-      vsync: context.vsync,
-    );
+          debugLabel: objectRuntimeType(
+            this,
+            '_DraggableScrollableSheetPosition',
+          ),
+          vsync: context.vsync,
+        );
     _ballisticControllers.add(ballisticController);
 
     double lastPosition = extent.currentPixels;
@@ -916,7 +937,8 @@ class _DraggableScrollableSheetScrollPosition
         // Make sure we pass along enough velocity to keep scrolling - otherwise
         // we just "bounce" off the top making it look like the list doesn't
         // have more to scroll.
-        velocity = ballisticController.velocity +
+        velocity =
+            ballisticController.velocity +
             (physics.toleranceFor(this).velocity *
                 ballisticController.velocity.sign);
         super.goBallistic(velocity);
@@ -984,8 +1006,8 @@ class DraggableScrollableActuator extends StatefulWidget {
   /// some [DraggableScrollableSheet] is listening for updates, `false`
   /// otherwise.
   static bool reset(BuildContext context) {
-    final _InheritedResetNotifier? notifier =
-        context.dependOnInheritedWidgetOfExactType<_InheritedResetNotifier>();
+    final _InheritedResetNotifier? notifier = context
+        .dependOnInheritedWidgetOfExactType<_InheritedResetNotifier>();
     return notifier?._sendReset() ?? false;
   }
 
@@ -1040,8 +1062,10 @@ class _ResetNotifier extends ChangeNotifier {
 class _InheritedResetNotifier extends InheritedNotifier<_ResetNotifier> {
   /// Creates an [InheritedNotifier] that the [DraggableScrollableSheet] will
   /// listen to for an indication that it should reset itself back to [DraggableScrollableSheet.initialChildSize].
-  const _InheritedResetNotifier(
-      {required super.child, required _ResetNotifier super.notifier});
+  const _InheritedResetNotifier({
+    required super.child,
+    required _ResetNotifier super.notifier,
+  });
 
   bool _sendReset() => notifier!.sendReset();
 
@@ -1050,8 +1074,8 @@ class _InheritedResetNotifier extends InheritedNotifier<_ResetNotifier> {
   ///
   /// Returns true if the notifier requested a reset, false otherwise.
   static bool shouldReset(BuildContext context) {
-    final InheritedWidget? widget =
-        context.dependOnInheritedWidgetOfExactType<_InheritedResetNotifier>();
+    final InheritedWidget? widget = context
+        .dependOnInheritedWidgetOfExactType<_InheritedResetNotifier>();
     if (widget == null) {
       return false;
     }
@@ -1076,7 +1100,8 @@ class _SnappingSimulation extends Simulation {
 
     if (snapAnimationDuration != null &&
         snapAnimationDuration.inMilliseconds > 0) {
-      velocity = (_pixelSnapSize - position) *
+      velocity =
+          (_pixelSnapSize - position) *
           1000 /
           snapAnimationDuration.inMilliseconds;
     }
@@ -1126,8 +1151,9 @@ class _SnappingSimulation extends Simulation {
   // non-zero, select the size in the velocity's direction. Otherwise,
   // the nearest snap size.
   double _getSnapSize(double initialVelocity, List<double> pixelSnapSizes) {
-    final int indexOfNextSize =
-        pixelSnapSizes.indexWhere((double size) => size >= position);
+    final int indexOfNextSize = pixelSnapSizes.indexWhere(
+      (double size) => size >= position,
+    );
     if (indexOfNextSize == 0) {
       return pixelSnapSizes.first;
     }
diff --git a/lib/common/widgets/draggable_sheet/draggable_scrollable_sheet_topic.dart b/lib/common/widgets/draggable_sheet/draggable_scrollable_sheet_topic.dart
index a2e6fb2be..b9c1c8707 100644
--- a/lib/common/widgets/draggable_sheet/draggable_scrollable_sheet_topic.dart
+++ b/lib/common/widgets/draggable_sheet/draggable_scrollable_sheet_topic.dart
@@ -104,16 +104,19 @@ class DraggableScrollableController extends ChangeNotifier {
   /// When calling [animateTo] in widget tests, `await`ing the returned
   /// [Future] may cause the test to hang and timeout. Instead, use
   /// [WidgetTester.pumpAndSettle].
-  Future<void> animateTo(double size,
-      {required Duration duration, required Curve curve}) async {
+  Future<void> animateTo(
+    double size, {
+    required Duration duration,
+    required Curve curve,
+  }) async {
     _assertAttached();
     assert(size >= 0 && size <= 1);
     assert(duration != Duration.zero);
     final AnimationController animationController =
         AnimationController.unbounded(
-      vsync: _attachedController!.position.context.vsync,
-      value: _attachedController!.extent.currentSize,
-    );
+          vsync: _attachedController!.position.context.vsync,
+          value: _attachedController!.extent.currentSize,
+        );
     _animationControllers.add(animationController);
     _attachedController!.position.goIdle();
     // This disables any snapping until the next user interaction with the sheet.
@@ -134,8 +137,11 @@ class DraggableScrollableController extends ChangeNotifier {
       );
     });
     await animationController.animateTo(
-      clampDouble(size, _attachedController!.extent.minSize,
-          _attachedController!.extent.maxSize),
+      clampDouble(
+        size,
+        _attachedController!.extent.minSize,
+        _attachedController!.extent.maxSize,
+      ),
       duration: duration,
       curve: curve,
     );
@@ -292,12 +298,13 @@ class DraggableScrollableSheet extends StatefulWidget {
     this.shouldCloseOnMinExtent = true,
     this.initialScrollOffset = 0,
     required this.builder,
-  })  : assert(minChildSize >= 0.0),
-        assert(maxChildSize <= 1.0),
-        assert(minChildSize <= initialChildSize),
-        assert(initialChildSize <= maxChildSize),
-        assert(snapAnimationDuration == null ||
-            snapAnimationDuration > Duration.zero);
+  }) : assert(minChildSize >= 0.0),
+       assert(maxChildSize <= 1.0),
+       assert(minChildSize <= initialChildSize),
+       assert(initialChildSize <= maxChildSize),
+       assert(
+         snapAnimationDuration == null || snapAnimationDuration > Duration.zero,
+       );
 
   final double initialScrollOffset;
 
@@ -417,14 +424,14 @@ class _DraggableSheetExtent {
     bool? hasDragged,
     bool? hasChanged,
     this.shouldCloseOnMinExtent = true,
-  })  : assert(minSize >= 0),
-        assert(maxSize <= 1),
-        assert(minSize <= initialSize),
-        assert(initialSize <= maxSize),
-        _currentSize = currentSize ?? ValueNotifier<double>(initialSize),
-        availablePixels = double.infinity,
-        hasDragged = hasDragged ?? false,
-        hasChanged = hasChanged ?? false {
+  }) : assert(minSize >= 0),
+       assert(maxSize <= 1),
+       assert(minSize <= initialSize),
+       assert(initialSize <= maxSize),
+       _currentSize = currentSize ?? ValueNotifier<double>(initialSize),
+       availablePixels = double.infinity,
+       hasDragged = hasDragged ?? false,
+       hasChanged = hasChanged ?? false {
     assert(debugMaybeDispatchCreated('widgets', '_DraggableSheetExtent', this));
   }
 
@@ -626,17 +633,17 @@ class _DraggableScrollableSheetState extends State<DraggableScrollableSheet> {
       valueListenable: _extent._currentSize,
       builder: (BuildContext context, double currentSize, Widget? child) =>
           LayoutBuilder(
-        builder: (BuildContext context, BoxConstraints constraints) {
-          _extent.availablePixels =
-              widget.maxChildSize * constraints.biggest.height;
-          final Widget sheet = FractionallySizedBox(
-            heightFactor: currentSize,
-            alignment: Alignment.bottomCenter,
-            child: child,
-          );
-          return widget.expand ? SizedBox.expand(child: sheet) : sheet;
-        },
-      ),
+            builder: (BuildContext context, BoxConstraints constraints) {
+              _extent.availablePixels =
+                  widget.maxChildSize * constraints.biggest.height;
+              final Widget sheet = FractionallySizedBox(
+                heightFactor: currentSize,
+                alignment: Alignment.bottomCenter,
+                child: child,
+              );
+              return widget.expand ? SizedBox.expand(child: sheet) : sheet;
+            },
+          ),
       child: widget.builder(context, _scrollController),
     );
   }
@@ -680,9 +687,11 @@ class _DraggableScrollableSheetState extends State<DraggableScrollableSheet> {
       // this runs-we can't use the previous extent's available pixels as it may
       // have changed when the widget was updated.
       WidgetsBinding.instance.addPostFrameCallback((Duration timeStamp) {
-        for (int index = 0;
-            index < _scrollController.positions.length;
-            index++) {
+        for (
+          int index = 0;
+          index < _scrollController.positions.length;
+          index++
+        ) {
           final _DraggableScrollableSheetScrollPosition position =
               _scrollController.positions.elementAt(index)
                   as _DraggableScrollableSheetScrollPosition;
@@ -693,14 +702,17 @@ class _DraggableScrollableSheetState extends State<DraggableScrollableSheet> {
   }
 
   String _snapSizeErrorMessage(int invalidIndex) {
-    final List<String> snapSizesWithIndicator =
-        widget.snapSizes!.asMap().keys.map((int index) {
-      final String snapSizeString = widget.snapSizes![index].toString();
-      if (index == invalidIndex) {
-        return '>>> $snapSizeString <<<';
-      }
-      return snapSizeString;
-    }).toList();
+    final List<String> snapSizesWithIndicator = widget.snapSizes!
+        .asMap()
+        .keys
+        .map((int index) {
+          final String snapSizeString = widget.snapSizes![index].toString();
+          if (index == invalidIndex) {
+            return '>>> $snapSizeString <<<';
+          }
+          return snapSizeString;
+        })
+        .toList();
     return "Invalid snapSize '${widget.snapSizes![invalidIndex]}' at index $invalidIndex of:\n"
         '  $snapSizesWithIndicator';
   }
@@ -766,11 +778,16 @@ class _DraggableScrollableSheetScrollController extends ScrollController {
     // Just animate really fast.
     // Avoid doing it at all if the offset is already 0.0.
     if (offset != 0.0) {
-      animateTo(0.0,
-          duration: const Duration(milliseconds: 1), curve: Curves.linear);
+      animateTo(
+        0.0,
+        duration: const Duration(milliseconds: 1),
+        curve: Curves.linear,
+      );
     }
     extent.updateSize(
-        extent.initialSize, position.context.notificationContext!);
+      extent.initialSize,
+      position.context.notificationContext!,
+    );
   }
 
   @override
@@ -905,9 +922,12 @@ class _DraggableScrollableSheetScrollPosition
 
     final AnimationController ballisticController =
         AnimationController.unbounded(
-      debugLabel: objectRuntimeType(this, '_DraggableScrollableSheetPosition'),
-      vsync: context.vsync,
-    );
+          debugLabel: objectRuntimeType(
+            this,
+            '_DraggableScrollableSheetPosition',
+          ),
+          vsync: context.vsync,
+        );
     _ballisticControllers.add(ballisticController);
 
     double lastPosition = extent.currentPixels;
@@ -920,7 +940,8 @@ class _DraggableScrollableSheetScrollPosition
         // Make sure we pass along enough velocity to keep scrolling - otherwise
         // we just "bounce" off the top making it look like the list doesn't
         // have more to scroll.
-        velocity = ballisticController.velocity +
+        velocity =
+            ballisticController.velocity +
             (physics.toleranceFor(this).velocity *
                 ballisticController.velocity.sign);
         super.goBallistic(velocity);
@@ -987,8 +1008,8 @@ class DraggableScrollableActuator extends StatefulWidget {
   /// some [DraggableScrollableSheet] is listening for updates, `false`
   /// otherwise.
   static bool reset(BuildContext context) {
-    final _InheritedResetNotifier? notifier =
-        context.dependOnInheritedWidgetOfExactType<_InheritedResetNotifier>();
+    final _InheritedResetNotifier? notifier = context
+        .dependOnInheritedWidgetOfExactType<_InheritedResetNotifier>();
     return notifier?._sendReset() ?? false;
   }
 
@@ -1043,8 +1064,10 @@ class _ResetNotifier extends ChangeNotifier {
 class _InheritedResetNotifier extends InheritedNotifier<_ResetNotifier> {
   /// Creates an [InheritedNotifier] that the [DraggableScrollableSheet] will
   /// listen to for an indication that it should reset itself back to [DraggableScrollableSheet.initialChildSize].
-  const _InheritedResetNotifier(
-      {required super.child, required _ResetNotifier super.notifier});
+  const _InheritedResetNotifier({
+    required super.child,
+    required _ResetNotifier super.notifier,
+  });
 
   bool _sendReset() => notifier!.sendReset();
 
@@ -1053,8 +1076,8 @@ class _InheritedResetNotifier extends InheritedNotifier<_ResetNotifier> {
   ///
   /// Returns true if the notifier requested a reset, false otherwise.
   static bool shouldReset(BuildContext context) {
-    final InheritedWidget? widget =
-        context.dependOnInheritedWidgetOfExactType<_InheritedResetNotifier>();
+    final InheritedWidget? widget = context
+        .dependOnInheritedWidgetOfExactType<_InheritedResetNotifier>();
     if (widget == null) {
       return false;
     }
@@ -1079,7 +1102,8 @@ class _SnappingSimulation extends Simulation {
 
     if (snapAnimationDuration != null &&
         snapAnimationDuration.inMilliseconds > 0) {
-      velocity = (_pixelSnapSize - position) *
+      velocity =
+          (_pixelSnapSize - position) *
           1000 /
           snapAnimationDuration.inMilliseconds;
     }
@@ -1129,8 +1153,9 @@ class _SnappingSimulation extends Simulation {
   // non-zero, select the size in the velocity's direction. Otherwise,
   // the nearest snap size.
   double _getSnapSize(double initialVelocity, List<double> pixelSnapSizes) {
-    final int indexOfNextSize =
-        pixelSnapSizes.indexWhere((double size) => size >= position);
+    final int indexOfNextSize = pixelSnapSizes.indexWhere(
+      (double size) => size >= position,
+    );
     if (indexOfNextSize == 0) {
       return pixelSnapSizes.first;
     }
diff --git a/lib/common/widgets/image/image_view.dart b/lib/common/widgets/image/image_view.dart
index 879baac18..15ff34363 100644
--- a/lib/common/widgets/image/image_view.dart
+++ b/lib/common/widgets/image/image_view.dart
@@ -54,8 +54,8 @@ Widget imageView(
     imageWidth = ratioWH > 1.5
         ? maxWidth
         : (ratioWH >= 1 || (height > width && ratioHW < 1.5))
-            ? 2 * imageWidth
-            : 1.5 * imageWidth;
+        ? 2 * imageWidth
+        : 1.5 * imageWidth;
     imageHeight = imageWidth * min(ratioHW, _maxRatio);
   } else if (picArr.length == 2) {
     imageWidth = imageHeight = 2 * imageWidth;
@@ -66,19 +66,23 @@ Widget imageView(
       return StyleString.mdRadius;
     }
     return BorderRadius.only(
-      topLeft: index - row >= 0 ||
+      topLeft:
+          index - row >= 0 ||
               ((index - 1) >= 0 && (index - 1) % row < index % row)
           ? Radius.zero
           : StyleString.imgRadius,
-      topRight: index - row >= 0 ||
+      topRight:
+          index - row >= 0 ||
               ((index + 1) < picArr.length && (index + 1) % row > index % row)
           ? Radius.zero
           : StyleString.imgRadius,
-      bottomLeft: index + row < picArr.length ||
+      bottomLeft:
+          index + row < picArr.length ||
               ((index - 1) >= 0 && (index - 1) % row < index % row)
           ? Radius.zero
           : StyleString.imgRadius,
-      bottomRight: index + row < picArr.length ||
+      bottomRight:
+          index + row < picArr.length ||
               ((index + 1) < picArr.length && (index + 1) % row > index % row)
           ? Radius.zero
           : StyleString.imgRadius,
@@ -105,8 +109,9 @@ Widget imageView(
           (item) {
             bool isLive = item.isLivePhoto;
             return SourceModel(
-              sourceType:
-                  isLive ? SourceType.livePhoto : SourceType.networkImage,
+              sourceType: isLive
+                  ? SourceType.livePhoto
+                  : SourceType.networkImage,
               url: item.url,
               liveUrl: isLive ? item.liveUrl : null,
               width: isLive ? parseSize(item.width) : null,
@@ -152,10 +157,9 @@ Widget imageView(
                       width: imageWidth,
                       height: imageHeight,
                       decoration: BoxDecoration(
-                        color: Theme.of(context)
-                            .colorScheme
-                            .onInverseSurface
-                            .withValues(alpha: 0.4),
+                        color: Theme.of(
+                          context,
+                        ).colorScheme.onInverseSurface.withValues(alpha: 0.4),
                         borderRadius: borderRadius(index),
                       ),
                       child: Center(
diff --git a/lib/common/widgets/image/network_img_layer.dart b/lib/common/widgets/image/network_img_layer.dart
index 565e8f137..0adb8d520 100644
--- a/lib/common/widgets/image/network_img_layer.dart
+++ b/lib/common/widgets/image/network_img_layer.dart
@@ -44,15 +44,15 @@ class NetworkImgLayer extends StatelessWidget {
   Widget build(BuildContext context) {
     return src?.isNotEmpty == true
         ? type == ImageType.avatar
-            ? ClipOval(child: _buildImage(context))
-            : radius == 0 || type == ImageType.emote
-                ? _buildImage(context)
-                : ClipRRect(
-                    borderRadius: radius != null
-                        ? BorderRadius.circular(radius!)
-                        : StyleString.mdRadius,
-                    child: _buildImage(context),
-                  )
+              ? ClipOval(child: _buildImage(context))
+              : radius == 0 || type == ImageType.emote
+              ? _buildImage(context)
+              : ClipRRect(
+                  borderRadius: radius != null
+                      ? BorderRadius.circular(radius!)
+                      : StyleString.mdRadius,
+                  child: _buildImage(context),
+                )
         : getPlaceHolder?.call() ?? placeholder(context);
   }
 
@@ -70,8 +70,9 @@ class NetworkImgLayer extends StatelessWidget {
       memCacheWidth: memCacheWidth,
       memCacheHeight: memCacheHeight,
       fit: boxFit ?? BoxFit.cover,
-      alignment:
-          isLongPic?.call() == true ? Alignment.topCenter : Alignment.center,
+      alignment: isLongPic?.call() == true
+          ? Alignment.topCenter
+          : Alignment.center,
       fadeOutDuration: fadeOutDuration ?? const Duration(milliseconds: 120),
       fadeInDuration: fadeInDuration ?? const Duration(milliseconds: 120),
       filterQuality: FilterQuality.low,
@@ -89,16 +90,15 @@ class NetworkImgLayer extends StatelessWidget {
       clipBehavior: Clip.antiAlias,
       decoration: BoxDecoration(
         shape: type == ImageType.avatar ? BoxShape.circle : BoxShape.rectangle,
-        color: Theme.of(context)
-            .colorScheme
-            .onInverseSurface
-            .withValues(alpha: 0.4),
+        color: Theme.of(
+          context,
+        ).colorScheme.onInverseSurface.withValues(alpha: 0.4),
         borderRadius:
             type == ImageType.avatar || type == ImageType.emote || radius == 0
-                ? null
-                : radius != null
-                    ? BorderRadius.circular(radius!)
-                    : StyleString.mdRadius,
+            ? null
+            : radius != null
+            ? BorderRadius.circular(radius!)
+            : StyleString.mdRadius,
       ),
       child: Center(
         child: Image.asset(
diff --git a/lib/common/widgets/image/nine_grid_view.dart b/lib/common/widgets/image/nine_grid_view.dart
index 08d2ce17a..0174bcf5a 100644
--- a/lib/common/widgets/image/nine_grid_view.dart
+++ b/lib/common/widgets/image/nine_grid_view.dart
@@ -133,7 +133,8 @@ class _NineGridViewState extends State<NineGridView> {
     if (widget.itemCount == 0) {
       return Rect.fromLTRB(0, 0, padding.horizontal, padding.vertical);
     }
-    double width = widget.width ??
+    double width =
+        widget.width ??
         (MediaQuery.sizeOf(context).width - widget.margin.horizontal);
     width = width - padding.horizontal;
     double space = widget.space;
@@ -158,18 +159,22 @@ class _NineGridViewState extends State<NineGridView> {
   /// build nine grid view.
   Widget _buildChild(BuildContext context, double itemW) {
     double space = widget.space;
-    int column =
-        (widget.itemCount == 4 && widget.type != NineGridType.normal) ? 2 : 3;
+    int column = (widget.itemCount == 4 && widget.type != NineGridType.normal)
+        ? 2
+        : 3;
     List<Widget> list = [];
     for (int i = 0; i < widget.itemCount; i++) {
-      list.add(Positioned(
+      list.add(
+        Positioned(
           top: (space + itemW) * (i ~/ column),
           left: (space + itemW) * (i % column),
           child: SizedBox(
             width: itemW,
             height: itemW,
             child: widget.itemBuilder(context, i),
-          )));
+          ),
+        ),
+      );
     }
     return Stack(
       clipBehavior: Clip.none,
@@ -191,11 +196,14 @@ class _NineGridViewState extends State<NineGridView> {
       if (!_isZero(bigImgWidth) && !_isZero(bigImgHeight)) {
         return _getOneChild(context, bigImgWidth!, bigImgHeight!);
       } else {
-        _ImageUtil().getImageSize(widget.bigImage)?.then((rect) {
-          ngvBigImageSizeMap[bigImageUrl] = rect;
-          if (!mounted) return;
-          setState(() {});
-        }).catchError((e) {});
+        _ImageUtil()
+            .getImageSize(widget.bigImage)
+            ?.then((rect) {
+              ngvBigImageSizeMap[bigImageUrl] = rect;
+              if (!mounted) return;
+              setState(() {});
+            })
+            .catchError((e) {});
       }
     }
     return null;
@@ -238,7 +246,8 @@ class _NineGridViewState extends State<NineGridView> {
     for (int i = 0; i < widget.itemCount; i++) {
       double left;
       if (first > 0 && i < first) {
-        left = (width - itemW * first - space * (first - 1)) / 2 +
+        left =
+            (width - itemW * first - space * (first - 1)) / 2 +
             (itemW + space) * i;
       } else {
         left = (space + itemW) * ((i - first) % column);
@@ -248,17 +257,21 @@ class _NineGridViewState extends State<NineGridView> {
           ? 0
           : (first > 0 ? (i + column - first) : i) ~/ column;
 
-      double top = (width - itemW * row - space * (row - 1)) / 2 +
+      double top =
+          (width - itemW * row - space * (row - 1)) / 2 +
           (space + itemW) * itemIndex;
 
-      list.add(Positioned(
+      list.add(
+        Positioned(
           top: top,
           left: left,
           child: SizedBox(
             width: itemW,
             height: itemW,
             child: widget.itemBuilder(context, i),
-          )));
+          ),
+        ),
+      );
     }
     return Stack(
       clipBehavior: Clip.none,
@@ -273,18 +286,22 @@ class _NineGridViewState extends State<NineGridView> {
     double itemW = (width - widget.space) / 2;
     List<Widget> children = [];
     for (int i = 0; i < itemCount; i++) {
-      children.add(Positioned(
+      children.add(
+        Positioned(
           top: (widget.space + itemW) * (i ~/ 2),
-          left: (widget.space + itemW) *
+          left:
+              (widget.space + itemW) *
               (((itemCount == 3 && i == 2) ? i + 1 : i) % 2),
           child: SizedBox(
             width: itemCount == 1 ? width : itemW,
             height:
                 (itemCount == 1 || itemCount == 2 || (itemCount == 3 && i == 0))
-                    ? width
-                    : itemW,
+                ? width
+                : itemW,
             child: widget.itemBuilder(context, i),
-          )));
+          ),
+        ),
+      );
     }
     return ClipOval(
       child: Stack(
@@ -300,11 +317,12 @@ class _NineGridViewState extends State<NineGridView> {
     int itemCount = math.min(5, widget.itemCount);
     if (itemCount == 1) {
       return ClipOval(
-          child: SizedBox(
-        width: width,
-        height: width,
-        child: widget.itemBuilder(context, 0),
-      ));
+        child: SizedBox(
+          width: width,
+          height: width,
+          child: widget.itemBuilder(context, 0),
+        ),
+      );
     }
 
     List<Widget> children = [];
@@ -323,7 +341,8 @@ class _NineGridViewState extends State<NineGridView> {
         startDegree = 210;
         r = width / (2 + 4 * math.sin(math.pi * (3 - 2) / (2 * 3)));
         r1 = r / math.cos(math.pi * (3 - 2) / (2 * 3));
-        double R = r *
+        double R =
+            r *
             (1 + math.sin(math.pi / itemCount)) /
             math.sin(math.pi / itemCount);
         double dy = 0.5 * (width - R - r * (1 + 1 / math.tan(math.pi / 3)));
@@ -338,7 +357,8 @@ class _NineGridViewState extends State<NineGridView> {
         startDegree = 126;
         r = width / (2 + 4 * math.sin(math.pi * (5 - 2) / (2 * 5)));
         r1 = r / math.cos(math.pi * (5 - 2) / (2 * 5));
-        double R = r *
+        double R =
+            r *
             (1 + math.sin(math.pi / itemCount)) /
             math.sin(math.pi / itemCount);
         double dy = 0.5 * (width - R - r * (1 + 1 / math.tan(math.pi / 5)));
@@ -388,7 +408,8 @@ class _NineGridViewState extends State<NineGridView> {
 
   /// get big image size.
   Rect _getBigImgSize(double originalWidth, double originalHeight) {
-    double width = widget.width ??
+    double width =
+        widget.width ??
         (MediaQuery.sizeOf(context).width - widget.margin.horizontal);
     width = width - widget.padding.horizontal;
     double itemW = (width - widget.space * 2) / 3;
@@ -475,8 +496,14 @@ class _ImageUtil {
       (ImageInfo info, bool synchronousCall) {
         imageStream.removeListener(listener);
         if (!completer.isCompleted) {
-          completer.complete(Rect.fromLTWH(
-              0, 0, info.image.width.toDouble(), info.image.height.toDouble()));
+          completer.complete(
+            Rect.fromLTWH(
+              0,
+              0,
+              info.image.width.toDouble(),
+              info.image.height.toDouble(),
+            ),
+          );
         }
       },
       onError: (dynamic exception, StackTrace? stackTrace) {
@@ -535,8 +562,10 @@ class QQClipper extends CustomClipper<Path> {
         points.add(Offset(x1, y1));
       }
 
-      double spaceB = math.atan(
-              r * math.sin(d2r(spaceA)) / (2 * r - r * math.cos(d2r(spaceA)))) /
+      double spaceB =
+          math.atan(
+            r * math.sin(d2r(spaceA)) / (2 * r - r * math.cos(d2r(spaceA))),
+          ) /
           math.pi *
           180;
       double r1 = (2 * r - r * math.cos(d2r(spaceA))) / math.cos(d2r(spaceB));
diff --git a/lib/common/widgets/interactiveviewer_gallery/interactive_viewer.dart b/lib/common/widgets/interactiveviewer_gallery/interactive_viewer.dart
index bfaa7519e..a5fab49bd 100644
--- a/lib/common/widgets/interactiveviewer_gallery/interactive_viewer.dart
+++ b/lib/common/widgets/interactiveviewer_gallery/interactive_viewer.dart
@@ -22,8 +22,8 @@ import 'package:vector_math/vector_math_64.dart' show Matrix4, Quad, Vector3;
 ///
 ///   * [InteractiveViewer.builder], whose builder is of this type.
 ///   * [WidgetBuilder], which is similar, but takes no viewport.
-typedef InteractiveViewerWidgetBuilder = Widget Function(
-    BuildContext context, Quad viewport);
+typedef InteractiveViewerWidgetBuilder =
+    Widget Function(BuildContext context, Quad viewport);
 
 /// A widget that enables pan and zoom interactions with its child.
 ///
@@ -82,23 +82,23 @@ class InteractiveViewer extends StatefulWidget {
     this.onReset,
     this.isAnimating,
     required Widget this.child,
-  })  : assert(minScale > 0),
-        assert(interactionEndFrictionCoefficient > 0),
-        assert(minScale.isFinite),
-        assert(maxScale > 0),
-        assert(!maxScale.isNaN),
-        assert(maxScale >= minScale),
-        // boundaryMargin must be either fully infinite or fully finite, but not
-        // a mix of both.
-        assert(
-          (boundaryMargin.horizontal.isInfinite &&
-                  boundaryMargin.vertical.isInfinite) ||
-              (boundaryMargin.top.isFinite &&
-                  boundaryMargin.right.isFinite &&
-                  boundaryMargin.bottom.isFinite &&
-                  boundaryMargin.left.isFinite),
-        ),
-        builder = null;
+  }) : assert(minScale > 0),
+       assert(interactionEndFrictionCoefficient > 0),
+       assert(minScale.isFinite),
+       assert(maxScale > 0),
+       assert(!maxScale.isNaN),
+       assert(maxScale >= minScale),
+       // boundaryMargin must be either fully infinite or fully finite, but not
+       // a mix of both.
+       assert(
+         (boundaryMargin.horizontal.isInfinite &&
+                 boundaryMargin.vertical.isInfinite) ||
+             (boundaryMargin.top.isFinite &&
+                 boundaryMargin.right.isFinite &&
+                 boundaryMargin.bottom.isFinite &&
+                 boundaryMargin.left.isFinite),
+       ),
+       builder = null;
 
   /// Creates an InteractiveViewer for a child that is created on demand.
   ///
@@ -132,24 +132,24 @@ class InteractiveViewer extends StatefulWidget {
     this.onReset,
     this.isAnimating,
     required InteractiveViewerWidgetBuilder this.builder,
-  })  : assert(minScale > 0),
-        assert(interactionEndFrictionCoefficient > 0),
-        assert(minScale.isFinite),
-        assert(maxScale > 0),
-        assert(!maxScale.isNaN),
-        assert(maxScale >= minScale),
-        // boundaryMargin must be either fully infinite or fully finite, but not
-        // a mix of both.
-        assert(
-          (boundaryMargin.horizontal.isInfinite &&
-                  boundaryMargin.vertical.isInfinite) ||
-              (boundaryMargin.top.isFinite &&
-                  boundaryMargin.right.isFinite &&
-                  boundaryMargin.bottom.isFinite &&
-                  boundaryMargin.left.isFinite),
-        ),
-        constrained = false,
-        child = null;
+  }) : assert(minScale > 0),
+       assert(interactionEndFrictionCoefficient > 0),
+       assert(minScale.isFinite),
+       assert(maxScale > 0),
+       assert(!maxScale.isNaN),
+       assert(maxScale >= minScale),
+       // boundaryMargin must be either fully infinite or fully finite, but not
+       // a mix of both.
+       assert(
+         (boundaryMargin.horizontal.isInfinite &&
+                 boundaryMargin.vertical.isInfinite) ||
+             (boundaryMargin.top.isFinite &&
+                 boundaryMargin.right.isFinite &&
+                 boundaryMargin.bottom.isFinite &&
+                 boundaryMargin.left.isFinite),
+       ),
+       constrained = false,
+       child = null;
 
   final Function? isAnimating;
   final VoidCallback? onReset;
@@ -402,7 +402,8 @@ class InteractiveViewer extends StatefulWidget {
   /// Returns the closest point to the given point on the given line segment.
   @visibleForTesting
   static Vector3 getNearestPointOnLine(Vector3 point, Vector3 l1, Vector3 l2) {
-    final double lengthSquared = math.pow(l2.x - l1.x, 2.0).toDouble() +
+    final double lengthSquared =
+        math.pow(l2.x - l1.x, 2.0).toDouble() +
         math.pow(l2.y - l1.y, 2.0).toDouble();
 
     // In this case, l1 == l2.
@@ -414,8 +415,11 @@ class InteractiveViewer extends StatefulWidget {
     // the point.
     final Vector3 l1P = point - l1;
     final Vector3 l1L2 = l2 - l1;
-    final double fraction =
-        clampDouble(l1P.dot(l1L2) / lengthSquared, 0.0, 1.0);
+    final double fraction = clampDouble(
+      l1P.dot(l1L2) / lengthSquared,
+      0.0,
+      1.0,
+    );
     return l1 + l1L2 * fraction;
   }
 
@@ -558,8 +562,9 @@ class _InteractiveViewerState extends State<InteractiveViewer>
     final RenderBox childRenderBox =
         _childKey.currentContext!.findRenderObject()! as RenderBox;
     final Size childSize = childRenderBox.size;
-    final Rect boundaryRect =
-        widget.boundaryMargin.inflateRect(Offset.zero & childSize);
+    final Rect boundaryRect = widget.boundaryMargin.inflateRect(
+      Offset.zero & childSize,
+    );
     assert(
       !boundaryRect.isEmpty,
       "InteractiveViewer's child must have nonzero dimensions.",
@@ -631,8 +636,10 @@ class _InteractiveViewerState extends State<InteractiveViewer>
     );
 
     // If the given translation fits completely within the boundaries, allow it.
-    final Offset offendingDistance =
-        _exceedsBy(boundariesAabbQuad, nextViewport);
+    final Offset offendingDistance = _exceedsBy(
+      boundariesAabbQuad,
+      nextViewport,
+    );
     if (offendingDistance == Offset.zero) {
       return nextMatrix;
     }
@@ -651,17 +658,23 @@ class _InteractiveViewerState extends State<InteractiveViewer>
     // complicated than this when rotated.
     // https://github.com/flutter/flutter/issues/57698
     final Matrix4 correctedMatrix = matrix.clone()
-      ..setTranslation(Vector3(
-        correctedTotalTranslation.dx,
-        correctedTotalTranslation.dy,
-        0.0,
-      ));
+      ..setTranslation(
+        Vector3(
+          correctedTotalTranslation.dx,
+          correctedTotalTranslation.dy,
+          0.0,
+        ),
+      );
 
     // Double check that the corrected translation fits.
-    final Quad correctedViewport =
-        _transformViewport(correctedMatrix, _viewport);
-    final Offset offendingCorrectedDistance =
-        _exceedsBy(boundariesAabbQuad, correctedViewport);
+    final Quad correctedViewport = _transformViewport(
+      correctedMatrix,
+      _viewport,
+    );
+    final Offset offendingCorrectedDistance = _exceedsBy(
+      boundariesAabbQuad,
+      correctedViewport,
+    );
     if (offendingCorrectedDistance == Offset.zero) {
       return correctedMatrix;
     }
@@ -680,12 +693,13 @@ class _InteractiveViewerState extends State<InteractiveViewer>
       offendingCorrectedDistance.dx == 0.0 ? correctedTotalTranslation.dx : 0.0,
       offendingCorrectedDistance.dy == 0.0 ? correctedTotalTranslation.dy : 0.0,
     );
-    return matrix.clone()
-      ..setTranslation(Vector3(
+    return matrix.clone()..setTranslation(
+      Vector3(
         unidirectionalCorrectedTotalTranslation.dx,
         unidirectionalCorrectedTotalTranslation.dy,
         0.0,
-      ));
+      ),
+    );
   }
 
   // Return a new matrix representing the given matrix after applying the given
@@ -698,8 +712,8 @@ class _InteractiveViewerState extends State<InteractiveViewer>
 
     // Don't allow a scale that results in an overall scale beyond min/max
     // scale.
-    final double currentScale =
-        _transformationController!.value.getMaxScaleOnAxis();
+    final double currentScale = _transformationController!.value
+        .getMaxScaleOnAxis();
     final double totalScale = math.max(
       currentScale * scale,
       // Ensure that the scale cannot make the child so big that it can't fit
@@ -933,10 +947,12 @@ class _InteractiveViewerState extends State<InteractiveViewer>
           _currentAxis = null;
           return;
         }
-        final Vector3 translationVector =
-            _transformationController!.value.getTranslation();
-        final Offset translation =
-            Offset(translationVector.x, translationVector.y);
+        final Vector3 translationVector = _transformationController!.value
+            .getTranslation();
+        final Offset translation = Offset(
+          translationVector.x,
+          translationVector.y,
+        );
         final FrictionSimulation frictionSimulationX = FrictionSimulation(
           widget.interactionEndFrictionCoefficient,
           translation.dx,
@@ -951,13 +967,19 @@ class _InteractiveViewerState extends State<InteractiveViewer>
           details.velocity.pixelsPerSecond.distance,
           widget.interactionEndFrictionCoefficient,
         );
-        _animation = Tween<Offset>(
-          begin: translation,
-          end: Offset(frictionSimulationX.finalX, frictionSimulationY.finalX),
-        ).animate(CurvedAnimation(
-          parent: _controller,
-          curve: Curves.decelerate,
-        ));
+        _animation =
+            Tween<Offset>(
+              begin: translation,
+              end: Offset(
+                frictionSimulationX.finalX,
+                frictionSimulationY.finalX,
+              ),
+            ).animate(
+              CurvedAnimation(
+                parent: _controller,
+                curve: Curves.decelerate,
+              ),
+            );
         _controller.duration = Duration(milliseconds: (tFinal * 1000).round());
         _animation!.addListener(_onAnimate);
         _controller.forward();
@@ -966,21 +988,31 @@ class _InteractiveViewerState extends State<InteractiveViewer>
           _currentAxis = null;
           return;
         }
-        final double scale =
-            _transformationController!.value.getMaxScaleOnAxis();
+        final double scale = _transformationController!.value
+            .getMaxScaleOnAxis();
         final FrictionSimulation frictionSimulation = FrictionSimulation(
-            widget.interactionEndFrictionCoefficient * widget.scaleFactor,
-            scale,
-            details.scaleVelocity / 10);
-        final double tFinal = _getFinalTime(details.scaleVelocity.abs(),
-            widget.interactionEndFrictionCoefficient,
-            effectivelyMotionless: 0.1);
+          widget.interactionEndFrictionCoefficient * widget.scaleFactor,
+          scale,
+          details.scaleVelocity / 10,
+        );
+        final double tFinal = _getFinalTime(
+          details.scaleVelocity.abs(),
+          widget.interactionEndFrictionCoefficient,
+          effectivelyMotionless: 0.1,
+        );
         _scaleAnimation =
-            Tween<double>(begin: scale, end: frictionSimulation.x(tFinal))
-                .animate(CurvedAnimation(
-                    parent: _scaleController, curve: Curves.decelerate));
-        _scaleController.duration =
-            Duration(milliseconds: (tFinal * 1000).round());
+            Tween<double>(
+              begin: scale,
+              end: frictionSimulation.x(tFinal),
+            ).animate(
+              CurvedAnimation(
+                parent: _scaleController,
+                curve: Curves.decelerate,
+              ),
+            );
+        _scaleController.duration = Duration(
+          milliseconds: (tFinal * 1000).round(),
+        );
         _scaleAnimation!.addListener(_onScaleAnimate);
         _scaleController.forward();
       case _GestureType.rotate || null:
@@ -1009,11 +1041,13 @@ class _InteractiveViewerState extends State<InteractiveViewer>
         );
 
         if (!_gestureIsSupported(_GestureType.pan)) {
-          widget.onInteractionUpdate?.call(ScaleUpdateDetails(
-            focalPoint: event.position - event.scrollDelta,
-            localFocalPoint: event.localPosition - event.scrollDelta,
-            focalPointDelta: -localDelta,
-          ));
+          widget.onInteractionUpdate?.call(
+            ScaleUpdateDetails(
+              focalPoint: event.position - event.scrollDelta,
+              localFocalPoint: event.localPosition - event.scrollDelta,
+              focalPointDelta: -localDelta,
+            ),
+          );
           widget.onInteractionEnd?.call(ScaleEndDetails());
           return;
         }
@@ -1027,13 +1061,17 @@ class _InteractiveViewerState extends State<InteractiveViewer>
         );
 
         _transformationController!.value = _matrixTranslate(
-            _transformationController!.value,
-            newFocalPointScene - focalPointScene);
+          _transformationController!.value,
+          newFocalPointScene - focalPointScene,
+        );
 
-        widget.onInteractionUpdate?.call(ScaleUpdateDetails(
+        widget.onInteractionUpdate?.call(
+          ScaleUpdateDetails(
             focalPoint: event.position - event.scrollDelta,
             localFocalPoint: event.localPosition - localDelta,
-            focalPointDelta: -localDelta));
+            focalPointDelta: -localDelta,
+          ),
+        );
         widget.onInteractionEnd?.call(ScaleEndDetails());
         return;
       }
@@ -1055,11 +1093,13 @@ class _InteractiveViewerState extends State<InteractiveViewer>
     );
 
     if (!_gestureIsSupported(_GestureType.scale)) {
-      widget.onInteractionUpdate?.call(ScaleUpdateDetails(
-        focalPoint: event.position,
-        localFocalPoint: event.localPosition,
-        scale: scaleChange,
-      ));
+      widget.onInteractionUpdate?.call(
+        ScaleUpdateDetails(
+          focalPoint: event.position,
+          localFocalPoint: event.localPosition,
+          scale: scaleChange,
+        ),
+      );
       widget.onInteractionEnd?.call(ScaleEndDetails());
       return;
     }
@@ -1083,11 +1123,13 @@ class _InteractiveViewerState extends State<InteractiveViewer>
       focalPointSceneScaled - focalPointScene,
     );
 
-    widget.onInteractionUpdate?.call(ScaleUpdateDetails(
-      focalPoint: event.position,
-      localFocalPoint: event.localPosition,
-      scale: scaleChange,
-    ));
+    widget.onInteractionUpdate?.call(
+      ScaleUpdateDetails(
+        focalPoint: event.position,
+        localFocalPoint: event.localPosition,
+        scale: scaleChange,
+      ),
+    );
     widget.onInteractionEnd?.call(ScaleEndDetails());
   }
 
@@ -1101,8 +1143,8 @@ class _InteractiveViewerState extends State<InteractiveViewer>
       return;
     }
     // Translate such that the resulting translation is _animation.value.
-    final Vector3 translationVector =
-        _transformationController!.value.getTranslation();
+    final Vector3 translationVector = _transformationController!.value
+        .getTranslation();
     final Offset translation = Offset(translationVector.x, translationVector.y);
     final Offset translationScene = _transformationController!.toScene(
       translation,
@@ -1176,27 +1218,33 @@ class _InteractiveViewerState extends State<InteractiveViewer>
     // transformationControllers.
     if (oldWidget.transformationController == null) {
       if (widget.transformationController != null) {
-        _transformationController!
-            .removeListener(_onTransformationControllerChange);
+        _transformationController!.removeListener(
+          _onTransformationControllerChange,
+        );
         _transformationController!.dispose();
         _transformationController = widget.transformationController;
-        _transformationController!
-            .addListener(_onTransformationControllerChange);
+        _transformationController!.addListener(
+          _onTransformationControllerChange,
+        );
       }
     } else {
       if (widget.transformationController == null) {
-        _transformationController!
-            .removeListener(_onTransformationControllerChange);
+        _transformationController!.removeListener(
+          _onTransformationControllerChange,
+        );
         _transformationController = TransformationController();
-        _transformationController!
-            .addListener(_onTransformationControllerChange);
+        _transformationController!.addListener(
+          _onTransformationControllerChange,
+        );
       } else if (widget.transformationController !=
           oldWidget.transformationController) {
-        _transformationController!
-            .removeListener(_onTransformationControllerChange);
+        _transformationController!.removeListener(
+          _onTransformationControllerChange,
+        );
         _transformationController = widget.transformationController;
-        _transformationController!
-            .addListener(_onTransformationControllerChange);
+        _transformationController!.addListener(
+          _onTransformationControllerChange,
+        );
       }
     }
   }
@@ -1205,8 +1253,9 @@ class _InteractiveViewerState extends State<InteractiveViewer>
   void dispose() {
     _controller.dispose();
     _scaleController.dispose();
-    _transformationController!
-        .removeListener(_onTransformationControllerChange);
+    _transformationController!.removeListener(
+      _onTransformationControllerChange,
+    );
     if (widget.transformationController == null) {
       _transformationController!.dispose();
     }
@@ -1329,7 +1378,7 @@ class TransformationController extends ValueNotifier<Matrix4> {
   /// The [value] defaults to the identity matrix, which corresponds to no
   /// transformation.
   TransformationController([Matrix4? value])
-      : super(value ?? Matrix4.identity());
+    : super(value ?? Matrix4.identity());
 
   /// Return the scene point at the given viewport point.
   ///
@@ -1365,11 +1414,13 @@ class TransformationController extends ValueNotifier<Matrix4> {
     // On viewportPoint, perform the inverse transformation of the scene to get
     // where the point would be in the scene before the transformation.
     final Matrix4 inverseMatrix = Matrix4.inverted(value);
-    final Vector3 untransformed = inverseMatrix.transform3(Vector3(
-      viewportPoint.dx,
-      viewportPoint.dy,
-      0,
-    ));
+    final Vector3 untransformed = inverseMatrix.transform3(
+      Vector3(
+        viewportPoint.dx,
+        viewportPoint.dy,
+        0,
+      ),
+    );
     return Offset(untransformed.x, untransformed.y);
   }
 }
@@ -1384,8 +1435,11 @@ enum _GestureType {
 
 // Given a velocity and drag, calculate the time at which motion will come to
 // a stop, within the margin of effectivelyMotionless.
-double _getFinalTime(double velocity, double drag,
-    {double effectivelyMotionless = 10}) {
+double _getFinalTime(
+  double velocity,
+  double drag, {
+  double effectivelyMotionless = 10,
+}) {
   return math.log(effectivelyMotionless / velocity) / math.log(drag / 100);
 }
 
@@ -1402,26 +1456,34 @@ Offset _getMatrixTranslation(Matrix4 matrix) {
 Quad _transformViewport(Matrix4 matrix, Rect viewport) {
   final Matrix4 inverseMatrix = matrix.clone()..invert();
   return Quad.points(
-    inverseMatrix.transform3(Vector3(
-      viewport.topLeft.dx,
-      viewport.topLeft.dy,
-      0.0,
-    )),
-    inverseMatrix.transform3(Vector3(
-      viewport.topRight.dx,
-      viewport.topRight.dy,
-      0.0,
-    )),
-    inverseMatrix.transform3(Vector3(
-      viewport.bottomRight.dx,
-      viewport.bottomRight.dy,
-      0.0,
-    )),
-    inverseMatrix.transform3(Vector3(
-      viewport.bottomLeft.dx,
-      viewport.bottomLeft.dy,
-      0.0,
-    )),
+    inverseMatrix.transform3(
+      Vector3(
+        viewport.topLeft.dx,
+        viewport.topLeft.dy,
+        0.0,
+      ),
+    ),
+    inverseMatrix.transform3(
+      Vector3(
+        viewport.topRight.dx,
+        viewport.topRight.dy,
+        0.0,
+      ),
+    ),
+    inverseMatrix.transform3(
+      Vector3(
+        viewport.bottomRight.dx,
+        viewport.bottomRight.dy,
+        0.0,
+      ),
+    ),
+    inverseMatrix.transform3(
+      Vector3(
+        viewport.bottomLeft.dx,
+        viewport.bottomLeft.dy,
+        0.0,
+      ),
+    ),
   );
 }
 
@@ -1453,8 +1515,10 @@ Offset _exceedsBy(Quad boundary, Quad viewport) {
   ];
   Offset largestExcess = Offset.zero;
   for (final Vector3 point in viewportPoints) {
-    final Vector3 pointInside =
-        InteractiveViewer.getNearestPointInside(point, boundary);
+    final Vector3 pointInside = InteractiveViewer.getNearestPointInside(
+      point,
+      boundary,
+    );
     final Offset excess = Offset(
       pointInside.x - point.x,
       pointInside.y - point.y,
diff --git a/lib/common/widgets/interactiveviewer_gallery/interactive_viewer_boundary.dart b/lib/common/widgets/interactiveviewer_gallery/interactive_viewer_boundary.dart
index 17dbe874e..cf6673ab4 100644
--- a/lib/common/widgets/interactiveviewer_gallery/interactive_viewer_boundary.dart
+++ b/lib/common/widgets/interactiveviewer_gallery/interactive_viewer_boundary.dart
@@ -213,15 +213,15 @@ class InteractiveViewerBoundaryState extends State<InteractiveViewerBoundary>
   }
 
   Widget get content => DecoratedBoxTransition(
-        decoration: _opacityAnimation,
-        child: SlideTransition(
-          position: _slideAnimation,
-          child: ScaleTransition(
-            scale: _scaleAnimation,
-            child: widget.child,
-          ),
-        ),
-      );
+    decoration: _opacityAnimation,
+    child: SlideTransition(
+      position: _slideAnimation,
+      child: ScaleTransition(
+        scale: _scaleAnimation,
+        child: widget.child,
+      ),
+    ),
+  );
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart b/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart
index 7ba92e2bf..edd4fef22 100644
--- a/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart
+++ b/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart
@@ -28,8 +28,13 @@ import 'package:media_kit_video/media_kit_video.dart';
 /// source is hit after zooming in to disable or enable the swiping gesture of
 /// the [PageView].
 ///
-typedef IndexedFocusedWidgetBuilder = Widget Function(
-    BuildContext context, int index, bool isFocus, bool enablePageView);
+typedef IndexedFocusedWidgetBuilder =
+    Widget Function(
+      BuildContext context,
+      int index,
+      bool isFocus,
+      bool enablePageView,
+    );
 
 typedef IndexedTagStringBuilder = String Function(int index);
 
@@ -233,12 +238,13 @@ class _InteractiveviewerGalleryState extends State<InteractiveviewerGallery>
     if (_transformationController!.value != Matrix4.identity()) {
       // animate the reset for the transformation of the interactive viewer
 
-      _animation = Matrix4Tween(
-        begin: _transformationController!.value,
-        end: Matrix4.identity(),
-      ).animate(
-        CurveTween(curve: Curves.easeOut).animate(_animationController),
-      );
+      _animation =
+          Matrix4Tween(
+            begin: _transformationController!.value,
+            end: Matrix4.identity(),
+          ).animate(
+            CurveTween(curve: Curves.easeOut).animate(_animationController),
+          );
 
       _animationController.forward(from: 0);
     }
@@ -287,20 +293,27 @@ class _InteractiveviewerGalleryState extends State<InteractiveviewerGallery>
           child: PageView.builder(
             onPageChanged: _onPageChanged,
             controller: _pageController,
-            physics:
-                _enablePageView ? null : const NeverScrollableScrollPhysics(),
+            physics: _enablePageView
+                ? null
+                : const NeverScrollableScrollPhysics(),
             itemCount: widget.sources.length,
             itemBuilder: (BuildContext context, int index) {
               final item = widget.sources[index];
               return GestureDetector(
                 behavior: HitTestBehavior.opaque,
                 onTap: () => EasyThrottle.throttle(
-                    'preview', const Duration(milliseconds: 555), onClose),
+                  'preview',
+                  const Duration(milliseconds: 555),
+                  onClose,
+                ),
                 onDoubleTapDown: (TapDownDetails details) {
                   _doubleTapLocalPosition = details.localPosition;
                 },
                 onDoubleTap: () => EasyThrottle.throttle(
-                    'preview', const Duration(milliseconds: 555), onDoubleTap),
+                  'preview',
+                  const Duration(milliseconds: 555),
+                  onDoubleTap,
+                ),
                 onLongPress: item.sourceType == SourceType.fileImage
                     ? null
                     : () => onLongPress(item),
@@ -321,7 +334,8 @@ class _InteractiveviewerGalleryState extends State<InteractiveviewerGallery>
           left: 0,
           right: 0,
           child: Container(
-            padding: MediaQuery.paddingOf(context) +
+            padding:
+                MediaQuery.paddingOf(context) +
                 const EdgeInsets.fromLTRB(12, 8, 20, 8),
             decoration: _enablePageView
                 ? BoxDecoration(
@@ -330,7 +344,7 @@ class _InteractiveviewerGalleryState extends State<InteractiveviewerGallery>
                       end: Alignment.bottomCenter,
                       colors: [
                         Colors.transparent,
-                        Colors.black.withValues(alpha: 0.3)
+                        Colors.black.withValues(alpha: 0.3),
                       ],
                     ),
                   )
@@ -419,30 +433,32 @@ class _InteractiveviewerGalleryState extends State<InteractiveviewerGallery>
         tag: item.url,
         child: switch (item.sourceType) {
           SourceType.fileImage => Image(
-              filterQuality: FilterQuality.low,
-              image: FileImage(File(item.url)),
-            ),
+            filterQuality: FilterQuality.low,
+            image: FileImage(File(item.url)),
+          ),
           SourceType.networkImage => CachedNetworkImage(
-              fadeInDuration: Duration.zero,
-              fadeOutDuration: Duration.zero,
-              imageUrl: _getActualUrl(item.url),
-              placeholderFadeInDuration: Duration.zero,
-              placeholder: (context, url) {
-                return CachedNetworkImage(
-                  fadeInDuration: Duration.zero,
-                  fadeOutDuration: Duration.zero,
-                  imageUrl: ImageUtil.thumbnailUrl(item.url, widget.quality),
-                );
-              },
-            ),
-          SourceType.livePhoto => Obx(() => currentIndex.value == index
-              ? IgnorePointer(
-                  child: Video(
-                    controller: _videoController!,
-                    fill: Colors.transparent,
-                  ),
-                )
-              : const SizedBox.shrink()),
+            fadeInDuration: Duration.zero,
+            fadeOutDuration: Duration.zero,
+            imageUrl: _getActualUrl(item.url),
+            placeholderFadeInDuration: Duration.zero,
+            placeholder: (context, url) {
+              return CachedNetworkImage(
+                fadeInDuration: Duration.zero,
+                fadeOutDuration: Duration.zero,
+                imageUrl: ImageUtil.thumbnailUrl(item.url, widget.quality),
+              );
+            },
+          ),
+          SourceType.livePhoto => Obx(
+            () => currentIndex.value == index
+                ? IgnorePointer(
+                    child: Video(
+                      controller: _videoController!,
+                      fill: Colors.transparent,
+                    ),
+                  )
+                : const SizedBox.shrink(),
+          ),
         },
       ),
     );
@@ -481,15 +497,16 @@ class _InteractiveviewerGalleryState extends State<InteractiveviewerGallery>
       offSetX,
       offSetY,
       matrix.row2.w,
-      matrix.row3.w
+      matrix.row3.w,
     ]);
 
-    _animation = Matrix4Tween(
-      begin: _transformationController!.value,
-      end: matrix,
-    ).animate(
-      CurveTween(curve: Curves.easeOut).animate(_animationController),
-    );
+    _animation =
+        Matrix4Tween(
+          begin: _transformationController!.value,
+          end: matrix,
+        ).animate(
+          CurveTween(curve: Curves.easeOut).animate(_animationController),
+        );
     _animationController
         .forward(from: 0)
         .whenComplete(() => _onScaleChanged(targetScale));
diff --git a/lib/common/widgets/loading_widget/loading_widget.dart b/lib/common/widgets/loading_widget/loading_widget.dart
index 2b7f0c61a..3dc3ee6cc 100644
--- a/lib/common/widgets/loading_widget/loading_widget.dart
+++ b/lib/common/widgets/loading_widget/loading_widget.dart
@@ -7,17 +7,17 @@ Widget get linearLoading =>
     const SliverToBoxAdapter(child: LinearProgressIndicator());
 
 Widget errorWidget({errMsg, onReload}) => HttpError(
-      isSliver: false,
-      errMsg: errMsg,
-      onReload: onReload,
-    );
+  isSliver: false,
+  errMsg: errMsg,
+  onReload: onReload,
+);
 
 Widget scrollErrorWidget({errMsg, onReload, controller}) => CustomScrollView(
-      controller: controller,
-      slivers: [
-        HttpError(
-          errMsg: errMsg,
-          onReload: onReload,
-        )
-      ],
-    );
+  controller: controller,
+  slivers: [
+    HttpError(
+      errMsg: errMsg,
+      onReload: onReload,
+    ),
+  ],
+);
diff --git a/lib/common/widgets/page/page_view.dart b/lib/common/widgets/page/page_view.dart
index 0f631fbba..59584d23a 100644
--- a/lib/common/widgets/page/page_view.dart
+++ b/lib/common/widgets/page/page_view.dart
@@ -16,8 +16,10 @@ import 'package:flutter/material.dart' hide Scrollable, ScrollableState;
 import 'package:flutter/rendering.dart';
 
 class _ForceImplicitScrollPhysics extends ScrollPhysics {
-  const _ForceImplicitScrollPhysics(
-      {required this.allowImplicitScrolling, super.parent});
+  const _ForceImplicitScrollPhysics({
+    required this.allowImplicitScrolling,
+    super.parent,
+  });
 
   @override
   _ForceImplicitScrollPhysics applyTo(ScrollPhysics? ancestor) {
@@ -160,10 +162,10 @@ class CustomPageView extends StatefulWidget {
     this.header,
     this.bgColor = Colors.transparent,
   }) : childrenDelegate = SliverChildBuilderDelegate(
-          itemBuilder,
-          findChildIndexCallback: findChildIndexCallback,
-          childCount: itemCount,
-        );
+         itemBuilder,
+         findChildIndexCallback: findChildIndexCallback,
+         childCount: itemCount,
+       );
 
   /// Creates a scrollable list that works page by page with a custom child
   /// model.
@@ -345,8 +347,9 @@ class _CustomPageViewState extends State<CustomPageView> {
       case Axis.horizontal:
         assert(debugCheckHasDirectionality(context));
         final TextDirection textDirection = Directionality.of(context);
-        final AxisDirection axisDirection =
-            textDirectionToAxisDirection(textDirection);
+        final AxisDirection axisDirection = textDirectionToAxisDirection(
+          textDirection,
+        );
         return widget.reverse
             ? flipAxisDirection(axisDirection)
             : axisDirection;
@@ -358,16 +361,18 @@ class _CustomPageViewState extends State<CustomPageView> {
   @override
   Widget build(BuildContext context) {
     final AxisDirection axisDirection = _getDirection(context);
-    final ScrollPhysics physics = _ForceImplicitScrollPhysics(
-      allowImplicitScrolling: widget.allowImplicitScrolling,
-    ).applyTo(
-      widget.pageSnapping
-          ? _kPagePhysics.applyTo(
-              widget.physics ??
-                  widget.scrollBehavior?.getScrollPhysics(context),
-            )
-          : widget.physics ?? widget.scrollBehavior?.getScrollPhysics(context),
-    );
+    final ScrollPhysics physics =
+        _ForceImplicitScrollPhysics(
+          allowImplicitScrolling: widget.allowImplicitScrolling,
+        ).applyTo(
+          widget.pageSnapping
+              ? _kPagePhysics.applyTo(
+                  widget.physics ??
+                      widget.scrollBehavior?.getScrollPhysics(context),
+                )
+              : widget.physics ??
+                    widget.scrollBehavior?.getScrollPhysics(context),
+        );
 
     return NotificationListener<ScrollNotification>(
       onNotification: (ScrollNotification notification) {
@@ -392,7 +397,8 @@ class _CustomPageViewState extends State<CustomPageView> {
         physics: physics,
         restorationId: widget.restorationId,
         hitTestBehavior: widget.hitTestBehavior,
-        scrollBehavior: widget.scrollBehavior ??
+        scrollBehavior:
+            widget.scrollBehavior ??
             ScrollConfiguration.of(context).copyWith(scrollbars: false),
         viewportBuilder: (BuildContext context, ViewportOffset position) {
           return Viewport(
@@ -424,14 +430,25 @@ class _CustomPageViewState extends State<CustomPageView> {
       ..add(EnumProperty<Axis>('scrollDirection', widget.scrollDirection))
       ..add(FlagProperty('reverse', value: widget.reverse, ifTrue: 'reversed'))
       ..add(
-        DiagnosticsProperty<PageController>('controller', _controller,
-            showName: false),
+        DiagnosticsProperty<PageController>(
+          'controller',
+          _controller,
+          showName: false,
+        ),
       )
-      ..add(DiagnosticsProperty<ScrollPhysics>('physics', widget.physics,
-          showName: false))
       ..add(
-        FlagProperty('pageSnapping',
-            value: widget.pageSnapping, ifFalse: 'snapping disabled'),
+        DiagnosticsProperty<ScrollPhysics>(
+          'physics',
+          widget.physics,
+          showName: false,
+        ),
+      )
+      ..add(
+        FlagProperty(
+          'pageSnapping',
+          value: widget.pageSnapping,
+          ifFalse: 'snapping disabled',
+        ),
       )
       ..add(
         FlagProperty(
diff --git a/lib/common/widgets/page/scrollable.dart b/lib/common/widgets/page/scrollable.dart
index da2e1f475..95254c18f 100644
--- a/lib/common/widgets/page/scrollable.dart
+++ b/lib/common/widgets/page/scrollable.dart
@@ -356,8 +356,8 @@ class CustomScrollable extends StatefulWidget {
   static CustomScrollableState? maybeOf(BuildContext context, {Axis? axis}) {
     // This is the context that will need to establish the dependency.
     final BuildContext originalContext = context;
-    InheritedElement? element =
-        context.getElementForInheritedWidgetOfExactType<_ScrollableScope>();
+    InheritedElement? element = context
+        .getElementForInheritedWidgetOfExactType<_ScrollableScope>();
     while (element != null) {
       final CustomScrollableState scrollable =
           (element.widget as _ScrollableScope).scrollable;
@@ -368,8 +368,8 @@ class CustomScrollable extends StatefulWidget {
         return scrollable;
       }
       context = scrollable.context;
-      element =
-          context.getElementForInheritedWidgetOfExactType<_ScrollableScope>();
+      element = context
+          .getElementForInheritedWidgetOfExactType<_ScrollableScope>();
     }
     return null;
   }
@@ -451,10 +451,12 @@ class CustomScrollable extends StatefulWidget {
   ///
   /// If there is no [CustomScrollable] in the widget tree above the [context], this
   /// method returns false.
-  static bool recommendDeferredLoadingForContext(BuildContext context,
-      {Axis? axis}) {
-    _ScrollableScope? widget =
-        context.getInheritedWidgetOfExactType<_ScrollableScope>();
+  static bool recommendDeferredLoadingForContext(
+    BuildContext context, {
+    Axis? axis,
+  }) {
+    _ScrollableScope? widget = context
+        .getInheritedWidgetOfExactType<_ScrollableScope>();
     while (widget != null) {
       if (axis == null ||
           axisDirectionToAxis(widget.scrollable.axisDirection) == axis) {
@@ -521,8 +523,11 @@ class CustomScrollable extends StatefulWidget {
 // Enable Scrollable.of() to work as if ScrollableState was an inherited widget.
 // ScrollableState.build() always rebuilds its _ScrollableScope.
 class _ScrollableScope extends InheritedWidget {
-  const _ScrollableScope(
-      {required this.scrollable, required this.position, required super.child});
+  const _ScrollableScope({
+    required this.scrollable,
+    required this.position,
+    required super.child,
+  });
 
   final CustomScrollableState scrollable;
   final ScrollPosition position;
@@ -566,11 +571,11 @@ class CustomScrollableState extends State<CustomScrollable>
   /// Used by [EdgeDraggingAutoScroller] to progress the position forward when a
   /// drag gesture reaches the edge of the [Viewport].
   Offset get deltaToScrollOrigin => switch (axisDirection) {
-        AxisDirection.up => Offset(0, -position.pixels),
-        AxisDirection.down => Offset(0, position.pixels),
-        AxisDirection.left => Offset(-position.pixels, 0),
-        AxisDirection.right => Offset(position.pixels, 0),
-      };
+    AxisDirection.up => Offset(0, -position.pixels),
+    AxisDirection.down => Offset(0, position.pixels),
+    AxisDirection.left => Offset(-position.pixels, 0),
+    AxisDirection.right => Offset(position.pixels, 0),
+  };
 
   ScrollController get _effectiveScrollController =>
       widget.controller ?? _fallbackScrollController!;
@@ -618,7 +623,10 @@ class CustomScrollableState extends State<CustomScrollable>
     }
 
     _position = _effectiveScrollController.createScrollPosition(
-        _physics!, this, oldPosition);
+      _physics!,
+      this,
+      oldPosition,
+    );
     assert(_position != null);
     _effectiveScrollController.attach(position);
   }
@@ -629,8 +637,10 @@ class CustomScrollableState extends State<CustomScrollable>
     registerForRestoration(_persistedScrollOffset, 'offset');
     assert(_position != null);
     if (_persistedScrollOffset.value != null) {
-      position.restoreOffset(_persistedScrollOffset.value!,
-          initialRestore: initialRestore);
+      position.restoreOffset(
+        _persistedScrollOffset.value!,
+        initialRestore: initialRestore,
+      );
     }
   }
 
@@ -655,15 +665,18 @@ class CustomScrollableState extends State<CustomScrollable>
       vsync: this,
       reverseDuration: const Duration(milliseconds: 500),
     );
-    _anim = Tween<Offset>(begin: Offset.zero, end: const Offset(0, 1))
-        .animate(_animController);
+    _anim = Tween<Offset>(
+      begin: Offset.zero,
+      end: const Offset(0, 1),
+    ).animate(_animController);
   }
 
   @protected
   @override
   void didChangeDependencies() {
     _mediaQueryGestureSettings = MediaQuery.maybeGestureSettingsOf(context);
-    _devicePixelRatio = MediaQuery.maybeDevicePixelRatioOf(context) ??
+    _devicePixelRatio =
+        MediaQuery.maybeDevicePixelRatioOf(context) ??
         View.of(context).devicePixelRatio;
     _updatePosition();
     super.didChangeDependencies();
@@ -680,7 +693,8 @@ class CustomScrollableState extends State<CustomScrollable>
     }
     ScrollPhysics? newPhysics =
         widget.physics ?? widget.scrollBehavior?.getScrollPhysics(context);
-    ScrollPhysics? oldPhysics = oldWidget.physics ??
+    ScrollPhysics? oldPhysics =
+        oldWidget.physics ??
         oldWidget.scrollBehavior?.getScrollPhysics(context);
     do {
       if (newPhysics?.runtimeType != oldPhysics?.runtimeType) {
@@ -791,64 +805,70 @@ class CustomScrollableState extends State<CustomScrollable>
       switch (widget.axis) {
         case Axis.vertical:
           _gestureRecognizers = <Type, GestureRecognizerFactory>{
-            VerticalDragGestureRecognizer: GestureRecognizerFactoryWithHandlers<
-                VerticalDragGestureRecognizer>(
-              () => VerticalDragGestureRecognizer(
-                  supportedDevices: _configuration.dragDevices),
-              (VerticalDragGestureRecognizer instance) {
-                instance
-                  ..onDown = _handleDragDown
-                  ..onStart = _handleDragStart
-                  ..onUpdate = _handleDragUpdate
-                  ..onEnd = _handleDragEnd
-                  ..onCancel = _handleDragCancel
-                  ..minFlingDistance = _physics?.minFlingDistance
-                  ..minFlingVelocity = _physics?.minFlingVelocity
-                  ..maxFlingVelocity = _physics?.maxFlingVelocity
-                  ..velocityTrackerBuilder =
-                      _configuration.velocityTrackerBuilder(context)
-                  ..dragStartBehavior = widget.dragStartBehavior
-                  ..multitouchDragStrategy =
-                      _configuration.getMultitouchDragStrategy(context)
-                  ..gestureSettings = _mediaQueryGestureSettings
-                  ..supportedDevices = _configuration.dragDevices;
-              },
-            ),
+            VerticalDragGestureRecognizer:
+                GestureRecognizerFactoryWithHandlers<
+                  VerticalDragGestureRecognizer
+                >(
+                  () => VerticalDragGestureRecognizer(
+                    supportedDevices: _configuration.dragDevices,
+                  ),
+                  (VerticalDragGestureRecognizer instance) {
+                    instance
+                      ..onDown = _handleDragDown
+                      ..onStart = _handleDragStart
+                      ..onUpdate = _handleDragUpdate
+                      ..onEnd = _handleDragEnd
+                      ..onCancel = _handleDragCancel
+                      ..minFlingDistance = _physics?.minFlingDistance
+                      ..minFlingVelocity = _physics?.minFlingVelocity
+                      ..maxFlingVelocity = _physics?.maxFlingVelocity
+                      ..velocityTrackerBuilder = _configuration
+                          .velocityTrackerBuilder(context)
+                      ..dragStartBehavior = widget.dragStartBehavior
+                      ..multitouchDragStrategy = _configuration
+                          .getMultitouchDragStrategy(context)
+                      ..gestureSettings = _mediaQueryGestureSettings
+                      ..supportedDevices = _configuration.dragDevices;
+                  },
+                ),
           };
         case Axis.horizontal:
           _gestureRecognizers = <Type, GestureRecognizerFactory>{
             HorizontalDragGestureRecognizer:
                 GestureRecognizerFactoryWithHandlers<
-                    HorizontalDragGestureRecognizer>(
-              () => HorizontalDragGestureRecognizer(
-                  supportedDevices: _configuration.dragDevices),
-              (HorizontalDragGestureRecognizer instance) {
-                instance
-                  ..onDown = _handleDragDown
-                  ..onStart = _handleDragStart
-                  ..onUpdate = _handleDragUpdate
-                  ..onEnd = _handleDragEnd
-                  ..onCancel = _handleDragCancel
-                  ..minFlingDistance = _physics?.minFlingDistance
-                  ..minFlingVelocity = _physics?.minFlingVelocity
-                  ..maxFlingVelocity = _physics?.maxFlingVelocity
-                  ..velocityTrackerBuilder =
-                      _configuration.velocityTrackerBuilder(context)
-                  ..dragStartBehavior = widget.dragStartBehavior
-                  ..multitouchDragStrategy =
-                      _configuration.getMultitouchDragStrategy(context)
-                  ..gestureSettings = _mediaQueryGestureSettings
-                  ..supportedDevices = _configuration.dragDevices;
-              },
-            ),
+                  HorizontalDragGestureRecognizer
+                >(
+                  () => HorizontalDragGestureRecognizer(
+                    supportedDevices: _configuration.dragDevices,
+                  ),
+                  (HorizontalDragGestureRecognizer instance) {
+                    instance
+                      ..onDown = _handleDragDown
+                      ..onStart = _handleDragStart
+                      ..onUpdate = _handleDragUpdate
+                      ..onEnd = _handleDragEnd
+                      ..onCancel = _handleDragCancel
+                      ..minFlingDistance = _physics?.minFlingDistance
+                      ..minFlingVelocity = _physics?.minFlingVelocity
+                      ..maxFlingVelocity = _physics?.maxFlingVelocity
+                      ..velocityTrackerBuilder = _configuration
+                          .velocityTrackerBuilder(context)
+                      ..dragStartBehavior = widget.dragStartBehavior
+                      ..multitouchDragStrategy = _configuration
+                          .getMultitouchDragStrategy(context)
+                      ..gestureSettings = _mediaQueryGestureSettings
+                      ..supportedDevices = _configuration.dragDevices;
+                  },
+                ),
           };
       }
     }
     _lastCanDrag = value;
     _lastAxisDirection = widget.axis;
     if (_gestureDetectorKey.currentState != null) {
-      _gestureDetectorKey.currentState!
-          .replaceGestureRecognizers(_gestureRecognizers);
+      _gestureDetectorKey.currentState!.replaceGestureRecognizers(
+        _gestureRecognizers,
+      );
     }
   }
 
@@ -860,8 +880,9 @@ class CustomScrollableState extends State<CustomScrollable>
     }
     _shouldIgnorePointer = value;
     if (_ignorePointerKey.currentContext != null) {
-      final RenderIgnorePointer renderBox = _ignorePointerKey.currentContext!
-          .findRenderObject()! as RenderIgnorePointer;
+      final RenderIgnorePointer renderBox =
+          _ignorePointerKey.currentContext!.findRenderObject()!
+              as RenderIgnorePointer;
       renderBox.ignoring = _shouldIgnorePointer;
     }
   }
@@ -999,8 +1020,8 @@ class CustomScrollableState extends State<CustomScrollable>
   double _pointerSignalEventDelta(PointerScrollEvent event) {
     final Set<LogicalKeyboardKey> pressed =
         HardwareKeyboard.instance.logicalKeysPressed;
-    final bool flipAxes = pressed
-            .any(_configuration.pointerAxisModifiers.contains) &&
+    final bool flipAxes =
+        pressed.any(_configuration.pointerAxisModifiers.contains) &&
         // Axes are only flipped for physical mouse wheel input.
         // On some platforms, like web, trackpad input is handled through pointer
         // signals, but should not be included in this axis modifying behavior.
@@ -1027,12 +1048,15 @@ class CustomScrollableState extends State<CustomScrollable>
         return;
       }
       final double delta = _pointerSignalEventDelta(event);
-      final double targetScrollOffset =
-          _targetScrollOffsetForPointerScroll(delta);
+      final double targetScrollOffset = _targetScrollOffsetForPointerScroll(
+        delta,
+      );
       // Only express interest in the event if it would actually result in a scroll.
       if (delta != 0.0 && targetScrollOffset != position.pixels) {
-        GestureBinding.instance.pointerSignalResolver
-            .register(event, _handlePointerScroll);
+        GestureBinding.instance.pointerSignalResolver.register(
+          event,
+          _handlePointerScroll,
+        );
         return;
       }
       // The `event` won't result in a scroll, so allow the platform to trigger
@@ -1047,18 +1071,21 @@ class CustomScrollableState extends State<CustomScrollable>
   void _handlePointerScroll(PointerEvent event) {
     assert(event is PointerScrollEvent);
     final double delta = _pointerSignalEventDelta(event as PointerScrollEvent);
-    final double targetScrollOffset =
-        _targetScrollOffsetForPointerScroll(delta);
+    final double targetScrollOffset = _targetScrollOffsetForPointerScroll(
+      delta,
+    );
     if (delta != 0.0 && targetScrollOffset != position.pixels) {
       position.pointerScroll(delta);
     }
   }
 
   bool _handleScrollMetricsNotification(
-      ScrollMetricsNotification notification) {
+    ScrollMetricsNotification notification,
+  ) {
     if (notification.depth == 0) {
-      final RenderObject? scrollSemanticsRenderObject =
-          _scrollSemanticsKey.currentContext?.findRenderObject();
+      final RenderObject? scrollSemanticsRenderObject = _scrollSemanticsKey
+          .currentContext
+          ?.findRenderObject();
       if (scrollSemanticsRenderObject != null) {
         scrollSemanticsRenderObject.markNeedsSemanticsUpdate();
       }
@@ -1267,13 +1294,14 @@ class _ScrollableSelectionHandlerState
 /// selectable.
 class _ScrollableSelectionContainerDelegate
     extends MultiSelectableSelectionContainerDelegate {
-  _ScrollableSelectionContainerDelegate(
-      {required this.state, required ScrollPosition position})
-      : _position = position,
-        _autoScroller = EdgeDraggingAutoScroller(
-          state,
-          velocityScalar: _kDefaultSelectToScrollVelocityScalar,
-        ) {
+  _ScrollableSelectionContainerDelegate({
+    required this.state,
+    required ScrollPosition position,
+  }) : _position = position,
+       _autoScroller = EdgeDraggingAutoScroller(
+         state,
+         velocityScalar: _kDefaultSelectToScrollVelocityScalar,
+       ) {
     _position.addListener(_scheduleLayoutChange);
   }
 
@@ -1367,13 +1395,15 @@ class _ScrollableSelectionContainerDelegate
     if (_currentDragEndRelatedToOrigin == null &&
         _currentDragStartRelatedToOrigin == null) {
       assert(!_selectionStartsInScrollable);
-      _selectionStartsInScrollable =
-          _globalPositionInScrollable(event.globalPosition);
+      _selectionStartsInScrollable = _globalPositionInScrollable(
+        event.globalPosition,
+      );
     }
     final Offset deltaToOrigin = _getDeltaToScrollOrigin(state);
     if (event.type == SelectionEventType.endEdgeUpdate) {
-      _currentDragEndRelatedToOrigin =
-          _inferPositionRelatedToOrigin(event.globalPosition);
+      _currentDragEndRelatedToOrigin = _inferPositionRelatedToOrigin(
+        event.globalPosition,
+      );
       final Offset endOffset = _currentDragEndRelatedToOrigin!.translate(
         -deltaToOrigin.dx,
         -deltaToOrigin.dy,
@@ -1383,8 +1413,9 @@ class _ScrollableSelectionContainerDelegate
         granularity: event.granularity,
       );
     } else {
-      _currentDragStartRelatedToOrigin =
-          _inferPositionRelatedToOrigin(event.globalPosition);
+      _currentDragStartRelatedToOrigin = _inferPositionRelatedToOrigin(
+        event.globalPosition,
+      );
       final Offset startOffset = _currentDragStartRelatedToOrigin!.translate(
         -deltaToOrigin.dx,
         -deltaToOrigin.dy,
@@ -1430,7 +1461,8 @@ class _ScrollableSelectionContainerDelegate
     }
     final Offset deltaToOrigin = _getDeltaToScrollOrigin(state);
     return box.localToGlobal(
-        localPosition.translate(deltaToOrigin.dx, deltaToOrigin.dy));
+      localPosition.translate(deltaToOrigin.dx, deltaToOrigin.dy),
+    );
   }
 
   /// Infers the [_currentDragStartRelatedToOrigin] and
@@ -1453,8 +1485,8 @@ class _ScrollableSelectionContainerDelegate
           selectables[currentSelectionStartIndex].value;
       assert(geometry.hasSelection);
       final SelectionPoint start = geometry.startSelectionPoint!;
-      final Matrix4 childTransform =
-          selectables[currentSelectionStartIndex].getTransformTo(box);
+      final Matrix4 childTransform = selectables[currentSelectionStartIndex]
+          .getTransformTo(box);
       final Offset localDragStart = MatrixUtils.transformPoint(
         childTransform,
         start.localPosition + Offset(0, -start.lineHeight / 2),
@@ -1470,8 +1502,8 @@ class _ScrollableSelectionContainerDelegate
           selectables[currentSelectionEndIndex].value;
       assert(geometry.hasSelection);
       final SelectionPoint end = geometry.endSelectionPoint!;
-      final Matrix4 childTransform =
-          selectables[currentSelectionEndIndex].getTransformTo(box);
+      final Matrix4 childTransform = selectables[currentSelectionEndIndex]
+          .getTransformTo(box);
       final Offset localDragEnd = MatrixUtils.transformPoint(
         childTransform,
         end.localPosition + Offset(0, -end.lineHeight / 2),
@@ -1488,7 +1520,8 @@ class _ScrollableSelectionContainerDelegate
     assert(!_selectionStartsInScrollable);
     final SelectionResult result = super.handleSelectAll(event);
     assert(
-        (currentSelectionStartIndex == -1) == (currentSelectionEndIndex == -1));
+      (currentSelectionStartIndex == -1) == (currentSelectionEndIndex == -1),
+    );
     if (currentSelectionStartIndex != -1) {
       _updateDragLocationsFromGeometries();
     }
@@ -1497,8 +1530,9 @@ class _ScrollableSelectionContainerDelegate
 
   @override
   SelectionResult handleSelectWord(SelectWordSelectionEvent event) {
-    _selectionStartsInScrollable =
-        _globalPositionInScrollable(event.globalPosition);
+    _selectionStartsInScrollable = _globalPositionInScrollable(
+      event.globalPosition,
+    );
     final SelectionResult result = super.handleSelectWord(event);
     _updateDragLocationsFromGeometries();
     return result;
@@ -1506,13 +1540,16 @@ class _ScrollableSelectionContainerDelegate
 
   @override
   SelectionResult handleGranularlyExtendSelection(
-      GranularlyExtendSelectionEvent event) {
+    GranularlyExtendSelectionEvent event,
+  ) {
     final SelectionResult result = super.handleGranularlyExtendSelection(event);
     // The selection geometry may not have the accurate offset for the edges
     // that are outside of the viewport whose transform may not be valid. Only
     // the edge this event is updating is sure to be accurate.
     _updateDragLocationsFromGeometries(
-        forceUpdateStart: !event.isEnd, forceUpdateEnd: event.isEnd);
+      forceUpdateStart: !event.isEnd,
+      forceUpdateEnd: event.isEnd,
+    );
     if (_selectionStartsInScrollable) {
       _jumpToEdge(event.isEnd);
     }
@@ -1521,14 +1558,18 @@ class _ScrollableSelectionContainerDelegate
 
   @override
   SelectionResult handleDirectionallyExtendSelection(
-      DirectionallyExtendSelectionEvent event) {
-    final SelectionResult result =
-        super.handleDirectionallyExtendSelection(event);
+    DirectionallyExtendSelectionEvent event,
+  ) {
+    final SelectionResult result = super.handleDirectionallyExtendSelection(
+      event,
+    );
     // The selection geometry may not have the accurate offset for the edges
     // that are outside of the viewport whose transform may not be valid. Only
     // the edge this event is updating is sure to be accurate.
     _updateDragLocationsFromGeometries(
-        forceUpdateStart: !event.isEnd, forceUpdateEnd: event.isEnd);
+      forceUpdateStart: !event.isEnd,
+      forceUpdateEnd: event.isEnd,
+    );
     if (_selectionStartsInScrollable) {
       _jumpToEdge(event.isEnd);
     }
@@ -1643,7 +1684,9 @@ class _ScrollableSelectionContainerDelegate
 
   @override
   SelectionResult dispatchSelectionEventToChild(
-      Selectable selectable, SelectionEvent event) {
+    Selectable selectable,
+    SelectionEvent event,
+  ) {
     switch (event.type) {
       case SelectionEventType.startEdgeUpdate:
         _selectableStartEdgeUpdateRecords[selectable] = state.position.pixels;
@@ -1702,7 +1745,8 @@ class _ScrollableSelectionContainerDelegate
         -deltaToOrigin.dy,
       );
       selectable.dispatchSelectionEvent(
-          SelectionEdgeUpdateEvent.forEnd(globalPosition: endOffset));
+        SelectionEdgeUpdateEvent.forEnd(globalPosition: endOffset),
+      );
       // Make sure we track that we have synthesized an end event for this selectable,
       // so we don't synthesize events unnecessarily.
       _selectableEndEdgeUpdateRecords[selectable] = state.position.pixels;
@@ -1769,7 +1813,9 @@ class _ScrollSemantics extends SingleChildRenderObjectWidget {
 
   @override
   void updateRenderObject(
-      BuildContext context, _RenderScrollSemantics renderObject) {
+    BuildContext context,
+    _RenderScrollSemantics renderObject,
+  ) {
     renderObject
       ..allowImplicitScrolling = allowImplicitScrolling
       ..axis = axis
@@ -1785,10 +1831,10 @@ class _RenderScrollSemantics extends RenderProxyBox {
     required this.axis,
     required int? semanticChildCount,
     RenderBox? child,
-  })  : _position = position,
-        _allowImplicitScrolling = allowImplicitScrolling,
-        _semanticChildCount = semanticChildCount,
-        super(child) {
+  }) : _position = position,
+       _allowImplicitScrolling = allowImplicitScrolling,
+       _semanticChildCount = semanticChildCount,
+       super(child) {
     position.addListener(markNeedsSemanticsUpdate);
   }
 
@@ -1887,8 +1933,10 @@ class _RenderScrollSemantics extends RenderProxyBox {
     }
     config.scrollIndex = firstVisibleIndex;
     node.updateWith(config: null, childrenInInversePaintOrder: excluded);
-    _innerNode!
-        .updateWith(config: config, childrenInInversePaintOrder: included);
+    _innerNode!.updateWith(
+      config: config,
+      childrenInInversePaintOrder: included,
+    );
   }
 
   @override
@@ -2019,8 +2067,10 @@ class EdgeDraggingAutoScroller {
   /// previous dragTarget to the new value and continues scrolling if necessary.
   void startAutoScrollIfNecessary(Rect dragTarget) {
     final Offset deltaToOrigin = scrollable.deltaToScrollOrigin;
-    _dragTargetRelatedToScrollOrigin =
-        dragTarget.translate(deltaToOrigin.dx, deltaToOrigin.dy);
+    _dragTargetRelatedToScrollOrigin = dragTarget.translate(
+      deltaToOrigin.dx,
+      deltaToOrigin.dy,
+    );
     if (_scrolling) {
       // The change will be picked up in the next scroll.
       return;
@@ -2040,7 +2090,11 @@ class EdgeDraggingAutoScroller {
     final Rect globalRect = MatrixUtils.transformRect(
       scrollRenderBox.getTransformTo(null),
       Rect.fromLTWH(
-          0, 0, scrollRenderBox.size.width, scrollRenderBox.size.height),
+        0,
+        0,
+        scrollRenderBox.size.width,
+        scrollRenderBox.size.height,
+      ),
     );
     assert(
       globalRect.size.width >= _dragTargetRelatedToScrollOrigin.size.width &&
@@ -2053,10 +2107,14 @@ class EdgeDraggingAutoScroller {
     const double overDragMax = 20.0;
 
     final Offset deltaToOrigin = scrollable.deltaToScrollOrigin;
-    final Offset viewportOrigin =
-        globalRect.topLeft.translate(deltaToOrigin.dx, deltaToOrigin.dy);
-    final double viewportStart =
-        _offsetExtent(viewportOrigin, _scrollDirection);
+    final Offset viewportOrigin = globalRect.topLeft.translate(
+      deltaToOrigin.dx,
+      deltaToOrigin.dy,
+    );
+    final double viewportStart = _offsetExtent(
+      viewportOrigin,
+      _scrollDirection,
+    );
     final double viewportEnd =
         viewportStart + _sizeExtent(globalRect.size, _scrollDirection);
 
@@ -2080,8 +2138,10 @@ class EdgeDraggingAutoScroller {
           );
         } else if (proxyStart < viewportStart &&
             scrollable.position.pixels < scrollable.position.maxScrollExtent) {
-          final double overDrag =
-              math.min(viewportStart - proxyStart, overDragMax);
+          final double overDrag = math.min(
+            viewportStart - proxyStart,
+            overDragMax,
+          );
           newOffset = math.min(
             scrollable.position.maxScrollExtent,
             scrollable.position.pixels + overDrag,
@@ -2091,8 +2151,10 @@ class EdgeDraggingAutoScroller {
       case AxisDirection.down:
         if (proxyStart < viewportStart &&
             scrollable.position.pixels > scrollable.position.minScrollExtent) {
-          final double overDrag =
-              math.min(viewportStart - proxyStart, overDragMax);
+          final double overDrag = math.min(
+            viewportStart - proxyStart,
+            overDragMax,
+          );
           newOffset = math.max(
             scrollable.position.minScrollExtent,
             scrollable.position.pixels - overDrag,
@@ -2113,10 +2175,14 @@ class EdgeDraggingAutoScroller {
       _scrolling = false;
       return;
     }
-    final Duration duration =
-        Duration(milliseconds: (1000 / velocityScalar).round());
-    await scrollable.position
-        .animateTo(newOffset, duration: duration, curve: Curves.linear);
+    final Duration duration = Duration(
+      milliseconds: (1000 / velocityScalar).round(),
+    );
+    await scrollable.position.animateTo(
+      newOffset,
+      duration: duration,
+      curve: Curves.linear,
+    );
     onScrollViewScrolled?.call();
     if (_scrolling) {
       await _scroll();
diff --git a/lib/common/widgets/page/tabs.dart b/lib/common/widgets/page/tabs.dart
index 57e5bd8e3..cd567232d 100644
--- a/lib/common/widgets/page/tabs.dart
+++ b/lib/common/widgets/page/tabs.dart
@@ -132,11 +132,17 @@ class _CustomTabBarViewState extends State<CustomTabBarView> {
     _warpUnderwayCount -= 1;
   }
 
-  Future<void> _animateToPage(int page,
-      {required Duration duration, required Curve curve}) async {
+  Future<void> _animateToPage(
+    int page, {
+    required Duration duration,
+    required Curve curve,
+  }) async {
     _warpUnderwayCount += 1;
-    await _pageController!
-        .animateToPage(page, duration: duration, curve: curve);
+    await _pageController!.animateToPage(
+      page,
+      duration: duration,
+      curve: curve,
+    );
     _warpUnderwayCount -= 1;
   }
 
@@ -231,8 +237,11 @@ class _CustomTabBarViewState extends State<CustomTabBarView> {
     if (duration == Duration.zero) {
       _jumpToPage(_currentIndex!);
     } else {
-      await _animateToPage(_currentIndex!,
-          duration: duration, curve: Curves.ease);
+      await _animateToPage(
+        _currentIndex!,
+        duration: duration,
+        curve: Curves.ease,
+      );
     }
     if (mounted) {
       setState(() {
@@ -269,8 +278,11 @@ class _CustomTabBarViewState extends State<CustomTabBarView> {
     if (duration == Duration.zero) {
       _jumpToPage(_currentIndex!);
     } else {
-      await _animateToPage(_currentIndex!,
-          duration: duration, curve: Curves.ease);
+      await _animateToPage(
+        _currentIndex!,
+        duration: duration,
+        curve: Curves.ease,
+      );
     }
 
     if (mounted) {
@@ -281,8 +293,11 @@ class _CustomTabBarViewState extends State<CustomTabBarView> {
   }
 
   void _syncControllerOffset() {
-    _controller!.offset =
-        clampDouble(_pageController!.page! - _controller!.index, -1.0, 1.0);
+    _controller!.offset = clampDouble(
+      _pageController!.page! - _controller!.index,
+      -1.0,
+      1.0,
+    );
   }
 
   // Called when the PageView scrolls
diff --git a/lib/common/widgets/pendant_avatar.dart b/lib/common/widgets/pendant_avatar.dart
index ca7e5b4d1..316f5d8c3 100644
--- a/lib/common/widgets/pendant_avatar.dart
+++ b/lib/common/widgets/pendant_avatar.dart
@@ -27,16 +27,16 @@ class PendantAvatar extends StatelessWidget {
     this.garbPendantImage,
     this.roomId,
     this.onTap,
-  })  : _badgeType = officialType == null || officialType < 0
-            ? isVip == true
-                ? BadgeType.vip
-                : BadgeType.none
-            : officialType == 0
-                ? BadgeType.person
-                : officialType == 1
-                    ? BadgeType.institution
-                    : BadgeType.none,
-        badgeSize = badgeSize ?? size / 3;
+  }) : _badgeType = officialType == null || officialType < 0
+           ? isVip == true
+                 ? BadgeType.vip
+                 : BadgeType.none
+           : officialType == 0
+           ? BadgeType.person
+           : officialType == 1
+           ? BadgeType.institution
+           : BadgeType.none,
+       badgeSize = badgeSize ?? size / 3;
 
   static bool showDynDecorate = Pref.showDynDecorate;
 
@@ -56,7 +56,8 @@ class PendantAvatar extends StatelessWidget {
               ),
         if (showDynDecorate && !garbPendantImage.isNullOrEmpty)
           Positioned(
-            top: -0.375 *
+            top:
+                -0.375 *
                 (size == 80 ? size - 4 : size), // -(size * 1.75 - size) / 2
             child: IgnorePointer(
               child: CachedNetworkImage(
@@ -133,27 +134,29 @@ class PendantAvatar extends StatelessWidget {
   Widget _buildBadge(ColorScheme colorScheme) {
     final child = switch (_badgeType) {
       BadgeType.vip => Image.asset(
-          'assets/images/big-vip.png',
-          height: badgeSize,
-          semanticLabel: _badgeType.desc,
-        ),
+        'assets/images/big-vip.png',
+        height: badgeSize,
+        semanticLabel: _badgeType.desc,
+      ),
       _ => Icon(
-          Icons.offline_bolt,
-          color: _badgeType.color,
-          size: badgeSize,
-          semanticLabel: _badgeType.desc,
-        ),
+        Icons.offline_bolt,
+        color: _badgeType.color,
+        size: badgeSize,
+        semanticLabel: _badgeType.desc,
+      ),
     };
     return Positioned(
-        right: 0,
-        bottom: 0,
-        child: IgnorePointer(
-          child: DecoratedBox(
-              decoration: BoxDecoration(
-                shape: BoxShape.circle,
-                color: colorScheme.surface,
-              ),
-              child: child),
-        ));
+      right: 0,
+      bottom: 0,
+      child: IgnorePointer(
+        child: DecoratedBox(
+          decoration: BoxDecoration(
+            shape: BoxShape.circle,
+            color: colorScheme.surface,
+          ),
+          child: child,
+        ),
+      ),
+    );
   }
 }
diff --git a/lib/common/widgets/progress_bar/audio_video_progress_bar.dart b/lib/common/widgets/progress_bar/audio_video_progress_bar.dart
index a284e365b..72b8265e7 100644
--- a/lib/common/widgets/progress_bar/audio_video_progress_bar.dart
+++ b/lib/common/widgets/progress_bar/audio_video_progress_bar.dart
@@ -326,16 +326,34 @@ class ProgressBar extends LeafRenderObjectWidget {
       ..add(StringProperty('progress', progress.toString()))
       ..add(StringProperty('total', total.toString()))
       ..add(StringProperty('buffered', buffered.toString()))
-      ..add(ObjectFlagProperty<ValueChanged<Duration>>('onSeek', onSeek,
-          ifNull: 'unimplemented'))
-      ..add(ObjectFlagProperty<ThumbDragStartCallback>(
-          'onDragStart', onDragStart,
-          ifNull: 'unimplemented'))
-      ..add(ObjectFlagProperty<ThumbDragUpdateCallback>(
-          'onDragUpdate', onDragUpdate,
-          ifNull: 'unimplemented'))
-      ..add(ObjectFlagProperty<VoidCallback>('onDragEnd', onDragEnd,
-          ifNull: 'unimplemented'))
+      ..add(
+        ObjectFlagProperty<ValueChanged<Duration>>(
+          'onSeek',
+          onSeek,
+          ifNull: 'unimplemented',
+        ),
+      )
+      ..add(
+        ObjectFlagProperty<ThumbDragStartCallback>(
+          'onDragStart',
+          onDragStart,
+          ifNull: 'unimplemented',
+        ),
+      )
+      ..add(
+        ObjectFlagProperty<ThumbDragUpdateCallback>(
+          'onDragUpdate',
+          onDragUpdate,
+          ifNull: 'unimplemented',
+        ),
+      )
+      ..add(
+        ObjectFlagProperty<VoidCallback>(
+          'onDragEnd',
+          onDragEnd,
+          ifNull: 'unimplemented',
+        ),
+      )
       ..add(DoubleProperty('barHeight', barHeight))
       ..add(ColorProperty('baseBarColor', baseBarColor))
       ..add(ColorProperty('progressBarColor', progressBarColor))
@@ -386,7 +404,8 @@ class ThumbDragDetails {
   final Offset localPosition;
 
   @override
-  String toString() => '${objectRuntimeType(this, 'ThumbDragDetails')}('
+  String toString() =>
+      '${objectRuntimeType(this, 'ThumbDragDetails')}('
       'time: $timeStamp, '
       'global: $globalPosition, '
       'local: $localPosition)';
@@ -431,27 +450,27 @@ class _RenderProgressBar extends RenderBox {
     TextStyle? timeLabelTextStyle,
     double timeLabelPadding = 0.0,
     double textScaleFactor = 1.0,
-  })  : _total = total,
-        _buffered = buffered,
-        _onSeek = onSeek,
-        _onDragStartUserCallback = onDragStart,
-        _onDragUpdateUserCallback = onDragUpdate,
-        _onDragEndUserCallback = onDragEnd,
-        _barHeight = barHeight,
-        _baseBarColor = baseBarColor,
-        _progressBarColor = progressBarColor,
-        _bufferedBarColor = bufferedBarColor,
-        _barCapShape = barCapShape,
-        _thumbRadius = thumbRadius,
-        _thumbColor = thumbColor,
-        _thumbGlowColor = thumbGlowColor,
-        _thumbGlowRadius = thumbGlowRadius,
-        _thumbCanPaintOutsideBar = thumbCanPaintOutsideBar,
-        _timeLabelLocation = timeLabelLocation,
-        _timeLabelType = timeLabelType,
-        _timeLabelTextStyle = timeLabelTextStyle,
-        _timeLabelPadding = timeLabelPadding,
-        _textScaleFactor = textScaleFactor {
+  }) : _total = total,
+       _buffered = buffered,
+       _onSeek = onSeek,
+       _onDragStartUserCallback = onDragStart,
+       _onDragUpdateUserCallback = onDragUpdate,
+       _onDragEndUserCallback = onDragEnd,
+       _barHeight = barHeight,
+       _baseBarColor = baseBarColor,
+       _progressBarColor = progressBarColor,
+       _bufferedBarColor = bufferedBarColor,
+       _barCapShape = barCapShape,
+       _thumbRadius = thumbRadius,
+       _thumbColor = thumbColor,
+       _thumbGlowColor = thumbGlowColor,
+       _thumbGlowRadius = thumbGlowRadius,
+       _thumbCanPaintOutsideBar = thumbCanPaintOutsideBar,
+       _timeLabelLocation = timeLabelLocation,
+       _timeLabelType = timeLabelType,
+       _timeLabelTextStyle = timeLabelTextStyle,
+       _timeLabelPadding = timeLabelPadding,
+       _textScaleFactor = textScaleFactor {
     _drag = _EagerHorizontalDragGestureRecognizer()
       ..onStart = _onDragStart
       ..onUpdate = _onDragUpdate
@@ -490,11 +509,13 @@ class _RenderProgressBar extends RenderBox {
     }
     _userIsDraggingThumb = true;
     _updateThumbPosition(details.localPosition);
-    onDragStart?.call(ThumbDragDetails(
-      timeStamp: _currentThumbDuration(),
-      globalPosition: details.globalPosition,
-      localPosition: details.localPosition,
-    ));
+    onDragStart?.call(
+      ThumbDragDetails(
+        timeStamp: _currentThumbDuration(),
+        globalPosition: details.globalPosition,
+        localPosition: details.localPosition,
+      ),
+    );
   }
 
   void _onDragUpdate(DragUpdateDetails details) {
@@ -502,11 +523,13 @@ class _RenderProgressBar extends RenderBox {
       return;
     }
     _updateThumbPosition(details.localPosition);
-    onDragUpdate?.call(ThumbDragDetails(
-      timeStamp: _currentThumbDuration(),
-      globalPosition: details.globalPosition,
-      localPosition: details.localPosition,
-    ));
+    onDragUpdate?.call(
+      ThumbDragDetails(
+        timeStamp: _currentThumbDuration(),
+        globalPosition: details.globalPosition,
+        localPosition: details.localPosition,
+      ),
+    );
   }
 
   void _onDragEnd(DragEndDetails details) {
@@ -620,10 +643,10 @@ class _RenderProgressBar extends RenderBox {
 
   TextPainter _layoutText(String text) {
     TextPainter textPainter = TextPainter(
-        text: TextSpan(text: text, style: _timeLabelTextStyle),
-        textDirection: TextDirection.ltr,
-        textScaler: TextScaler.linear(textScaleFactor))
-      ..layout(minWidth: 0, maxWidth: double.infinity);
+      text: TextSpan(text: text, style: _timeLabelTextStyle),
+      textDirection: TextDirection.ltr,
+      textScaler: TextScaler.linear(textScaleFactor),
+    )..layout(minWidth: 0, maxWidth: double.infinity);
     return textPainter;
   }
 
@@ -966,8 +989,9 @@ class _RenderProgressBar extends RenderBox {
     _rightTimeLabel().paint(canvas, rightLabelOffset);
 
     // progress bar
-    final barDy =
-        (isLabelBelow) ? 0.0 : _leftLabelSize.height + _timeLabelPadding;
+    final barDy = (isLabelBelow)
+        ? 0.0
+        : _leftLabelSize.height + _timeLabelPadding;
     _drawProgressBar(canvas, Offset(0, barDy), Size(barWidth, barHeight));
   }
 
@@ -992,7 +1016,8 @@ class _RenderProgressBar extends RenderBox {
     // progress bar
     final leftLabelWidth = leftLabelSize.width;
     final barHeight = _heightWhenNoLabels();
-    final barWidth = size.width -
+    final barWidth =
+        size.width -
         2 * _defaultSidePadding -
         2 * _timeLabelPadding -
         leftLabelWidth -
@@ -1050,11 +1075,12 @@ class _RenderProgressBar extends RenderBox {
     );
   }
 
-  void _drawBar(
-      {required Canvas canvas,
-      required Size availableSize,
-      required double widthProportion,
-      required Color color}) {
+  void _drawBar({
+    required Canvas canvas,
+    required Size availableSize,
+    required double widthProportion,
+    required Color color,
+  }) {
     final strokeCap = (_barCapShape == BarCapShape.round)
         ? StrokeCap.round
         : StrokeCap.square;
@@ -1094,8 +1120,9 @@ class _RenderProgressBar extends RenderBox {
   }
 
   String _getTimeString(Duration time) {
-    final minutes =
-        time.inMinutes.remainder(Duration.minutesPerHour).toString();
+    final minutes = time.inMinutes
+        .remainder(Duration.minutesPerHour)
+        .toString();
     final seconds = time.inSeconds
         .remainder(Duration.secondsPerMinute)
         .toString()
@@ -1112,15 +1139,14 @@ class _RenderProgressBar extends RenderBox {
     // description
     config
       ..textDirection = TextDirection.ltr
-      ..label = '进度条' //'Progress bar';
+      ..label =
+          '进度条' //'Progress bar';
       ..value = '${(_thumbValue * 100).round()}%'
-
       // increase action
       ..onIncrease = increaseAction;
     final increased = _thumbValue + _semanticActionUnit;
     config
       ..increasedValue = '${((increased).clamp(0.0, 1.0) * 100).round()}%'
-
       // decrease action
       ..onDecrease = decreaseAction;
     final decreased = _thumbValue - _semanticActionUnit;
diff --git a/lib/common/widgets/progress_bar/segment_progress_bar.dart b/lib/common/widgets/progress_bar/segment_progress_bar.dart
index 697f32973..a8e91f2ff 100644
--- a/lib/common/widgets/progress_bar/segment_progress_bar.dart
+++ b/lib/common/widgets/progress_bar/segment_progress_bar.dart
@@ -43,7 +43,8 @@ class SegmentProgressBar extends CustomPainter {
         if (item.title != null) {
           double fontSize = 10;
 
-          _defHeight ??= (TextPainter(
+          _defHeight ??=
+              (TextPainter(
                 text: TextSpan(
                   text: item.title,
                   style: TextStyle(
@@ -51,23 +52,21 @@ class SegmentProgressBar extends CustomPainter {
                   ),
                 ),
                 textDirection: TextDirection.ltr,
-              )..layout())
-                  .height +
+              )..layout()).height +
               2;
 
           TextPainter getTextPainter() => TextPainter(
-                text: TextSpan(
-                  text: item.title,
-                  style: TextStyle(
-                    color: Colors.white,
-                    fontSize: fontSize,
-                    height: 1,
-                  ),
-                ),
-                strutStyle:
-                    StrutStyle(leading: 0, height: 1, fontSize: fontSize),
-                textDirection: TextDirection.ltr,
-              )..layout();
+            text: TextSpan(
+              text: item.title,
+              style: TextStyle(
+                color: Colors.white,
+                fontSize: fontSize,
+                height: 1,
+              ),
+            ),
+            strutStyle: StrutStyle(leading: 0, height: 1, fontSize: fontSize),
+            textDirection: TextDirection.ltr,
+          )..layout();
 
           TextPainter textPainter = getTextPainter();
 
@@ -107,8 +106,8 @@ class SegmentProgressBar extends CustomPainter {
           double textX = i == 0
               ? (segmentStart - textPainter.width) / 2
               : (segmentStart - prevStart - textPainter.width) / 2 +
-                  prevStart +
-                  1;
+                    prevStart +
+                    1;
           double textY = (-_defHeight! - textPainter.height) / 2;
           textPainter.paint(canvas, Offset(textX, textY));
         } else {
diff --git a/lib/common/widgets/progress_bar/video_progress_indicator.dart b/lib/common/widgets/progress_bar/video_progress_indicator.dart
index 4910b6c69..9b7914443 100644
--- a/lib/common/widgets/progress_bar/video_progress_indicator.dart
+++ b/lib/common/widgets/progress_bar/video_progress_indicator.dart
@@ -2,18 +2,18 @@ import 'package:PiliPlus/common/constants.dart';
 import 'package:flutter/material.dart';
 
 Widget videoProgressIndicator(double progress) => ClipRect(
-      clipper: ProgressClipper(),
-      child: ClipRRect(
-        borderRadius: const BorderRadius.only(
-          bottomLeft: StyleString.imgRadius,
-          bottomRight: StyleString.imgRadius,
-        ),
-        child: LinearProgressIndicator(
-          minHeight: 10,
-          value: progress,
-        ),
-      ),
-    );
+  clipper: ProgressClipper(),
+  child: ClipRRect(
+    borderRadius: const BorderRadius.only(
+      bottomLeft: StyleString.imgRadius,
+      bottomRight: StyleString.imgRadius,
+    ),
+    child: LinearProgressIndicator(
+      minHeight: 10,
+      value: progress,
+    ),
+  ),
+);
 
 class ProgressClipper extends CustomClipper<Rect> {
   @override
diff --git a/lib/common/widgets/radio_widget.dart b/lib/common/widgets/radio_widget.dart
index b4a22c8c6..6a978c733 100644
--- a/lib/common/widgets/radio_widget.dart
+++ b/lib/common/widgets/radio_widget.dart
@@ -17,16 +17,16 @@ class RadioWidget<T> extends StatelessWidget {
   });
 
   Widget _child() => Row(
-        children: [
-          Radio<T>(
-            value: value,
-            groupValue: groupValue,
-            onChanged: onChanged,
-            materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-          ),
-          Text(title),
-        ],
-      );
+    children: [
+      Radio<T>(
+        value: value,
+        groupValue: groupValue,
+        onChanged: onChanged,
+        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+      ),
+      Text(title),
+    ],
+  );
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/common/widgets/refresh_indicator.dart b/lib/common/widgets/refresh_indicator.dart
index 4b18e9944..d72efcc40 100644
--- a/lib/common/widgets/refresh_indicator.dart
+++ b/lib/common/widgets/refresh_indicator.dart
@@ -167,9 +167,9 @@ class RefreshIndicator extends StatefulWidget {
     this.strokeWidth = RefreshProgressIndicator.defaultStrokeWidth,
     this.triggerMode = RefreshIndicatorTriggerMode.onEdge,
     this.elevation = 2.0,
-  })  : _indicatorType = _IndicatorType.material,
-        onStatusChange = null,
-        assert(elevation >= 0.0);
+  }) : _indicatorType = _IndicatorType.material,
+       onStatusChange = null,
+       assert(elevation >= 0.0);
 
   /// Creates an adaptive [RefreshIndicator] based on whether the target
   /// platform is iOS or macOS, following Material design's
@@ -201,9 +201,9 @@ class RefreshIndicator extends StatefulWidget {
     this.strokeWidth = RefreshProgressIndicator.defaultStrokeWidth,
     this.triggerMode = RefreshIndicatorTriggerMode.onEdge,
     this.elevation = 2.0,
-  })  : _indicatorType = _IndicatorType.adaptive,
-        onStatusChange = null,
-        assert(elevation >= 0.0);
+  }) : _indicatorType = _IndicatorType.adaptive,
+       onStatusChange = null,
+       assert(elevation >= 0.0);
 
   /// Creates a [RefreshIndicator] with no spinner and calls `onRefresh` when
   /// successfully armed by a drag event.
@@ -219,16 +219,16 @@ class RefreshIndicator extends StatefulWidget {
     this.semanticsValue,
     this.triggerMode = RefreshIndicatorTriggerMode.onEdge,
     this.elevation = 2.0,
-  })  : _indicatorType = _IndicatorType.noSpinner,
-        // The following parameters aren't used because [_IndicatorType.noSpinner] is being used,
-        // which involves showing no spinner, hence the following parameters are useless since
-        // their only use is to change the spinner's appearance.
-        displacement = 0.0,
-        edgeOffset = 0.0,
-        color = null,
-        backgroundColor = null,
-        strokeWidth = 0.0,
-        assert(elevation >= 0.0);
+  }) : _indicatorType = _IndicatorType.noSpinner,
+       // The following parameters aren't used because [_IndicatorType.noSpinner] is being used,
+       // which involves showing no spinner, hence the following parameters are useless since
+       // their only use is to change the spinner's appearance.
+       displacement = 0.0,
+       edgeOffset = 0.0,
+       color = null,
+       backgroundColor = null,
+       strokeWidth = 0.0,
+       assert(elevation >= 0.0);
 
   /// The widget below this widget in the tree.
   ///
@@ -345,16 +345,20 @@ class RefreshIndicatorState extends State<RefreshIndicator>
   late Color _effectiveValueColor =
       widget.color ?? Theme.of(context).colorScheme.primary;
 
-  static final Animatable<double> _threeQuarterTween =
-      Tween<double>(begin: 0.0, end: 0.75);
+  static final Animatable<double> _threeQuarterTween = Tween<double>(
+    begin: 0.0,
+    end: 0.75,
+  );
 
   static final Animatable<double> _kDragSizeFactorLimitTween = Tween<double>(
     begin: 0.0,
     end: _kDragSizeFactorLimit,
   );
 
-  static final Animatable<double> _oneToZeroTween =
-      Tween<double>(begin: 1.0, end: 0.0);
+  static final Animatable<double> _oneToZeroTween = Tween<double>(
+    begin: 1.0,
+    end: 0.0,
+  );
 
   @protected
   @override
@@ -408,8 +412,9 @@ class RefreshIndicatorState extends State<RefreshIndicator>
         ColorTween(
           begin: color.withAlpha(0),
           end: color.withAlpha(color.alpha),
-        ).chain(CurveTween(
-            curve: const Interval(0.0, 1.0 / _kDragSizeFactorLimit))),
+        ).chain(
+          CurveTween(curve: const Interval(0.0, 1.0 / _kDragSizeFactorLimit)),
+        ),
       );
     }
   }
@@ -444,9 +449,9 @@ class RefreshIndicatorState extends State<RefreshIndicator>
     }
     final bool? indicatorAtTopNow =
         switch (notification.metrics.axisDirection) {
-      AxisDirection.down || AxisDirection.up => true,
-      AxisDirection.left || AxisDirection.right => null,
-    };
+          AxisDirection.down || AxisDirection.up => true,
+          AxisDirection.left || AxisDirection.right => null,
+        };
     if (indicatorAtTopNow != _isIndicatorAtTop) {
       if (_status == RefreshIndicatorStatus.drag ||
           _status == RefreshIndicatorStatus.armed) {
@@ -502,7 +507,8 @@ class RefreshIndicatorState extends State<RefreshIndicator>
   }
 
   bool _handleIndicatorNotification(
-      OverscrollIndicatorNotification notification) {
+    OverscrollIndicatorNotification notification,
+  ) {
     if (notification.depth != 0 || !notification.leading) {
       return false;
     }
@@ -534,15 +540,20 @@ class RefreshIndicatorState extends State<RefreshIndicator>
   }
 
   void _checkDragOffset(double containerExtent) {
-    assert(_status == RefreshIndicatorStatus.drag ||
-        _status == RefreshIndicatorStatus.armed);
+    assert(
+      _status == RefreshIndicatorStatus.drag ||
+          _status == RefreshIndicatorStatus.armed,
+    );
     double newValue =
         _dragOffset! / (containerExtent * kDragContainerExtentPercentage);
     if (_status == RefreshIndicatorStatus.armed) {
       newValue = math.max(newValue, 1.0 / _kDragSizeFactorLimit);
     }
-    _positionController.value =
-        clampDouble(newValue, 0.0, 1.0); // This triggers various rebuilds.
+    _positionController.value = clampDouble(
+      newValue,
+      0.0,
+      1.0,
+    ); // This triggers various rebuilds.
     if (_status == RefreshIndicatorStatus.drag &&
         _valueColor.value!.alpha == _effectiveValueColor.alpha) {
       _status = RefreshIndicatorStatus.armed;
@@ -556,19 +567,25 @@ class RefreshIndicatorState extends State<RefreshIndicator>
     // This can only be called from _show() when refreshing and
     // _handleScrollNotification in response to a ScrollEndNotification or
     // direction change.
-    assert(newMode == RefreshIndicatorStatus.canceled ||
-        newMode == RefreshIndicatorStatus.done);
+    assert(
+      newMode == RefreshIndicatorStatus.canceled ||
+          newMode == RefreshIndicatorStatus.done,
+    );
     setState(() {
       _status = newMode;
       widget.onStatusChange?.call(_status);
     });
     switch (_status!) {
       case RefreshIndicatorStatus.done:
-        await _scaleController.animateTo(1.0,
-            duration: _kIndicatorScaleDuration);
+        await _scaleController.animateTo(
+          1.0,
+          duration: _kIndicatorScaleDuration,
+        );
       case RefreshIndicatorStatus.canceled:
-        await _positionController.animateTo(0.0,
-            duration: _kIndicatorScaleDuration);
+        await _positionController.animateTo(
+          0.0,
+          duration: _kIndicatorScaleDuration,
+        );
       case RefreshIndicatorStatus.armed:
       case RefreshIndicatorStatus.drag:
       case RefreshIndicatorStatus.refresh:
@@ -592,23 +609,25 @@ class RefreshIndicatorState extends State<RefreshIndicator>
     _status = RefreshIndicatorStatus.snap;
     widget.onStatusChange?.call(_status);
     _positionController
-        .animateTo(1.0 / _kDragSizeFactorLimit,
-            duration: _kIndicatorSnapDuration)
+        .animateTo(
+          1.0 / _kDragSizeFactorLimit,
+          duration: _kIndicatorSnapDuration,
+        )
         .whenComplete(() {
-      if (mounted && _status == RefreshIndicatorStatus.snap) {
-        setState(() {
-          // Show the indeterminate progress indicator.
-          _status = RefreshIndicatorStatus.refresh;
-        });
+          if (mounted && _status == RefreshIndicatorStatus.snap) {
+            setState(() {
+              // Show the indeterminate progress indicator.
+              _status = RefreshIndicatorStatus.refresh;
+            });
 
-        widget.onRefresh().whenComplete(() {
-          if (mounted && _status == RefreshIndicatorStatus.refresh) {
-            completer.complete();
-            _dismiss(RefreshIndicatorStatus.done);
+            widget.onRefresh().whenComplete(() {
+              if (mounted && _status == RefreshIndicatorStatus.refresh) {
+                completer.complete();
+                _dismiss(RefreshIndicatorStatus.done);
+              }
+            });
           }
         });
-      }
-    });
   }
 
   /// Show the refresh indicator and run the refresh callback as if it had
@@ -662,7 +681,7 @@ class RefreshIndicatorState extends State<RefreshIndicator>
 
     final bool showIndeterminateIndicator =
         _status == RefreshIndicatorStatus.refresh ||
-            _status == RefreshIndicatorStatus.done;
+        _status == RefreshIndicatorStatus.done;
 
     return Stack(
       clipBehavior: Clip.none,
@@ -692,22 +711,25 @@ class RefreshIndicatorState extends State<RefreshIndicator>
                       builder: (BuildContext context, Widget? child) {
                         final Widget materialIndicator =
                             RefreshProgressIndicator(
-                          semanticsLabel: widget.semanticsLabel ??
-                              MaterialLocalizations.of(context)
-                                  .refreshIndicatorSemanticLabel,
-                          semanticsValue: widget.semanticsValue,
-                          value:
-                              showIndeterminateIndicator ? null : _value.value,
-                          valueColor: _valueColor,
-                          backgroundColor: widget.backgroundColor,
-                          strokeWidth: widget.strokeWidth,
-                          elevation: widget.elevation,
-                        );
+                              semanticsLabel:
+                                  widget.semanticsLabel ??
+                                  MaterialLocalizations.of(
+                                    context,
+                                  ).refreshIndicatorSemanticLabel,
+                              semanticsValue: widget.semanticsValue,
+                              value: showIndeterminateIndicator
+                                  ? null
+                                  : _value.value,
+                              valueColor: _valueColor,
+                              backgroundColor: widget.backgroundColor,
+                              strokeWidth: widget.strokeWidth,
+                              elevation: widget.elevation,
+                            );
 
                         final Widget cupertinoIndicator =
                             CupertinoActivityIndicator(
-                          color: widget.color,
-                        );
+                              color: widget.color,
+                            );
 
                         switch (widget._indicatorType) {
                           case _IndicatorType.material:
diff --git a/lib/common/widgets/scroll_physics.dart b/lib/common/widgets/scroll_physics.dart
index 8f7ba2dbf..d1faf9721 100644
--- a/lib/common/widgets/scroll_physics.dart
+++ b/lib/common/widgets/scroll_physics.dart
@@ -4,22 +4,20 @@ import 'package:flutter/material.dart';
 Widget videoTabBarView({
   required List<Widget> children,
   TabController? controller,
-}) =>
-    TabBarView(
-      physics: const CustomTabBarViewClampingScrollPhysics(),
-      controller: controller,
-      children: children,
-    );
+}) => TabBarView(
+  physics: const CustomTabBarViewClampingScrollPhysics(),
+  controller: controller,
+  children: children,
+);
 
 Widget tabBarView({
   required List<Widget> children,
   TabController? controller,
-}) =>
-    TabBarView(
-      physics: const CustomTabBarViewScrollPhysics(),
-      controller: controller,
-      children: children,
-    );
+}) => TabBarView(
+  physics: const CustomTabBarViewScrollPhysics(),
+  controller: controller,
+  children: children,
+);
 
 class CustomTabBarViewScrollPhysics extends ScrollPhysics {
   const CustomTabBarViewScrollPhysics({super.parent});
@@ -57,7 +55,9 @@ class ReloadScrollPhysics extends AlwaysScrollableScrollPhysics {
   @override
   ReloadScrollPhysics applyTo(ScrollPhysics? ancestor) {
     return ReloadScrollPhysics(
-        parent: buildParent(ancestor), controller: controller);
+      parent: buildParent(ancestor),
+      controller: controller,
+    );
   }
 
   @override
diff --git a/lib/common/widgets/stat/stat.dart b/lib/common/widgets/stat/stat.dart
index ce30c734b..94e05f456 100644
--- a/lib/common/widgets/stat/stat.dart
+++ b/lib/common/widgets/stat/stat.dart
@@ -18,7 +18,8 @@ class StatWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    Color color = this.color ??
+    Color color =
+        this.color ??
         Theme.of(context).colorScheme.outline.withValues(alpha: 0.8);
     return Row(
       spacing: 2,
diff --git a/lib/common/widgets/tabs.dart b/lib/common/widgets/tabs.dart
index 9345095be..7d5b9deb5 100644
--- a/lib/common/widgets/tabs.dart
+++ b/lib/common/widgets/tabs.dart
@@ -126,11 +126,17 @@ class _CustomTabBarViewState extends State<CustomTabBarView> {
     _warpUnderwayCount -= 1;
   }
 
-  Future<void> _animateToPage(int page,
-      {required Duration duration, required Curve curve}) async {
+  Future<void> _animateToPage(
+    int page, {
+    required Duration duration,
+    required Curve curve,
+  }) async {
     _warpUnderwayCount += 1;
-    await _pageController!
-        .animateToPage(page, duration: duration, curve: curve);
+    await _pageController!.animateToPage(
+      page,
+      duration: duration,
+      curve: curve,
+    );
     _warpUnderwayCount -= 1;
   }
 
@@ -225,8 +231,11 @@ class _CustomTabBarViewState extends State<CustomTabBarView> {
     if (duration == Duration.zero) {
       _jumpToPage(_currentIndex!);
     } else {
-      await _animateToPage(_currentIndex!,
-          duration: duration, curve: Curves.ease);
+      await _animateToPage(
+        _currentIndex!,
+        duration: duration,
+        curve: Curves.ease,
+      );
     }
     if (mounted) {
       setState(() {
@@ -263,8 +272,11 @@ class _CustomTabBarViewState extends State<CustomTabBarView> {
     if (duration == Duration.zero) {
       _jumpToPage(_currentIndex!);
     } else {
-      await _animateToPage(_currentIndex!,
-          duration: duration, curve: Curves.ease);
+      await _animateToPage(
+        _currentIndex!,
+        duration: duration,
+        curve: Curves.ease,
+      );
     }
 
     if (mounted) {
@@ -275,8 +287,11 @@ class _CustomTabBarViewState extends State<CustomTabBarView> {
   }
 
   void _syncControllerOffset() {
-    _controller!.offset =
-        clampDouble(_pageController!.page! - _controller!.index, -1.0, 1.0);
+    _controller!.offset = clampDouble(
+      _pageController!.page! - _controller!.index,
+      -1.0,
+      1.0,
+    );
   }
 
   // Called when the PageView scrolls
diff --git a/lib/common/widgets/text/paragraph.dart b/lib/common/widgets/text/paragraph.dart
index 4cd1562d8..442a51ea7 100644
--- a/lib/common/widgets/text/paragraph.dart
+++ b/lib/common/widgets/text/paragraph.dart
@@ -11,7 +11,8 @@ library;
 
 import 'dart:collection';
 import 'dart:math' as math;
-import 'dart:ui' as ui
+import 'dart:ui'
+    as ui
     show
         BoxHeightStyle,
         BoxWidthStyle,
@@ -30,18 +31,18 @@ import 'package:flutter/services.dart';
 /// The start and end positions for a text boundary.
 typedef _TextBoundaryRecord = ({
   TextPosition boundaryStart,
-  TextPosition boundaryEnd
+  TextPosition boundaryEnd,
 });
 
 /// Signature for a function that determines the [_TextBoundaryRecord] at the given
 /// [TextPosition].
-typedef _TextBoundaryAtPosition = _TextBoundaryRecord Function(
-    TextPosition position);
+typedef _TextBoundaryAtPosition =
+    _TextBoundaryRecord Function(TextPosition position);
 
 /// Signature for a function that determines the [_TextBoundaryRecord] at the given
 /// [TextPosition], for the given [String].
-typedef _TextBoundaryAtPositionInText = _TextBoundaryRecord Function(
-    TextPosition position, String text);
+typedef _TextBoundaryAtPositionInText =
+    _TextBoundaryRecord Function(TextPosition position, String text);
 
 const String _kEllipsis = '\u2026';
 
@@ -77,33 +78,35 @@ class RenderParagraph extends RenderBox
     Color? selectionColor,
     SelectionRegistrar? registrar,
     required Color primary,
-  })  : assert(text.debugAssertIsValid()),
-        assert(maxLines == null ||
-            (maxLines > 0 &&
-                overflow != TextOverflow.ellipsis &&
-                overflow != TextOverflow.fade)),
-        assert(
-          identical(textScaler, TextScaler.noScaling) || textScaleFactor == 1.0,
-          'textScaleFactor is deprecated and cannot be specified when textScaler is specified.',
-        ),
-        _primary = primary,
-        _softWrap = softWrap,
-        _overflow = overflow,
-        _selectionColor = selectionColor,
-        _textPainter = TextPainter(
-          text: text,
-          textAlign: textAlign,
-          textDirection: textDirection,
-          textScaler: textScaler == TextScaler.noScaling
-              ? TextScaler.linear(textScaleFactor)
-              : textScaler,
-          maxLines: maxLines,
-          ellipsis: overflow == TextOverflow.ellipsis ? _kEllipsis : null,
-          locale: locale,
-          strutStyle: strutStyle,
-          textWidthBasis: textWidthBasis,
-          textHeightBehavior: textHeightBehavior,
-        ) {
+  }) : assert(text.debugAssertIsValid()),
+       assert(
+         maxLines == null ||
+             (maxLines > 0 &&
+                 overflow != TextOverflow.ellipsis &&
+                 overflow != TextOverflow.fade),
+       ),
+       assert(
+         identical(textScaler, TextScaler.noScaling) || textScaleFactor == 1.0,
+         'textScaleFactor is deprecated and cannot be specified when textScaler is specified.',
+       ),
+       _primary = primary,
+       _softWrap = softWrap,
+       _overflow = overflow,
+       _selectionColor = selectionColor,
+       _textPainter = TextPainter(
+         text: text,
+         textAlign: textAlign,
+         textDirection: textDirection,
+         textScaler: textScaler == TextScaler.noScaling
+             ? TextScaler.linear(textScaleFactor)
+             : textScaler,
+         maxLines: maxLines,
+         ellipsis: overflow == TextOverflow.ellipsis ? _kEllipsis : null,
+         locale: locale,
+         strutStyle: strutStyle,
+         textWidthBasis: textWidthBasis,
+         textHeightBehavior: textHeightBehavior,
+       ) {
     addAll(children);
     this.registrar = registrar;
   }
@@ -487,11 +490,11 @@ class RenderParagraph extends RenderBox
   double computeMinIntrinsicWidth(double height) {
     final List<PlaceholderDimensions> placeholderDimensions =
         layoutInlineChildren(
-      double.infinity,
-      (RenderBox child, BoxConstraints constraints) =>
-          Size(child.getMinIntrinsicWidth(double.infinity), 0.0),
-      ChildLayoutHelper.getDryBaseline,
-    );
+          double.infinity,
+          (RenderBox child, BoxConstraints constraints) =>
+              Size(child.getMinIntrinsicWidth(double.infinity), 0.0),
+          ChildLayoutHelper.getDryBaseline,
+        );
     return (_textIntrinsics
           ..setPlaceholderDimensions(placeholderDimensions)
           ..layout())
@@ -500,8 +503,8 @@ class RenderParagraph extends RenderBox
 
   @override
   double computeMaxIntrinsicWidth(double height) {
-    final List<PlaceholderDimensions> placeholderDimensions =
-        layoutInlineChildren(
+    final List<PlaceholderDimensions>
+    placeholderDimensions = layoutInlineChildren(
       double.infinity,
       // Height and baseline is irrelevant as all text will be laid
       // out in a single line. Therefore, using 0.0 as a dummy for the height.
@@ -558,10 +561,10 @@ class RenderParagraph extends RenderBox
     // graphemeClusterLayoutBounds rects.
     final InlineSpan? spanHit =
         glyph != null && glyph.graphemeClusterLayoutBounds.contains(position)
-            ? _textPainter.text!.getSpanForPosition(
-                TextPosition(offset: glyph.graphemeClusterCodeUnitRange.start),
-              )
-            : null;
+        ? _textPainter.text!.getSpanForPosition(
+            TextPosition(offset: glyph.graphemeClusterCodeUnitRange.start),
+          )
+        : null;
     switch (spanHit) {
       case final HitTestTarget span:
         result.add(HitTestEntry(span));
@@ -604,26 +607,28 @@ class RenderParagraph extends RenderBox
     _textPainter
       ..setPlaceholderDimensions(_placeholderDimensions)
       ..layout(
-          minWidth: constraints.minWidth,
-          maxWidth: _adjustMaxWidth(constraints.maxWidth));
+        minWidth: constraints.minWidth,
+        maxWidth: _adjustMaxWidth(constraints.maxWidth),
+      );
   }
 
   @override
   @protected
   Size computeDryLayout(covariant BoxConstraints constraints) {
-    final Size size = (_textIntrinsics
-          ..setPlaceholderDimensions(
-            layoutInlineChildren(
-              constraints.maxWidth,
-              ChildLayoutHelper.dryLayoutChild,
-              ChildLayoutHelper.getDryBaseline,
-            ),
-          )
-          ..layout(
-            minWidth: constraints.minWidth,
-            maxWidth: _adjustMaxWidth(constraints.maxWidth),
-          ))
-        .size;
+    final Size size =
+        (_textIntrinsics
+              ..setPlaceholderDimensions(
+                layoutInlineChildren(
+                  constraints.maxWidth,
+                  ChildLayoutHelper.dryLayoutChild,
+                  ChildLayoutHelper.getDryBaseline,
+                ),
+              )
+              ..layout(
+                minWidth: constraints.minWidth,
+                maxWidth: _adjustMaxWidth(constraints.maxWidth),
+              ))
+            .size;
     return constraints.constrain(size);
   }
 
@@ -638,13 +643,16 @@ class RenderParagraph extends RenderBox
     // layouts. We should eventually change this back to pass the `baseline`
     // property when the ideographic baseline is properly implemented
     // (https://github.com/flutter/flutter/issues/22625).
-    return _textPainter
-        .computeDistanceToActualBaseline(TextBaseline.alphabetic);
+    return _textPainter.computeDistanceToActualBaseline(
+      TextBaseline.alphabetic,
+    );
   }
 
   @override
   double computeDryBaseline(
-      covariant BoxConstraints constraints, TextBaseline baseline) {
+    covariant BoxConstraints constraints,
+    TextBaseline baseline,
+  ) {
     assert(constraints.debugAssertIsValid());
     _textIntrinsics
       ..setPlaceholderDimensions(
@@ -655,10 +663,12 @@ class RenderParagraph extends RenderBox
         ),
       )
       ..layout(
-          minWidth: constraints.minWidth,
-          maxWidth: _adjustMaxWidth(constraints.maxWidth));
-    return _textIntrinsics
-        .computeDistanceToActualBaseline(TextBaseline.alphabetic);
+        minWidth: constraints.minWidth,
+        maxWidth: _adjustMaxWidth(constraints.maxWidth),
+      );
+    return _textIntrinsics.computeDistanceToActualBaseline(
+      TextBaseline.alphabetic,
+    );
   }
 
   Color _primary;
@@ -671,9 +681,9 @@ class RenderParagraph extends RenderBox
   }
 
   TextSpan get _moreTextSpan => TextSpan(
-        style: text.style!.copyWith(color: _primary),
-        text: '查看更多',
-      );
+    style: text.style!.copyWith(color: _primary),
+    text: '查看更多',
+  );
   TextPainter? _morePainter;
 
   bool didOverflowHeight = false;
@@ -739,9 +749,9 @@ class RenderParagraph extends RenderBox
             final (double fadeStart, double fadeEnd) = switch (textDirection) {
               TextDirection.rtl => (fadeSizePainter.width, 0.0),
               TextDirection.ltr => (
-                  size.width - fadeSizePainter.width,
-                  size.width
-                ),
+                size.width - fadeSizePainter.width,
+                size.width,
+              ),
             };
             _overflowShader = ui.Gradient.linear(
               Offset(fadeStart, 0.0),
@@ -915,11 +925,17 @@ class RenderParagraph extends RenderBox
   }
 
   TextPosition _getTextPositionVertical(
-      TextPosition position, double verticalOffset) {
-    final Offset caretOffset =
-        _textPainter.getOffsetForCaret(position, Rect.zero);
-    final Offset caretOffsetTranslated =
-        caretOffset.translate(0.0, verticalOffset);
+    TextPosition position,
+    double verticalOffset,
+  ) {
+    final Offset caretOffset = _textPainter.getOffsetForCaret(
+      position,
+      Rect.zero,
+    );
+    final Offset caretOffsetTranslated = caretOffset.translate(
+      0.0,
+      verticalOffset,
+    );
     return _textPainter.getPositionForOffset(caretOffsetTranslated);
   }
 
@@ -1018,7 +1034,9 @@ class RenderParagraph extends RenderBox
         if (seenTextInfo != null) {
           builder.markAsMergeUp(
             _createSemanticsConfigForTextInfo(
-                seenTextInfo, attributedLabelCacheIndex),
+              seenTextInfo,
+              attributedLabelCacheIndex,
+            ),
           );
           attributedLabelCacheIndex += 1;
         }
@@ -1040,7 +1058,9 @@ class RenderParagraph extends RenderBox
     if (seenTextInfo != null) {
       builder.markAsMergeUp(
         _createSemanticsConfigForTextInfo(
-            seenTextInfo, attributedLabelCacheIndex),
+          seenTextInfo,
+          attributedLabelCacheIndex,
+        ),
       );
     }
     return builder.build();
@@ -1051,8 +1071,8 @@ class RenderParagraph extends RenderBox
     int cacheIndex,
   ) {
     assert(!textInfo.requiresOwnNode);
-    final List<AttributedString> cachedStrings =
-        _cachedAttributedLabels ??= <AttributedString>[];
+    final List<AttributedString> cachedStrings = _cachedAttributedLabels ??=
+        <AttributedString>[];
     assert(cacheIndex <= cachedStrings.length);
     final bool hasCache = cacheIndex < cachedStrings.length;
 
@@ -1161,15 +1181,15 @@ class RenderParagraph extends RenderBox
         switch (info.recognizer) {
           case TapGestureRecognizer(onTap: final VoidCallback? handler):
           case DoubleTapGestureRecognizer(
-              onDoubleTap: final VoidCallback? handler
-            ):
+            onDoubleTap: final VoidCallback? handler,
+          ):
             if (handler != null) {
               configuration.onTap = handler;
               configuration.isLink = true;
             }
           case LongPressGestureRecognizer(
-              onLongPress: final GestureLongPressCallback? onLongPress
-            ):
+            onLongPress: final GestureLongPressCallback? onLongPress,
+          ):
             if (onLongPress != null) {
               configuration.onLongPress = onLongPress;
             }
@@ -1179,8 +1199,9 @@ class RenderParagraph extends RenderBox
             assert(false, '${info.recognizer.runtimeType} is not supported.');
         }
         if (node.parentPaintClipRect != null) {
-          final Rect paintRect =
-              node.parentPaintClipRect!.intersect(currentRect);
+          final Rect paintRect = node.parentPaintClipRect!.intersect(
+            currentRect,
+          );
           configuration.isHidden = paintRect.isEmpty && !currentRect.isEmpty;
         }
         final SemanticsNode newChild;
@@ -1189,7 +1210,9 @@ class RenderParagraph extends RenderBox
         } else {
           final UniqueKey key = UniqueKey();
           newChild = SemanticsNode(
-              key: key, showOnScreen: _createShowOnScreenFor(key));
+            key: key,
+            showOnScreen: _createShowOnScreenFor(key),
+          );
         }
         newChild
           ..updateWith(config: configuration)
@@ -1223,7 +1246,9 @@ class RenderParagraph extends RenderBox
   List<DiagnosticsNode> debugDescribeChildren() {
     return <DiagnosticsNode>[
       text.toDiagnosticsNode(
-          name: 'text', style: DiagnosticsTreeStyle.transition),
+        name: 'text',
+        style: DiagnosticsTreeStyle.transition,
+      ),
     ];
   }
 
@@ -1243,11 +1268,15 @@ class RenderParagraph extends RenderBox
     );
     properties.add(EnumProperty<TextOverflow>('overflow', overflow));
     properties.add(
-      DiagnosticsProperty<TextScaler>('textScaler', textScaler,
-          defaultValue: TextScaler.noScaling),
+      DiagnosticsProperty<TextScaler>(
+        'textScaler',
+        textScaler,
+        defaultValue: TextScaler.noScaling,
+      ),
+    );
+    properties.add(
+      DiagnosticsProperty<Locale>('locale', locale, defaultValue: null),
     );
-    properties
-        .add(DiagnosticsProperty<Locale>('locale', locale, defaultValue: null));
     properties.add(IntProperty('maxLines', maxLines, ifNull: 'unlimited'));
   }
 }
@@ -1262,9 +1291,11 @@ class RenderParagraph extends RenderBox
 class _SelectableFragment
     with Selectable, Diagnosticable, ChangeNotifier
     implements TextLayoutMetrics {
-  _SelectableFragment(
-      {required this.paragraph, required this.fullText, required this.range})
-      : assert(range.isValid && !range.isCollapsed && range.isNormalized) {
+  _SelectableFragment({
+    required this.paragraph,
+    required this.fullText,
+    required this.range,
+  }) : assert(range.isValid && !range.isCollapsed && range.isNormalized) {
     if (kFlutterMemoryAllocationsEnabled) {
       ChangeNotifier.maybeDispatchObjectCreation(this);
     }
@@ -1299,18 +1330,20 @@ class _SelectableFragment
   SelectionGeometry _getSelectionGeometry() {
     if (_textSelectionStart == null || _textSelectionEnd == null) {
       return const SelectionGeometry(
-          status: SelectionStatus.none, hasContent: true);
+        status: SelectionStatus.none,
+        hasContent: true,
+      );
     }
 
     final int selectionStart = _textSelectionStart!.offset;
     final int selectionEnd = _textSelectionEnd!.offset;
     final bool isReversed = selectionStart > selectionEnd;
-    final Offset startOffsetInParagraphCoordinates =
-        paragraph._getOffsetForPosition(
-      TextPosition(offset: selectionStart),
-    );
-    final Offset endOffsetInParagraphCoordinates = selectionStart ==
-            selectionEnd
+    final Offset startOffsetInParagraphCoordinates = paragraph
+        ._getOffsetForPosition(
+          TextPosition(offset: selectionStart),
+        );
+    final Offset endOffsetInParagraphCoordinates =
+        selectionStart == selectionEnd
         ? startOffsetInParagraphCoordinates
         : paragraph._getOffsetForPosition(TextPosition(offset: selectionEnd));
     final bool flipHandles =
@@ -1330,17 +1363,17 @@ class _SelectableFragment
     ) = switch ((selectionCollapsed, flipHandles)) {
       // Always prefer collapsed handle when selection is collapsed.
       (true, _) => (
-          TextSelectionHandleType.collapsed,
-          TextSelectionHandleType.collapsed
-        ),
+        TextSelectionHandleType.collapsed,
+        TextSelectionHandleType.collapsed,
+      ),
       (false, true) => (
-          TextSelectionHandleType.right,
-          TextSelectionHandleType.left
-        ),
+        TextSelectionHandleType.right,
+        TextSelectionHandleType.left,
+      ),
       (false, false) => (
-          TextSelectionHandleType.left,
-          TextSelectionHandleType.right
-        ),
+        TextSelectionHandleType.left,
+        TextSelectionHandleType.right,
+      ),
     };
     return SelectionGeometry(
       startSelectionPoint: SelectionPoint(
@@ -1394,8 +1427,10 @@ class _SelectableFragment
             );
           case TextGranularity.document:
           case TextGranularity.line:
-            assert(false,
-                'Moving the selection edge by line or document is not supported.');
+            assert(
+              false,
+              'Moving the selection edge by line or document is not supported.',
+            );
         }
       case SelectionEventType.clear:
         result = _handleClearSelection();
@@ -1445,10 +1480,14 @@ class _SelectableFragment
     if (_textSelectionStart == null || _textSelectionEnd == null) {
       return null;
     }
-    final int start =
-        math.min(_textSelectionStart!.offset, _textSelectionEnd!.offset);
-    final int end =
-        math.max(_textSelectionStart!.offset, _textSelectionEnd!.offset);
+    final int start = math.min(
+      _textSelectionStart!.offset,
+      _textSelectionEnd!.offset,
+    );
+    final int end = math.max(
+      _textSelectionStart!.offset,
+      _textSelectionEnd!.offset,
+    );
     return SelectedContent(plainText: fullText.substring(start, end));
   }
 
@@ -1488,7 +1527,8 @@ class _SelectableFragment
             position.offset == existingSelectionEnd.offset;
         final bool isSelectionInverted =
             existingSelectionStart.offset > existingSelectionEnd.offset;
-        final bool shouldSwapEdges = !isSamePosition &&
+        final bool shouldSwapEdges =
+            !isSamePosition &&
             (isSelectionInverted !=
                 (position.offset > existingSelectionEnd.offset));
         if (shouldSwapEdges) {
@@ -1500,8 +1540,9 @@ class _SelectableFragment
           // When the selection is inverted by the new position it is necessary to
           // swap the start edge (moving edge) with the end edge (static edge) to
           // maintain the origin text boundary within the selection.
-          final _TextBoundaryRecord localTextBoundary =
-              getTextBoundary(existingSelectionEnd);
+          final _TextBoundaryRecord localTextBoundary = getTextBoundary(
+            existingSelectionEnd,
+          );
           assert(
             localTextBoundary.boundaryStart.offset >= range.start &&
                 localTextBoundary.boundaryEnd.offset <= range.end,
@@ -1551,13 +1592,15 @@ class _SelectableFragment
             position.offset == existingSelectionEnd.offset;
         final bool isSelectionInverted =
             existingSelectionStart.offset > existingSelectionEnd.offset;
-        final bool shouldSwapEdges = !isSamePosition &&
+        final bool shouldSwapEdges =
+            !isSamePosition &&
             (isSelectionInverted !=
                 (position.offset > existingSelectionEnd.offset));
 
         if (shouldSwapEdges) {
-          final _TextBoundaryRecord localTextBoundary =
-              getTextBoundary(existingSelectionEnd);
+          final _TextBoundaryRecord localTextBoundary = getTextBoundary(
+            existingSelectionEnd,
+          );
           assert(
             localTextBoundary.boundaryStart.offset >= range.start &&
                 localTextBoundary.boundaryEnd.offset <= range.end,
@@ -1594,7 +1637,8 @@ class _SelectableFragment
             position.offset == existingSelectionStart.offset;
         final bool isSelectionInverted =
             existingSelectionStart.offset > existingSelectionEnd.offset;
-        final bool shouldSwapEdges = !isSamePosition &&
+        final bool shouldSwapEdges =
+            !isSamePosition &&
             (isSelectionInverted !=
                 (position.offset < existingSelectionStart.offset));
         if (shouldSwapEdges) {
@@ -1606,8 +1650,9 @@ class _SelectableFragment
           // When the selection is inverted by the new position it is necessary to
           // swap the end edge (moving edge) with the start edge (static edge) to
           // maintain the origin text boundary within the selection.
-          final _TextBoundaryRecord localTextBoundary =
-              getTextBoundary(existingSelectionStart);
+          final _TextBoundaryRecord localTextBoundary = getTextBoundary(
+            existingSelectionStart,
+          );
           assert(
             localTextBoundary.boundaryStart.offset >= range.start &&
                 localTextBoundary.boundaryEnd.offset <= range.end,
@@ -1657,12 +1702,14 @@ class _SelectableFragment
             position.offset == existingSelectionStart.offset;
         final bool isSelectionInverted =
             existingSelectionStart.offset > existingSelectionEnd.offset;
-        final bool shouldSwapEdges = isSelectionInverted !=
+        final bool shouldSwapEdges =
+            isSelectionInverted !=
                 (position.offset < existingSelectionStart.offset) ||
             isSamePosition;
         if (shouldSwapEdges) {
-          final _TextBoundaryRecord localTextBoundary =
-              getTextBoundary(existingSelectionStart);
+          final _TextBoundaryRecord localTextBoundary = getTextBoundary(
+            existingSelectionStart,
+          );
           assert(
             localTextBoundary.boundaryStart.offset >= range.start &&
                 localTextBoundary.boundaryEnd.offset <= range.end,
@@ -1693,8 +1740,10 @@ class _SelectableFragment
     _setSelectionPosition(null, isEnd: isEnd);
     final Matrix4 transform = paragraph.getTransformTo(null);
     transform.invert();
-    final Offset localPosition =
-        MatrixUtils.transformPoint(transform, globalPosition);
+    final Offset localPosition = MatrixUtils.transformPoint(
+      transform,
+      globalPosition,
+    );
     if (_rect.isEmpty) {
       return SelectionUtils.getResultBasedOnRect(_rect, localPosition);
     }
@@ -1704,14 +1753,16 @@ class _SelectableFragment
       direction: paragraph.textDirection,
     );
 
-    final TextPosition position =
-        paragraph.getPositionForOffset(adjustedOffset);
+    final TextPosition position = paragraph.getPositionForOffset(
+      adjustedOffset,
+    );
     // Check if the original local position is within the rect, if it is not then
     // we do not need to look up the text boundary for that position. This is to
     // maintain a selectables selection collapsed at 0 when the local position is
     // not located inside its rect.
-    _TextBoundaryRecord? textBoundary =
-        _rect.contains(localPosition) ? getTextBoundary(position) : null;
+    _TextBoundaryRecord? textBoundary = _rect.contains(localPosition)
+        ? getTextBoundary(position)
+        : null;
     if (textBoundary != null &&
         (textBoundary.boundaryStart.offset < range.start &&
                 textBoundary.boundaryEnd.offset <= range.start ||
@@ -1756,13 +1807,17 @@ class _SelectableFragment
     return SelectionUtils.getResultBasedOnRect(_rect, localPosition);
   }
 
-  SelectionResult _updateSelectionEdge(Offset globalPosition,
-      {required bool isEnd}) {
+  SelectionResult _updateSelectionEdge(
+    Offset globalPosition, {
+    required bool isEnd,
+  }) {
     _setSelectionPosition(null, isEnd: isEnd);
     final Matrix4 transform = paragraph.getTransformTo(null);
     transform.invert();
-    final Offset localPosition =
-        MatrixUtils.transformPoint(transform, globalPosition);
+    final Offset localPosition = MatrixUtils.transformPoint(
+      transform,
+      globalPosition,
+    );
     if (_rect.isEmpty) {
       return SelectionUtils.getResultBasedOnRect(_rect, localPosition);
     }
@@ -1818,8 +1873,10 @@ class _SelectableFragment
       if (paragraphContainsPosition) {
         // When the position is within the root paragraph, swap the start and end
         // edges when the selection is inverted.
-        final _TextBoundaryRecord boundaryAtPosition =
-            getTextBoundary(position, fullText);
+        final _TextBoundaryRecord boundaryAtPosition = getTextBoundary(
+          position,
+          fullText,
+        );
         // To accurately retrieve the origin text boundary when the selection
         // is forward, use existingSelectionEnd.offset - 1. This is necessary
         // because in a forwards selection, existingSelectionEnd marks the end
@@ -1846,8 +1903,9 @@ class _SelectableFragment
           targetPosition = boundaryAtPosition.boundaryEnd;
         } else {
           // Keep the origin text boundary in bounds when position is at the static edge.
-          targetPosition =
-              forwardSelection ? existingSelectionStart : existingSelectionEnd;
+          targetPosition = forwardSelection
+              ? existingSelectionStart
+              : existingSelectionEnd;
         }
         if (shouldSwapEdges) {
           _setSelectionPosition(
@@ -1917,15 +1975,17 @@ class _SelectableFragment
         }
         if (forwardSelection && clampedPosition.offset == range.end) {
           _setSelectionPosition(
-              _clampTextPosition(originTextBoundary.boundaryStart),
-              isEnd: true);
+            _clampTextPosition(originTextBoundary.boundaryStart),
+            isEnd: true,
+          );
           _setSelectionPosition(clampedPosition, isEnd: isEnd);
           return SelectionResult.next;
         }
         if (!forwardSelection && clampedPosition.offset == range.start) {
           _setSelectionPosition(
-              _clampTextPosition(originTextBoundary.boundaryEnd),
-              isEnd: true);
+            _clampTextPosition(originTextBoundary.boundaryEnd),
+            isEnd: true,
+          );
           _setSelectionPosition(clampedPosition, isEnd: isEnd);
           return SelectionResult.previous;
         }
@@ -1937,14 +1997,17 @@ class _SelectableFragment
       // to allow traversal to reach that placeholder.
       final bool positionOnPlaceholder =
           paragraph.getWordBoundary(position).textInside(fullText) ==
-              _placeholderCharacter;
+          _placeholderCharacter;
       if (!paragraphContainsPosition || positionOnPlaceholder) {
         return null;
       }
       if (existingSelectionEnd != null) {
-        final _TextBoundaryRecord boundaryAtPosition =
-            getTextBoundary(position, fullText);
-        final bool backwardSelection = existingSelectionStart == null &&
+        final _TextBoundaryRecord boundaryAtPosition = getTextBoundary(
+          position,
+          fullText,
+        );
+        final bool backwardSelection =
+            existingSelectionStart == null &&
                 existingSelectionEnd.offset == range.start ||
             existingSelectionStart == existingSelectionEnd &&
                 existingSelectionEnd.offset == range.start ||
@@ -1952,8 +2015,10 @@ class _SelectableFragment
                 existingSelectionStart.offset > existingSelectionEnd.offset;
         if (boundaryAtPosition.boundaryStart.offset < range.start &&
             boundaryAtPosition.boundaryEnd.offset < range.start) {
-          _setSelectionPosition(TextPosition(offset: range.start),
-              isEnd: isEnd);
+          _setSelectionPosition(
+            TextPosition(offset: range.start),
+            isEnd: isEnd,
+          );
           return SelectionResult.previous;
         }
         if (boundaryAtPosition.boundaryStart.offset > range.end &&
@@ -1964,19 +2029,23 @@ class _SelectableFragment
         if (backwardSelection) {
           if (boundaryAtPosition.boundaryEnd.offset <= range.end) {
             _setSelectionPosition(
-                _clampTextPosition(boundaryAtPosition.boundaryEnd),
-                isEnd: isEnd);
+              _clampTextPosition(boundaryAtPosition.boundaryEnd),
+              isEnd: isEnd,
+            );
             return SelectionResult.end;
           }
           if (boundaryAtPosition.boundaryEnd.offset > range.end) {
-            _setSelectionPosition(TextPosition(offset: range.end),
-                isEnd: isEnd);
+            _setSelectionPosition(
+              TextPosition(offset: range.end),
+              isEnd: isEnd,
+            );
             return SelectionResult.next;
           }
         } else {
           _setSelectionPosition(
-              _clampTextPosition(boundaryAtPosition.boundaryStart),
-              isEnd: isEnd);
+            _clampTextPosition(boundaryAtPosition.boundaryStart),
+            isEnd: isEnd,
+          );
           if (boundaryAtPosition.boundaryStart.offset < range.start) {
             return SelectionResult.previous;
           }
@@ -2018,8 +2087,10 @@ class _SelectableFragment
       if (paragraphContainsPosition) {
         // When the position is within the root paragraph, swap the start and end
         // edges when the selection is inverted.
-        final _TextBoundaryRecord boundaryAtPosition =
-            getTextBoundary(position, fullText);
+        final _TextBoundaryRecord boundaryAtPosition = getTextBoundary(
+          position,
+          fullText,
+        );
         // To accurately retrieve the origin text boundary when the selection
         // is backwards, use existingSelectionStart.offset - 1. This is necessary
         // because in a backwards selection, existingSelectionStart marks the end
@@ -2046,8 +2117,9 @@ class _SelectableFragment
           targetPosition = boundaryAtPosition.boundaryEnd;
         } else {
           // Keep the origin text boundary in bounds when position is at the static edge.
-          targetPosition =
-              forwardSelection ? existingSelectionEnd : existingSelectionStart;
+          targetPosition = forwardSelection
+              ? existingSelectionEnd
+              : existingSelectionStart;
         }
         if (shouldSwapEdges) {
           _setSelectionPosition(
@@ -2109,15 +2181,17 @@ class _SelectableFragment
         );
         if (forwardSelection && clampedPosition.offset == range.start) {
           _setSelectionPosition(
-              _clampTextPosition(originTextBoundary.boundaryEnd),
-              isEnd: false);
+            _clampTextPosition(originTextBoundary.boundaryEnd),
+            isEnd: false,
+          );
           _setSelectionPosition(clampedPosition, isEnd: isEnd);
           return SelectionResult.previous;
         }
         if (!forwardSelection && clampedPosition.offset == range.end) {
           _setSelectionPosition(
-              _clampTextPosition(originTextBoundary.boundaryStart),
-              isEnd: false);
+            _clampTextPosition(originTextBoundary.boundaryStart),
+            isEnd: false,
+          );
           _setSelectionPosition(clampedPosition, isEnd: isEnd);
           return SelectionResult.next;
         }
@@ -2137,14 +2211,17 @@ class _SelectableFragment
       // to allow traversal to reach that placeholder.
       final bool positionOnPlaceholder =
           paragraph.getWordBoundary(position).textInside(fullText) ==
-              _placeholderCharacter;
+          _placeholderCharacter;
       if (!paragraphContainsPosition || positionOnPlaceholder) {
         return null;
       }
       if (existingSelectionStart != null) {
-        final _TextBoundaryRecord boundaryAtPosition =
-            getTextBoundary(position, fullText);
-        final bool backwardSelection = existingSelectionEnd == null &&
+        final _TextBoundaryRecord boundaryAtPosition = getTextBoundary(
+          position,
+          fullText,
+        );
+        final bool backwardSelection =
+            existingSelectionEnd == null &&
                 existingSelectionStart.offset == range.end ||
             existingSelectionStart == existingSelectionEnd &&
                 existingSelectionStart.offset == range.end ||
@@ -2152,8 +2229,10 @@ class _SelectableFragment
                 existingSelectionStart.offset > existingSelectionEnd.offset;
         if (boundaryAtPosition.boundaryStart.offset < range.start &&
             boundaryAtPosition.boundaryEnd.offset < range.start) {
-          _setSelectionPosition(TextPosition(offset: range.start),
-              isEnd: isEnd);
+          _setSelectionPosition(
+            TextPosition(offset: range.start),
+            isEnd: isEnd,
+          );
           return SelectionResult.previous;
         }
         if (boundaryAtPosition.boundaryStart.offset > range.end &&
@@ -2163,8 +2242,9 @@ class _SelectableFragment
         }
         if (backwardSelection) {
           _setSelectionPosition(
-              _clampTextPosition(boundaryAtPosition.boundaryStart),
-              isEnd: isEnd);
+            _clampTextPosition(boundaryAtPosition.boundaryStart),
+            isEnd: isEnd,
+          );
           if (boundaryAtPosition.boundaryStart.offset < range.start) {
             return SelectionResult.previous;
           }
@@ -2174,13 +2254,16 @@ class _SelectableFragment
         } else {
           if (boundaryAtPosition.boundaryEnd.offset <= range.end) {
             _setSelectionPosition(
-                _clampTextPosition(boundaryAtPosition.boundaryEnd),
-                isEnd: isEnd);
+              _clampTextPosition(boundaryAtPosition.boundaryEnd),
+              isEnd: isEnd,
+            );
             return SelectionResult.end;
           }
           if (boundaryAtPosition.boundaryEnd.offset > range.end) {
-            _setSelectionPosition(TextPosition(offset: range.end),
-                isEnd: isEnd);
+            _setSelectionPosition(
+              TextPosition(offset: range.end),
+              isEnd: isEnd,
+            );
             return SelectionResult.next;
           }
         }
@@ -2207,7 +2290,7 @@ class _SelectableFragment
   // See [_updateSelectionEndEdgeAtPlaceholderByMultiSelectableTextBoundary] for the method
   // that handles updating the end edge.
   SelectionResult?
-      _updateSelectionStartEdgeAtPlaceholderByMultiSelectableTextBoundary(
+  _updateSelectionStartEdgeAtPlaceholderByMultiSelectableTextBoundary(
     _TextBoundaryAtPositionInText getTextBoundary,
     Offset globalPosition,
     bool paragraphContainsPosition,
@@ -2241,20 +2324,21 @@ class _SelectableFragment
         originTransform,
         globalPosition,
       );
-      final bool positionWithinOriginParagraph =
-          originParagraph.paintBounds.contains(
-        originParagraphLocalPosition,
-      );
-      final TextPosition positionRelativeToOriginParagraph =
-          originParagraph.getPositionForOffset(
-        originParagraphLocalPosition,
-      );
+      final bool positionWithinOriginParagraph = originParagraph.paintBounds
+          .contains(
+            originParagraphLocalPosition,
+          );
+      final TextPosition positionRelativeToOriginParagraph = originParagraph
+          .getPositionForOffset(
+            originParagraphLocalPosition,
+          );
       if (positionWithinOriginParagraph) {
         // When the selection is inverted by the new position it is necessary to
         // swap the start edge (moving edge) with the end edge (static edge) to
         // maintain the origin text boundary within the selection.
-        final String originText =
-            originParagraph.text.toPlainText(includeSemanticsLabels: false);
+        final String originText = originParagraph.text.toPlainText(
+          includeSemanticsLabels: false,
+        );
         final _TextBoundaryRecord boundaryAtPosition = getTextBoundary(
           positionRelativeToOriginParagraph,
           originText,
@@ -2267,7 +2351,8 @@ class _SelectableFragment
         final int pivotOffset = forwardSelection
             ? originTextBoundary.boundaryEnd.offset
             : originTextBoundary.boundaryStart.offset;
-        final bool shouldSwapEdges = !forwardSelection !=
+        final bool shouldSwapEdges =
+            !forwardSelection !=
             (positionRelativeToOriginParagraph.offset > pivotOffset);
         if (positionRelativeToOriginParagraph.offset < pivotOffset) {
           targetPosition = boundaryAtPosition.boundaryStart;
@@ -2285,11 +2370,12 @@ class _SelectableFragment
             _textSelectionEnd!.offset >= _textSelectionStart!.offset;
         final TextPosition originParagraphPlaceholderTextPosition =
             _getPositionInParagraph(
-          originParagraph,
-        );
+              originParagraph,
+            );
         final TextRange originParagraphPlaceholderRange = TextRange(
           start: originParagraphPlaceholderTextPosition.offset,
-          end: originParagraphPlaceholderTextPosition.offset +
+          end:
+              originParagraphPlaceholderTextPosition.offset +
               _placeholderLength,
         );
         if (boundaryAtPosition.boundaryStart.offset >
@@ -2339,18 +2425,21 @@ class _SelectableFragment
             originParagraph.getPositionForOffset(adjustedOffset);
         final TextPosition originParagraphPlaceholderTextPosition =
             _getPositionInParagraph(
-          originParagraph,
-        );
+              originParagraph,
+            );
         final TextRange originParagraphPlaceholderRange = TextRange(
           start: originParagraphPlaceholderTextPosition.offset,
-          end: originParagraphPlaceholderTextPosition.offset +
+          end:
+              originParagraphPlaceholderTextPosition.offset +
               _placeholderLength,
         );
         if (forwardSelection &&
             adjustedPositionRelativeToOriginParagraph.offset <=
                 originParagraphPlaceholderRange.start) {
-          _setSelectionPosition(TextPosition(offset: range.start),
-              isEnd: isEnd);
+          _setSelectionPosition(
+            TextPosition(offset: range.start),
+            isEnd: isEnd,
+          );
           return SelectionResult.previous;
         }
         if (!forwardSelection &&
@@ -2370,8 +2459,10 @@ class _SelectableFragment
             adjustedPositionRelativeToOriginParagraph.offset <=
                 originParagraphPlaceholderRange.start) {
           _setSelectionPosition(existingSelectionStart, isEnd: true);
-          _setSelectionPosition(TextPosition(offset: range.start),
-              isEnd: isEnd);
+          _setSelectionPosition(
+            TextPosition(offset: range.start),
+            isEnd: isEnd,
+          );
           return SelectionResult.previous;
         }
       }
@@ -2389,28 +2480,29 @@ class _SelectableFragment
         );
       }
       if (existingSelectionEnd != null) {
-        final ({
-          RenderParagraph paragraph,
-          Offset localPosition
-        })? targetDetails = _getParagraphContainingPosition(globalPosition);
+        final ({RenderParagraph paragraph, Offset localPosition})?
+        targetDetails = _getParagraphContainingPosition(globalPosition);
         if (targetDetails == null) {
           return null;
         }
         final RenderParagraph targetParagraph = targetDetails.paragraph;
-        final TextPosition positionRelativeToTargetParagraph =
-            targetParagraph.getPositionForOffset(
-          targetDetails.localPosition,
+        final TextPosition positionRelativeToTargetParagraph = targetParagraph
+            .getPositionForOffset(
+              targetDetails.localPosition,
+            );
+        final String targetText = targetParagraph.text.toPlainText(
+          includeSemanticsLabels: false,
         );
-        final String targetText =
-            targetParagraph.text.toPlainText(includeSemanticsLabels: false);
-        final bool positionOnPlaceholder = targetParagraph
+        final bool positionOnPlaceholder =
+            targetParagraph
                 .getWordBoundary(positionRelativeToTargetParagraph)
                 .textInside(targetText) ==
             _placeholderCharacter;
         if (positionOnPlaceholder) {
           return null;
         }
-        final bool backwardSelection = existingSelectionStart == null &&
+        final bool backwardSelection =
+            existingSelectionStart == null &&
                 existingSelectionEnd.offset == range.start ||
             existingSelectionStart == existingSelectionEnd &&
                 existingSelectionEnd.offset == range.start ||
@@ -2418,24 +2510,27 @@ class _SelectableFragment
                 existingSelectionStart.offset > existingSelectionEnd.offset;
         final _TextBoundaryRecord boundaryAtPositionRelativeToTargetParagraph =
             getTextBoundary(
-          positionRelativeToTargetParagraph,
-          targetText,
-        );
+              positionRelativeToTargetParagraph,
+              targetText,
+            );
         final TextPosition targetParagraphPlaceholderTextPosition =
             _getPositionInParagraph(
-          targetParagraph,
-        );
+              targetParagraph,
+            );
         final TextRange targetParagraphPlaceholderRange = TextRange(
           start: targetParagraphPlaceholderTextPosition.offset,
-          end: targetParagraphPlaceholderTextPosition.offset +
+          end:
+              targetParagraphPlaceholderTextPosition.offset +
               _placeholderLength,
         );
         if (boundaryAtPositionRelativeToTargetParagraph.boundaryStart.offset <
                 targetParagraphPlaceholderRange.start &&
             boundaryAtPositionRelativeToTargetParagraph.boundaryEnd.offset <
                 targetParagraphPlaceholderRange.start) {
-          _setSelectionPosition(TextPosition(offset: range.start),
-              isEnd: isEnd);
+          _setSelectionPosition(
+            TextPosition(offset: range.start),
+            isEnd: isEnd,
+          );
           return SelectionResult.previous;
         }
         if (boundaryAtPositionRelativeToTargetParagraph.boundaryStart.offset >
@@ -2448,28 +2543,37 @@ class _SelectableFragment
         if (backwardSelection) {
           if (boundaryAtPositionRelativeToTargetParagraph.boundaryEnd.offset <=
               targetParagraphPlaceholderRange.end) {
-            _setSelectionPosition(TextPosition(offset: range.end),
-                isEnd: isEnd);
+            _setSelectionPosition(
+              TextPosition(offset: range.end),
+              isEnd: isEnd,
+            );
             return SelectionResult.end;
           }
           if (boundaryAtPositionRelativeToTargetParagraph.boundaryEnd.offset >
               targetParagraphPlaceholderRange.end) {
-            _setSelectionPosition(TextPosition(offset: range.end),
-                isEnd: isEnd);
+            _setSelectionPosition(
+              TextPosition(offset: range.end),
+              isEnd: isEnd,
+            );
             return SelectionResult.next;
           }
         } else {
           if (boundaryAtPositionRelativeToTargetParagraph
-                  .boundaryStart.offset >=
+                  .boundaryStart
+                  .offset >=
               targetParagraphPlaceholderRange.start) {
-            _setSelectionPosition(TextPosition(offset: range.start),
-                isEnd: isEnd);
+            _setSelectionPosition(
+              TextPosition(offset: range.start),
+              isEnd: isEnd,
+            );
             return SelectionResult.end;
           }
           if (boundaryAtPositionRelativeToTargetParagraph.boundaryStart.offset <
               targetParagraphPlaceholderRange.start) {
-            _setSelectionPosition(TextPosition(offset: range.start),
-                isEnd: isEnd);
+            _setSelectionPosition(
+              TextPosition(offset: range.start),
+              isEnd: isEnd,
+            );
             return SelectionResult.previous;
           }
         }
@@ -2491,7 +2595,7 @@ class _SelectableFragment
   // See [_updateSelectionStartEdgeAtPlaceholderByMultiSelectableTextBoundary]
   // for the method that handles updating the start edge.
   SelectionResult?
-      _updateSelectionEndEdgeAtPlaceholderByMultiSelectableTextBoundary(
+  _updateSelectionEndEdgeAtPlaceholderByMultiSelectableTextBoundary(
     _TextBoundaryAtPositionInText getTextBoundary,
     Offset globalPosition,
     bool paragraphContainsPosition,
@@ -2525,20 +2629,21 @@ class _SelectableFragment
         originTransform,
         globalPosition,
       );
-      final bool positionWithinOriginParagraph =
-          originParagraph.paintBounds.contains(
-        originParagraphLocalPosition,
-      );
-      final TextPosition positionRelativeToOriginParagraph =
-          originParagraph.getPositionForOffset(
-        originParagraphLocalPosition,
-      );
+      final bool positionWithinOriginParagraph = originParagraph.paintBounds
+          .contains(
+            originParagraphLocalPosition,
+          );
+      final TextPosition positionRelativeToOriginParagraph = originParagraph
+          .getPositionForOffset(
+            originParagraphLocalPosition,
+          );
       if (positionWithinOriginParagraph) {
         // When the selection is inverted by the new position it is necessary to
         // swap the end edge (moving edge) with the start edge (static edge) to
         // maintain the origin text boundary within the selection.
-        final String originText =
-            originParagraph.text.toPlainText(includeSemanticsLabels: false);
+        final String originText = originParagraph.text.toPlainText(
+          includeSemanticsLabels: false,
+        );
         final _TextBoundaryRecord boundaryAtPosition = getTextBoundary(
           positionRelativeToOriginParagraph,
           originText,
@@ -2551,7 +2656,8 @@ class _SelectableFragment
         final int pivotOffset = forwardSelection
             ? originTextBoundary.boundaryStart.offset
             : originTextBoundary.boundaryEnd.offset;
-        final bool shouldSwapEdges = !forwardSelection !=
+        final bool shouldSwapEdges =
+            !forwardSelection !=
             (positionRelativeToOriginParagraph.offset < pivotOffset);
         if (positionRelativeToOriginParagraph.offset < pivotOffset) {
           targetPosition = boundaryAtPosition.boundaryStart;
@@ -2569,11 +2675,12 @@ class _SelectableFragment
             _textSelectionEnd!.offset >= _textSelectionStart!.offset;
         final TextPosition originParagraphPlaceholderTextPosition =
             _getPositionInParagraph(
-          originParagraph,
-        );
+              originParagraph,
+            );
         final TextRange originParagraphPlaceholderRange = TextRange(
           start: originParagraphPlaceholderTextPosition.offset,
-          end: originParagraphPlaceholderTextPosition.offset +
+          end:
+              originParagraphPlaceholderTextPosition.offset +
               _placeholderLength,
         );
         if (boundaryAtPosition.boundaryStart.offset >
@@ -2623,19 +2730,22 @@ class _SelectableFragment
             originParagraph.getPositionForOffset(adjustedOffset);
         final TextPosition originParagraphPlaceholderTextPosition =
             _getPositionInParagraph(
-          originParagraph,
-        );
+              originParagraph,
+            );
         final TextRange originParagraphPlaceholderRange = TextRange(
           start: originParagraphPlaceholderTextPosition.offset,
-          end: originParagraphPlaceholderTextPosition.offset +
+          end:
+              originParagraphPlaceholderTextPosition.offset +
               _placeholderLength,
         );
         if (forwardSelection &&
             adjustedPositionRelativeToOriginParagraph.offset <=
                 originParagraphPlaceholderRange.start) {
           _setSelectionPosition(existingSelectionEnd, isEnd: false);
-          _setSelectionPosition(TextPosition(offset: range.start),
-              isEnd: isEnd);
+          _setSelectionPosition(
+            TextPosition(offset: range.start),
+            isEnd: isEnd,
+          );
           return SelectionResult.previous;
         }
         if (!forwardSelection &&
@@ -2654,8 +2764,10 @@ class _SelectableFragment
         if (!forwardSelection &&
             adjustedPositionRelativeToOriginParagraph.offset <=
                 originParagraphPlaceholderRange.start) {
-          _setSelectionPosition(TextPosition(offset: range.start),
-              isEnd: isEnd);
+          _setSelectionPosition(
+            TextPosition(offset: range.start),
+            isEnd: isEnd,
+          );
           return SelectionResult.previous;
         }
       }
@@ -2673,28 +2785,29 @@ class _SelectableFragment
         );
       }
       if (existingSelectionStart != null) {
-        final ({
-          RenderParagraph paragraph,
-          Offset localPosition
-        })? targetDetails = _getParagraphContainingPosition(globalPosition);
+        final ({RenderParagraph paragraph, Offset localPosition})?
+        targetDetails = _getParagraphContainingPosition(globalPosition);
         if (targetDetails == null) {
           return null;
         }
         final RenderParagraph targetParagraph = targetDetails.paragraph;
-        final TextPosition positionRelativeToTargetParagraph =
-            targetParagraph.getPositionForOffset(
-          targetDetails.localPosition,
+        final TextPosition positionRelativeToTargetParagraph = targetParagraph
+            .getPositionForOffset(
+              targetDetails.localPosition,
+            );
+        final String targetText = targetParagraph.text.toPlainText(
+          includeSemanticsLabels: false,
         );
-        final String targetText =
-            targetParagraph.text.toPlainText(includeSemanticsLabels: false);
-        final bool positionOnPlaceholder = targetParagraph
+        final bool positionOnPlaceholder =
+            targetParagraph
                 .getWordBoundary(positionRelativeToTargetParagraph)
                 .textInside(targetText) ==
             _placeholderCharacter;
         if (positionOnPlaceholder) {
           return null;
         }
-        final bool backwardSelection = existingSelectionEnd == null &&
+        final bool backwardSelection =
+            existingSelectionEnd == null &&
                 existingSelectionStart.offset == range.end ||
             existingSelectionStart == existingSelectionEnd &&
                 existingSelectionStart.offset == range.end ||
@@ -2702,24 +2815,27 @@ class _SelectableFragment
                 existingSelectionStart.offset > existingSelectionEnd.offset;
         final _TextBoundaryRecord boundaryAtPositionRelativeToTargetParagraph =
             getTextBoundary(
-          positionRelativeToTargetParagraph,
-          targetText,
-        );
+              positionRelativeToTargetParagraph,
+              targetText,
+            );
         final TextPosition targetParagraphPlaceholderTextPosition =
             _getPositionInParagraph(
-          targetParagraph,
-        );
+              targetParagraph,
+            );
         final TextRange targetParagraphPlaceholderRange = TextRange(
           start: targetParagraphPlaceholderTextPosition.offset,
-          end: targetParagraphPlaceholderTextPosition.offset +
+          end:
+              targetParagraphPlaceholderTextPosition.offset +
               _placeholderLength,
         );
         if (boundaryAtPositionRelativeToTargetParagraph.boundaryStart.offset <
                 targetParagraphPlaceholderRange.start &&
             boundaryAtPositionRelativeToTargetParagraph.boundaryEnd.offset <
                 targetParagraphPlaceholderRange.start) {
-          _setSelectionPosition(TextPosition(offset: range.start),
-              isEnd: isEnd);
+          _setSelectionPosition(
+            TextPosition(offset: range.start),
+            isEnd: isEnd,
+          );
           return SelectionResult.previous;
         }
         if (boundaryAtPositionRelativeToTargetParagraph.boundaryStart.offset >
@@ -2731,29 +2847,38 @@ class _SelectableFragment
         }
         if (backwardSelection) {
           if (boundaryAtPositionRelativeToTargetParagraph
-                  .boundaryStart.offset >=
+                  .boundaryStart
+                  .offset >=
               targetParagraphPlaceholderRange.start) {
-            _setSelectionPosition(TextPosition(offset: range.start),
-                isEnd: isEnd);
+            _setSelectionPosition(
+              TextPosition(offset: range.start),
+              isEnd: isEnd,
+            );
             return SelectionResult.end;
           }
           if (boundaryAtPositionRelativeToTargetParagraph.boundaryStart.offset <
               targetParagraphPlaceholderRange.start) {
-            _setSelectionPosition(TextPosition(offset: range.start),
-                isEnd: isEnd);
+            _setSelectionPosition(
+              TextPosition(offset: range.start),
+              isEnd: isEnd,
+            );
             return SelectionResult.previous;
           }
         } else {
           if (boundaryAtPositionRelativeToTargetParagraph.boundaryEnd.offset <=
               targetParagraphPlaceholderRange.end) {
-            _setSelectionPosition(TextPosition(offset: range.end),
-                isEnd: isEnd);
+            _setSelectionPosition(
+              TextPosition(offset: range.end),
+              isEnd: isEnd,
+            );
             return SelectionResult.end;
           }
           if (boundaryAtPositionRelativeToTargetParagraph.boundaryEnd.offset >
               targetParagraphPlaceholderRange.end) {
-            _setSelectionPosition(TextPosition(offset: range.end),
-                isEnd: isEnd);
+            _setSelectionPosition(
+              TextPosition(offset: range.end),
+              isEnd: isEnd,
+            );
             return SelectionResult.next;
           }
         }
@@ -2777,8 +2902,10 @@ class _SelectableFragment
     _setSelectionPosition(null, isEnd: isEnd);
     final Matrix4 transform = paragraph.getTransformTo(null);
     transform.invert();
-    final Offset localPosition =
-        MatrixUtils.transformPoint(transform, globalPosition);
+    final Offset localPosition = MatrixUtils.transformPoint(
+      transform,
+      globalPosition,
+    );
     if (_rect.isEmpty) {
       return SelectionUtils.getResultBasedOnRect(_rect, localPosition);
     }
@@ -2789,13 +2916,14 @@ class _SelectableFragment
     );
     final Offset adjustedOffsetRelativeToParagraph =
         SelectionUtils.adjustDragOffset(
-      paragraph.paintBounds,
-      localPosition,
-      direction: paragraph.textDirection,
-    );
+          paragraph.paintBounds,
+          localPosition,
+          direction: paragraph.textDirection,
+        );
 
-    final TextPosition position =
-        paragraph.getPositionForOffset(adjustedOffset);
+    final TextPosition position = paragraph.getPositionForOffset(
+      adjustedOffset,
+    );
     final TextPosition positionInFullText = paragraph.getPositionForOffset(
       adjustedOffsetRelativeToParagraph,
     );
@@ -2892,11 +3020,13 @@ class _SelectableFragment
   }
 
   TextPosition _closestTextBoundary(
-      _TextBoundaryRecord textBoundary, TextPosition position) {
+    _TextBoundaryRecord textBoundary,
+    TextPosition position,
+  ) {
     final int differenceA =
         (position.offset - textBoundary.boundaryStart.offset).abs();
-    final int differenceB =
-        (position.offset - textBoundary.boundaryEnd.offset).abs();
+    final int differenceB = (position.offset - textBoundary.boundaryEnd.offset)
+        .abs();
     return differenceA < differenceB
         ? textBoundary.boundaryStart
         : textBoundary.boundaryEnd;
@@ -2946,7 +3076,7 @@ class _SelectableFragment
   }
 
   ({RenderParagraph paragraph, Offset localPosition})?
-      _getParagraphContainingPosition(
+  _getParagraphContainingPosition(
     Offset globalPosition,
   ) {
     // This method will return the closest [RenderParagraph] whose rect
@@ -2962,14 +3092,14 @@ class _SelectableFragment
           currentTransform,
           globalPosition,
         );
-        final bool positionWithinCurrentParagraph =
-            current.paintBounds.contains(
-          currentParagraphLocalPosition,
-        );
+        final bool positionWithinCurrentParagraph = current.paintBounds
+            .contains(
+              currentParagraphLocalPosition,
+            );
         if (positionWithinCurrentParagraph) {
           return (
             paragraph: current,
-            localPosition: currentParagraphLocalPosition
+            localPosition: currentParagraphLocalPosition,
           );
         }
       }
@@ -3017,8 +3147,10 @@ class _SelectableFragment
 
   SelectionResult _handleSelectAll() {
     _textSelectionStart = TextPosition(offset: range.start);
-    _textSelectionEnd =
-        TextPosition(offset: range.end, affinity: TextAffinity.upstream);
+    _textSelectionEnd = TextPosition(
+      offset: range.end,
+      affinity: TextAffinity.upstream,
+    );
     return SelectionResult.none;
   }
 
@@ -3059,7 +3191,8 @@ class _SelectableFragment
   }
 
   SelectionResult _handleSelectMultiFragmentTextBoundary(
-      _TextBoundaryRecord textBoundary) {
+    _TextBoundaryRecord textBoundary,
+  ) {
     // This fragment may not contain the boundary, decide what direction the target
     // fragment is located in. Because fragments are separated by placeholder
     // spans, we also check if the beginning or end of the boundary is touching
@@ -3089,7 +3222,9 @@ class _SelectableFragment
   }
 
   _TextBoundaryRecord _adjustTextBoundaryAtPosition(
-      TextRange textBoundary, TextPosition position) {
+    TextRange textBoundary,
+    TextPosition position,
+  ) {
     late final TextPosition start;
     late final TextPosition end;
     if (position.offset > textBoundary.end) {
@@ -3097,7 +3232,9 @@ class _SelectableFragment
     } else {
       start = TextPosition(offset: textBoundary.start);
       end = TextPosition(
-          offset: textBoundary.end, affinity: TextAffinity.upstream);
+        offset: textBoundary.end,
+        affinity: TextAffinity.upstream,
+      );
     }
     return (boundaryStart: start, boundaryEnd: end);
   }
@@ -3110,8 +3247,9 @@ class _SelectableFragment
         _textSelectionStart != _textSelectionEnd) {
       return SelectionResult.end;
     }
-    final _TextBoundaryRecord wordBoundary =
-        _getWordBoundaryAtPosition(position);
+    final _TextBoundaryRecord wordBoundary = _getWordBoundaryAtPosition(
+      position,
+    );
     return _handleSelectTextBoundary(wordBoundary);
   }
 
@@ -3126,9 +3264,9 @@ class _SelectableFragment
     final TextPosition position = paragraph.getPositionForOffset(localPosition);
     final _TextBoundaryRecord paragraphBoundary =
         _getParagraphBoundaryAtPosition(
-      position,
-      fullText,
-    );
+          position,
+          fullText,
+        );
     return _handleSelectMultiFragmentTextBoundary(paragraphBoundary);
   }
 
@@ -3136,17 +3274,21 @@ class _SelectableFragment
     final Matrix4 transform = paragraph.getTransformTo(targetParagraph);
     final Offset localCenter = paragraph.paintBounds.centerLeft;
     final Offset localPos = MatrixUtils.transformPoint(transform, localCenter);
-    final TextPosition position =
-        targetParagraph.getPositionForOffset(localPos);
+    final TextPosition position = targetParagraph.getPositionForOffset(
+      localPos,
+    );
     return position;
   }
 
   _TextBoundaryRecord _getParagraphBoundaryAtPosition(
-      TextPosition position, String text) {
+    TextPosition position,
+    String text,
+  ) {
     final ParagraphBoundary paragraphBoundary = ParagraphBoundary(text);
     // Use position.offset - 1 when `position` is at the end of the selectable to retrieve
     // the previous text boundary's location.
-    final int paragraphStart = paragraphBoundary.getLeadingTextBoundaryAt(
+    final int paragraphStart =
+        paragraphBoundary.getLeadingTextBoundaryAt(
           position.offset == text.length ||
                   position.affinity == TextAffinity.upstream
               ? position.offset - 1
@@ -3155,19 +3297,23 @@ class _SelectableFragment
         0;
     final int paragraphEnd =
         paragraphBoundary.getTrailingTextBoundaryAt(position.offset) ??
-            text.length;
-    final TextRange paragraphRange =
-        TextRange(start: paragraphStart, end: paragraphEnd);
+        text.length;
+    final TextRange paragraphRange = TextRange(
+      start: paragraphStart,
+      end: paragraphEnd,
+    );
     assert(paragraphRange.isNormalized);
     return _adjustTextBoundaryAtPosition(paragraphRange, position);
   }
 
   _TextBoundaryRecord _getClampedParagraphBoundaryAtPosition(
-      TextPosition position) {
+    TextPosition position,
+  ) {
     final ParagraphBoundary paragraphBoundary = ParagraphBoundary(fullText);
     // Use position.offset - 1 when `position` is at the end of the selectable to retrieve
     // the previous text boundary's location.
-    int paragraphStart = paragraphBoundary.getLeadingTextBoundaryAt(
+    int paragraphStart =
+        paragraphBoundary.getLeadingTextBoundaryAt(
           position.offset == fullText.length ||
                   position.affinity == TextAffinity.upstream
               ? position.offset - 1
@@ -3176,19 +3322,21 @@ class _SelectableFragment
         0;
     int paragraphEnd =
         paragraphBoundary.getTrailingTextBoundaryAt(position.offset) ??
-            fullText.length;
+        fullText.length;
     paragraphStart = paragraphStart < range.start
         ? range.start
         : paragraphStart > range.end
-            ? range.end
-            : paragraphStart;
+        ? range.end
+        : paragraphStart;
     paragraphEnd = paragraphEnd > range.end
         ? range.end
         : paragraphEnd < range.start
-            ? range.start
-            : paragraphEnd;
-    final TextRange paragraphRange =
-        TextRange(start: paragraphStart, end: paragraphEnd);
+        ? range.start
+        : paragraphEnd;
+    final TextRange paragraphRange = TextRange(
+      start: paragraphStart,
+      end: paragraphEnd,
+    );
     assert(paragraphRange.isNormalized);
     return _adjustTextBoundaryAtPosition(paragraphRange, position);
   }
@@ -3209,8 +3357,10 @@ class _SelectableFragment
           return SelectionResult.next;
       }
     }
-    final double baselineInParagraphCoordinates =
-        MatrixUtils.transformPoint(transform, Offset(horizontalBaseline, 0)).dx;
+    final double baselineInParagraphCoordinates = MatrixUtils.transformPoint(
+      transform,
+      Offset(horizontalBaseline, 0),
+    ).dx;
     assert(!baselineInParagraphCoordinates.isNaN);
     final TextPosition newPosition;
     final SelectionResult result;
@@ -3218,15 +3368,16 @@ class _SelectableFragment
       case SelectionExtendDirection.previousLine:
       case SelectionExtendDirection.nextLine:
         assert(_textSelectionEnd != null && _textSelectionStart != null);
-        final TextPosition targetedEdge =
-            isExtent ? _textSelectionEnd! : _textSelectionStart!;
+        final TextPosition targetedEdge = isExtent
+            ? _textSelectionEnd!
+            : _textSelectionStart!;
         final MapEntry<TextPosition, SelectionResult> moveResult =
             _handleVerticalMovement(
-          targetedEdge,
-          horizontalBaselineInParagraphCoordinates:
-              baselineInParagraphCoordinates,
-          below: movement == SelectionExtendDirection.nextLine,
-        );
+              targetedEdge,
+              horizontalBaselineInParagraphCoordinates:
+                  baselineInParagraphCoordinates,
+              below: movement == SelectionExtendDirection.nextLine,
+            );
         newPosition = moveResult.key;
         result = moveResult.value;
       case SelectionExtendDirection.forward:
@@ -3235,20 +3386,22 @@ class _SelectableFragment
             ? TextPosition(offset: range.start)
             : TextPosition(offset: range.end, affinity: TextAffinity.upstream);
         _textSelectionStart ??= _textSelectionEnd;
-        final TextPosition targetedEdge =
-            isExtent ? _textSelectionEnd! : _textSelectionStart!;
-        final Offset edgeOffsetInParagraphCoordinates =
-            paragraph._getOffsetForPosition(
-          targetedEdge,
-        );
+        final TextPosition targetedEdge = isExtent
+            ? _textSelectionEnd!
+            : _textSelectionStart!;
+        final Offset edgeOffsetInParagraphCoordinates = paragraph
+            ._getOffsetForPosition(
+              targetedEdge,
+            );
         final Offset baselineOffsetInParagraphCoordinates = Offset(
           baselineInParagraphCoordinates,
           // Use half of line height to point to the middle of the line.
           edgeOffsetInParagraphCoordinates.dy -
               paragraph._textPainter.preferredLineHeight / 2,
         );
-        newPosition = paragraph
-            .getPositionForOffset(baselineOffsetInParagraphCoordinates);
+        newPosition = paragraph.getPositionForOffset(
+          baselineOffsetInParagraphCoordinates,
+        );
         result = SelectionResult.end;
     }
     if (isExtent) {
@@ -3268,8 +3421,9 @@ class _SelectableFragment
         ? TextPosition(offset: range.start)
         : TextPosition(offset: range.end, affinity: TextAffinity.upstream);
     _textSelectionStart ??= _textSelectionEnd;
-    final TextPosition targetedEdge =
-        isExtent ? _textSelectionEnd! : _textSelectionStart!;
+    final TextPosition targetedEdge = isExtent
+        ? _textSelectionEnd!
+        : _textSelectionStart!;
     if (forward && (targetedEdge.offset == range.end)) {
       return SelectionResult.next;
     }
@@ -3291,7 +3445,10 @@ class _SelectableFragment
         final TextBoundary textBoundary =
             paragraph._textPainter.wordBoundaries.moveByWordBoundary;
         newPosition = _moveBeyondTextBoundaryAtDirection(
-            targetedEdge, forward, textBoundary);
+          targetedEdge,
+          forward,
+          textBoundary,
+        );
         result = SelectionResult.end;
       case TextGranularity.paragraph:
         final String text = range.textInside(fullText);
@@ -3303,7 +3460,10 @@ class _SelectableFragment
         result = SelectionResult.end;
       case TextGranularity.line:
         newPosition = _moveToTextBoundaryAtDirection(
-            targetedEdge, forward, LineBoundary(this));
+          targetedEdge,
+          forward,
+          LineBoundary(this),
+        );
         result = SelectionResult.end;
       case TextGranularity.document:
         final String text = range.textInside(fullText);
@@ -3361,10 +3521,12 @@ class _SelectableFragment
           return const TextPosition(offset: 0);
         }
         final CharacterBoundary characterBoundary = CharacterBoundary(fullText);
-        caretOffset = math.max(
+        caretOffset =
+            math.max(
               0,
-              characterBoundary
-                      .getLeadingTextBoundaryAt(range.start + end.offset) ??
+              characterBoundary.getLeadingTextBoundaryAt(
+                    range.start + end.offset,
+                  ) ??
                   range.start,
             ) -
             1;
@@ -3382,8 +3544,8 @@ class _SelectableFragment
     required double horizontalBaselineInParagraphCoordinates,
     required bool below,
   }) {
-    final List<ui.LineMetrics> lines =
-        paragraph._textPainter.computeLineMetrics();
+    final List<ui.LineMetrics> lines = paragraph._textPainter
+        .computeLineMetrics();
     final Offset offset = paragraph.getOffsetForCaret(position, Rect.zero);
     int currentLine = lines.length - 1;
     for (final ui.LineMetrics lineMetrics in lines) {
@@ -3394,16 +3556,20 @@ class _SelectableFragment
     }
     final TextPosition newPosition;
     if (below && currentLine == lines.length - 1) {
-      newPosition =
-          TextPosition(offset: range.end, affinity: TextAffinity.upstream);
+      newPosition = TextPosition(
+        offset: range.end,
+        affinity: TextAffinity.upstream,
+      );
     } else if (!below && currentLine == 0) {
       newPosition = TextPosition(offset: range.start);
     } else {
       final int newLine = below ? currentLine + 1 : currentLine - 1;
       newPosition = _clampTextPosition(
         paragraph.getPositionForOffset(
-          Offset(horizontalBaselineInParagraphCoordinates,
-              lines[newLine].baseline),
+          Offset(
+            horizontalBaselineInParagraphCoordinates,
+            lines[newLine].baseline,
+          ),
         ),
       );
     }
@@ -3447,7 +3613,9 @@ class _SelectableFragment
   /// Returns 1 if `position` < `otherPosition`, -1 if `position` > `otherPosition`,
   /// or 0 if they are equal.
   static int _compareTextPositions(
-      TextPosition position, TextPosition otherPosition) {
+    TextPosition position,
+    TextPosition otherPosition,
+  ) {
     if (position.offset < otherPosition.offset) {
       return 1;
     } else if (position.offset > otherPosition.offset) {
@@ -3467,8 +3635,10 @@ class _SelectableFragment
   @override
   void pushHandleLayers(LayerLink? startHandle, LayerLink? endHandle) {
     if (!paragraph.attached) {
-      assert(startHandle == null && endHandle == null,
-          'Only clean up can be called.');
+      assert(
+        startHandle == null && endHandle == null,
+        'Only clean up can be called.',
+      );
       return;
     }
     if (_startHandleLayerLink != startHandle) {
@@ -3495,8 +3665,9 @@ class _SelectableFragment
           _cachedBoundingBoxes!.add(textBox.toRect());
         }
       } else {
-        final Offset offset =
-            paragraph._getOffsetForPosition(TextPosition(offset: range.start));
+        final Offset offset = paragraph._getOffsetForPosition(
+          TextPosition(offset: range.start),
+        );
         final Rect rect = Rect.fromPoints(
           offset,
           offset.translate(0, -paragraph._textPainter.preferredLineHeight),
@@ -3520,8 +3691,9 @@ class _SelectableFragment
         }
         _cachedRect = result;
       } else {
-        final Offset offset =
-            paragraph._getOffsetForPosition(TextPosition(offset: range.start));
+        final Offset offset = paragraph._getOffsetForPosition(
+          TextPosition(offset: range.start),
+        );
         _cachedRect = Rect.fromPoints(
           offset,
           offset.translate(0, -paragraph._textPainter.preferredLineHeight),
@@ -3607,8 +3779,12 @@ class _SelectableFragment
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
     super.debugFillProperties(properties);
-    properties.add(DiagnosticsProperty<String>(
-        'textInsideRange', range.textInside(fullText)));
+    properties.add(
+      DiagnosticsProperty<String>(
+        'textInsideRange',
+        range.textInside(fullText),
+      ),
+    );
     properties.add(DiagnosticsProperty<TextRange>('range', range));
     properties.add(DiagnosticsProperty<String>('fullText', fullText));
   }
diff --git a/lib/common/widgets/text/rich_text.dart b/lib/common/widgets/text/rich_text.dart
index 0917f1f80..6d3b67f46 100644
--- a/lib/common/widgets/text/rich_text.dart
+++ b/lib/common/widgets/text/rich_text.dart
@@ -114,26 +114,29 @@ class RichText extends MultiChildRenderObjectWidget {
     this.textHeightBehavior,
     this.selectionRegistrar,
     this.selectionColor,
-  })  : assert(maxLines == null || maxLines > 0),
-        assert(selectionRegistrar == null || selectionColor != null),
-        assert(
-          textScaleFactor == 1.0 || identical(textScaler, TextScaler.noScaling),
-          'Use textScaler instead.',
-        ),
-        textScaler = _effectiveTextScalerFrom(textScaler, textScaleFactor),
-        super(
-          children: WidgetSpan.extractFromInlineSpan(
-            text,
-            _effectiveTextScalerFrom(textScaler, textScaleFactor),
-          ),
-        );
+  }) : assert(maxLines == null || maxLines > 0),
+       assert(selectionRegistrar == null || selectionColor != null),
+       assert(
+         textScaleFactor == 1.0 || identical(textScaler, TextScaler.noScaling),
+         'Use textScaler instead.',
+       ),
+       textScaler = _effectiveTextScalerFrom(textScaler, textScaleFactor),
+       super(
+         children: WidgetSpan.extractFromInlineSpan(
+           text,
+           _effectiveTextScalerFrom(textScaler, textScaleFactor),
+         ),
+       );
 
   static TextScaler _effectiveTextScalerFrom(
-      TextScaler textScaler, double textScaleFactor) {
+    TextScaler textScaler,
+    double textScaleFactor,
+  ) {
     return switch ((textScaler, textScaleFactor)) {
       (final TextScaler scaler, 1.0) => scaler,
-      (TextScaler.noScaling, final double textScaleFactor) =>
-        TextScaler.linear(textScaleFactor),
+      (TextScaler.noScaling, final double textScaleFactor) => TextScaler.linear(
+        textScaleFactor,
+      ),
       (final TextScaler scaler, _) => scaler,
     };
   }
@@ -269,10 +272,20 @@ class RichText extends MultiChildRenderObjectWidget {
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
     super.debugFillProperties(properties);
-    properties.add(EnumProperty<TextAlign>('textAlign', textAlign,
-        defaultValue: TextAlign.start));
-    properties.add(EnumProperty<TextDirection>('textDirection', textDirection,
-        defaultValue: null));
+    properties.add(
+      EnumProperty<TextAlign>(
+        'textAlign',
+        textAlign,
+        defaultValue: TextAlign.start,
+      ),
+    );
+    properties.add(
+      EnumProperty<TextDirection>(
+        'textDirection',
+        textDirection,
+        defaultValue: null,
+      ),
+    );
     properties.add(
       FlagProperty(
         'softWrap',
@@ -283,12 +296,18 @@ class RichText extends MultiChildRenderObjectWidget {
       ),
     );
     properties.add(
-      EnumProperty<TextOverflow>('overflow', overflow,
-          defaultValue: TextOverflow.clip),
+      EnumProperty<TextOverflow>(
+        'overflow',
+        overflow,
+        defaultValue: TextOverflow.clip,
+      ),
     );
     properties.add(
-      DiagnosticsProperty<TextScaler>('textScaler', textScaler,
-          defaultValue: TextScaler.noScaling),
+      DiagnosticsProperty<TextScaler>(
+        'textScaler',
+        textScaler,
+        defaultValue: TextScaler.noScaling,
+      ),
     );
     properties.add(IntProperty('maxLines', maxLines, ifNull: 'unlimited'));
     properties.add(
@@ -299,10 +318,16 @@ class RichText extends MultiChildRenderObjectWidget {
       ),
     );
     properties.add(StringProperty('text', text.toPlainText()));
-    properties
-        .add(DiagnosticsProperty<Locale>('locale', locale, defaultValue: null));
-    properties.add(DiagnosticsProperty<StrutStyle>('strutStyle', strutStyle,
-        defaultValue: null));
+    properties.add(
+      DiagnosticsProperty<Locale>('locale', locale, defaultValue: null),
+    );
+    properties.add(
+      DiagnosticsProperty<StrutStyle>(
+        'strutStyle',
+        strutStyle,
+        defaultValue: null,
+      ),
+    );
     properties.add(
       DiagnosticsProperty<TextHeightBehavior>(
         'textHeightBehavior',
diff --git a/lib/common/widgets/text/text.dart b/lib/common/widgets/text/text.dart
index fbbe26c9c..d8a7d9452 100644
--- a/lib/common/widgets/text/text.dart
+++ b/lib/common/widgets/text/text.dart
@@ -174,11 +174,11 @@ class Text extends StatelessWidget {
     this.textWidthBasis,
     this.textHeightBehavior,
     this.selectionColor,
-  })  : textSpan = null,
-        assert(
-          textScaler == null || textScaleFactor == null,
-          'textScaleFactor is deprecated and cannot be specified when textScaler is specified.',
-        );
+  }) : textSpan = null,
+       assert(
+         textScaler == null || textScaleFactor == null,
+         'textScaleFactor is deprecated and cannot be specified when textScaler is specified.',
+       );
 
   /// Creates a text widget with a [InlineSpan].
   ///
@@ -211,11 +211,11 @@ class Text extends StatelessWidget {
     this.textWidthBasis,
     this.textHeightBehavior,
     this.selectionColor,
-  })  : data = null,
-        assert(
-          textScaler == null || textScaleFactor == null,
-          'textScaleFactor is deprecated and cannot be specified when textScaler is specified.',
-        );
+  }) : data = null,
+       assert(
+         textScaler == null || textScaleFactor == null,
+         'textScaleFactor is deprecated and cannot be specified when textScaler is specified.',
+       );
 
   /// The text to display.
   ///
@@ -357,21 +357,24 @@ class Text extends StatelessWidget {
       effectiveTextStyle = defaultTextStyle.style.merge(style);
     }
     if (MediaQuery.boldTextOf(context)) {
-      effectiveTextStyle = effectiveTextStyle!
-          .merge(const TextStyle(fontWeight: FontWeight.bold));
+      effectiveTextStyle = effectiveTextStyle!.merge(
+        const TextStyle(fontWeight: FontWeight.bold),
+      );
     }
     final SelectionRegistrar? registrar = SelectionContainer.maybeOf(context);
     final TextScaler textScaler = switch ((this.textScaler, textScaleFactor)) {
       (final TextScaler textScaler, _) => textScaler,
       // For unmigrated apps, fall back to textScaleFactor.
-      (null, final double textScaleFactor) =>
-        TextScaler.linear(textScaleFactor),
+      (null, final double textScaleFactor) => TextScaler.linear(
+        textScaleFactor,
+      ),
       (null, null) => MediaQuery.textScalerOf(context),
     };
     late Widget result;
     if (registrar != null) {
       result = MouseRegion(
-        cursor: DefaultSelectionStyle.of(context).mouseCursor ??
+        cursor:
+            DefaultSelectionStyle.of(context).mouseCursor ??
             SystemMouseCursors.text,
         child: _SelectableTextContainer(
           textAlign: textAlign ?? defaultTextStyle.textAlign ?? TextAlign.start,
@@ -380,17 +383,20 @@ class Text extends StatelessWidget {
           locale:
               locale, // RichText uses Localizations.localeOf to obtain a default if this is null
           softWrap: softWrap ?? defaultTextStyle.softWrap,
-          overflow: overflow ??
+          overflow:
+              overflow ??
               effectiveTextStyle?.overflow ??
               defaultTextStyle.overflow,
           textScaler: textScaler,
           maxLines: maxLines ?? defaultTextStyle.maxLines,
           strutStyle: strutStyle,
           textWidthBasis: textWidthBasis ?? defaultTextStyle.textWidthBasis,
-          textHeightBehavior: textHeightBehavior ??
+          textHeightBehavior:
+              textHeightBehavior ??
               defaultTextStyle.textHeightBehavior ??
               DefaultTextHeightBehavior.maybeOf(context),
-          selectionColor: selectionColor ??
+          selectionColor:
+              selectionColor ??
               DefaultSelectionStyle.of(context).selectionColor ??
               DefaultSelectionStyle.defaultColor,
           text: TextSpan(
@@ -408,17 +414,20 @@ class Text extends StatelessWidget {
         locale:
             locale, // RichText uses Localizations.localeOf to obtain a default if this is null
         softWrap: softWrap ?? defaultTextStyle.softWrap,
-        overflow: overflow ??
+        overflow:
+            overflow ??
             effectiveTextStyle?.overflow ??
             defaultTextStyle.overflow,
         textScaler: textScaler,
         maxLines: maxLines ?? defaultTextStyle.maxLines,
         strutStyle: strutStyle,
         textWidthBasis: textWidthBasis ?? defaultTextStyle.textWidthBasis,
-        textHeightBehavior: textHeightBehavior ??
+        textHeightBehavior:
+            textHeightBehavior ??
             defaultTextStyle.textHeightBehavior ??
             DefaultTextHeightBehavior.maybeOf(context),
-        selectionColor: selectionColor ??
+        selectionColor:
+            selectionColor ??
             DefaultSelectionStyle.of(context).selectionColor ??
             DefaultSelectionStyle.defaultColor,
         text: TextSpan(
@@ -433,8 +442,10 @@ class Text extends StatelessWidget {
         textDirection: textDirection,
         label: semanticsLabel,
         identifier: semanticsIdentifier,
-        child:
-            ExcludeSemantics(excluding: semanticsLabel != null, child: result),
+        child: ExcludeSemantics(
+          excluding: semanticsLabel != null,
+          child: result,
+        ),
       );
     }
     return result;
@@ -447,16 +458,25 @@ class Text extends StatelessWidget {
     if (textSpan != null) {
       properties.add(
         textSpan!.toDiagnosticsNode(
-            name: 'textSpan', style: DiagnosticsTreeStyle.transition),
+          name: 'textSpan',
+          style: DiagnosticsTreeStyle.transition,
+        ),
       );
     }
     style?.debugFillProperties(properties);
     properties.add(
-        EnumProperty<TextAlign>('textAlign', textAlign, defaultValue: null));
-    properties.add(EnumProperty<TextDirection>('textDirection', textDirection,
-        defaultValue: null));
-    properties
-        .add(DiagnosticsProperty<Locale>('locale', locale, defaultValue: null));
+      EnumProperty<TextAlign>('textAlign', textAlign, defaultValue: null),
+    );
+    properties.add(
+      EnumProperty<TextDirection>(
+        'textDirection',
+        textDirection,
+        defaultValue: null,
+      ),
+    );
+    properties.add(
+      DiagnosticsProperty<Locale>('locale', locale, defaultValue: null),
+    );
     properties.add(
       FlagProperty(
         'softWrap',
@@ -467,13 +487,18 @@ class Text extends StatelessWidget {
       ),
     );
     properties.add(
-        EnumProperty<TextOverflow>('overflow', overflow, defaultValue: null));
+      EnumProperty<TextOverflow>('overflow', overflow, defaultValue: null),
+    );
     properties.add(
-        DoubleProperty('textScaleFactor', textScaleFactor, defaultValue: null));
+      DoubleProperty('textScaleFactor', textScaleFactor, defaultValue: null),
+    );
     properties.add(IntProperty('maxLines', maxLines, defaultValue: null));
     properties.add(
-      EnumProperty<TextWidthBasis>('textWidthBasis', textWidthBasis,
-          defaultValue: null),
+      EnumProperty<TextWidthBasis>(
+        'textWidthBasis',
+        textWidthBasis,
+        defaultValue: null,
+      ),
     );
     properties.add(
       DiagnosticsProperty<ui.TextHeightBehavior>(
@@ -486,8 +511,9 @@ class Text extends StatelessWidget {
       properties.add(StringProperty('semanticsLabel', semanticsLabel));
     }
     if (semanticsIdentifier != null) {
-      properties
-          .add(StringProperty('semanticsIdentifier', semanticsIdentifier));
+      properties.add(
+        StringProperty('semanticsIdentifier', semanticsIdentifier),
+      );
     }
   }
 }
@@ -653,8 +679,8 @@ class _SelectableTextContainerDelegate
     // First pass, if the position is on a placeholder then dispatch the selection
     // event to the [Selectable] at the location and terminate.
     for (int index = 0; index < selectables.length; index += 1) {
-      final bool selectableIsPlaceholder =
-          !paragraph.selectableBelongsToParagraph(selectables[index]);
+      final bool selectableIsPlaceholder = !paragraph
+          .selectableBelongsToParagraph(selectables[index]);
       if (selectableIsPlaceholder &&
           selectables[index].boundingBoxes.isNotEmpty) {
         for (final Rect rect in selectables[index].boundingBoxes) {
@@ -693,8 +719,10 @@ class _SelectableTextContainerDelegate
         continue;
       }
       final SelectionGeometry existingGeometry = selectables[index].value;
-      lastSelectionResult =
-          dispatchSelectionEventToChild(selectables[index], event);
+      lastSelectionResult = dispatchSelectionEventToChild(
+        selectables[index],
+        event,
+      );
       if (index == selectables.length - 1 &&
           lastSelectionResult == SelectionResult.next) {
         if (foundStart) {
@@ -711,10 +739,11 @@ class _SelectableTextContainerDelegate
         if (selectables[index].value != existingGeometry && !foundStart) {
           assert(selectables[index].boundingBoxes.isNotEmpty);
           assert(selectables[index].value.selectionRects.isNotEmpty);
-          final bool selectionAtStartOfSelectable =
-              selectables[index].boundingBoxes[0].overlaps(
-                    selectables[index].value.selectionRects[0],
-                  );
+          final bool selectionAtStartOfSelectable = selectables[index]
+              .boundingBoxes[0]
+              .overlaps(
+                selectables[index].value.selectionRects[0],
+              );
           int startIndex = 0;
           if (lastNextIndex != null && selectionAtStartOfSelectable) {
             startIndex = lastNextIndex + 1;
@@ -726,9 +755,9 @@ class _SelectableTextContainerDelegate
           for (int i = startIndex; i < index; i += 1) {
             final SelectionEvent synthesizedEvent =
                 SelectParagraphSelectionEvent(
-              globalPosition: event.globalPosition,
-              absorb: true,
-            );
+                  globalPosition: event.globalPosition,
+                  absorb: true,
+                );
             dispatchSelectionEventToChild(selectables[i], synthesizedEvent);
           }
           currentSelectionStartIndex = startIndex;
@@ -745,9 +774,9 @@ class _SelectableTextContainerDelegate
           for (int i = 0; i < index; i += 1) {
             final SelectionEvent synthesizedEvent =
                 SelectParagraphSelectionEvent(
-              globalPosition: event.globalPosition,
-              absorb: true,
-            );
+                  globalPosition: event.globalPosition,
+                  absorb: true,
+                );
             dispatchSelectionEventToChild(selectables[i], synthesizedEvent);
           }
         }
@@ -773,8 +802,10 @@ class _SelectableTextContainerDelegate
   /// Ideally, this method should only be called twice at the beginning of the
   /// drag selection, once for start edge update event, once for end edge update
   /// event.
-  SelectionResult _initSelection(SelectionEdgeUpdateEvent event,
-      {required bool isEnd}) {
+  SelectionResult _initSelection(
+    SelectionEdgeUpdateEvent event, {
+    required bool isEnd,
+  }) {
     assert(
       (isEnd && currentSelectionEndIndex == -1) ||
           (!isEnd && currentSelectionStartIndex == -1),
@@ -804,10 +835,13 @@ class _SelectableTextContainerDelegate
     // 1. the selectable returns end, pending, none.
     // 2. the selectable returns previous when looking forward.
     // 2. the selectable returns next when looking backward.
-    while (
-        newIndex < selectables.length && newIndex >= 0 && finalResult == null) {
-      currentSelectableResult =
-          dispatchSelectionEventToChild(selectables[newIndex], event);
+    while (newIndex < selectables.length &&
+        newIndex >= 0 &&
+        finalResult == null) {
+      currentSelectableResult = dispatchSelectionEventToChild(
+        selectables[newIndex],
+        event,
+      );
       switch (currentSelectableResult) {
         case SelectionResult.end:
         case SelectionResult.pending:
@@ -844,16 +878,22 @@ class _SelectableTextContainerDelegate
     return finalResult!;
   }
 
-  SelectionResult _adjustSelection(SelectionEdgeUpdateEvent event,
-      {required bool isEnd}) {
+  SelectionResult _adjustSelection(
+    SelectionEdgeUpdateEvent event, {
+    required bool isEnd,
+  }) {
     assert(() {
       if (isEnd) {
-        assert(currentSelectionEndIndex < selectables.length &&
-            currentSelectionEndIndex >= 0);
+        assert(
+          currentSelectionEndIndex < selectables.length &&
+              currentSelectionEndIndex >= 0,
+        );
         return true;
       }
-      assert(currentSelectionStartIndex < selectables.length &&
-          currentSelectionStartIndex >= 0);
+      assert(
+        currentSelectionStartIndex < selectables.length &&
+            currentSelectionStartIndex >= 0,
+      );
       return true;
     }());
     SelectionResult? finalResult;
@@ -876,7 +916,7 @@ class _SelectableTextContainerDelegate
     int newIndex = switch ((
       isEnd,
       isCurrentEdgeWithinViewport,
-      isOppositeEdgeWithinViewport
+      isOppositeEdgeWithinViewport,
     )) {
       (true, true, true) => currentSelectionEndIndex,
       (true, true, false) => currentSelectionEndIndex,
@@ -903,10 +943,13 @@ class _SelectableTextContainerDelegate
     // 1. the selectable returns end, pending, none.
     // 2. the selectable returns previous when looking forward.
     // 2. the selectable returns next when looking backward.
-    while (
-        newIndex < selectables.length && newIndex >= 0 && finalResult == null) {
-      currentSelectableResult =
-          dispatchSelectionEventToChild(selectables[newIndex], event);
+    while (newIndex < selectables.length &&
+        newIndex >= 0 &&
+        finalResult == null) {
+      currentSelectableResult = dispatchSelectionEventToChild(
+        selectables[newIndex],
+        event,
+      );
       switch (currentSelectableResult) {
         case SelectionResult.end:
         case SelectionResult.pending:
@@ -976,9 +1019,13 @@ class _SelectableTextContainerDelegate
     // Attempt to sort the selectables under a [_SelectableTextContainerDelegate]
     // by the top left rect.
     final Rect rectA = MatrixUtils.transformRect(
-        a.getTransformTo(null), a.boundingBoxes.first);
+      a.getTransformTo(null),
+      a.boundingBoxes.first,
+    );
     final Rect rectB = MatrixUtils.transformRect(
-        b.getTransformTo(null), b.boundingBoxes.first);
+      b.getTransformTo(null),
+      b.boundingBoxes.first,
+    );
     final int result = _compareVertically(rectA, rectB);
     if (result != 0) {
       return result;
@@ -1045,7 +1092,8 @@ class _SelectableTextContainerDelegate
       // Use the range from the selectable within the selection as the source of truth for selection direction.
       final SelectedContentRange rangeAtSelectableInSelection =
           selectables[currentSelectionStartIndex].getSelection()!;
-      forwardSelection = rangeAtSelectableInSelection.endOffset >=
+      forwardSelection =
+          rangeAtSelectableInSelection.endOffset >=
           rangeAtSelectableInSelection.startOffset;
     }
     for (int index = 0; index < selections.length; index++) {
@@ -1073,17 +1121,24 @@ class _SelectableTextContainerDelegate
         // Because a RenderParagraph may split its content into multiple selectables
         // we have to consider at what offset a selectable starts at relative
         // to the RenderParagraph, when the selectable is not the start of the content.
-        final bool shouldConsiderContentStart = index > 0 &&
+        final bool shouldConsiderContentStart =
+            index > 0 &&
             paragraph.selectableBelongsToParagraph(selectables[index]);
-        startOffset += (selectionStartNormalized -
-                (shouldConsiderContentStart
-                    ? paragraph
-                        .getPositionForOffset(
-                            selectables[index].boundingBoxes.first.centerLeft)
-                        .offset
-                    : 0))
-            .abs();
-        endOffset = startOffset +
+        startOffset +=
+            (selectionStartNormalized -
+                    (shouldConsiderContentStart
+                        ? paragraph
+                              .getPositionForOffset(
+                                selectables[index]
+                                    .boundingBoxes
+                                    .first
+                                    .centerLeft,
+                              )
+                              .offset
+                        : 0))
+                .abs();
+        endOffset =
+            startOffset +
             (selectionEndNormalized - selectionStartNormalized).abs();
         foundStart = true;
       } else {
@@ -1111,7 +1166,7 @@ class _SelectableTextContainerDelegate
       for (final Selectable selectable in selectables)
         (
           contentLength: selectable.contentLength,
-          range: selectable.getSelection()
+          range: selectable.getSelection(),
         ),
     ];
     return _calculateLocalRange(selections);
@@ -1138,20 +1193,28 @@ class _SelectableTextContainerDelegate
           .where((Selectable target) => target != selectables[skipIndex])
           .forEach(
             (Selectable target) => dispatchSelectionEventToChild(
-                target, const ClearSelectionEvent()),
+              target,
+              const ClearSelectionEvent(),
+            ),
           );
       return;
     }
-    final int skipStart =
-        min(currentSelectionStartIndex, currentSelectionEndIndex);
-    final int skipEnd =
-        max(currentSelectionStartIndex, currentSelectionEndIndex);
+    final int skipStart = min(
+      currentSelectionStartIndex,
+      currentSelectionEndIndex,
+    );
+    final int skipEnd = max(
+      currentSelectionStartIndex,
+      currentSelectionEndIndex,
+    );
     for (int index = 0; index < selectables.length; index += 1) {
       if (index >= skipStart && index <= skipEnd) {
         continue;
       }
       dispatchSelectionEventToChild(
-          selectables[index], const ClearSelectionEvent());
+        selectables[index],
+        const ClearSelectionEvent(),
+      );
     }
   }
 
diff --git a/lib/common/widgets/text_field/adaptive_text_selection_toolbar.dart b/lib/common/widgets/text_field/adaptive_text_selection_toolbar.dart
index 18ede2dc2..6dc0dc393 100644
--- a/lib/common/widgets/text_field/adaptive_text_selection_toolbar.dart
+++ b/lib/common/widgets/text_field/adaptive_text_selection_toolbar.dart
@@ -62,9 +62,11 @@ class AdaptiveTextSelectionToolbar extends StatelessWidget {
   /// * [AdaptiveTextSelectionToolbar.selectable], which builds the default
   ///   children for content that is selectable but not editable.
   /// {@endtemplate}
-  const AdaptiveTextSelectionToolbar(
-      {super.key, required this.children, required this.anchors})
-      : buttonItems = null;
+  const AdaptiveTextSelectionToolbar({
+    super.key,
+    required this.children,
+    required this.anchors,
+  }) : buttonItems = null;
 
   /// Create an instance of [AdaptiveTextSelectionToolbar] whose children will
   /// be built from the given [buttonItems].
@@ -113,18 +115,18 @@ class AdaptiveTextSelectionToolbar extends StatelessWidget {
     required VoidCallback? onShare,
     required VoidCallback? onLiveTextInput,
     required this.anchors,
-  })  : children = null,
-        buttonItems = EditableText.getEditableButtonItems(
-          clipboardStatus: clipboardStatus,
-          onCopy: onCopy,
-          onCut: onCut,
-          onPaste: onPaste,
-          onSelectAll: onSelectAll,
-          onLookUp: onLookUp,
-          onSearchWeb: onSearchWeb,
-          onShare: onShare,
-          onLiveTextInput: onLiveTextInput,
-        );
+  }) : children = null,
+       buttonItems = EditableText.getEditableButtonItems(
+         clipboardStatus: clipboardStatus,
+         onCopy: onCopy,
+         onCut: onCut,
+         onPaste: onPaste,
+         onSelectAll: onSelectAll,
+         onLookUp: onLookUp,
+         onSearchWeb: onSearchWeb,
+         onShare: onShare,
+         onLiveTextInput: onLiveTextInput,
+       );
 
   /// Create an instance of [AdaptiveTextSelectionToolbar] with the default
   /// children for an [EditableText].
@@ -138,9 +140,9 @@ class AdaptiveTextSelectionToolbar extends StatelessWidget {
   AdaptiveTextSelectionToolbar.editableText({
     super.key,
     required EditableTextState editableTextState,
-  })  : children = null,
-        buttonItems = editableTextState.contextMenuButtonItems,
-        anchors = editableTextState.contextMenuAnchors;
+  }) : children = null,
+       buttonItems = editableTextState.contextMenuButtonItems,
+       anchors = editableTextState.contextMenuAnchors;
 
   /// Create an instance of [AdaptiveTextSelectionToolbar] with the default
   /// children for selectable, but not editable, content.
@@ -158,13 +160,13 @@ class AdaptiveTextSelectionToolbar extends StatelessWidget {
     required VoidCallback? onShare,
     required SelectionGeometry selectionGeometry,
     required this.anchors,
-  })  : children = null,
-        buttonItems = SelectableRegion.getSelectableButtonItems(
-          selectionGeometry: selectionGeometry,
-          onCopy: onCopy,
-          onSelectAll: onSelectAll,
-          onShare: onShare,
-        );
+  }) : children = null,
+       buttonItems = SelectableRegion.getSelectableButtonItems(
+         selectionGeometry: selectionGeometry,
+         onCopy: onCopy,
+         onSelectAll: onSelectAll,
+         onShare: onShare,
+       );
 
   /// Create an instance of [AdaptiveTextSelectionToolbar] with the default
   /// children for a [SelectableRegion].
@@ -179,9 +181,9 @@ class AdaptiveTextSelectionToolbar extends StatelessWidget {
   AdaptiveTextSelectionToolbar.selectableRegion({
     super.key,
     required SelectableRegionState selectableRegionState,
-  })  : children = null,
-        buttonItems = selectableRegionState.contextMenuButtonItems,
-        anchors = selectableRegionState.contextMenuAnchors;
+  }) : children = null,
+       buttonItems = selectableRegionState.contextMenuButtonItems,
+       anchors = selectableRegionState.contextMenuAnchors;
 
   /// {@template flutter.material.AdaptiveTextSelectionToolbar.buttonItems}
   /// The [ContextMenuButtonItem]s that will be turned into the correct button
@@ -200,7 +202,9 @@ class AdaptiveTextSelectionToolbar extends StatelessWidget {
   /// Returns the default button label String for the button of the given
   /// [ContextMenuButtonType] on any platform.
   static String getButtonLabel(
-      BuildContext context, ContextMenuButtonItem buttonItem) {
+    BuildContext context,
+    ContextMenuButtonItem buttonItem,
+  ) {
     if (buttonItem.label != null) {
       return buttonItem.label!;
     }
@@ -209,14 +213,17 @@ class AdaptiveTextSelectionToolbar extends StatelessWidget {
       case TargetPlatform.iOS:
       case TargetPlatform.macOS:
         return CupertinoTextSelectionToolbarButton.getButtonLabel(
-            context, buttonItem);
+          context,
+          buttonItem,
+        );
       case TargetPlatform.android:
       case TargetPlatform.fuchsia:
       case TargetPlatform.linux:
       case TargetPlatform.windows:
         assert(debugCheckHasMaterialLocalizations(context));
-        final MaterialLocalizations localizations =
-            MaterialLocalizations.of(context);
+        final MaterialLocalizations localizations = MaterialLocalizations.of(
+          context,
+        );
         return switch (buttonItem.type) {
           ContextMenuButtonType.cut => localizations.cutButtonLabel,
           ContextMenuButtonType.copy => localizations.copyButtonLabel,
@@ -261,7 +268,8 @@ class AdaptiveTextSelectionToolbar extends StatelessWidget {
       case TargetPlatform.iOS:
         return buttonItems.map((ContextMenuButtonItem buttonItem) {
           return CupertinoTextSelectionToolbarButton.buttonItem(
-              buttonItem: buttonItem);
+            buttonItem: buttonItem,
+          );
         });
       case TargetPlatform.fuchsia:
       case TargetPlatform.android:
@@ -271,7 +279,9 @@ class AdaptiveTextSelectionToolbar extends StatelessWidget {
           buttons.add(
             TextSelectionToolbarTextButton(
               padding: TextSelectionToolbarTextButton.getPadding(
-                  i, buttonItems.length),
+                i,
+                buttonItems.length,
+              ),
               onPressed: buttonItem.onPressed,
               alignment: AlignmentDirectional.centerStart,
               child: Text(getButtonLabel(context, buttonItem)),
@@ -331,7 +341,9 @@ class AdaptiveTextSelectionToolbar extends StatelessWidget {
       case TargetPlatform.linux:
       case TargetPlatform.windows:
         return DesktopTextSelectionToolbar(
-            anchor: anchors.primaryAnchor, children: resultChildren);
+          anchor: anchors.primaryAnchor,
+          children: resultChildren,
+        );
       case TargetPlatform.macOS:
         return CupertinoDesktopTextSelectionToolbar(
           anchor: anchors.primaryAnchor,
diff --git a/lib/common/widgets/text_field/controller.dart b/lib/common/widgets/text_field/controller.dart
index caa4b32f2..31fc20815 100644
--- a/lib/common/widgets/text_field/controller.dart
+++ b/lib/common/widgets/text_field/controller.dart
@@ -56,7 +56,7 @@ extension TextEditingDeltaExt on TextEditingDelta {
       type: composing.isValid ? RichTextType.composing : RichTextType.text,
       rawText: null,
       emote: null,
-      id: null
+      id: null,
     );
   }
 
@@ -85,7 +85,8 @@ class RichTextEditingDeltaInsertion extends TextEditingDeltaInsertion
     this.id,
     this.rawText,
   }) {
-    this.type = type ??
+    this.type =
+        type ??
         (composing.isValid ? RichTextType.composing : RichTextType.text);
   }
 
@@ -115,7 +116,8 @@ class RichTextEditingDeltaReplacement extends TextEditingDeltaReplacement
     this.id,
     this.rawText,
   }) {
-    this.type = type ??
+    this.type =
+        type ??
         (composing.isValid ? RichTextType.composing : RichTextType.text);
   }
 
@@ -305,8 +307,9 @@ class RichTextItem {
         '',
       );
       range = TextRange(start: range.start, end: range.start + text.length);
-      controller.newSelection =
-          TextSelection.collapsed(offset: deletedRange.start);
+      controller.newSelection = TextSelection.collapsed(
+        offset: deletedRange.start,
+      );
       return null;
     }
 
@@ -331,8 +334,9 @@ class RichTextItem {
         start: range.start,
         end: deletedRange.start,
       );
-      controller.newSelection =
-          TextSelection.collapsed(offset: deletedRange.start);
+      controller.newSelection = TextSelection.collapsed(
+        offset: deletedRange.start,
+      );
       return null;
     }
 
@@ -385,11 +389,14 @@ class RichTextItem {
           final end = range.start + text.length;
           range = TextRange(start: range.start, end: end);
           controller.newSelection = TextSelection.collapsed(
-              offset: replacedRange.start + delta.replacementText.length);
+            offset: replacedRange.start + delta.replacementText.length,
+          );
           return null;
         } else {
-          final leadingText =
-              text.substring(0, replacedRange.start - range.start);
+          final leadingText = text.substring(
+            0,
+            replacedRange.start - range.start,
+          );
           final trailString = text.substring(replacedRange.end - range.start);
           final insertEnd = replacedRange.start + delta.replacementText.length;
           controller.newSelection = TextSelection.collapsed(offset: insertEnd);
@@ -560,10 +567,10 @@ class RichTextEditingController extends TextEditingController {
     List<RichTextItem>? items,
     this.onMention,
   }) : super(
-          text: items != null && items.isNotEmpty
-              ? (StringBuffer()..writeAll(items.map((e) => e.text))).toString()
-              : null,
-        ) {
+         text: items != null && items.isNotEmpty
+             ? (StringBuffer()..writeAll(items.map((e) => e.text))).toString()
+             : null,
+       ) {
     if (items != null && items.isNotEmpty) {
       this.items.addAll(items);
     }
@@ -625,8 +632,9 @@ class RichTextEditingController extends TextEditingController {
               id: config.id,
             ),
           );
-          newSelection =
-              TextSelection.collapsed(offset: delta.textInserted.length);
+          newSelection = TextSelection.collapsed(
+            offset: delta.textInserted.length,
+          );
           return;
         }
         for (int index = 0; index < items.length; index++) {
@@ -654,15 +662,17 @@ class RichTextEditingController extends TextEditingController {
       case TextEditingDeltaReplacement e:
         for (int index = 0; index < items.length; index++) {
           final item = items[index];
-          ({bool remove, List<RichTextItem>? toAdd})? res =
-              item.onReplace(e, this);
+          ({bool remove, List<RichTextItem>? toAdd})? res = item.onReplace(
+            e,
+            this,
+          );
           if (res != null) {
             if (res.toAdd != null) {
               addIndex = res.remove
                   ? index
                   : (e.replacedRange.start == 0 && index == 0)
-                      ? 0
-                      : index + 1;
+                  ? 0
+                  : index + 1;
               (toAdd ??= <RichTextItem>[]).addAll(res.toAdd!);
             } else if (res.remove) {
               (toDel ??= <RichTextItem>[]).add(item);
@@ -675,7 +685,9 @@ class RichTextEditingController extends TextEditingController {
         if (newSelection.isCollapsed) {
           final newPos = dragOffset(newSelection.base);
           newSelection = newSelection.copyWith(
-              baseOffset: newPos.offset, extentOffset: newPos.offset);
+            baseOffset: newPos.offset,
+            extentOffset: newPos.offset,
+          );
         } else {
           final isNormalized =
               newSelection.baseOffset < newSelection.extentOffset;
@@ -742,8 +754,10 @@ class RichTextEditingController extends TextEditingController {
           case RichTextType.text:
             return TextSpan(text: e.text);
           case RichTextType.composing:
-            composingStyle ??= style?.merge(
-                    const TextStyle(decoration: TextDecoration.underline)) ??
+            composingStyle ??=
+                style?.merge(
+                  const TextStyle(decoration: TextDecoration.underline),
+                ) ??
                 const TextStyle(decoration: TextDecoration.underline);
             if (composingRegionOutOfRange) {
               e.type = RichTextType.text;
@@ -753,8 +767,9 @@ class RichTextEditingController extends TextEditingController {
               style: composingRegionOutOfRange ? null : composingStyle,
             );
           case RichTextType.at || RichTextType.common:
-            richStyle ??= (style ?? const TextStyle())
-                .copyWith(color: Theme.of(context).colorScheme.primary);
+            richStyle ??= (style ?? const TextStyle()).copyWith(
+              color: Theme.of(context).colorScheme.primary,
+            );
             return TextSpan(
               text: e.text,
               style: richStyle,
@@ -778,8 +793,9 @@ class RichTextEditingController extends TextEditingController {
             }
             return TextSpan(text: e.text);
           case RichTextType.vote:
-            richStyle ??= (style ?? const TextStyle())
-                .copyWith(color: Theme.of(context).colorScheme.primary);
+            richStyle ??= (style ?? const TextStyle()).copyWith(
+              color: Theme.of(context).colorScheme.primary,
+            );
             return TextSpan(
               children: [
                 WidgetSpan(
@@ -938,10 +954,14 @@ class RichTextEditingController extends TextEditingController {
         if (e.isRich) {
           if (offset < selection.baseOffset) {
             return newSelection.copyWith(
-                baseOffset: range.start, extentOffset: range.start);
+              baseOffset: range.start,
+              extentOffset: range.start,
+            );
           } else {
             return newSelection.copyWith(
-                baseOffset: range.end, extentOffset: range.end);
+              baseOffset: range.end,
+              extentOffset: range.end,
+            );
           }
         }
       }
diff --git a/lib/common/widgets/text_field/cupertino/cupertino_adaptive_text_selection_toolbar.dart b/lib/common/widgets/text_field/cupertino/cupertino_adaptive_text_selection_toolbar.dart
index e1311bad4..a29fdf2ce 100644
--- a/lib/common/widgets/text_field/cupertino/cupertino_adaptive_text_selection_toolbar.dart
+++ b/lib/common/widgets/text_field/cupertino/cupertino_adaptive_text_selection_toolbar.dart
@@ -98,18 +98,18 @@ class CupertinoAdaptiveTextSelectionToolbar extends StatelessWidget {
     required VoidCallback? onShare,
     required VoidCallback? onLiveTextInput,
     required this.anchors,
-  })  : children = null,
-        buttonItems = EditableText.getEditableButtonItems(
-          clipboardStatus: clipboardStatus,
-          onCopy: onCopy,
-          onCut: onCut,
-          onPaste: onPaste,
-          onSelectAll: onSelectAll,
-          onLookUp: onLookUp,
-          onSearchWeb: onSearchWeb,
-          onShare: onShare,
-          onLiveTextInput: onLiveTextInput,
-        );
+  }) : children = null,
+       buttonItems = EditableText.getEditableButtonItems(
+         clipboardStatus: clipboardStatus,
+         onCopy: onCopy,
+         onCut: onCut,
+         onPaste: onPaste,
+         onSelectAll: onSelectAll,
+         onLookUp: onLookUp,
+         onSearchWeb: onSearchWeb,
+         onShare: onShare,
+         onLiveTextInput: onLiveTextInput,
+       );
 
   /// Create an instance of [CupertinoAdaptiveTextSelectionToolbar] with the
   /// default children for an [EditableText].
@@ -125,9 +125,9 @@ class CupertinoAdaptiveTextSelectionToolbar extends StatelessWidget {
   CupertinoAdaptiveTextSelectionToolbar.editableText({
     super.key,
     required EditableTextState editableTextState,
-  })  : children = null,
-        buttonItems = editableTextState.contextMenuButtonItems,
-        anchors = editableTextState.contextMenuAnchors;
+  }) : children = null,
+       buttonItems = editableTextState.contextMenuButtonItems,
+       anchors = editableTextState.contextMenuAnchors;
 
   /// Create an instance of [CupertinoAdaptiveTextSelectionToolbar] with the
   /// default children for selectable, but not editable, content.
@@ -146,14 +146,13 @@ class CupertinoAdaptiveTextSelectionToolbar extends StatelessWidget {
     required VoidCallback onSelectAll,
     required SelectionGeometry selectionGeometry,
     required this.anchors,
-  })  : children = null,
-        buttonItems = SelectableRegion.getSelectableButtonItems(
-          selectionGeometry: selectionGeometry,
-          onCopy: onCopy,
-          onSelectAll: onSelectAll,
-          onShare:
-              null, // See https://github.com/flutter/flutter/issues/141775.
-        );
+  }) : children = null,
+       buttonItems = SelectableRegion.getSelectableButtonItems(
+         selectionGeometry: selectionGeometry,
+         onCopy: onCopy,
+         onSelectAll: onSelectAll,
+         onShare: null, // See https://github.com/flutter/flutter/issues/141775.
+       );
 
   /// {@macro flutter.material.AdaptiveTextSelectionToolbar.anchors}
   final TextSelectionToolbarAnchors anchors;
@@ -193,14 +192,16 @@ class CupertinoAdaptiveTextSelectionToolbar extends StatelessWidget {
       case TargetPlatform.iOS:
         return buttonItems.map((ContextMenuButtonItem buttonItem) {
           return CupertinoTextSelectionToolbarButton.buttonItem(
-              buttonItem: buttonItem);
+            buttonItem: buttonItem,
+          );
         });
       case TargetPlatform.linux:
       case TargetPlatform.windows:
       case TargetPlatform.macOS:
         return buttonItems.map((ContextMenuButtonItem buttonItem) {
           return CupertinoDesktopTextSelectionToolbarButton.buttonItem(
-              buttonItem: buttonItem);
+            buttonItem: buttonItem,
+          );
         });
     }
   }
diff --git a/lib/common/widgets/text_field/cupertino/cupertino_spell_check_suggestions_toolbar.dart b/lib/common/widgets/text_field/cupertino/cupertino_spell_check_suggestions_toolbar.dart
index 8cce9772b..3a5f6e18c 100644
--- a/lib/common/widgets/text_field/cupertino/cupertino_spell_check_suggestions_toolbar.dart
+++ b/lib/common/widgets/text_field/cupertino/cupertino_spell_check_suggestions_toolbar.dart
@@ -41,9 +41,9 @@ class CupertinoSpellCheckSuggestionsToolbar extends StatelessWidget {
   CupertinoSpellCheckSuggestionsToolbar.editableText({
     super.key,
     required EditableTextState editableTextState,
-  })  : buttonItems =
-            buildButtonItems(editableTextState) ?? <ContextMenuButtonItem>[],
-        anchors = editableTextState.contextMenuAnchors;
+  }) : buttonItems =
+           buildButtonItems(editableTextState) ?? <ContextMenuButtonItem>[],
+       anchors = editableTextState.contextMenuAnchors;
 
   /// The location on which to anchor the menu.
   final TextSelectionToolbarAnchors anchors;
@@ -66,12 +66,13 @@ class CupertinoSpellCheckSuggestionsToolbar extends StatelessWidget {
   /// Builds the button items for the toolbar based on the available
   /// spell check suggestions.
   static List<ContextMenuButtonItem>? buildButtonItems(
-      EditableTextState editableTextState) {
+    EditableTextState editableTextState,
+  ) {
     // Determine if composing region is misspelled.
-    final SuggestionSpan? spanAtCursorIndex =
-        editableTextState.findSuggestionSpanAtCursorIndex(
-      editableTextState.currentTextEditingValue.selection.baseOffset,
-    );
+    final SuggestionSpan? spanAtCursorIndex = editableTextState
+        .findSuggestionSpanAtCursorIndex(
+          editableTextState.currentTextEditingValue.selection.baseOffset,
+        );
 
     if (spanAtCursorIndex == null) {
       return null;
@@ -83,16 +84,18 @@ class CupertinoSpellCheckSuggestionsToolbar extends StatelessWidget {
       );
       return <ContextMenuButtonItem>[
         ContextMenuButtonItem(
-            onPressed: null,
-            label: localizations.noSpellCheckReplacementsLabel),
+          onPressed: null,
+          label: localizations.noSpellCheckReplacementsLabel,
+        ),
       ];
     }
 
     final List<ContextMenuButtonItem> buttonItems = <ContextMenuButtonItem>[];
 
     // Build suggestion buttons.
-    for (final String suggestion
-        in spanAtCursorIndex.suggestions.take(_kMaxSuggestions)) {
+    for (final String suggestion in spanAtCursorIndex.suggestions.take(
+      _kMaxSuggestions,
+    )) {
       buttonItems.add(
         ContextMenuButtonItem(
           onPressed: () {
@@ -100,7 +103,10 @@ class CupertinoSpellCheckSuggestionsToolbar extends StatelessWidget {
               return;
             }
             _replaceText(
-                editableTextState, suggestion, spanAtCursorIndex.range);
+              editableTextState,
+              suggestion,
+              spanAtCursorIndex.range,
+            );
           },
           label: suggestion,
         ),
@@ -115,22 +121,29 @@ class CupertinoSpellCheckSuggestionsToolbar extends StatelessWidget {
     TextRange replacementRange,
   ) {
     // Replacement cannot be performed if the text is read only or obscured.
-    assert(!editableTextState.widget.readOnly &&
-        !editableTextState.widget.obscureText);
+    assert(
+      !editableTextState.widget.readOnly &&
+          !editableTextState.widget.obscureText,
+    );
 
     final TextEditingValue newValue = editableTextState.textEditingValue
         .replaced(replacementRange, text)
         .copyWith(
-            selection: TextSelection.collapsed(
-                offset: replacementRange.start + text.length));
+          selection: TextSelection.collapsed(
+            offset: replacementRange.start + text.length,
+          ),
+        );
     editableTextState.userUpdateTextEditingValue(
-        newValue, SelectionChangedCause.toolbar);
+      newValue,
+      SelectionChangedCause.toolbar,
+    );
 
     // Schedule a call to bringIntoView() after renderEditable updates.
     SchedulerBinding.instance.addPostFrameCallback((Duration duration) {
       if (editableTextState.mounted) {
-        editableTextState
-            .bringIntoView(editableTextState.textEditingValue.selection.extent);
+        editableTextState.bringIntoView(
+          editableTextState.textEditingValue.selection.extent,
+        );
       }
     }, debugLabel: 'SpellCheckSuggestions.bringIntoView');
     editableTextState.hideToolbar();
@@ -140,7 +153,8 @@ class CupertinoSpellCheckSuggestionsToolbar extends StatelessWidget {
   List<Widget> _buildToolbarButtons(BuildContext context) {
     return buttonItems.map((ContextMenuButtonItem buttonItem) {
       return CupertinoTextSelectionToolbarButton.buttonItem(
-          buttonItem: buttonItem);
+        buttonItem: buttonItem,
+      );
     }).toList();
   }
 
diff --git a/lib/common/widgets/text_field/cupertino/cupertino_text_field.dart b/lib/common/widgets/text_field/cupertino/cupertino_text_field.dart
index 7b449ccbd..705df17ea 100644
--- a/lib/common/widgets/text_field/cupertino/cupertino_text_field.dart
+++ b/lib/common/widgets/text_field/cupertino/cupertino_text_field.dart
@@ -77,9 +77,9 @@ const Color _kDisabledBackground = CupertinoDynamicColor.withBrightness(
 // Note it may not be consistent with https://developer.apple.com/design/resources/.
 const CupertinoDynamicColor _kClearButtonColor =
     CupertinoDynamicColor.withBrightness(
-  color: Color(0x33000000),
-  darkColor: Color(0x33FFFFFF),
-);
+      color: Color(0x33000000),
+      darkColor: Color(0x33FFFFFF),
+    );
 
 // An eyeballed value that moves the cursor slightly left of where it is
 // rendered for text on Android so it's positioning more accurately matches the
@@ -115,10 +115,10 @@ enum OverlayVisibilityMode {
 
 class _CupertinoTextFieldSelectionGestureDetectorBuilder
     extends TextSelectionGestureDetectorBuilder {
-  _CupertinoTextFieldSelectionGestureDetectorBuilder(
-      {required _CupertinoRichTextFieldState state})
-      : _state = state,
-        super(delegate: state);
+  _CupertinoTextFieldSelectionGestureDetectorBuilder({
+    required _CupertinoRichTextFieldState state,
+  }) : _state = state,
+       super(delegate: state);
 
   final _CupertinoRichTextFieldState _state;
 
@@ -129,10 +129,12 @@ class _CupertinoTextFieldSelectionGestureDetectorBuilder
     // this handler. If the clear button widget recognizes the up event,
     // then do not handle it.
     if (_state._clearGlobalKey.currentContext != null) {
-      final RenderBox renderBox = _state._clearGlobalKey.currentContext!
-          .findRenderObject()! as RenderBox;
-      final Offset localOffset =
-          renderBox.globalToLocal(details.globalPosition);
+      final RenderBox renderBox =
+          _state._clearGlobalKey.currentContext!.findRenderObject()!
+              as RenderBox;
+      final Offset localOffset = renderBox.globalToLocal(
+        details.globalPosition,
+      );
       if (renderBox.hitTest(BoxHitTestResult(), position: localOffset)) {
         return;
       }
@@ -324,35 +326,40 @@ class CupertinoRichTextField extends StatefulWidget {
     this.contextMenuBuilder = _defaultContextMenuBuilder,
     this.spellCheckConfiguration,
     this.magnifierConfiguration,
-  })  : assert(obscuringCharacter.length == 1),
-        smartDashesType = smartDashesType ??
-            (obscureText ? SmartDashesType.disabled : SmartDashesType.enabled),
-        smartQuotesType = smartQuotesType ??
-            (obscureText ? SmartQuotesType.disabled : SmartQuotesType.enabled),
-        assert(maxLines == null || maxLines > 0),
-        assert(minLines == null || minLines > 0),
-        assert(
-          (maxLines == null) || (minLines == null) || (maxLines >= minLines),
-          "minLines can't be greater than maxLines",
-        ),
-        assert(
-          !expands || (maxLines == null && minLines == null),
-          'minLines and maxLines must be null when expands is true.',
-        ),
-        assert(!obscureText || maxLines == 1,
-            'Obscured fields cannot be multiline.'),
-        assert(maxLength == null || maxLength > 0),
-        // Assert the following instead of setting it directly to avoid surprising the user by silently changing the value they set.
-        assert(
-          !identical(textInputAction, TextInputAction.newline) ||
-              maxLines == 1 ||
-              !identical(keyboardType, TextInputType.text),
-          'Use keyboardType TextInputType.multiline when using TextInputAction.newline on a multiline TextField.',
-        ),
-        keyboardType = keyboardType ??
-            (maxLines == 1 ? TextInputType.text : TextInputType.multiline),
-        enableInteractiveSelection =
-            enableInteractiveSelection ?? (!readOnly || !obscureText);
+  }) : assert(obscuringCharacter.length == 1),
+       smartDashesType =
+           smartDashesType ??
+           (obscureText ? SmartDashesType.disabled : SmartDashesType.enabled),
+       smartQuotesType =
+           smartQuotesType ??
+           (obscureText ? SmartQuotesType.disabled : SmartQuotesType.enabled),
+       assert(maxLines == null || maxLines > 0),
+       assert(minLines == null || minLines > 0),
+       assert(
+         (maxLines == null) || (minLines == null) || (maxLines >= minLines),
+         "minLines can't be greater than maxLines",
+       ),
+       assert(
+         !expands || (maxLines == null && minLines == null),
+         'minLines and maxLines must be null when expands is true.',
+       ),
+       assert(
+         !obscureText || maxLines == 1,
+         'Obscured fields cannot be multiline.',
+       ),
+       assert(maxLength == null || maxLength > 0),
+       // Assert the following instead of setting it directly to avoid surprising the user by silently changing the value they set.
+       assert(
+         !identical(textInputAction, TextInputAction.newline) ||
+             maxLines == 1 ||
+             !identical(keyboardType, TextInputType.text),
+         'Use keyboardType TextInputType.multiline when using TextInputAction.newline on a multiline TextField.',
+       ),
+       keyboardType =
+           keyboardType ??
+           (maxLines == 1 ? TextInputType.text : TextInputType.multiline),
+       enableInteractiveSelection =
+           enableInteractiveSelection ?? (!readOnly || !obscureText);
 
   /// Creates a borderless iOS-style text field.
   ///
@@ -464,35 +471,40 @@ class CupertinoRichTextField extends StatefulWidget {
     this.contextMenuBuilder = _defaultContextMenuBuilder,
     this.spellCheckConfiguration,
     this.magnifierConfiguration,
-  })  : assert(obscuringCharacter.length == 1),
-        smartDashesType = smartDashesType ??
-            (obscureText ? SmartDashesType.disabled : SmartDashesType.enabled),
-        smartQuotesType = smartQuotesType ??
-            (obscureText ? SmartQuotesType.disabled : SmartQuotesType.enabled),
-        assert(maxLines == null || maxLines > 0),
-        assert(minLines == null || minLines > 0),
-        assert(
-          (maxLines == null) || (minLines == null) || (maxLines >= minLines),
-          "minLines can't be greater than maxLines",
-        ),
-        assert(
-          !expands || (maxLines == null && minLines == null),
-          'minLines and maxLines must be null when expands is true.',
-        ),
-        assert(!obscureText || maxLines == 1,
-            'Obscured fields cannot be multiline.'),
-        assert(maxLength == null || maxLength > 0),
-        // Assert the following instead of setting it directly to avoid surprising the user by silently changing the value they set.
-        assert(
-          !identical(textInputAction, TextInputAction.newline) ||
-              maxLines == 1 ||
-              !identical(keyboardType, TextInputType.text),
-          'Use keyboardType TextInputType.multiline when using TextInputAction.newline on a multiline TextField.',
-        ),
-        keyboardType = keyboardType ??
-            (maxLines == 1 ? TextInputType.text : TextInputType.multiline),
-        enableInteractiveSelection =
-            enableInteractiveSelection ?? (!readOnly || !obscureText);
+  }) : assert(obscuringCharacter.length == 1),
+       smartDashesType =
+           smartDashesType ??
+           (obscureText ? SmartDashesType.disabled : SmartDashesType.enabled),
+       smartQuotesType =
+           smartQuotesType ??
+           (obscureText ? SmartQuotesType.disabled : SmartQuotesType.enabled),
+       assert(maxLines == null || maxLines > 0),
+       assert(minLines == null || minLines > 0),
+       assert(
+         (maxLines == null) || (minLines == null) || (maxLines >= minLines),
+         "minLines can't be greater than maxLines",
+       ),
+       assert(
+         !expands || (maxLines == null && minLines == null),
+         'minLines and maxLines must be null when expands is true.',
+       ),
+       assert(
+         !obscureText || maxLines == 1,
+         'Obscured fields cannot be multiline.',
+       ),
+       assert(maxLength == null || maxLength > 0),
+       // Assert the following instead of setting it directly to avoid surprising the user by silently changing the value they set.
+       assert(
+         !identical(textInputAction, TextInputAction.newline) ||
+             maxLines == 1 ||
+             !identical(keyboardType, TextInputType.text),
+         'Use keyboardType TextInputType.multiline when using TextInputAction.newline on a multiline TextField.',
+       ),
+       keyboardType =
+           keyboardType ??
+           (maxLines == 1 ? TextInputType.text : TextInputType.multiline),
+       enableInteractiveSelection =
+           enableInteractiveSelection ?? (!readOnly || !obscureText);
 
   /// {@macro flutter.widgets.editableText.groupId}
   final Object groupId;
@@ -832,10 +844,12 @@ class CupertinoRichTextField extends StatefulWidget {
     if (defaultTargetPlatform == TargetPlatform.iOS &&
         SystemContextMenu.isSupported(context)) {
       return SystemContextMenu.editableText(
-          editableTextState: editableTextState);
+        editableTextState: editableTextState,
+      );
     }
     return CupertinoAdaptiveTextSelectionToolbar.editableText(
-        editableTextState: editableTextState);
+      editableTextState: editableTextState,
+    );
   }
 
   /// Configuration for the text field magnifier.
@@ -895,7 +909,8 @@ class CupertinoRichTextField extends StatefulWidget {
     EditableTextState editableTextState,
   ) {
     return CupertinoSpellCheckSuggestionsToolbar.editableText(
-        editableTextState: editableTextState);
+      editableTextState: editableTextState,
+    );
   }
 
   /// {@macro flutter.widgets.undoHistory.controller}
@@ -908,11 +923,19 @@ class CupertinoRichTextField extends StatefulWidget {
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
     super.debugFillProperties(properties);
     properties.add(
-      DiagnosticsProperty<RichTextEditingController>('controller', controller,
-          defaultValue: null),
+      DiagnosticsProperty<RichTextEditingController>(
+        'controller',
+        controller,
+        defaultValue: null,
+      ),
+    );
+    properties.add(
+      DiagnosticsProperty<FocusNode>(
+        'focusNode',
+        focusNode,
+        defaultValue: null,
+      ),
     );
-    properties.add(DiagnosticsProperty<FocusNode>('focusNode', focusNode,
-        defaultValue: null));
     properties.add(
       DiagnosticsProperty<UndoHistoryController>(
         'undoController',
@@ -920,25 +943,37 @@ class CupertinoRichTextField extends StatefulWidget {
         defaultValue: null,
       ),
     );
-    properties
-        .add(DiagnosticsProperty<BoxDecoration>('decoration', decoration));
+    properties.add(
+      DiagnosticsProperty<BoxDecoration>('decoration', decoration),
+    );
     properties.add(DiagnosticsProperty<EdgeInsetsGeometry>('padding', padding));
     properties.add(StringProperty('placeholder', placeholder));
     properties.add(
-        DiagnosticsProperty<TextStyle>('placeholderStyle', placeholderStyle));
-    properties.add(
-      DiagnosticsProperty<OverlayVisibilityMode>(
-          'prefix', prefix == null ? null : prefixMode),
+      DiagnosticsProperty<TextStyle>('placeholderStyle', placeholderStyle),
     );
     properties.add(
       DiagnosticsProperty<OverlayVisibilityMode>(
-          'suffix', suffix == null ? null : suffixMode),
+        'prefix',
+        prefix == null ? null : prefixMode,
+      ),
+    );
+    properties.add(
+      DiagnosticsProperty<OverlayVisibilityMode>(
+        'suffix',
+        suffix == null ? null : suffixMode,
+      ),
+    );
+    properties.add(
+      DiagnosticsProperty<OverlayVisibilityMode>(
+        'clearButtonMode',
+        clearButtonMode,
+      ),
     );
-    properties.add(DiagnosticsProperty<OverlayVisibilityMode>(
-        'clearButtonMode', clearButtonMode));
     properties.add(
       DiagnosticsProperty<String>(
-          'clearButtonSemanticLabel', clearButtonSemanticLabel),
+        'clearButtonSemanticLabel',
+        clearButtonSemanticLabel,
+      ),
     );
     properties.add(
       DiagnosticsProperty<TextInputType>(
@@ -948,41 +983,58 @@ class CupertinoRichTextField extends StatefulWidget {
       ),
     );
     properties.add(
-        DiagnosticsProperty<TextStyle>('style', style, defaultValue: null));
-    properties.add(
-        DiagnosticsProperty<bool>('autofocus', autofocus, defaultValue: false));
-    properties.add(
-      DiagnosticsProperty<String>('obscuringCharacter', obscuringCharacter,
-          defaultValue: '•'),
+      DiagnosticsProperty<TextStyle>('style', style, defaultValue: null),
+    );
+    properties.add(
+      DiagnosticsProperty<bool>('autofocus', autofocus, defaultValue: false),
+    );
+    properties.add(
+      DiagnosticsProperty<String>(
+        'obscuringCharacter',
+        obscuringCharacter,
+        defaultValue: '•',
+      ),
+    );
+    properties.add(
+      DiagnosticsProperty<bool>(
+        'obscureText',
+        obscureText,
+        defaultValue: false,
+      ),
+    );
+    properties.add(
+      DiagnosticsProperty<bool>('autocorrect', autocorrect, defaultValue: true),
     );
-    properties.add(DiagnosticsProperty<bool>('obscureText', obscureText,
-        defaultValue: false));
-    properties.add(DiagnosticsProperty<bool>('autocorrect', autocorrect,
-        defaultValue: true));
     properties.add(
       EnumProperty<SmartDashesType>(
         'smartDashesType',
         smartDashesType,
-        defaultValue:
-            obscureText ? SmartDashesType.disabled : SmartDashesType.enabled,
+        defaultValue: obscureText
+            ? SmartDashesType.disabled
+            : SmartDashesType.enabled,
       ),
     );
     properties.add(
       EnumProperty<SmartQuotesType>(
         'smartQuotesType',
         smartQuotesType,
-        defaultValue:
-            obscureText ? SmartQuotesType.disabled : SmartQuotesType.enabled,
+        defaultValue: obscureText
+            ? SmartQuotesType.disabled
+            : SmartQuotesType.enabled,
       ),
     );
     properties.add(
-      DiagnosticsProperty<bool>('enableSuggestions', enableSuggestions,
-          defaultValue: true),
+      DiagnosticsProperty<bool>(
+        'enableSuggestions',
+        enableSuggestions,
+        defaultValue: true,
+      ),
     );
     properties.add(IntProperty('maxLines', maxLines, defaultValue: 1));
     properties.add(IntProperty('minLines', minLines, defaultValue: null));
     properties.add(
-        DiagnosticsProperty<bool>('expands', expands, defaultValue: false));
+      DiagnosticsProperty<bool>('expands', expands, defaultValue: false),
+    );
     properties.add(IntProperty('maxLength', maxLength, defaultValue: null));
     properties.add(
       EnumProperty<MaxLengthEnforcement>(
@@ -991,18 +1043,33 @@ class CupertinoRichTextField extends StatefulWidget {
         defaultValue: null,
       ),
     );
-    properties
-        .add(DoubleProperty('cursorWidth', cursorWidth, defaultValue: 2.0));
-    properties
-        .add(DoubleProperty('cursorHeight', cursorHeight, defaultValue: null));
-    properties.add(DiagnosticsProperty<Radius>('cursorRadius', cursorRadius,
-        defaultValue: null));
     properties.add(
-      DiagnosticsProperty<bool>('cursorOpacityAnimates', cursorOpacityAnimates,
-          defaultValue: true),
+      DoubleProperty('cursorWidth', cursorWidth, defaultValue: 2.0),
+    );
+    properties.add(
+      DoubleProperty('cursorHeight', cursorHeight, defaultValue: null),
+    );
+    properties.add(
+      DiagnosticsProperty<Radius>(
+        'cursorRadius',
+        cursorRadius,
+        defaultValue: null,
+      ),
+    );
+    properties.add(
+      DiagnosticsProperty<bool>(
+        'cursorOpacityAnimates',
+        cursorOpacityAnimates,
+        defaultValue: true,
+      ),
+    );
+    properties.add(
+      createCupertinoColorProperty(
+        'cursorColor',
+        cursorColor,
+        defaultValue: null,
+      ),
     );
-    properties.add(createCupertinoColorProperty('cursorColor', cursorColor,
-        defaultValue: null));
     properties.add(
       FlagProperty(
         'selectionEnabled',
@@ -1026,11 +1093,19 @@ class CupertinoRichTextField extends StatefulWidget {
       ),
     );
     properties.add(
-      DiagnosticsProperty<ScrollPhysics>('scrollPhysics', scrollPhysics,
-          defaultValue: null),
+      DiagnosticsProperty<ScrollPhysics>(
+        'scrollPhysics',
+        scrollPhysics,
+        defaultValue: null,
+      ),
+    );
+    properties.add(
+      EnumProperty<TextAlign>(
+        'textAlign',
+        textAlign,
+        defaultValue: TextAlign.start,
+      ),
     );
-    properties.add(EnumProperty<TextAlign>('textAlign', textAlign,
-        defaultValue: TextAlign.start));
     properties.add(
       DiagnosticsProperty<TextAlignVertical>(
         'textAlignVertical',
@@ -1038,15 +1113,26 @@ class CupertinoRichTextField extends StatefulWidget {
         defaultValue: null,
       ),
     );
-    properties.add(EnumProperty<TextDirection>('textDirection', textDirection,
-        defaultValue: null));
     properties.add(
-      DiagnosticsProperty<Clip>('clipBehavior', clipBehavior,
-          defaultValue: Clip.hardEdge),
+      EnumProperty<TextDirection>(
+        'textDirection',
+        textDirection,
+        defaultValue: null,
+      ),
     );
     properties.add(
-      DiagnosticsProperty<bool>('scribbleEnabled', scribbleEnabled,
-          defaultValue: true),
+      DiagnosticsProperty<Clip>(
+        'clipBehavior',
+        clipBehavior,
+        defaultValue: Clip.hardEdge,
+      ),
+    );
+    properties.add(
+      DiagnosticsProperty<bool>(
+        'scribbleEnabled',
+        scribbleEnabled,
+        defaultValue: true,
+      ),
     );
     properties.add(
       DiagnosticsProperty<bool>(
@@ -1082,24 +1168,27 @@ class CupertinoRichTextField extends StatefulWidget {
 
   static final TextMagnifierConfiguration _iosMagnifierConfiguration =
       TextMagnifierConfiguration(
-    magnifierBuilder: (
-      BuildContext context,
-      MagnifierController controller,
-      ValueNotifier<MagnifierInfo> magnifierInfo,
-    ) {
-      switch (defaultTargetPlatform) {
-        case TargetPlatform.android:
-        case TargetPlatform.iOS:
-          return CupertinoTextMagnifier(
-              controller: controller, magnifierInfo: magnifierInfo);
-        case TargetPlatform.fuchsia:
-        case TargetPlatform.linux:
-        case TargetPlatform.macOS:
-        case TargetPlatform.windows:
-          return null;
-      }
-    },
-  );
+        magnifierBuilder:
+            (
+              BuildContext context,
+              MagnifierController controller,
+              ValueNotifier<MagnifierInfo> magnifierInfo,
+            ) {
+              switch (defaultTargetPlatform) {
+                case TargetPlatform.android:
+                case TargetPlatform.iOS:
+                  return CupertinoTextMagnifier(
+                    controller: controller,
+                    magnifierInfo: magnifierInfo,
+                  );
+                case TargetPlatform.fuchsia:
+                case TargetPlatform.linux:
+                case TargetPlatform.macOS:
+                case TargetPlatform.windows:
+                  return null;
+              }
+            },
+      );
 
   /// Returns a new [SpellCheckConfiguration] where the given configuration has
   /// had any missing values replaced with their defaults for the iOS platform.
@@ -1112,13 +1201,15 @@ class CupertinoRichTextField extends StatefulWidget {
     }
 
     return configuration.copyWith(
-      misspelledTextStyle: configuration.misspelledTextStyle ??
+      misspelledTextStyle:
+          configuration.misspelledTextStyle ??
           CupertinoRichTextField.cupertinoMisspelledTextStyle,
-      misspelledSelectionColor: configuration.misspelledSelectionColor ??
+      misspelledSelectionColor:
+          configuration.misspelledSelectionColor ??
           CupertinoRichTextField.kMisspelledSelectionColor,
       spellCheckSuggestionsToolbarBuilder:
           configuration.spellCheckSuggestionsToolbarBuilder ??
-              CupertinoRichTextField.defaultSpellCheckSuggestionsToolbarBuilder,
+          CupertinoRichTextField.defaultSpellCheckSuggestionsToolbarBuilder,
     );
   }
 }
@@ -1143,7 +1234,7 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
   bool _showSelectionHandles = false;
 
   late _CupertinoTextFieldSelectionGestureDetectorBuilder
-      _selectionGestureDetectorBuilder;
+  _selectionGestureDetectorBuilder;
 
   // API for TextSelectionGestureDetectorBuilderDelegate.
   @override
@@ -1162,8 +1253,8 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
     super.initState();
     _selectionGestureDetectorBuilder =
         _CupertinoTextFieldSelectionGestureDetectorBuilder(
-      state: this,
-    );
+          state: this,
+        );
     // if (widget.controller == null) {
     //   _createLocalController();
     // }
@@ -1264,7 +1355,9 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
   }
 
   void _handleSelectionChanged(
-      TextSelection selection, SelectionChangedCause? cause) {
+    TextSelection selection,
+    SelectionChangedCause? cause,
+  ) {
     final bool willShowSelectionHandles = _shouldShowSelectionHandles(cause);
     if (willShowSelectionHandles != _showSelectionHandles) {
       setState(() {
@@ -1343,7 +1436,8 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
   }
 
   Widget _buildClearButton() {
-    final String clearLabel = widget.clearButtonSemanticLabel ??
+    final String clearLabel =
+        widget.clearButtonSemanticLabel ??
         CupertinoLocalizations.of(context).clearButtonLabel;
 
     return Semantics(
@@ -1410,8 +1504,11 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
                 ),
               );
 
-        final Widget? prefixWidget = _shouldShowAttachment(
-                attachment: widget.prefixMode, hasText: hasText)
+        final Widget? prefixWidget =
+            _shouldShowAttachment(
+              attachment: widget.prefixMode,
+              hasText: hasText,
+            )
             ? widget.prefix
             : null;
 
@@ -1424,8 +1521,10 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
           attachment: widget.clearButtonMode,
           hasText: hasText,
         );
-        final Widget? suffixWidget =
-            switch ((showUserSuffix, showClearButton)) {
+        final Widget? suffixWidget = switch ((
+          showUserSuffix,
+          showClearButton,
+        )) {
           (false, false) => null,
           (true, false) => widget.suffix,
           (true, true) => widget.suffix ?? _buildClearButton(),
@@ -1447,10 +1546,7 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
                 // See also https://github.com/flutter/flutter/issues/13715.
                 alignment: AlignmentDirectional.center,
                 textDirection: widget.textDirection,
-                children: <Widget>[
-                  ?placeholder,
-                  editableText
-                ],
+                children: <Widget>[?placeholder, editableText],
               ),
             ),
             ?suffixWidget,
@@ -1470,8 +1566,9 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
 
   @override
   TextInputConfiguration get textInputConfiguration {
-    final List<String>? autofillHints =
-        widget.autofillHints?.toList(growable: false);
+    final List<String>? autofillHints = widget.autofillHints?.toList(
+      growable: false,
+    );
     final AutofillConfiguration autofillConfiguration = autofillHints != null
         ? AutofillConfiguration(
             uniqueIdentifier: autofillId,
@@ -1535,35 +1632,44 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
     final TextStyle? resolvedStyle = widget.style?.copyWith(
       color: CupertinoDynamicColor.maybeResolve(widget.style?.color, context),
       backgroundColor: CupertinoDynamicColor.maybeResolve(
-          widget.style?.backgroundColor, context),
-    );
-
-    final TextStyle textStyle =
-        themeData.textTheme.textStyle.merge(resolvedStyle);
-
-    final TextStyle? resolvedPlaceholderStyle =
-        widget.placeholderStyle?.copyWith(
-      color: CupertinoDynamicColor.maybeResolve(
-          widget.placeholderStyle?.color, context),
-      backgroundColor: CupertinoDynamicColor.maybeResolve(
-        widget.placeholderStyle?.backgroundColor,
+        widget.style?.backgroundColor,
         context,
       ),
     );
 
-    final TextStyle placeholderStyle =
-        textStyle.merge(resolvedPlaceholderStyle);
+    final TextStyle textStyle = themeData.textTheme.textStyle.merge(
+      resolvedStyle,
+    );
+
+    final TextStyle? resolvedPlaceholderStyle = widget.placeholderStyle
+        ?.copyWith(
+          color: CupertinoDynamicColor.maybeResolve(
+            widget.placeholderStyle?.color,
+            context,
+          ),
+          backgroundColor: CupertinoDynamicColor.maybeResolve(
+            widget.placeholderStyle?.backgroundColor,
+            context,
+          ),
+        );
+
+    final TextStyle placeholderStyle = textStyle.merge(
+      resolvedPlaceholderStyle,
+    );
 
     final Brightness keyboardAppearance =
         widget.keyboardAppearance ?? CupertinoTheme.brightnessOf(context);
-    final Color cursorColor = CupertinoDynamicColor.maybeResolve(
+    final Color cursorColor =
+        CupertinoDynamicColor.maybeResolve(
           widget.cursorColor ?? DefaultSelectionStyle.of(context).cursorColor,
           context,
         ) ??
         themeData.primaryColor;
 
-    final Color disabledColor =
-        CupertinoDynamicColor.resolve(_kDisabledBackground, context);
+    final Color disabledColor = CupertinoDynamicColor.resolve(
+      _kDisabledBackground,
+      context,
+    );
 
     final Color? decorationColor = CupertinoDynamicColor.maybeResolve(
       widget.decoration?.color,
@@ -1577,7 +1683,8 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
         return side == BorderSide.none
             ? side
             : side.copyWith(
-                color: CupertinoDynamicColor.resolve(side.color, context));
+                color: CupertinoDynamicColor.resolve(side.color, context),
+              );
       }
 
       resolvedBorder = border.runtimeType != Border
@@ -1596,11 +1703,12 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
       color: enabled
           ? decorationColor
           : (widget.decoration == _kDefaultRoundedBorderDecoration
-              ? disabledColor
-              : widget.decoration?.color),
+                ? disabledColor
+                : widget.decoration?.color),
     );
 
-    final Color selectionColor = CupertinoDynamicColor.maybeResolve(
+    final Color selectionColor =
+        CupertinoDynamicColor.maybeResolve(
           DefaultSelectionStyle.of(context).selectionColor,
           context,
         ) ??
@@ -1611,7 +1719,8 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
     // unless a custom style is specified.
     final SpellCheckConfiguration spellCheckConfiguration =
         CupertinoRichTextField.inferIOSSpellCheckConfiguration(
-            widget.spellCheckConfiguration);
+          widget.spellCheckConfiguration,
+        );
 
     final Widget paddedEditable = Padding(
       padding: widget.padding,
@@ -1644,13 +1753,16 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
             maxLines: widget.maxLines,
             minLines: widget.minLines,
             expands: widget.expands,
-            magnifierConfiguration: widget.magnifierConfiguration ??
+            magnifierConfiguration:
+                widget.magnifierConfiguration ??
                 CupertinoRichTextField._iosMagnifierConfiguration,
             // Only show the selection highlight when the text field is focused.
-            selectionColor:
-                _effectiveFocusNode.hasFocus ? selectionColor : null,
-            selectionControls:
-                widget.selectionEnabled ? textSelectionControls : null,
+            selectionColor: _effectiveFocusNode.hasFocus
+                ? selectionColor
+                : null,
+            selectionControls: widget.selectionEnabled
+                ? textSelectionControls
+                : null,
             groupId: widget.groupId,
             onChanged: widget.onChanged,
             onSelectionChanged: _handleSelectionChanged,
@@ -1699,8 +1811,9 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
           ? null
           : () {
               if (!controller.selection.isValid) {
-                controller.selection =
-                    TextSelection.collapsed(offset: controller.text.length);
+                controller.selection = TextSelection.collapsed(
+                  offset: controller.text.length,
+                );
               }
               _requestKeyboard();
             },
@@ -1741,8 +1854,9 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
           ignoring: !enabled,
           child: Container(
             decoration: effectiveDecoration,
-            color:
-                !enabled && effectiveDecoration == null ? disabledColor : null,
+            color: !enabled && effectiveDecoration == null
+                ? disabledColor
+                : null,
             child: _selectionGestureDetectorBuilder.buildGestureDetector(
               behavior: HitTestBehavior.translucent,
               child: Align(
@@ -1750,7 +1864,10 @@ class _CupertinoRichTextFieldState extends State<CupertinoRichTextField>
                 widthFactor: 1.0,
                 heightFactor: 1.0,
                 child: _addTextDependentAttachments(
-                    paddedEditable, textStyle, placeholderStyle),
+                  paddedEditable,
+                  textStyle,
+                  placeholderStyle,
+                ),
               ),
             ),
           ),
diff --git a/lib/common/widgets/text_field/editable.dart b/lib/common/widgets/text_field/editable.dart
index 5751522a1..4e3af69e4 100644
--- a/lib/common/widgets/text_field/editable.dart
+++ b/lib/common/widgets/text_field/editable.dart
@@ -7,7 +7,8 @@ library;
 
 import 'dart:collection';
 import 'dart:math' as math;
-import 'dart:ui' as ui
+import 'dart:ui'
+    as ui
     show
         BoxHeightStyle,
         BoxWidthStyle,
@@ -122,8 +123,8 @@ class VerticalCaretMovementRun implements Iterator<TextPosition> {
     if (!_isValid) {
       return false;
     }
-    final List<ui.LineMetrics> newLineMetrics =
-        _editable._textPainter.computeLineMetrics();
+    final List<ui.LineMetrics> newLineMetrics = _editable._textPainter
+        .computeLineMetrics();
     // Use the implementation detail of the computeLineMetrics method to figure
     // out if the current text layout has been invalidated.
     if (!identical(newLineMetrics, _lineMetrics)) {
@@ -149,8 +150,8 @@ class VerticalCaretMovementRun implements Iterator<TextPosition> {
       _currentOffset.dx,
       _lineMetrics[lineNumber].baseline,
     );
-    final TextPosition closestPosition =
-        _editable._textPainter.getPositionForOffset(newOffset);
+    final TextPosition closestPosition = _editable._textPainter
+        .getPositionForOffset(newOffset);
     final MapEntry<Offset, TextPosition> position =
         MapEntry<Offset, TextPosition>(newOffset, closestPosition);
     _positionCache[lineNumber] = position;
@@ -305,56 +306,56 @@ class RenderEditable extends RenderBox
     RenderEditablePainter? foregroundPainter,
     List<RenderBox>? children,
     required this.controller,
-  })  : assert(maxLines == null || maxLines > 0),
-        assert(minLines == null || minLines > 0),
-        assert(
-          (maxLines == null) || (minLines == null) || (maxLines >= minLines),
-          "minLines can't be greater than maxLines",
-        ),
-        assert(
-          !expands || (maxLines == null && minLines == null),
-          'minLines and maxLines must be null when expands is true.',
-        ),
-        assert(
-          identical(textScaler, TextScaler.noScaling) || textScaleFactor == 1.0,
-          'textScaleFactor is deprecated and cannot be specified when textScaler is specified.',
-        ),
-        assert(obscuringCharacter.characters.length == 1),
-        assert(cursorWidth >= 0.0),
-        assert(cursorHeight == null || cursorHeight >= 0.0),
-        _textPainter = TextPainter(
-          text: text,
-          textAlign: textAlign,
-          textDirection: textDirection,
-          textScaler: textScaler == TextScaler.noScaling
-              ? TextScaler.linear(textScaleFactor)
-              : textScaler,
-          locale: locale,
-          maxLines: maxLines == 1 ? 1 : null,
-          strutStyle: strutStyle,
-          textHeightBehavior: textHeightBehavior,
-          textWidthBasis: textWidthBasis,
-        ),
-        _showCursor = showCursor ?? ValueNotifier<bool>(false),
-        _maxLines = maxLines,
-        _minLines = minLines,
-        _expands = expands,
-        _selection = selection,
-        _offset = offset,
-        _cursorWidth = cursorWidth,
-        _cursorHeight = cursorHeight,
-        _paintCursorOnTop = paintCursorAboveText,
-        _enableInteractiveSelection = enableInteractiveSelection,
-        _devicePixelRatio = devicePixelRatio,
-        _startHandleLayerLink = startHandleLayerLink,
-        _endHandleLayerLink = endHandleLayerLink,
-        _obscuringCharacter = obscuringCharacter,
-        _obscureText = obscureText,
-        _readOnly = readOnly,
-        _forceLine = forceLine,
-        _clipBehavior = clipBehavior,
-        _hasFocus = hasFocus ?? false,
-        _disposeShowCursor = showCursor == null {
+  }) : assert(maxLines == null || maxLines > 0),
+       assert(minLines == null || minLines > 0),
+       assert(
+         (maxLines == null) || (minLines == null) || (maxLines >= minLines),
+         "minLines can't be greater than maxLines",
+       ),
+       assert(
+         !expands || (maxLines == null && minLines == null),
+         'minLines and maxLines must be null when expands is true.',
+       ),
+       assert(
+         identical(textScaler, TextScaler.noScaling) || textScaleFactor == 1.0,
+         'textScaleFactor is deprecated and cannot be specified when textScaler is specified.',
+       ),
+       assert(obscuringCharacter.characters.length == 1),
+       assert(cursorWidth >= 0.0),
+       assert(cursorHeight == null || cursorHeight >= 0.0),
+       _textPainter = TextPainter(
+         text: text,
+         textAlign: textAlign,
+         textDirection: textDirection,
+         textScaler: textScaler == TextScaler.noScaling
+             ? TextScaler.linear(textScaleFactor)
+             : textScaler,
+         locale: locale,
+         maxLines: maxLines == 1 ? 1 : null,
+         strutStyle: strutStyle,
+         textHeightBehavior: textHeightBehavior,
+         textWidthBasis: textWidthBasis,
+       ),
+       _showCursor = showCursor ?? ValueNotifier<bool>(false),
+       _maxLines = maxLines,
+       _minLines = minLines,
+       _expands = expands,
+       _selection = selection,
+       _offset = offset,
+       _cursorWidth = cursorWidth,
+       _cursorHeight = cursorHeight,
+       _paintCursorOnTop = paintCursorAboveText,
+       _enableInteractiveSelection = enableInteractiveSelection,
+       _devicePixelRatio = devicePixelRatio,
+       _startHandleLayerLink = startHandleLayerLink,
+       _endHandleLayerLink = endHandleLayerLink,
+       _obscuringCharacter = obscuringCharacter,
+       _obscureText = obscureText,
+       _readOnly = readOnly,
+       _forceLine = forceLine,
+       _clipBehavior = clipBehavior,
+       _hasFocus = hasFocus ?? false,
+       _disposeShowCursor = showCursor == null {
     assert(!_showCursor.value || cursorColor != null);
 
     _selectionPainter.highlightColor = selectionColor;
@@ -1503,15 +1504,15 @@ class RenderEditable extends RenderBox
         switch (info.recognizer) {
           case TapGestureRecognizer(onTap: final VoidCallback? handler):
           case DoubleTapGestureRecognizer(
-              onDoubleTap: final VoidCallback? handler,
-            ):
+            onDoubleTap: final VoidCallback? handler,
+          ):
             if (handler != null) {
               configuration.onTap = handler;
               configuration.isLink = true;
             }
           case LongPressGestureRecognizer(
-              onLongPress: final GestureLongPressCallback? onLongPress,
-            ):
+            onLongPress: final GestureLongPressCallback? onLongPress,
+          ):
             if (onLongPress != null) {
               configuration.onLongPress = onLongPress;
             }
@@ -1570,8 +1571,9 @@ class RenderEditable extends RenderBox
     if (extentOffset == null) {
       return;
     }
-    final int baseOffset =
-        !extendSelection ? extentOffset : selection!.baseOffset;
+    final int baseOffset = !extendSelection
+        ? extentOffset
+        : selection!.baseOffset;
     _setSelection(
       TextSelection(baseOffset: baseOffset, extentOffset: extentOffset),
       SelectionChangedCause.keyboard,
@@ -1586,8 +1588,9 @@ class RenderEditable extends RenderBox
     if (extentOffset == null) {
       return;
     }
-    final int baseOffset =
-        !extendSelection ? extentOffset : selection!.baseOffset;
+    final int baseOffset = !extendSelection
+        ? extentOffset
+        : selection!.baseOffset;
     _setSelection(
       TextSelection(baseOffset: baseOffset, extentOffset: extentOffset),
       SelectionChangedCause.keyboard,
@@ -1603,8 +1606,9 @@ class RenderEditable extends RenderBox
     if (nextWord == null) {
       return;
     }
-    final int baseOffset =
-        extendSelection ? selection!.baseOffset : nextWord.start;
+    final int baseOffset = extendSelection
+        ? selection!.baseOffset
+        : nextWord.start;
     _setSelection(
       TextSelection(baseOffset: baseOffset, extentOffset: nextWord.start),
       SelectionChangedCause.keyboard,
@@ -1620,8 +1624,9 @@ class RenderEditable extends RenderBox
     if (previousWord == null) {
       return;
     }
-    final int baseOffset =
-        extendSelection ? selection!.baseOffset : previousWord.start;
+    final int baseOffset = extendSelection
+        ? selection!.baseOffset
+        : previousWord.start;
     _setSelection(
       TextSelection(baseOffset: baseOffset, extentOffset: previousWord.start),
       SelectionChangedCause.keyboard,
@@ -1733,9 +1738,9 @@ class RenderEditable extends RenderBox
   Axis get _viewportAxis => _isMultiline ? Axis.vertical : Axis.horizontal;
 
   Offset get _paintOffset => switch (_viewportAxis) {
-        Axis.horizontal => Offset(-offset.pixels, 0.0),
-        Axis.vertical => Offset(0.0, -offset.pixels),
-      };
+    Axis.horizontal => Offset(-offset.pixels, 0.0),
+    Axis.vertical => Offset(0.0, -offset.pixels),
+  };
 
   double get _viewportExtent {
     assert(hasSize);
@@ -1792,12 +1797,14 @@ class RenderEditable extends RenderBox
           Offset(0.0, preferredLineHeight) + caretOffset + paintOffset;
       return <TextSelectionPoint>[TextSelectionPoint(start, null)];
     } else {
-      final Offset start = Offset(
+      final Offset start =
+          Offset(
             clampDouble(boxes.first.start, 0, _textPainter.size.width),
             boxes.first.bottom,
           ) +
           paintOffset;
-      final Offset end = Offset(
+      final Offset end =
+          Offset(
             clampDouble(boxes.last.end, 0, _textPainter.size.width),
             boxes.last.bottom,
           ) +
@@ -1925,11 +1932,11 @@ class RenderEditable extends RenderBox
   double computeMinIntrinsicWidth(double height) {
     final List<PlaceholderDimensions> placeholderDimensions =
         layoutInlineChildren(
-      double.infinity,
-      (RenderBox child, BoxConstraints constraints) =>
-          Size(child.getMinIntrinsicWidth(double.infinity), 0.0),
-      ChildLayoutHelper.getDryBaseline,
-    );
+          double.infinity,
+          (RenderBox child, BoxConstraints constraints) =>
+              Size(child.getMinIntrinsicWidth(double.infinity), 0.0),
+          ChildLayoutHelper.getDryBaseline,
+        );
     final (double minWidth, double maxWidth) = _adjustConstraints();
     return (_textIntrinsics
           ..setPlaceholderDimensions(placeholderDimensions)
@@ -1939,8 +1946,8 @@ class RenderEditable extends RenderBox
 
   @override
   double computeMaxIntrinsicWidth(double height) {
-    final List<PlaceholderDimensions> placeholderDimensions =
-        layoutInlineChildren(
+    final List<PlaceholderDimensions>
+    placeholderDimensions = layoutInlineChildren(
       double.infinity,
       // Height and baseline is irrelevant as all text will be laid
       // out in a single line. Therefore, using 0.0 as a dummy for the height.
@@ -1996,9 +2003,9 @@ class RenderEditable extends RenderBox
         final (double minWidth, double maxWidth) = _adjustConstraints(
           maxWidth: width,
         );
-        estimatedHeight = (_textIntrinsics
-              ..layout(minWidth: minWidth, maxWidth: maxWidth))
-            .height;
+        estimatedHeight =
+            (_textIntrinsics..layout(minWidth: minWidth, maxWidth: maxWidth))
+                .height;
       }
       return math.max(estimatedHeight, minHeight);
     }
@@ -2067,7 +2074,8 @@ class RenderEditable extends RenderBox
     // text justification, as graphemeClusterLayoutBounds.width is the advance
     // width to the next character, so there's no gap between their
     // graphemeClusterLayoutBounds rects.
-    final InlineSpan? spanHit = glyph != null &&
+    final InlineSpan? spanHit =
+        glyph != null &&
             glyph.graphemeClusterLayoutBounds.contains(effectivePosition)
         ? _textPainter.text!.getSpanForPosition(
             TextPosition(offset: glyph.graphemeClusterCodeUnitRange.start),
@@ -2264,15 +2272,18 @@ class RenderEditable extends RenderBox
         : _textPainter.getPositionForOffset(
             globalToLocal(to) - _paintOffset,
           );
-    final TextSelection toWord =
-        toPosition == fromPosition ? fromWord : getWordAtOffset(toPosition);
+    final TextSelection toWord = toPosition == fromPosition
+        ? fromWord
+        : getWordAtOffset(toPosition);
     final bool isFromWordBeforeToWord = fromWord.start < toWord.end;
 
     // bggRGjQaUbCoE longpress
-    var startOffset =
-        isFromWordBeforeToWord ? fromWord.baseOffset : toWord.baseOffset;
-    var endOffset =
-        isFromWordBeforeToWord ? toWord.extentOffset : fromWord.extentOffset;
+    var startOffset = isFromWordBeforeToWord
+        ? fromWord.baseOffset
+        : toWord.baseOffset;
+    var endOffset = isFromWordBeforeToWord
+        ? toWord.extentOffset
+        : fromWord.extentOffset;
     final newOffset = controller.longPressOffset(startOffset, endOffset);
     startOffset = newOffset.startOffset;
     endOffset = newOffset.endOffset;
@@ -2479,11 +2490,11 @@ class RenderEditable extends RenderBox
     return Offset(
       globalOffset.dx.isFinite
           ? (globalOffset.dx / pixelMultiple).round() * pixelMultiple -
-              globalOffset.dx
+                globalOffset.dx
           : 0,
       globalOffset.dy.isFinite
           ? (globalOffset.dy / pixelMultiple).round() * pixelMultiple -
-              globalOffset.dy
+                globalOffset.dy
           : 0,
     );
   }
@@ -2560,15 +2571,15 @@ class RenderEditable extends RenderBox
     assert(maxLines != 1 || _textPainter.maxLines == 1);
     final double preferredHeight = switch (maxLines) {
       null => math.max(
-          _textPainter.height,
-          preferredLineHeight * (minLines ?? 0),
-        ),
+        _textPainter.height,
+        preferredLineHeight * (minLines ?? 0),
+      ),
       1 => _textPainter.height,
       final int maxLines => clampDouble(
-          _textPainter.height,
-          preferredLineHeight * (minLines ?? maxLines),
-          preferredLineHeight * maxLines,
-        ),
+        _textPainter.height,
+        preferredLineHeight * (minLines ?? maxLines),
+        preferredLineHeight * maxLines,
+      ),
     };
 
     size = Size(width, constraints.constrainHeight(preferredHeight));
@@ -2628,11 +2639,13 @@ class RenderEditable extends RenderBox
   }) {
     Offset deltaPosition = Offset.zero;
     final double topBound = -floatingCursorAddedMargin.top;
-    final double bottomBound = math.min(size.height, _textPainter.height) -
+    final double bottomBound =
+        math.min(size.height, _textPainter.height) -
         preferredLineHeight +
         floatingCursorAddedMargin.bottom;
     final double leftBound = -floatingCursorAddedMargin.left;
-    final double rightBound = math.min(size.width, _textPainter.width) +
+    final double rightBound =
+        math.min(size.width, _textPainter.width) +
         floatingCursorAddedMargin.right;
     final Rect boundingRects = Rect.fromLTRB(
       leftBound,
@@ -2739,8 +2752,9 @@ class RenderEditable extends RenderBox
               animationValue,
             )!
           : _kFloatingCursorSizeIncrease;
-      _caretPainter.floatingCursorRect =
-          sizeAdjustment.inflateRect(_caretPrototype).shift(boundedOffset);
+      _caretPainter.floatingCursorRect = sizeAdjustment
+          .inflateRect(_caretPrototype)
+          .shift(boundedOffset);
     } else {
       _caretPainter.floatingCursorRect = null;
     }
@@ -2957,8 +2971,8 @@ class RenderEditable extends RenderBox
 
 class _RenderEditableCustomPaint extends RenderBox {
   _RenderEditableCustomPaint({RenderEditablePainter? painter})
-      : _painter = painter,
-        super();
+    : _painter = painter,
+      super();
 
   @override
   RenderEditable? get parent => super.parent as RenderEditable?;
@@ -3070,8 +3084,8 @@ abstract class RenderEditablePainter extends ChangeNotifier {
 
 class _TextHighlightPainter extends RenderEditablePainter {
   _TextHighlightPainter({TextRange? highlightedRange, Color? highlightColor})
-      : _highlightedRange = highlightedRange,
-        _highlightColor = highlightColor;
+    : _highlightedRange = highlightedRange,
+      _highlightColor = highlightColor;
 
   final Paint highlightPaint = Paint();
 
@@ -3139,7 +3153,10 @@ class _TextHighlightPainter extends RenderEditablePainter {
 
     for (final TextBox box in boxes) {
       canvas.drawRect(
-        box.toRect().shift(renderEditable._paintOffset).intersect(
+        box
+            .toRect()
+            .shift(renderEditable._paintOffset)
+            .intersect(
               Rect.fromLTWH(0, 0, textPainter.width, textPainter.height),
             ),
         highlightPaint,
@@ -3282,8 +3299,8 @@ class _CaretPainter extends RenderEditablePainter {
     final Color? caretColor = floatingCursorRect == null
         ? this.caretColor
         : showRegularCaret
-            ? backgroundCursorColor
-            : null;
+        ? backgroundCursorColor
+        : null;
     final TextPosition caretTextPosition = floatingCursorRect == null
         ? selection.extent
         : renderEditable._floatingCursorTextPosition;
diff --git a/lib/common/widgets/text_field/editable_text.dart b/lib/common/widgets/text_field/editable_text.dart
index b4feb9731..a1951571f 100644
--- a/lib/common/widgets/text_field/editable_text.dart
+++ b/lib/common/widgets/text_field/editable_text.dart
@@ -55,8 +55,8 @@ export 'package:flutter/services.dart'
 
 /// Signature for the callback that reports when the user changes the selection
 /// (including the cursor location).
-typedef SelectionChangedCallback = void Function(
-    TextSelection selection, SelectionChangedCause? cause);
+typedef SelectionChangedCallback =
+    void Function(TextSelection selection, SelectionChangedCause? cause);
 
 /// Signature for a widget builder that builds a context menu for the given
 /// [EditableTextState].
@@ -65,13 +65,13 @@ typedef SelectionChangedCallback = void Function(
 ///
 ///  * [SelectableRegionContextMenuBuilder], which performs the same role for
 ///    [SelectableRegion].
-typedef EditableTextContextMenuBuilder = Widget Function(
-    BuildContext context, EditableTextState editableTextState);
+typedef EditableTextContextMenuBuilder =
+    Widget Function(BuildContext context, EditableTextState editableTextState);
 
 // Signature for a function that determines the target location of the given
 // [TextPosition] after applying the given [TextBoundary].
-typedef _ApplyTextBoundary = TextPosition Function(
-    TextPosition, bool, TextBoundary);
+typedef _ApplyTextBoundary =
+    TextPosition Function(TextPosition, bool, TextBoundary);
 
 // The time it takes for the cursor to fade from fully opaque to fully
 // transparent and vice versa. A full cursor blink, from transparent to opaque
@@ -83,8 +83,11 @@ const Duration _kCursorBlinkHalfPeriod = Duration(milliseconds: 500);
 const int _kObscureShowLatestCharCursorTicks = 3;
 
 class _CompositionCallback extends SingleChildRenderObjectWidget {
-  const _CompositionCallback(
-      {required this.compositeCallback, required this.enabled, super.child});
+  const _CompositionCallback({
+    required this.compositeCallback,
+    required this.enabled,
+    super.child,
+  });
   final CompositionCallback compositeCallback;
   final bool enabled;
 
@@ -95,7 +98,9 @@ class _CompositionCallback extends SingleChildRenderObjectWidget {
 
   @override
   void updateRenderObject(
-      BuildContext context, _RenderCompositionCallback renderObject) {
+    BuildContext context,
+    _RenderCompositionCallback renderObject,
+  ) {
     super.updateRenderObject(context, renderObject);
     // _EditableTextState always uses the same callback.
     assert(renderObject.compositeCallback == compositeCallback);
@@ -203,18 +208,18 @@ class _KeyFrame {
 
 class _DiscreteKeyFrameSimulation extends Simulation {
   _DiscreteKeyFrameSimulation.iOSBlinkingCaret()
-      : this._(_KeyFrame.iOSBlinkingCaretKeyFrames, 1);
+    : this._(_KeyFrame.iOSBlinkingCaretKeyFrames, 1);
   _DiscreteKeyFrameSimulation._(this._keyFrames, this.maxDuration)
-      : assert(_keyFrames.isNotEmpty),
-        assert(_keyFrames.last.time <= maxDuration),
-        assert(() {
-          for (int i = 0; i < _keyFrames.length - 1; i += 1) {
-            if (_keyFrames[i].time > _keyFrames[i + 1].time) {
-              return false;
-            }
+    : assert(_keyFrames.isNotEmpty),
+      assert(_keyFrames.last.time <= maxDuration),
+      assert(() {
+        for (int i = 0; i < _keyFrames.length - 1; i += 1) {
+          if (_keyFrames[i].time > _keyFrames[i + 1].time) {
+            return false;
           }
-          return true;
-        }(), 'The key frame sequence must be sorted by time.');
+        }
+        return true;
+      }(), 'The key frame sequence must be sorted by time.');
 
   final double maxDuration;
 
@@ -582,64 +587,68 @@ class EditableText extends StatefulWidget {
     this.spellCheckConfiguration,
     this.magnifierConfiguration = TextMagnifierConfiguration.disabled,
     this.undoController,
-  })  : assert(obscuringCharacter.length == 1),
-        smartDashesType = smartDashesType ??
-            (obscureText ? SmartDashesType.disabled : SmartDashesType.enabled),
-        smartQuotesType = smartQuotesType ??
-            (obscureText ? SmartQuotesType.disabled : SmartQuotesType.enabled),
-        assert(minLines == null || minLines > 0),
-        assert(
-          (maxLines == null) || (minLines == null) || (maxLines >= minLines),
-          "minLines can't be greater than maxLines",
-        ),
-        assert(
-          !expands || (maxLines == null && minLines == null),
-          'minLines and maxLines must be null when expands is true.',
-        ),
-        assert(!obscureText || maxLines == 1,
-            'Obscured fields cannot be multiline.'),
-        enableInteractiveSelection =
-            enableInteractiveSelection ?? (!readOnly || !obscureText),
-        toolbarOptions = selectionControls is TextSelectionHandleControls &&
-                toolbarOptions == null
-            ? ToolbarOptions.empty
-            : toolbarOptions ??
-                (obscureText
-                    ? (readOnly
-                        // No point in even offering "Select All" in a read-only obscured
-                        // field.
-                        ? ToolbarOptions.empty
-                        // Writable, but obscured.
-                        : const ToolbarOptions(selectAll: true, paste: true))
-                    : (readOnly
-                        // Read-only, not obscured.
-                        ? const ToolbarOptions(selectAll: true, copy: true)
-                        // Writable, not obscured.
-                        : const ToolbarOptions(
-                            copy: true,
-                            cut: true,
-                            selectAll: true,
-                            paste: true,
-                          ))),
-        assert(
-          spellCheckConfiguration == null ||
-              spellCheckConfiguration ==
-                  const SpellCheckConfiguration.disabled() ||
-              spellCheckConfiguration.misspelledTextStyle != null,
-          'spellCheckConfiguration must specify a misspelledTextStyle if spell check behavior is desired',
-        ),
-        _strutStyle = strutStyle,
-        keyboardType = keyboardType ??
-            _inferKeyboardType(
-                autofillHints: autofillHints, maxLines: maxLines),
-        inputFormatters = maxLines == 1
-            ? <TextInputFormatter>[
-                FilteringTextInputFormatter.singleLineFormatter,
-                ...inputFormatters ??
-                    const Iterable<TextInputFormatter>.empty(),
-              ]
-            : inputFormatters,
-        showCursor = showCursor ?? !readOnly;
+  }) : assert(obscuringCharacter.length == 1),
+       smartDashesType =
+           smartDashesType ??
+           (obscureText ? SmartDashesType.disabled : SmartDashesType.enabled),
+       smartQuotesType =
+           smartQuotesType ??
+           (obscureText ? SmartQuotesType.disabled : SmartQuotesType.enabled),
+       assert(minLines == null || minLines > 0),
+       assert(
+         (maxLines == null) || (minLines == null) || (maxLines >= minLines),
+         "minLines can't be greater than maxLines",
+       ),
+       assert(
+         !expands || (maxLines == null && minLines == null),
+         'minLines and maxLines must be null when expands is true.',
+       ),
+       assert(
+         !obscureText || maxLines == 1,
+         'Obscured fields cannot be multiline.',
+       ),
+       enableInteractiveSelection =
+           enableInteractiveSelection ?? (!readOnly || !obscureText),
+       toolbarOptions =
+           selectionControls is TextSelectionHandleControls &&
+               toolbarOptions == null
+           ? ToolbarOptions.empty
+           : toolbarOptions ??
+                 (obscureText
+                     ? (readOnly
+                           // No point in even offering "Select All" in a read-only obscured
+                           // field.
+                           ? ToolbarOptions.empty
+                           // Writable, but obscured.
+                           : const ToolbarOptions(selectAll: true, paste: true))
+                     : (readOnly
+                           // Read-only, not obscured.
+                           ? const ToolbarOptions(selectAll: true, copy: true)
+                           // Writable, not obscured.
+                           : const ToolbarOptions(
+                               copy: true,
+                               cut: true,
+                               selectAll: true,
+                               paste: true,
+                             ))),
+       assert(
+         spellCheckConfiguration == null ||
+             spellCheckConfiguration ==
+                 const SpellCheckConfiguration.disabled() ||
+             spellCheckConfiguration.misspelledTextStyle != null,
+         'spellCheckConfiguration must specify a misspelledTextStyle if spell check behavior is desired',
+       ),
+       _strutStyle = strutStyle,
+       keyboardType =
+           keyboardType ??
+           _inferKeyboardType(autofillHints: autofillHints, maxLines: maxLines),
+       inputFormatters = maxLines == 1
+           ? <TextInputFormatter>[
+               FilteringTextInputFormatter.singleLineFormatter,
+               ...inputFormatters ?? const Iterable<TextInputFormatter>.empty(),
+             ]
+           : inputFormatters,
+       showCursor = showCursor ?? !readOnly;
 
   /// Controls the text being edited.
   final RichTextEditingController controller;
@@ -1761,28 +1770,44 @@ class EditableText extends StatefulWidget {
       resultButtonItem.addAll(<ContextMenuButtonItem>[
         if (onCut != null)
           ContextMenuButtonItem(
-              onPressed: onCut, type: ContextMenuButtonType.cut),
+            onPressed: onCut,
+            type: ContextMenuButtonType.cut,
+          ),
         if (onCopy != null)
           ContextMenuButtonItem(
-              onPressed: onCopy, type: ContextMenuButtonType.copy),
+            onPressed: onCopy,
+            type: ContextMenuButtonType.copy,
+          ),
         if (onPaste != null)
           ContextMenuButtonItem(
-              onPressed: onPaste, type: ContextMenuButtonType.paste),
+            onPressed: onPaste,
+            type: ContextMenuButtonType.paste,
+          ),
         if (onShare != null && showShareBeforeSelectAll)
           ContextMenuButtonItem(
-              onPressed: onShare, type: ContextMenuButtonType.share),
+            onPressed: onShare,
+            type: ContextMenuButtonType.share,
+          ),
         if (onSelectAll != null)
           ContextMenuButtonItem(
-              onPressed: onSelectAll, type: ContextMenuButtonType.selectAll),
+            onPressed: onSelectAll,
+            type: ContextMenuButtonType.selectAll,
+          ),
         if (onLookUp != null)
           ContextMenuButtonItem(
-              onPressed: onLookUp, type: ContextMenuButtonType.lookUp),
+            onPressed: onLookUp,
+            type: ContextMenuButtonType.lookUp,
+          ),
         if (onSearchWeb != null)
           ContextMenuButtonItem(
-              onPressed: onSearchWeb, type: ContextMenuButtonType.searchWeb),
+            onPressed: onSearchWeb,
+            type: ContextMenuButtonType.searchWeb,
+          ),
         if (onShare != null && !showShareBeforeSelectAll)
           ContextMenuButtonItem(
-              onPressed: onShare, type: ContextMenuButtonType.share),
+            onPressed: onShare,
+            type: ContextMenuButtonType.share,
+          ),
       ]);
     }
 
@@ -1822,8 +1847,8 @@ class EditableText extends StatefulWidget {
       switch (defaultTargetPlatform) {
         case TargetPlatform.iOS:
         case TargetPlatform.macOS:
-          const Map<String, TextInputType> iOSKeyboardType =
-              <String, TextInputType>{
+          const Map<String, TextInputType>
+          iOSKeyboardType = <String, TextInputType>{
             AutofillHints.addressCity: TextInputType.name,
             AutofillHints.addressCityAndState:
                 TextInputType.name, // Autofill not working.
@@ -1880,74 +1905,75 @@ class EditableText extends StatefulWidget {
 
     const Map<String, TextInputType> inferKeyboardType =
         <String, TextInputType>{
-      AutofillHints.addressCity: TextInputType.streetAddress,
-      AutofillHints.addressCityAndState: TextInputType.streetAddress,
-      AutofillHints.addressState: TextInputType.streetAddress,
-      AutofillHints.birthday: TextInputType.datetime,
-      AutofillHints.birthdayDay: TextInputType.datetime,
-      AutofillHints.birthdayMonth: TextInputType.datetime,
-      AutofillHints.birthdayYear: TextInputType.datetime,
-      AutofillHints.countryCode: TextInputType.number,
-      AutofillHints.countryName: TextInputType.text,
-      AutofillHints.creditCardExpirationDate: TextInputType.datetime,
-      AutofillHints.creditCardExpirationDay: TextInputType.datetime,
-      AutofillHints.creditCardExpirationMonth: TextInputType.datetime,
-      AutofillHints.creditCardExpirationYear: TextInputType.datetime,
-      AutofillHints.creditCardFamilyName: TextInputType.name,
-      AutofillHints.creditCardGivenName: TextInputType.name,
-      AutofillHints.creditCardMiddleName: TextInputType.name,
-      AutofillHints.creditCardName: TextInputType.name,
-      AutofillHints.creditCardNumber: TextInputType.number,
-      AutofillHints.creditCardSecurityCode: TextInputType.number,
-      AutofillHints.creditCardType: TextInputType.text,
-      AutofillHints.email: TextInputType.emailAddress,
-      AutofillHints.familyName: TextInputType.name,
-      AutofillHints.fullStreetAddress: TextInputType.streetAddress,
-      AutofillHints.gender: TextInputType.text,
-      AutofillHints.givenName: TextInputType.name,
-      AutofillHints.impp: TextInputType.url,
-      AutofillHints.jobTitle: TextInputType.text,
-      AutofillHints.language: TextInputType.text,
-      AutofillHints.location: TextInputType.streetAddress,
-      AutofillHints.middleInitial: TextInputType.name,
-      AutofillHints.middleName: TextInputType.name,
-      AutofillHints.name: TextInputType.name,
-      AutofillHints.namePrefix: TextInputType.name,
-      AutofillHints.nameSuffix: TextInputType.name,
-      AutofillHints.newPassword: TextInputType.text,
-      AutofillHints.newUsername: TextInputType.text,
-      AutofillHints.nickname: TextInputType.text,
-      AutofillHints.oneTimeCode: TextInputType.text,
-      AutofillHints.organizationName: TextInputType.text,
-      AutofillHints.password: TextInputType.text,
-      AutofillHints.photo: TextInputType.text,
-      AutofillHints.postalAddress: TextInputType.streetAddress,
-      AutofillHints.postalAddressExtended: TextInputType.streetAddress,
-      AutofillHints.postalAddressExtendedPostalCode: TextInputType.number,
-      AutofillHints.postalCode: TextInputType.number,
-      AutofillHints.streetAddressLevel1: TextInputType.streetAddress,
-      AutofillHints.streetAddressLevel2: TextInputType.streetAddress,
-      AutofillHints.streetAddressLevel3: TextInputType.streetAddress,
-      AutofillHints.streetAddressLevel4: TextInputType.streetAddress,
-      AutofillHints.streetAddressLine1: TextInputType.streetAddress,
-      AutofillHints.streetAddressLine2: TextInputType.streetAddress,
-      AutofillHints.streetAddressLine3: TextInputType.streetAddress,
-      AutofillHints.sublocality: TextInputType.streetAddress,
-      AutofillHints.telephoneNumber: TextInputType.phone,
-      AutofillHints.telephoneNumberAreaCode: TextInputType.phone,
-      AutofillHints.telephoneNumberCountryCode: TextInputType.phone,
-      AutofillHints.telephoneNumberDevice: TextInputType.phone,
-      AutofillHints.telephoneNumberExtension: TextInputType.phone,
-      AutofillHints.telephoneNumberLocal: TextInputType.phone,
-      AutofillHints.telephoneNumberLocalPrefix: TextInputType.phone,
-      AutofillHints.telephoneNumberLocalSuffix: TextInputType.phone,
-      AutofillHints.telephoneNumberNational: TextInputType.phone,
-      AutofillHints.transactionAmount:
-          TextInputType.numberWithOptions(decimal: true),
-      AutofillHints.transactionCurrency: TextInputType.text,
-      AutofillHints.url: TextInputType.url,
-      AutofillHints.username: TextInputType.text,
-    };
+          AutofillHints.addressCity: TextInputType.streetAddress,
+          AutofillHints.addressCityAndState: TextInputType.streetAddress,
+          AutofillHints.addressState: TextInputType.streetAddress,
+          AutofillHints.birthday: TextInputType.datetime,
+          AutofillHints.birthdayDay: TextInputType.datetime,
+          AutofillHints.birthdayMonth: TextInputType.datetime,
+          AutofillHints.birthdayYear: TextInputType.datetime,
+          AutofillHints.countryCode: TextInputType.number,
+          AutofillHints.countryName: TextInputType.text,
+          AutofillHints.creditCardExpirationDate: TextInputType.datetime,
+          AutofillHints.creditCardExpirationDay: TextInputType.datetime,
+          AutofillHints.creditCardExpirationMonth: TextInputType.datetime,
+          AutofillHints.creditCardExpirationYear: TextInputType.datetime,
+          AutofillHints.creditCardFamilyName: TextInputType.name,
+          AutofillHints.creditCardGivenName: TextInputType.name,
+          AutofillHints.creditCardMiddleName: TextInputType.name,
+          AutofillHints.creditCardName: TextInputType.name,
+          AutofillHints.creditCardNumber: TextInputType.number,
+          AutofillHints.creditCardSecurityCode: TextInputType.number,
+          AutofillHints.creditCardType: TextInputType.text,
+          AutofillHints.email: TextInputType.emailAddress,
+          AutofillHints.familyName: TextInputType.name,
+          AutofillHints.fullStreetAddress: TextInputType.streetAddress,
+          AutofillHints.gender: TextInputType.text,
+          AutofillHints.givenName: TextInputType.name,
+          AutofillHints.impp: TextInputType.url,
+          AutofillHints.jobTitle: TextInputType.text,
+          AutofillHints.language: TextInputType.text,
+          AutofillHints.location: TextInputType.streetAddress,
+          AutofillHints.middleInitial: TextInputType.name,
+          AutofillHints.middleName: TextInputType.name,
+          AutofillHints.name: TextInputType.name,
+          AutofillHints.namePrefix: TextInputType.name,
+          AutofillHints.nameSuffix: TextInputType.name,
+          AutofillHints.newPassword: TextInputType.text,
+          AutofillHints.newUsername: TextInputType.text,
+          AutofillHints.nickname: TextInputType.text,
+          AutofillHints.oneTimeCode: TextInputType.text,
+          AutofillHints.organizationName: TextInputType.text,
+          AutofillHints.password: TextInputType.text,
+          AutofillHints.photo: TextInputType.text,
+          AutofillHints.postalAddress: TextInputType.streetAddress,
+          AutofillHints.postalAddressExtended: TextInputType.streetAddress,
+          AutofillHints.postalAddressExtendedPostalCode: TextInputType.number,
+          AutofillHints.postalCode: TextInputType.number,
+          AutofillHints.streetAddressLevel1: TextInputType.streetAddress,
+          AutofillHints.streetAddressLevel2: TextInputType.streetAddress,
+          AutofillHints.streetAddressLevel3: TextInputType.streetAddress,
+          AutofillHints.streetAddressLevel4: TextInputType.streetAddress,
+          AutofillHints.streetAddressLine1: TextInputType.streetAddress,
+          AutofillHints.streetAddressLine2: TextInputType.streetAddress,
+          AutofillHints.streetAddressLine3: TextInputType.streetAddress,
+          AutofillHints.sublocality: TextInputType.streetAddress,
+          AutofillHints.telephoneNumber: TextInputType.phone,
+          AutofillHints.telephoneNumberAreaCode: TextInputType.phone,
+          AutofillHints.telephoneNumberCountryCode: TextInputType.phone,
+          AutofillHints.telephoneNumberDevice: TextInputType.phone,
+          AutofillHints.telephoneNumberExtension: TextInputType.phone,
+          AutofillHints.telephoneNumberLocal: TextInputType.phone,
+          AutofillHints.telephoneNumberLocalPrefix: TextInputType.phone,
+          AutofillHints.telephoneNumberLocalSuffix: TextInputType.phone,
+          AutofillHints.telephoneNumberNational: TextInputType.phone,
+          AutofillHints.transactionAmount: TextInputType.numberWithOptions(
+            decimal: true,
+          ),
+          AutofillHints.transactionCurrency: TextInputType.text,
+          AutofillHints.url: TextInputType.url,
+          AutofillHints.username: TextInputType.text,
+        };
 
     return inferKeyboardType[effectiveHint] ?? TextInputType.text;
   }
@@ -1958,53 +1984,83 @@ class EditableText extends StatefulWidget {
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
     super.debugFillProperties(properties);
-    properties.add(DiagnosticsProperty<RichTextEditingController>(
-        'controller', controller));
-    properties.add(DiagnosticsProperty<FocusNode>('focusNode', focusNode));
-    properties.add(DiagnosticsProperty<bool>('obscureText', obscureText,
-        defaultValue: false));
     properties.add(
-        DiagnosticsProperty<bool>('readOnly', readOnly, defaultValue: false));
-    properties.add(DiagnosticsProperty<bool>('autocorrect', autocorrect,
-        defaultValue: true));
+      DiagnosticsProperty<RichTextEditingController>('controller', controller),
+    );
+    properties.add(DiagnosticsProperty<FocusNode>('focusNode', focusNode));
+    properties.add(
+      DiagnosticsProperty<bool>(
+        'obscureText',
+        obscureText,
+        defaultValue: false,
+      ),
+    );
+    properties.add(
+      DiagnosticsProperty<bool>('readOnly', readOnly, defaultValue: false),
+    );
+    properties.add(
+      DiagnosticsProperty<bool>('autocorrect', autocorrect, defaultValue: true),
+    );
     properties.add(
       EnumProperty<SmartDashesType>(
         'smartDashesType',
         smartDashesType,
-        defaultValue:
-            obscureText ? SmartDashesType.disabled : SmartDashesType.enabled,
+        defaultValue: obscureText
+            ? SmartDashesType.disabled
+            : SmartDashesType.enabled,
       ),
     );
     properties.add(
       EnumProperty<SmartQuotesType>(
         'smartQuotesType',
         smartQuotesType,
-        defaultValue:
-            obscureText ? SmartQuotesType.disabled : SmartQuotesType.enabled,
+        defaultValue: obscureText
+            ? SmartQuotesType.disabled
+            : SmartQuotesType.enabled,
       ),
     );
     properties.add(
-      DiagnosticsProperty<bool>('enableSuggestions', enableSuggestions,
-          defaultValue: true),
+      DiagnosticsProperty<bool>(
+        'enableSuggestions',
+        enableSuggestions,
+        defaultValue: true,
+      ),
     );
     style.debugFillProperties(properties);
     properties.add(
-        EnumProperty<TextAlign>('textAlign', textAlign, defaultValue: null));
-    properties.add(EnumProperty<TextDirection>('textDirection', textDirection,
-        defaultValue: null));
-    properties
-        .add(DiagnosticsProperty<Locale>('locale', locale, defaultValue: null));
-    properties.add(DiagnosticsProperty<TextScaler>('textScaler', textScaler,
-        defaultValue: null));
+      EnumProperty<TextAlign>('textAlign', textAlign, defaultValue: null),
+    );
+    properties.add(
+      EnumProperty<TextDirection>(
+        'textDirection',
+        textDirection,
+        defaultValue: null,
+      ),
+    );
+    properties.add(
+      DiagnosticsProperty<Locale>('locale', locale, defaultValue: null),
+    );
+    properties.add(
+      DiagnosticsProperty<TextScaler>(
+        'textScaler',
+        textScaler,
+        defaultValue: null,
+      ),
+    );
     properties.add(IntProperty('maxLines', maxLines, defaultValue: 1));
     properties.add(IntProperty('minLines', minLines, defaultValue: null));
     properties.add(
-        DiagnosticsProperty<bool>('expands', expands, defaultValue: false));
+      DiagnosticsProperty<bool>('expands', expands, defaultValue: false),
+    );
     properties.add(
-        DiagnosticsProperty<bool>('autofocus', autofocus, defaultValue: false));
+      DiagnosticsProperty<bool>('autofocus', autofocus, defaultValue: false),
+    );
     properties.add(
-      DiagnosticsProperty<TextInputType>('keyboardType', keyboardType,
-          defaultValue: null),
+      DiagnosticsProperty<TextInputType>(
+        'keyboardType',
+        keyboardType,
+        defaultValue: null,
+      ),
     );
     properties.add(
       DiagnosticsProperty<ScrollController>(
@@ -2014,12 +2070,18 @@ class EditableText extends StatefulWidget {
       ),
     );
     properties.add(
-      DiagnosticsProperty<ScrollPhysics>('scrollPhysics', scrollPhysics,
-          defaultValue: null),
+      DiagnosticsProperty<ScrollPhysics>(
+        'scrollPhysics',
+        scrollPhysics,
+        defaultValue: null,
+      ),
     );
     properties.add(
-      DiagnosticsProperty<Iterable<String>>('autofillHints', autofillHints,
-          defaultValue: null),
+      DiagnosticsProperty<Iterable<String>>(
+        'autofillHints',
+        autofillHints,
+        defaultValue: null,
+      ),
     );
     properties.add(
       DiagnosticsProperty<TextHeightBehavior>(
@@ -2029,8 +2091,11 @@ class EditableText extends StatefulWidget {
       ),
     );
     properties.add(
-      DiagnosticsProperty<bool>('scribbleEnabled', scribbleEnabled,
-          defaultValue: true),
+      DiagnosticsProperty<bool>(
+        'scribbleEnabled',
+        scribbleEnabled,
+        defaultValue: true,
+      ),
     );
     properties.add(
       DiagnosticsProperty<bool>(
@@ -2091,16 +2156,18 @@ class EditableTextState extends State<EditableText>
     implements AutofillClient {
   Timer? _cursorTimer;
   AnimationController get _cursorBlinkOpacityController {
-    return _backingCursorBlinkOpacityController ??=
-        AnimationController(vsync: this)..addListener(_onCursorColorTick);
+    return _backingCursorBlinkOpacityController ??= AnimationController(
+      vsync: this,
+    )..addListener(_onCursorColorTick);
   }
 
   AnimationController? _backingCursorBlinkOpacityController;
   late final Simulation _iosBlinkCursorSimulation =
       _DiscreteKeyFrameSimulation.iOSBlinkingCaret();
 
-  final ValueNotifier<bool> _cursorVisibilityNotifier =
-      ValueNotifier<bool>(true);
+  final ValueNotifier<bool> _cursorVisibilityNotifier = ValueNotifier<bool>(
+    true,
+  );
   final GlobalKey _editableKey = GlobalKey();
 
   /// Detects whether the clipboard can paste.
@@ -2116,18 +2183,17 @@ class EditableTextState extends State<EditableText>
   ///
   /// See also:
   ///  * [LiveText], where the availability of Live Text input can be obtained.
-  final LiveTextInputStatusNotifier? _liveTextInputStatus =
-      kIsWeb ? null : LiveTextInputStatusNotifier();
+  final LiveTextInputStatusNotifier? _liveTextInputStatus = kIsWeb
+      ? null
+      : LiveTextInputStatusNotifier();
 
   TextInputConnection? _textInputConnection;
   bool get _hasInputConnection => _textInputConnection?.attached ?? false;
 
   TextSelectionOverlay? _selectionOverlay;
   ScrollNotificationObserverState? _scrollNotificationObserver;
-  ({
-    TextEditingValue value,
-    Rect selectionBounds
-  })? _dataWhenToolbarShowScheduled;
+  ({TextEditingValue value, Rect selectionBounds})?
+  _dataWhenToolbarShowScheduled;
   bool _listeningToScrollNotificationObserver = false;
 
   bool get _webContextMenuEnabled => kIsWeb && BrowserContextMenu.enabled;
@@ -2397,7 +2463,8 @@ class EditableTextState extends State<EditableText>
             TextEditingValue(
               text: textEditingValue.text,
               selection: TextSelection.collapsed(
-                  offset: textEditingValue.selection.end),
+                offset: textEditingValue.selection.end,
+              ),
             ),
             SelectionChangedCause.toolbar,
           );
@@ -2458,8 +2525,10 @@ class EditableTextState extends State<EditableText>
     // After the paste, the cursor should be collapsed and located after the
     // pasted content.
     final TextSelection selection = textEditingValue.selection;
-    final int lastSelectionIndex =
-        math.max(selection.baseOffset, selection.extentOffset);
+    final int lastSelectionIndex = math.max(
+      selection.baseOffset,
+      selection.extentOffset,
+    );
     // final TextEditingValue collapsedTextEditingValue =
     //     textEditingValue.copyWith(
     //   selection: TextSelection.collapsed(offset: lastSelectionIndex),
@@ -2514,7 +2583,9 @@ class EditableTextState extends State<EditableText>
     userUpdateTextEditingValue(
       textEditingValue.copyWith(
         selection: TextSelection(
-            baseOffset: 0, extentOffset: textEditingValue.text.length),
+          baseOffset: 0,
+          extentOffset: textEditingValue.text.length,
+        ),
       ),
       cause,
     );
@@ -2552,8 +2623,9 @@ class EditableTextState extends State<EditableText>
   Future<void> lookUpSelection(SelectionChangedCause cause) async {
     assert(!widget.obscureText);
 
-    final String text =
-        textEditingValue.selection.textInside(textEditingValue.text);
+    final String text = textEditingValue.selection.textInside(
+      textEditingValue.text,
+    );
     if (widget.obscureText || text.isEmpty) {
       return;
     }
@@ -2573,8 +2645,9 @@ class EditableTextState extends State<EditableText>
       return;
     }
 
-    final String text =
-        textEditingValue.selection.textInside(textEditingValue.text);
+    final String text = textEditingValue.selection.textInside(
+      textEditingValue.text,
+    );
     if (text.isNotEmpty) {
       await SystemChannels.platform.invokeMethod('SearchWeb.invoke', text);
     }
@@ -2593,8 +2666,9 @@ class EditableTextState extends State<EditableText>
       return;
     }
 
-    final String text =
-        textEditingValue.selection.textInside(textEditingValue.text);
+    final String text = textEditingValue.selection.textInside(
+      textEditingValue.text,
+    );
     if (text.isNotEmpty) {
       await SystemChannels.platform.invokeMethod('Share.invoke', text);
     }
@@ -2659,11 +2733,15 @@ class EditableTextState extends State<EditableText>
   ) {
     final SpellCheckService? spellCheckService =
         configuration?.spellCheckService;
-    final bool spellCheckAutomaticallyDisabled = configuration == null ||
+    final bool spellCheckAutomaticallyDisabled =
+        configuration == null ||
         configuration == const SpellCheckConfiguration.disabled();
-    final bool spellCheckServiceIsConfigured = spellCheckService != null ||
+    final bool spellCheckServiceIsConfigured =
+        spellCheckService != null ||
         WidgetsBinding
-            .instance.platformDispatcher.nativeSpellCheckServiceDefined;
+            .instance
+            .platformDispatcher
+            .nativeSpellCheckServiceDefined;
     if (spellCheckAutomaticallyDisabled || !spellCheckServiceIsConfigured) {
       // Only enable spell check if a non-disabled configuration is provided
       // and if that configuration does not specify a spell check service,
@@ -2700,8 +2778,9 @@ class EditableTextState extends State<EditableText>
     'Use `contextMenuBuilder` instead of `toolbarOptions`. '
     'This feature was deprecated after v3.3.0-0.5.pre.',
   )
-  List<ContextMenuButtonItem>? buttonItemsForToolbarOptions(
-      [TargetPlatform? targetPlatform]) {
+  List<ContextMenuButtonItem>? buttonItemsForToolbarOptions([
+    TargetPlatform? targetPlatform,
+  ]) {
     final ToolbarOptions toolbarOptions = widget.toolbarOptions;
     if (toolbarOptions == ToolbarOptions.empty) {
       return null;
@@ -2770,15 +2849,17 @@ class EditableTextState extends State<EditableText>
         selectedGraphemes.characters.first.length;
     final Rect? startCharacterRect = renderEditable.getRectForComposingRange(
       TextRange(
-          start: selection.start,
-          end: selection.start + firstSelectedGraphemeExtent),
+        start: selection.start,
+        end: selection.start + firstSelectedGraphemeExtent,
+      ),
     );
     final int lastSelectedGraphemeExtent =
         selectedGraphemes.characters.last.length;
     final Rect? endCharacterRect = renderEditable.getRectForComposingRange(
       TextRange(
-          start: selection.end - lastSelectedGraphemeExtent,
-          end: selection.end),
+        start: selection.end - lastSelectedGraphemeExtent,
+        end: selection.end,
+      ),
     );
     return (
       startGlyphHeight:
@@ -2805,11 +2886,11 @@ class EditableTextState extends State<EditableText>
 
     final (
       startGlyphHeight: double startGlyphHeight,
-      endGlyphHeight: double endGlyphHeight
+      endGlyphHeight: double endGlyphHeight,
     ) = getGlyphHeights();
     final TextSelection selection = textEditingValue.selection;
-    final List<TextSelectionPoint> points =
-        renderEditable.getEndpointsForSelection(selection);
+    final List<TextSelectionPoint> points = renderEditable
+        .getEndpointsForSelection(selection);
     return TextSelectionToolbarAnchors.fromSelection(
       renderBox: renderEditable,
       startGlyphHeight: startGlyphHeight,
@@ -2838,33 +2919,33 @@ class EditableTextState extends State<EditableText>
   ///   button Widgets for the current platform given [ContextMenuButtonItem]s.
   List<ContextMenuButtonItem> get contextMenuButtonItems {
     return buttonItemsForToolbarOptions() ??
-        EditableText.getEditableButtonItems(
-          clipboardStatus: clipboardStatus.value,
-          onCopy: copyEnabled
-              ? () => copySelection(SelectionChangedCause.toolbar)
-              : null,
-          onCut: cutEnabled
-              ? () => cutSelection(SelectionChangedCause.toolbar)
-              : null,
-          onPaste: pasteEnabled
-              ? () => pasteText(SelectionChangedCause.toolbar)
-              : null,
-          onSelectAll: selectAllEnabled
-              ? () => selectAll(SelectionChangedCause.toolbar)
-              : null,
-          onLookUp: lookUpEnabled
-              ? () => lookUpSelection(SelectionChangedCause.toolbar)
-              : null,
-          onSearchWeb: searchWebEnabled
-              ? () => searchWebForSelection(SelectionChangedCause.toolbar)
-              : null,
-          onShare: shareEnabled
-              ? () => shareSelection(SelectionChangedCause.toolbar)
-              : null,
-          onLiveTextInput: liveTextInputEnabled
-              ? () => _startLiveTextInput(SelectionChangedCause.toolbar)
-              : null,
-        )
+          EditableText.getEditableButtonItems(
+            clipboardStatus: clipboardStatus.value,
+            onCopy: copyEnabled
+                ? () => copySelection(SelectionChangedCause.toolbar)
+                : null,
+            onCut: cutEnabled
+                ? () => cutSelection(SelectionChangedCause.toolbar)
+                : null,
+            onPaste: pasteEnabled
+                ? () => pasteText(SelectionChangedCause.toolbar)
+                : null,
+            onSelectAll: selectAllEnabled
+                ? () => selectAll(SelectionChangedCause.toolbar)
+                : null,
+            onLookUp: lookUpEnabled
+                ? () => lookUpSelection(SelectionChangedCause.toolbar)
+                : null,
+            onSearchWeb: searchWebEnabled
+                ? () => searchWebForSelection(SelectionChangedCause.toolbar)
+                : null,
+            onShare: shareEnabled
+                ? () => shareSelection(SelectionChangedCause.toolbar)
+                : null,
+            onLiveTextInput: liveTextInputEnabled
+                ? () => _startLiveTextInput(SelectionChangedCause.toolbar)
+                : null,
+          )
       ..addAll(_textProcessingActionButtonItems);
   }
 
@@ -2880,15 +2961,16 @@ class EditableTextState extends State<EditableText>
         ContextMenuButtonItem(
           label: action.label,
           onPressed: () async {
-            final String selectedText =
-                selection.textInside(textEditingValue.text);
+            final String selectedText = selection.textInside(
+              textEditingValue.text,
+            );
             if (selectedText.isNotEmpty) {
-              final String? processedText =
-                  await _processTextService.processTextAction(
-                action.id,
-                selectedText,
-                widget.readOnly,
-              );
+              final String? processedText = await _processTextService
+                  .processTextAction(
+                    action.id,
+                    selectedText,
+                    widget.readOnly,
+                  );
               // If an activity does not return a modified version, just hide the toolbar.
               // Otherwise use the result to replace the selected text.
               if (processedText != null && _allowPaste) {
@@ -2915,10 +2997,12 @@ class EditableTextState extends State<EditableText>
     widget.controller.addListener(_didChangeTextEditingValue);
     widget.focusNode.addListener(_handleFocusChanged);
     _cursorVisibilityNotifier.value = widget.showCursor;
-    _spellCheckConfiguration =
-        _inferSpellCheckConfiguration(widget.spellCheckConfiguration);
-    _appLifecycleListener =
-        AppLifecycleListener(onResume: () => _justResumed = true);
+    _spellCheckConfiguration = _inferSpellCheckConfiguration(
+      widget.spellCheckConfiguration,
+    );
+    _appLifecycleListener = AppLifecycleListener(
+      onResume: () => _justResumed = true,
+    );
     _initProcessTextActions();
   }
 
@@ -2974,8 +3058,9 @@ class EditableTextState extends State<EditableText>
     if (_hasInputConnection) {
       final int newViewId = View.of(context).viewId;
       if (newViewId != _viewId) {
-        _textInputConnection!
-            .updateConfig(_effectiveAutofillClient.textInputConfiguration);
+        _textInputConnection!.updateConfig(
+          _effectiveAutofillClient.textInputConfiguration,
+        );
       }
     }
 
@@ -3005,11 +3090,13 @@ class EditableTextState extends State<EditableText>
       // scroll notification observer. We only subscribe to the scroll
       // notification observer when the context menu is shown on platforms that
       // support _platformSupportsFadeOnScroll.
-      _scrollNotificationObserver
-          ?.removeListener(_handleContextMenuOnParentScroll);
+      _scrollNotificationObserver?.removeListener(
+        _handleContextMenuOnParentScroll,
+      );
       _scrollNotificationObserver = ScrollNotificationObserver.maybeOf(context);
-      _scrollNotificationObserver
-          ?.addListener(_handleContextMenuOnParentScroll);
+      _scrollNotificationObserver?.addListener(
+        _handleContextMenuOnParentScroll,
+      );
     }
   }
 
@@ -3051,8 +3138,9 @@ class EditableTextState extends State<EditableText>
     _selectionOverlay?.handlesVisible = widget.showSelectionHandles;
 
     if (widget.autofillClient != oldWidget.autofillClient) {
-      _currentAutofillScope
-          ?.unregister(oldWidget.autofillClient?.autofillId ?? autofillId);
+      _currentAutofillScope?.unregister(
+        oldWidget.autofillClient?.autofillId ?? autofillId,
+      );
       _currentAutofillScope?.register(_effectiveAutofillClient);
     }
 
@@ -3074,16 +3162,18 @@ class EditableTextState extends State<EditableText>
 
     if (kIsWeb && _hasInputConnection) {
       if (oldWidget.readOnly != widget.readOnly) {
-        _textInputConnection!
-            .updateConfig(_effectiveAutofillClient.textInputConfiguration);
+        _textInputConnection!.updateConfig(
+          _effectiveAutofillClient.textInputConfiguration,
+        );
       }
     }
 
     if (_hasInputConnection) {
       if (oldWidget.obscureText != widget.obscureText ||
           oldWidget.keyboardType != widget.keyboardType) {
-        _textInputConnection!
-            .updateConfig(_effectiveAutofillClient.textInputConfiguration);
+        _textInputConnection!.updateConfig(
+          _effectiveAutofillClient.textInputConfiguration,
+        );
       }
     }
 
@@ -3109,8 +3199,8 @@ class EditableTextState extends State<EditableText>
     }
     final bool canPaste =
         widget.selectionControls is TextSelectionHandleControls
-            ? pasteEnabled
-            : widget.selectionControls?.canPaste(this) ?? false;
+        ? pasteEnabled
+        : widget.selectionControls?.canPaste(this) ?? false;
     if (widget.selectionEnabled && pasteEnabled && canPaste) {
       clipboardStatus.update();
     }
@@ -3119,8 +3209,9 @@ class EditableTextState extends State<EditableText>
   void _disposeScrollNotificationObserver() {
     _listeningToScrollNotificationObserver = false;
     if (_scrollNotificationObserver != null) {
-      _scrollNotificationObserver!
-          .removeListener(_handleContextMenuOnParentScroll);
+      _scrollNotificationObserver!.removeListener(
+        _handleContextMenuOnParentScroll,
+      );
       _scrollNotificationObserver = null;
     }
   }
@@ -3172,8 +3263,10 @@ class EditableTextState extends State<EditableText>
   TextEditingValue get currentTextEditingValue => _value;
 
   @override
-  void updateEditingValue(TextEditingValue value,
-      {TextEditingValue? remoteValue}) {
+  void updateEditingValue(
+    TextEditingValue value, {
+    TextEditingValue? remoteValue,
+  }) {
     // This method handles text editing state updates from the platform text
     // input plugin. The [EditableText] may not have the focus or an open input
     // connection, as autofill can update a disconnected [EditableText].
@@ -3186,8 +3279,9 @@ class EditableTextState extends State<EditableText>
 
     if (_checkNeedsAdjustAffinity(value)) {
       value = value.copyWith(
-        selection:
-            value.selection.copyWith(affinity: _value.selection.affinity),
+        selection: value.selection.copyWith(
+          affinity: _value.selection.affinity,
+        ),
       );
     }
 
@@ -3229,15 +3323,18 @@ class EditableTextState extends State<EditableText>
       }
       _currentPromptRectRange = null;
 
-      final bool revealObscuredInput = _hasInputConnection &&
+      final bool revealObscuredInput =
+          _hasInputConnection &&
           widget.obscureText &&
           WidgetsBinding.instance.platformDispatcher.brieflyShowPassword &&
           value.text.length == _value.text.length + 1;
 
-      _obscureShowCharTicksPending =
-          revealObscuredInput ? _kObscureShowLatestCharCursorTicks : 0;
-      _obscureLatestCharIndex =
-          revealObscuredInput ? _value.selection.baseOffset : null;
+      _obscureShowCharTicksPending = revealObscuredInput
+          ? _kObscureShowLatestCharCursorTicks
+          : 0;
+      _obscureLatestCharIndex = revealObscuredInput
+          ? _value.selection.baseOffset
+          : null;
       _formatAndSetValue(value, SelectionChangedCause.keyboard);
     }
 
@@ -3322,8 +3419,9 @@ class EditableTextState extends State<EditableText>
   @override
   void insertContent(KeyboardInsertedContent content) {
     assert(
-      widget.contentInsertionConfiguration?.allowedMimeTypes
-              .contains(content.mimeType) ??
+      widget.contentInsertionConfiguration?.allowedMimeTypes.contains(
+            content.mimeType,
+          ) ??
           false,
     );
     widget.contentInsertionConfiguration?.onContentInserted.call(content);
@@ -3378,19 +3476,23 @@ class EditableTextState extends State<EditableText>
             offset: renderEditable.selection!.baseOffset,
             affinity: renderEditable.selection!.affinity,
           );
-          startCaretCenter =
-              renderEditable.getLocalRectForCaret(currentTextPosition).center;
+          startCaretCenter = renderEditable
+              .getLocalRectForCaret(currentTextPosition)
+              .center;
         }
 
         _startCaretCenter = startCaretCenter;
-        _lastBoundedOffset =
-            renderEditable.calculateBoundedFloatingCursorOffset(
-          _startCaretCenter! - _floatingCursorOffset,
-          shouldResetOrigin: shouldResetOrigin,
-        );
+        _lastBoundedOffset = renderEditable
+            .calculateBoundedFloatingCursorOffset(
+              _startCaretCenter! - _floatingCursorOffset,
+              shouldResetOrigin: shouldResetOrigin,
+            );
         _lastTextPosition = currentTextPosition;
         renderEditable.setFloatingCursor(
-            point.state, _lastBoundedOffset!, _lastTextPosition!);
+          point.state,
+          _lastBoundedOffset!,
+          _lastTextPosition!,
+        );
       case FloatingCursorDragState.Update:
         final Offset centeredPoint = point.offset! - _pointOffsetOrigin!;
         final Offset rawCursorOffset =
@@ -3399,15 +3501,19 @@ class EditableTextState extends State<EditableText>
         _lastBoundedOffset = renderEditable
             .calculateBoundedFloatingCursorOffset(rawCursorOffset);
         _lastTextPosition = renderEditable.getPositionForPoint(
-          renderEditable
-              .localToGlobal(_lastBoundedOffset! + _floatingCursorOffset),
+          renderEditable.localToGlobal(
+            _lastBoundedOffset! + _floatingCursorOffset,
+          ),
         );
 
         // bggRGjQaUbCoE ios single long press
         _lastTextPosition = widget.controller.dragOffset(_lastTextPosition!);
 
         renderEditable.setFloatingCursor(
-            point.state, _lastBoundedOffset!, _lastTextPosition!);
+          point.state,
+          _lastBoundedOffset!,
+          _lastTextPosition!,
+        );
       case FloatingCursorDragState.End:
         // Resume cursor blinking.
         _startCursorBlink();
@@ -3426,7 +3532,7 @@ class EditableTextState extends State<EditableText>
   void _onFloatingCursorResetTick() {
     final Offset finalPosition =
         renderEditable.getLocalRectForCaret(_lastTextPosition!).centerLeft -
-            _floatingCursorOffset;
+        _floatingCursorOffset;
     if (_floatingCursorResetController!.isCompleted) {
       renderEditable.setFloatingCursor(
         FloatingCursorDragState.End,
@@ -3462,10 +3568,16 @@ class EditableTextState extends State<EditableText>
       _lastBoundedOffset = null;
     } else {
       final double lerpValue = _floatingCursorResetController!.value;
-      final double lerpX =
-          ui.lerpDouble(_lastBoundedOffset!.dx, finalPosition.dx, lerpValue)!;
-      final double lerpY =
-          ui.lerpDouble(_lastBoundedOffset!.dy, finalPosition.dy, lerpValue)!;
+      final double lerpX = ui.lerpDouble(
+        _lastBoundedOffset!.dx,
+        finalPosition.dx,
+        lerpValue,
+      )!;
+      final double lerpY = ui.lerpDouble(
+        _lastBoundedOffset!.dy,
+        finalPosition.dy,
+        lerpValue,
+      )!;
 
       renderEditable.setFloatingCursor(
         FloatingCursorDragState.Update,
@@ -3488,8 +3600,9 @@ class EditableTextState extends State<EditableText>
             exception: exception,
             stack: stack,
             library: 'widgets',
-            context:
-                ErrorDescription('while calling onEditingComplete for $action'),
+            context: ErrorDescription(
+              'while calling onEditingComplete for $action',
+            ),
           ),
         );
       }
@@ -3647,7 +3760,10 @@ class EditableTextState extends State<EditableText>
       additionalOffset = expandedRect.height >= editableSize.height
           ? editableSize.height / 2 - expandedRect.center.dy
           : clampDouble(
-              0.0, expandedRect.bottom - editableSize.height, expandedRect.top);
+              0.0,
+              expandedRect.bottom - editableSize.height,
+              expandedRect.top,
+            );
       unitOffset = const Offset(0, 1);
     }
 
@@ -3661,13 +3777,17 @@ class EditableTextState extends State<EditableText>
 
     final double offsetDelta = _scrollController.offset - targetOffset;
     return RevealedOffset(
-        rect: rect.shift(unitOffset * offsetDelta), offset: targetOffset);
+      rect: rect.shift(unitOffset * offsetDelta),
+      offset: targetOffset,
+    );
   }
 
   /// Whether to send the autofill information to the autofill service. True by
   /// default.
   bool get _needsAutofill => _effectiveAutofillClient
-      .textInputConfiguration.autofillConfiguration.enabled;
+      .textInputConfiguration
+      .autofillConfiguration
+      .enabled;
 
   // Must be called after layout.
   // See https://github.com/flutter/flutter/issues/126312
@@ -3687,10 +3807,14 @@ class EditableTextState extends State<EditableText>
       // notified to exclude this field from the autofill context. So we need to
       // provide the autofillId.
       _textInputConnection = _needsAutofill && currentAutofillScope != null
-          ? currentAutofillScope!
-              .attach(this, _effectiveAutofillClient.textInputConfiguration)
+          ? currentAutofillScope!.attach(
+              this,
+              _effectiveAutofillClient.textInputConfiguration,
+            )
           : TextInput.attach(
-              this, _effectiveAutofillClient.textInputConfiguration);
+              this,
+              _effectiveAutofillClient.textInputConfiguration,
+            );
       _updateSizeAndTransform();
       _schedulePeriodicPostFrameCallbacks();
       _textInputConnection!
@@ -3756,10 +3880,11 @@ class EditableTextState extends State<EditableText>
     _textInputConnection = null;
     _lastKnownRemoteTextEditingValue = null;
 
-    final AutofillScope? currentAutofillScope =
-        _needsAutofill ? this.currentAutofillScope : null;
-    final TextInputConnection newConnection = currentAutofillScope?.attach(
-            this, textInputConfiguration) ??
+    final AutofillScope? currentAutofillScope = _needsAutofill
+        ? this.currentAutofillScope
+        : null;
+    final TextInputConnection newConnection =
+        currentAutofillScope?.attach(this, textInputConfiguration) ??
         TextInput.attach(this, _effectiveAutofillClient.textInputConfiguration);
     _textInputConnection = newConnection;
 
@@ -3778,7 +3903,9 @@ class EditableTextState extends State<EditableText>
 
   @override
   void didChangeInputControl(
-      TextInputControl? oldControl, TextInputControl? newControl) {
+    TextInputControl? oldControl,
+    TextInputControl? newControl,
+  ) {
     if (_hasFocus && _hasInputConnection) {
       oldControl?.hide();
       newControl?.show();
@@ -3845,18 +3972,18 @@ class EditableTextState extends State<EditableText>
     TargetPlatform.fuchsia ||
     TargetPlatform.linux ||
     TargetPlatform.macOS ||
-    TargetPlatform.windows =>
-      false,
+    TargetPlatform.windows => false,
   };
 
   bool _isInternalScrollableNotification(BuildContext? notificationContext) {
-    final ScrollableState? scrollableState =
-        notificationContext?.findAncestorStateOfType<ScrollableState>();
+    final ScrollableState? scrollableState = notificationContext
+        ?.findAncestorStateOfType<ScrollableState>();
     return _scrollableKey.currentContext == scrollableState?.context;
   }
 
   bool _scrollableNotificationIsFromSameSubtree(
-      BuildContext? notificationContext) {
+    BuildContext? notificationContext,
+  ) {
     if (notificationContext == null) {
       return false;
     }
@@ -3864,14 +3991,14 @@ class EditableTextState extends State<EditableText>
     // The notification context of a ScrollNotification points to the RawGestureDetector
     // of the Scrollable. We get the ScrollableState associated with this notification
     // by looking up the tree.
-    final ScrollableState? notificationScrollableState =
-        notificationContext.findAncestorStateOfType<ScrollableState>();
+    final ScrollableState? notificationScrollableState = notificationContext
+        .findAncestorStateOfType<ScrollableState>();
     if (notificationScrollableState == null) {
       return false;
     }
     while (currentContext != null) {
-      final ScrollableState? scrollableState =
-          currentContext.findAncestorStateOfType<ScrollableState>();
+      final ScrollableState? scrollableState = currentContext
+          .findAncestorStateOfType<ScrollableState>();
       if (scrollableState == notificationScrollableState) {
         return true;
       }
@@ -3906,7 +4033,7 @@ class EditableTextState extends State<EditableText>
     final ui.FlutterView view = View.of(context);
     final double obscuredVertical =
         (view.padding.top + view.padding.bottom + view.viewInsets.bottom) /
-            view.devicePixelRatio;
+        view.devicePixelRatio;
     final double obscuredHorizontal =
         (view.padding.left + view.padding.right) / view.devicePixelRatio;
     final Size visibleScreenSize = Size(
@@ -3941,22 +4068,28 @@ class EditableTextState extends State<EditableText>
       if (_dataWhenToolbarShowScheduled != null) {
         return;
       }
-      final bool toolbarIsVisible = _selectionOverlay != null &&
+      final bool toolbarIsVisible =
+          _selectionOverlay != null &&
           _selectionOverlay!.toolbarIsVisible &&
           !_selectionOverlay!.spellCheckToolbarIsVisible;
       if (!toolbarIsVisible) {
         return;
       }
-      final List<TextBox> selectionBoxes =
-          renderEditable.getBoxesForSelection(_value.selection);
-      final Rect selectionBounds = _value.selection.isCollapsed ||
-              selectionBoxes.isEmpty
+      final List<TextBox> selectionBoxes = renderEditable.getBoxesForSelection(
+        _value.selection,
+      );
+      final Rect selectionBounds =
+          _value.selection.isCollapsed || selectionBoxes.isEmpty
           ? renderEditable.getLocalRectForCaret(_value.selection.extent)
           : selectionBoxes
-              .map((TextBox box) => box.toRect())
-              .reduce((Rect result, Rect rect) => result.expandToInclude(rect));
-      _dataWhenToolbarShowScheduled =
-          (value: _value, selectionBounds: selectionBounds);
+                .map((TextBox box) => box.toRect())
+                .reduce(
+                  (Rect result, Rect rect) => result.expandToInclude(rect),
+                );
+      _dataWhenToolbarShowScheduled = (
+        value: _value,
+        selectionBounds: selectionBounds,
+      );
       _selectionOverlay?.hideToolbar();
     } else if (notification is ScrollEndNotification) {
       if (_dataWhenToolbarShowScheduled == null) {
@@ -3981,7 +4114,7 @@ class EditableTextState extends State<EditableText>
         final Rect deviceRect = _calculateDeviceRect();
         final bool selectionVisibleInEditable =
             renderEditable.selectionStartInViewport.value ||
-                renderEditable.selectionEndInViewport.value;
+            renderEditable.selectionEndInViewport.value;
         final Rect selectionBounds = MatrixUtils.transformRect(
           renderEditable.getTransformTo(null),
           _dataWhenToolbarShowScheduled!.selectionBounds,
@@ -3992,7 +4125,8 @@ class EditableTextState extends State<EditableText>
         if (selectionVisibleInEditable &&
             selectionOverlapsWithDeviceRect &&
             _selectionInViewport(
-                _dataWhenToolbarShowScheduled!.selectionBounds)) {
+              _dataWhenToolbarShowScheduled!.selectionBounds,
+            )) {
           showToolbar();
           _dataWhenToolbarShowScheduled = null;
         }
@@ -4001,8 +4135,9 @@ class EditableTextState extends State<EditableText>
   }
 
   bool _selectionInViewport(Rect selectionBounds) {
-    RenderAbstractViewport? closestViewport =
-        RenderAbstractViewport.maybeOf(renderEditable);
+    RenderAbstractViewport? closestViewport = RenderAbstractViewport.maybeOf(
+      renderEditable,
+    );
     while (closestViewport != null) {
       final Rect selectionBoundsLocalToViewport = MatrixUtils.transformRect(
         renderEditable.getTransformTo(closestViewport),
@@ -4010,8 +4145,9 @@ class EditableTextState extends State<EditableText>
       );
       if (selectionBoundsLocalToViewport.hasNaN ||
           closestViewport.paintBounds.hasNaN ||
-          !closestViewport.paintBounds
-              .overlaps(selectionBoundsLocalToViewport)) {
+          !closestViewport.paintBounds.overlaps(
+            selectionBoundsLocalToViewport,
+          )) {
         return false;
       }
       closestViewport = RenderAbstractViewport.maybeOf(closestViewport.parent);
@@ -4049,7 +4185,9 @@ class EditableTextState extends State<EditableText>
 
   @pragma('vm:notify-debugger-on-exception')
   void _handleSelectionChanged(
-      TextSelection selection, SelectionChangedCause? cause) {
+    TextSelection selection,
+    SelectionChangedCause? cause,
+  ) {
     // We return early if the selection is not valid. This can happen when the
     // text of [EditableText] is updated at the same time as the selection is
     // changed by a gesture event.
@@ -4100,8 +4238,9 @@ class EditableTextState extends State<EditableText>
           exception: exception,
           stack: stack,
           library: 'widgets',
-          context:
-              ErrorDescription('while calling onSelectionChanged for $cause'),
+          context: ErrorDescription(
+            'while calling onSelectionChanged for $cause',
+          ),
         ),
       );
     }
@@ -4145,23 +4284,29 @@ class EditableTextState extends State<EditableText>
         final double handleHeight = _selectionOverlay!.selectionControls!
             .getHandleSize(lineHeight)
             .height;
-        final double interactiveHandleHeight =
-            math.max(handleHeight, kMinInteractiveDimension);
-        final Offset anchor =
-            _selectionOverlay!.selectionControls!.getHandleAnchor(
-          TextSelectionHandleType.collapsed,
-          lineHeight,
+        final double interactiveHandleHeight = math.max(
+          handleHeight,
+          kMinInteractiveDimension,
         );
+        final Offset anchor = _selectionOverlay!.selectionControls!
+            .getHandleAnchor(
+              TextSelectionHandleType.collapsed,
+              lineHeight,
+            );
         final double handleCenter = handleHeight / 2 - anchor.dy;
-        bottomSpacing =
-            math.max(handleCenter + interactiveHandleHeight / 2, bottomSpacing);
+        bottomSpacing = math.max(
+          handleCenter + interactiveHandleHeight / 2,
+          bottomSpacing,
+        );
       }
 
-      final EdgeInsets caretPadding =
-          widget.scrollPadding.copyWith(bottom: bottomSpacing);
+      final EdgeInsets caretPadding = widget.scrollPadding.copyWith(
+        bottom: bottomSpacing,
+      );
 
-      final Rect caretRect =
-          renderEditable.getLocalRectForCaret(renderEditable.selection!.extent);
+      final Rect caretRect = renderEditable.getLocalRectForCaret(
+        renderEditable.selection!.extent,
+      );
       final RevealedOffset targetOffset = _getOffsetToRevealCaret(caretRect);
 
       final Rect rectToReveal;
@@ -4169,8 +4314,8 @@ class EditableTextState extends State<EditableText>
       if (selection.isCollapsed) {
         rectToReveal = targetOffset.rect;
       } else {
-        final List<TextBox> selectionBoxes =
-            renderEditable.getBoxesForSelection(selection);
+        final List<TextBox> selectionBoxes = renderEditable
+            .getBoxesForSelection(selection);
         // selectionBoxes may be empty if, for example, the selection does not
         // encompass a full character, like if it only contained part of an
         // extended grapheme cluster.
@@ -4197,7 +4342,8 @@ class EditableTextState extends State<EditableText>
       } else {
         _scrollController.jumpTo(targetOffset.offset);
         renderEditable.showOnScreen(
-            rect: caretPadding.inflateRect(rectToReveal));
+          rect: caretPadding.inflateRect(rectToReveal),
+        );
       }
     }, debugLabel: 'EditableText.showCaret');
   }
@@ -4287,7 +4433,8 @@ class EditableTextState extends State<EditableText>
       // will keep trying to modify the composing region while Gboard will keep
       // trying to restore the original composing region.
       try {
-        value = widget.inputFormatters?.fold<TextEditingValue>(
+        value =
+            widget.inputFormatters?.fold<TextEditingValue>(
               value,
               (TextEditingValue newValue, TextInputFormatter formatter) =>
                   formatter.formatEditUpdate(_value, newValue),
@@ -4377,9 +4524,11 @@ class EditableTextState extends State<EditableText>
       widget.cursorColor.alpha / 255.0,
       _cursorBlinkOpacityController.value,
     );
-    renderEditable.cursorColor =
-        widget.cursorColor.withOpacity(effectiveOpacity);
-    _cursorVisibilityNotifier.value = widget.showCursor &&
+    renderEditable.cursorColor = widget.cursorColor.withOpacity(
+      effectiveOpacity,
+    );
+    _cursorVisibilityNotifier.value =
+        widget.showCursor &&
         (EditableText.debugDeterministicCursor ||
             _cursorBlinkOpacityController.value > 0);
   }
@@ -4440,8 +4589,8 @@ class EditableTextState extends State<EditableText>
     if (_obscureShowCharTicksPending > 0) {
       _obscureShowCharTicksPending =
           WidgetsBinding.instance.platformDispatcher.brieflyShowPassword
-              ? _obscureShowCharTicksPending - 1
-              : 0;
+          ? _obscureShowCharTicksPending - 1
+          : 0;
       if (_obscureShowCharTicksPending == 0) {
         setState(() {});
       }
@@ -4471,8 +4620,9 @@ class EditableTextState extends State<EditableText>
   void _stopCursorBlink({bool resetCharTicks = true}) {
     // If the cursor is animating, stop the animation, and we always
     // want the cursor to be visible when the floating cursor is enabled.
-    _cursorBlinkOpacityController.value =
-        renderEditable.floatingCursorOn ? 1.0 : 0.0;
+    _cursorBlinkOpacityController.value = renderEditable.floatingCursorOn
+        ? 1.0
+        : 0.0;
     _cursorTimer?.cancel();
     _cursorTimer = null;
     if (resetCharTicks) {
@@ -4538,14 +4688,13 @@ class EditableTextState extends State<EditableText>
     final bool isDesktop = switch (defaultTargetPlatform) {
       TargetPlatform.android ||
       TargetPlatform.iOS ||
-      TargetPlatform.fuchsia =>
-        false,
+      TargetPlatform.fuchsia => false,
       TargetPlatform.macOS ||
       TargetPlatform.linux ||
-      TargetPlatform.windows =>
-        true,
+      TargetPlatform.windows => true,
     };
-    final bool shouldSelectAll = widget.selectionEnabled &&
+    final bool shouldSelectAll =
+        widget.selectionEnabled &&
         (kIsWeb || isDesktop) &&
         !_isMultiline &&
         !_nextFocusChangeIsInternal &&
@@ -4554,8 +4703,10 @@ class EditableTextState extends State<EditableText>
     if (shouldSelectAll) {
       // On native web and desktop platforms, single line <input> tags
       // select all when receiving focus.
-      selection =
-          TextSelection(baseOffset: 0, extentOffset: _value.text.length);
+      selection = TextSelection(
+        baseOffset: 0,
+        extentOffset: _value.text.length,
+      );
     } else if (!_value.selection.isValid) {
       // Place cursor at the end if the selection is invalid when we receive focus.
       selection = TextSelection.collapsed(offset: _value.text.length);
@@ -4611,11 +4762,14 @@ class EditableTextState extends State<EditableText>
     }
 
     final InlineSpan inlineSpan = renderEditable.text!;
-    final TextScaler effectiveTextScaler =
-        switch ((widget.textScaler, widget.textScaleFactor)) {
+    final TextScaler effectiveTextScaler = switch ((
+      widget.textScaler,
+      widget.textScaleFactor,
+    )) {
       (final TextScaler textScaler, _) => textScaler,
-      (null, final double textScaleFactor) =>
-        TextScaler.linear(textScaleFactor),
+      (null, final double textScaleFactor) => TextScaler.linear(
+        textScaleFactor,
+      ),
       (null, null) => MediaQuery.textScalerOf(context),
     };
 
@@ -4624,7 +4778,8 @@ class EditableTextState extends State<EditableText>
       textAlign: widget.textAlign,
       textDirection: _textDirection,
       textScaler: effectiveTextScaler,
-      textHeightBehavior: widget.textHeightBehavior ??
+      textHeightBehavior:
+          widget.textHeightBehavior ??
           DefaultTextHeightBehavior.maybeOf(context),
       locale: widget.locale,
       structStyle: widget.strutStyle,
@@ -4644,8 +4799,9 @@ class EditableTextState extends State<EditableText>
     int graphemeStart = 0;
     // Can't use _value.text here: the controller value could change between
     // frames.
-    final String plainText =
-        inlineSpan.toPlainText(includeSemanticsLabels: false);
+    final String plainText = inlineSpan.toPlainText(
+      includeSemanticsLabels: false,
+    );
     final CharacterRange characterRange = CharacterRange(plainText);
     while (characterRange.moveNext()) {
       final int graphemeEnd = graphemeStart + characterRange.current.length;
@@ -4668,9 +4824,10 @@ class EditableTextState extends State<EditableText>
           // At least some part of the letter is visible within the text field.
           rects.add(
             SelectionRect(
-                position: graphemeStart,
-                bounds: box.toRect(),
-                direction: box.direction),
+              position: graphemeStart,
+              bounds: box.toRect(),
+              direction: box.direction,
+            ),
           );
         }
       }
@@ -4689,13 +4846,15 @@ class EditableTextState extends State<EditableText>
   void _updateComposingRectIfNeeded() {
     final TextRange composingRange = _value.composing;
     assert(mounted);
-    Rect? composingRect =
-        renderEditable.getRectForComposingRange(composingRange);
+    Rect? composingRect = renderEditable.getRectForComposingRange(
+      composingRange,
+    );
     // Send the caret location instead if there's no marked text yet.
     if (composingRect == null) {
       final int offset = composingRange.isValid ? composingRange.start : 0;
-      composingRect =
-          renderEditable.getLocalRectForCaret(TextPosition(offset: offset));
+      composingRect = renderEditable.getLocalRectForCaret(
+        TextPosition(offset: offset),
+      );
     }
     _textInputConnection!.setComposingRect(composingRect);
   }
@@ -4717,10 +4876,12 @@ class EditableTextState extends State<EditableText>
     if (selection == null || !selection.isValid) {
       return;
     }
-    final TextPosition currentTextPosition =
-        TextPosition(offset: selection.start);
-    final Rect caretRect =
-        renderEditable.getLocalRectForCaret(currentTextPosition);
+    final TextPosition currentTextPosition = TextPosition(
+      offset: selection.start,
+    );
+    final Rect caretRect = renderEditable.getLocalRectForCaret(
+      currentTextPosition,
+    );
     _textInputConnection!.setCaretRect(caretRect);
   }
 
@@ -4741,11 +4902,14 @@ class EditableTextState extends State<EditableText>
 
   @override
   void userUpdateTextEditingValue(
-      TextEditingValue value, SelectionChangedCause? cause) {
+    TextEditingValue value,
+    SelectionChangedCause? cause,
+  ) {
     // Compare the current TextEditingValue with the pre-format new
     // TextEditingValue value, in case the formatter would reject the change.
-    final bool shouldShowCaret =
-        widget.readOnly ? _value.selection != value.selection : _value != value;
+    final bool shouldShowCaret = widget.readOnly
+        ? _value.selection != value.selection
+        : _value != value;
     if (shouldShowCaret) {
       scheduleShowCaretOnScreen(withAnimation: true);
     }
@@ -4802,11 +4966,13 @@ class EditableTextState extends State<EditableText>
     // hidden during a scroll on supported platforms.
     if (_platformSupportsFadeOnScroll) {
       _listeningToScrollNotificationObserver = true;
-      _scrollNotificationObserver
-          ?.removeListener(_handleContextMenuOnParentScroll);
+      _scrollNotificationObserver?.removeListener(
+        _handleContextMenuOnParentScroll,
+      );
       _scrollNotificationObserver = ScrollNotificationObserver.maybeOf(context);
-      _scrollNotificationObserver
-          ?.addListener(_handleContextMenuOnParentScroll);
+      _scrollNotificationObserver?.addListener(
+        _handleContextMenuOnParentScroll,
+      );
     }
     return true;
   }
@@ -4826,8 +4992,8 @@ class EditableTextState extends State<EditableText>
 
   /// Toggles the visibility of the toolbar.
   void toggleToolbar([bool hideHandles = true]) {
-    final TextSelectionOverlay selectionOverlay =
-        _selectionOverlay ??= _createSelectionOverlay();
+    final TextSelectionOverlay selectionOverlay = _selectionOverlay ??=
+        _createSelectionOverlay();
     if (selectionOverlay.toolbarIsVisible) {
       hideToolbar(hideHandles);
     } else {
@@ -4848,7 +5014,8 @@ class EditableTextState extends State<EditableText>
         _selectionOverlay == null ||
         !_spellCheckResultsReceived ||
         findSuggestionSpanAtCursorIndex(
-                textEditingValue.selection.extentOffset) ==
+              textEditingValue.selection.extentOffset,
+            ) ==
             null) {
       // Only attempt to show the spell check suggestions toolbar if there
       // is a toolbar specified and spell check suggestions available to show.
@@ -4864,7 +5031,9 @@ class EditableTextState extends State<EditableText>
 
     _selectionOverlay!.showSpellCheckSuggestionsToolbar((BuildContext context) {
       return _spellCheckConfiguration.spellCheckSuggestionsToolbarBuilder!(
-          context, this);
+        context,
+        this,
+      );
     });
     return true;
   }
@@ -4953,8 +5122,9 @@ class EditableTextState extends State<EditableText>
 
   @override
   TextInputConfiguration get textInputConfiguration {
-    final List<String>? autofillHints =
-        widget.autofillHints?.toList(growable: false);
+    final List<String>? autofillHints = widget.autofillHints?.toList(
+      growable: false,
+    );
     final AutofillConfiguration autofillConfiguration = autofillHints != null
         ? AutofillConfiguration(
             uniqueIdentifier: autofillId,
@@ -4975,7 +5145,8 @@ class EditableTextState extends State<EditableText>
       smartQuotesType: widget.smartQuotesType,
       enableSuggestions: widget.enableSuggestions,
       enableInteractiveSelection: widget._userSelectionEnabled,
-      inputAction: widget.textInputAction ??
+      inputAction:
+          widget.textInputAction ??
           (widget.keyboardType == TextInputType.multiline
               ? TextInputAction.newline
               : TextInputAction.done),
@@ -5008,7 +5179,7 @@ class EditableTextState extends State<EditableText>
             (widget.selectionControls is TextSelectionHandleControls
                 ? copyEnabled
                 : copyEnabled &&
-                    (widget.selectionControls?.canCopy(this) ?? false))
+                      (widget.selectionControls?.canCopy(this) ?? false))
         ? () {
             controls?.handleCopy(this);
             copySelection(SelectionChangedCause.toolbar);
@@ -5022,7 +5193,7 @@ class EditableTextState extends State<EditableText>
             (widget.selectionControls is TextSelectionHandleControls
                 ? cutEnabled
                 : cutEnabled &&
-                    (widget.selectionControls?.canCut(this) ?? false))
+                      (widget.selectionControls?.canCut(this) ?? false))
         ? () {
             controls?.handleCut(this);
             cutSelection(SelectionChangedCause.toolbar);
@@ -5036,7 +5207,7 @@ class EditableTextState extends State<EditableText>
             (widget.selectionControls is TextSelectionHandleControls
                 ? pasteEnabled
                 : pasteEnabled &&
-                    (widget.selectionControls?.canPaste(this) ?? false)) &&
+                      (widget.selectionControls?.canPaste(this) ?? false)) &&
             (clipboardStatus.value == ClipboardStatus.pasteable)
         ? () {
             controls?.handlePaste(this);
@@ -5056,7 +5227,7 @@ class EditableTextState extends State<EditableText>
     assert(extent.offset >= 0);
     final int newOffset = forward
         ? textBoundary.getTrailingTextBoundaryAt(extent.offset) ??
-            _value.text.length
+              _value.text.length
         // if x is a boundary defined by `textBoundary`, most textBoundaries (except
         // LineBreaker) guarantees `x == textBoundary.getLeadingTextBoundaryAt(x)`.
         // Use x - 1 here to make sure we don't get stuck at the fixed point x.
@@ -5072,7 +5243,10 @@ class EditableTextState extends State<EditableText>
   // exclusively for handling line boundaries, since performing "move to line
   // start" more than once usually doesn't move you to the previous line.
   TextPosition _moveToTextBoundary(
-      TextPosition extent, bool forward, TextBoundary textBoundary) {
+    TextPosition extent,
+    bool forward,
+    TextBoundary textBoundary,
+  ) {
     assert(extent.offset >= 0);
     final int caretOffset;
     switch (extent.affinity) {
@@ -5099,12 +5273,14 @@ class EditableTextState extends State<EditableText>
     // processing needed since the LineBoundary class does exactly that.
     return forward
         ? TextPosition(
-            offset: textBoundary.getTrailingTextBoundaryAt(caretOffset) ??
+            offset:
+                textBoundary.getTrailingTextBoundaryAt(caretOffset) ??
                 _value.text.length,
             affinity: TextAffinity.upstream,
           )
         : TextPosition(
-            offset: textBoundary.getLeadingTextBoundaryAt(caretOffset) ?? 0);
+            offset: textBoundary.getLeadingTextBoundaryAt(caretOffset) ?? 0,
+          );
   }
 
   // --------------------------- Text Editing Actions ---------------------------
@@ -5122,7 +5298,9 @@ class EditableTextState extends State<EditableText>
 
   Action<T> _makeOverridable<T extends Intent>(Action<T> defaultAction) {
     return Action<T>.overridable(
-        context: context, defaultAction: defaultAction);
+      context: context,
+      defaultAction: defaultAction,
+    );
   }
 
   /// Transpose the characters immediately before and after the current
@@ -5142,8 +5320,10 @@ class EditableTextState extends State<EditableText>
     final String text = _value.text;
     final TextSelection selection = _value.selection;
     final bool atEnd = selection.baseOffset == text.length;
-    final CharacterRange transposing =
-        CharacterRange.at(text, selection.baseOffset);
+    final CharacterRange transposing = CharacterRange.at(
+      text,
+      selection.baseOffset,
+    );
     if (atEnd) {
       transposing.moveBack(2);
     } else {
@@ -5155,7 +5335,8 @@ class EditableTextState extends State<EditableText>
 
     userUpdateTextEditingValue(
       TextEditingValue(
-        text: transposing.stringBefore +
+        text:
+            transposing.stringBefore +
             transposing.currentCharacters.last +
             transposing.currentCharacters.first +
             transposing.stringAfter,
@@ -5182,7 +5363,8 @@ class EditableTextState extends State<EditableText>
               oldText: oldValue.text,
               deletedRange: intent.replacementRange,
               selection: TextSelection.collapsed(
-                  offset: intent.replacementRange.start),
+                offset: intent.replacementRange.start,
+              ),
               composing: TextRange.empty,
             )
           : TextEditingDeltaReplacement(
@@ -5190,7 +5372,8 @@ class EditableTextState extends State<EditableText>
               replacementText: intent.replacementText,
               replacedRange: intent.replacementRange,
               selection: TextSelection.collapsed(
-                  offset: intent.replacementRange.start),
+                offset: intent.replacementRange.start,
+              ),
               composing: TextRange.empty,
             ),
     );
@@ -5213,8 +5396,8 @@ class EditableTextState extends State<EditableText>
 
   late final Action<ReplaceTextIntent> _replaceTextAction =
       CallbackAction<ReplaceTextIntent>(
-    onInvoke: _replaceText,
-  );
+        onInvoke: _replaceText,
+      );
 
   // Scrolls either to the beginning or end of the document depending on the
   // intent's `forward` parameter.
@@ -5247,8 +5430,10 @@ class EditableTextState extends State<EditableText>
 
     final ScrollableState? state =
         _scrollableKey.currentState as ScrollableState?;
-    final double increment =
-        ScrollAction.getDirectionalIncrement(state!, intent);
+    final double increment = ScrollAction.getDirectionalIncrement(
+      state!,
+      intent,
+    );
     final double destination = clampDouble(
       position.pixels + increment,
       position.minScrollExtent,
@@ -5268,8 +5453,9 @@ class EditableTextState extends State<EditableText>
     }
 
     final TextSelection nextSelection;
-    final Rect extentRect =
-        renderEditable.getLocalRectForCaret(_value.selection.extent);
+    final Rect extentRect = renderEditable.getLocalRectForCaret(
+      _value.selection.extent,
+    );
     final ScrollableState? state =
         _scrollableKey.currentState as ScrollableState?;
     final double increment = ScrollAction.getDirectionalIncrement(
@@ -5284,29 +5470,37 @@ class EditableTextState extends State<EditableText>
       if (_value.selection.extentOffset >= _value.text.length) {
         return;
       }
-      final Offset nextExtentOffset =
-          Offset(extentRect.left, extentRect.top + increment);
+      final Offset nextExtentOffset = Offset(
+        extentRect.left,
+        extentRect.top + increment,
+      );
       final double height =
           position.maxScrollExtent + renderEditable.size.height;
       final TextPosition nextExtent =
           nextExtentOffset.dy + position.pixels >= height
-              ? TextPosition(offset: _value.text.length)
-              : renderEditable.getPositionForPoint(
-                  renderEditable.localToGlobal(nextExtentOffset));
-      nextSelection =
-          _value.selection.copyWith(extentOffset: nextExtent.offset);
+          ? TextPosition(offset: _value.text.length)
+          : renderEditable.getPositionForPoint(
+              renderEditable.localToGlobal(nextExtentOffset),
+            );
+      nextSelection = _value.selection.copyWith(
+        extentOffset: nextExtent.offset,
+      );
     } else {
       if (_value.selection.extentOffset <= 0) {
         return;
       }
-      final Offset nextExtentOffset =
-          Offset(extentRect.left, extentRect.top + increment);
+      final Offset nextExtentOffset = Offset(
+        extentRect.left,
+        extentRect.top + increment,
+      );
       final TextPosition nextExtent = nextExtentOffset.dy + position.pixels <= 0
           ? const TextPosition(offset: 0)
           : renderEditable.getPositionForPoint(
-              renderEditable.localToGlobal(nextExtentOffset));
-      nextSelection =
-          _value.selection.copyWith(extentOffset: nextExtent.offset);
+              renderEditable.localToGlobal(nextExtentOffset),
+            );
+      nextSelection = _value.selection.copyWith(
+        extentOffset: nextExtent.offset,
+      );
     }
 
     bringIntoView(nextSelection.extent);
@@ -5347,9 +5541,12 @@ class EditableTextState extends State<EditableText>
       CallbackAction<UpdateSelectionIntent>(onInvoke: _updateSelection);
 
   late final _UpdateTextSelectionVerticallyAction<
-          DirectionalCaretMovementIntent> _verticalSelectionUpdateAction =
+    DirectionalCaretMovementIntent
+  >
+  _verticalSelectionUpdateAction =
       _UpdateTextSelectionVerticallyAction<DirectionalCaretMovementIntent>(
-          this);
+        this,
+      );
 
   Object? _hideToolbarIfVisible(DismissIntent intent) {
     if (_selectionOverlay?.toolbarIsVisible ?? false) {
@@ -5391,7 +5588,9 @@ class EditableTextState extends State<EditableText>
     Actions.invoke(
       context,
       EditableTextTapOutsideIntent(
-          focusNode: widget.focusNode, pointerDownEvent: event),
+        focusNode: widget.focusNode,
+        pointerDownEvent: event,
+      ),
     );
   }
 
@@ -5402,7 +5601,9 @@ class EditableTextState extends State<EditableText>
     Actions.invoke(
       context,
       EditableTextTapUpOutsideIntent(
-          focusNode: widget.focusNode, pointerUpEvent: event),
+        focusNode: widget.focusNode,
+        pointerUpEvent: event,
+      ),
     );
   }
 
@@ -5411,8 +5612,9 @@ class EditableTextState extends State<EditableText>
     ReplaceTextIntent: _replaceTextAction,
     UpdateSelectionIntent: _updateSelectionAction,
     DirectionalFocusIntent: DirectionalFocusAction.forTextField(),
-    DismissIntent:
-        CallbackAction<DismissIntent>(onInvoke: _hideToolbarIfVisible),
+    DismissIntent: CallbackAction<DismissIntent>(
+      onInvoke: _hideToolbarIfVisible,
+    ),
 
     // Delete
     DeleteCharacterIntent: _makeOverridable(
@@ -5431,7 +5633,10 @@ class EditableTextState extends State<EditableText>
     ),
     DeleteToLineBreakIntent: _makeOverridable(
       _DeleteTextAction<DeleteToLineBreakIntent>(
-          this, _linebreak, _moveToTextBoundary),
+        this,
+        _linebreak,
+        _moveToTextBoundary,
+      ),
     ),
 
     // Extend/Move Selection
@@ -5445,7 +5650,8 @@ class EditableTextState extends State<EditableText>
     ),
     ExtendSelectionByPageIntent: _makeOverridable(
       CallbackAction<ExtendSelectionByPageIntent>(
-          onInvoke: _extendSelectionByPage),
+        onInvoke: _extendSelectionByPage,
+      ),
     ),
     ExtendSelectionToNextWordBoundaryIntent: _makeOverridable(
       _UpdateTextSelectionAction<ExtendSelectionToNextWordBoundaryIntent>(
@@ -5471,20 +5677,23 @@ class EditableTextState extends State<EditableText>
         ignoreNonCollapsedSelection: true,
       ),
     ),
-    ExtendSelectionVerticallyToAdjacentLineIntent:
-        _makeOverridable(_verticalSelectionUpdateAction),
-    ExtendSelectionVerticallyToAdjacentPageIntent:
-        _makeOverridable(_verticalSelectionUpdateAction),
+    ExtendSelectionVerticallyToAdjacentLineIntent: _makeOverridable(
+      _verticalSelectionUpdateAction,
+    ),
+    ExtendSelectionVerticallyToAdjacentPageIntent: _makeOverridable(
+      _verticalSelectionUpdateAction,
+    ),
     ExtendSelectionToNextParagraphBoundaryOrCaretLocationIntent:
         _makeOverridable(
-      _UpdateTextSelectionAction<
-          ExtendSelectionToNextParagraphBoundaryOrCaretLocationIntent>(
-        this,
-        _paragraphBoundary,
-        _moveBeyondTextBoundary,
-        ignoreNonCollapsedSelection: true,
-      ),
-    ),
+          _UpdateTextSelectionAction<
+            ExtendSelectionToNextParagraphBoundaryOrCaretLocationIntent
+          >(
+            this,
+            _paragraphBoundary,
+            _moveBeyondTextBoundary,
+            ignoreNonCollapsedSelection: true,
+          ),
+        ),
     ExtendSelectionToDocumentBoundaryIntent: _makeOverridable(
       _UpdateTextSelectionAction<ExtendSelectionToDocumentBoundaryIntent>(
         this,
@@ -5495,7 +5704,8 @@ class EditableTextState extends State<EditableText>
     ),
     ExtendSelectionToNextWordBoundaryOrCaretLocationIntent: _makeOverridable(
       _UpdateTextSelectionAction<
-          ExtendSelectionToNextWordBoundaryOrCaretLocationIntent>(
+        ExtendSelectionToNextWordBoundaryOrCaretLocationIntent
+      >(
         this,
         _nextWordBoundary,
         _moveBeyondTextBoundary,
@@ -5504,7 +5714,8 @@ class EditableTextState extends State<EditableText>
     ),
     ScrollToDocumentBoundaryIntent: _makeOverridable(
       CallbackAction<ScrollToDocumentBoundaryIntent>(
-          onInvoke: _scrollToDocumentBoundary),
+        onInvoke: _scrollToDocumentBoundary,
+      ),
     ),
     ScrollIntent: CallbackAction<ScrollIntent>(onInvoke: _scroll),
 
@@ -5539,10 +5750,12 @@ class EditableTextState extends State<EditableText>
     ),
 
     TransposeCharactersIntent: _makeOverridable(_transposeCharactersAction),
-    EditableTextTapOutsideIntent:
-        _makeOverridable(_EditableTextTapOutsideAction()),
-    EditableTextTapUpOutsideIntent:
-        _makeOverridable(_EditableTextTapUpOutsideAction()),
+    EditableTextTapOutsideIntent: _makeOverridable(
+      _EditableTextTapOutsideAction(),
+    ),
+    EditableTextTapUpOutsideIntent: _makeOverridable(
+      _EditableTextTapUpOutsideAction(),
+    ),
   };
 
   @protected
@@ -5552,11 +5765,14 @@ class EditableTextState extends State<EditableText>
     super.build(context); // See AutomaticKeepAliveClientMixin.
 
     final TextSelectionControls? controls = widget.selectionControls;
-    final TextScaler effectiveTextScaler =
-        switch ((widget.textScaler, widget.textScaleFactor)) {
+    final TextScaler effectiveTextScaler = switch ((
+      widget.textScaler,
+      widget.textScaleFactor,
+    )) {
       (final TextScaler textScaler, _) => textScaler,
-      (null, final double textScaleFactor) =>
-        TextScaler.linear(textScaleFactor),
+      (null, final double textScaleFactor) => TextScaler.linear(
+        textScaleFactor,
+      ),
       (null, null) => MediaQuery.textScalerOf(context),
     };
     final ui.SemanticsInputType inputType;
@@ -5592,38 +5808,44 @@ class EditableTextState extends State<EditableText>
                   value: widget.controller,
                   onTriggered: (TextEditingValue value) {
                     userUpdateTextEditingValue(
-                        value, SelectionChangedCause.keyboard);
+                      value,
+                      SelectionChangedCause.keyboard,
+                    );
                   },
                   shouldChangeUndoStack:
                       (TextEditingValue? oldValue, TextEditingValue newValue) {
-                    if (!newValue.selection.isValid) {
-                      return false;
-                    }
-
-                    if (oldValue == null) {
-                      return true;
-                    }
-
-                    switch (defaultTargetPlatform) {
-                      case TargetPlatform.iOS:
-                      case TargetPlatform.macOS:
-                      case TargetPlatform.fuchsia:
-                      case TargetPlatform.linux:
-                      case TargetPlatform.windows:
-                        // Composing text is not counted in history coalescing.
-                        if (!widget.controller.value.composing.isCollapsed) {
+                        if (!newValue.selection.isValid) {
                           return false;
                         }
-                      case TargetPlatform.android:
-                        // Gboard on Android puts non-CJK words in composing regions. Coalesce
-                        // composing text in order to allow the saving of partial words in that
-                        // case.
-                        break;
-                    }
 
-                    return oldValue.text != newValue.text ||
-                        oldValue.composing != newValue.composing;
-                  },
+                        if (oldValue == null) {
+                          return true;
+                        }
+
+                        switch (defaultTargetPlatform) {
+                          case TargetPlatform.iOS:
+                          case TargetPlatform.macOS:
+                          case TargetPlatform.fuchsia:
+                          case TargetPlatform.linux:
+                          case TargetPlatform.windows:
+                            // Composing text is not counted in history coalescing.
+                            if (!widget
+                                .controller
+                                .value
+                                .composing
+                                .isCollapsed) {
+                              return false;
+                            }
+                          case TargetPlatform.android:
+                            // Gboard on Android puts non-CJK words in composing regions. Coalesce
+                            // composing text in order to allow the saving of partial words in that
+                            // case.
+                            break;
+                        }
+
+                        return oldValue.text != newValue.text ||
+                            oldValue.composing != newValue.composing;
+                      },
                   undoStackModifier: (TextEditingValue value) {
                     // On Android we should discard the composing region when pushing
                     // a new entry to the undo stack. This prevents the TextInputPlugin
@@ -5658,94 +5880,101 @@ class EditableTextState extends State<EditableText>
                         // If a ScrollBehavior is not provided, only apply scrollbars when
                         // multiline. The overscroll indicator should not be applied in
                         // either case, glowing or stretching.
-                        scrollBehavior: widget.scrollBehavior ??
+                        scrollBehavior:
+                            widget.scrollBehavior ??
                             ScrollConfiguration.of(
                               context,
                             ).copyWith(
-                                scrollbars: _isMultiline, overscroll: false),
+                              scrollbars: _isMultiline,
+                              overscroll: false,
+                            ),
                         viewportBuilder:
                             (BuildContext context, ViewportOffset offset) {
-                          return CompositedTransformTarget(
-                            link: _toolbarLayerLink,
-                            child: Semantics(
-                              inputType: inputType,
-                              onCopy: _semanticsOnCopy(controls),
-                              onCut: _semanticsOnCut(controls),
-                              onPaste: _semanticsOnPaste(controls),
-                              child: _ScribbleFocusable(
-                                editableKey: _editableKey,
-                                enabled: _stylusHandwritingEnabled,
-                                focusNode: widget.focusNode,
-                                updateSelectionRects: () {
-                                  _openInputConnection();
-                                  _updateSelectionRects(force: true);
-                                },
-                                child: SizeChangedLayoutNotifier(
-                                  child: _Editable(
-                                    key: _editableKey,
-                                    controller: widget.controller,
-                                    startHandleLayerLink: _startHandleLayerLink,
-                                    endHandleLayerLink: _endHandleLayerLink,
-                                    inlineSpan: buildTextSpan(),
-                                    value: _value,
-                                    cursorColor: _cursorColor,
-                                    backgroundCursorColor:
-                                        widget.backgroundCursorColor,
-                                    showCursor: _cursorVisibilityNotifier,
-                                    forceLine: widget.forceLine,
-                                    readOnly: widget.readOnly,
-                                    hasFocus: _hasFocus,
-                                    maxLines: widget.maxLines,
-                                    minLines: widget.minLines,
-                                    expands: widget.expands,
-                                    strutStyle: widget.strutStyle,
-                                    selectionColor: _selectionOverlay
-                                                ?.spellCheckToolbarIsVisible ??
-                                            false
-                                        ? _spellCheckConfiguration
-                                                .misspelledSelectionColor ??
-                                            widget.selectionColor
-                                        : widget.selectionColor,
-                                    textScaler: effectiveTextScaler,
-                                    textAlign: widget.textAlign,
-                                    textDirection: _textDirection,
-                                    locale: widget.locale,
-                                    textHeightBehavior:
-                                        widget.textHeightBehavior ??
+                              return CompositedTransformTarget(
+                                link: _toolbarLayerLink,
+                                child: Semantics(
+                                  inputType: inputType,
+                                  onCopy: _semanticsOnCopy(controls),
+                                  onCut: _semanticsOnCut(controls),
+                                  onPaste: _semanticsOnPaste(controls),
+                                  child: _ScribbleFocusable(
+                                    editableKey: _editableKey,
+                                    enabled: _stylusHandwritingEnabled,
+                                    focusNode: widget.focusNode,
+                                    updateSelectionRects: () {
+                                      _openInputConnection();
+                                      _updateSelectionRects(force: true);
+                                    },
+                                    child: SizeChangedLayoutNotifier(
+                                      child: _Editable(
+                                        key: _editableKey,
+                                        controller: widget.controller,
+                                        startHandleLayerLink:
+                                            _startHandleLayerLink,
+                                        endHandleLayerLink: _endHandleLayerLink,
+                                        inlineSpan: buildTextSpan(),
+                                        value: _value,
+                                        cursorColor: _cursorColor,
+                                        backgroundCursorColor:
+                                            widget.backgroundCursorColor,
+                                        showCursor: _cursorVisibilityNotifier,
+                                        forceLine: widget.forceLine,
+                                        readOnly: widget.readOnly,
+                                        hasFocus: _hasFocus,
+                                        maxLines: widget.maxLines,
+                                        minLines: widget.minLines,
+                                        expands: widget.expands,
+                                        strutStyle: widget.strutStyle,
+                                        selectionColor:
+                                            _selectionOverlay
+                                                    ?.spellCheckToolbarIsVisible ??
+                                                false
+                                            ? _spellCheckConfiguration
+                                                      .misspelledSelectionColor ??
+                                                  widget.selectionColor
+                                            : widget.selectionColor,
+                                        textScaler: effectiveTextScaler,
+                                        textAlign: widget.textAlign,
+                                        textDirection: _textDirection,
+                                        locale: widget.locale,
+                                        textHeightBehavior:
+                                            widget.textHeightBehavior ??
                                             DefaultTextHeightBehavior.maybeOf(
-                                                context),
-                                    textWidthBasis: widget.textWidthBasis,
-                                    obscuringCharacter:
-                                        widget.obscuringCharacter,
-                                    obscureText: widget.obscureText,
-                                    offset: offset,
-                                    rendererIgnoresPointer:
-                                        widget.rendererIgnoresPointer,
-                                    cursorWidth: widget.cursorWidth,
-                                    cursorHeight: widget.cursorHeight,
-                                    cursorRadius: widget.cursorRadius,
-                                    cursorOffset:
-                                        widget.cursorOffset ?? Offset.zero,
-                                    selectionHeightStyle:
-                                        widget.selectionHeightStyle,
-                                    selectionWidthStyle:
-                                        widget.selectionWidthStyle,
-                                    paintCursorAboveText:
-                                        widget.paintCursorAboveText,
-                                    enableInteractiveSelection:
-                                        widget._userSelectionEnabled,
-                                    textSelectionDelegate: this,
-                                    devicePixelRatio: _devicePixelRatio,
-                                    promptRectRange: _currentPromptRectRange,
-                                    promptRectColor:
-                                        widget.autocorrectionTextRectColor,
-                                    clipBehavior: widget.clipBehavior,
+                                              context,
+                                            ),
+                                        textWidthBasis: widget.textWidthBasis,
+                                        obscuringCharacter:
+                                            widget.obscuringCharacter,
+                                        obscureText: widget.obscureText,
+                                        offset: offset,
+                                        rendererIgnoresPointer:
+                                            widget.rendererIgnoresPointer,
+                                        cursorWidth: widget.cursorWidth,
+                                        cursorHeight: widget.cursorHeight,
+                                        cursorRadius: widget.cursorRadius,
+                                        cursorOffset:
+                                            widget.cursorOffset ?? Offset.zero,
+                                        selectionHeightStyle:
+                                            widget.selectionHeightStyle,
+                                        selectionWidthStyle:
+                                            widget.selectionWidthStyle,
+                                        paintCursorAboveText:
+                                            widget.paintCursorAboveText,
+                                        enableInteractiveSelection:
+                                            widget._userSelectionEnabled,
+                                        textSelectionDelegate: this,
+                                        devicePixelRatio: _devicePixelRatio,
+                                        promptRectRange:
+                                            _currentPromptRectRange,
+                                        promptRectColor:
+                                            widget.autocorrectionTextRectColor,
+                                        clipBehavior: widget.clipBehavior,
+                                      ),
+                                    ),
                                   ),
                                 ),
-                              ),
-                            ),
-                          );
-                        },
+                              );
+                            },
                       ),
                     ),
                   ),
@@ -5774,10 +6003,11 @@ class EditableTextState extends State<EditableText>
       };
       final bool brieflyShowPassword =
           WidgetsBinding.instance.platformDispatcher.brieflyShowPassword &&
-              mobilePlatforms.contains(defaultTargetPlatform);
+          mobilePlatforms.contains(defaultTargetPlatform);
       if (brieflyShowPassword) {
-        final int? o =
-            _obscureShowCharTicksPending > 0 ? _obscureLatestCharIndex : null;
+        final int? o = _obscureShowCharTicksPending > 0
+            ? _obscureLatestCharIndex
+            : null;
         if (o != null && o >= 0 && o < text.length) {
           text = text.replaceRange(o, o + 1, _value.text.substring(o, o + 1));
         }
@@ -5790,8 +6020,9 @@ class EditableTextState extends State<EditableText>
       final int placeholderLocation = _value.text.length - _placeholderLocation;
       if (_isMultiline) {
         // The zero size placeholder here allows the line to break and keep the caret on the first line.
-        placeholders.add(const _ScribblePlaceholder(
-            child: SizedBox.shrink(), size: Size.zero));
+        placeholders.add(
+          const _ScribblePlaceholder(child: SizedBox.shrink(), size: Size.zero),
+        );
         placeholders.add(
           _ScribblePlaceholder(
             child: const SizedBox.shrink(),
@@ -5801,7 +6032,9 @@ class EditableTextState extends State<EditableText>
       } else {
         placeholders.add(
           const _ScribblePlaceholder(
-              child: SizedBox.shrink(), size: Size(100.0, 0.0)),
+            child: SizedBox.shrink(),
+            size: Size(100.0, 0.0),
+          ),
         );
       }
       return TextSpan(
@@ -5818,9 +6051,11 @@ class EditableTextState extends State<EditableText>
       // If the composing range is out of range for the current text, ignore it to
       // preserve the tree integrity, otherwise in release mode a RangeError will
       // be thrown and this EditableText will be built with a broken subtree.
-      assert(!_value.composing.isValid ||
-          !withComposing ||
-          _value.isComposingRangeValid);
+      assert(
+        !_value.composing.isValid ||
+            !withComposing ||
+            _value.isComposingRangeValid,
+      );
 
       final bool composingRegionOutOfRange =
           !_value.isComposingRangeValid || !withComposing;
@@ -5886,7 +6121,8 @@ class _Editable extends MultiChildRenderObjectWidget {
     required this.clipBehavior,
     required this.controller,
   }) : super(
-            children: WidgetSpan.extractFromInlineSpan(inlineSpan, textScaler));
+         children: WidgetSpan.extractFromInlineSpan(inlineSpan, textScaler),
+       );
 
   final InlineSpan inlineSpan;
   final TextEditingValue value;
@@ -6045,7 +6281,8 @@ class _ScribbleCacheKey {
     if (identical(other, this)) {
       return RenderComparison.identical;
     }
-    final bool needsLayout = textAlign != other.textAlign ||
+    final bool needsLayout =
+        textAlign != other.textAlign ||
         textDirection != other.textDirection ||
         textScaler != other.textScaler ||
         (textHeightBehavior ?? const TextHeightBehavior()) !=
@@ -6082,7 +6319,7 @@ class _ScribbleFocusable extends StatefulWidget {
 class _ScribbleFocusableState extends State<_ScribbleFocusable>
     implements ScribbleClient {
   _ScribbleFocusableState()
-      : _elementIdentifier = (_nextElementIdentifier++).toString();
+    : _elementIdentifier = (_nextElementIdentifier++).toString();
 
   @override
   void initState() {
@@ -6123,7 +6360,9 @@ class _ScribbleFocusableState extends State<_ScribbleFocusable>
   void onScribbleFocus(Offset offset) {
     widget.focusNode.requestFocus();
     renderEditable?.selectPositionAt(
-        from: offset, cause: SelectionChangedCause.stylusHandwriting);
+      from: offset,
+      cause: SelectionChangedCause.stylusHandwriting,
+    );
     widget.updateSelectionRects();
   }
 
@@ -6141,10 +6380,14 @@ class _ScribbleFocusableState extends State<_ScribbleFocusable>
     }
     final Rect intersection = calculatedBounds.intersect(rect);
     final HitTestResult result = HitTestResult();
-    WidgetsBinding.instance
-        .hitTestInView(result, intersection.center, View.of(context).viewId);
-    return result.path
-        .any((HitTestEntry entry) => entry.target == renderEditable);
+    WidgetsBinding.instance.hitTestInView(
+      result,
+      intersection.center,
+      View.of(context).viewId,
+    );
+    return result.path.any(
+      (HitTestEntry entry) => entry.target == renderEditable,
+    );
   }
 
   @override
@@ -6301,7 +6544,8 @@ class _DeleteTextAction<T extends DirectionalTextEditingIntent>
     if (!selection.isCollapsed) {
       // Expands the selection to ensure the range covers full graphemes.
       final TextRange range = TextRange(
-        start: atomicBoundary.getLeadingTextBoundaryAt(selection.start) ??
+        start:
+            atomicBoundary.getLeadingTextBoundaryAt(selection.start) ??
             state._value.text.length,
         end: atomicBoundary.getTrailingTextBoundaryAt(selection.end - 1) ?? 0,
       );
@@ -6315,17 +6559,20 @@ class _DeleteTextAction<T extends DirectionalTextEditingIntent>
       return Actions.invoke(context!, replaceTextIntent);
     }
 
-    final int target =
-        _applyTextBoundary(selection.base, intent.forward, getTextBoundary())
-            .offset;
+    final int target = _applyTextBoundary(
+      selection.base,
+      intent.forward,
+      getTextBoundary(),
+    ).offset;
 
     final TextRange rangeToDelete = TextSelection(
       baseOffset: intent.forward
           ? atomicBoundary.getLeadingTextBoundaryAt(selection.baseOffset) ??
-              state._value.text.length
-          : atomicBoundary
-                  .getTrailingTextBoundaryAt(selection.baseOffset - 1) ??
-              0,
+                state._value.text.length
+          : atomicBoundary.getTrailingTextBoundaryAt(
+                  selection.baseOffset - 1,
+                ) ??
+                0,
       extentOffset: target,
     );
     final ReplaceTextIntent replaceTextIntent = ReplaceTextIntent(
@@ -6403,7 +6650,8 @@ class _UpdateTextSelectionAction<T extends DirectionalCaretMovementIntent>
         UpdateSelectionIntent(
           state._value,
           TextSelection.collapsed(
-              offset: intent.forward ? selection.end : selection.start),
+            offset: intent.forward ? selection.end : selection.start,
+          ),
           SelectionChangedCause.keyboard,
         ),
       );
@@ -6417,11 +6665,14 @@ class _UpdateTextSelectionAction<T extends DirectionalCaretMovementIntent>
         extent = TextPosition(offset: extent.offset);
       } else if (!intent.forward && _isAtWordwrapDownstream(extent)) {
         extent = TextPosition(
-            offset: extent.offset, affinity: TextAffinity.upstream);
+          offset: extent.offset,
+          affinity: TextAffinity.upstream,
+        );
       }
     }
 
-    final bool shouldTargetBase = isExpand &&
+    final bool shouldTargetBase =
+        isExpand &&
         (intent.forward
             ? selection.baseOffset > selection.extentOffset
             : selection.baseOffset < selection.extentOffset);
@@ -6430,15 +6681,16 @@ class _UpdateTextSelectionAction<T extends DirectionalCaretMovementIntent>
       intent.forward,
       getTextBoundary(),
     );
-    final TextSelection newSelection = collapseSelection ||
+    final TextSelection newSelection =
+        collapseSelection ||
             (!isExpand && newExtent.offset == selection.baseOffset)
         ? TextSelection.fromPosition(newExtent)
         : isExpand
-            ? selection.expandTo(
-                newExtent, extentAtIndex || selection.isCollapsed)
-            : selection.extendTo(newExtent);
+        ? selection.expandTo(newExtent, extentAtIndex || selection.isCollapsed)
+        : selection.extendTo(newExtent);
 
-    final bool shouldCollapseToBase = intent.collapseAtReversal &&
+    final bool shouldCollapseToBase =
+        intent.collapseAtReversal &&
         (selection.baseOffset - selection.extentOffset) *
                 (selection.baseOffset - newSelection.extentOffset) <
             0;
@@ -6448,7 +6700,10 @@ class _UpdateTextSelectionAction<T extends DirectionalCaretMovementIntent>
     return Actions.invoke(
       context!,
       UpdateSelectionIntent(
-          state._value, newRange, SelectionChangedCause.keyboard),
+        state._value,
+        newRange,
+        SelectionChangedCause.keyboard,
+      ),
     );
   }
 
@@ -6457,7 +6712,9 @@ class _UpdateTextSelectionAction<T extends DirectionalCaretMovementIntent>
 }
 
 class _UpdateTextSelectionVerticallyAction<
-    T extends DirectionalCaretMovementIntent> extends ContextAction<T> {
+  T extends DirectionalCaretMovementIntent
+>
+    extends ContextAction<T> {
   _UpdateTextSelectionVerticallyAction(this.state);
 
   final EditableTextState state;
@@ -6473,7 +6730,8 @@ class _UpdateTextSelectionVerticallyAction<
     }
     _runSelection = state._value.selection;
     final TextSelection currentSelection = state.widget.controller.selection;
-    final bool continueCurrentRun = currentSelection.isValid &&
+    final bool continueCurrentRun =
+        currentSelection.isValid &&
         currentSelection.isCollapsed &&
         currentSelection.baseOffset == runSelection.baseOffset &&
         currentSelection.extentOffset == runSelection.extentOffset;
@@ -6499,23 +6757,25 @@ class _UpdateTextSelectionVerticallyAction<
       _runSelection = null;
     }
 
-    final VerticalCaretMovementRun currentRun = _verticalMovementRun ??
-        state.renderEditable
-            .startVerticalCaretMovement(state.renderEditable.selection!.extent);
+    final VerticalCaretMovementRun currentRun =
+        _verticalMovementRun ??
+        state.renderEditable.startVerticalCaretMovement(
+          state.renderEditable.selection!.extent,
+        );
 
-    final bool shouldMove = intent
-            is ExtendSelectionVerticallyToAdjacentPageIntent
+    final bool shouldMove =
+        intent is ExtendSelectionVerticallyToAdjacentPageIntent
         ? currentRun.moveByOffset(
             (intent.forward ? 1.0 : -1.0) * state.renderEditable.size.height,
           )
         : intent.forward
-            ? currentRun.moveNext()
-            : currentRun.movePrevious();
+        ? currentRun.moveNext()
+        : currentRun.movePrevious();
     final TextPosition newExtent = shouldMove
         ? currentRun.current
         : intent.forward
-            ? TextPosition(offset: value.text.length)
-            : const TextPosition(offset: 0);
+        ? TextPosition(offset: value.text.length)
+        : const TextPosition(offset: 0);
     final TextSelection newSelection = collapseSelection
         ? TextSelection.fromPosition(newExtent)
         : value.selection.extendTo(newExtent);
@@ -6523,7 +6783,10 @@ class _UpdateTextSelectionVerticallyAction<
     Actions.invoke(
       context!,
       UpdateSelectionIntent(
-          value, newSelection, SelectionChangedCause.keyboard),
+        value,
+        newSelection,
+        SelectionChangedCause.keyboard,
+      ),
     );
     if (state._value.selection == newSelection) {
       _verticalMovementRun = currentRun;
@@ -6615,7 +6878,8 @@ class _EditableTextTapOutsideAction
             intent.focusNode.unfocus();
           case ui.PointerDeviceKind.trackpad:
             throw UnimplementedError(
-                'Unexpected pointer down event for trackpad');
+              'Unexpected pointer down event for trackpad',
+            );
         }
       case TargetPlatform.linux:
       case TargetPlatform.macOS:
diff --git a/lib/common/widgets/text_field/spell_check.dart b/lib/common/widgets/text_field/spell_check.dart
index 699c904d9..bb6e5606a 100644
--- a/lib/common/widgets/text_field/spell_check.dart
+++ b/lib/common/widgets/text_field/spell_check.dart
@@ -12,7 +12,8 @@ import 'package:flutter/painting.dart';
 import 'package:flutter/services.dart'
     show SpellCheckResults, SpellCheckService, SuggestionSpan, TextEditingValue;
 
-import 'package:PiliPlus/common/widgets/text_field/editable_text.dart' show EditableTextContextMenuBuilder;
+import 'package:PiliPlus/common/widgets/text_field/editable_text.dart'
+    show EditableTextContextMenuBuilder;
 
 /// Controls how spell check is performed for text input.
 ///
@@ -32,11 +33,11 @@ class SpellCheckConfiguration {
 
   /// Creates a configuration that disables spell check.
   const SpellCheckConfiguration.disabled()
-      : _spellCheckEnabled = false,
-        spellCheckService = null,
-        spellCheckSuggestionsToolbarBuilder = null,
-        misspelledTextStyle = null,
-        misspelledSelectionColor = null;
+    : _spellCheckEnabled = false,
+      spellCheckService = null,
+      spellCheckSuggestionsToolbarBuilder = null,
+      misspelledTextStyle = null,
+      misspelledSelectionColor = null;
 
   /// The service used to fetch spell check results for text input.
   final SpellCheckService? spellCheckService;
@@ -85,7 +86,7 @@ class SpellCheckConfiguration {
       misspelledTextStyle: misspelledTextStyle ?? this.misspelledTextStyle,
       spellCheckSuggestionsToolbarBuilder:
           spellCheckSuggestionsToolbarBuilder ??
-              this.spellCheckSuggestionsToolbarBuilder,
+          this.spellCheckSuggestionsToolbarBuilder,
     );
   }
 
@@ -114,11 +115,11 @@ class SpellCheckConfiguration {
 
   @override
   int get hashCode => Object.hash(
-        spellCheckService,
-        misspelledTextStyle,
-        spellCheckSuggestionsToolbarBuilder,
-        _spellCheckEnabled,
-      );
+    spellCheckService,
+    misspelledTextStyle,
+    spellCheckSuggestionsToolbarBuilder,
+    _spellCheckEnabled,
+  );
 }
 
 // Methods for displaying spell check results:
@@ -153,8 +154,9 @@ List<SuggestionSpan> _correctSpellCheckResults(
     // Try finding SuggestionSpan from resultsText in new text.
     final String escapedText = RegExp.escape(currentSpanText);
     final RegExp currentSpanTextRegexp = RegExp('\\b$escapedText\\b');
-    final int foundIndex =
-        newText.substring(searchStart).indexOf(currentSpanTextRegexp);
+    final int foundIndex = newText
+        .substring(searchStart)
+        .indexOf(currentSpanTextRegexp);
 
     // Check whether word was found exactly where expected or elsewhere in the newText.
     final bool currentSpanFoundExactly =
@@ -170,14 +172,17 @@ List<SuggestionSpan> _correctSpellCheckResults(
       // corrected results.
       final SuggestionSpan adjustedSpan = SuggestionSpan(
         TextRange(
-            start: currentSpan.range.start + offset,
-            end: currentSpan.range.end + offset),
+          start: currentSpan.range.start + offset,
+          end: currentSpan.range.end + offset,
+        ),
         currentSpan.suggestions,
       );
 
       // Start search for the next misspelled word at the end of currentSpan.
-      searchStart =
-          math.min(currentSpan.range.end + 1 + offset, newText.length);
+      searchStart = math.min(
+        currentSpan.range.end + 1 + offset,
+        newText.length,
+      );
       correctedSpellCheckResults.add(adjustedSpan);
     } else if (currentSpanFoundElsewhere) {
       // Word was pushed forward but not modified.
@@ -302,7 +307,8 @@ List<TextSpan> _buildSubtreesWithoutComposingRegion(
         endIndex = currentSpan.range.end < text.length
             ? currentSpan.range.end
             : text.length;
-        cursorInCurrentSpan = currentSpan.range.start <= cursorIndex &&
+        cursorInCurrentSpan =
+            currentSpan.range.start <= cursorIndex &&
             currentSpan.range.end >= cursorIndex;
         textSpanTreeChildren.add(
           TextSpan(
@@ -346,7 +352,7 @@ List<TextSpan> _buildSubtreesWithComposingRegion(
   final TextRange composingRegion = value.composing;
   final TextStyle composingTextStyle =
       style?.merge(const TextStyle(decoration: TextDecoration.underline)) ??
-          const TextStyle(decoration: TextDecoration.underline);
+      const TextStyle(decoration: TextDecoration.underline);
   final TextStyle misspelledJointStyle =
       style?.merge(misspelledStyle) ?? misspelledStyle;
   bool textPointerWithinComposingRegion = false;
@@ -364,8 +370,8 @@ List<TextSpan> _buildSubtreesWithComposingRegion(
             : text.length;
         textPointerWithinComposingRegion =
             composingRegion.start >= textPointer &&
-                composingRegion.end <= endIndex &&
-                !composingWithinCurrentTextRange;
+            composingRegion.end <= endIndex &&
+            !composingWithinCurrentTextRange;
 
         if (textPointerWithinComposingRegion) {
           _addComposingRegionTextSpans(
@@ -378,8 +384,9 @@ List<TextSpan> _buildSubtreesWithComposingRegion(
           );
           textSpanTreeChildren.add(
             TextSpan(
-                style: style,
-                text: text.substring(composingRegion.end, endIndex)),
+              style: style,
+              text: text.substring(composingRegion.end, endIndex),
+            ),
           );
         } else {
           textSpanTreeChildren.add(
@@ -392,7 +399,8 @@ List<TextSpan> _buildSubtreesWithComposingRegion(
         endIndex = currentSpan.range.end < text.length
             ? currentSpan.range.end
             : text.length;
-        currentSpanIsComposingRegion = textPointer >= composingRegion.start &&
+        currentSpanIsComposingRegion =
+            textPointer >= composingRegion.start &&
             endIndex <= composingRegion.end &&
             !composingWithinCurrentTextRange;
         textSpanTreeChildren.add(
@@ -426,8 +434,9 @@ List<TextSpan> _buildSubtreesWithComposingRegion(
       if (composingRegion.end != text.length) {
         textSpanTreeChildren.add(
           TextSpan(
-              style: style,
-              text: text.substring(composingRegion.end, text.length)),
+            style: style,
+            text: text.substring(composingRegion.end, text.length),
+          ),
         );
       }
     } else {
@@ -450,8 +459,9 @@ void _addComposingRegionTextSpans(
   TextStyle? style,
   TextStyle composingTextStyle,
 ) {
-  treeChildren.add(TextSpan(
-      style: style, text: text.substring(start, composingRegion.start)));
+  treeChildren.add(
+    TextSpan(style: style, text: text.substring(start, composingRegion.start)),
+  );
   treeChildren.add(
     TextSpan(
       style: composingTextStyle,
diff --git a/lib/common/widgets/text_field/spell_check_suggestions_toolbar.dart b/lib/common/widgets/text_field/spell_check_suggestions_toolbar.dart
index 7c79f68fb..9631bdcb6 100644
--- a/lib/common/widgets/text_field/spell_check_suggestions_toolbar.dart
+++ b/lib/common/widgets/text_field/spell_check_suggestions_toolbar.dart
@@ -31,9 +31,11 @@ class SpellCheckSuggestionsToolbar extends StatelessWidget {
   ///
   /// [buttonItems] must not contain more than four items, generally three
   /// suggestions and one delete button.
-  const SpellCheckSuggestionsToolbar(
-      {super.key, required this.anchor, required this.buttonItems})
-      : assert(buttonItems.length <= _kMaxSuggestions + 1);
+  const SpellCheckSuggestionsToolbar({
+    super.key,
+    required this.anchor,
+    required this.buttonItems,
+  }) : assert(buttonItems.length <= _kMaxSuggestions + 1);
 
   /// Constructs a [SpellCheckSuggestionsToolbar] with the default children for
   /// an [EditableText].
@@ -44,9 +46,9 @@ class SpellCheckSuggestionsToolbar extends StatelessWidget {
   SpellCheckSuggestionsToolbar.editableText({
     super.key,
     required EditableTextState editableTextState,
-  })  : buttonItems =
-            buildButtonItems(editableTextState) ?? <ContextMenuButtonItem>[],
-        anchor = getToolbarAnchor(editableTextState.contextMenuAnchors);
+  }) : buttonItems =
+           buildButtonItems(editableTextState) ?? <ContextMenuButtonItem>[],
+       anchor = getToolbarAnchor(editableTextState.contextMenuAnchors);
 
   /// {@template flutter.material.SpellCheckSuggestionsToolbar.anchor}
   /// The focal point below which the toolbar attempts to position itself.
@@ -72,12 +74,13 @@ class SpellCheckSuggestionsToolbar extends StatelessWidget {
   /// Builds the button items for the toolbar based on the available
   /// spell check suggestions.
   static List<ContextMenuButtonItem>? buildButtonItems(
-      EditableTextState editableTextState) {
+    EditableTextState editableTextState,
+  ) {
     // Determine if composing region is misspelled.
-    final SuggestionSpan? spanAtCursorIndex =
-        editableTextState.findSuggestionSpanAtCursorIndex(
-      editableTextState.currentTextEditingValue.selection.baseOffset,
-    );
+    final SuggestionSpan? spanAtCursorIndex = editableTextState
+        .findSuggestionSpanAtCursorIndex(
+          editableTextState.currentTextEditingValue.selection.baseOffset,
+        );
 
     if (spanAtCursorIndex == null) {
       return null;
@@ -86,8 +89,9 @@ class SpellCheckSuggestionsToolbar extends StatelessWidget {
     final List<ContextMenuButtonItem> buttonItems = <ContextMenuButtonItem>[];
 
     // Build suggestion buttons.
-    for (final String suggestion
-        in spanAtCursorIndex.suggestions.take(_kMaxSuggestions)) {
+    for (final String suggestion in spanAtCursorIndex.suggestions.take(
+      _kMaxSuggestions,
+    )) {
       buttonItems.add(
         ContextMenuButtonItem(
           onPressed: () {
@@ -95,7 +99,10 @@ class SpellCheckSuggestionsToolbar extends StatelessWidget {
               return;
             }
             _replaceText(
-                editableTextState, suggestion, spanAtCursorIndex.range);
+              editableTextState,
+              suggestion,
+              spanAtCursorIndex.range,
+            );
           },
           label: suggestion,
         ),
@@ -108,8 +115,11 @@ class SpellCheckSuggestionsToolbar extends StatelessWidget {
         if (!editableTextState.mounted) {
           return;
         }
-        _replaceText(editableTextState, '',
-            editableTextState.currentTextEditingValue.composing);
+        _replaceText(
+          editableTextState,
+          '',
+          editableTextState.currentTextEditingValue.composing,
+        );
       },
       type: ContextMenuButtonType.delete,
     );
@@ -124,22 +134,27 @@ class SpellCheckSuggestionsToolbar extends StatelessWidget {
     TextRange replacementRange,
   ) {
     // Replacement cannot be performed if the text is read only or obscured.
-    assert(!editableTextState.widget.readOnly &&
-        !editableTextState.widget.obscureText);
-
-    final TextEditingValue newValue =
-        editableTextState.textEditingValue.replaced(
-      replacementRange,
-      text,
+    assert(
+      !editableTextState.widget.readOnly &&
+          !editableTextState.widget.obscureText,
     );
+
+    final TextEditingValue newValue = editableTextState.textEditingValue
+        .replaced(
+          replacementRange,
+          text,
+        );
     editableTextState.userUpdateTextEditingValue(
-        newValue, SelectionChangedCause.toolbar);
+      newValue,
+      SelectionChangedCause.toolbar,
+    );
 
     // Schedule a call to bringIntoView() after renderEditable updates.
     SchedulerBinding.instance.addPostFrameCallback((Duration duration) {
       if (editableTextState.mounted) {
-        editableTextState
-            .bringIntoView(editableTextState.textEditingValue.selection.extent);
+        editableTextState.bringIntoView(
+          editableTextState.textEditingValue.selection.extent,
+        );
       }
     }, debugLabel: 'SpellCheckerSuggestionsToolbar.bringIntoView');
     editableTextState.hideToolbar();
@@ -159,23 +174,24 @@ class SpellCheckSuggestionsToolbar extends StatelessWidget {
     return buttonItems.map((ContextMenuButtonItem buttonItem) {
       final TextSelectionToolbarTextButton button =
           TextSelectionToolbarTextButton(
-        padding: const EdgeInsets.fromLTRB(20, 0, 0, 0),
-        onPressed: buttonItem.onPressed,
-        alignment: Alignment.centerLeft,
-        child: Text(
-          AdaptiveTextSelectionToolbar.getButtonLabel(context, buttonItem),
-          style: buttonItem.type == ContextMenuButtonType.delete
-              ? const TextStyle(color: Colors.blue)
-              : null,
-        ),
-      );
+            padding: const EdgeInsets.fromLTRB(20, 0, 0, 0),
+            onPressed: buttonItem.onPressed,
+            alignment: Alignment.centerLeft,
+            child: Text(
+              AdaptiveTextSelectionToolbar.getButtonLabel(context, buttonItem),
+              style: buttonItem.type == ContextMenuButtonType.delete
+                  ? const TextStyle(color: Colors.blue)
+                  : null,
+            ),
+          );
 
       if (buttonItem.type != ContextMenuButtonType.delete) {
         return button;
       }
       return DecoratedBox(
         decoration: const BoxDecoration(
-            border: Border(top: BorderSide(color: Colors.grey))),
+          border: Border(top: BorderSide(color: Colors.grey)),
+        ),
         child: button,
       );
     }).toList();
@@ -194,7 +210,8 @@ class SpellCheckSuggestionsToolbar extends StatelessWidget {
     final MediaQueryData mediaQueryData = MediaQuery.of(context);
     final double softKeyboardViewInsetsBottom =
         mediaQueryData.viewInsets.bottom;
-    final double paddingAbove = mediaQueryData.padding.top +
+    final double paddingAbove =
+        mediaQueryData.padding.top +
         CupertinoTextSelectionToolbar.kToolbarScreenPadding;
     // Makes up for the Padding.
     final Offset localAdjustment = Offset(
@@ -212,7 +229,8 @@ class SpellCheckSuggestionsToolbar extends StatelessWidget {
       ),
       child: CustomSingleChildLayout(
         delegate: SpellCheckSuggestionsToolbarLayoutDelegate(
-            anchor: anchor - localAdjustment),
+          anchor: anchor - localAdjustment,
+        ),
         child: AnimatedSize(
           // This duration was eyeballed on a Pixel 2 emulator running Android
           // API 28 for the Material TextSelectionToolbar.
@@ -230,8 +248,10 @@ class SpellCheckSuggestionsToolbar extends StatelessWidget {
 /// The Material-styled toolbar outline for the spell check suggestions
 /// toolbar.
 class _SpellCheckSuggestionsToolbarContainer extends StatelessWidget {
-  const _SpellCheckSuggestionsToolbarContainer(
-      {required this.height, required this.children});
+  const _SpellCheckSuggestionsToolbarContainer({
+    required this.height,
+    required this.children,
+  });
 
   final double height;
   final List<Widget> children;
diff --git a/lib/common/widgets/text_field/system_context_menu.dart b/lib/common/widgets/text_field/system_context_menu.dart
index 9969d01ae..827a8bc70 100644
--- a/lib/common/widgets/text_field/system_context_menu.dart
+++ b/lib/common/widgets/text_field/system_context_menu.dart
@@ -65,8 +65,9 @@ class SystemContextMenu extends StatefulWidget {
   }) {
     final (
       startGlyphHeight: double startGlyphHeight,
-      endGlyphHeight: double endGlyphHeight
-    ) = editableTextState.getGlyphHeights();
+      endGlyphHeight: double endGlyphHeight,
+    ) = editableTextState
+        .getGlyphHeights();
 
     return SystemContextMenu._(
       key: key,
@@ -123,7 +124,8 @@ class SystemContextMenu extends StatefulWidget {
   ///  * [EditableTextState.contextMenuButtonItems], which provides the default
   ///    [ContextMenuButtonItem]s for the Flutter-rendered context menu.
   static List<IOSSystemContextMenuItem> getDefaultItems(
-      EditableTextState editableTextState) {
+    EditableTextState editableTextState,
+  ) {
     return <IOSSystemContextMenuItem>[
       if (editableTextState.copyEnabled) const IOSSystemContextMenuItemCopy(),
       if (editableTextState.cutEnabled) const IOSSystemContextMenuItemCut(),
@@ -147,8 +149,9 @@ class _SystemContextMenuState extends State<SystemContextMenu> {
   @override
   void initState() {
     super.initState();
-    _systemContextMenuController =
-        SystemContextMenuController(onSystemHide: widget.onSystemHide);
+    _systemContextMenuController = SystemContextMenuController(
+      onSystemHide: widget.onSystemHide,
+    );
   }
 
   @override
@@ -162,8 +165,9 @@ class _SystemContextMenuState extends State<SystemContextMenu> {
     assert(SystemContextMenu.isSupported(context));
 
     if (widget.items.isNotEmpty) {
-      final WidgetsLocalizations localizations =
-          WidgetsLocalizations.of(context);
+      final WidgetsLocalizations localizations = WidgetsLocalizations.of(
+        context,
+      );
       final List<IOSSystemContextMenuItemData> itemDatas = widget.items
           .map((IOSSystemContextMenuItem item) => item.getData(localizations))
           .toList();
@@ -279,7 +283,8 @@ final class IOSSystemContextMenuItemPaste extends IOSSystemContextMenuItem {
 
   @override
   IOSSystemContextMenuItemDataPaste getData(
-      WidgetsLocalizations localizations) {
+    WidgetsLocalizations localizations,
+  ) {
     return const IOSSystemContextMenuItemDataPaste();
   }
 }
@@ -303,7 +308,8 @@ final class IOSSystemContextMenuItemSelectAll extends IOSSystemContextMenuItem {
 
   @override
   IOSSystemContextMenuItemDataSelectAll getData(
-      WidgetsLocalizations localizations) {
+    WidgetsLocalizations localizations,
+  ) {
     return const IOSSystemContextMenuItemDataSelectAll();
   }
 }
@@ -334,9 +340,11 @@ final class IOSSystemContextMenuItemLookUp extends IOSSystemContextMenuItem {
 
   @override
   IOSSystemContextMenuItemDataLookUp getData(
-      WidgetsLocalizations localizations) {
+    WidgetsLocalizations localizations,
+  ) {
     return IOSSystemContextMenuItemDataLookUp(
-        title: title ?? localizations.lookUpButtonLabel);
+      title: title ?? localizations.lookUpButtonLabel,
+    );
   }
 
   @override
@@ -371,7 +379,8 @@ final class IOSSystemContextMenuItemSearchWeb extends IOSSystemContextMenuItem {
 
   @override
   IOSSystemContextMenuItemDataSearchWeb getData(
-      WidgetsLocalizations localizations) {
+    WidgetsLocalizations localizations,
+  ) {
     return IOSSystemContextMenuItemDataSearchWeb(
       title: title ?? localizations.searchWebButtonLabel,
     );
@@ -409,9 +418,11 @@ final class IOSSystemContextMenuItemShare extends IOSSystemContextMenuItem {
 
   @override
   IOSSystemContextMenuItemDataShare getData(
-      WidgetsLocalizations localizations) {
+    WidgetsLocalizations localizations,
+  ) {
     return IOSSystemContextMenuItemDataShare(
-        title: title ?? localizations.shareButtonLabel);
+      title: title ?? localizations.shareButtonLabel,
+    );
   }
 
   @override
diff --git a/lib/common/widgets/text_field/text_field.dart b/lib/common/widgets/text_field/text_field.dart
index 912172a37..c128d28f8 100644
--- a/lib/common/widgets/text_field/text_field.dart
+++ b/lib/common/widgets/text_field/text_field.dart
@@ -66,25 +66,27 @@ export 'package:flutter/services.dart'
 // late FocusNode myFocusNode;
 
 /// Signature for the [RichTextField.buildCounter] callback.
-typedef InputCounterWidgetBuilder = Widget? Function(
-  /// The build context for the TextField.
-  BuildContext context, {
-  /// The length of the string currently in the input.
-  required int currentLength,
+typedef InputCounterWidgetBuilder =
+    Widget? Function(
+      /// The build context for the TextField.
+      BuildContext context, {
 
-  /// The maximum string length that can be entered into the TextField.
-  required int? maxLength,
+      /// The length of the string currently in the input.
+      required int currentLength,
 
-  /// Whether or not the TextField is currently focused. Mainly provided for
-  /// the [liveRegion] parameter in the [Semantics] widget for accessibility.
-  required bool isFocused,
-});
+      /// The maximum string length that can be entered into the TextField.
+      required int? maxLength,
+
+      /// Whether or not the TextField is currently focused. Mainly provided for
+      /// the [liveRegion] parameter in the [Semantics] widget for accessibility.
+      required bool isFocused,
+    });
 
 class _TextFieldSelectionGestureDetectorBuilder
     extends TextSelectionGestureDetectorBuilder {
   _TextFieldSelectionGestureDetectorBuilder({required RichTextFieldState state})
-      : _state = state,
-        super(delegate: state);
+    : _state = state,
+      super(delegate: state);
 
   final RichTextFieldState _state;
 
@@ -343,37 +345,44 @@ class RichTextField extends StatefulWidget {
     this.canRequestFocus = true,
     this.spellCheckConfiguration,
     this.magnifierConfiguration,
-  })  : assert(obscuringCharacter.length == 1),
-        smartDashesType = smartDashesType ??
-            (obscureText ? SmartDashesType.disabled : SmartDashesType.enabled),
-        smartQuotesType = smartQuotesType ??
-            (obscureText ? SmartQuotesType.disabled : SmartQuotesType.enabled),
-        assert(maxLines == null || maxLines > 0),
-        assert(minLines == null || minLines > 0),
-        assert(
-          (maxLines == null) || (minLines == null) || (maxLines >= minLines),
-          "minLines can't be greater than maxLines",
-        ),
-        assert(
-          !expands || (maxLines == null && minLines == null),
-          'minLines and maxLines must be null when expands is true.',
-        ),
-        assert(!obscureText || maxLines == 1,
-            'Obscured fields cannot be multiline.'),
-        assert(maxLength == null ||
-            maxLength == RichTextField.noMaxLength ||
-            maxLength > 0),
-        // Assert the following instead of setting it directly to avoid surprising the user by silently changing the value they set.
-        assert(
-          !identical(textInputAction, TextInputAction.newline) ||
-              maxLines == 1 ||
-              !identical(keyboardType, TextInputType.text),
-          'Use keyboardType TextInputType.multiline when using TextInputAction.newline on a multiline TextField.',
-        ),
-        keyboardType = keyboardType ??
-            (maxLines == 1 ? TextInputType.text : TextInputType.multiline),
-        enableInteractiveSelection =
-            enableInteractiveSelection ?? (!readOnly || !obscureText);
+  }) : assert(obscuringCharacter.length == 1),
+       smartDashesType =
+           smartDashesType ??
+           (obscureText ? SmartDashesType.disabled : SmartDashesType.enabled),
+       smartQuotesType =
+           smartQuotesType ??
+           (obscureText ? SmartQuotesType.disabled : SmartQuotesType.enabled),
+       assert(maxLines == null || maxLines > 0),
+       assert(minLines == null || minLines > 0),
+       assert(
+         (maxLines == null) || (minLines == null) || (maxLines >= minLines),
+         "minLines can't be greater than maxLines",
+       ),
+       assert(
+         !expands || (maxLines == null && minLines == null),
+         'minLines and maxLines must be null when expands is true.',
+       ),
+       assert(
+         !obscureText || maxLines == 1,
+         'Obscured fields cannot be multiline.',
+       ),
+       assert(
+         maxLength == null ||
+             maxLength == RichTextField.noMaxLength ||
+             maxLength > 0,
+       ),
+       // Assert the following instead of setting it directly to avoid surprising the user by silently changing the value they set.
+       assert(
+         !identical(textInputAction, TextInputAction.newline) ||
+             maxLines == 1 ||
+             !identical(keyboardType, TextInputType.text),
+         'Use keyboardType TextInputType.multiline when using TextInputAction.newline on a multiline TextField.',
+       ),
+       keyboardType =
+           keyboardType ??
+           (maxLines == 1 ? TextInputType.text : TextInputType.multiline),
+       enableInteractiveSelection =
+           enableInteractiveSelection ?? (!readOnly || !obscureText);
 
   /// The configuration for the magnifier of this text field.
   ///
@@ -883,10 +892,12 @@ class RichTextField extends StatefulWidget {
     if (defaultTargetPlatform == TargetPlatform.iOS &&
         SystemContextMenu.isSupported(context)) {
       return SystemContextMenu.editableText(
-          editableTextState: editableTextState);
+        editableTextState: editableTextState,
+      );
     }
     return AdaptiveTextSelectionToolbar.editableText(
-        editableTextState: editableTextState);
+      editableTextState: editableTextState,
+    );
   }
 
   /// {@macro flutter.widgets.EditableText.spellCheckConfiguration}
@@ -936,7 +947,8 @@ class RichTextField extends StatefulWidget {
       case TargetPlatform.linux:
       case TargetPlatform.windows:
         return SpellCheckSuggestionsToolbar.editableText(
-            editableTextState: editableTextState);
+          editableTextState: editableTextState,
+        );
     }
   }
 
@@ -951,11 +963,12 @@ class RichTextField extends StatefulWidget {
       return const SpellCheckConfiguration.disabled();
     }
     return configuration.copyWith(
-      misspelledTextStyle: configuration.misspelledTextStyle ??
+      misspelledTextStyle:
+          configuration.misspelledTextStyle ??
           RichTextField.materialMisspelledTextStyle,
       spellCheckSuggestionsToolbarBuilder:
           configuration.spellCheckSuggestionsToolbarBuilder ??
-              RichTextField.defaultSpellCheckSuggestionsToolbarBuilder,
+          RichTextField.defaultSpellCheckSuggestionsToolbarBuilder,
     );
   }
 
@@ -967,11 +980,19 @@ class RichTextField extends StatefulWidget {
     super.debugFillProperties(properties);
     properties
       ..add(
-        DiagnosticsProperty<RichTextEditingController>('controller', controller,
-            defaultValue: null),
+        DiagnosticsProperty<RichTextEditingController>(
+          'controller',
+          controller,
+          defaultValue: null,
+        ),
+      )
+      ..add(
+        DiagnosticsProperty<FocusNode>(
+          'focusNode',
+          focusNode,
+          defaultValue: null,
+        ),
       )
-      ..add(DiagnosticsProperty<FocusNode>('focusNode', focusNode,
-          defaultValue: null))
       ..add(
         DiagnosticsProperty<UndoHistoryController>(
           'undoController',
@@ -995,35 +1016,54 @@ class RichTextField extends StatefulWidget {
         ),
       )
       ..add(DiagnosticsProperty<TextStyle>('style', style, defaultValue: null))
-      ..add(DiagnosticsProperty<bool>('autofocus', autofocus,
-          defaultValue: false))
       ..add(
-        DiagnosticsProperty<String>('obscuringCharacter', obscuringCharacter,
-            defaultValue: '•'),
+        DiagnosticsProperty<bool>('autofocus', autofocus, defaultValue: false),
+      )
+      ..add(
+        DiagnosticsProperty<String>(
+          'obscuringCharacter',
+          obscuringCharacter,
+          defaultValue: '•',
+        ),
+      )
+      ..add(
+        DiagnosticsProperty<bool>(
+          'obscureText',
+          obscureText,
+          defaultValue: false,
+        ),
+      )
+      ..add(
+        DiagnosticsProperty<bool>(
+          'autocorrect',
+          autocorrect,
+          defaultValue: true,
+        ),
       )
-      ..add(DiagnosticsProperty<bool>('obscureText', obscureText,
-          defaultValue: false))
-      ..add(DiagnosticsProperty<bool>('autocorrect', autocorrect,
-          defaultValue: true))
       ..add(
         EnumProperty<SmartDashesType>(
           'smartDashesType',
           smartDashesType,
-          defaultValue:
-              obscureText ? SmartDashesType.disabled : SmartDashesType.enabled,
+          defaultValue: obscureText
+              ? SmartDashesType.disabled
+              : SmartDashesType.enabled,
         ),
       )
       ..add(
         EnumProperty<SmartQuotesType>(
           'smartQuotesType',
           smartQuotesType,
-          defaultValue:
-              obscureText ? SmartQuotesType.disabled : SmartQuotesType.enabled,
+          defaultValue: obscureText
+              ? SmartQuotesType.disabled
+              : SmartQuotesType.enabled,
         ),
       )
       ..add(
-        DiagnosticsProperty<bool>('enableSuggestions', enableSuggestions,
-            defaultValue: true),
+        DiagnosticsProperty<bool>(
+          'enableSuggestions',
+          enableSuggestions,
+          defaultValue: true,
+        ),
       )
       ..add(IntProperty('maxLines', maxLines, defaultValue: 1))
       ..add(IntProperty('minLines', minLines, defaultValue: null))
@@ -1037,8 +1077,11 @@ class RichTextField extends StatefulWidget {
         ),
       )
       ..add(
-        EnumProperty<TextInputAction>('textInputAction', textInputAction,
-            defaultValue: null),
+        EnumProperty<TextInputAction>(
+          'textInputAction',
+          textInputAction,
+          defaultValue: null,
+        ),
       )
       ..add(
         EnumProperty<TextCapitalization>(
@@ -1047,8 +1090,13 @@ class RichTextField extends StatefulWidget {
           defaultValue: TextCapitalization.none,
         ),
       )
-      ..add(EnumProperty<TextAlign>('textAlign', textAlign,
-          defaultValue: TextAlign.start))
+      ..add(
+        EnumProperty<TextAlign>(
+          'textAlign',
+          textAlign,
+          defaultValue: TextAlign.start,
+        ),
+      )
       ..add(
         DiagnosticsProperty<TextAlignVertical>(
           'textAlignVertical',
@@ -1056,24 +1104,39 @@ class RichTextField extends StatefulWidget {
           defaultValue: null,
         ),
       )
-      ..add(EnumProperty<TextDirection>('textDirection', textDirection,
-          defaultValue: null))
+      ..add(
+        EnumProperty<TextDirection>(
+          'textDirection',
+          textDirection,
+          defaultValue: null,
+        ),
+      )
       ..add(DoubleProperty('cursorWidth', cursorWidth, defaultValue: 2.0))
       ..add(DoubleProperty('cursorHeight', cursorHeight, defaultValue: null))
-      ..add(DiagnosticsProperty<Radius>('cursorRadius', cursorRadius,
-          defaultValue: null))
+      ..add(
+        DiagnosticsProperty<Radius>(
+          'cursorRadius',
+          cursorRadius,
+          defaultValue: null,
+        ),
+      )
       ..add(
         DiagnosticsProperty<bool>(
-            'cursorOpacityAnimates', cursorOpacityAnimates,
-            defaultValue: null),
+          'cursorOpacityAnimates',
+          cursorOpacityAnimates,
+          defaultValue: null,
+        ),
       )
       ..add(ColorProperty('cursorColor', cursorColor, defaultValue: null))
-      ..add(ColorProperty('cursorErrorColor', cursorErrorColor,
-          defaultValue: null))
+      ..add(
+        ColorProperty('cursorErrorColor', cursorErrorColor, defaultValue: null),
+      )
       ..add(
         DiagnosticsProperty<Brightness>(
-            'keyboardAppearance', keyboardAppearance,
-            defaultValue: null),
+          'keyboardAppearance',
+          keyboardAppearance,
+          defaultValue: null,
+        ),
       )
       ..add(
         DiagnosticsProperty<EdgeInsetsGeometry>(
@@ -1105,16 +1168,25 @@ class RichTextField extends StatefulWidget {
         ),
       )
       ..add(
-        DiagnosticsProperty<ScrollPhysics>('scrollPhysics', scrollPhysics,
-            defaultValue: null),
+        DiagnosticsProperty<ScrollPhysics>(
+          'scrollPhysics',
+          scrollPhysics,
+          defaultValue: null,
+        ),
       )
       ..add(
-        DiagnosticsProperty<Clip>('clipBehavior', clipBehavior,
-            defaultValue: Clip.hardEdge),
+        DiagnosticsProperty<Clip>(
+          'clipBehavior',
+          clipBehavior,
+          defaultValue: Clip.hardEdge,
+        ),
       )
       ..add(
-        DiagnosticsProperty<bool>('scribbleEnabled', scribbleEnabled,
-            defaultValue: true),
+        DiagnosticsProperty<bool>(
+          'scribbleEnabled',
+          scribbleEnabled,
+          defaultValue: true,
+        ),
       )
       ..add(
         DiagnosticsProperty<bool>(
@@ -1163,7 +1235,8 @@ class RichTextFieldState extends State<RichTextField>
   MaxLengthEnforcement get _effectiveMaxLengthEnforcement =>
       widget.maxLengthEnforcement ??
       LengthLimitingTextInputFormatter.getDefaultMaxLengthEnforcement(
-          Theme.of(context).platform);
+        Theme.of(context).platform,
+      );
 
   bool _isHovering = false;
 
@@ -1175,7 +1248,7 @@ class RichTextFieldState extends State<RichTextField>
   bool _showSelectionHandles = false;
 
   late _TextFieldSelectionGestureDetectorBuilder
-      _selectionGestureDetectorBuilder;
+  _selectionGestureDetectorBuilder;
 
   // API for TextSelectionGestureDetectorBuilderDelegate.
   @override
@@ -1197,13 +1270,12 @@ class RichTextFieldState extends State<RichTextField>
       widget.maxLength != null &&
       widget.maxLength! > 0 &&
       (
-          // widget.controller == null
-          //   ? !restorePending &&
-          //       _effectiveController.value.text.characters.length >
-          //           widget.maxLength!
-          //   :
-          _effectiveController.value.text.characters.length >
-              widget.maxLength!);
+      // widget.controller == null
+      //   ? !restorePending &&
+      //       _effectiveController.value.text.characters.length >
+      //           widget.maxLength!
+      //   :
+      _effectiveController.value.text.characters.length > widget.maxLength!);
 
   bool get _hasError =>
       widget.decoration?.errorText != null ||
@@ -1216,8 +1288,9 @@ class RichTextFieldState extends State<RichTextField>
       Theme.of(context).colorScheme.error;
 
   InputDecoration _getEffectiveDecoration() {
-    final MaterialLocalizations localizations =
-        MaterialLocalizations.of(context);
+    final MaterialLocalizations localizations = MaterialLocalizations.of(
+      context,
+    );
     final ThemeData themeData = Theme.of(context);
     final InputDecoration effectiveDecoration =
         (widget.decoration ?? const InputDecoration())
@@ -1249,7 +1322,10 @@ class RichTextFieldState extends State<RichTextField>
       // If buildCounter returns null, don't add a counter widget to the field.
       if (builtCounter != null) {
         counter = Semantics(
-            container: true, liveRegion: isFocused, child: builtCounter);
+          container: true,
+          liveRegion: isFocused,
+          child: builtCounter,
+        );
       }
       return effectiveDecoration.copyWith(counter: counter);
     }
@@ -1265,16 +1341,20 @@ class RichTextFieldState extends State<RichTextField>
     if (widget.maxLength! > 0) {
       // Show the maxLength in the counter
       counterText += '/${widget.maxLength}';
-      final int remaining =
-          (widget.maxLength! - currentLength).clamp(0, widget.maxLength!);
-      semanticCounterText =
-          localizations.remainingTextFieldCharacterCount(remaining);
+      final int remaining = (widget.maxLength! - currentLength).clamp(
+        0,
+        widget.maxLength!,
+      );
+      semanticCounterText = localizations.remainingTextFieldCharacterCount(
+        remaining,
+      );
     }
 
     if (_hasIntrinsicError) {
       return effectiveDecoration.copyWith(
         errorText: effectiveDecoration.errorText ?? '',
-        counterStyle: effectiveDecoration.errorStyle ??
+        counterStyle:
+            effectiveDecoration.errorStyle ??
             (themeData.useMaterial3
                 ? _m3CounterErrorStyle(context)
                 : _m2CounterErrorStyle(context)),
@@ -1436,12 +1516,13 @@ class RichTextFieldState extends State<RichTextField>
       // Rebuild the widget on focus change to show/hide the text selection
       // highlight.
     });
-    _statesController.update(
-        WidgetState.focused, _effectiveFocusNode.hasFocus);
+    _statesController.update(WidgetState.focused, _effectiveFocusNode.hasFocus);
   }
 
   void _handleSelectionChanged(
-      TextSelection selection, SelectionChangedCause? cause) {
+    TextSelection selection,
+    SelectionChangedCause? cause,
+  ) {
     final bool willShowSelectionHandles = _shouldShowSelectionHandles(cause);
     if (willShowSelectionHandles != _showSelectionHandles) {
       setState(() {
@@ -1508,8 +1589,7 @@ class RichTextFieldState extends State<RichTextField>
     }
     _statesController.update(WidgetState.disabled, !_isEnabled);
     _statesController.update(WidgetState.hovered, _isHovering);
-    _statesController.update(
-        WidgetState.focused, _effectiveFocusNode.hasFocus);
+    _statesController.update(WidgetState.focused, _effectiveFocusNode.hasFocus);
     _statesController.update(WidgetState.error, _hasError);
     _statesController.addListener(_handleStatesControllerChange);
   }
@@ -1524,8 +1604,9 @@ class RichTextFieldState extends State<RichTextField>
 
   @override
   TextInputConfiguration get textInputConfiguration {
-    final List<String>? autofillHints =
-        widget.autofillHints?.toList(growable: false);
+    final List<String>? autofillHints = widget.autofillHints?.toList(
+      growable: false,
+    );
     final AutofillConfiguration autofillConfiguration = autofillHints != null
         ? AutofillConfiguration(
             uniqueIdentifier: autofillId,
@@ -1549,8 +1630,10 @@ class RichTextFieldState extends State<RichTextField>
           : _m2StateInputStyle(context)!,
       _statesController.value,
     );
-    final TextStyle providedStyle =
-        WidgetStateProperty.resolveAs(style, _statesController.value);
+    final TextStyle providedStyle = WidgetStateProperty.resolveAs(
+      style,
+      _statesController.value,
+    );
     return providedStyle.merge(stateStyle);
   }
 
@@ -1568,8 +1651,9 @@ class RichTextFieldState extends State<RichTextField>
     );
 
     final ThemeData theme = Theme.of(context);
-    final DefaultSelectionStyle selectionStyle =
-        DefaultSelectionStyle.of(context);
+    final DefaultSelectionStyle selectionStyle = DefaultSelectionStyle.of(
+      context,
+    );
     final TextStyle? providedStyle = WidgetStateProperty.resolveAs(
       widget.style,
       _statesController.value,
@@ -1601,16 +1685,16 @@ class RichTextFieldState extends State<RichTextField>
       case TargetPlatform.macOS:
         spellCheckConfiguration =
             CupertinoRichTextField.inferIOSSpellCheckConfiguration(
-          widget.spellCheckConfiguration,
-        );
+              widget.spellCheckConfiguration,
+            );
       case TargetPlatform.android:
       case TargetPlatform.fuchsia:
       case TargetPlatform.linux:
       case TargetPlatform.windows:
         spellCheckConfiguration =
             RichTextField.inferAndroidSpellCheckConfiguration(
-          widget.spellCheckConfiguration,
-        );
+              widget.spellCheckConfiguration,
+            );
     }
 
     TextSelectionControls? textSelectionControls = widget.selectionControls;
@@ -1634,13 +1718,16 @@ class RichTextFieldState extends State<RichTextField>
         cursorColor = _hasError
             ? _errorColor
             : widget.cursorColor ??
-                selectionStyle.cursorColor ??
-                cupertinoTheme.primaryColor;
-        selectionColor = selectionStyle.selectionColor ??
+                  selectionStyle.cursorColor ??
+                  cupertinoTheme.primaryColor;
+        selectionColor =
+            selectionStyle.selectionColor ??
             cupertinoTheme.primaryColor.withOpacity(0.40);
         cursorRadius ??= const Radius.circular(2.0);
         cursorOffset = Offset(
-            iOSHorizontalOffset / MediaQuery.devicePixelRatioOf(context), 0);
+          iOSHorizontalOffset / MediaQuery.devicePixelRatioOf(context),
+          0,
+        );
         autocorrectionTextRectColor = selectionColor;
 
       case TargetPlatform.macOS:
@@ -1652,13 +1739,16 @@ class RichTextFieldState extends State<RichTextField>
         cursorColor = _hasError
             ? _errorColor
             : widget.cursorColor ??
-                selectionStyle.cursorColor ??
-                cupertinoTheme.primaryColor;
-        selectionColor = selectionStyle.selectionColor ??
+                  selectionStyle.cursorColor ??
+                  cupertinoTheme.primaryColor;
+        selectionColor =
+            selectionStyle.selectionColor ??
             cupertinoTheme.primaryColor.withOpacity(0.40);
         cursorRadius ??= const Radius.circular(2.0);
         cursorOffset = Offset(
-            iOSHorizontalOffset / MediaQuery.devicePixelRatioOf(context), 0);
+          iOSHorizontalOffset / MediaQuery.devicePixelRatioOf(context),
+          0,
+        );
         handleDidGainAccessibilityFocus = () {
           // Automatically activate the TextField when it receives accessibility focus.
           if (!_effectiveFocusNode.hasFocus &&
@@ -1679,9 +1769,10 @@ class RichTextFieldState extends State<RichTextField>
         cursorColor = _hasError
             ? _errorColor
             : widget.cursorColor ??
-                selectionStyle.cursorColor ??
-                theme.colorScheme.primary;
-        selectionColor = selectionStyle.selectionColor ??
+                  selectionStyle.cursorColor ??
+                  theme.colorScheme.primary;
+        selectionColor =
+            selectionStyle.selectionColor ??
             theme.colorScheme.primary.withOpacity(0.40);
 
       case TargetPlatform.linux:
@@ -1692,9 +1783,10 @@ class RichTextFieldState extends State<RichTextField>
         cursorColor = _hasError
             ? _errorColor
             : widget.cursorColor ??
-                selectionStyle.cursorColor ??
-                theme.colorScheme.primary;
-        selectionColor = selectionStyle.selectionColor ??
+                  selectionStyle.cursorColor ??
+                  theme.colorScheme.primary;
+        selectionColor =
+            selectionStyle.selectionColor ??
             theme.colorScheme.primary.withOpacity(0.40);
         handleDidGainAccessibilityFocus = () {
           // Automatically activate the TextField when it receives accessibility focus.
@@ -1715,9 +1807,10 @@ class RichTextFieldState extends State<RichTextField>
         cursorColor = _hasError
             ? _errorColor
             : widget.cursorColor ??
-                selectionStyle.cursorColor ??
-                theme.colorScheme.primary;
-        selectionColor = selectionStyle.selectionColor ??
+                  selectionStyle.cursorColor ??
+                  theme.colorScheme.primary;
+        selectionColor =
+            selectionStyle.selectionColor ??
             theme.colorScheme.primary.withOpacity(0.40);
         handleDidGainAccessibilityFocus = () {
           // Automatically activate the TextField when it receives accessibility focus.
@@ -1762,8 +1855,9 @@ class RichTextFieldState extends State<RichTextField>
           expands: widget.expands,
           // Only show the selection highlight when the text field is focused.
           selectionColor: focusNode.hasFocus ? selectionColor : null,
-          selectionControls:
-              widget.selectionEnabled ? textSelectionControls : null,
+          selectionControls: widget.selectionEnabled
+              ? textSelectionControls
+              : null,
           onChanged: widget.onChanged,
           onSelectionChanged: _handleSelectionChanged,
           onEditingComplete: widget.onEditingComplete,
@@ -1802,7 +1896,8 @@ class RichTextFieldState extends State<RichTextField>
           contentInsertionConfiguration: widget.contentInsertionConfiguration,
           contextMenuBuilder: widget.contextMenuBuilder,
           spellCheckConfiguration: spellCheckConfiguration,
-          magnifierConfiguration: widget.magnifierConfiguration ??
+          magnifierConfiguration:
+              widget.magnifierConfiguration ??
               TextMagnifier.adaptiveMagnifierConfiguration,
         ),
       ),
@@ -1829,9 +1924,9 @@ class RichTextFieldState extends State<RichTextField>
     }
     final MouseCursor effectiveMouseCursor =
         WidgetStateProperty.resolveAs<MouseCursor>(
-      widget.mouseCursor ?? WidgetStateMouseCursor.textable,
-      _statesController.value,
-    );
+          widget.mouseCursor ?? WidgetStateMouseCursor.textable,
+          _statesController.value,
+        );
 
     final int? semanticsMaxValueLength;
     if (_effectiveMaxLengthEnforcement != MaxLengthEnforcement.none &&
@@ -1862,8 +1957,8 @@ class RichTextFieldState extends State<RichTextField>
                         if (!_effectiveController.selection.isValid) {
                           _effectiveController.selection =
                               TextSelection.collapsed(
-                            offset: _effectiveController.text.length,
-                          );
+                                offset: _effectiveController.text.length,
+                              );
                         }
                         _requestKeyboard();
                       },
@@ -1926,10 +2021,9 @@ TextStyle? _m2StateInputStyle(BuildContext context) =>
       return TextStyle(color: theme.textTheme.titleMedium?.color);
     });
 
-TextStyle _m2CounterErrorStyle(BuildContext context) => Theme.of(context)
-    .textTheme
-    .bodySmall!
-    .copyWith(color: Theme.of(context).colorScheme.error);
+TextStyle _m2CounterErrorStyle(BuildContext context) => Theme.of(
+  context,
+).textTheme.bodySmall!.copyWith(color: Theme.of(context).colorScheme.error);
 
 // BEGIN GENERATED TOKEN PROPERTIES - TextField
 
diff --git a/lib/common/widgets/text_field/text_selection.dart b/lib/common/widgets/text_field/text_selection.dart
index ef149f913..b81a19bca 100644
--- a/lib/common/widgets/text_field/text_selection.dart
+++ b/lib/common/widgets/text_field/text_selection.dart
@@ -143,12 +143,13 @@ class TextSelectionGestureDetectorBuilder {
   ]) {
     assert(renderEditable.selection?.baseOffset != null);
 
-    final TextPosition tappedPosition =
-        renderEditable.getPositionForPoint(offset);
+    final TextPosition tappedPosition = renderEditable.getPositionForPoint(
+      offset,
+    );
     final TextSelection selection = fromSelection ?? renderEditable.selection!;
     final bool baseIsCloser =
         (tappedPosition.offset - selection.baseOffset).abs() <
-            (tappedPosition.offset - selection.extentOffset).abs();
+        (tappedPosition.offset - selection.extentOffset).abs();
     final TextSelection nextSelection = selection.copyWith(
       baseOffset: baseIsCloser ? selection.extentOffset : selection.baseOffset,
       extentOffset: tappedPosition.offset,
@@ -171,11 +172,13 @@ class TextSelectionGestureDetectorBuilder {
   void _extendSelection(Offset offset, SelectionChangedCause cause) {
     assert(renderEditable.selection?.baseOffset != null);
 
-    final TextPosition tappedPosition =
-        renderEditable.getPositionForPoint(offset);
+    final TextPosition tappedPosition = renderEditable.getPositionForPoint(
+      offset,
+    );
     final TextSelection selection = renderEditable.selection!;
-    final TextSelection nextSelection =
-        selection.copyWith(extentOffset: tappedPosition.offset);
+    final TextSelection nextSelection = selection.copyWith(
+      extentOffset: tappedPosition.offset,
+    );
 
     editableText.userUpdateTextEditingValue(
       editableText.textEditingValue.copyWith(selection: nextSelection),
@@ -215,16 +218,16 @@ class TextSelectionGestureDetectorBuilder {
   double get _scrollPosition {
     final ScrollableState? scrollableState =
         delegate.editableTextKey.currentContext == null
-            ? null
-            : Scrollable.maybeOf(delegate.editableTextKey.currentContext!);
+        ? null
+        : Scrollable.maybeOf(delegate.editableTextKey.currentContext!);
     return scrollableState == null ? 0.0 : scrollableState.position.pixels;
   }
 
   AxisDirection? get _scrollDirection {
     final ScrollableState? scrollableState =
         delegate.editableTextKey.currentContext == null
-            ? null
-            : Scrollable.maybeOf(delegate.editableTextKey.currentContext!);
+        ? null
+        : Scrollable.maybeOf(delegate.editableTextKey.currentContext!);
     return scrollableState?.axisDirection;
   }
 
@@ -249,11 +252,12 @@ class TextSelectionGestureDetectorBuilder {
   ///    callback.
   @protected
   void onTapTrackStart() {
-    _isShiftPressed = HardwareKeyboard.instance.logicalKeysPressed
-        .intersection(<LogicalKeyboardKey>{
-      LogicalKeyboardKey.shiftLeft,
-      LogicalKeyboardKey.shiftRight,
-    }).isNotEmpty;
+    _isShiftPressed = HardwareKeyboard.instance.logicalKeysPressed.intersection(
+      <LogicalKeyboardKey>{
+        LogicalKeyboardKey.shiftLeft,
+        LogicalKeyboardKey.shiftRight,
+      },
+    ).isNotEmpty;
   }
 
   /// Handler for [TextSelectionGestureDetector.onTapTrackReset].
@@ -287,8 +291,9 @@ class TextSelectionGestureDetectorBuilder {
     // vs [TapGestureRecognizer.onSecondaryTapUp] instead of having to track state in
     // renderEditable. When this migration is complete we should remove this hack.
     // See https://github.com/flutter/flutter/issues/115130.
-    renderEditable
-        .handleTapDown(TapDownDetails(globalPosition: details.globalPosition));
+    renderEditable.handleTapDown(
+      TapDownDetails(globalPosition: details.globalPosition),
+    );
     // The selection overlay should only be shown when the user is interacting
     // through a touch screen (via either a finger or a stylus). A mouse shouldn't
     // trigger the selection overlay.
@@ -297,7 +302,8 @@ class TextSelectionGestureDetectorBuilder {
     // TODO(justinmc): Should a desktop platform show its selection toolbar when
     // receiving a tap event?  Say a Windows device with a touchscreen.
     // https://github.com/flutter/flutter/issues/106586
-    _shouldShowSelectionToolbar = kind == null ||
+    _shouldShowSelectionToolbar =
+        kind == null ||
         kind == PointerDeviceKind.touch ||
         kind == PointerDeviceKind.stylus;
 
@@ -309,8 +315,7 @@ class TextSelectionGestureDetectorBuilder {
       case TargetPlatform.android:
         if (editableText.widget.stylusHandwritingEnabled) {
           final bool stylusEnabled = switch (kind) {
-            PointerDeviceKind.stylus ||
-            PointerDeviceKind.invertedStylus =>
+            PointerDeviceKind.stylus || PointerDeviceKind.invertedStylus =>
               editableText.widget.stylusHandwritingEnabled,
             _ => false,
           };
@@ -318,7 +323,8 @@ class TextSelectionGestureDetectorBuilder {
             Scribe.isFeatureAvailable().then((bool isAvailable) {
               if (isAvailable) {
                 renderEditable.selectPosition(
-                    cause: SelectionChangedCause.stylusHandwriting);
+                  cause: SelectionChangedCause.stylusHandwriting,
+                );
                 Scribe.startStylusHandwriting();
               }
             });
@@ -337,7 +343,10 @@ class TextSelectionGestureDetectorBuilder {
               ? null
               : const TextSelection.collapsed(offset: 0);
           _expandSelection(
-              details.globalPosition, SelectionChangedCause.tap, fromSelection);
+            details.globalPosition,
+            SelectionChangedCause.tap,
+            fromSelection,
+          );
           return;
         }
         // On macOS, a tap/click places the selection in a precise position.
@@ -474,7 +483,10 @@ class TextSelectionGestureDetectorBuilder {
               ? null
               : const TextSelection.collapsed(offset: 0);
           _expandSelection(
-              details.globalPosition, SelectionChangedCause.tap, fromSelection);
+            details.globalPosition,
+            SelectionChangedCause.tap,
+            fromSelection,
+          );
           return;
         }
         switch (details.kind) {
@@ -505,16 +517,19 @@ class TextSelectionGestureDetectorBuilder {
             // Selects the word edge closest to the tap when the editable is not focused, or if the tap was neither exclusively
             // or inclusively on `previousSelection`. If the selection remains the same after selecting the word edge, then we
             // toggle the toolbar, if the editable field is not read only. If the selection changes then we hide the toolbar.
-            final TextSelection previousSelection = renderEditable.selection ??
+            final TextSelection previousSelection =
+                renderEditable.selection ??
                 editableText.textEditingValue.selection;
-            final TextPosition textPosition =
-                renderEditable.getPositionForPoint(
-              details.globalPosition,
-            );
+            final TextPosition textPosition = renderEditable
+                .getPositionForPoint(
+                  details.globalPosition,
+                );
             final bool isAffinityTheSame =
                 textPosition.affinity == previousSelection.affinity;
-            final bool wordAtCursorIndexIsMisspelled = editableText
-                    .findSuggestionSpanAtCursorIndex(textPosition.offset) !=
+            final bool wordAtCursorIndexIsMisspelled =
+                editableText.findSuggestionSpanAtCursorIndex(
+                  textPosition.offset,
+                ) !=
                 null;
 
             if (wordAtCursorIndexIsMisspelled) {
@@ -651,7 +666,8 @@ class TextSelectionGestureDetectorBuilder {
       case TargetPlatform.macOS:
         if (_longPressStartedWithoutFocus || renderEditable.readOnly) {
           renderEditable.selectWordsInRange(
-            from: details.globalPosition -
+            from:
+                details.globalPosition -
                 details.offsetFromOrigin -
                 editableOffset -
                 scrollableOffset,
@@ -675,7 +691,8 @@ class TextSelectionGestureDetectorBuilder {
       case TargetPlatform.linux:
       case TargetPlatform.windows:
         renderEditable.selectWordsInRange(
-          from: details.globalPosition -
+          from:
+              details.globalPosition -
               details.offsetFromOrigin -
               editableOffset -
               scrollableOffset,
@@ -760,7 +777,8 @@ class TextSelectionGestureDetectorBuilder {
     // renderEditable. When this migration is complete we should remove this hack.
     // See https://github.com/flutter/flutter/issues/115130.
     renderEditable.handleSecondaryTapDown(
-        TapDownDetails(globalPosition: details.globalPosition));
+      TapDownDetails(globalPosition: details.globalPosition),
+    );
     _shouldShowSelectionToolbar = true;
   }
 
@@ -785,37 +803,56 @@ class TextSelectionGestureDetectorBuilder {
 
   // Selects the set of paragraphs in a document that intersect a given range of
   // global positions.
-  void _selectParagraphsInRange(
-      {required Offset from, Offset? to, SelectionChangedCause? cause}) {
-    final TextBoundary paragraphBoundary =
-        ParagraphBoundary(editableText.textEditingValue.text);
+  void _selectParagraphsInRange({
+    required Offset from,
+    Offset? to,
+    SelectionChangedCause? cause,
+  }) {
+    final TextBoundary paragraphBoundary = ParagraphBoundary(
+      editableText.textEditingValue.text,
+    );
     _selectTextBoundariesInRange(
-        boundary: paragraphBoundary, from: from, to: to, cause: cause);
+      boundary: paragraphBoundary,
+      from: from,
+      to: to,
+      cause: cause,
+    );
   }
 
   // Selects the set of lines in a document that intersect a given range of
   // global positions.
-  void _selectLinesInRange(
-      {required Offset from, Offset? to, SelectionChangedCause? cause}) {
+  void _selectLinesInRange({
+    required Offset from,
+    Offset? to,
+    SelectionChangedCause? cause,
+  }) {
     final TextBoundary lineBoundary = LineBoundary(renderEditable);
     _selectTextBoundariesInRange(
-        boundary: lineBoundary, from: from, to: to, cause: cause);
+      boundary: lineBoundary,
+      from: from,
+      to: to,
+      cause: cause,
+    );
   }
 
   // Returns the location of a text boundary at `extent`. When `extent` is at
   // the end of the text, returns the previous text boundary's location.
   TextRange _moveToTextBoundary(
-      TextPosition extent, TextBoundary textBoundary) {
+    TextPosition extent,
+    TextBoundary textBoundary,
+  ) {
     assert(extent.offset >= 0);
     // Use extent.offset - 1 when `extent` is at the end of the text to retrieve
     // the previous text boundary's location.
-    final int start = textBoundary.getLeadingTextBoundaryAt(
+    final int start =
+        textBoundary.getLeadingTextBoundaryAt(
           extent.offset == editableText.textEditingValue.text.length
               ? extent.offset - 1
               : extent.offset,
         ) ??
         0;
-    final int end = textBoundary.getTrailingTextBoundaryAt(extent.offset) ??
+    final int end =
+        textBoundary.getTrailingTextBoundaryAt(extent.offset) ??
         editableText.textEditingValue.text.length;
     return TextRange(start: start, end: end);
   }
@@ -836,8 +873,9 @@ class TextSelectionGestureDetectorBuilder {
   }) {
     final TextPosition fromPosition = renderEditable.getPositionForPoint(from);
     final TextRange fromRange = _moveToTextBoundary(fromPosition, boundary);
-    final TextPosition toPosition =
-        to == null ? fromPosition : renderEditable.getPositionForPoint(to);
+    final TextPosition toPosition = to == null
+        ? fromPosition
+        : renderEditable.getPositionForPoint(to);
     final TextRange toRange = toPosition == fromPosition
         ? fromRange
         : _moveToTextBoundary(toPosition, boundary);
@@ -878,10 +916,14 @@ class TextSelectionGestureDetectorBuilder {
         case TargetPlatform.macOS:
         case TargetPlatform.windows:
           _selectParagraphsInRange(
-              from: details.globalPosition, cause: SelectionChangedCause.tap);
+            from: details.globalPosition,
+            cause: SelectionChangedCause.tap,
+          );
         case TargetPlatform.linux:
           _selectLinesInRange(
-              from: details.globalPosition, cause: SelectionChangedCause.tap);
+            from: details.globalPosition,
+            cause: SelectionChangedCause.tap,
+          );
       }
     }
     if (shouldShowSelectionToolbar) {
@@ -903,7 +945,8 @@ class TextSelectionGestureDetectorBuilder {
       return;
     }
     final PointerDeviceKind? kind = details.kind;
-    _shouldShowSelectionToolbar = kind == null ||
+    _shouldShowSelectionToolbar =
+        kind == null ||
         kind == PointerDeviceKind.touch ||
         kind == PointerDeviceKind.stylus;
 
@@ -1003,12 +1046,16 @@ class TextSelectionGestureDetectorBuilder {
       final Offset editableOffset = renderEditable.maxLines == 1
           ? Offset(renderEditable.offset.pixels - _dragStartViewportOffset, 0.0)
           : Offset(
-              0.0, renderEditable.offset.pixels - _dragStartViewportOffset);
+              0.0,
+              renderEditable.offset.pixels - _dragStartViewportOffset,
+            );
       final Offset scrollableOffset = switch (axisDirectionToAxis(
         _scrollDirection ?? AxisDirection.left,
       )) {
-        Axis.horizontal =>
-          Offset(_scrollPosition - _dragStartScrollOffset, 0.0),
+        Axis.horizontal => Offset(
+          _scrollPosition - _dragStartScrollOffset,
+          0.0,
+        ),
         Axis.vertical => Offset(0.0, _scrollPosition - _dragStartScrollOffset),
       };
       final Offset dragStartGlobalPosition =
@@ -1051,7 +1098,8 @@ class TextSelectionGestureDetectorBuilder {
               case PointerDeviceKind.mouse:
               case PointerDeviceKind.trackpad:
                 return _selectParagraphsInRange(
-                  from: dragStartGlobalPosition -
+                  from:
+                      dragStartGlobalPosition -
                       editableOffset -
                       scrollableOffset,
                   to: details.globalPosition,
@@ -1130,7 +1178,8 @@ class TextSelectionGestureDetectorBuilder {
                   cause: SelectionChangedCause.drag,
                 );
                 return _showMagnifierIfSupportedByPlatform(
-                    details.globalPosition);
+                  details.globalPosition,
+                );
               }
             case null:
               break;
@@ -1151,14 +1200,17 @@ class TextSelectionGestureDetectorBuilder {
         (defaultTargetPlatform != TargetPlatform.iOS &&
             defaultTargetPlatform != TargetPlatform.macOS)) {
       return _extendSelection(
-          details.globalPosition, SelectionChangedCause.drag);
+        details.globalPosition,
+        SelectionChangedCause.drag,
+      );
     }
 
     // If the drag inverts the selection, Mac and iOS revert to the initial
     // selection.
     final TextSelection selection = editableText.textEditingValue.selection;
-    final TextPosition nextExtent =
-        renderEditable.getPositionForPoint(details.globalPosition);
+    final TextPosition nextExtent = renderEditable.getPositionForPoint(
+      details.globalPosition,
+    );
     final bool isShiftTapDragSelectionForward =
         _dragStartSelection!.baseOffset < _dragStartSelection!.extentOffset;
     final bool isInverted = isShiftTapDragSelectionForward
@@ -1223,8 +1275,11 @@ class TextSelectionGestureDetectorBuilder {
   /// The [child] or its subtree should contain an [EditableText] whose key is
   /// the [GlobalKey] provided by the [delegate]'s
   /// [TextSelectionGestureDetectorBuilderDelegate.editableTextKey].
-  Widget buildGestureDetector(
-      {Key? key, HitTestBehavior? behavior, required Widget child}) {
+  Widget buildGestureDetector({
+    Key? key,
+    HitTestBehavior? behavior,
+    required Widget child,
+  }) {
     return TextSelectionGestureDetector(
       key: key,
       onTapTrackStart: onTapTrackStart,
@@ -1375,30 +1430,30 @@ class _TextSelectionGestureDetectorState
 
     gestures[TapGestureRecognizer] =
         GestureRecognizerFactoryWithHandlers<TapGestureRecognizer>(
-      () => TapGestureRecognizer(debugOwner: this),
-      (TapGestureRecognizer instance) {
-        instance
-          ..onSecondaryTap = widget.onSecondaryTap
-          ..onSecondaryTapDown = widget.onSecondaryTapDown;
-      },
-    );
+          () => TapGestureRecognizer(debugOwner: this),
+          (TapGestureRecognizer instance) {
+            instance
+              ..onSecondaryTap = widget.onSecondaryTap
+              ..onSecondaryTapDown = widget.onSecondaryTapDown;
+          },
+        );
 
     if (widget.onSingleLongTapStart != null ||
         widget.onSingleLongTapMoveUpdate != null ||
         widget.onSingleLongTapEnd != null) {
       gestures[LongPressGestureRecognizer] =
           GestureRecognizerFactoryWithHandlers<LongPressGestureRecognizer>(
-        () => LongPressGestureRecognizer(
-          debugOwner: this,
-          supportedDevices: <PointerDeviceKind>{PointerDeviceKind.touch},
-        ),
-        (LongPressGestureRecognizer instance) {
-          instance
-            ..onLongPressStart = _handleLongPressStart
-            ..onLongPressMoveUpdate = _handleLongPressMoveUpdate
-            ..onLongPressEnd = _handleLongPressEnd;
-        },
-      );
+            () => LongPressGestureRecognizer(
+              debugOwner: this,
+              supportedDevices: <PointerDeviceKind>{PointerDeviceKind.touch},
+            ),
+            (LongPressGestureRecognizer instance) {
+              instance
+                ..onLongPressStart = _handleLongPressStart
+                ..onLongPressMoveUpdate = _handleLongPressMoveUpdate
+                ..onLongPressEnd = _handleLongPressEnd;
+            },
+          );
     }
 
     if (widget.onDragSelectionStart != null ||
@@ -1410,60 +1465,64 @@ class _TextSelectionGestureDetectorState
         case TargetPlatform.iOS:
           gestures[TapAndHorizontalDragGestureRecognizer] =
               GestureRecognizerFactoryWithHandlers<
-                  TapAndHorizontalDragGestureRecognizer>(
-            () => TapAndHorizontalDragGestureRecognizer(debugOwner: this),
-            (TapAndHorizontalDragGestureRecognizer instance) {
-              instance
-                // Text selection should start from the position of the first pointer
-                // down event.
-                ..dragStartBehavior = DragStartBehavior.down
-                ..eagerVictoryOnDrag =
-                    defaultTargetPlatform != TargetPlatform.iOS
-                ..onTapTrackStart = _handleTapTrackStart
-                ..onTapTrackReset = _handleTapTrackReset
-                ..onTapDown = _handleTapDown
-                ..onDragStart = _handleDragStart
-                ..onDragUpdate = _handleDragUpdate
-                ..onDragEnd = _handleDragEnd
-                ..onTapUp = _handleTapUp
-                ..onCancel = _handleTapCancel;
-            },
-          );
+                TapAndHorizontalDragGestureRecognizer
+              >(
+                () => TapAndHorizontalDragGestureRecognizer(debugOwner: this),
+                (TapAndHorizontalDragGestureRecognizer instance) {
+                  instance
+                    // Text selection should start from the position of the first pointer
+                    // down event.
+                    ..dragStartBehavior = DragStartBehavior.down
+                    ..eagerVictoryOnDrag =
+                        defaultTargetPlatform != TargetPlatform.iOS
+                    ..onTapTrackStart = _handleTapTrackStart
+                    ..onTapTrackReset = _handleTapTrackReset
+                    ..onTapDown = _handleTapDown
+                    ..onDragStart = _handleDragStart
+                    ..onDragUpdate = _handleDragUpdate
+                    ..onDragEnd = _handleDragEnd
+                    ..onTapUp = _handleTapUp
+                    ..onCancel = _handleTapCancel;
+                },
+              );
         case TargetPlatform.linux:
         case TargetPlatform.macOS:
         case TargetPlatform.windows:
           gestures[TapAndPanGestureRecognizer] =
               GestureRecognizerFactoryWithHandlers<TapAndPanGestureRecognizer>(
-            () => TapAndPanGestureRecognizer(debugOwner: this),
-            (TapAndPanGestureRecognizer instance) {
-              instance
-                // Text selection should start from the position of the first pointer
-                // down event.
-                ..dragStartBehavior = DragStartBehavior.down
-                ..onTapTrackStart = _handleTapTrackStart
-                ..onTapTrackReset = _handleTapTrackReset
-                ..onTapDown = _handleTapDown
-                ..onDragStart = _handleDragStart
-                ..onDragUpdate = _handleDragUpdate
-                ..onDragEnd = _handleDragEnd
-                ..onTapUp = _handleTapUp
-                ..onCancel = _handleTapCancel;
-            },
-          );
+                () => TapAndPanGestureRecognizer(debugOwner: this),
+                (TapAndPanGestureRecognizer instance) {
+                  instance
+                    // Text selection should start from the position of the first pointer
+                    // down event.
+                    ..dragStartBehavior = DragStartBehavior.down
+                    ..onTapTrackStart = _handleTapTrackStart
+                    ..onTapTrackReset = _handleTapTrackReset
+                    ..onTapDown = _handleTapDown
+                    ..onDragStart = _handleDragStart
+                    ..onDragUpdate = _handleDragUpdate
+                    ..onDragEnd = _handleDragEnd
+                    ..onTapUp = _handleTapUp
+                    ..onCancel = _handleTapCancel;
+                },
+              );
       }
     }
 
     if (widget.onForcePressStart != null || widget.onForcePressEnd != null) {
       gestures[ForcePressGestureRecognizer] =
           GestureRecognizerFactoryWithHandlers<ForcePressGestureRecognizer>(
-        () => ForcePressGestureRecognizer(debugOwner: this),
-        (ForcePressGestureRecognizer instance) {
-          instance
-            ..onStart =
-                widget.onForcePressStart != null ? _forcePressStarted : null
-            ..onEnd = widget.onForcePressEnd != null ? _forcePressEnded : null;
-        },
-      );
+            () => ForcePressGestureRecognizer(debugOwner: this),
+            (ForcePressGestureRecognizer instance) {
+              instance
+                ..onStart = widget.onForcePressStart != null
+                    ? _forcePressStarted
+                    : null
+                ..onEnd = widget.onForcePressEnd != null
+                    ? _forcePressEnded
+                    : null;
+            },
+          );
     }
 
     return RawGestureDetector(
@@ -1502,13 +1561,15 @@ class TextSelectionOverlay {
     this.contextMenuBuilder,
     required TextMagnifierConfiguration magnifierConfiguration,
     required this.controller,
-  })  : _handlesVisible = handlesVisible,
-        _value = value {
+  }) : _handlesVisible = handlesVisible,
+       _value = value {
     assert(debugMaybeDispatchCreated('widgets', 'TextSelectionOverlay', this));
-    renderObject.selectionStartInViewport
-        .addListener(_updateTextSelectionOverlayVisibilities);
-    renderObject.selectionEndInViewport
-        .addListener(_updateTextSelectionOverlayVisibilities);
+    renderObject.selectionStartInViewport.addListener(
+      _updateTextSelectionOverlayVisibilities,
+    );
+    renderObject.selectionEndInViewport.addListener(
+      _updateTextSelectionOverlayVisibilities,
+    );
     _updateTextSelectionOverlayVisibilities();
     _selectionOverlay = SelectionOverlay(
       magnifierConfiguration: magnifierConfiguration,
@@ -1579,10 +1640,12 @@ class TextSelectionOverlay {
 
   final ValueNotifier<bool> _effectiveStartHandleVisibility =
       ValueNotifier<bool>(false);
-  final ValueNotifier<bool> _effectiveEndHandleVisibility =
-      ValueNotifier<bool>(false);
-  final ValueNotifier<bool> _effectiveToolbarVisibility =
-      ValueNotifier<bool>(false);
+  final ValueNotifier<bool> _effectiveEndHandleVisibility = ValueNotifier<bool>(
+    false,
+  );
+  final ValueNotifier<bool> _effectiveToolbarVisibility = ValueNotifier<bool>(
+    false,
+  );
 
   void _updateTextSelectionOverlayVisibilities() {
     _effectiveStartHandleVisibility.value =
@@ -1591,7 +1654,7 @@ class TextSelectionOverlay {
         _handlesVisible && renderObject.selectionEndInViewport.value;
     _effectiveToolbarVisibility.value =
         renderObject.selectionStartInViewport.value ||
-            renderObject.selectionEndInViewport.value;
+        renderObject.selectionEndInViewport.value;
   }
 
   /// Whether selection handles are visible.
@@ -1635,14 +1698,17 @@ class TextSelectionOverlay {
 
     assert(context.mounted);
     _selectionOverlay.showToolbar(
-        context: context, contextMenuBuilder: contextMenuBuilder);
+      context: context,
+      contextMenuBuilder: contextMenuBuilder,
+    );
     return;
   }
 
   /// Shows toolbar with spell check suggestions of misspelled words that are
   /// available for click-and-replace.
   void showSpellCheckSuggestionsToolbar(
-      WidgetBuilder spellCheckSuggestionsToolbarBuilder) {
+    WidgetBuilder spellCheckSuggestionsToolbarBuilder,
+  ) {
     _updateSelectionOverlay();
     assert(context.mounted);
     _selectionOverlay.showSpellCheckSuggestionsToolbar(
@@ -1654,8 +1720,9 @@ class TextSelectionOverlay {
 
   /// {@macro flutter.widgets.SelectionOverlay.showMagnifier}
   void showMagnifier(Offset positionToShow) {
-    final TextPosition position =
-        renderObject.getPositionForPoint(positionToShow);
+    final TextPosition position = renderObject.getPositionForPoint(
+      positionToShow,
+    );
     _updateSelectionOverlay();
     _selectionOverlay.showMagnifier(
       _buildMagnifier(
@@ -1668,8 +1735,9 @@ class TextSelectionOverlay {
 
   /// {@macro flutter.widgets.SelectionOverlay.updateMagnifier}
   void updateMagnifier(Offset positionToShow) {
-    final TextPosition position =
-        renderObject.getPositionForPoint(positionToShow);
+    final TextPosition position = renderObject.getPositionForPoint(
+      positionToShow,
+    );
     _updateSelectionOverlay();
     _selectionOverlay.updateMagnifier(
       _buildMagnifier(
@@ -1772,10 +1840,12 @@ class TextSelectionOverlay {
   void dispose() {
     assert(debugMaybeDispatchDisposed(this));
     _selectionOverlay.dispose();
-    renderObject.selectionStartInViewport
-        .removeListener(_updateTextSelectionOverlayVisibilities);
-    renderObject.selectionEndInViewport
-        .removeListener(_updateTextSelectionOverlayVisibilities);
+    renderObject.selectionStartInViewport.removeListener(
+      _updateTextSelectionOverlayVisibilities,
+    );
+    renderObject.selectionEndInViewport.removeListener(
+      _updateTextSelectionOverlayVisibilities,
+    );
     _effectiveToolbarVisibility.dispose();
     _effectiveStartHandleVisibility.dispose();
     _effectiveEndHandleVisibility.dispose();
@@ -1800,8 +1870,9 @@ class TextSelectionOverlay {
       firstSelectedGraphemeExtent = selectedGraphemes.characters.first.length;
       startHandleRect = renderObject.getRectForComposingRange(
         TextRange(
-            start: _selection.start,
-            end: _selection.start + firstSelectedGraphemeExtent),
+          start: _selection.start,
+          end: _selection.start + firstSelectedGraphemeExtent,
+        ),
       );
     }
     return startHandleRect?.height ?? renderObject.preferredLineHeight;
@@ -1819,8 +1890,9 @@ class TextSelectionOverlay {
       lastSelectedGraphemeExtent = selectedGraphemes.characters.last.length;
       endHandleRect = renderObject.getRectForComposingRange(
         TextRange(
-            start: _selection.end - lastSelectedGraphemeExtent,
-            end: _selection.end),
+          start: _selection.end - lastSelectedGraphemeExtent,
+          end: _selection.end,
+        ),
       );
     }
     return endHandleRect?.height ?? renderObject.preferredLineHeight;
@@ -1831,41 +1903,48 @@ class TextSelectionOverlay {
     required Offset globalGesturePosition,
     required TextPosition currentTextPosition,
   }) {
-    final TextSelection lineAtOffset =
-        renderEditable.getLineAtOffset(currentTextPosition);
+    final TextSelection lineAtOffset = renderEditable.getLineAtOffset(
+      currentTextPosition,
+    );
     final TextPosition positionAtEndOfLine = TextPosition(
       offset: lineAtOffset.extentOffset,
       affinity: TextAffinity.upstream,
     );
 
     // Default affinity is downstream.
-    final TextPosition positionAtBeginningOfLine =
-        TextPosition(offset: lineAtOffset.baseOffset);
+    final TextPosition positionAtBeginningOfLine = TextPosition(
+      offset: lineAtOffset.baseOffset,
+    );
 
     final Rect localLineBoundaries = Rect.fromPoints(
       renderEditable.getLocalRectForCaret(positionAtBeginningOfLine).topCenter,
       renderEditable.getLocalRectForCaret(positionAtEndOfLine).bottomCenter,
     );
-    final RenderBox? overlay = Overlay.of(context, rootOverlay: true)
-        .context
-        .findRenderObject() as RenderBox?;
+    final RenderBox? overlay =
+        Overlay.of(context, rootOverlay: true).context.findRenderObject()
+            as RenderBox?;
     final Matrix4 transformToOverlay = renderEditable.getTransformTo(overlay);
     final Rect overlayLineBoundaries = MatrixUtils.transformRect(
       transformToOverlay,
       localLineBoundaries,
     );
 
-    final Rect localCaretRect =
-        renderEditable.getLocalRectForCaret(currentTextPosition);
-    final Rect overlayCaretRect =
-        MatrixUtils.transformRect(transformToOverlay, localCaretRect);
+    final Rect localCaretRect = renderEditable.getLocalRectForCaret(
+      currentTextPosition,
+    );
+    final Rect overlayCaretRect = MatrixUtils.transformRect(
+      transformToOverlay,
+      localCaretRect,
+    );
 
     final Offset overlayGesturePosition =
         overlay?.globalToLocal(globalGesturePosition) ?? globalGesturePosition;
 
     return MagnifierInfo(
       fieldBounds: MatrixUtils.transformRect(
-          transformToOverlay, renderEditable.paintBounds),
+        transformToOverlay,
+        renderEditable.paintBounds,
+      ),
       globalGesturePosition: overlayGesturePosition,
       caretRect: overlayCaretRect,
       currentLineBoundaries: overlayLineBoundaries,
@@ -1894,9 +1973,10 @@ class TextSelectionOverlay {
     // scale transformation, the line height will also be scaled.
     final double centerOfLineLocal =
         _selectionOverlay.selectionEndpoints.last.point.dy -
-            renderObject.preferredLineHeight / 2;
-    final double centerOfLineGlobal =
-        renderObject.localToGlobal(Offset(0.0, centerOfLineLocal)).dy;
+        renderObject.preferredLineHeight / 2;
+    final double centerOfLineGlobal = renderObject
+        .localToGlobal(Offset(0.0, centerOfLineLocal))
+        .dy;
     _endHandleDragTarget = centerOfLineGlobal - details.globalPosition.dy;
     // Instead of finding the TextPosition at the handle's location directly,
     // use the vertical center of the line that it points to. This is because
@@ -1936,7 +2016,8 @@ class TextSelectionOverlay {
   double _getHandleDy(double dragDy, double handleDy) {
     final double distanceDragged = dragDy - handleDy;
     final int dragDirection = distanceDragged < 0.0 ? -1 : 1;
-    final int linesDragged = dragDirection *
+    final int linesDragged =
+        dragDirection *
         (distanceDragged.abs() / renderObject.preferredLineHeight).floor();
     return handleDy + linesDragged * renderObject.preferredLineHeight;
   }
@@ -1949,8 +2030,9 @@ class TextSelectionOverlay {
 
     // This is NOT the same as details.localPosition. That is relative to the
     // selection handle, whereas this is relative to the RenderEditable.
-    final Offset localPosition =
-        renderObject.globalToLocal(details.globalPosition);
+    final Offset localPosition = renderObject.globalToLocal(
+      details.globalPosition,
+    );
 
     final double nextEndHandleDragPositionLocal = _getHandleDy(
       localPosition.dy,
@@ -1965,8 +2047,9 @@ class TextSelectionOverlay {
       _endHandleDragPosition + _endHandleDragTarget,
     );
 
-    TextPosition position =
-        renderObject.getPositionForPoint(handleTargetGlobal);
+    TextPosition position = renderObject.getPositionForPoint(
+      handleTargetGlobal,
+    );
 
     // bggRGjQaUbCoE right drag
     position = controller.dragOffset(position);
@@ -1980,8 +2063,9 @@ class TextSelectionOverlay {
         ),
       );
 
-      final TextSelection currentSelection =
-          TextSelection.fromPosition(position);
+      final TextSelection currentSelection = TextSelection.fromPosition(
+        position,
+      );
       _handleSelectionHandleChanged(currentSelection);
       return;
     }
@@ -1995,7 +2079,7 @@ class TextSelectionOverlay {
         // always returns true for a TextSelection.
         final bool dragStartSelectionNormalized =
             _dragStartSelection!.extentOffset >=
-                _dragStartSelection!.baseOffset;
+            _dragStartSelection!.baseOffset;
         newSelection = TextSelection(
           baseOffset: dragStartSelectionNormalized
               ? _dragStartSelection!.baseOffset
@@ -2045,9 +2129,10 @@ class TextSelectionOverlay {
     // scale transformation, the line height will also be scaled.
     final double centerOfLineLocal =
         _selectionOverlay.selectionEndpoints.first.point.dy -
-            renderObject.preferredLineHeight / 2;
-    final double centerOfLineGlobal =
-        renderObject.localToGlobal(Offset(0.0, centerOfLineLocal)).dy;
+        renderObject.preferredLineHeight / 2;
+    final double centerOfLineGlobal = renderObject
+        .localToGlobal(Offset(0.0, centerOfLineLocal))
+        .dy;
     _startHandleDragTarget = centerOfLineGlobal - details.globalPosition.dy;
     // Instead of finding the TextPosition at the handle's location directly,
     // use the vertical center of the line that it points to. This is because
@@ -2075,8 +2160,9 @@ class TextSelectionOverlay {
 
     // This is NOT the same as details.localPosition. That is relative to the
     // selection handle, whereas this is relative to the RenderEditable.
-    final Offset localPosition =
-        renderObject.globalToLocal(details.globalPosition);
+    final Offset localPosition = renderObject.globalToLocal(
+      details.globalPosition,
+    );
     final double nextStartHandleDragPositionLocal = _getHandleDy(
       localPosition.dy,
       renderObject.globalToLocal(Offset(0.0, _startHandleDragPosition)).dy,
@@ -2088,8 +2174,9 @@ class TextSelectionOverlay {
       details.globalPosition.dx,
       _startHandleDragPosition + _startHandleDragTarget,
     );
-    TextPosition position =
-        renderObject.getPositionForPoint(handleTargetGlobal);
+    TextPosition position = renderObject.getPositionForPoint(
+      handleTargetGlobal,
+    );
 
     // bggRGjQaUbCoE single drag, left drag
     position = controller.dragOffset(position);
@@ -2103,8 +2190,9 @@ class TextSelectionOverlay {
         ),
       );
 
-      final TextSelection currentSelection =
-          TextSelection.fromPosition(position);
+      final TextSelection currentSelection = TextSelection.fromPosition(
+        position,
+      );
       _handleSelectionHandleChanged(currentSelection);
       return;
     }
@@ -2118,7 +2206,7 @@ class TextSelectionOverlay {
         // always returns true for a TextSelection.
         final bool dragStartSelectionNormalized =
             _dragStartSelection!.extentOffset >=
-                _dragStartSelection!.baseOffset;
+            _dragStartSelection!.baseOffset;
         newSelection = TextSelection(
           baseOffset: dragStartSelectionNormalized
               ? _dragStartSelection!.extentOffset
@@ -2142,8 +2230,8 @@ class TextSelectionOverlay {
       _buildMagnifier(
         currentTextPosition:
             newSelection.extent.offset < newSelection.base.offset
-                ? newSelection.extent
-                : newSelection.base,
+            ? newSelection.extent
+            : newSelection.base,
         globalGesturePosition: details.globalPosition,
         renderEditable: renderObject,
       ),
@@ -2167,7 +2255,9 @@ class TextSelectionOverlay {
     _selectionOverlay.hideMagnifier();
     if (!_selection.isCollapsed) {
       _selectionOverlay.showToolbar(
-          context: context, contextMenuBuilder: contextMenuBuilder);
+        context: context,
+        contextMenuBuilder: contextMenuBuilder,
+      );
     }
   }
 
@@ -2237,13 +2327,13 @@ class SelectionOverlay {
     )
     Offset? toolbarLocation,
     this.magnifierConfiguration = TextMagnifierConfiguration.disabled,
-  })  : _startHandleType = startHandleType,
-        _lineHeightAtStart = lineHeightAtStart,
-        _endHandleType = endHandleType,
-        _lineHeightAtEnd = lineHeightAtEnd,
-        _selectionEndpoints = selectionEndpoints,
-        _toolbarLocation = toolbarLocation,
-        assert(debugCheckHasOverlay(context)) {
+  }) : _startHandleType = startHandleType,
+       _lineHeightAtStart = lineHeightAtStart,
+       _endHandleType = endHandleType,
+       _lineHeightAtEnd = lineHeightAtEnd,
+       _selectionEndpoints = selectionEndpoints,
+       _toolbarLocation = toolbarLocation,
+       assert(debugCheckHasOverlay(context)) {
     assert(debugMaybeDispatchCreated('widgets', 'SelectionOverlay', this));
   }
 
@@ -2252,8 +2342,8 @@ class SelectionOverlay {
 
   final ValueNotifier<MagnifierInfo> _magnifierInfo =
       ValueNotifier<MagnifierInfo>(
-    MagnifierInfo.empty,
-  );
+        MagnifierInfo.empty,
+      );
 
   // [MagnifierController.show] and [MagnifierController.hide] should not be
   // called directly, except from inside [showMagnifier] and [hideMagnifier]. If
@@ -2719,8 +2809,10 @@ class SelectionOverlay {
 
   /// Shows toolbar with spell check suggestions of misspelled words that are
   /// available for click-and-replace.
-  void showSpellCheckSuggestionsToolbar(
-      {BuildContext? context, required WidgetBuilder builder}) {
+  void showSpellCheckSuggestionsToolbar({
+    BuildContext? context,
+    required WidgetBuilder builder,
+  }) {
     if (context == null) {
       return;
     }
@@ -2890,15 +2982,15 @@ class SelectionOverlay {
 
     final bool isMultiline =
         selectionEndpoints.last.point.dy - selectionEndpoints.first.point.dy >
-            lineHeightAtEnd / 2;
+        lineHeightAtEnd / 2;
 
     // If the selected text spans more than 1 line, horizontally center the toolbar.
     // Derived from both iOS and Android.
     final double midX = isMultiline
         ? editingRegion.width / 2
         : (selectionEndpoints.first.point.dx +
-                selectionEndpoints.last.point.dx) /
-            2;
+                  selectionEndpoints.last.point.dx) /
+              2;
 
     final Offset midpoint = Offset(
       midX,
@@ -2980,7 +3072,9 @@ class _SelectionToolbarWrapperState extends State<_SelectionToolbarWrapper>
     super.initState();
 
     _controller = AnimationController(
-        duration: SelectionOverlay.fadeDuration, vsync: this);
+      duration: SelectionOverlay.fadeDuration,
+      vsync: this,
+    );
 
     _toolbarVisibilityChanged();
     widget.visibility?.addListener(_toolbarVisibilityChanged);
@@ -3073,7 +3167,9 @@ class _SelectionHandleOverlayState extends State<_SelectionHandleOverlay>
     super.initState();
 
     _controller = AnimationController(
-        duration: SelectionOverlay.fadeDuration, vsync: this);
+      duration: SelectionOverlay.fadeDuration,
+      vsync: this,
+    );
 
     _handleVisibilityChanged();
     widget.visibility?.addListener(_handleVisibilityChanged);
@@ -3094,9 +3190,12 @@ class _SelectionHandleOverlayState extends State<_SelectionHandleOverlay>
   /// interactive area should be at least [kMinInteractiveDimension] square,
   /// which this method does not consider.
   Rect _getHandleRect(
-      TextSelectionHandleType type, double preferredLineHeight) {
-    final Size handleSize =
-        widget.selectionControls.getHandleSize(preferredLineHeight);
+    TextSelectionHandleType type,
+    double preferredLineHeight,
+  ) {
+    final Size handleSize = widget.selectionControls.getHandleSize(
+      preferredLineHeight,
+    );
     return Rect.fromLTWH(0.0, 0.0, handleSize.width, handleSize.height);
   }
 
@@ -3117,13 +3216,17 @@ class _SelectionHandleOverlayState extends State<_SelectionHandleOverlay>
 
   @override
   Widget build(BuildContext context) {
-    final Rect handleRect =
-        _getHandleRect(widget.type, widget.preferredLineHeight);
+    final Rect handleRect = _getHandleRect(
+      widget.type,
+      widget.preferredLineHeight,
+    );
 
     // Make sure the GestureDetector is big enough to be easily interactive.
     final Rect interactiveRect = handleRect.expandToInclude(
       Rect.fromCircle(
-          center: handleRect.center, radius: kMinInteractiveDimension / 2),
+        center: handleRect.center,
+        radius: kMinInteractiveDimension / 2,
+      ),
     );
     final RelativeRect padding = RelativeRect.fromLTRB(
       math.max((interactiveRect.width - handleRect.width) / 2, 0),
@@ -3142,7 +3245,7 @@ class _SelectionHandleOverlayState extends State<_SelectionHandleOverlay>
     // other drag gestures.
     final bool eagerlyAcceptDragWhenCollapsed =
         widget.type == TextSelectionHandleType.collapsed &&
-            defaultTargetPlatform == TargetPlatform.iOS;
+        defaultTargetPlatform == TargetPlatform.iOS;
 
     return CompositedTransformFollower(
       link: widget.handleLayerLink,
@@ -3161,26 +3264,26 @@ class _SelectionHandleOverlayState extends State<_SelectionHandleOverlay>
               gestures: <Type, GestureRecognizerFactory>{
                 PanGestureRecognizer:
                     GestureRecognizerFactoryWithHandlers<PanGestureRecognizer>(
-                  () => PanGestureRecognizer(
-                    debugOwner: this,
-                    // Mouse events select the text and do not drag the cursor.
-                    supportedDevices: <PointerDeviceKind>{
-                      PointerDeviceKind.touch,
-                      PointerDeviceKind.stylus,
-                      PointerDeviceKind.unknown,
-                    },
-                  ),
-                  (PanGestureRecognizer instance) {
-                    instance
-                      ..dragStartBehavior = widget.dragStartBehavior
-                      ..gestureSettings = eagerlyAcceptDragWhenCollapsed
-                          ? const DeviceGestureSettings(touchSlop: 1.0)
-                          : null
-                      ..onStart = widget.onSelectionHandleDragStart
-                      ..onUpdate = widget.onSelectionHandleDragUpdate
-                      ..onEnd = widget.onSelectionHandleDragEnd;
-                  },
-                ),
+                      () => PanGestureRecognizer(
+                        debugOwner: this,
+                        // Mouse events select the text and do not drag the cursor.
+                        supportedDevices: <PointerDeviceKind>{
+                          PointerDeviceKind.touch,
+                          PointerDeviceKind.stylus,
+                          PointerDeviceKind.unknown,
+                        },
+                      ),
+                      (PanGestureRecognizer instance) {
+                        instance
+                          ..dragStartBehavior = widget.dragStartBehavior
+                          ..gestureSettings = eagerlyAcceptDragWhenCollapsed
+                              ? const DeviceGestureSettings(touchSlop: 1.0)
+                              : null
+                          ..onStart = widget.onSelectionHandleDragStart
+                          ..onUpdate = widget.onSelectionHandleDragUpdate
+                          ..onEnd = widget.onSelectionHandleDragEnd;
+                      },
+                    ),
               },
               child: Padding(
                 padding: EdgeInsets.only(
diff --git a/lib/common/widgets/video_card/video_card_h.dart b/lib/common/widgets/video_card/video_card_h.dart
index 0d7ce79cf..56a408da1 100644
--- a/lib/common/widgets/video_card/video_card_h.dart
+++ b/lib/common/widgets/video_card/video_card_h.dart
@@ -60,13 +60,15 @@ class VideoCardH extends StatelessWidget {
         clipBehavior: Clip.none,
         children: [
           InkWell(
-            onLongPress: onLongPress ??
+            onLongPress:
+                onLongPress ??
                 () => imageSaveDialog(
-                      bvid: videoItem.bvid,
-                      title: videoItem.title,
-                      cover: videoItem.cover,
-                    ),
-            onTap: onTap ??
+                  bvid: videoItem.bvid,
+                  title: videoItem.title,
+                  cover: videoItem.cover,
+                ),
+            onTap:
+                onTap ??
                 () async {
                   if (type == 'ketang') {
                     SmartDialog.showToast('课堂视频暂不支持播放');
@@ -79,7 +81,8 @@ class VideoCardH extends StatelessWidget {
                       }
                     } else {
                       SmartDialog.showToast(
-                          'err: live_room : ${videoItem.runtimeType}');
+                        'err: live_room : ${videoItem.runtimeType}',
+                      );
                     }
                     return;
                   }
@@ -90,15 +93,18 @@ class VideoCardH extends StatelessWidget {
                     }
                   }
                   try {
-                    final int? cid = videoItem.cid ??
+                    final int? cid =
+                        videoItem.cid ??
                         await SearchHttp.ab2c(
-                            aid: videoItem.aid, bvid: videoItem.bvid);
+                          aid: videoItem.aid,
+                          bvid: videoItem.bvid,
+                        );
                     if (cid != null) {
                       PageUtils.toVideoPage(
                         'bvid=${videoItem.bvid}&cid=$cid',
                         arguments: {
                           'videoItem': videoItem,
-                          'heroTag': Utils.makeHeroTag(videoItem.aid)
+                          'heroTag': Utils.makeHeroTag(videoItem.aid),
                         },
                       );
                     }
@@ -157,11 +163,12 @@ class VideoCardH extends StatelessWidget {
                                       ? 1
                                       : progress / videoItem.duration,
                                 ),
-                              )
+                              ),
                             ] else if (videoItem.duration > 0)
                               PBadge(
                                 text: DurationUtil.formatDuration(
-                                    videoItem.duration),
+                                  videoItem.duration,
+                                ),
                                 right: 6.0,
                                 bottom: 6.0,
                                 type: PBadgeType.gray,
@@ -214,22 +221,24 @@ class VideoCardH extends StatelessWidget {
                   overflow: TextOverflow.ellipsis,
                   maxLines: 2,
                   TextSpan(
-                      children: item.titleList!
-                          .map((e) => TextSpan(
-                                text: e.text,
-                                style: TextStyle(
-                                  fontSize:
-                                      theme.textTheme.bodyMedium!.fontSize,
-                                  height: 1.42,
-                                  letterSpacing: 0.3,
-                                  color: e.isEm
-                                      ? theme.colorScheme.primary
-                                      : theme.colorScheme.onSurface,
-                                ),
-                              ))
-                          .toList()),
+                    children: item.titleList!
+                        .map(
+                          (e) => TextSpan(
+                            text: e.text,
+                            style: TextStyle(
+                              fontSize: theme.textTheme.bodyMedium!.fontSize,
+                              height: 1.42,
+                              letterSpacing: 0.3,
+                              color: e.isEm
+                                  ? theme.colorScheme.primary
+                                  : theme.colorScheme.onSurface,
+                            ),
+                          ),
+                        )
+                        .toList(),
+                  ),
                 ),
-              )
+              ),
           ] else
             Expanded(
               child: Text(
diff --git a/lib/common/widgets/video_card/video_card_v.dart b/lib/common/widgets/video_card/video_card_v.dart
index 2c1f0cd93..ff836214a 100644
--- a/lib/common/widgets/video_card/video_card_v.dart
+++ b/lib/common/widgets/video_card/video_card_v.dart
@@ -37,7 +37,8 @@ class VideoCardV extends StatelessWidget {
         break;
       case 'av':
         String bvid = videoItem.bvid ?? IdUtils.av2bv(videoItem.aid!);
-        int? cid = videoItem.cid ??
+        int? cid =
+            videoItem.cid ??
             await SearchHttp.ab2c(aid: videoItem.aid, bvid: bvid);
         if (cid != null) {
           PageUtils.toVideoPage(
@@ -83,32 +84,35 @@ class VideoCardV extends StatelessWidget {
               children: [
                 AspectRatio(
                   aspectRatio: StyleString.aspectRatio,
-                  child: LayoutBuilder(builder: (context, boxConstraints) {
-                    double maxWidth = boxConstraints.maxWidth;
-                    double maxHeight = boxConstraints.maxHeight;
-                    return Stack(
-                      clipBehavior: Clip.none,
-                      children: [
-                        NetworkImgLayer(
-                          src: videoItem.cover,
-                          width: maxWidth,
-                          height: maxHeight,
-                          radius: 0,
-                        ),
-                        if (videoItem.duration > 0)
-                          PBadge(
-                            bottom: 6,
-                            right: 7,
-                            size: PBadgeSize.small,
-                            type: PBadgeType.gray,
-                            text:
-                                DurationUtil.formatDuration(videoItem.duration),
-                          )
-                      ],
-                    );
-                  }),
+                  child: LayoutBuilder(
+                    builder: (context, boxConstraints) {
+                      double maxWidth = boxConstraints.maxWidth;
+                      double maxHeight = boxConstraints.maxHeight;
+                      return Stack(
+                        clipBehavior: Clip.none,
+                        children: [
+                          NetworkImgLayer(
+                            src: videoItem.cover,
+                            width: maxWidth,
+                            height: maxHeight,
+                            radius: 0,
+                          ),
+                          if (videoItem.duration > 0)
+                            PBadge(
+                              bottom: 6,
+                              right: 7,
+                              size: PBadgeSize.small,
+                              type: PBadgeType.gray,
+                              text: DurationUtil.formatDuration(
+                                videoItem.duration,
+                              ),
+                            ),
+                        ],
+                      );
+                    },
+                  ),
                 ),
-                content(context)
+                content(context),
               ],
             ),
           ),
@@ -193,7 +197,7 @@ class VideoCardV extends StatelessWidget {
                     ),
                   ),
                 ),
-                if (videoItem.goto == 'av') const SizedBox(width: 10)
+                if (videoItem.goto == 'av') const SizedBox(width: 10),
               ],
             ),
           ],
@@ -236,7 +240,7 @@ class VideoCardV extends StatelessWidget {
             ),
           ),
           const SizedBox(width: 2),
-        ]
+        ],
         // deprecated
         //  else if (videoItem is RecVideoItemAppModel &&
         //     videoItem.desc != null &&
diff --git a/lib/common/widgets/video_popup_menu.dart b/lib/common/widgets/video_popup_menu.dart
index 625770dcc..b00def7fd 100644
--- a/lib/common/widgets/video_popup_menu.dart
+++ b/lib/common/widgets/video_popup_menu.dart
@@ -146,7 +146,8 @@ class VideoCustomActions {
                                 );
                                 SmartDialog.dismiss();
                                 SmartDialog.showToast(
-                                    res['status'] ? "成功" : res['msg']);
+                                  res['status'] ? "成功" : res['msg'],
+                                );
                                 Get.back();
                               },
                               style: FilledButton.styleFrom(
@@ -181,7 +182,9 @@ class VideoCustomActions {
                                   Get.back();
                                   SmartDialog.showLoading(msg: '正在提交');
                                   var res = await VideoHttp.dislikeVideo(
-                                      bvid: videoItem.bvid!, type: true);
+                                    bvid: videoItem.bvid!,
+                                    type: true,
+                                  );
                                   SmartDialog.dismiss();
                                   SmartDialog.showToast(
                                     res['status'] ? "点踩成功" : res['msg'],
@@ -200,10 +203,13 @@ class VideoCustomActions {
                                   Get.back();
                                   SmartDialog.showLoading(msg: '正在提交');
                                   var res = await VideoHttp.dislikeVideo(
-                                      bvid: videoItem.bvid!, type: false);
+                                    bvid: videoItem.bvid!,
+                                    type: false,
+                                  );
                                   SmartDialog.dismiss();
                                   SmartDialog.showToast(
-                                      res['status'] ? "取消踩" : res['msg']);
+                                    res['status'] ? "取消踩" : res['msg'],
+                                  );
                                 },
                                 style: FilledButton.styleFrom(
                                   visualDensity: VisualDensity.compact,
@@ -211,7 +217,7 @@ class VideoCustomActions {
                                 child: const Text("撤销"),
                               ),
                             ],
-                          )
+                          ),
                         ],
                       ),
                     ),
@@ -231,16 +237,18 @@ class VideoCustomActions {
             builder: (context) {
               return AlertDialog(
                 title: const Text('提示'),
-                content:
-                    Text('确定拉黑:${videoItem.owner.name}(${videoItem.owner.mid})?'
-                        '\n\n注：被拉黑的Up可以在隐私设置-黑名单管理中解除'),
+                content: Text(
+                  '确定拉黑:${videoItem.owner.name}(${videoItem.owner.mid})?'
+                  '\n\n注：被拉黑的Up可以在隐私设置-黑名单管理中解除',
+                ),
                 actions: [
                   TextButton(
                     onPressed: Get.back,
                     child: Text(
                       '点错了',
                       style: TextStyle(
-                          color: Theme.of(context).colorScheme.outline),
+                        color: Theme.of(context).colorScheme.outline,
+                      ),
                     ),
                   ),
                   TextButton(
@@ -258,7 +266,7 @@ class VideoCustomActions {
                       SmartDialog.showToast(res['msg'] ?? '成功');
                     },
                     child: const Text('确认'),
-                  )
+                  ),
                 ],
               );
             },
@@ -271,7 +279,7 @@ class VideoCustomActions {
             ? const Icon(MdiIcons.incognitoOff, size: 16)
             : const Icon(MdiIcons.incognito, size: 16),
         MineController.onChangeAnonymity,
-      )
+      ),
     ];
   }
 }
@@ -295,34 +303,35 @@ class VideoPopupMenu extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ExcludeSemantics(
-        child: SizedBox(
-      width: size,
-      height: size,
-      child: PopupMenuButton<String>(
-        padding: EdgeInsets.zero,
-        icon: Icon(
-          Icons.more_vert_outlined,
-          color: Theme.of(context).colorScheme.outline,
-          size: iconSize,
+      child: SizedBox(
+        width: size,
+        height: size,
+        child: PopupMenuButton<String>(
+          padding: EdgeInsets.zero,
+          icon: Icon(
+            Icons.more_vert_outlined,
+            color: Theme.of(context).colorScheme.outline,
+            size: iconSize,
+          ),
+          position: PopupMenuPosition.under,
+          onSelected: (String type) {},
+          itemBuilder: (BuildContext context) =>
+              VideoCustomActions(videoItem, context, onRemove).actions.map((e) {
+                return PopupMenuItem<String>(
+                  value: e.value,
+                  height: menuItemHeight,
+                  onTap: e.onTap,
+                  child: Row(
+                    children: [
+                      e.icon,
+                      const SizedBox(width: 6),
+                      Text(e.title, style: const TextStyle(fontSize: 13)),
+                    ],
+                  ),
+                );
+              }).toList(),
         ),
-        position: PopupMenuPosition.under,
-        onSelected: (String type) {},
-        itemBuilder: (BuildContext context) =>
-            VideoCustomActions(videoItem, context, onRemove).actions.map((e) {
-          return PopupMenuItem<String>(
-            value: e.value,
-            height: menuItemHeight,
-            onTap: e.onTap,
-            child: Row(
-              children: [
-                e.icon,
-                const SizedBox(width: 6),
-                Text(e.title, style: const TextStyle(fontSize: 13))
-              ],
-            ),
-          );
-        }).toList(),
       ),
-    ));
+    );
   }
 }
diff --git a/lib/grpc/grpc_req.dart b/lib/grpc/grpc_req.dart
index 67cd7e28d..6c5691ef6 100644
--- a/lib/grpc/grpc_req.dart
+++ b/lib/grpc/grpc_req.dart
@@ -39,15 +39,17 @@ class GrpcReq {
     } else {
       headers.remove('authorization');
     }
-    headers['x-bili-metadata-bin'] = base64Encode(Metadata(
-      accessKey: _accessKey ?? '',
-      mobiApp: _mobiApp,
-      device: _device,
-      build: _build,
-      channel: _biliChannel,
-      buvid: _buvid,
-      platform: _device,
-    ).writeToBuffer());
+    headers['x-bili-metadata-bin'] = base64Encode(
+      Metadata(
+        accessKey: _accessKey ?? '',
+        mobiApp: _mobiApp,
+        device: _device,
+        build: _build,
+        channel: _biliChannel,
+        buvid: _buvid,
+        platform: _device,
+      ).writeToBuffer(),
+    );
     options = Options(headers: headers, responseType: ResponseType.bytes);
   }
 
@@ -63,45 +65,57 @@ class GrpcReq {
     'buvid': _buvid,
     'bili-http-engine': 'cronet',
     'te': 'trailers',
-    'x-bili-fawkes-req-bin': base64Encode(FawkesReq(
-      appkey: _mobiApp,
-      env: 'prod',
-      sessionId: _sessionId,
-    ).writeToBuffer()),
-    'x-bili-metadata-bin': base64Encode(Metadata(
-      accessKey: _accessKey ?? '',
-      mobiApp: _mobiApp,
-      device: _device,
-      build: _build,
-      channel: _biliChannel,
-      buvid: _buvid,
-      platform: _device,
-    ).writeToBuffer()),
-    'x-bili-device-bin': base64Encode(Device(
-      appId: 5,
-      build: _build,
-      buvid: _buvid,
-      mobiApp: _mobiApp,
-      platform: _device,
-      channel: _biliChannel,
-      brand: _device,
-      model: _device,
-      osver: '15',
-      versionName: _versionName,
-    ).writeToBuffer()),
-    'x-bili-network-bin': base64Encode(network.Network(
-      type: network.NetworkType.WIFI,
-    ).writeToBuffer()),
-    'x-bili-locale-bin': base64Encode(Locale(
-      cLocale: LocaleIds(language: 'zh', region: 'CN', script: 'Hans'),
-      sLocale: LocaleIds(language: 'zh', region: 'CN', script: 'Hans'),
-      timezone: 'Asia/Shanghai',
-    ).writeToBuffer()),
+    'x-bili-fawkes-req-bin': base64Encode(
+      FawkesReq(
+        appkey: _mobiApp,
+        env: 'prod',
+        sessionId: _sessionId,
+      ).writeToBuffer(),
+    ),
+    'x-bili-metadata-bin': base64Encode(
+      Metadata(
+        accessKey: _accessKey ?? '',
+        mobiApp: _mobiApp,
+        device: _device,
+        build: _build,
+        channel: _biliChannel,
+        buvid: _buvid,
+        platform: _device,
+      ).writeToBuffer(),
+    ),
+    'x-bili-device-bin': base64Encode(
+      Device(
+        appId: 5,
+        build: _build,
+        buvid: _buvid,
+        mobiApp: _mobiApp,
+        platform: _device,
+        channel: _biliChannel,
+        brand: _device,
+        model: _device,
+        osver: '15',
+        versionName: _versionName,
+      ).writeToBuffer(),
+    ),
+    'x-bili-network-bin': base64Encode(
+      network.Network(
+        type: network.NetworkType.WIFI,
+      ).writeToBuffer(),
+    ),
+    'x-bili-locale-bin': base64Encode(
+      Locale(
+        cLocale: LocaleIds(language: 'zh', region: 'CN', script: 'Hans'),
+        sLocale: LocaleIds(language: 'zh', region: 'CN', script: 'Hans'),
+        timezone: 'Asia/Shanghai',
+      ).writeToBuffer(),
+    ),
     'x-bili-exps-bin': '',
   };
 
-  static Options options =
-      Options(headers: headers, responseType: ResponseType.bytes);
+  static Options options = Options(
+    headers: headers,
+    responseType: ResponseType.bytes,
+  );
 
   static Uint8List compressProtobuf(Uint8List proto) {
     proto = const GZipEncoder().encodeBytes(proto);
@@ -122,10 +136,16 @@ class GrpcReq {
     }
   }
 
-  static Future<LoadingState<T>> request<T>(String url,
-      GeneratedMessage request, T Function(Uint8List) grpcParser) async {
-    final response = await Request().post(HttpString.appBaseUrl + url,
-        data: compressProtobuf(request.writeToBuffer()), options: options);
+  static Future<LoadingState<T>> request<T>(
+    String url,
+    GeneratedMessage request,
+    T Function(Uint8List) grpcParser,
+  ) async {
+    final response = await Request().post(
+      HttpString.appBaseUrl + url,
+      data: compressProtobuf(request.writeToBuffer()),
+      options: options,
+    );
 
     if (response.data is Map) {
       return Error(response.data['message']);
@@ -151,8 +171,9 @@ class GrpcReq {
           try {
             final grpcMsg = Status.fromBuffer(msgBytes);
             // UNKNOWN : -400 : msg
-            final errMsg =
-                grpcMsg.details.map((e) => e.status.message).join('\n');
+            final errMsg = grpcMsg.details
+                .map((e) => e.status.message)
+                .join('\n');
             msg = kDebugMode
                 ? 'CODE: ${grpcMsg.code}(${grpcMsg.message})\nMSG: $errMsg'
                 : errMsg;
diff --git a/lib/grpc/im.dart b/lib/grpc/im.dart
index 335f6424f..a58b591fc 100644
--- a/lib/grpc/im.dart
+++ b/lib/grpc/im.dart
@@ -153,8 +153,9 @@ class ImGrpc {
     );
   }
 
-  static Future<LoadingState<GetImSettingsReply>> getImSettings(
-      {IMSettingType? type}) {
+  static Future<LoadingState<GetImSettingsReply>> getImSettings({
+    IMSettingType? type,
+  }) {
     return GrpcReq.request(
       GrpcUrl.getImSettings,
       GetImSettingsReq(
@@ -164,8 +165,9 @@ class ImGrpc {
     );
   }
 
-  static Future<LoadingState<SetImSettingsReply>> setImSettings(
-      {PbMap<int, Setting>? settings}) {
+  static Future<LoadingState<SetImSettingsReply>> setImSettings({
+    PbMap<int, Setting>? settings,
+  }) {
     return GrpcReq.request(
       GrpcUrl.setImSettings,
       SetImSettingsReq(
@@ -184,7 +186,8 @@ class ImGrpc {
   }
 
   static Future<LoadingState<KeywordBlockingAddReply>> keywordBlockingAdd(
-      String keyword) {
+    String keyword,
+  ) {
     return GrpcReq.request(
       GrpcUrl.keywordBlockingAdd,
       KeywordBlockingAddReq(keyword: keyword),
@@ -193,7 +196,8 @@ class ImGrpc {
   }
 
   static Future<LoadingState<KeywordBlockingDeleteReply>> keywordBlockingDelete(
-      String keyword) {
+    String keyword,
+  ) {
     return GrpcReq.request(
       GrpcUrl.keywordBlockingDelete,
       KeywordBlockingDeleteReq(keyword: keyword),
@@ -201,8 +205,9 @@ class ImGrpc {
     );
   }
 
-  static Future<LoadingState<RspTotalUnread>> getTotalUnread(
-      {int? unreadType}) {
+  static Future<LoadingState<RspTotalUnread>> getTotalUnread({
+    int? unreadType,
+  }) {
     return GrpcReq.request(
       GrpcUrl.getTotalUnread,
       ReqTotalUnread(unreadType: unreadType, showUnfollowList: 1),
diff --git a/lib/grpc/reply.dart b/lib/grpc/reply.dart
index 90d95115a..48c2e96d4 100644
--- a/lib/grpc/reply.dart
+++ b/lib/grpc/reply.dart
@@ -9,8 +9,10 @@ import 'package:fixnum/fixnum.dart';
 
 class ReplyGrpc {
   static bool antiGoodsReply = Pref.antiGoodsReply;
-  static RegExp replyRegExp =
-      RegExp(Pref.banWordForReply, caseSensitive: false);
+  static RegExp replyRegExp = RegExp(
+    Pref.banWordForReply,
+    caseSensitive: false,
+  );
   static bool enableFilter = replyRegExp.pattern.isNotEmpty;
 
   // static Future replyInfo({required int rpid}) {
diff --git a/lib/http/black.dart b/lib/http/black.dart
index 4f4e4f4d5..9c5f14e9b 100644
--- a/lib/http/black.dart
+++ b/lib/http/black.dart
@@ -5,8 +5,10 @@ import 'package:PiliPlus/models_new/blacklist/data.dart';
 import 'package:PiliPlus/utils/accounts.dart';
 
 class BlackHttp {
-  static Future<LoadingState<BlackListData>> blackList(
-      {required int pn, int? ps}) async {
+  static Future<LoadingState<BlackListData>> blackList({
+    required int pn,
+    int? ps,
+  }) async {
     var res = await Request().get(
       Api.blackLst,
       queryParameters: {
diff --git a/lib/http/common.dart b/lib/http/common.dart
index e314cc362..952d048cd 100644
--- a/lib/http/common.dart
+++ b/lib/http/common.dart
@@ -3,15 +3,18 @@ import 'package:PiliPlus/http/init.dart';
 
 class CommonHttp {
   static Future unReadDynamic() async {
-    var res = await Request().get(Api.getUnreadDynamic, queryParameters: {
-      'alltype_offset': 0,
-      'video_offset': 0,
-      'article_offset': 0,
-    });
+    var res = await Request().get(
+      Api.getUnreadDynamic,
+      queryParameters: {
+        'alltype_offset': 0,
+        'video_offset': 0,
+        'article_offset': 0,
+      },
+    );
     if (res.data['code'] == 0) {
       return {
         'status': true,
-        'data': res.data['data']['update_info']['item']['count']
+        'data': res.data['data']['update_info']['item']['count'],
       };
     } else {
       return {
diff --git a/lib/http/danmaku_block.dart b/lib/http/danmaku_block.dart
index fbce701a1..59fb71ce5 100644
--- a/lib/http/danmaku_block.dart
+++ b/lib/http/danmaku_block.dart
@@ -9,7 +9,7 @@ class DanmakuFilterHttp {
     if (res.data['code'] == 0) {
       return {
         'status': true,
-        'data': DanmakuBlockDataModel.fromJson(res.data['data'])
+        'data': DanmakuBlockDataModel.fromJson(res.data['data']),
       };
     } else {
       return {
@@ -37,8 +37,10 @@ class DanmakuFilterHttp {
     }
   }
 
-  static Future danmakuFilterAdd(
-      {required String filter, required int type}) async {
+  static Future danmakuFilterAdd({
+    required String filter,
+    required int type,
+  }) async {
     var res = await Request().post(
       Api.danmakuFilterAdd,
       queryParameters: {
diff --git a/lib/http/dynamics.dart b/lib/http/dynamics.dart
index c25b9d7ab..856d3b47e 100644
--- a/lib/http/dynamics.dart
+++ b/lib/http/dynamics.dart
@@ -168,16 +168,16 @@ class DynamicsHttp {
           "scene": rid != null
               ? 5
               : dynIdStr != null
-                  ? 4
-                  : pics != null
-                      ? 2
-                      : 1,
+              ? 4
+              : pics != null
+              ? 2
+              : 1,
           'pics': ?pics,
           "attach_card": attachCard,
           "upload_id":
               "${rid != null ? 0 : mid}_${DateTime.now().millisecondsSinceEpoch ~/ 1000}_${Utils.random.nextInt(9000) + 1000}",
           "meta": {
-            "app_meta": {"from": "create.dynamic.web", "mobi_app": "web"}
+            "app_meta": {"from": "create.dynamic.web", "mobi_app": "web"},
           },
           if (topic != null)
             "topic": {
@@ -185,7 +185,7 @@ class DynamicsHttp {
               "name": topic.second,
               "from_source": "dyn.web.list",
               "from_topic_id": 0,
-            }
+            },
         },
         if (dynIdStr != null || rid != null)
           "web_repost_src": {
@@ -194,8 +194,8 @@ class DynamicsHttp {
               "revs_id": {
                 "dyn_type": dynType,
                 "rid": rid,
-              }
-          }
+              },
+          },
       },
     );
     if (res.data['code'] == 0) {
@@ -309,15 +309,16 @@ class DynamicsHttp {
     if (res.data['code'] == 0) {
       return {
         'status': true,
-        'data': ArticleInfoData.fromJson(res.data['data'])
+        'data': ArticleInfoData.fromJson(res.data['data']),
       };
     } else {
       return {'status': false, 'msg': res.data['message']};
     }
   }
 
-  static Future<LoadingState<ArticleViewData>> articleView(
-      {required dynamic cvId}) async {
+  static Future<LoadingState<ArticleViewData>> articleView({
+    required dynamic cvId,
+  }) async {
     final res = await Request().get(
       Api.articleView,
       queryParameters: await WbiSign.makSign({
@@ -333,8 +334,9 @@ class DynamicsHttp {
     }
   }
 
-  static Future<LoadingState<DynamicItemModel>> opusDetail(
-      {required dynamic opusId}) async {
+  static Future<LoadingState<DynamicItemModel>> opusDetail({
+    required dynamic opusId,
+  }) async {
     final res = await Request().get(
       Api.opusDetail,
       queryParameters: await WbiSign.makSign({
@@ -351,8 +353,10 @@ class DynamicsHttp {
   }
 
   static Future<LoadingState<VoteInfo>> voteInfo(dynamic voteId) async {
-    final res =
-        await Request().get(Api.voteInfo, queryParameters: {'vote_id': voteId});
+    final res = await Request().get(
+      Api.voteInfo,
+      queryParameters: {'vote_id': voteId},
+    );
     if (res.data['code'] == 0) {
       return Success(VoteInfo.fromSeparatedJson(res.data['data']));
     } else {
@@ -375,12 +379,14 @@ class DynamicsHttp {
       'op_bit': 0,
       'dynamic_id': dynamicId ?? 0,
       'csrf_token': csrf,
-      'csrf': csrf
+      'csrf': csrf,
     };
-    final res = await Request().post(Api.doVote,
-        queryParameters: {'csrf': csrf},
-        data: data,
-        options: Options(contentType: Headers.jsonContentType));
+    final res = await Request().post(
+      Api.doVote,
+      queryParameters: {'csrf': csrf},
+      data: data,
+      options: Options(contentType: Headers.jsonContentType),
+    );
     if (res.data['code'] == 0) {
       return Success(VoteInfo.fromJson(res.data['data']['vote_info']));
     } else {
@@ -471,15 +477,16 @@ class DynamicsHttp {
     if (res.data['code'] == 0) {
       return {
         'status': true,
-        'data': DynReserveData.fromJson(res.data['data'])
+        'data': DynReserveData.fromJson(res.data['data']),
       };
     } else {
       return {'status': false, 'msg': res.data['message']};
     }
   }
 
-  static Future<LoadingState<List<TopicItem>?>> dynTopicRcmd(
-      {int ps = 25}) async {
+  static Future<LoadingState<List<TopicItem>?>> dynTopicRcmd({
+    int ps = 25,
+  }) async {
     final res = await Request().get(
       Api.dynTopicRcmd,
       queryParameters: {
@@ -489,9 +496,11 @@ class DynamicsHttp {
       },
     );
     if (res.data['code'] == 0) {
-      return Success((res.data['data']?['topic_items'] as List?)
-          ?.map((e) => TopicItem.fromJson(e))
-          .toList());
+      return Success(
+        (res.data['data']?['topic_items'] as List?)
+            ?.map((e) => TopicItem.fromJson(e))
+            .toList(),
+      );
     } else {
       return Error(res.data['message']);
     }
@@ -506,16 +515,19 @@ class DynamicsHttp {
       },
     );
     if (res.data['code'] == 0) {
-      return Success((res.data['data'] as List?)
-          ?.map((e) => OpusPicModel.fromJson(e))
-          .toList());
+      return Success(
+        (res.data['data'] as List?)
+            ?.map((e) => OpusPicModel.fromJson(e))
+            .toList(),
+      );
     } else {
       return Error(res.data['message']);
     }
   }
 
-  static Future<LoadingState<List<MentionGroup>?>> dynMention(
-      {String? keyword}) async {
+  static Future<LoadingState<List<MentionGroup>?>> dynMention({
+    String? keyword,
+  }) async {
     final res = await Request().get(
       Api.dynMention,
       queryParameters: {
diff --git a/lib/http/fan.dart b/lib/http/fan.dart
index 9f35ede4f..91c2ee4bc 100644
--- a/lib/http/fan.dart
+++ b/lib/http/fan.dart
@@ -4,15 +4,22 @@ import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/models_new/fans/data.dart';
 
 class FanHttp {
-  static Future<LoadingState<FansData>> fans(
-      {int? vmid, int? pn, int? ps, String? orderType}) async {
-    var res = await Request().get(Api.fans, queryParameters: {
-      'vmid': vmid,
-      'pn': pn,
-      'ps': ps,
-      'order': 'desc',
-      'order_type': orderType,
-    });
+  static Future<LoadingState<FansData>> fans({
+    int? vmid,
+    int? pn,
+    int? ps,
+    String? orderType,
+  }) async {
+    var res = await Request().get(
+      Api.fans,
+      queryParameters: {
+        'vmid': vmid,
+        'pn': pn,
+        'ps': ps,
+        'order': 'desc',
+        'order_type': orderType,
+      },
+    );
     if (res.data['code'] == 0) {
       return Success(FansData.fromJson(res.data['data']));
     } else {
diff --git a/lib/http/fav.dart b/lib/http/fav.dart
index 21f6a6ca5..bbddb5e0d 100644
--- a/lib/http/fav.dart
+++ b/lib/http/fav.dart
@@ -67,7 +67,7 @@ class FavHttp {
         'order': order.name,
         'type': type,
         'tid': 0,
-        'platform': 'web'
+        'platform': 'web',
       },
     );
     if (res.data['code'] == 0) {
@@ -444,15 +444,17 @@ class FavHttp {
   static Future deleteFolder({
     required List<dynamic> mediaIds,
   }) async {
-    var res = await Request().post(Api.deleteFolder,
-        data: {
-          'media_ids': mediaIds.join(','),
-          'platform': 'web',
-          'csrf': Accounts.main.csrf,
-        },
-        options: Options(
-          contentType: Headers.formUrlEncodedContentType,
-        ));
+    var res = await Request().post(
+      Api.deleteFolder,
+      data: {
+        'media_ids': mediaIds.join(','),
+        'platform': 'web',
+        'csrf': Accounts.main.csrf,
+      },
+      options: Options(
+        contentType: Headers.formUrlEncodedContentType,
+      ),
+    );
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
     } else {
@@ -468,18 +470,20 @@ class FavHttp {
     required String cover,
     required String intro,
   }) async {
-    var res = await Request().post(isAdd ? Api.addFolder : Api.editFolder,
-        data: {
-          'title': title,
-          'intro': intro,
-          'privacy': privacy,
-          'cover': cover.isNotEmpty ? Uri.encodeFull(cover) : cover,
-          'csrf': Accounts.main.csrf,
-          'media_id': ?mediaId,
-        },
-        options: Options(
-          contentType: Headers.formUrlEncodedContentType,
-        ));
+    var res = await Request().post(
+      isAdd ? Api.addFolder : Api.editFolder,
+      data: {
+        'title': title,
+        'intro': intro,
+        'privacy': privacy,
+        'cover': cover.isNotEmpty ? Uri.encodeFull(cover) : cover,
+        'csrf': Accounts.main.csrf,
+        'media_id': ?mediaId,
+      },
+      options: Options(
+        contentType: Headers.formUrlEncodedContentType,
+      ),
+    );
     if (res.data['code'] == 0) {
       return {'status': true, 'data': FavFolderInfo.fromJson(res.data['data'])};
     } else {
@@ -554,9 +558,11 @@ class FavHttp {
       ),
     );
     if (res.data['code'] == 0) {
-      return Success((res.data['data'] as List?)
-          ?.map((e) => SpaceFavData.fromJson(e))
-          .toList());
+      return Success(
+        (res.data['data'] as List?)
+            ?.map((e) => SpaceFavData.fromJson(e))
+            .toList(),
+      );
     } else {
       return Error(res.data['message']);
     }
@@ -574,7 +580,7 @@ class FavHttp {
       data: {
         "entity": {
           "object_id_str": opusId,
-          "type": {"biz": 2}
+          "type": {"biz": 2},
         },
         "action": action, // 3 fav, 4 unfav
       },
@@ -644,11 +650,11 @@ class FavHttp {
     var res = await Request().post(
       isFav
           ? isCopy
-              ? Api.copyFav
-              : Api.moveFav
+                ? Api.copyFav
+                : Api.moveFav
           : isCopy
-              ? Api.copyToview
-              : Api.moveToview,
+          ? Api.copyToview
+          : Api.moveToview,
       data: {
         'src_media_id': ?srcMediaId,
         'tar_media_id': tarMediaId,
diff --git a/lib/http/follow.dart b/lib/http/follow.dart
index 00fd6ad1b..0b3e7f364 100644
--- a/lib/http/follow.dart
+++ b/lib/http/follow.dart
@@ -10,13 +10,16 @@ class FollowHttp {
     int? ps,
     String orderType = '',
   }) async {
-    var res = await Request().get(Api.followings, queryParameters: {
-      'vmid': vmid,
-      'pn': pn,
-      'ps': ps,
-      'order': 'desc',
-      'order_type': orderType,
-    });
+    var res = await Request().get(
+      Api.followings,
+      queryParameters: {
+        'vmid': vmid,
+        'pn': pn,
+        'ps': ps,
+        'order': 'desc',
+        'order_type': orderType,
+      },
+    );
     if (res.data['code'] == 0) {
       return Success(
         FollowData.fromJson(res.data['data']),
@@ -32,13 +35,16 @@ class FollowHttp {
     int? ps,
     String orderType = '', // ''=>最近关注，'attention'=>最常访问
   }) async {
-    var res = await Request().get(Api.followings, queryParameters: {
-      'vmid': vmid,
-      'pn': pn,
-      'ps': ps,
-      'order': 'desc',
-      'order_type': orderType,
-    });
+    var res = await Request().get(
+      Api.followings,
+      queryParameters: {
+        'vmid': vmid,
+        'pn': pn,
+        'ps': ps,
+        'order': 'desc',
+        'order_type': orderType,
+      },
+    );
 
     if (res.data['code'] == 0) {
       return Success(
diff --git a/lib/http/init.dart b/lib/http/init.dart
index 64646750b..527aa6af4 100644
--- a/lib/http/init.dart
+++ b/lib/http/init.dart
@@ -37,7 +37,9 @@ class Request {
     Accounts.refresh();
     final List<Cookie> cookies = Accounts.main.cookieJar.toList();
     final webManager = web.CookieManager();
-    await Future.wait(cookies.map((item) => webManager.setCookie(
+    await Future.wait(
+      cookies.map(
+        (item) => webManager.setCookie(
           url: web.WebUri(item.domain ?? ''),
           name: item.name,
           value: item.value,
@@ -45,7 +47,9 @@ class Request {
           domain: item.domain,
           isSecure: item.secure,
           isHttpOnly: item.httpOnly,
-        )));
+        ),
+      ),
+    );
 
     if (Accounts.main.isLogin) {
       final coin = GStorage.userInfo.get('userInfoCache')?.money;
@@ -73,10 +77,11 @@ class Request {
       //     options: Options(extra: {'account': account}));
       // final String spmPrefix = _spmPrefixExp.firstMatch(html.data)!.group(1)!;
       final String randPngEnd = base64.encode(
-          List<int>.generate(32, (_) => Utils.random.nextInt(256)) +
-              List<int>.filled(4, 0) +
-              [73, 69, 78, 68] +
-              List<int>.generate(4, (_) => Utils.random.nextInt(256)));
+        List<int>.generate(32, (_) => Utils.random.nextInt(256)) +
+            List<int>.filled(4, 0) +
+            [73, 69, 78, 68] +
+            List<int>.generate(4, (_) => Utils.random.nextInt(256)),
+      );
 
       String jsonData = json.encode({
         '3064': 1,
@@ -88,9 +93,11 @@ class Request {
         },
       });
 
-      await Request().post(Api.activateBuvidApi,
-          data: {'payload': jsonData},
-          options: Options(contentType: Headers.jsonContentType));
+      await Request().post(
+        Api.activateBuvidApi,
+        data: {'payload': jsonData},
+        options: Options(contentType: Headers.jsonContentType),
+      );
     } catch (_) {}
   }
 
@@ -100,68 +107,74 @@ class Request {
   Request._internal() {
     //BaseOptions、Options、RequestOptions 都可以配置参数，优先级别依次递增，且可以根据优先级别覆盖参数
     BaseOptions options = BaseOptions(
-        //请求基地址,可以包含子路径
-        baseUrl: HttpString.apiBaseUrl,
-        //连接服务器超时时间，单位是毫秒.
-        connectTimeout: const Duration(milliseconds: 10000),
-        //响应流上前后两次接受到数据的间隔，单位为毫秒。
-        receiveTimeout: const Duration(milliseconds: 10000),
-        //Http请求头.
-        headers: {
-          'connection': 'keep-alive',
-          'accept-encoding': 'br,gzip',
-          'user-agent': 'Dart/3.6 (dart:io)', // Http2Adapter不会自动添加标头
-          'referer': HttpString.baseUrl,
-          'env': 'prod',
-          'app-key': 'android64',
-          'x-bili-aurora-zone': 'sh001',
-        },
-        responseDecoder: responseDecoder, // Http2Adapter没有自动解压
-        persistentConnection: true);
+      //请求基地址,可以包含子路径
+      baseUrl: HttpString.apiBaseUrl,
+      //连接服务器超时时间，单位是毫秒.
+      connectTimeout: const Duration(milliseconds: 10000),
+      //响应流上前后两次接受到数据的间隔，单位为毫秒。
+      receiveTimeout: const Duration(milliseconds: 10000),
+      //Http请求头.
+      headers: {
+        'connection': 'keep-alive',
+        'accept-encoding': 'br,gzip',
+        'user-agent': 'Dart/3.6 (dart:io)', // Http2Adapter不会自动添加标头
+        'referer': HttpString.baseUrl,
+        'env': 'prod',
+        'app-key': 'android64',
+        'x-bili-aurora-zone': 'sh001',
+      },
+      responseDecoder: responseDecoder, // Http2Adapter没有自动解压
+      persistentConnection: true,
+    );
 
     final bool enableSystemProxy = Pref.enableSystemProxy;
     final String systemProxyHost = Pref.systemProxyHost;
     final String systemProxyPort = Pref.systemProxyPort;
 
-    final http11Adapter = IOHttpClientAdapter(createHttpClient: () {
-      final client = HttpClient()
-        ..idleTimeout = const Duration(seconds: 15)
-        ..autoUncompress = false; // Http2Adapter没有自动解压, 统一行为
-      // 设置代理
-      if (enableSystemProxy) {
-        client
-          ..findProxy = ((_) => 'PROXY $systemProxyHost:$systemProxyPort')
-          ..badCertificateCallback =
-              (X509Certificate cert, String host, int port) => true;
-      }
-      return client;
-    });
+    final http11Adapter = IOHttpClientAdapter(
+      createHttpClient: () {
+        final client = HttpClient()
+          ..idleTimeout = const Duration(seconds: 15)
+          ..autoUncompress = false; // Http2Adapter没有自动解压, 统一行为
+        // 设置代理
+        if (enableSystemProxy) {
+          client
+            ..findProxy = ((_) => 'PROXY $systemProxyHost:$systemProxyPort')
+            ..badCertificateCallback =
+                (X509Certificate cert, String host, int port) => true;
+        }
+        return client;
+      },
+    );
 
     late Uri proxy;
     if (enableSystemProxy) {
       proxy = Uri(
-          scheme: 'http',
-          host: systemProxyHost,
-          port: int.parse(systemProxyPort));
+        scheme: 'http',
+        host: systemProxyHost,
+        port: int.parse(systemProxyPort),
+      );
     }
 
     dio = Dio(options)
       ..httpClientAdapter = Pref.enableHttp2
           ? Http2Adapter(
               ConnectionManager(
-                  idleTimeout: const Duration(seconds: 15),
-                  onClientCreate: enableSystemProxy
-                      ? (_, config) {
-                          config
-                            ..proxy = proxy
-                            ..onBadCertificate = (_) => true;
-                        }
-                      : Pref.badCertificateCallback
-                          ? (_, config) {
-                              config.onBadCertificate = (_) => true;
-                            }
-                          : null),
-              fallbackAdapter: http11Adapter)
+                idleTimeout: const Duration(seconds: 15),
+                onClientCreate: enableSystemProxy
+                    ? (_, config) {
+                        config
+                          ..proxy = proxy
+                          ..onBadCertificate = (_) => true;
+                      }
+                    : Pref.badCertificateCallback
+                    ? (_, config) {
+                        config.onBadCertificate = (_) => true;
+                      }
+                    : null,
+              ),
+              fallbackAdapter: http11Adapter,
+            )
           : http11Adapter;
 
     // 先于其他Interceptor
@@ -169,11 +182,13 @@ class Request {
 
     // 日志拦截器 输出请求、响应内容
     if (kDebugMode) {
-      dio.interceptors.add(LogInterceptor(
-        request: false,
-        requestHeader: false,
-        responseHeader: false,
-      ));
+      dio.interceptors.add(
+        LogInterceptor(
+          request: false,
+          requestHeader: false,
+          responseHeader: false,
+        ),
+      );
     }
 
     dio.transformer = BackgroundTransformer();
@@ -208,7 +223,7 @@ class Request {
     } on DioException catch (e) {
       return Response(
         data: {
-          'message': await AccountManager.dioError(e)
+          'message': await AccountManager.dioError(e),
         }, // 将自定义 Map 数据赋值给 Response 的 data 属性
         statusCode: e.response?.statusCode ?? -1,
         requestOptions: e.requestOptions,
@@ -239,7 +254,7 @@ class Request {
       AccountManager.toast(e);
       return Response(
         data: {
-          'message': await AccountManager.dioError(e)
+          'message': await AccountManager.dioError(e),
         }, // 将自定义 Map 数据赋值给 Response 的 data 属性
         statusCode: e.response?.statusCode ?? -1,
         requestOptions: e.requestOptions,
@@ -250,8 +265,11 @@ class Request {
   /*
    * 下载文件
    */
-  Future<Response> downloadFile(String urlPath, String savePath,
-      {CancelToken? cancelToken}) async {
+  Future<Response> downloadFile(
+    String urlPath,
+    String savePath, {
+    CancelToken? cancelToken,
+  }) async {
     try {
       final response = await dio.download(
         urlPath,
@@ -291,19 +309,26 @@ class Request {
       'mob' =>
         'Mozilla/5.0 (Linux; Android 10; SM-G975F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.101 Mobile Safari/537.36',
       _ =>
-        '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'
+        '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 String responseDecoder(List<int> responseBytes, RequestOptions options,
-      ResponseBody responseBody) {
+  static String responseDecoder(
+    List<int> responseBytes,
+    RequestOptions options,
+    ResponseBody responseBody,
+  ) {
     switch (responseBody.headers['content-encoding']?.firstOrNull) {
       case 'gzip':
-        return utf8.decode(_gzipDecoder.decodeBytes(responseBytes),
-            allowMalformed: true);
+        return utf8.decode(
+          _gzipDecoder.decodeBytes(responseBytes),
+          allowMalformed: true,
+        );
       case 'br':
-        return utf8.decode(_brotilDecoder.convert(responseBytes),
-            allowMalformed: true);
+        return utf8.decode(
+          _brotilDecoder.convert(responseBytes),
+          allowMalformed: true,
+        );
       default:
         return utf8.decode(responseBytes, allowMalformed: true);
     }
diff --git a/lib/http/live.dart b/lib/http/live.dart
index f66ec90bd..86602dd50 100644
--- a/lib/http/live.dart
+++ b/lib/http/live.dart
@@ -83,7 +83,7 @@ class LiveHttp {
     if (res.data['code'] == 0) {
       return {
         'status': true,
-        'data': RoomPlayInfoData.fromJson(res.data['data'])
+        'data': RoomPlayInfoData.fromJson(res.data['data']),
       };
     } else {
       return {'status': false, 'msg': res.data['message']};
@@ -91,13 +91,16 @@ class LiveHttp {
   }
 
   static Future liveRoomInfoH5({roomId, qn}) async {
-    var res = await Request().get(Api.liveRoomInfoH5, queryParameters: {
-      'room_id': roomId,
-    });
+    var res = await Request().get(
+      Api.liveRoomInfoH5,
+      queryParameters: {
+        'room_id': roomId,
+      },
+    );
     if (res.data['code'] == 0) {
       return {
         'status': true,
-        'data': RoomInfoH5Data.fromJson(res.data['data'])
+        'data': RoomInfoH5Data.fromJson(res.data['data']),
       };
     } else {
       return {'status': false, 'msg': res.data['message']};
@@ -133,15 +136,16 @@ class LiveHttp {
     if (res.data['code'] == 0) {
       return {
         'status': true,
-        'data': LiveDmInfoData.fromJson(res.data['data'])
+        'data': LiveDmInfoData.fromJson(res.data['data']),
       };
     } else {
       return {'status': false, 'msg': res.data['message']};
     }
   }
 
-  static Future<LoadingState<List<LiveEmoteDatum>?>> getLiveEmoticons(
-      {required int roomId}) async {
+  static Future<LoadingState<List<LiveEmoteDatum>?>> getLiveEmoticons({
+    required int roomId,
+  }) async {
     var res = await Request().get(
       Api.getLiveEmoticons,
       queryParameters: {
@@ -295,9 +299,11 @@ class LiveHttp {
       queryParameters: params,
     );
     if (res.data['code'] == 0) {
-      return Success((res.data['data']?['list'] as List?)
-          ?.map((e) => AreaList.fromJson(e))
-          .toList());
+      return Success(
+        (res.data['data']?['list'] as List?)
+            ?.map((e) => AreaList.fromJson(e))
+            .toList(),
+      );
     } else {
       return Error(res.data['message']);
     }
@@ -331,10 +337,12 @@ class LiveHttp {
     );
 
     if (res.data['code'] == 0) {
-      return Success((res.data['data']?['tags'] as List?)
-              ?.map((e) => AreaItem.fromJson(e))
-              .toList() ??
-          <AreaItem>[]);
+      return Success(
+        (res.data['data']?['tags'] as List?)
+                ?.map((e) => AreaItem.fromJson(e))
+                .toList() ??
+            <AreaItem>[],
+      );
     } else {
       return Error(res.data['message']);
     }
@@ -409,9 +417,9 @@ class LiveHttp {
       queryParameters: params,
     );
     if (res.data['code'] == 0) {
-      return Success((res.data['data'] as List?)
-          ?.map((e) => AreaItem.fromJson(e))
-          .toList());
+      return Success(
+        (res.data['data'] as List?)?.map((e) => AreaItem.fromJson(e)).toList(),
+      );
     } else {
       return Error(res.data['message']);
     }
@@ -458,7 +466,8 @@ class LiveHttp {
   }
 
   static Future<LoadingState<ShieldInfo?>> getLiveInfoByUser(
-      dynamic roomId) async {
+    dynamic roomId,
+  ) async {
     var res = await Request().get(
       Api.getLiveInfoByUser,
       queryParameters: await WbiSign.makSign({
diff --git a/lib/http/loading_state.dart b/lib/http/loading_state.dart
index 55abf3c27..e1f4f447f 100644
--- a/lib/http/loading_state.dart
+++ b/lib/http/loading_state.dart
@@ -8,14 +8,14 @@ sealed class LoadingState<T> {
   bool get isSuccess => this is Success<T>;
 
   T get data => switch (this) {
-        Success(:var response) => response,
-        _ => throw this,
-      };
+    Success(:var response) => response,
+    _ => throw this,
+  };
 
   T? get dataOrNull => switch (this) {
-        Success(:var response) => response,
-        _ => null,
-      };
+    Success(:var response) => response,
+    _ => null,
+  };
 
   void toast() => SmartDialog.showToast(toString());
 }
diff --git a/lib/http/login.dart b/lib/http/login.dart
index 7bea5fc03..0dcabd666 100644
--- a/lib/http/login.dart
+++ b/lib/http/login.dart
@@ -57,7 +57,7 @@ class LoginHttp {
       'status': res.data['code'] == 0,
       'code': res.data['code'],
       'data': res.data['data'],
-      'msg': res.data['message']
+      'msg': res.data['message'],
     };
   }
 
@@ -107,8 +107,9 @@ class LoginHttp {
       'gee_validate': ?geeValidate,
       'local_id': buvid,
       // https://chinggg.github.io/post/appre/
-      'login_session_id':
-          md5.convert(utf8.encode(buvid + timestamp.toString())).toString(),
+      'login_session_id': md5
+          .convert(utf8.encode(buvid + timestamp.toString()))
+          .toString(),
       'mobi_app': 'android_hd',
       'platform': 'android',
       'recaptcha_token': ?recaptchaToken,
@@ -135,7 +136,7 @@ class LoginHttp {
         'status': false,
         'code': res.data['code'],
         'msg': res.data['message'],
-        'data': res.data['data']
+        'data': res.data['data'],
       };
     }
   }
@@ -191,8 +192,9 @@ class LoginHttp {
     String? recaptchaToken,
   }) async {
     dynamic publicKey = RSAKeyParser().parse(key);
-    String passwordEncrypted =
-        Encrypter(RSA(publicKey: publicKey)).encrypt(salt + password).base64;
+    String passwordEncrypted = Encrypter(
+      RSA(publicKey: publicKey),
+    ).encrypt(salt + password).base64;
 
     Map<String, String> data = {
       'bili_local_id': deviceId,
@@ -206,9 +208,11 @@ class LoginHttp {
       'device_name': 'vivo',
       'device_platform': 'Android14vivo',
       'disable_rcmd': '0',
-      'dt': Uri.encodeComponent(Encrypter(RSA(publicKey: publicKey))
-          .encrypt(Utils.generateRandomString(16))
-          .base64),
+      'dt': Uri.encodeComponent(
+        Encrypter(
+          RSA(publicKey: publicKey),
+        ).encrypt(Utils.generateRandomString(16)).base64,
+      ),
       'from_pv': 'main.homepage.avatar-nologin.all.click',
       'from_url': Uri.encodeComponent('bilibili://pegasus/promo'),
       'gee_challenge': ?geeChallenge,
@@ -247,7 +251,7 @@ class LoginHttp {
         'status': false,
         'code': res.data['code'],
         'msg': res.data['message'],
-        'data': res.data['data']
+        'data': res.data['data'],
       };
     }
   }
@@ -277,9 +281,11 @@ class LoginHttp {
       'device_platform': 'Android14vivo',
       // 'device_tourist_id': '',
       'disable_rcmd': '0',
-      'dt': Uri.encodeComponent(Encrypter(RSA(publicKey: publicKey))
-          .encrypt(Utils.generateRandomString(16))
-          .base64),
+      'dt': Uri.encodeComponent(
+        Encrypter(
+          RSA(publicKey: publicKey),
+        ).encrypt(Utils.generateRandomString(16)).base64,
+      ),
       'from_pv': 'main.my-information.my-login.0.click',
       'from_url': Uri.encodeComponent('bilibili://user_center/mine'),
       'local_id': buvid,
@@ -308,7 +314,7 @@ class LoginHttp {
         'status': false,
         'code': res.data['code'],
         'msg': res.data['message'],
-        'data': res.data['data']
+        'data': res.data['data'],
       };
     }
   }
@@ -330,7 +336,7 @@ class LoginHttp {
         'status': false,
         'code': res.data['code'],
         'msg': res.data['message'],
-        'data': res.data['data']
+        'data': res.data['data'],
       };
     }
   }
@@ -346,7 +352,7 @@ class LoginHttp {
         'status': false,
         'code': res.data['code'],
         'msg': res.data['message'],
-        'data': res.data['data']
+        'data': res.data['data'],
       };
     }
   }
@@ -374,10 +380,12 @@ class LoginHttp {
     var res = await Request().post(
       Api.safeCenterSmsCode,
       data: data,
-      options:
-          Options(contentType: Headers.formUrlEncodedContentType, headers: {
-        "Referer": refererUrl,
-      }),
+      options: Options(
+        contentType: Headers.formUrlEncodedContentType,
+        headers: {
+          "Referer": refererUrl,
+        },
+      ),
     );
 
     if (res.data['code'] == 0) {
@@ -387,7 +395,7 @@ class LoginHttp {
         'status': false,
         'code': res.data['code'],
         'msg': res.data['message'],
-        'data': res.data['data']
+        'data': res.data['data'],
       };
     }
   }
@@ -414,10 +422,12 @@ class LoginHttp {
     var res = await Request().post(
       Api.safeCenterSmsVerify,
       data: data,
-      options:
-          Options(contentType: Headers.formUrlEncodedContentType, headers: {
-        "Referer": refererUrl,
-      }),
+      options: Options(
+        contentType: Headers.formUrlEncodedContentType,
+        headers: {
+          "Referer": refererUrl,
+        },
+      ),
     );
 
     if (res.data['code'] == 0) {
@@ -427,7 +437,7 @@ class LoginHttp {
         'status': false,
         'code': res.data['code'],
         'msg': res.data['message'],
-        'data': res.data['data']
+        'data': res.data['data'],
       };
     }
   }
@@ -473,7 +483,7 @@ class LoginHttp {
         'status': false,
         'code': res.data['code'],
         'msg': res.data['message'],
-        'data': res.data['data']
+        'data': res.data['data'],
       };
     }
   }
@@ -483,8 +493,9 @@ class LoginHttp {
       Api.logout,
       data: {'biliCSRF': account.csrf},
       options: Options(
-          contentType: Headers.formUrlEncodedContentType,
-          extra: {'account': account}),
+        contentType: Headers.formUrlEncodedContentType,
+        extra: {'account': account},
+      ),
     );
     return {'status': res.data['code'] == 0, 'msg': res.data['message']};
   }
diff --git a/lib/http/member.dart b/lib/http/member.dart
index 9f930aece..84c812063 100644
--- a/lib/http/member.dart
+++ b/lib/http/member.dart
@@ -99,7 +99,8 @@ class MemberHttp {
     );
     if (res.data['code'] == 0) {
       return Success(
-          SpaceSsData.fromJson(res.data['data']?['items_lists'] ?? {}));
+        SpaceSsData.fromJson(res.data['data']?['items_lists'] ?? {}),
+      );
     } else {
       return Error(res.data['message']);
     }
@@ -172,7 +173,7 @@ class MemberHttp {
         'ps': 20,
         'order': 1,
         'uid': mid,
-        'web_location': 333.1387
+        'web_location': 333.1387,
       },
     );
     if (res.data['code'] == 0) {
@@ -286,7 +287,7 @@ class MemberHttp {
     if (res.data['code'] == 0) {
       return {
         'status': true,
-        'data': MemberInfoModel.fromJson(res.data['data'])
+        'data': MemberInfoModel.fromJson(res.data['data']),
       };
     } else {
       return {'status': false, 'msg': res.data['message']};
@@ -313,7 +314,7 @@ class MemberHttp {
     if (res.data['code'] == 0) {
       return {
         'status': true,
-        'data': MemberCardInfoData.fromJson(res.data['data'])
+        'data': MemberCardInfoData.fromJson(res.data['data']),
       };
     } else {
       return {'status': false, 'msg': res.data['message']};
@@ -349,11 +350,13 @@ class MemberHttp {
     var res = await Request().get(
       Api.searchArchive,
       queryParameters: params,
-      options: Options(headers: {
-        HttpHeaders.userAgentHeader: Request.headerUa(type: 'pc'),
-        HttpHeaders.refererHeader: '${HttpString.spaceBaseUrl}/$mid',
-        'origin': HttpString.spaceBaseUrl,
-      }),
+      options: Options(
+        headers: {
+          HttpHeaders.userAgentHeader: Request.headerUa(type: 'pc'),
+          HttpHeaders.refererHeader: '${HttpString.spaceBaseUrl}/$mid',
+          'origin': HttpString.spaceBaseUrl,
+        },
+      ),
     );
     if (res.data['code'] == 0) {
       return Success(SearchArchiveData.fromJson(res.data['data']));
@@ -465,7 +468,7 @@ class MemberHttp {
         'status': true,
         'data': res.data['data']
             .map<MemberTagItemModel>((e) => MemberTagItemModel.fromJson(e))
-            .toList()
+            .toList(),
       };
     } else {
       return {'status': false, 'msg': res.data['message']};
@@ -502,7 +505,7 @@ class MemberHttp {
       Api.addUsers,
       queryParameters: {
         'x-bili-device-req-json':
-            '{"platform":"web","device":"pc","spmid":"333.1387"}'
+            '{"platform":"web","device":"pc","spmid":"333.1387"}',
       },
       data: {
         'fids': fids.join(','),
@@ -538,10 +541,13 @@ class MemberHttp {
       },
     );
     if (res.data['code'] == 0) {
-      return Success(FollowData(
+      return Success(
+        FollowData(
           list: (res.data['data'] as List?)
               ?.map<FollowItemModel>((e) => FollowItemModel.fromJson(e))
-              .toList()));
+              .toList(),
+        ),
+      );
     } else {
       return Error(res.data['message']);
     }
@@ -622,7 +628,7 @@ class MemberHttp {
         'status': true,
         'data': res.data['data']
             .map<MemberTagItemModel>((e) => MemberTagItemModel.fromJson(e))
-            .toList()
+            .toList(),
       };
     } else {
       return {'status': false, 'msg': res.data['message']};
@@ -631,8 +637,10 @@ class MemberHttp {
 
   // 获取up播放数、点赞数
   static Future memberView({required int mid}) async {
-    var res = await Request()
-        .get(Api.getMemberViewApi, queryParameters: {'mid': mid});
+    var res = await Request().get(
+      Api.getMemberViewApi,
+      queryParameters: {'mid': mid},
+    );
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
     } else {
@@ -658,11 +666,14 @@ class MemberHttp {
       'web_location': 333.999,
     };
     Map params = await WbiSign.makSign(data);
-    var res = await Request().get(Api.followSearch, queryParameters: {
-      ...data,
-      'w_rid': params['w_rid'],
-      'wts': params['wts'],
-    });
+    var res = await Request().get(
+      Api.followSearch,
+      queryParameters: {
+        ...data,
+        'w_rid': params['w_rid'],
+        'wts': params['wts'],
+      },
+    );
     if (res.data['code'] == 0) {
       return Success(FollowData.fromJson(res.data['data']));
     } else {
diff --git a/lib/http/msg.dart b/lib/http/msg.dart
index 0d05bc969..99ff4af0a 100644
--- a/lib/http/msg.dart
+++ b/lib/http/msg.dart
@@ -41,8 +41,10 @@ class MsgHttp {
     }
   }
 
-  static Future<LoadingState<MsgAtData>> msgFeedAtMe(
-      {int? cursor, int? cursorTime}) async {
+  static Future<LoadingState<MsgAtData>> msgFeedAtMe({
+    int? cursor,
+    int? cursorTime,
+  }) async {
     var res = await Request().get(
       Api.msgFeedAt,
       queryParameters: {
@@ -61,16 +63,21 @@ class MsgHttp {
     }
   }
 
-  static Future<LoadingState<MsgLikeData>> msgFeedLikeMe(
-      {int? cursor, int? cursorTime}) async {
-    var res = await Request().get(Api.msgFeedLike, queryParameters: {
-      'id': ?cursor,
-      'like_time': ?cursorTime,
-      'platform': 'web',
-      'mobi_app': 'web',
-      'build': 0,
-      'web_location': 333.40164,
-    });
+  static Future<LoadingState<MsgLikeData>> msgFeedLikeMe({
+    int? cursor,
+    int? cursorTime,
+  }) async {
+    var res = await Request().get(
+      Api.msgFeedLike,
+      queryParameters: {
+        'id': ?cursor,
+        'like_time': ?cursorTime,
+        'platform': 'web',
+        'mobi_app': 'web',
+        'build': 0,
+        'web_location': 333.40164,
+      },
+    );
     if (res.data['code'] == 0) {
       return Success(MsgLikeData.fromJson(res.data['data']));
     } else {
@@ -101,8 +108,10 @@ class MsgHttp {
     }
   }
 
-  static Future<LoadingState<List<MsgSysItem>?>> msgFeedNotify(
-      {int? cursor, int pageSize = 20}) async {
+  static Future<LoadingState<List<MsgSysItem>?>> msgFeedNotify({
+    int? cursor,
+    int pageSize = 20,
+  }) async {
     var res = await Request().get(
       Api.msgSysNotify,
       queryParameters: {
@@ -114,9 +123,11 @@ class MsgHttp {
       },
     );
     if (res.data['code'] == 0) {
-      return Success((res.data['data'] as List?)
-          ?.map((e) => MsgSysItem.fromJson(e))
-          .toList());
+      return Success(
+        (res.data['data'] as List?)
+            ?.map((e) => MsgSysItem.fromJson(e))
+            .toList(),
+      );
     } else {
       return Error(res.data['message']);
     }
@@ -124,10 +135,13 @@ class MsgHttp {
 
   static Future msgSysUpdateCursor(int cursor) async {
     String csrf = Accounts.main.csrf;
-    var res = await Request().get(Api.msgSysUpdateCursor, queryParameters: {
-      'csrf': csrf,
-      'cursor': cursor,
-    });
+    var res = await Request().get(
+      Api.msgSysUpdateCursor,
+      queryParameters: {
+        'csrf': csrf,
+        'cursor': cursor,
+      },
+    );
     if (res.data['code'] == 0) {
       return {
         'status': true,
@@ -254,7 +268,7 @@ class MsgHttp {
       'build': 0,
       'mobi_app': 'web',
       'csrf_token': csrf,
-      'csrf': csrf
+      'csrf': csrf,
     });
     var res = await Request().post(
       HttpString.tUrl + Api.removeMsg,
@@ -336,10 +350,12 @@ class MsgHttp {
       'build': 0,
       'mobi_app': 'web',
       'csrf_token': csrf,
-      'csrf': csrf
+      'csrf': csrf,
     });
-    var res = await Request()
-        .post(HttpString.tUrl + Api.setTop, data: FormData.fromMap(data));
+    var res = await Request().post(
+      HttpString.tUrl + Api.setTop,
+      data: FormData.fromMap(data),
+    );
     if (res.data['code'] == 0) {
       return {'status': true};
     } else {
@@ -363,7 +379,7 @@ class MsgHttp {
       'build': 0,
       'mobi_app': 'web',
       'csrf_token': csrf,
-      'csrf': csrf
+      'csrf': csrf,
     });
     var res = await Request().get(Api.ackSessionMsg, queryParameters: params);
     if (res.data['code'] == 0) {
@@ -374,7 +390,8 @@ class MsgHttp {
     } else {
       return {
         'status': false,
-        'msg': "message: ${res.data['message']},"
+        'msg':
+            "message: ${res.data['message']},"
             " msg: ${res.data['msg']},"
             " code: ${res.data['code']}",
       };
@@ -530,9 +547,11 @@ class MsgHttp {
       },
     );
     if (res.data['code'] == 0) {
-      return Success((res.data['data'] as List?)
-          ?.map((e) => ImUserInfosData.fromJson(e))
-          .toList());
+      return Success(
+        (res.data['data'] as List?)
+            ?.map((e) => ImUserInfosData.fromJson(e))
+            .toList(),
+      );
     } else {
       return Error(res.data['message']);
     }
@@ -575,9 +594,11 @@ class MsgHttp {
       },
     );
     if (res.data['code'] == 0) {
-      return Success((res.data['data']?['uid_settings'] as List?)
-          ?.map((e) => UidSetting.fromJson(e))
-          .toList());
+      return Success(
+        (res.data['data']?['uid_settings'] as List?)
+            ?.map((e) => UidSetting.fromJson(e))
+            .toList(),
+      );
     } else {
       return Error(res.data['message']);
     }
@@ -596,7 +617,7 @@ class MsgHttp {
     if (res.data['code'] == 0) {
       return {
         'status': true,
-        'data': SingleUnreadData.fromJson(res.data['data'])
+        'data': SingleUnreadData.fromJson(res.data['data']),
       };
     } else {
       return {'status': false, 'data': res.data['message']};
@@ -615,7 +636,7 @@ class MsgHttp {
     if (res.data['code'] == 0) {
       return {
         'status': true,
-        'data': MsgFeedUnreadData.fromJson(res.data['data'])
+        'data': MsgFeedUnreadData.fromJson(res.data['data']),
       };
     } else {
       return {'status': false, 'data': res.data['message']};
diff --git a/lib/http/reply.dart b/lib/http/reply.dart
index 627c9400a..52155a05f 100644
--- a/lib/http/reply.dart
+++ b/lib/http/reply.dart
@@ -12,8 +12,9 @@ import 'package:PiliPlus/utils/accounts/account.dart';
 import 'package:dio/dio.dart';
 
 class ReplyHttp {
-  static final Options _options =
-      Options(extra: {'account': AnonymousAccount(), 'checkReply': true});
+  static final Options _options = Options(
+    extra: {'account': AnonymousAccount(), 'checkReply': true},
+  );
 
   static Future<LoadingState> replyList({
     required bool isLogin,
@@ -229,12 +230,16 @@ class ReplyHttp {
     }
   }
 
-  static Future<LoadingState<List<Package>?>> getEmoteList(
-      {String? business}) async {
-    var res = await Request().get(Api.myEmote, queryParameters: {
-      'business': business ?? 'reply',
-      'web_location': '333.1245',
-    });
+  static Future<LoadingState<List<Package>?>> getEmoteList({
+    String? business,
+  }) async {
+    var res = await Request().get(
+      Api.myEmote,
+      queryParameters: {
+        'business': business ?? 'reply',
+        'web_location': '333.1245',
+      },
+    );
     if (res.data['code'] == 0) {
       return Success(EmoteModelData.fromJson(res.data['data']).packages);
     } else {
diff --git a/lib/http/retry_interceptor.dart b/lib/http/retry_interceptor.dart
index 7ff72826d..53d24464d 100644
--- a/lib/http/retry_interceptor.dart
+++ b/lib/http/retry_interceptor.dart
@@ -29,9 +29,15 @@ class RetryInterceptor extends Interceptor {
             }
             Request.dio
                 .fetch(options)
-                .then((i) => handler.resolve(i
-                  ..redirects.add(RedirectRecord(status, options.method, uri))
-                  ..isRedirect = true))
+                .then(
+                  (i) => handler.resolve(
+                    i
+                      ..redirects.add(
+                        RedirectRecord(status, options.method, uri),
+                      )
+                      ..isRedirect = true,
+                  ),
+                )
                 .onError<DioException>((error, _) => handler.next(error));
             return;
           }
@@ -46,13 +52,14 @@ class RetryInterceptor extends Interceptor {
         case DioExceptionType.unknown:
           if ((err.requestOptions.extra['_rt'] ??= 0) < _count) {
             Future.delayed(
-                Duration(
-                    milliseconds: ++err.requestOptions.extra['_rt'] * _delay),
-                () => Request.dio
-                    .fetch(err.requestOptions)
-                    .then(handler.resolve)
-                    .onError<DioException>(
-                        (error, _) => handler.reject(error)));
+              Duration(
+                milliseconds: ++err.requestOptions.extra['_rt'] * _delay,
+              ),
+              () => Request.dio
+                  .fetch(err.requestOptions)
+                  .then(handler.resolve)
+                  .onError<DioException>((error, _) => handler.reject(error)),
+            );
           } else {
             handler.next(err);
           }
diff --git a/lib/http/search.dart b/lib/http/search.dart
index 6f1a8bb3b..31c840519 100644
--- a/lib/http/search.dart
+++ b/lib/http/search.dart
@@ -175,8 +175,10 @@ class SearchHttp {
     }
   }
 
-  static Future<LoadingState<PgcInfoModel>> pgcInfoNew(
-      {int? seasonId, int? epId}) async {
+  static Future<LoadingState<PgcInfoModel>> pgcInfoNew({
+    int? seasonId,
+    int? epId,
+  }) async {
     var res = await Request().get(
       Api.pgcInfo,
       queryParameters: {
@@ -226,8 +228,9 @@ class SearchHttp {
     }
   }
 
-  static Future<LoadingState<SearchTrendingData>> searchTrending(
-      {int limit = 30}) async {
+  static Future<LoadingState<SearchTrendingData>> searchTrending({
+    int limit = 30,
+  }) async {
     final res = await Request().get(
       Api.searchTrending,
       queryParameters: {
diff --git a/lib/http/user.dart b/lib/http/user.dart
index e78f13d2e..0d67cfe8f 100644
--- a/lib/http/user.dart
+++ b/lib/http/user.dart
@@ -81,12 +81,15 @@ class UserHttp {
     int? max,
     int? viewAt,
   }) async {
-    var res = await Request().get(Api.historyList, queryParameters: {
-      'type': type,
-      'ps': 20,
-      'max': max ?? 0,
-      'view_at': viewAt ?? 0,
-    });
+    var res = await Request().get(
+      Api.historyList,
+      queryParameters: {
+        'type': type,
+        'ps': 20,
+        'max': max ?? 0,
+        'view_at': viewAt ?? 0,
+      },
+    );
     if (res.data['code'] == 0) {
       return Success(HistoryData.fromJson(res.data['data']));
     } else {
@@ -151,7 +154,7 @@ class UserHttp {
   static Future toViewDel({required List<int?> aids}) async {
     final Map<String, dynamic> params = {
       'csrf': Accounts.main.csrf,
-      'resources': aids.join(',')
+      'resources': aids.join(','),
     };
     var res = await Request().post(
       Api.toViewDel,
@@ -235,8 +238,10 @@ class UserHttp {
   }
 
   // 搜索历史记录
-  static Future<LoadingState<HistoryData>> searchHistory(
-      {required int pn, required String keyword}) async {
+  static Future<LoadingState<HistoryData>> searchHistory({
+    required int pn,
+    required String keyword,
+  }) async {
     var res = await Request().get(
       Api.searchHistory,
       queryParameters: {
@@ -275,8 +280,10 @@ class UserHttp {
   }
 
   static Future<Map<String, dynamic>> videoTags({required String bvid}) async {
-    var res =
-        await Request().get(Api.videoTags, queryParameters: {'bvid': bvid});
+    var res = await Request().get(
+      Api.videoTags,
+      queryParameters: {'bvid': bvid},
+    );
     if (res.data['code'] == 0) {
       List<VideoTagItem>? list = (res.data['data'] as List?)
           ?.map((e) => VideoTagItem.fromJson(e))
diff --git a/lib/http/video.dart b/lib/http/video.dart
index 66fa2b0f2..3f8208efb 100644
--- a/lib/http/video.dart
+++ b/lib/http/video.dart
@@ -39,8 +39,10 @@ class VideoHttp {
   static bool enableFilter = zoneRegExp.pattern.isNotEmpty;
 
   // 首页推荐视频
-  static Future<LoadingState> rcmdVideoList(
-      {required int ps, required int freshIdx}) async {
+  static Future<LoadingState> rcmdVideoList({
+    required int ps,
+    required int freshIdx,
+  }) async {
     var res = await Request().get(
       Api.recommendListWeb,
       queryParameters: {
@@ -50,7 +52,7 @@ class VideoHttp {
         'ps': ps,
         'fresh_idx': freshIdx,
         'brush': freshIdx,
-        'fresh_type': 4
+        'fresh_type': 4,
       },
     );
     if (res.data['code'] == 0) {
@@ -101,26 +103,28 @@ class VideoHttp {
       's_locale': 'zh_CN',
       'splash_id': '',
       'statistics': Constants.statistics,
-      'voice_balance': '0'
+      'voice_balance': '0',
     };
     var res = await Request().get(
       Api.recommendListApp,
       queryParameters: data,
-      options: Options(headers: {
-        'buvid': LoginHttp.buvid,
-        'fp_local':
-            '1111111111111111111111111111111111111111111111111111111111111111',
-        'fp_remote':
-            '1111111111111111111111111111111111111111111111111111111111111111',
-        'session_id': '11111111',
-        'env': 'prod',
-        'app-key': 'android_hd',
-        'User-Agent': Constants.userAgent,
-        'x-bili-trace-id': Constants.traceId,
-        'x-bili-aurora-eid': '',
-        'x-bili-aurora-zone': '',
-        'bili-http-engine': 'cronet',
-      }),
+      options: Options(
+        headers: {
+          'buvid': LoginHttp.buvid,
+          'fp_local':
+              '1111111111111111111111111111111111111111111111111111111111111111',
+          'fp_remote':
+              '1111111111111111111111111111111111111111111111111111111111111111',
+          'session_id': '11111111',
+          'env': 'prod',
+          'app-key': 'android_hd',
+          'User-Agent': Constants.userAgent,
+          'x-bili-trace-id': Constants.traceId,
+          'x-bili-aurora-eid': '',
+          'x-bili-aurora-zone': '',
+          'bili-http-engine': 'cronet',
+        },
+      ),
     );
     if (res.data['code'] == 0) {
       List<RecVideoItemAppModel> list = <RecVideoItemAppModel>[];
@@ -150,8 +154,10 @@ class VideoHttp {
   }
 
   // 最热视频
-  static Future<LoadingState<List<HotVideoItemModel>>> hotVideoList(
-      {required int pn, required int ps}) async {
+  static Future<LoadingState<List<HotVideoItemModel>>> hotVideoList({
+    required int pn,
+    required int ps,
+  }) async {
     var res = await Request().get(
       Api.hotList,
       queryParameters: {'pn': pn, 'ps': ps},
@@ -162,7 +168,9 @@ class VideoHttp {
         if (!GlobalData().blackMids.contains(i['owner']['mid']) &&
             !RecommendFilter.filterTitle(i['title']) &&
             !RecommendFilter.filterLikeRatio(
-                i['stat']['like'], i['stat']['view'])) {
+              i['stat']['like'],
+              i['stat']['view'],
+            )) {
           if (enableFilter &&
               i['tname'] != null &&
               zoneRegExp.hasMatch(i['tname'])) {
@@ -219,8 +227,8 @@ class VideoHttp {
         late PlayUrlModel data;
         if (epid != null && usePgcApi) {
           data = PlayUrlModel.fromJson(res.data['result']['video_info'])
-            ..lastPlayTime = res.data['result']['play_view_business_info']
-                ['user_status']['watch_progress']['current_watch_progress'];
+            ..lastPlayTime = res
+                .data['result']['play_view_business_info']['user_status']['watch_progress']['current_watch_progress'];
         } else {
           data = PlayUrlModel.fromJson(res.data['data']);
         }
@@ -252,10 +260,13 @@ class VideoHttp {
   }
 
   // 视频信息 标题、简介
-  static Future<LoadingState<VideoDetailData>> videoIntro(
-      {required String bvid}) async {
-    var res =
-        await Request().get(Api.videoIntro, queryParameters: {'bvid': bvid});
+  static Future<LoadingState<VideoDetailData>> videoIntro({
+    required String bvid,
+  }) async {
+    var res = await Request().get(
+      Api.videoIntro,
+      queryParameters: {'bvid': bvid},
+    );
     VideoDetailResponse data = VideoDetailResponse.fromJson(res.data);
     if (data.code == 0) {
       return Success(data.data!);
@@ -286,13 +297,17 @@ class VideoHttp {
   }
 
   // 相关视频
-  static Future<LoadingState<List<HotVideoItemModel>?>> relatedVideoList(
-      {required String bvid}) async {
-    var res =
-        await Request().get(Api.relatedList, queryParameters: {'bvid': bvid});
+  static Future<LoadingState<List<HotVideoItemModel>?>> relatedVideoList({
+    required String bvid,
+  }) async {
+    var res = await Request().get(
+      Api.relatedList,
+      queryParameters: {'bvid': bvid},
+    );
     if (res.data['code'] == 0) {
-      final items = (res.data['data'] as List?)
-          ?.map((i) => HotVideoItemModel.fromJson(i));
+      final items = (res.data['data'] as List?)?.map(
+        (i) => HotVideoItemModel.fromJson(i),
+      );
       final list = RecommendFilter.applyFilterToRelatedVideos
           ? items?.where((i) => !RecommendFilter.filterAll(i)).toList()
           : items?.toList();
@@ -426,29 +441,33 @@ class VideoHttp {
     } else {
       return {
         'status': false,
-        'msg': res.data is String ? res.data : res.data['message']
+        'msg': res.data is String ? res.data : res.data['message'],
       };
     }
   }
 
   // 推送不感兴趣反馈
-  static Future feedDislike(
-      {required String goto,
-      required int id,
-      int? reasonId,
-      int? feedbackId}) async {
+  static Future feedDislike({
+    required String goto,
+    required int id,
+    int? reasonId,
+    int? feedbackId,
+  }) async {
     if (Accounts.get(AccountType.recommend).accessKey.isNullOrEmpty) {
       return {'status': false, 'msg': "请退出账号后重新登录"};
     }
     assert((reasonId != null) ^ (feedbackId != null));
-    var res = await Request().get(Api.feedDislike, queryParameters: {
-      'goto': goto,
-      'id': id,
-      'reason_id': ?reasonId,
-      'feedback_id': ?feedbackId,
-      'build': '1',
-      'mobi_app': 'android',
-    });
+    var res = await Request().get(
+      Api.feedDislike,
+      queryParameters: {
+        'goto': goto,
+        'id': id,
+        'reason_id': ?reasonId,
+        'feedback_id': ?feedbackId,
+        'build': '1',
+        'mobi_app': 'android',
+      },
+    );
     if (res.data['code'] == 0) {
       return {'status': true};
     } else {
@@ -457,22 +476,26 @@ class VideoHttp {
   }
 
   // 推送不感兴趣取消
-  static Future feedDislikeCancel(
-      {required String goto,
-      required int id,
-      int? reasonId,
-      int? feedbackId}) async {
+  static Future feedDislikeCancel({
+    required String goto,
+    required int id,
+    int? reasonId,
+    int? feedbackId,
+  }) async {
     if (Accounts.get(AccountType.recommend).accessKey.isNullOrEmpty) {
       return {'status': false, 'msg': "请退出账号后重新登录"};
     }
-    var res = await Request().get(Api.feedDislikeCancel, queryParameters: {
-      'goto': goto,
-      'id': id,
-      'reason_id': ?reasonId,
-      'feedback_id': ?feedbackId,
-      'build': '1',
-      'mobi_app': 'android',
-    });
+    var res = await Request().get(
+      Api.feedDislikeCancel,
+      queryParameters: {
+        'goto': goto,
+        'id': id,
+        'reason_id': ?reasonId,
+        'feedback_id': ?feedbackId,
+        'build': '1',
+        'mobi_app': 'android',
+      },
+    );
     if (res.data['code'] == 0) {
       return {'status': true};
     } else {
@@ -531,12 +554,15 @@ class VideoHttp {
     required int oid,
     required int rpid,
   }) async {
-    var res = await Request().post(Api.replyDel, queryParameters: {
-      'type': type, //type.index
-      'oid': oid,
-      'rpid': rpid,
-      'csrf': Accounts.main.csrf,
-    });
+    var res = await Request().post(
+      Api.replyDel,
+      queryParameters: {
+        'type': type, //type.index
+        'oid': oid,
+        'rpid': rpid,
+        'csrf': Accounts.main.csrf,
+      },
+    );
     log(res.toString());
     if (res.data['code'] == 0) {
       return {'status': true};
@@ -546,8 +572,11 @@ class VideoHttp {
   }
 
   // 操作用户关系
-  static Future relationMod(
-      {required int mid, required int act, required int reSrc}) async {
+  static Future relationMod({
+    required int mid,
+    required int act,
+    required int reSrc,
+  }) async {
     var res = await Request().post(
       Api.relationMod,
       queryParameters: {
@@ -603,11 +632,14 @@ class VideoHttp {
     aid,
     type,
   }) async {
-    await Request().post(Api.historyReport, queryParameters: {
-      'aid': ?aid,
-      'type': ?type,
-      'csrf': Accounts.main.csrf,
-    });
+    await Request().post(
+      Api.historyReport,
+      queryParameters: {
+        'aid': ?aid,
+        'type': ?type,
+        'csrf': Accounts.main.csrf,
+      },
+    );
   }
 
   // 视频播放进度
@@ -619,16 +651,19 @@ class VideoHttp {
     seasonId,
     subType,
   }) async {
-    await Request().post(Api.heartBeat, queryParameters: {
-      'bvid': bvid,
-      'cid': cid,
-      'epid': ?epid,
-      'sid': ?seasonId,
-      if (epid != null) 'type': 4,
-      'sub_type': ?subType,
-      'played_time': progress,
-      'csrf': Accounts.main.csrf,
-    });
+    await Request().post(
+      Api.heartBeat,
+      queryParameters: {
+        'bvid': bvid,
+        'cid': cid,
+        'epid': ?epid,
+        'sid': ?seasonId,
+        if (epid != null) 'type': 4,
+        'sub_type': ?subType,
+        'played_time': progress,
+        'csrf': Accounts.main.csrf,
+      },
+    );
   }
 
   static Future medialistHistory({
@@ -636,52 +671,65 @@ class VideoHttp {
     required dynamic oid,
     required dynamic upperMid,
   }) async {
-    await Request().post(Api.mediaListHistory, queryParameters: {
-      'desc': desc,
-      'oid': oid,
-      'upper_mid': upperMid,
-      'csrf': Accounts.main.csrf,
-    });
+    await Request().post(
+      Api.mediaListHistory,
+      queryParameters: {
+        'desc': desc,
+        'oid': oid,
+        'upper_mid': upperMid,
+        'csrf': Accounts.main.csrf,
+      },
+    );
   }
 
   // 添加追番
   static Future pgcAdd({int? seasonId}) async {
-    var res = await Request().post(Api.pgcAdd, queryParameters: {
-      'season_id': seasonId,
-      'csrf': Accounts.main.csrf,
-    });
+    var res = await Request().post(
+      Api.pgcAdd,
+      queryParameters: {
+        'season_id': seasonId,
+        'csrf': Accounts.main.csrf,
+      },
+    );
     if (res.data['code'] == 0) {
       return {
         'status': true,
-        'msg':
-            res.data['result'] == null ? 'failed' : res.data['result']['toast']
+        'msg': res.data['result'] == null
+            ? 'failed'
+            : res.data['result']['toast'],
       };
     } else {
       return {
         'status': false,
-        'msg':
-            res.data['result'] == null ? 'failed' : res.data['result']['toast']
+        'msg': res.data['result'] == null
+            ? 'failed'
+            : res.data['result']['toast'],
       };
     }
   }
 
   // 取消追番
   static Future pgcDel({int? seasonId}) async {
-    var res = await Request().post(Api.pgcDel, queryParameters: {
-      'season_id': seasonId,
-      'csrf': Accounts.main.csrf,
-    });
+    var res = await Request().post(
+      Api.pgcDel,
+      queryParameters: {
+        'season_id': seasonId,
+        'csrf': Accounts.main.csrf,
+      },
+    );
     if (res.data['code'] == 0) {
       return {
         'status': true,
-        'msg':
-            res.data['result'] == null ? 'failed' : res.data['result']['toast']
+        'msg': res.data['result'] == null
+            ? 'failed'
+            : res.data['result']['toast'],
       };
     } else {
       return {
         'status': false,
-        'msg':
-            res.data['result'] == null ? 'failed' : res.data['result']['toast']
+        'msg': res.data['result'] == null
+            ? 'failed'
+            : res.data['result']['toast'],
       };
     }
   }
@@ -703,17 +751,22 @@ class VideoHttp {
     );
     return {
       'status': res.data['code'] == 0,
-      'msg': res.data['result'] == null ? 'failed' : res.data['result']['toast']
+      'msg': res.data['result'] == null
+          ? 'failed'
+          : res.data['result']['toast'],
     };
   }
 
   // 查看视频同时在看人数
   static Future onlineTotal({int? aid, String? bvid, int? cid}) async {
-    var res = await Request().get(Api.onlineTotal, queryParameters: {
-      'aid': aid,
-      'bvid': bvid,
-      'cid': cid,
-    });
+    var res = await Request().get(
+      Api.onlineTotal,
+      queryParameters: {
+        'aid': aid,
+        'bvid': bvid,
+        'cid': cid,
+      },
+    );
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']['total']};
     } else {
@@ -777,9 +830,12 @@ class VideoHttp {
     String processList(List list) {
       final sb = StringBuffer('WEBVTT\n\n')
         ..writeAll(
-            list.map((item) =>
-                '${item?['sid'] ?? 0}\n${subtitleTimecode(item['from'])} --> ${subtitleTimecode(item['to'])}\n${item['content'].trim()}'),
-            '\n\n');
+          list.map(
+            (item) =>
+                '${item?['sid'] ?? 0}\n${subtitleTimecode(item['from'])} --> ${subtitleTimecode(item['to'])}\n${item['content'].trim()}',
+          ),
+          '\n\n',
+        );
       return sb.toString();
     }
 
@@ -793,7 +849,8 @@ class VideoHttp {
 
   // 视频排行
   static Future<LoadingState<List<HotVideoItemModel>>> getRankVideoList(
-      int rid) async {
+    int rid,
+  ) async {
     var res = await Request().get(
       Api.getRankApi,
       queryParameters: await WbiSign.makSign({
@@ -807,7 +864,9 @@ class VideoHttp {
         if (!GlobalData().blackMids.contains(i['owner']['mid']) &&
             !RecommendFilter.filterTitle(i['title']) &&
             !RecommendFilter.filterLikeRatio(
-                i['stat']['like'], i['stat']['view'])) {
+              i['stat']['like'],
+              i['stat']['view'],
+            )) {
           if (enableFilter &&
               i['tname'] != null &&
               zoneRegExp.hasMatch(i['tname'])) {
@@ -823,8 +882,10 @@ class VideoHttp {
   }
 
   // pgc 排行
-  static Future<LoadingState> pgcRankList(
-      {int day = 3, required int seasonType}) async {
+  static Future<LoadingState> pgcRankList({
+    int day = 3,
+    required int seasonType,
+  }) async {
     var res = await Request().get(
       Api.pgcRank,
       queryParameters: await WbiSign.makSign({
@@ -833,17 +894,21 @@ class VideoHttp {
       }),
     );
     if (res.data['code'] == 0) {
-      return Success((res.data['result']?['list'] as List?)
-          ?.map((e) => PgcRankItemModel.fromJson(e))
-          .toList());
+      return Success(
+        (res.data['result']?['list'] as List?)
+            ?.map((e) => PgcRankItemModel.fromJson(e))
+            .toList(),
+      );
     } else {
       return Error(res.data['message']);
     }
   }
 
   // pgc season 排行
-  static Future<LoadingState> pgcSeasonRankList(
-      {int day = 3, required int seasonType}) async {
+  static Future<LoadingState> pgcSeasonRankList({
+    int day = 3,
+    required int seasonType,
+  }) async {
     var res = await Request().get(
       Api.pgcSeasonRank,
       queryParameters: await WbiSign.makSign({
@@ -852,9 +917,11 @@ class VideoHttp {
       }),
     );
     if (res.data['code'] == 0) {
-      return Success((res.data['data']?['list'] as List?)
-          ?.map((e) => PgcRankItemModel.fromJson(e))
-          .toList());
+      return Success(
+        (res.data['data']?['list'] as List?)
+            ?.map((e) => PgcRankItemModel.fromJson(e))
+            .toList(),
+      );
     } else {
       return Error(res.data['message']);
     }
diff --git a/lib/main.dart b/lib/main.dart
index ea1498f19..fe5aa3b9c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -71,7 +71,8 @@ void main() async {
 
   if (Pref.enableLog) {
     // 异常捕获 logo记录
-    String buildConfig = '''\n
+    String buildConfig =
+        '''\n
 Build Time: ${DateUtil.format(BuildConfig.buildTime, format: DateUtil.longFormatDs)}
 Commit Hash: ${BuildConfig.commitHash}''';
     final Catcher2Options debugConfig = Catcher2Options(
@@ -82,7 +83,7 @@ Commit Hash: ${BuildConfig.commitHash}''';
           enableDeviceParameters: false,
           enableApplicationParameters: false,
           enableCustomParameters: true,
-        )
+        ),
       ],
       customParameters: {
         'BuildConfig': buildConfig,
@@ -95,7 +96,7 @@ Commit Hash: ${BuildConfig.commitHash}''';
         FileHandler(await getLogsPath()),
         ConsoleHandler(
           enableCustomParameters: true,
-        )
+        ),
       ],
       customParameters: {
         'BuildConfig': buildConfig,
@@ -115,12 +116,14 @@ Commit Hash: ${BuildConfig.commitHash}''';
 
   // 小白条、导航栏沉浸
   SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-  SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
-    systemNavigationBarColor: Colors.transparent,
-    systemNavigationBarDividerColor: Colors.transparent,
-    statusBarColor: Colors.transparent,
-    systemNavigationBarContrastEnforced: false,
-  ));
+  SystemChrome.setSystemUIOverlayStyle(
+    const SystemUiOverlayStyle(
+      systemNavigationBarColor: Colors.transparent,
+      systemNavigationBarDividerColor: Colors.transparent,
+      statusBarColor: Colors.transparent,
+      systemNavigationBarContrastEnforced: false,
+    ),
+  );
   Data.init();
   PiliScheme.init();
 }
@@ -144,8 +147,10 @@ class MyApp extends StatelessWidget {
         var storageDisplay = GStorage.setting.get(SettingBoxKey.displayMode);
         DisplayMode f = DisplayMode.auto;
         if (storageDisplay != null) {
-          f = modes.firstWhere((e) => e.toString() == storageDisplay,
-              orElse: () => f);
+          f = modes.firstWhere(
+            (e) => e.toString() == storageDisplay,
+            orElse: () => f,
+          );
         }
         DisplayMode preferred = modes.toList().firstWhere((el) => el == f);
         FlutterDisplayMode.setPreferredMode(preferred);
@@ -211,7 +216,8 @@ class MyApp extends StatelessWidget {
             builder: (context, child) {
               return MediaQuery(
                 data: MediaQuery.of(context).copyWith(
-                    textScaler: TextScaler.linear(Pref.defaultTextScale)),
+                  textScaler: TextScaler.linear(Pref.defaultTextScale),
+                ),
                 child: child!,
               );
             },
diff --git a/lib/member_card_info/card.dart b/lib/member_card_info/card.dart
index c6515acac..a14d56cd1 100644
--- a/lib/member_card_info/card.dart
+++ b/lib/member_card_info/card.dart
@@ -20,17 +20,18 @@ class Card {
   });
 
   factory Card.fromJson(Map<String, dynamic> json) => Card(
-        mid: json['mid'] as String?,
-        name: json['name'] as String?,
-        face: json['face'] as String?,
-        fans: json['fans'] as int?,
-        attention: json['attention'] as int?,
-        officialVerify: json['official_verify'] == null
-            ? null
-            : BaseOfficialVerify.fromJson(
-                json['official_verify'] as Map<String, dynamic>),
-        vip: json['vip'] == null
-            ? null
-            : Vip.fromJson(json['vip'] as Map<String, dynamic>),
-      );
+    mid: json['mid'] as String?,
+    name: json['name'] as String?,
+    face: json['face'] as String?,
+    fans: json['fans'] as int?,
+    attention: json['attention'] as int?,
+    officialVerify: json['official_verify'] == null
+        ? null
+        : BaseOfficialVerify.fromJson(
+            json['official_verify'] as Map<String, dynamic>,
+          ),
+    vip: json['vip'] == null
+        ? null
+        : Vip.fromJson(json['vip'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models/common/dm_block_type.dart b/lib/models/common/dm_block_type.dart
index cee31e94b..9924df1fb 100644
--- a/lib/models/common/dm_block_type.dart
+++ b/lib/models/common/dm_block_type.dart
@@ -1,8 +1,7 @@
 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 9ce018d6b..044c6e9ec 100644
--- a/lib/models/common/dynamic/dynamic_badge_mode.dart
+++ b/lib/models/common/dynamic/dynamic_badge_mode.dart
@@ -1,8 +1,7 @@
 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 a2c397422..dc71a080d 100644
--- a/lib/models/common/dynamic/dynamics_type.dart
+++ b/lib/models/common/dynamic/dynamics_type.dart
@@ -3,8 +3,7 @@ enum DynamicsTabType {
   video('投稿'),
   pgc('番剧'),
   article('专栏'),
-  up('UP'),
-  ;
+  up('UP');
 
   final String label;
   const DynamicsTabType(this.label);
diff --git a/lib/models/common/fav_order_type.dart b/lib/models/common/fav_order_type.dart
index e6f7b4d64..3ad6990eb 100644
--- a/lib/models/common/fav_order_type.dart
+++ b/lib/models/common/fav_order_type.dart
@@ -1,8 +1,7 @@
 enum FavOrderType {
   mtime('最近收藏'),
   view('最多播放'),
-  pubtime('最近投稿'),
-  ;
+  pubtime('最近投稿');
 
   final String label;
 
diff --git a/lib/models/common/home_tab_type.dart b/lib/models/common/home_tab_type.dart
index 40d7d6e09..1f7e88b16 100644
--- a/lib/models/common/home_tab_type.dart
+++ b/lib/models/common/home_tab_type.dart
@@ -26,21 +26,21 @@ enum HomeTabType implements EnumWithLabel {
   const HomeTabType(this.label);
 
   ScrollOrRefreshMixin Function() get ctr => switch (this) {
-        HomeTabType.live => Get.find<LiveController>,
-        HomeTabType.rcmd => Get.find<RcmdController>,
-        HomeTabType.hot => Get.find<HotController>,
-        HomeTabType.rank =>
-          (Get.find<RankController>) as ScrollOrRefreshMixin Function(),
-        HomeTabType.bangumi || HomeTabType.cinema => () =>
-            Get.find<PgcController>(tag: name),
-      };
+    HomeTabType.live => Get.find<LiveController>,
+    HomeTabType.rcmd => Get.find<RcmdController>,
+    HomeTabType.hot => Get.find<HotController>,
+    HomeTabType.rank =>
+      (Get.find<RankController>) as ScrollOrRefreshMixin Function(),
+    HomeTabType.bangumi ||
+    HomeTabType.cinema => () => Get.find<PgcController>(tag: name),
+  };
 
   Widget get page => switch (this) {
-        HomeTabType.live => const LivePage(),
-        HomeTabType.rcmd => const RcmdPage(),
-        HomeTabType.hot => const HotPage(),
-        HomeTabType.rank => const RankPage(),
-        HomeTabType.bangumi => const PgcPage(tabType: HomeTabType.bangumi),
-        HomeTabType.cinema => const PgcPage(tabType: HomeTabType.cinema),
-      };
+    HomeTabType.live => const LivePage(),
+    HomeTabType.rcmd => const RcmdPage(),
+    HomeTabType.hot => const HotPage(),
+    HomeTabType.rank => const RankPage(),
+    HomeTabType.bangumi => const PgcPage(tabType: HomeTabType.bangumi),
+    HomeTabType.cinema => const PgcPage(tabType: HomeTabType.cinema),
+  };
 }
diff --git a/lib/models/common/later_view_type.dart b/lib/models/common/later_view_type.dart
index bcd7be2fa..1012e1222 100644
--- a/lib/models/common/later_view_type.dart
+++ b/lib/models/common/later_view_type.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 enum LaterViewType {
   all(0, '全部'),
   // toView(1, '未看'),
-  unfinished(2, '未看完'),
+  unfinished(2, '未看完')
   // viewed(3, '已看完'),
   ;
 
diff --git a/lib/models/common/member/tab_type.dart b/lib/models/common/member/tab_type.dart
index 53a9fe950..a174362d6 100644
--- a/lib/models/common/member/tab_type.dart
+++ b/lib/models/common/member/tab_type.dart
@@ -4,8 +4,7 @@ enum MemberTabType {
   dynamic('动态'),
   contribute('投稿'),
   favorite('收藏'),
-  bangumi('番剧'),
-  ;
+  bangumi('番剧');
 
   final String title;
   const MemberTabType(this.title);
diff --git a/lib/models/common/reply/reply_option_type.dart b/lib/models/common/reply/reply_option_type.dart
index e5a6e988b..858370b97 100644
--- a/lib/models/common/reply/reply_option_type.dart
+++ b/lib/models/common/reply/reply_option_type.dart
@@ -4,15 +4,14 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
 enum ReplyOptionType {
   allow('允许评论'),
   close('关闭评论'),
-  choose('精选评论'),
-  ;
+  choose('精选评论');
 
   final String title;
   const ReplyOptionType(this.title);
 
   IconData get iconData => switch (this) {
-        ReplyOptionType.allow => MdiIcons.commentTextOutline,
-        ReplyOptionType.close => MdiIcons.commentOffOutline,
-        ReplyOptionType.choose => MdiIcons.commentProcessingOutline
-      };
+    ReplyOptionType.allow => MdiIcons.commentTextOutline,
+    ReplyOptionType.close => MdiIcons.commentOffOutline,
+    ReplyOptionType.choose => MdiIcons.commentProcessingOutline,
+  };
 }
diff --git a/lib/models/common/sponsor_block/action_type.dart b/lib/models/common/sponsor_block/action_type.dart
index 6a73a1337..d7becd4e0 100644
--- a/lib/models/common/sponsor_block/action_type.dart
+++ b/lib/models/common/sponsor_block/action_type.dart
@@ -2,8 +2,7 @@ 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 958fe8d47..edc997869 100644
--- a/lib/models/common/sponsor_block/segment_type.dart
+++ b/lib/models/common/sponsor_block/segment_type.dart
@@ -14,7 +14,7 @@ enum SegmentType {
   music_offtopic,
   poi_highlight,
   filler,
-  exclusive_access
+  exclusive_access,
 }
 
 // List<SegmentType> _actionType2SegmentType(ActionType actionType) {
@@ -52,93 +52,93 @@ enum SegmentType {
 extension SegmentTypeExt on SegmentType {
   /// from https://github.com/hanydd/BilibiliSponsorBlock/blob/master/public/_locales/zh_CN/messages.json
   String get title => const [
-        '赞助广告', //sponsor
-        '无偿/自我推广', //selfpromo
-        '三连/订阅提醒', //interaction
-        '过场/开场动画', //intro
-        '鸣谢/结束画面', //outro
-        '回顾/概要', //preview
-        '音乐:非音乐部分', //music_offtopic
-        '精彩时刻/重点', //poi_highlight
-        '离题闲聊/玩笑', //filler
-        '柔性推广/品牌合作', //exclusive_access
-      ][index];
+    '赞助广告', //sponsor
+    '无偿/自我推广', //selfpromo
+    '三连/订阅提醒', //interaction
+    '过场/开场动画', //intro
+    '鸣谢/结束画面', //outro
+    '回顾/概要', //preview
+    '音乐:非音乐部分', //music_offtopic
+    '精彩时刻/重点', //poi_highlight
+    '离题闲聊/玩笑', //filler
+    '柔性推广/品牌合作', //exclusive_access
+  ][index];
 
   String get shortTitle => const [
-        '赞助广告', //sponsor
-        '推广', //selfpromo
-        '订阅提醒', //interaction
-        '开场', //intro
-        '片尾', //outro
-        '预览', //preview
-        '非音乐', //music_offtopic
-        '精彩时刻', //poi_highlight
-        '闲聊', //filler
-        '品牌合作', //exclusive_access
-      ][index];
+    '赞助广告', //sponsor
+    '推广', //selfpromo
+    '订阅提醒', //interaction
+    '开场', //intro
+    '片尾', //outro
+    '预览', //preview
+    '非音乐', //music_offtopic
+    '精彩时刻', //poi_highlight
+    '闲聊', //filler
+    '品牌合作', //exclusive_access
+  ][index];
 
   String get description => const [
-        '付费推广、付费推荐和直接广告。不是自我推广或免费提及他们喜欢的商品/创作者/网站/产品。', //sponsor
-        '类似于 “赞助广告” ，但无报酬或是自我推广。包括有关商品、捐赠的部分或合作者的信息。', //selfpromo
-        '视频中间简短提醒观众来一键三连或关注。 如果片段较长，或是有具体内容，则应分类为自我推广。', //interaction
-        '没有实际内容的间隔片段。可以是暂停、静态帧或重复动画。不适用于包含内容的过场。', //intro
-        '致谢画面或片尾画面。不包含内容的结尾。', //outro
-        '展示此视频或同系列视频将出现的画面集锦，片段中所有内容都将在之后的正片中再次出现。', //preview
-        '仅用于音乐视频。此分类只能用于音乐视频中未包括于其他分类的部分。', //music_offtopic
-        '大部分人都在寻找的空降时间。类似于“封面在12:34”的评论。', //poi_highlight
-        "仅作为填充内容或增添趣味而添加的离题片段，这些内容对理解视频的主要内容并非必需。这不包括提供背景信息或上下文的片段。这是一个非常激进的分类，适用于当你不想看'娱乐性'内容的时候。", //filler
-        '仅用于对整个视频进行标记。适用于展示UP主免费或获得补贴后使用的产品、服务或场地的视频。', //exclusive_access
-      ][index];
+    '付费推广、付费推荐和直接广告。不是自我推广或免费提及他们喜欢的商品/创作者/网站/产品。', //sponsor
+    '类似于 “赞助广告” ，但无报酬或是自我推广。包括有关商品、捐赠的部分或合作者的信息。', //selfpromo
+    '视频中间简短提醒观众来一键三连或关注。 如果片段较长，或是有具体内容，则应分类为自我推广。', //interaction
+    '没有实际内容的间隔片段。可以是暂停、静态帧或重复动画。不适用于包含内容的过场。', //intro
+    '致谢画面或片尾画面。不包含内容的结尾。', //outro
+    '展示此视频或同系列视频将出现的画面集锦，片段中所有内容都将在之后的正片中再次出现。', //preview
+    '仅用于音乐视频。此分类只能用于音乐视频中未包括于其他分类的部分。', //music_offtopic
+    '大部分人都在寻找的空降时间。类似于“封面在12:34”的评论。', //poi_highlight
+    "仅作为填充内容或增添趣味而添加的离题片段，这些内容对理解视频的主要内容并非必需。这不包括提供背景信息或上下文的片段。这是一个非常激进的分类，适用于当你不想看'娱乐性'内容的时候。", //filler
+    '仅用于对整个视频进行标记。适用于展示UP主免费或获得补贴后使用的产品、服务或场地的视频。', //exclusive_access
+  ][index];
 
   Color get color => const [
-        Color(0xFF00d400), //sponsor
-        Color(0xFFffff00), //selfpromo
-        Color(0xFFcc00ff), //interaction
-        Color(0xFF00ffff), //intro
-        Color(0xFF0202ed), //outro
-        Color(0xFF008fd6), //preview
-        Color(0xFFff9900), //music_offtopic
-        Color(0xFFff1684), //poi_highlight
-        Color(0xFF7300FF), //filler
-        Color(0xFF008a5c), //exclusive_access
-      ][index];
+    Color(0xFF00d400), //sponsor
+    Color(0xFFffff00), //selfpromo
+    Color(0xFFcc00ff), //interaction
+    Color(0xFF00ffff), //intro
+    Color(0xFF0202ed), //outro
+    Color(0xFF008fd6), //preview
+    Color(0xFFff9900), //music_offtopic
+    Color(0xFFff1684), //poi_highlight
+    Color(0xFF7300FF), //filler
+    Color(0xFF008a5c), //exclusive_access
+  ][index];
 
   List<ActionType> get toActionType {
     return switch (this) {
       SegmentType.sponsor => const [
-          ActionType.skip,
-          ActionType.mute,
-          ActionType.full
-        ],
+        ActionType.skip,
+        ActionType.mute,
+        ActionType.full,
+      ],
       SegmentType.selfpromo => const [
-          ActionType.skip,
-          ActionType.mute,
-          ActionType.full
-        ],
+        ActionType.skip,
+        ActionType.mute,
+        ActionType.full,
+      ],
       SegmentType.interaction => const [
-          ActionType.skip,
-          ActionType.mute,
-        ],
+        ActionType.skip,
+        ActionType.mute,
+      ],
       SegmentType.intro => const [
-          ActionType.skip,
-          ActionType.mute,
-        ],
+        ActionType.skip,
+        ActionType.mute,
+      ],
       SegmentType.outro => const [
-          ActionType.skip,
-          ActionType.mute,
-        ],
+        ActionType.skip,
+        ActionType.mute,
+      ],
       SegmentType.preview => const [
-          ActionType.skip,
-          ActionType.mute,
-        ],
+        ActionType.skip,
+        ActionType.mute,
+      ],
       SegmentType.music_offtopic => const [
-          ActionType.skip,
-        ],
+        ActionType.skip,
+      ],
       SegmentType.poi_highlight => const [ActionType.poi],
       SegmentType.filler => const [
-          ActionType.skip,
-          ActionType.mute,
-        ],
+        ActionType.skip,
+        ActionType.mute,
+      ],
       SegmentType.exclusive_access => const [ActionType.full],
     };
   }
diff --git a/lib/models/common/sponsor_block/skip_type.dart b/lib/models/common/sponsor_block/skip_type.dart
index 6fd9a4c51..e66646e7d 100644
--- a/lib/models/common/sponsor_block/skip_type.dart
+++ b/lib/models/common/sponsor_block/skip_type.dart
@@ -3,8 +3,7 @@ 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 cc3943a4d..d43eaa886 100644
--- a/lib/models/common/stat_type.dart
+++ b/lib/models/common/stat_type.dart
@@ -7,8 +7,7 @@ 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;
   const StatType(this.iconData);
diff --git a/lib/models/common/theme/theme_type.dart b/lib/models/common/theme/theme_type.dart
index ffa91a681..9a301a491 100644
--- a/lib/models/common/theme/theme_type.dart
+++ b/lib/models/common/theme/theme_type.dart
@@ -4,21 +4,20 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
 enum ThemeType {
   light('浅色'),
   dark('深色'),
-  system('跟随系统'),
-  ;
+  system('跟随系统');
 
   final String desc;
   const ThemeType(this.desc);
 
   ThemeMode get toThemeMode => switch (this) {
-        ThemeType.light => ThemeMode.light,
-        ThemeType.dark => ThemeMode.dark,
-        ThemeType.system => ThemeMode.system,
-      };
+    ThemeType.light => ThemeMode.light,
+    ThemeType.dark => ThemeMode.dark,
+    ThemeType.system => ThemeMode.system,
+  };
 
   Icon get icon => switch (this) {
-        ThemeType.light => const Icon(MdiIcons.weatherSunny, size: 24),
-        ThemeType.dark => const Icon(MdiIcons.weatherNight, size: 24),
-        ThemeType.system => const Icon(MdiIcons.themeLightDark, size: 24),
-      };
+    ThemeType.light => const Icon(MdiIcons.weatherSunny, size: 24),
+    ThemeType.dark => const Icon(MdiIcons.weatherNight, size: 24),
+    ThemeType.system => const Icon(MdiIcons.themeLightDark, size: 24),
+  };
 }
diff --git a/lib/models/common/video/live_quality.dart b/lib/models/common/video/live_quality.dart
index d0fb008d4..f1ee04ccb 100644
--- a/lib/models/common/video/live_quality.dart
+++ b/lib/models/common/video/live_quality.dart
@@ -29,12 +29,12 @@ extension LiveQualityExt on LiveQuality {
   }
 
   String get description => const [
-        '杜比',
-        '4K',
-        '原画',
-        '蓝光',
-        '超清',
-        '高清',
-        '流畅',
-      ][index];
+    '杜比',
+    '4K',
+    '原画',
+    '蓝光',
+    '超清',
+    '高清',
+    '流畅',
+  ][index];
 }
diff --git a/lib/models/common/video/subtitle_pref_type.dart b/lib/models/common/video/subtitle_pref_type.dart
index 5839c73ef..8be5aebd1 100644
--- a/lib/models/common/video/subtitle_pref_type.dart
+++ b/lib/models/common/video/subtitle_pref_type.dart
@@ -2,11 +2,11 @@ enum SubtitlePrefType { off, on, withoutAi, auto }
 
 extension SubtitlePrefTypeExt on SubtitlePrefType {
   String get description => const [
-        '默认不显示字幕',
-        '优先选择非自动生成(ai)字幕',
-        '跳过自动生成(ai)字幕，选择第一个可用字幕',
-        '静音时等同第二项，非静音时等同第三项'
-      ][index];
+    '默认不显示字幕',
+    '优先选择非自动生成(ai)字幕',
+    '跳过自动生成(ai)字幕，选择第一个可用字幕',
+    '静音时等同第二项，非静音时等同第三项',
+  ][index];
 
   static const List<String> _codeList = ['off', 'on', 'withoutAi', 'auto'];
   String get code => _codeList[index];
diff --git a/lib/models/dynamics/article_content_model.dart b/lib/models/dynamics/article_content_model.dart
index ce6ad0eff..9410f5354 100644
--- a/lib/models/dynamics/article_content_model.dart
+++ b/lib/models/dynamics/article_content_model.dart
@@ -19,8 +19,9 @@ class ArticleContentModel {
     format = json['format'] == null ? null : Format.fromJson(json['format']);
     line = json['line'] == null ? null : Line.fromJson(json['line']);
     pic = json['pic'] == null ? null : Pic.fromJson(json['pic']);
-    linkCard =
-        json['link_card'] == null ? null : LinkCard.fromJson(json['link_card']);
+    linkCard = json['link_card'] == null
+        ? null
+        : LinkCard.fromJson(json['link_card']);
     code = json['code'] == null ? null : Code.fromJson(json['code']);
     list = json['list'] == null ? null : L1st.fromJson(json['list']);
   }
@@ -79,8 +80,9 @@ class Text {
   List<Node>? nodes;
 
   Text.fromJson(Map<String, dynamic> json) {
-    nodes =
-        (json['nodes'] as List?)?.map((item) => Node.fromJson(item)).toList();
+    nodes = (json['nodes'] as List?)
+        ?.map((item) => Node.fromJson(item))
+        .toList();
   }
 }
 
@@ -95,8 +97,9 @@ class Node {
     nodeType = json['node_type'];
     word = json['word'] == null ? null : Word.fromJson(json['word']);
     rich = json['rich'] == null ? null : Rich.fromJson(json['rich']);
-    formula =
-        json['formula'] == null ? null : Formula.fromJson(json['formula']);
+    formula = json['formula'] == null
+        ? null
+        : Formula.fromJson(json['formula']);
     type = json['type'];
   }
 }
@@ -122,8 +125,10 @@ class Word {
     style = json['style'] == null ? null : Style.fromJson(json['style']);
     color = json['color'] == null
         ? null
-        : int.tryParse('FF${(json['color'] as String).substring(1)}',
-            radix: 16);
+        : int.tryParse(
+            'FF${(json['color'] as String).substring(1)}',
+            radix: 16,
+          );
     fontLevel = json['font_level'];
   }
 }
@@ -203,8 +208,9 @@ class Card {
     oid = json['oid'];
     type = json['type'];
     ugc = json['ugc'] == null ? null : Ugc.fromJson(json['ugc']);
-    itemNull =
-        json['item_null'] == null ? null : ItemNull.fromJson(json['item_null']);
+    itemNull = json['item_null'] == null
+        ? null
+        : ItemNull.fromJson(json['item_null']);
     common = json['common'] == null ? null : Common.fromJson(json['common']);
     live = json['live'] == null ? null : Live.fromJson(json['live']);
     opus = json['opus'] == null ? null : Opus.fromJson(json['opus']);
diff --git a/lib/models/dynamics/result.dart b/lib/models/dynamics/result.dart
index bf301ff6c..8d3249c3d 100644
--- a/lib/models/dynamics/result.dart
+++ b/lib/models/dynamics/result.dart
@@ -13,8 +13,10 @@ class DynamicsDataModel {
   String? offset;
   int? total;
 
-  static RegExp banWordForDyn =
-      RegExp(Pref.banWordForDyn, caseSensitive: false);
+  static RegExp banWordForDyn = RegExp(
+    Pref.banWordForDyn,
+    caseSensitive: false,
+  );
   static bool enableFilter = banWordForDyn.pattern.isNotEmpty;
 
   static bool antiGoodsDyn = Pref.antiGoodsDyn;
@@ -41,12 +43,14 @@ class DynamicsDataModel {
           continue;
         }
         if (enableFilter &&
-            banWordForDyn.hasMatch((item.orig?.modules.moduleDynamic?.major
-                        ?.opus?.summary?.text ??
-                    '') +
-                (item.modules.moduleDynamic?.major?.opus?.summary?.text ?? '') +
-                (item.orig?.modules.moduleDynamic?.desc?.text ?? '') +
-                (item.modules.moduleDynamic?.desc?.text ?? ''))) {
+            banWordForDyn.hasMatch(
+              (item.orig?.modules.moduleDynamic?.major?.opus?.summary?.text ??
+                      '') +
+                  (item.modules.moduleDynamic?.major?.opus?.summary?.text ??
+                      '') +
+                  (item.orig?.modules.moduleDynamic?.desc?.text ?? '') +
+                  (item.modules.moduleDynamic?.desc?.text ?? ''),
+            )) {
           continue;
         }
         if (filterBan &&
@@ -97,7 +101,8 @@ class DynamicItemModel {
     modules = json['item']?['modules'] == null
         ? ItemModulesModel()
         : ItemModulesModel.fromOpusJson(
-            (json['item']['modules'] as List).cast());
+            (json['item']['modules'] as List).cast(),
+          );
 
     if (json['fallback'] != null) {
       fallback = Fallback.fromJson(json['fallback']);
@@ -115,9 +120,9 @@ class Fallback {
   });
 
   factory Fallback.fromJson(Map<String, dynamic> json) => Fallback(
-        id: json['id'],
-        type: json['type'],
-      );
+    id: json['id'],
+    type: json['type'],
+  );
 }
 
 // 单个动态详情
@@ -238,8 +243,9 @@ class ModuleTopDisplay {
   int? type;
 
   ModuleTopDisplay.fromJson(Map<String, dynamic> json) {
-    album =
-        json['album'] == null ? null : ModuleTopAlbum.fromJson(json['album']);
+    album = json['album'] == null
+        ? null
+        : ModuleTopAlbum.fromJson(json['album']);
     type = json['type'];
   }
 }
@@ -353,8 +359,9 @@ class ModuleAuthorModel extends Avatar {
     pubTs = json['pub_ts'] == 0 ? null : json['pub_ts'];
     type = json['type'];
     if (PendantAvatar.showDynDecorate) {
-      decorate =
-          json['decorate'] == null ? null : Decorate.fromJson(json['decorate']);
+      decorate = json['decorate'] == null
+          ? null
+          : Decorate.fromJson(json['decorate']);
     } else {
       pendant = null;
     }
@@ -379,13 +386,13 @@ class Decorate {
   });
 
   factory Decorate.fromJson(Map<String, dynamic> json) => Decorate(
-        cardUrl: json["card_url"],
-        fan: json["fan"] == null ? null : Fan.fromJson(json["fan"]),
-        id: json["id"],
-        jumpUrl: json["jump_url"],
-        name: json["name"],
-        type: json["type"],
-      );
+    cardUrl: json["card_url"],
+    fan: json["fan"] == null ? null : Fan.fromJson(json["fan"]),
+    id: json["id"],
+    jumpUrl: json["jump_url"],
+    name: json["name"],
+    type: json["type"],
+  );
 }
 
 class Fan {
@@ -404,12 +411,12 @@ class Fan {
   });
 
   factory Fan.fromJson(Map<String, dynamic> json) => Fan(
-        color: json["color"],
-        isFan: json["is_fan"],
-        numPrefix: json["num_prefix"],
-        numStr: json["num_str"],
-        number: json["number"],
-      );
+    color: json["color"],
+    isFan: json["is_fan"],
+    numPrefix: json["num_prefix"],
+    numStr: json["num_str"],
+    number: json["number"],
+  );
 }
 
 // 单个动态详情 - 动态信息
@@ -430,8 +437,9 @@ class ModuleDynamicModel {
     additional = json['additional'] != null
         ? DynamicAddModel.fromJson(json['additional'])
         : null;
-    desc =
-        json['desc'] != null ? DynamicDescModel.fromJson(json['desc']) : null;
+    desc = json['desc'] != null
+        ? DynamicDescModel.fromJson(json['desc'])
+        : null;
     if (json['major'] != null) {
       major = DynamicMajorModel.fromJson(json['major']);
     }
@@ -473,8 +481,9 @@ class DynamicAddModel {
     type = json['type'];
     vote = json['vote'] != null ? Vote.fromJson(json['vote']) : null;
     ugc = json['ugc'] != null ? Ugc.fromJson(json['ugc']) : null;
-    reserve =
-        json['reserve'] != null ? Reserve.fromJson(json['reserve']) : null;
+    reserve = json['reserve'] != null
+        ? Reserve.fromJson(json['reserve'])
+        : null;
     goods = json['goods'] != null ? Good.fromJson(json['goods']) : null;
     upowerLottery = json['upower_lottery'] != null
         ? UpowerLottery.fromJson(json['upower_lottery'])
@@ -500,14 +509,14 @@ class AddMatch {
   });
 
   factory AddMatch.fromJson(Map<String, dynamic> json) => AddMatch(
-        button: json["button"] == null ? null : Button.fromJson(json["button"]),
-        headText: json["head_text"],
-        idStr: json["id_str"],
-        jumpUrl: json["jump_url"],
-        matchInfo: json["match_info"] == null
-            ? null
-            : MatchInfo.fromJson(json["match_info"]),
-      );
+    button: json["button"] == null ? null : Button.fromJson(json["button"]),
+    headText: json["head_text"],
+    idStr: json["id_str"],
+    jumpUrl: json["jump_url"],
+    matchInfo: json["match_info"] == null
+        ? null
+        : MatchInfo.fromJson(json["match_info"]),
+  );
 }
 
 class MatchInfo {
@@ -530,18 +539,18 @@ class MatchInfo {
   });
 
   factory MatchInfo.fromJson(Map<String, dynamic> json) => MatchInfo(
-        centerBottom: json["center_bottom"],
-        centerTop: json["center_top"],
-        leftTeam: json["left_team"] == null
-            ? null
-            : TTeam.fromJson(json["left_team"]),
-        rightTeam: json["right_team"] == null
-            ? null
-            : TTeam.fromJson(json["right_team"]),
-        status: json["status"],
-        subTitle: json["sub_title"],
-        title: json["title"],
-      );
+    centerBottom: json["center_bottom"],
+    centerTop: json["center_top"],
+    leftTeam: json["left_team"] == null
+        ? null
+        : TTeam.fromJson(json["left_team"]),
+    rightTeam: json["right_team"] == null
+        ? null
+        : TTeam.fromJson(json["right_team"]),
+    status: json["status"],
+    subTitle: json["sub_title"],
+    title: json["title"],
+  );
 }
 
 class TTeam {
@@ -556,10 +565,10 @@ class TTeam {
   });
 
   factory TTeam.fromJson(Map<String, dynamic> json) => TTeam(
-        id: json["id"],
-        name: json["name"],
-        pic: json["pic"],
-      );
+    id: json["id"],
+    name: json["name"],
+    pic: json["pic"],
+  );
 }
 
 class AddCommon {
@@ -588,17 +597,17 @@ class AddCommon {
   });
 
   factory AddCommon.fromJson(Map<String, dynamic> json) => AddCommon(
-        button: json["button"] == null ? null : Button.fromJson(json["button"]),
-        cover: json["cover"],
-        desc1: json["desc1"],
-        desc2: json["desc2"],
-        headText: json["head_text"],
-        idStr: json["id_str"],
-        jumpUrl: json["jump_url"],
-        style: json["style"],
-        subType: json["sub_type"],
-        title: json["title"],
-      );
+    button: json["button"] == null ? null : Button.fromJson(json["button"]),
+    cover: json["cover"],
+    desc1: json["desc1"],
+    desc2: json["desc2"],
+    headText: json["head_text"],
+    idStr: json["id_str"],
+    jumpUrl: json["jump_url"],
+    style: json["style"],
+    subType: json["sub_type"],
+    title: json["title"],
+  );
 }
 
 class UpowerLottery {
@@ -627,17 +636,17 @@ class UpowerLottery {
   });
 
   factory UpowerLottery.fromJson(Map<String, dynamic> json) => UpowerLottery(
-        button: json["button"] == null ? null : Button.fromJson(json["button"]),
-        desc: json["desc"] == null ? null : Desc.fromJson(json["desc"]),
-        hint: json["hint"] == null ? null : Hint.fromJson(json["hint"]),
-        jumpUrl: json["jump_url"],
-        rid: json["rid"],
-        state: json["state"],
-        title: json["title"],
-        upMid: json["up_mid"],
-        upowerActionState: json["upower_action_state"],
-        upowerLevel: json["upower_level"],
-      );
+    button: json["button"] == null ? null : Button.fromJson(json["button"]),
+    desc: json["desc"] == null ? null : Desc.fromJson(json["desc"]),
+    hint: json["hint"] == null ? null : Hint.fromJson(json["hint"]),
+    jumpUrl: json["jump_url"],
+    rid: json["rid"],
+    state: json["state"],
+    title: json["title"],
+    upMid: json["up_mid"],
+    upowerActionState: json["upower_action_state"],
+    upowerLevel: json["upower_level"],
+  );
 }
 
 class Hint {
@@ -650,9 +659,9 @@ class Hint {
   });
 
   factory Hint.fromJson(Map<String, dynamic> json) => Hint(
-        style: json["style"],
-        text: json["text"],
-      );
+    style: json["style"],
+    text: json["text"],
+  );
 }
 
 class JumpStyle {
@@ -665,9 +674,9 @@ class JumpStyle {
   });
 
   factory JumpStyle.fromJson(Map<String, dynamic> json) => JumpStyle(
-        iconUrl: json["icon_url"],
-        text: json["text"],
-      );
+    iconUrl: json["icon_url"],
+    text: json["text"],
+  );
 }
 
 class Vote {
@@ -771,8 +780,9 @@ class Reserve {
   int? upMid;
 
   Reserve.fromJson(Map<String, dynamic> json) {
-    button =
-        json['button'] == null ? null : ReserveBtn.fromJson(json['button']);
+    button = json['button'] == null
+        ? null
+        : ReserveBtn.fromJson(json['button']);
     desc1 = json['desc1'] == null ? null : Desc.fromJson(json['desc1']);
     desc2 = json['desc2'] == null ? null : Desc.fromJson(json['desc2']);
     desc3 = json['desc3'] == null ? null : Desc.fromJson(json['desc3']);
@@ -948,22 +958,27 @@ class DynamicMajorModel {
     archive = json['archive'] != null
         ? DynamicArchiveModel.fromJson(json['archive'])
         : null;
-    draw =
-        json['draw'] != null ? DynamicDrawModel.fromJson(json['draw']) : null;
+    draw = json['draw'] != null
+        ? DynamicDrawModel.fromJson(json['draw'])
+        : null;
     ugcSeason = json['ugc_season'] != null
         ? DynamicArchiveModel.fromJson(json['ugc_season'])
         : null;
-    opus =
-        json['opus'] != null ? DynamicOpusModel.fromJson(json['opus']) : null;
-    pgc =
-        json['pgc'] != null ? DynamicArchiveModel.fromJson(json['pgc']) : null;
+    opus = json['opus'] != null
+        ? DynamicOpusModel.fromJson(json['opus'])
+        : null;
+    pgc = json['pgc'] != null
+        ? DynamicArchiveModel.fromJson(json['pgc'])
+        : null;
     liveRcmd = json['live_rcmd'] != null
         ? DynamicLiveModel.fromJson(json['live_rcmd'])
         : null;
-    live =
-        json['live'] != null ? DynamicLive2Model.fromJson(json['live']) : null;
-    none =
-        json['none'] != null ? DynamicNoneModel.fromJson(json['none']) : null;
+    live = json['live'] != null
+        ? DynamicLive2Model.fromJson(json['live'])
+        : null;
+    none = json['none'] != null
+        ? DynamicNoneModel.fromJson(json['none'])
+        : null;
     type = json['type'];
     courses = json['courses'];
     common = json['common'] == null ? null : Common.fromJson(json['common']);
@@ -1026,11 +1041,11 @@ class LiveRcmd {
   });
 
   factory LiveRcmd.fromJson(Map<String, dynamic> json) => LiveRcmd(
-        content: json["content"] == null
-            ? null
-            : LiveRcmdContent.fromJson(jsonDecode(json["content"])),
-        reserveType: json["reserve_type"],
-      );
+    content: json["content"] == null
+        ? null
+        : LiveRcmdContent.fromJson(jsonDecode(json["content"])),
+    reserveType: json["reserve_type"],
+  );
 }
 
 class LiveRcmdContent {
@@ -1091,26 +1106,26 @@ class LivePlayInfo {
   });
 
   factory LivePlayInfo.fromJson(Map<String, dynamic> json) => LivePlayInfo(
-        roomId: json["room_id"],
-        uid: json["uid"],
-        liveStatus: json["live_status"],
-        roomType: json["room_type"],
-        playType: json["play_type"],
-        title: json["title"],
-        cover: json["cover"],
-        online: json["online"],
-        areaId: json["area_id"],
-        areaName: json["area_name"],
-        parentAreaId: json["parent_area_id"],
-        parentAreaName: json["parent_area_name"],
-        liveScreenType: json["live_screen_type"],
-        liveStartTime: json["live_start_time"],
-        link: json["link"],
-        watchedShow: json["watched_show"] == null
-            ? null
-            : WatchedShow.fromJson(json["watched_show"]),
-        roomPaidType: json["room_paid_type"],
-      );
+    roomId: json["room_id"],
+    uid: json["uid"],
+    liveStatus: json["live_status"],
+    roomType: json["room_type"],
+    playType: json["play_type"],
+    title: json["title"],
+    cover: json["cover"],
+    online: json["online"],
+    areaId: json["area_id"],
+    areaName: json["area_name"],
+    parentAreaId: json["parent_area_id"],
+    parentAreaName: json["parent_area_name"],
+    liveScreenType: json["live_screen_type"],
+    liveStartTime: json["live_start_time"],
+    link: json["link"],
+    watchedShow: json["watched_show"] == null
+        ? null
+        : WatchedShow.fromJson(json["watched_show"]),
+    roomPaidType: json["room_paid_type"],
+  );
 }
 
 class DynamicTopicModel {
@@ -1224,8 +1239,9 @@ class DynamicOpusModel {
     pics = (json['pics'] as List?)
         ?.map<OpusPicModel>((e) => OpusPicModel.fromJson(e))
         .toList();
-    summary =
-        json['summary'] != null ? SummaryModel.fromJson(json['summary']) : null;
+    summary = json['summary'] != null
+        ? SummaryModel.fromJson(json['summary'])
+        : null;
     title = json['title'];
   }
 }
@@ -1273,8 +1289,8 @@ class RichTextNodeItem {
     pics = json['pics'] == null
         ? null
         : (json['pics'] as List?)
-            ?.map((e) => OpusPicModel.fromJson(e))
-            .toList();
+              ?.map((e) => OpusPicModel.fromJson(e))
+              .toList();
     jumpUrl = json['jump_url'];
   }
 }
@@ -1462,10 +1478,12 @@ class ModuleStatModel {
   // DynamicStat? coin;
 
   ModuleStatModel.fromJson(Map<String, dynamic> json) {
-    comment =
-        json['comment'] == null ? null : DynamicStat.fromJson(json['comment']);
-    forward =
-        json['forward'] == null ? null : DynamicStat.fromJson(json['forward']);
+    comment = json['comment'] == null
+        ? null
+        : DynamicStat.fromJson(json['comment']);
+    forward = json['forward'] == null
+        ? null
+        : DynamicStat.fromJson(json['forward']);
     like = json['like'] == null ? null : DynamicStat.fromJson(json['like']);
     if (json['favorite'] != null) {
       favorite = DynamicStat.fromJson(json['favorite']);
@@ -1492,11 +1510,11 @@ class DynamicStat {
   }
 
   static int? _parseInt(dynamic x) => switch (x) {
-        int() => x,
-        String() => int.tryParse(x),
-        double() => x.toInt(),
-        _ => null
-      };
+    int() => x,
+    String() => int.tryParse(x),
+    double() => x.toInt(),
+    _ => null,
+  };
 }
 
 class Stat {
diff --git a/lib/models/dynamics/vote_model.dart b/lib/models/dynamics/vote_model.dart
index b2f466765..fbff1fbaa 100644
--- a/lib/models/dynamics/vote_model.dart
+++ b/lib/models/dynamics/vote_model.dart
@@ -76,7 +76,7 @@ class VoteInfo extends SimpleVoteInfo {
     myVotes = (json['my_votes'] as List?)?.cast(); // doVote
     options =
         (json['options'] as List?)?.map((v) => Option.fromJson(v)).toList() ??
-            <Option>[];
+        <Option>[];
     optionsCnt = json['options_cnt'];
     voterLevel = json['voter_level'];
     face = json['face'];
@@ -91,16 +91,16 @@ class VoteInfo extends SimpleVoteInfo {
   }
 
   Map<String, dynamic> toJson() => {
-        'title': title,
-        'desc': desc,
-        'type': type,
-        'choice_cnt': choiceCnt,
-        'duration': duration,
-        'options': options.map((e) => e.toJson()).toList(),
-        'only_fans_level': onlyFansLevel,
-        'vote_publisher': votePublisher,
-        if (voteId != null) 'vote_id': voteId,
-      };
+    'title': title,
+    'desc': desc,
+    'type': type,
+    'choice_cnt': choiceCnt,
+    'duration': duration,
+    'options': options.map((e) => e.toJson()).toList(),
+    'only_fans_level': onlyFansLevel,
+    'vote_publisher': votePublisher,
+    if (voteId != null) 'vote_id': voteId,
+  };
 }
 
 class Option {
@@ -122,7 +122,7 @@ class Option {
   }
 
   Map<String, dynamic> toJson() => {
-        'opt_desc': optDesc,
-        'img_url': imgUrl,
-      };
+    'opt_desc': optDesc,
+    'img_url': imgUrl,
+  };
 }
diff --git a/lib/models/login/model.dart b/lib/models/login/model.dart
index a4f2e3c0e..2f044ac42 100644
--- a/lib/models/login/model.dart
+++ b/lib/models/login/model.dart
@@ -18,10 +18,12 @@ class CaptchaDataModel {
   CaptchaDataModel.fromJson(Map<String, dynamic> json) {
     type = json["type"];
     token = json["token"];
-    geetest =
-        json["geetest"] != null ? GeetestData.fromJson(json["geetest"]) : null;
-    tencent =
-        json["tencent"] != null ? Tencent.fromJson(json["tencent"]) : null;
+    geetest = json["geetest"] != null
+        ? GeetestData.fromJson(json["geetest"])
+        : null;
+    tencent = json["tencent"] != null
+        ? Tencent.fromJson(json["tencent"])
+        : null;
   }
 }
 
diff --git a/lib/models/member/info.dart b/lib/models/member/info.dart
index 1612114b1..44affe9ec 100644
--- a/lib/models/member/info.dart
+++ b/lib/models/member/info.dart
@@ -43,8 +43,9 @@ class MemberInfoModel {
         ? null
         : BaseOfficialVerify.fromJson(json['official']);
     vip = Vip.fromJson(json['vip']);
-    liveRoom =
-        json['live_room'] != null ? LiveRoom.fromJson(json['live_room']) : null;
+    liveRoom = json['live_room'] != null
+        ? LiveRoom.fromJson(json['live_room'])
+        : null;
     isSeniorMember = json['is_senior_member'];
   }
 }
diff --git a/lib/models/pgc_lcf.dart b/lib/models/pgc_lcf.dart
index 51ed9c4e3..d04b346e4 100644
--- a/lib/models/pgc_lcf.dart
+++ b/lib/models/pgc_lcf.dart
@@ -12,9 +12,9 @@ class PgcLCF {
   });
 
   factory PgcLCF.fromJson(Map<String, dynamic> json) => PgcLCF(
-        coinNumber: json["coin_number"],
-        favorite: json["favorite"],
-        isOriginal: json["is_original"],
-        like: json["like"],
-      );
+    coinNumber: json["coin_number"],
+    favorite: json["favorite"],
+    isOriginal: json["is_original"],
+    like: json["like"],
+  );
 }
diff --git a/lib/models/search/result.dart b/lib/models/search/result.dart
index aaff7e41d..896d3856e 100644
--- a/lib/models/search/result.dart
+++ b/lib/models/search/result.dart
@@ -30,22 +30,28 @@ class SearchAllData extends SearchNumData {
           switch (item['result_type']) {
             case 'media_bangumi' || 'media_bangumi':
               if (isRefresh) {
-                list!.add((item['data'] as List)
-                    .map((e) => SearchPgcItemModel.fromJson(e))
-                    .toList());
+                list!.add(
+                  (item['data'] as List)
+                      .map((e) => SearchPgcItemModel.fromJson(e))
+                      .toList(),
+                );
               }
               break;
             case 'bili_user':
               if (isRefresh) {
-                list!.addAll((item['data'] as List)
-                    .map((e) => SearchUserItemModel.fromJson(e))
-                    .toList());
+                list!.addAll(
+                  (item['data'] as List)
+                      .map((e) => SearchUserItemModel.fromJson(e))
+                      .toList(),
+                );
               }
               break;
             case 'video':
-              list!.addAll((item['data'] as List)
-                  .map((e) => SearchVideoItemModel.fromJson(e))
-                  .toList());
+              list!.addAll(
+                (item['data'] as List)
+                    .map((e) => SearchVideoItemModel.fromJson(e))
+                    .toList(),
+              );
               break;
           }
         }
diff --git a/lib/models/user/danmaku_rule.dart b/lib/models/user/danmaku_rule.dart
index 53ed84b6a..6f0beb085 100644
--- a/lib/models/user/danmaku_rule.dart
+++ b/lib/models/user/danmaku_rule.dart
@@ -19,9 +19,12 @@ class RuleFilter {
     dmFilterString = rules[0].map((e) => e.filter).toList();
 
     dmRegExp = rules[1]
-        .map((e) => RegExp(
+        .map(
+          (e) => RegExp(
             _regExp.matchAsPrefix(e.filter)?.group(1) ?? e.filter,
-            caseSensitive: false))
+            caseSensitive: false,
+          ),
+        )
         .toList();
 
     dmUid = rules[2].map((e) => e.filter).toSet();
diff --git a/lib/models/user/danmaku_rule_adapter.dart b/lib/models/user/danmaku_rule_adapter.dart
index 980106c51..232a89d19 100644
--- a/lib/models/user/danmaku_rule_adapter.dart
+++ b/lib/models/user/danmaku_rule_adapter.dart
@@ -8,12 +8,13 @@ class RuleFilterAdapter extends TypeAdapter<RuleFilter> {
   @override
   RuleFilter read(BinaryReader reader) {
     return RuleFilter(
-        reader.readStringList(),
-        reader
-            .readStringList()
-            .map((i) => RegExp(i, caseSensitive: false))
-            .toList(),
-        reader.readStringList().toSet());
+      reader.readStringList(),
+      reader
+          .readStringList()
+          .map((i) => RegExp(i, caseSensitive: false))
+          .toList(),
+      reader.readStringList().toSet(),
+    );
   }
 
   @override
diff --git a/lib/models/user/info.dart b/lib/models/user/info.dart
index f5f7f6a66..c4c29dabb 100644
--- a/lib/models/user/info.dart
+++ b/lib/models/user/info.dart
@@ -134,7 +134,8 @@ class LevelInfo {
     currentLevel = json['current_level'];
     currentMin = json['current_min'];
     currentExp = json['current_exp'];
-    nextExp =
-        json['current_level'] == 6 ? json['current_exp'] : json['next_exp'];
+    nextExp = json['current_level'] == 6
+        ? json['current_exp']
+        : json['next_exp'];
   }
 }
diff --git a/lib/models/video/play/url.dart b/lib/models/video/play/url.dart
index 9aa5f4563..431d7750f 100644
--- a/lib/models/video/play/url.dart
+++ b/lib/models/video/play/url.dart
@@ -48,8 +48,9 @@ class PlayUrlModel {
     timeLength = json['timelength'];
     acceptFormat = json['accept_format'];
     acceptDesc = json['accept_description'];
-    acceptQuality =
-        (json['accept_quality'] as List?)?.map<int>((e) => e as int).toList();
+    acceptQuality = (json['accept_quality'] as List?)
+        ?.map<int>((e) => e as int)
+        .toList();
     videoCodecid = json['video_codecid'];
     seekParam = json['seek_param'];
     seekType = json['seek_type'];
@@ -172,8 +173,10 @@ abstract class BaseItem {
     baseUrl = json['baseUrl'];
     final backupUrls = (json['backupUrl'] as List?)?.cast<String>() ?? [];
     backupUrl = backupUrls.isNotEmpty
-        ? backupUrls.firstWhere((i) => !_isMCDNorPCDN(i),
-            orElse: () => backupUrls.first)
+        ? backupUrls.firstWhere(
+            (i) => !_isMCDNorPCDN(i),
+            orElse: () => backupUrls.first,
+          )
         : null;
     bandWidth = json['bandWidth'];
     mimeType = json['mime_type'];
diff --git a/lib/models_new/article/article_info/share_channel.dart b/lib/models_new/article/article_info/share_channel.dart
index eec687e3a..5eb5eab04 100644
--- a/lib/models_new/article/article_info/share_channel.dart
+++ b/lib/models_new/article/article_info/share_channel.dart
@@ -6,8 +6,8 @@ class ShareChannel {
   ShareChannel({this.name, this.picture, this.shareChannel});
 
   factory ShareChannel.fromJson(Map<String, dynamic> json) => ShareChannel(
-        name: json['name'] as String?,
-        picture: json['picture'] as String?,
-        shareChannel: json['share_channel'] as String?,
-      );
+    name: json['name'] as String?,
+    picture: json['picture'] as String?,
+    shareChannel: json['share_channel'] as String?,
+  );
 }
diff --git a/lib/models_new/article/article_info/stats.dart b/lib/models_new/article/article_info/stats.dart
index 09f5ad609..590b8c79a 100644
--- a/lib/models_new/article/article_info/stats.dart
+++ b/lib/models_new/article/article_info/stats.dart
@@ -20,13 +20,13 @@ class Stats {
   });
 
   factory Stats.fromJson(Map<String, dynamic> json) => Stats(
-        view: json['view'] as int?,
-        favorite: json['favorite'] as int?,
-        like: json['like'] as int?,
-        dislike: json['dislike'] as int?,
-        reply: json['reply'] as int?,
-        share: json['share'] as int?,
-        coin: json['coin'] as num?,
-        dynam1c: json['dynamic'] as int?,
-      );
+    view: json['view'] as int?,
+    favorite: json['favorite'] as int?,
+    like: json['like'] as int?,
+    dislike: json['dislike'] as int?,
+    reply: json['reply'] as int?,
+    share: json['share'] as int?,
+    coin: json['coin'] as num?,
+    dynam1c: json['dynamic'] as int?,
+  );
 }
diff --git a/lib/models_new/article/article_list/category.dart b/lib/models_new/article/article_list/category.dart
index 6109f8f4b..7b202e701 100644
--- a/lib/models_new/article/article_list/category.dart
+++ b/lib/models_new/article/article_list/category.dart
@@ -6,8 +6,8 @@ class Category {
   Category({this.id, this.parentId, this.name});
 
   factory Category.fromJson(Map<String, dynamic> json) => Category(
-        id: json['id'] as int?,
-        parentId: json['parent_id'] as int?,
-        name: json['name'] as String?,
-      );
+    id: json['id'] as int?,
+    parentId: json['parent_id'] as int?,
+    name: json['name'] as String?,
+  );
 }
diff --git a/lib/models_new/article/article_list/data.dart b/lib/models_new/article/article_list/data.dart
index be4861ddc..a9435b52f 100644
--- a/lib/models_new/article/article_list/data.dart
+++ b/lib/models_new/article/article_list/data.dart
@@ -10,8 +10,13 @@ class ArticleListData {
   Last? last;
   bool? attention;
 
-  ArticleListData(
-      {this.list, this.articles, this.author, this.last, this.attention});
+  ArticleListData({
+    this.list,
+    this.articles,
+    this.author,
+    this.last,
+    this.attention,
+  });
 
   factory ArticleListData.fromJson(Map<String, dynamic> json) =>
       ArticleListData(
@@ -20,7 +25,8 @@ class ArticleListData {
             : ArticleListInfo.fromJson(json['list'] as Map<String, dynamic>),
         articles: (json['articles'] as List<dynamic>?)
             ?.map(
-                (e) => ArticleListItemModel.fromJson(e as Map<String, dynamic>))
+              (e) => ArticleListItemModel.fromJson(e as Map<String, dynamic>),
+            )
             .toList(),
         author: json['author'] == null
             ? null
diff --git a/lib/models_new/article/article_list/label.dart b/lib/models_new/article/article_list/label.dart
index f81b7bb96..638ea14b2 100644
--- a/lib/models_new/article/article_list/label.dart
+++ b/lib/models_new/article/article_list/label.dart
@@ -6,8 +6,8 @@ class Label {
   Label({this.path, this.text, this.labelTheme});
 
   factory Label.fromJson(Map<String, dynamic> json) => Label(
-        path: json['path'] as String?,
-        text: json['text'] as String?,
-        labelTheme: json['label_theme'] as String?,
-      );
+    path: json['path'] as String?,
+    text: json['text'] as String?,
+    labelTheme: json['label_theme'] as String?,
+  );
 }
diff --git a/lib/models_new/article/article_list/last.dart b/lib/models_new/article/article_list/last.dart
index 472f6ce7e..66dea0970 100644
--- a/lib/models_new/article/article_list/last.dart
+++ b/lib/models_new/article/article_list/last.dart
@@ -34,21 +34,21 @@ class Last {
   });
 
   factory Last.fromJson(Map<String, dynamic> json) => Last(
-        id: json['id'] as int?,
-        title: json['title'] as String?,
-        state: json['state'] as int?,
-        publishTime: json['publish_time'] as int?,
-        words: json['words'] as int?,
-        imageUrls: (json['image_urls'] as List?)?.cast(),
-        category: json['category'] == null
-            ? null
-            : Category.fromJson(json['category'] as Map<String, dynamic>),
-        categories: json['categories'] as dynamic,
-        summary: json['summary'] as String?,
-        type: json['type'] as int?,
-        dynIdStr: json['dyn_id_str'] as String?,
-        attributes: json['attributes'] as int?,
-        authorUid: json['author_uid'] as int?,
-        onlyFans: json['only_fans'] as int?,
-      );
+    id: json['id'] as int?,
+    title: json['title'] as String?,
+    state: json['state'] as int?,
+    publishTime: json['publish_time'] as int?,
+    words: json['words'] as int?,
+    imageUrls: (json['image_urls'] as List?)?.cast(),
+    category: json['category'] == null
+        ? null
+        : Category.fromJson(json['category'] as Map<String, dynamic>),
+    categories: json['categories'] as dynamic,
+    summary: json['summary'] as String?,
+    type: json['type'] as int?,
+    dynIdStr: json['dyn_id_str'] as String?,
+    attributes: json['attributes'] as int?,
+    authorUid: json['author_uid'] as int?,
+    onlyFans: json['only_fans'] as int?,
+  );
 }
diff --git a/lib/models_new/article/article_list/stats.dart b/lib/models_new/article/article_list/stats.dart
index 09f5ad609..590b8c79a 100644
--- a/lib/models_new/article/article_list/stats.dart
+++ b/lib/models_new/article/article_list/stats.dart
@@ -20,13 +20,13 @@ class Stats {
   });
 
   factory Stats.fromJson(Map<String, dynamic> json) => Stats(
-        view: json['view'] as int?,
-        favorite: json['favorite'] as int?,
-        like: json['like'] as int?,
-        dislike: json['dislike'] as int?,
-        reply: json['reply'] as int?,
-        share: json['share'] as int?,
-        coin: json['coin'] as num?,
-        dynam1c: json['dynamic'] as int?,
-      );
+    view: json['view'] as int?,
+    favorite: json['favorite'] as int?,
+    like: json['like'] as int?,
+    dislike: json['dislike'] as int?,
+    reply: json['reply'] as int?,
+    share: json['share'] as int?,
+    coin: json['coin'] as num?,
+    dynam1c: json['dynamic'] as int?,
+  );
 }
diff --git a/lib/models_new/article/article_view/category.dart b/lib/models_new/article/article_view/category.dart
index 6109f8f4b..7b202e701 100644
--- a/lib/models_new/article/article_view/category.dart
+++ b/lib/models_new/article/article_view/category.dart
@@ -6,8 +6,8 @@ class Category {
   Category({this.id, this.parentId, this.name});
 
   factory Category.fromJson(Map<String, dynamic> json) => Category(
-        id: json['id'] as int?,
-        parentId: json['parent_id'] as int?,
-        name: json['name'] as String?,
-      );
+    id: json['id'] as int?,
+    parentId: json['parent_id'] as int?,
+    name: json['name'] as String?,
+  );
 }
diff --git a/lib/models_new/article/article_view/data.dart b/lib/models_new/article/article_view/data.dart
index b993586b3..03e0005f0 100644
--- a/lib/models_new/article/article_view/data.dart
+++ b/lib/models_new/article/article_view/data.dart
@@ -149,7 +149,8 @@ class ArticleViewData {
         opus: json['opus'] == null
             ? null
             : ArticleOpus.fromJson(json['opus'] as Map<String, dynamic>),
-        ops:
-            (json['ops'] as List?)?.map((e) => ArticleOps.fromJson(e)).toList(),
+        ops: (json['ops'] as List?)
+            ?.map((e) => ArticleOps.fromJson(e))
+            .toList(),
       );
 }
diff --git a/lib/models_new/article/article_view/label.dart b/lib/models_new/article/article_view/label.dart
index f81b7bb96..638ea14b2 100644
--- a/lib/models_new/article/article_view/label.dart
+++ b/lib/models_new/article/article_view/label.dart
@@ -6,8 +6,8 @@ class Label {
   Label({this.path, this.text, this.labelTheme});
 
   factory Label.fromJson(Map<String, dynamic> json) => Label(
-        path: json['path'] as String?,
-        text: json['text'] as String?,
-        labelTheme: json['label_theme'] as String?,
-      );
+    path: json['path'] as String?,
+    text: json['text'] as String?,
+    labelTheme: json['label_theme'] as String?,
+  );
 }
diff --git a/lib/models_new/article/article_view/media.dart b/lib/models_new/article/article_view/media.dart
index 26e028a5d..83c707baf 100644
--- a/lib/models_new/article/article_view/media.dart
+++ b/lib/models_new/article/article_view/media.dart
@@ -22,14 +22,14 @@ class Media {
   });
 
   factory Media.fromJson(Map<String, dynamic> json) => Media(
-        score: json['score'] as int?,
-        mediaId: json['media_id'] as int?,
-        title: json['title'] as String?,
-        cover: json['cover'] as String?,
-        area: json['area'] as String?,
-        typeId: json['type_id'] as int?,
-        typeName: json['type_name'] as String?,
-        spoiler: json['spoiler'] as int?,
-        seasonId: json['season_id'] as int?,
-      );
+    score: json['score'] as int?,
+    mediaId: json['media_id'] as int?,
+    title: json['title'] as String?,
+    cover: json['cover'] as String?,
+    area: json['area'] as String?,
+    typeId: json['type_id'] as int?,
+    typeName: json['type_name'] as String?,
+    spoiler: json['spoiler'] as int?,
+    seasonId: json['season_id'] as int?,
+  );
 }
diff --git a/lib/models_new/article/article_view/ops.dart b/lib/models_new/article/article_view/ops.dart
index 5005d77a8..08df3da58 100644
--- a/lib/models_new/article/article_view/ops.dart
+++ b/lib/models_new/article/article_view/ops.dart
@@ -22,8 +22,8 @@ class Attributes {
   Attributes({this.clazz});
 
   factory Attributes.fromJson(Map<String, dynamic> json) => Attributes(
-        clazz: json['class'] as String?,
-      );
+    clazz: json['class'] as String?,
+  );
 }
 
 class Insert {
diff --git a/lib/models_new/article/article_view/stats.dart b/lib/models_new/article/article_view/stats.dart
index 09f5ad609..590b8c79a 100644
--- a/lib/models_new/article/article_view/stats.dart
+++ b/lib/models_new/article/article_view/stats.dart
@@ -20,13 +20,13 @@ class Stats {
   });
 
   factory Stats.fromJson(Map<String, dynamic> json) => Stats(
-        view: json['view'] as int?,
-        favorite: json['favorite'] as int?,
-        like: json['like'] as int?,
-        dislike: json['dislike'] as int?,
-        reply: json['reply'] as int?,
-        share: json['share'] as int?,
-        coin: json['coin'] as num?,
-        dynam1c: json['dynamic'] as int?,
-      );
+    view: json['view'] as int?,
+    favorite: json['favorite'] as int?,
+    like: json['like'] as int?,
+    dislike: json['dislike'] as int?,
+    reply: json['reply'] as int?,
+    share: json['share'] as int?,
+    coin: json['coin'] as num?,
+    dynam1c: json['dynamic'] as int?,
+  );
 }
diff --git a/lib/models_new/article/article_view/tag.dart b/lib/models_new/article/article_view/tag.dart
index a2d7d3688..33fe70325 100644
--- a/lib/models_new/article/article_view/tag.dart
+++ b/lib/models_new/article/article_view/tag.dart
@@ -5,7 +5,7 @@ class Tag {
   Tag({this.tid, this.name});
 
   factory Tag.fromJson(Map<String, dynamic> json) => Tag(
-        tid: json['tid'] as int?,
-        name: json['name'] as String?,
-      );
+    tid: json['tid'] as int?,
+    name: json['name'] as String?,
+  );
 }
diff --git a/lib/models_new/blacklist/data.dart b/lib/models_new/blacklist/data.dart
index 30dca8b69..7741df5b5 100644
--- a/lib/models_new/blacklist/data.dart
+++ b/lib/models_new/blacklist/data.dart
@@ -8,10 +8,10 @@ class BlackListData {
   BlackListData({this.list, this.reVersion, this.total});
 
   factory BlackListData.fromJson(Map<String, dynamic> json) => BlackListData(
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => BlackListItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        reVersion: json['re_version'] as int?,
-        total: json['total'] as int?,
-      );
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => BlackListItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    reVersion: json['re_version'] as int?,
+    total: json['total'] as int?,
+  );
 }
diff --git a/lib/models_new/blacklist/list.dart b/lib/models_new/blacklist/list.dart
index 969499fc9..edbd86a1c 100644
--- a/lib/models_new/blacklist/list.dart
+++ b/lib/models_new/blacklist/list.dart
@@ -36,25 +36,26 @@ class BlackListItem {
   });
 
   factory BlackListItem.fromJson(Map<String, dynamic> json) => BlackListItem(
-        mid: json['mid'] as int?,
-        attribute: json['attribute'] as int?,
-        mtime: json['mtime'] as int?,
-        tag: json['tag'] as dynamic,
-        special: json['special'] as int?,
-        uname: json['uname'] as String?,
-        face: json['face'] as String?,
-        sign: json['sign'] as String?,
-        faceNft: json['face_nft'] as int?,
-        officialVerify: json['official_verify'] == null
-            ? null
-            : BaseOfficialVerify.fromJson(
-                json['official_verify'] as Map<String, dynamic>),
-        vip: json['vip'] == null
-            ? null
-            : Vip.fromJson(json['vip'] as Map<String, dynamic>),
-        nftIcon: json['nft_icon'] as String?,
-        recReason: json['rec_reason'] as String?,
-        trackId: json['track_id'] as String?,
-        followTime: json['follow_time'] as String?,
-      );
+    mid: json['mid'] as int?,
+    attribute: json['attribute'] as int?,
+    mtime: json['mtime'] as int?,
+    tag: json['tag'] as dynamic,
+    special: json['special'] as int?,
+    uname: json['uname'] as String?,
+    face: json['face'] as String?,
+    sign: json['sign'] as String?,
+    faceNft: json['face_nft'] as int?,
+    officialVerify: json['official_verify'] == null
+        ? null
+        : BaseOfficialVerify.fromJson(
+            json['official_verify'] as Map<String, dynamic>,
+          ),
+    vip: json['vip'] == null
+        ? null
+        : Vip.fromJson(json['vip'] as Map<String, dynamic>),
+    nftIcon: json['nft_icon'] as String?,
+    recReason: json['rec_reason'] as String?,
+    trackId: json['track_id'] as String?,
+    followTime: json['follow_time'] as String?,
+  );
 }
diff --git a/lib/models_new/coin_log/data.dart b/lib/models_new/coin_log/data.dart
index 7b3dd08dd..bba031664 100644
--- a/lib/models_new/coin_log/data.dart
+++ b/lib/models_new/coin_log/data.dart
@@ -7,9 +7,9 @@ class CoinLogData {
   CoinLogData({this.list, this.count});
 
   factory CoinLogData.fromJson(Map<String, dynamic> json) => CoinLogData(
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => CoinLogItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        count: json['count'] as int?,
-      );
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => CoinLogItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    count: json['count'] as int?,
+  );
 }
diff --git a/lib/models_new/coin_log/list.dart b/lib/models_new/coin_log/list.dart
index b05c7bef5..6e9b291a7 100644
--- a/lib/models_new/coin_log/list.dart
+++ b/lib/models_new/coin_log/list.dart
@@ -3,12 +3,15 @@ class CoinLogItem {
   final String delta;
   final String reason;
 
-  const CoinLogItem(
-      {required this.time, required this.delta, required this.reason});
+  const CoinLogItem({
+    required this.time,
+    required this.delta,
+    required this.reason,
+  });
 
   factory CoinLogItem.fromJson(Map<String, dynamic> json) => CoinLogItem(
-        time: json['time'],
-        delta: (json['delta'] as num).toString(),
-        reason: json['reason'],
-      );
+    time: json['time'],
+    delta: (json['delta'] as num).toString(),
+    reason: json['reason'],
+  );
 }
diff --git a/lib/models_new/dynamic/dyn_mention/data.dart b/lib/models_new/dynamic/dyn_mention/data.dart
index 28988517b..0a27f5d5b 100644
--- a/lib/models_new/dynamic/dyn_mention/data.dart
+++ b/lib/models_new/dynamic/dyn_mention/data.dart
@@ -6,8 +6,8 @@ class DynMentionData {
   DynMentionData({this.groups});
 
   factory DynMentionData.fromJson(Map<String, dynamic> json) => DynMentionData(
-        groups: (json['groups'] as List<dynamic>?)
-            ?.map((e) => MentionGroup.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    groups: (json['groups'] as List<dynamic>?)
+        ?.map((e) => MentionGroup.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/dynamic/dyn_mention/group.dart b/lib/models_new/dynamic/dyn_mention/group.dart
index e0f382a2b..711309a5f 100644
--- a/lib/models_new/dynamic/dyn_mention/group.dart
+++ b/lib/models_new/dynamic/dyn_mention/group.dart
@@ -8,10 +8,10 @@ class MentionGroup {
   MentionGroup({this.groupName, this.groupType, this.items});
 
   factory MentionGroup.fromJson(Map<String, dynamic> json) => MentionGroup(
-        groupName: json['group_name'] as String?,
-        groupType: json['group_type'] as int?,
-        items: (json['items'] as List<dynamic>?)
-            ?.map((e) => MentionItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    groupName: json['group_name'] as String?,
+    groupType: json['group_type'] as int?,
+    items: (json['items'] as List<dynamic>?)
+        ?.map((e) => MentionItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/dynamic/dyn_mention/item.dart b/lib/models_new/dynamic/dyn_mention/item.dart
index d1a2b06d9..8146e2912 100644
--- a/lib/models_new/dynamic/dyn_mention/item.dart
+++ b/lib/models_new/dynamic/dyn_mention/item.dart
@@ -17,12 +17,12 @@ class MentionItem with MultiSelectData {
   });
 
   factory MentionItem.fromJson(Map<String, dynamic> json) => MentionItem(
-        face: json['face'] as String?,
-        fans: json['fans'] as int?,
-        name: json['name'] as String?,
-        officialVerifyType: json['official_verify_type'] as int?,
-        uid: json['uid'] as String?,
-      );
+    face: json['face'] as String?,
+    fans: json['fans'] as int?,
+    name: json['name'] as String?,
+    officialVerifyType: json['official_verify_type'] as int?,
+    uid: json['uid'] as String?,
+  );
 
   @override
   bool operator ==(Object other) {
diff --git a/lib/models_new/dynamic/dyn_reserve/data.dart b/lib/models_new/dynamic/dyn_reserve/data.dart
index 62bac9070..fd82f6380 100644
--- a/lib/models_new/dynamic/dyn_reserve/data.dart
+++ b/lib/models_new/dynamic/dyn_reserve/data.dart
@@ -14,10 +14,10 @@ class DynReserveData {
   });
 
   factory DynReserveData.fromJson(Map<String, dynamic> json) => DynReserveData(
-        finalBtnStatus: json['final_btn_status'] as int?,
-        btnMode: json['btn_mode'] as int?,
-        reserveUpdate: json['reserve_update'] as int?,
-        descUpdate: json['desc_update'] as String?,
-        toast: json['toast'] as String?,
-      );
+    finalBtnStatus: json['final_btn_status'] as int?,
+    btnMode: json['btn_mode'] as int?,
+    reserveUpdate: json['reserve_update'] as int?,
+    descUpdate: json['desc_update'] as String?,
+    toast: json['toast'] as String?,
+  );
 }
diff --git a/lib/models_new/dynamic/dyn_reserve_info/data.dart b/lib/models_new/dynamic/dyn_reserve_info/data.dart
index 560f3bc90..363c72054 100644
--- a/lib/models_new/dynamic/dyn_reserve_info/data.dart
+++ b/lib/models_new/dynamic/dyn_reserve_info/data.dart
@@ -35,14 +35,14 @@ class ReserveInfoData {
       );
 
   Map<String, dynamic> toJson() => {
-        'id': id,
-        'title': title,
-        'stime': stime,
-        'etime': etime,
-        'type': type,
-        'live_plan_start_time': livePlanStartTime,
-        'lottery_type': lotteryType,
-        'lottery_id': lotteryId,
-        'sub_type': subType,
-      };
+    'id': id,
+    'title': title,
+    'stime': stime,
+    'etime': etime,
+    'type': type,
+    'live_plan_start_time': livePlanStartTime,
+    'lottery_type': lotteryType,
+    'lottery_id': lotteryId,
+    'sub_type': subType,
+  };
 }
diff --git a/lib/models_new/dynamic/dyn_topic_feed/all_sort_by.dart b/lib/models_new/dynamic/dyn_topic_feed/all_sort_by.dart
index 1c1145417..a23eb5f00 100644
--- a/lib/models_new/dynamic/dyn_topic_feed/all_sort_by.dart
+++ b/lib/models_new/dynamic/dyn_topic_feed/all_sort_by.dart
@@ -5,7 +5,7 @@ class AllSortBy {
   AllSortBy({this.sortBy, this.sortName});
 
   factory AllSortBy.fromJson(Map<String, dynamic> json) => AllSortBy(
-        sortBy: json['sort_by'] as int?,
-        sortName: json['sort_name'] as String?,
-      );
+    sortBy: json['sort_by'] as int?,
+    sortName: json['sort_name'] as String?,
+  );
 }
diff --git a/lib/models_new/dynamic/dyn_topic_feed/item.dart b/lib/models_new/dynamic/dyn_topic_feed/item.dart
index 9b496a061..78ce31057 100644
--- a/lib/models_new/dynamic/dyn_topic_feed/item.dart
+++ b/lib/models_new/dynamic/dyn_topic_feed/item.dart
@@ -7,10 +7,11 @@ class TopicCardItem {
   TopicCardItem({this.dynamicCardItem, this.topicType});
 
   factory TopicCardItem.fromJson(Map<String, dynamic> json) => TopicCardItem(
-        dynamicCardItem: json['dynamic_card_item'] == null
-            ? null
-            : DynamicItemModel.fromJson(
-                json['dynamic_card_item'] as Map<String, dynamic>),
-        topicType: json['topic_type'] as String?,
-      );
+    dynamicCardItem: json['dynamic_card_item'] == null
+        ? null
+        : DynamicItemModel.fromJson(
+            json['dynamic_card_item'] as Map<String, dynamic>,
+          ),
+    topicType: json['topic_type'] as String?,
+  );
 }
diff --git a/lib/models_new/dynamic/dyn_topic_feed/topic_card_list.dart b/lib/models_new/dynamic/dyn_topic_feed/topic_card_list.dart
index 319603c03..98a88cb88 100644
--- a/lib/models_new/dynamic/dyn_topic_feed/topic_card_list.dart
+++ b/lib/models_new/dynamic/dyn_topic_feed/topic_card_list.dart
@@ -15,14 +15,15 @@ class TopicCardList {
   });
 
   factory TopicCardList.fromJson(Map<String, dynamic> json) => TopicCardList(
-        hasMore: json['has_more'] as bool?,
-        items: (json['items'] as List<dynamic>?)
-            ?.map((e) => TopicCardItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        offset: json['offset'] as String?,
-        topicSortByConf: json['topic_sort_by_conf'] == null
-            ? null
-            : TopicSortByConf.fromJson(
-                json['topic_sort_by_conf'] as Map<String, dynamic>),
-      );
+    hasMore: json['has_more'] as bool?,
+    items: (json['items'] as List<dynamic>?)
+        ?.map((e) => TopicCardItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    offset: json['offset'] as String?,
+    topicSortByConf: json['topic_sort_by_conf'] == null
+        ? null
+        : TopicSortByConf.fromJson(
+            json['topic_sort_by_conf'] as Map<String, dynamic>,
+          ),
+  );
 }
diff --git a/lib/models_new/dynamic/dyn_topic_pub_search/new_topic.dart b/lib/models_new/dynamic/dyn_topic_pub_search/new_topic.dart
index 8b1e67a15..e8c2db534 100644
--- a/lib/models_new/dynamic/dyn_topic_pub_search/new_topic.dart
+++ b/lib/models_new/dynamic/dyn_topic_pub_search/new_topic.dart
@@ -4,6 +4,6 @@ class NewTopic {
   NewTopic({this.name});
 
   factory NewTopic.fromJson(Map<String, dynamic> json) => NewTopic(
-        name: json['name'] as String?,
-      );
+    name: json['name'] as String?,
+  );
 }
diff --git a/lib/models_new/dynamic/dyn_topic_pub_search/page_info.dart b/lib/models_new/dynamic/dyn_topic_pub_search/page_info.dart
index 291917378..c175a7f17 100644
--- a/lib/models_new/dynamic/dyn_topic_pub_search/page_info.dart
+++ b/lib/models_new/dynamic/dyn_topic_pub_search/page_info.dart
@@ -5,7 +5,7 @@ class PageInfo {
   PageInfo({this.offset, this.hasMore});
 
   factory PageInfo.fromJson(Map<String, dynamic> json) => PageInfo(
-        offset: json['offset'] as int?,
-        hasMore: json['has_more'] as bool?,
-      );
+    offset: json['offset'] as int?,
+    hasMore: json['has_more'] as bool?,
+  );
 }
diff --git a/lib/models_new/dynamic/dyn_topic_top/top_details.dart b/lib/models_new/dynamic/dyn_topic_top/top_details.dart
index 4cae09ced..2be417e3c 100644
--- a/lib/models_new/dynamic/dyn_topic_top/top_details.dart
+++ b/lib/models_new/dynamic/dyn_topic_top/top_details.dart
@@ -17,15 +17,14 @@ class TopDetails {
   });
 
   factory TopDetails.fromJson(Map<String, dynamic> json) => TopDetails(
-        topicItem: json['topic_item'] == null
-            ? null
-            : TopicItem.fromJson(json['topic_item'] as Map<String, dynamic>),
-        topicCreator: json['topic_creator'] == null
-            ? null
-            : TopicCreator.fromJson(
-                json['topic_creator'] as Map<String, dynamic>),
-        hasCreateJurisdiction: json['has_create_jurisdiction'] as bool?,
-        wordColor: json['word_color'] as int?,
-        closePubLayerEntry: json['close_pub_layer_entry'] as bool?,
-      );
+    topicItem: json['topic_item'] == null
+        ? null
+        : TopicItem.fromJson(json['topic_item'] as Map<String, dynamic>),
+    topicCreator: json['topic_creator'] == null
+        ? null
+        : TopicCreator.fromJson(json['topic_creator'] as Map<String, dynamic>),
+    hasCreateJurisdiction: json['has_create_jurisdiction'] as bool?,
+    wordColor: json['word_color'] as int?,
+    closePubLayerEntry: json['close_pub_layer_entry'] as bool?,
+  );
 }
diff --git a/lib/models_new/dynamic/dyn_topic_top/topic_creator.dart b/lib/models_new/dynamic/dyn_topic_top/topic_creator.dart
index e51546518..106245f3a 100644
--- a/lib/models_new/dynamic/dyn_topic_top/topic_creator.dart
+++ b/lib/models_new/dynamic/dyn_topic_top/topic_creator.dart
@@ -10,8 +10,8 @@ class TopicCreator {
   });
 
   factory TopicCreator.fromJson(Map<String, dynamic> json) => TopicCreator(
-        uid: json['uid'] as int?,
-        face: json['face'] as String?,
-        name: json['name'] as String?,
-      );
+    uid: json['uid'] as int?,
+    face: json['face'] as String?,
+    name: json['name'] as String?,
+  );
 }
diff --git a/lib/models_new/dynamic/dyn_topic_top/topic_item.dart b/lib/models_new/dynamic/dyn_topic_top/topic_item.dart
index e1d7bd4da..4996a13e6 100644
--- a/lib/models_new/dynamic/dyn_topic_top/topic_item.dart
+++ b/lib/models_new/dynamic/dyn_topic_top/topic_item.dart
@@ -36,21 +36,21 @@ class TopicItem {
   });
 
   factory TopicItem.fromJson(Map<String, dynamic> json) => TopicItem(
-        id: json['id'],
-        name: json['name'],
-        view: json['view'] ?? 0,
-        discuss: json['discuss'] ?? 0,
-        fav: json['fav'] ?? 0,
-        like: json['like'] ?? 0,
-        dynamics: json['dynamics'] as int?,
-        jumpUrl: json['jump_url'] as String?,
-        backColor: json['back_color'] as String?,
-        description: json['description'] as String?,
-        sharePic: json['share_pic'] as String?,
-        shareUrl: json['share_url'] as String?,
-        ctime: json['ctime'] as int?,
-        showInteractData: json['show_interact_data'] as bool?,
-        isFav: json['is_fav'] as bool?,
-        isLike: json['is_like'] as bool?,
-      );
+    id: json['id'],
+    name: json['name'],
+    view: json['view'] ?? 0,
+    discuss: json['discuss'] ?? 0,
+    fav: json['fav'] ?? 0,
+    like: json['like'] ?? 0,
+    dynamics: json['dynamics'] as int?,
+    jumpUrl: json['jump_url'] as String?,
+    backColor: json['back_color'] as String?,
+    description: json['description'] as String?,
+    sharePic: json['share_pic'] as String?,
+    shareUrl: json['share_url'] as String?,
+    ctime: json['ctime'] as int?,
+    showInteractData: json['show_interact_data'] as bool?,
+    isFav: json['is_fav'] as bool?,
+    isLike: json['is_like'] as bool?,
+  );
 }
diff --git a/lib/models_new/emote/data.dart b/lib/models_new/emote/data.dart
index 380834927..012a24075 100644
--- a/lib/models_new/emote/data.dart
+++ b/lib/models_new/emote/data.dart
@@ -6,8 +6,8 @@ class EmoteModelData {
   EmoteModelData({this.packages});
 
   factory EmoteModelData.fromJson(Map<String, dynamic> json) => EmoteModelData(
-        packages: (json['packages'] as List<dynamic>?)
-            ?.map((e) => Package.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    packages: (json['packages'] as List<dynamic>?)
+        ?.map((e) => Package.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/emote/emote.dart b/lib/models_new/emote/emote.dart
index dcb805703..f2282dee7 100644
--- a/lib/models_new/emote/emote.dart
+++ b/lib/models_new/emote/emote.dart
@@ -12,10 +12,10 @@ class Emote {
   });
 
   factory Emote.fromJson(Map<String, dynamic> json) => Emote(
-        text: json['text'] as String?,
-        url: json['url'] as String?,
-        meta: json['meta'] == null
-            ? null
-            : Meta.fromJson(json['meta'] as Map<String, dynamic>),
-      );
+    text: json['text'] as String?,
+    url: json['url'] as String?,
+    meta: json['meta'] == null
+        ? null
+        : Meta.fromJson(json['meta'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/emote/meta.dart b/lib/models_new/emote/meta.dart
index 8d76b5141..0de32916e 100644
--- a/lib/models_new/emote/meta.dart
+++ b/lib/models_new/emote/meta.dart
@@ -8,7 +8,7 @@ class Meta {
   });
 
   factory Meta.fromJson(Map<String, dynamic> json) => Meta(
-        size: json['size'] as int?,
-        alias: json['alias'] as String?,
-      );
+    size: json['size'] as int?,
+    alias: json['alias'] as String?,
+  );
 }
diff --git a/lib/models_new/emote/package.dart b/lib/models_new/emote/package.dart
index a8319769c..18cdcc25d 100644
--- a/lib/models_new/emote/package.dart
+++ b/lib/models_new/emote/package.dart
@@ -12,10 +12,10 @@ class Package {
   });
 
   factory Package.fromJson(Map<String, dynamic> json) => Package(
-        url: json['url'] as String?,
-        type: json['type'] as int?,
-        emote: (json['emote'] as List<dynamic>?)
-            ?.map((e) => Emote.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    url: json['url'] as String?,
+    type: json['type'] as int?,
+    emote: (json['emote'] as List<dynamic>?)
+        ?.map((e) => Emote.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/fans/data.dart b/lib/models_new/fans/data.dart
index 0a043753c..f4ab2a01c 100644
--- a/lib/models_new/fans/data.dart
+++ b/lib/models_new/fans/data.dart
@@ -9,11 +9,11 @@ class FansData {
   FansData({this.list, this.offset, this.reVersion, this.total});
 
   factory FansData.fromJson(Map<String, dynamic> json) => FansData(
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => FansItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        offset: json['offset'] as String?,
-        reVersion: json['re_version'] as int?,
-        total: json['total'] as int?,
-      );
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => FansItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    offset: json['offset'] as String?,
+    reVersion: json['re_version'] as int?,
+    total: json['total'] as int?,
+  );
 }
diff --git a/lib/models_new/fans/list.dart b/lib/models_new/fans/list.dart
index 426c7f291..47e7fd053 100644
--- a/lib/models_new/fans/list.dart
+++ b/lib/models_new/fans/list.dart
@@ -36,25 +36,26 @@ class FansItemModel {
   });
 
   factory FansItemModel.fromJson(Map<String, dynamic> json) => FansItemModel(
-        mid: json['mid'] as int?,
-        attribute: json['attribute'] as int?,
-        mtime: json['mtime'] as int?,
-        tag: json['tag'] as dynamic,
-        special: json['special'] as int?,
-        uname: json['uname'] as String?,
-        face: json['face'] as String?,
-        sign: json['sign'] as String?,
-        faceNft: json['face_nft'] as int?,
-        officialVerify: json['official_verify'] == null
-            ? null
-            : BaseOfficialVerify.fromJson(
-                json['official_verify'] as Map<String, dynamic>),
-        vip: json['vip'] == null
-            ? null
-            : Vip.fromJson(json['vip'] as Map<String, dynamic>),
-        nftIcon: json['nft_icon'] as String?,
-        recReason: json['rec_reason'] as String?,
-        trackId: json['track_id'] as String?,
-        followTime: json['follow_time'] as String?,
-      );
+    mid: json['mid'] as int?,
+    attribute: json['attribute'] as int?,
+    mtime: json['mtime'] as int?,
+    tag: json['tag'] as dynamic,
+    special: json['special'] as int?,
+    uname: json['uname'] as String?,
+    face: json['face'] as String?,
+    sign: json['sign'] as String?,
+    faceNft: json['face_nft'] as int?,
+    officialVerify: json['official_verify'] == null
+        ? null
+        : BaseOfficialVerify.fromJson(
+            json['official_verify'] as Map<String, dynamic>,
+          ),
+    vip: json['vip'] == null
+        ? null
+        : Vip.fromJson(json['vip'] as Map<String, dynamic>),
+    nftIcon: json['nft_icon'] as String?,
+    recReason: json['rec_reason'] as String?,
+    trackId: json['track_id'] as String?,
+    followTime: json['follow_time'] as String?,
+  );
 }
diff --git a/lib/models_new/fav/fav_article/author.dart b/lib/models_new/fav/fav_article/author.dart
index 84447ddf7..778aae896 100644
--- a/lib/models_new/fav/fav_article/author.dart
+++ b/lib/models_new/fav/fav_article/author.dart
@@ -6,8 +6,8 @@ class Author {
   Author({this.name, this.face, this.mid});
 
   factory Author.fromJson(Map<String, dynamic> json) => Author(
-        name: json['name'] as String?,
-        face: json['face'] as String?,
-        mid: json['mid'] as String?,
-      );
+    name: json['name'] as String?,
+    face: json['face'] as String?,
+    mid: json['mid'] as String?,
+  );
 }
diff --git a/lib/models_new/fav/fav_article/cover.dart b/lib/models_new/fav/fav_article/cover.dart
index ae44359f8..abcf6001a 100644
--- a/lib/models_new/fav/fav_article/cover.dart
+++ b/lib/models_new/fav/fav_article/cover.dart
@@ -6,8 +6,8 @@ class Cover {
   Cover({this.url, this.width, this.height});
 
   factory Cover.fromJson(Map<String, dynamic> json) => Cover(
-        url: json['url'] as String?,
-        width: json['width'] as int?,
-        height: json['height'] as int?,
-      );
+    url: json['url'] as String?,
+    width: json['width'] as int?,
+    height: json['height'] as int?,
+  );
 }
diff --git a/lib/models_new/fav/fav_article/data.dart b/lib/models_new/fav/fav_article/data.dart
index 4c933a7b2..8f326f4ef 100644
--- a/lib/models_new/fav/fav_article/data.dart
+++ b/lib/models_new/fav/fav_article/data.dart
@@ -16,13 +16,12 @@ class FavArticleData {
   });
 
   factory FavArticleData.fromJson(Map<String, dynamic> json) => FavArticleData(
-        items: (json['items'] as List<dynamic>?)
-            ?.map(
-                (e) => FavArticleItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        hasMore: json['has_more'] as bool?,
-        offset: json['offset'] as String?,
-        updateNum: json['update_num'] as String?,
-        updateBaseline: json['update_baseline'] as String?,
-      );
+    items: (json['items'] as List<dynamic>?)
+        ?.map((e) => FavArticleItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    hasMore: json['has_more'] as bool?,
+    offset: json['offset'] as String?,
+    updateNum: json['update_num'] as String?,
+    updateBaseline: json['update_baseline'] as String?,
+  );
 }
diff --git a/lib/models_new/fav/fav_article/stat.dart b/lib/models_new/fav/fav_article/stat.dart
index 1164032cc..e16802ff6 100644
--- a/lib/models_new/fav/fav_article/stat.dart
+++ b/lib/models_new/fav/fav_article/stat.dart
@@ -5,7 +5,7 @@ class Stat {
   Stat({this.view, this.like});
 
   factory Stat.fromJson(Map<String, dynamic> json) => Stat(
-        view: json['view'] as String?,
-        like: json['like'] as String?,
-      );
+    view: json['view'] as String?,
+    like: json['like'] as String?,
+  );
 }
diff --git a/lib/models_new/fav/fav_detail/cnt_info.dart b/lib/models_new/fav/fav_detail/cnt_info.dart
index 4db550e69..6f390a292 100644
--- a/lib/models_new/fav/fav_detail/cnt_info.dart
+++ b/lib/models_new/fav/fav_detail/cnt_info.dart
@@ -26,16 +26,16 @@ class CntInfo {
   });
 
   factory CntInfo.fromJson(Map<String, dynamic> json) => CntInfo(
-        collect: json['collect'] as int?,
-        play: json['play'] as int?,
-        thumbUp: json['thumb_up'] as int?,
-        thumbDown: json['thumb_down'] as int?,
-        share: json['share'] as int?,
-        reply: json['reply'] as int?,
-        danmaku: json['danmaku'] as int?,
-        coin: json['coin'] as num?,
-        vt: json['vt'] as int?,
-        playSwitch: json['play_switch'] as int?,
-        viewText1: json['view_text_1'] as String?,
-      );
+    collect: json['collect'] as int?,
+    play: json['play'] as int?,
+    thumbUp: json['thumb_up'] as int?,
+    thumbDown: json['thumb_down'] as int?,
+    share: json['share'] as int?,
+    reply: json['reply'] as int?,
+    danmaku: json['danmaku'] as int?,
+    coin: json['coin'] as num?,
+    vt: json['vt'] as int?,
+    playSwitch: json['play_switch'] as int?,
+    viewText1: json['view_text_1'] as String?,
+  );
 }
diff --git a/lib/models_new/fav/fav_detail/data.dart b/lib/models_new/fav/fav_detail/data.dart
index 34f5a4319..53a11ab21 100644
--- a/lib/models_new/fav/fav_detail/data.dart
+++ b/lib/models_new/fav/fav_detail/data.dart
@@ -10,13 +10,13 @@ class FavDetailData {
   FavDetailData({this.info, this.medias, this.hasMore, this.ttl});
 
   factory FavDetailData.fromJson(Map<String, dynamic> json) => FavDetailData(
-        info: json['info'] == null
-            ? null
-            : FavFolderInfo.fromJson(json['info'] as Map<String, dynamic>),
-        medias: (json['medias'] as List<dynamic>?)
-            ?.map((e) => FavDetailItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        hasMore: json['has_more'] as bool?,
-        ttl: json['ttl'] as int?,
-      );
+    info: json['info'] == null
+        ? null
+        : FavFolderInfo.fromJson(json['info'] as Map<String, dynamic>),
+    medias: (json['medias'] as List<dynamic>?)
+        ?.map((e) => FavDetailItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    hasMore: json['has_more'] as bool?,
+    ttl: json['ttl'] as int?,
+  );
 }
diff --git a/lib/models_new/fav/fav_detail/info.dart b/lib/models_new/fav/fav_detail/info.dart
index e16ac6a76..a6e31cc7f 100644
--- a/lib/models_new/fav/fav_detail/info.dart
+++ b/lib/models_new/fav/fav_detail/info.dart
@@ -43,27 +43,27 @@ class FavDetailInfo {
   });
 
   factory FavDetailInfo.fromJson(Map<String, dynamic> json) => FavDetailInfo(
-        id: json['id'] as int?,
-        fid: json['fid'] as int?,
-        mid: json['mid'] as int?,
-        attr: json['attr'] as int?,
-        title: json['title'] as String?,
-        cover: json['cover'] as String?,
-        upper: json['upper'] == null
-            ? null
-            : Owner.fromJson(json['upper'] as Map<String, dynamic>),
-        coverType: json['cover_type'] as int?,
-        cntInfo: json['cnt_info'] == null
-            ? null
-            : CntInfo.fromJson(json['cnt_info'] as Map<String, dynamic>),
-        type: json['type'] as int?,
-        intro: json['intro'] as String?,
-        ctime: json['ctime'] as int?,
-        mtime: json['mtime'] as int?,
-        state: json['state'] as int?,
-        favState: json['fav_state'] as int?,
-        likeState: json['like_state'] as int?,
-        mediaCount: json['media_count'] as int?,
-        isTop: json['is_top'] as bool?,
-      );
+    id: json['id'] as int?,
+    fid: json['fid'] as int?,
+    mid: json['mid'] as int?,
+    attr: json['attr'] as int?,
+    title: json['title'] as String?,
+    cover: json['cover'] as String?,
+    upper: json['upper'] == null
+        ? null
+        : Owner.fromJson(json['upper'] as Map<String, dynamic>),
+    coverType: json['cover_type'] as int?,
+    cntInfo: json['cnt_info'] == null
+        ? null
+        : CntInfo.fromJson(json['cnt_info'] as Map<String, dynamic>),
+    type: json['type'] as int?,
+    intro: json['intro'] as String?,
+    ctime: json['ctime'] as int?,
+    mtime: json['mtime'] as int?,
+    state: json['state'] as int?,
+    favState: json['fav_state'] as int?,
+    likeState: json['like_state'] as int?,
+    mediaCount: json['media_count'] as int?,
+    isTop: json['is_top'] as bool?,
+  );
 }
diff --git a/lib/models_new/fav/fav_detail/ogv.dart b/lib/models_new/fav/fav_detail/ogv.dart
index 7c7f2ae75..a560a46ef 100644
--- a/lib/models_new/fav/fav_detail/ogv.dart
+++ b/lib/models_new/fav/fav_detail/ogv.dart
@@ -10,8 +10,8 @@ class Ogv {
   });
 
   factory Ogv.fromJson(Map<String, dynamic> json) => Ogv(
-        typeName: json['type_name'],
-        typeId: json['type_id'],
-        seasonId: json['season_id'],
-      );
+    typeName: json['type_name'],
+    typeId: json['type_id'],
+    seasonId: json['season_id'],
+  );
 }
diff --git a/lib/models_new/fav/fav_detail/ugc.dart b/lib/models_new/fav/fav_detail/ugc.dart
index 1afa29e27..6c6156c98 100644
--- a/lib/models_new/fav/fav_detail/ugc.dart
+++ b/lib/models_new/fav/fav_detail/ugc.dart
@@ -4,6 +4,6 @@ class Ugc {
   Ugc({this.firstCid});
 
   factory Ugc.fromJson(Map<String, dynamic> json) => Ugc(
-        firstCid: json['first_cid'] as int?,
-      );
+    firstCid: json['first_cid'] as int?,
+  );
 }
diff --git a/lib/models_new/fav/fav_folder/data.dart b/lib/models_new/fav/fav_folder/data.dart
index 21fb0a95e..3c55b76a7 100644
--- a/lib/models_new/fav/fav_folder/data.dart
+++ b/lib/models_new/fav/fav_folder/data.dart
@@ -8,10 +8,10 @@ class FavFolderData {
   FavFolderData({this.count, this.list, this.hasMore});
 
   factory FavFolderData.fromJson(Map<String, dynamic> json) => FavFolderData(
-        count: json['count'] as int?,
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => FavFolderInfo.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        hasMore: json['has_more'] as bool?,
-      );
+    count: json['count'] as int?,
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => FavFolderInfo.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    hasMore: json['has_more'] as bool?,
+  );
 }
diff --git a/lib/models_new/fav/fav_folder/list.dart b/lib/models_new/fav/fav_folder/list.dart
index e1bec48f8..e0098dba3 100644
--- a/lib/models_new/fav/fav_folder/list.dart
+++ b/lib/models_new/fav/fav_folder/list.dart
@@ -52,30 +52,30 @@ class FavFolderInfo {
   });
 
   factory FavFolderInfo.fromJson(Map<String, dynamic> json) => FavFolderInfo(
-        id: json['id'] as int? ?? 0,
-        fid: json['fid'] as int?,
-        mid: json['mid'] as int? ?? 0,
-        attr: json['attr'] as int? ?? 0,
-        attrDesc: json['attr_desc'] as String?,
-        title: json['title'] as String? ?? '',
-        cover: json['cover'] as String? ?? '',
-        upper: json['upper'] == null
-            ? null
-            : Owner.fromJson(json['upper'] as Map<String, dynamic>),
-        coverType: json['cover_type'] as int?,
-        intro: json['intro'] as String?,
-        ctime: json['ctime'] as int?,
-        mtime: json['mtime'] as int?,
-        state: json['state'] as int?,
-        favState: json['fav_state'] as int?,
-        mediaCount: json['media_count'] as int? ?? 0,
-        viewCount: json['view_count'] as int?,
-        vt: json['vt'] as int?,
-        isTop: json['is_top'] as bool?,
-        recentFav: json['recent_fav'] as dynamic,
-        playSwitch: json['play_switch'] as int?,
-        type: json['type'] as int?,
-        link: json['link'] as String?,
-        bvid: json['bvid'] as String?,
-      );
+    id: json['id'] as int? ?? 0,
+    fid: json['fid'] as int?,
+    mid: json['mid'] as int? ?? 0,
+    attr: json['attr'] as int? ?? 0,
+    attrDesc: json['attr_desc'] as String?,
+    title: json['title'] as String? ?? '',
+    cover: json['cover'] as String? ?? '',
+    upper: json['upper'] == null
+        ? null
+        : Owner.fromJson(json['upper'] as Map<String, dynamic>),
+    coverType: json['cover_type'] as int?,
+    intro: json['intro'] as String?,
+    ctime: json['ctime'] as int?,
+    mtime: json['mtime'] as int?,
+    state: json['state'] as int?,
+    favState: json['fav_state'] as int?,
+    mediaCount: json['media_count'] as int? ?? 0,
+    viewCount: json['view_count'] as int?,
+    vt: json['vt'] as int?,
+    isTop: json['is_top'] as bool?,
+    recentFav: json['recent_fav'] as dynamic,
+    playSwitch: json['play_switch'] as int?,
+    type: json['type'] as int?,
+    link: json['link'] as String?,
+    bvid: json['bvid'] as String?,
+  );
 }
diff --git a/lib/models_new/fav/fav_note/arc.dart b/lib/models_new/fav/fav_note/arc.dart
index 10d0a40b6..710c3761f 100644
--- a/lib/models_new/fav/fav_note/arc.dart
+++ b/lib/models_new/fav/fav_note/arc.dart
@@ -18,12 +18,12 @@ class Arc {
   });
 
   factory Arc.fromJson(Map<String, dynamic> json) => Arc(
-        oid: json['oid'] as int?,
-        bvid: json['bvid'] as String?,
-        pic: json['pic'] as String?,
-        desc: json['desc'] as String?,
-        status: json['status'] as int?,
-        oidType: json['oid_type'] as int?,
-        aid: json['aid'] as int?,
-      );
+    oid: json['oid'] as int?,
+    bvid: json['bvid'] as String?,
+    pic: json['pic'] as String?,
+    desc: json['desc'] as String?,
+    status: json['status'] as int?,
+    oidType: json['oid_type'] as int?,
+    aid: json['aid'] as int?,
+  );
 }
diff --git a/lib/models_new/fav/fav_note/data.dart b/lib/models_new/fav/fav_note/data.dart
index 69fa6f355..37d446d36 100644
--- a/lib/models_new/fav/fav_note/data.dart
+++ b/lib/models_new/fav/fav_note/data.dart
@@ -8,11 +8,11 @@ class FavNoteData {
   FavNoteData({this.list, this.page});
 
   factory FavNoteData.fromJson(Map<String, dynamic> json) => FavNoteData(
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => FavNoteItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        page: json['page'] == null
-            ? null
-            : Page.fromJson(json['page'] as Map<String, dynamic>),
-      );
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => FavNoteItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    page: json['page'] == null
+        ? null
+        : Page.fromJson(json['page'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/fav/fav_note/page.dart b/lib/models_new/fav/fav_note/page.dart
index ad1920e0e..22984a071 100644
--- a/lib/models_new/fav/fav_note/page.dart
+++ b/lib/models_new/fav/fav_note/page.dart
@@ -6,8 +6,8 @@ class Page {
   Page({this.total, this.size, this.num});
 
   factory Page.fromJson(Map<String, dynamic> json) => Page(
-        total: json['total'] as int?,
-        size: json['size'] as int?,
-        num: json['num'] as int?,
-      );
+    total: json['total'] as int?,
+    size: json['size'] as int?,
+    num: json['num'] as int?,
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/area.dart b/lib/models_new/fav/fav_pgc/area.dart
index 5f1e57637..8540bf56f 100644
--- a/lib/models_new/fav/fav_pgc/area.dart
+++ b/lib/models_new/fav/fav_pgc/area.dart
@@ -5,7 +5,7 @@ class Area {
   Area({this.id, this.name});
 
   factory Area.fromJson(Map<String, dynamic> json) => Area(
-        id: json['id'] as int?,
-        name: json['name'] as String?,
-      );
+    id: json['id'] as int?,
+    name: json['name'] as String?,
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/badge_info.dart b/lib/models_new/fav/fav_pgc/badge_info.dart
index 210075c07..fd1c023d3 100644
--- a/lib/models_new/fav/fav_pgc/badge_info.dart
+++ b/lib/models_new/fav/fav_pgc/badge_info.dart
@@ -16,12 +16,12 @@ class BadgeInfo {
   });
 
   factory BadgeInfo.fromJson(Map<String, dynamic> json) => BadgeInfo(
-        text: json['text'] as String?,
-        bgColor: json['bg_color'] as String?,
-        bgColorNight: json['bg_color_night'] as String?,
-        img: json['img'] as String?,
-        multiImg: json['multi_img'] == null
-            ? null
-            : MultiImg.fromJson(json['multi_img'] as Map<String, dynamic>),
-      );
+    text: json['text'] as String?,
+    bgColor: json['bg_color'] as String?,
+    bgColorNight: json['bg_color_night'] as String?,
+    img: json['img'] as String?,
+    multiImg: json['multi_img'] == null
+        ? null
+        : MultiImg.fromJson(json['multi_img'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/badge_infos.dart b/lib/models_new/fav/fav_pgc/badge_infos.dart
index d17054660..5c70bdd3b 100644
--- a/lib/models_new/fav/fav_pgc/badge_infos.dart
+++ b/lib/models_new/fav/fav_pgc/badge_infos.dart
@@ -8,12 +8,11 @@ class BadgeInfos {
   BadgeInfos({this.contentAttr, this.vipOrPay});
 
   factory BadgeInfos.fromJson(Map<String, dynamic> json) => BadgeInfos(
-        contentAttr: json['content_attr'] == null
-            ? null
-            : ContentAttr.fromJson(
-                json['content_attr'] as Map<String, dynamic>),
-        vipOrPay: json['vip_or_pay'] == null
-            ? null
-            : VipOrPay.fromJson(json['vip_or_pay'] as Map<String, dynamic>),
-      );
+    contentAttr: json['content_attr'] == null
+        ? null
+        : ContentAttr.fromJson(json['content_attr'] as Map<String, dynamic>),
+    vipOrPay: json['vip_or_pay'] == null
+        ? null
+        : VipOrPay.fromJson(json['vip_or_pay'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/cc_on_lock.dart b/lib/models_new/fav/fav_pgc/cc_on_lock.dart
index 31bcd23cc..a83feefec 100644
--- a/lib/models_new/fav/fav_pgc/cc_on_lock.dart
+++ b/lib/models_new/fav/fav_pgc/cc_on_lock.dart
@@ -4,6 +4,6 @@ class CcOnLock {
   CcOnLock({this.typeUrl});
 
   factory CcOnLock.fromJson(Map<String, dynamic> json) => CcOnLock(
-        typeUrl: json['type_url'] as String?,
-      );
+    typeUrl: json['type_url'] as String?,
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/config_attrs.dart b/lib/models_new/fav/fav_pgc/config_attrs.dart
index bc7c3b34f..1668484e9 100644
--- a/lib/models_new/fav/fav_pgc/config_attrs.dart
+++ b/lib/models_new/fav/fav_pgc/config_attrs.dart
@@ -17,20 +17,23 @@ class ConfigAttrs {
   });
 
   factory ConfigAttrs.fromJson(Map<String, dynamic> json) => ConfigAttrs(
-        ccOnLock: json['cc_on_lock'] == null
-            ? null
-            : CcOnLock.fromJson(json['cc_on_lock'] as Map<String, dynamic>),
-        highlightIneffectiveHd: json['highlight_ineffective_hd'] == null
-            ? null
-            : HighlightIneffectiveHd.fromJson(
-                json['highlight_ineffective_hd'] as Map<String, dynamic>),
-        highlightIneffectiveOtt: json['highlight_ineffective_ott'] == null
-            ? null
-            : HighlightIneffectiveOtt.fromJson(
-                json['highlight_ineffective_ott'] as Map<String, dynamic>),
-        highlightIneffectivePink: json['highlight_ineffective_pink'] == null
-            ? null
-            : HighlightIneffectivePink.fromJson(
-                json['highlight_ineffective_pink'] as Map<String, dynamic>),
-      );
+    ccOnLock: json['cc_on_lock'] == null
+        ? null
+        : CcOnLock.fromJson(json['cc_on_lock'] as Map<String, dynamic>),
+    highlightIneffectiveHd: json['highlight_ineffective_hd'] == null
+        ? null
+        : HighlightIneffectiveHd.fromJson(
+            json['highlight_ineffective_hd'] as Map<String, dynamic>,
+          ),
+    highlightIneffectiveOtt: json['highlight_ineffective_ott'] == null
+        ? null
+        : HighlightIneffectiveOtt.fromJson(
+            json['highlight_ineffective_ott'] as Map<String, dynamic>,
+          ),
+    highlightIneffectivePink: json['highlight_ineffective_pink'] == null
+        ? null
+        : HighlightIneffectivePink.fromJson(
+            json['highlight_ineffective_pink'] as Map<String, dynamic>,
+          ),
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/content_attr.dart b/lib/models_new/fav/fav_pgc/content_attr.dart
index 891e410b6..ecb4beba0 100644
--- a/lib/models_new/fav/fav_pgc/content_attr.dart
+++ b/lib/models_new/fav/fav_pgc/content_attr.dart
@@ -16,12 +16,12 @@ class ContentAttr {
   });
 
   factory ContentAttr.fromJson(Map<String, dynamic> json) => ContentAttr(
-        text: json['text'] as String?,
-        bgColor: json['bg_color'] as String?,
-        bgColorNight: json['bg_color_night'] as String?,
-        img: json['img'] as String?,
-        multiImg: json['multi_img'] == null
-            ? null
-            : MultiImg.fromJson(json['multi_img'] as Map<String, dynamic>),
-      );
+    text: json['text'] as String?,
+    bgColor: json['bg_color'] as String?,
+    bgColorNight: json['bg_color_night'] as String?,
+    img: json['img'] as String?,
+    multiImg: json['multi_img'] == null
+        ? null
+        : MultiImg.fromJson(json['multi_img'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/data.dart b/lib/models_new/fav/fav_pgc/data.dart
index 9ec6fd00b..db84fd9b3 100644
--- a/lib/models_new/fav/fav_pgc/data.dart
+++ b/lib/models_new/fav/fav_pgc/data.dart
@@ -9,11 +9,11 @@ class FavPgcData {
   FavPgcData({this.list, this.pn, this.ps, this.total});
 
   factory FavPgcData.fromJson(Map<String, dynamic> json) => FavPgcData(
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => FavPgcItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        pn: json['pn'] as int?,
-        ps: json['ps'] as int?,
-        total: json['total'] as int?,
-      );
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => FavPgcItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    pn: json['pn'] as int?,
+    ps: json['ps'] as int?,
+    total: json['total'] as int?,
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/first_ep_info.dart b/lib/models_new/fav/fav_pgc/first_ep_info.dart
index 0dbc69bcb..452f637de 100644
--- a/lib/models_new/fav/fav_pgc/first_ep_info.dart
+++ b/lib/models_new/fav/fav_pgc/first_ep_info.dart
@@ -16,11 +16,11 @@ class FirstEpInfo {
   });
 
   factory FirstEpInfo.fromJson(Map<String, dynamic> json) => FirstEpInfo(
-        id: json['id'] as int?,
-        cover: json['cover'] as String?,
-        title: json['title'] as String?,
-        longTitle: json['long_title'] as String?,
-        pubTime: json['pub_time'] as String?,
-        duration: json['duration'] as int?,
-      );
+    id: json['id'] as int?,
+    cover: json['cover'] as String?,
+    title: json['title'] as String?,
+    longTitle: json['long_title'] as String?,
+    pubTime: json['pub_time'] as String?,
+    duration: json['duration'] as int?,
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/list.dart b/lib/models_new/fav/fav_pgc/list.dart
index 4b66735a0..106abca8f 100644
--- a/lib/models_new/fav/fav_pgc/list.dart
+++ b/lib/models_new/fav/fav_pgc/list.dart
@@ -123,87 +123,86 @@ class FavPgcItemModel with MultiSelectData {
     this.subtitle25,
   });
 
-  factory FavPgcItemModel.fromJson(Map<String, dynamic> json) =>
-      FavPgcItemModel(
-        seasonId: json['season_id'] as int?,
-        mediaId: json['media_id'] as int?,
-        seasonType: json['season_type'] as int?,
-        seasonTypeName: json['season_type_name'] as String?,
-        title: json['title'] as String?,
-        cover: json['cover'] as String?,
-        totalCount: json['total_count'] as int?,
-        isFinish: json['is_finish'] as int?,
-        isStarted: json['is_started'] as int?,
-        isPlay: json['is_play'] as int?,
-        badge: json['badge'] as String?,
-        badgeType: json['badge_type'] as int?,
-        rights: json['rights'] == null
-            ? null
-            : Rights.fromJson(json['rights'] as Map<String, dynamic>),
-        stat: json['stat'] == null
-            ? null
-            : Stat.fromJson(json['stat'] as Map<String, dynamic>),
-        newEp: json['new_ep'] == null
-            ? null
-            : NewEp.fromJson(json['new_ep'] as Map<String, dynamic>),
-        rating: json['rating'] == null
-            ? null
-            : Rating.fromJson(json['rating'] as Map<String, dynamic>),
-        squareCover: json['square_cover'] as String?,
-        seasonStatus: json['season_status'] as int?,
-        seasonTitle: json['season_title'] as String?,
-        badgeEp: json['badge_ep'] as String?,
-        mediaAttr: json['media_attr'] as int?,
-        seasonAttr: json['season_attr'] as int?,
-        evaluate: json['evaluate'] as String?,
-        areas: (json['areas'] as List<dynamic>?)
-            ?.map((e) => Area.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        subtitle: json['subtitle'] as String?,
-        firstEp: json['first_ep'] as int?,
-        canWatch: json['can_watch'] as int?,
-        series: json['series'] == null
-            ? null
-            : Series.fromJson(json['series'] as Map<String, dynamic>),
-        publish: json['publish'] == null
-            ? null
-            : Publish.fromJson(json['publish'] as Map<String, dynamic>),
-        mode: json['mode'] as int?,
-        section: (json['section'] as List<dynamic>?)
-            ?.map((e) => Section.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        url: json['url'] as String?,
-        badgeInfo: json['badge_info'] == null
-            ? null
-            : BadgeInfo.fromJson(json['badge_info'] as Map<String, dynamic>),
-        renewalTime: json['renewal_time'] as String?,
-        firstEpInfo: json['first_ep_info'] == null
-            ? null
-            : FirstEpInfo.fromJson(
-                json['first_ep_info'] as Map<String, dynamic>),
-        formalEpCount: json['formal_ep_count'] as int?,
-        shortUrl: json['short_url'] as String?,
-        badgeInfos: json['badge_infos'] == null
-            ? null
-            : BadgeInfos.fromJson(json['badge_infos'] as Map<String, dynamic>),
-        seasonVersion: json['season_version'] as String?,
-        horizontalCover169: json['horizontal_cover_16_9'] as String?,
-        horizontalCover1610: json['horizontal_cover_16_10'] as String?,
-        subtitle14: json['subtitle_14'] as String?,
-        viewableCrowdType: json['viewable_crowd_type'] as int?,
-        producers: (json['producers'] as List<dynamic>?)
-            ?.map((e) => Producer.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        summary: json['summary'] as String?,
-        styles: (json['styles'] as List?)?.cast(),
-        configAttrs: json['config_attrs'] == null
-            ? null
-            : ConfigAttrs.fromJson(
-                json['config_attrs'] as Map<String, dynamic>),
-        followStatus: json['follow_status'] as int?,
-        isNew: json['is_new'] as int?,
-        progress: json['progress'] == '' ? null : json['progress'],
-        bothFollow: json['both_follow'] as bool?,
-        subtitle25: json['subtitle_25'] as String?,
-      );
+  factory FavPgcItemModel.fromJson(
+    Map<String, dynamic> json,
+  ) => FavPgcItemModel(
+    seasonId: json['season_id'] as int?,
+    mediaId: json['media_id'] as int?,
+    seasonType: json['season_type'] as int?,
+    seasonTypeName: json['season_type_name'] as String?,
+    title: json['title'] as String?,
+    cover: json['cover'] as String?,
+    totalCount: json['total_count'] as int?,
+    isFinish: json['is_finish'] as int?,
+    isStarted: json['is_started'] as int?,
+    isPlay: json['is_play'] as int?,
+    badge: json['badge'] as String?,
+    badgeType: json['badge_type'] as int?,
+    rights: json['rights'] == null
+        ? null
+        : Rights.fromJson(json['rights'] as Map<String, dynamic>),
+    stat: json['stat'] == null
+        ? null
+        : Stat.fromJson(json['stat'] as Map<String, dynamic>),
+    newEp: json['new_ep'] == null
+        ? null
+        : NewEp.fromJson(json['new_ep'] as Map<String, dynamic>),
+    rating: json['rating'] == null
+        ? null
+        : Rating.fromJson(json['rating'] as Map<String, dynamic>),
+    squareCover: json['square_cover'] as String?,
+    seasonStatus: json['season_status'] as int?,
+    seasonTitle: json['season_title'] as String?,
+    badgeEp: json['badge_ep'] as String?,
+    mediaAttr: json['media_attr'] as int?,
+    seasonAttr: json['season_attr'] as int?,
+    evaluate: json['evaluate'] as String?,
+    areas: (json['areas'] as List<dynamic>?)
+        ?.map((e) => Area.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    subtitle: json['subtitle'] as String?,
+    firstEp: json['first_ep'] as int?,
+    canWatch: json['can_watch'] as int?,
+    series: json['series'] == null
+        ? null
+        : Series.fromJson(json['series'] as Map<String, dynamic>),
+    publish: json['publish'] == null
+        ? null
+        : Publish.fromJson(json['publish'] as Map<String, dynamic>),
+    mode: json['mode'] as int?,
+    section: (json['section'] as List<dynamic>?)
+        ?.map((e) => Section.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    url: json['url'] as String?,
+    badgeInfo: json['badge_info'] == null
+        ? null
+        : BadgeInfo.fromJson(json['badge_info'] as Map<String, dynamic>),
+    renewalTime: json['renewal_time'] as String?,
+    firstEpInfo: json['first_ep_info'] == null
+        ? null
+        : FirstEpInfo.fromJson(json['first_ep_info'] as Map<String, dynamic>),
+    formalEpCount: json['formal_ep_count'] as int?,
+    shortUrl: json['short_url'] as String?,
+    badgeInfos: json['badge_infos'] == null
+        ? null
+        : BadgeInfos.fromJson(json['badge_infos'] as Map<String, dynamic>),
+    seasonVersion: json['season_version'] as String?,
+    horizontalCover169: json['horizontal_cover_16_9'] as String?,
+    horizontalCover1610: json['horizontal_cover_16_10'] as String?,
+    subtitle14: json['subtitle_14'] as String?,
+    viewableCrowdType: json['viewable_crowd_type'] as int?,
+    producers: (json['producers'] as List<dynamic>?)
+        ?.map((e) => Producer.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    summary: json['summary'] as String?,
+    styles: (json['styles'] as List?)?.cast(),
+    configAttrs: json['config_attrs'] == null
+        ? null
+        : ConfigAttrs.fromJson(json['config_attrs'] as Map<String, dynamic>),
+    followStatus: json['follow_status'] as int?,
+    isNew: json['is_new'] as int?,
+    progress: json['progress'] == '' ? null : json['progress'],
+    bothFollow: json['both_follow'] as bool?,
+    subtitle25: json['subtitle_25'] as String?,
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/multi_img.dart b/lib/models_new/fav/fav_pgc/multi_img.dart
index b281e9417..fbb762ba7 100644
--- a/lib/models_new/fav/fav_pgc/multi_img.dart
+++ b/lib/models_new/fav/fav_pgc/multi_img.dart
@@ -5,7 +5,7 @@ class MultiImg {
   MultiImg({this.color, this.mediumRemind});
 
   factory MultiImg.fromJson(Map<String, dynamic> json) => MultiImg(
-        color: json['color'] as String?,
-        mediumRemind: json['medium_remind'] as String?,
-      );
+    color: json['color'] as String?,
+    mediumRemind: json['medium_remind'] as String?,
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/new_ep.dart b/lib/models_new/fav/fav_pgc/new_ep.dart
index 3e0ba5d22..6c1bda5db 100644
--- a/lib/models_new/fav/fav_pgc/new_ep.dart
+++ b/lib/models_new/fav/fav_pgc/new_ep.dart
@@ -18,12 +18,12 @@ class NewEp {
   });
 
   factory NewEp.fromJson(Map<String, dynamic> json) => NewEp(
-        id: json['id'] as int?,
-        indexShow: json['index_show'] as String?,
-        cover: json['cover'] as String?,
-        title: json['title'] as String?,
-        longTitle: json['long_title'] as String?,
-        pubTime: json['pub_time'] as String?,
-        duration: json['duration'] as int?,
-      );
+    id: json['id'] as int?,
+    indexShow: json['index_show'] as String?,
+    cover: json['cover'] as String?,
+    title: json['title'] as String?,
+    longTitle: json['long_title'] as String?,
+    pubTime: json['pub_time'] as String?,
+    duration: json['duration'] as int?,
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/producer.dart b/lib/models_new/fav/fav_pgc/producer.dart
index 4abfca9fa..e08790a57 100644
--- a/lib/models_new/fav/fav_pgc/producer.dart
+++ b/lib/models_new/fav/fav_pgc/producer.dart
@@ -7,9 +7,9 @@ class Producer {
   Producer({this.mid, this.type, this.isContribute, this.title});
 
   factory Producer.fromJson(Map<String, dynamic> json) => Producer(
-        mid: json['mid'] as int?,
-        type: json['type'] as int?,
-        isContribute: json['is_contribute'] as int?,
-        title: json['title'] as String?,
-      );
+    mid: json['mid'] as int?,
+    type: json['type'] as int?,
+    isContribute: json['is_contribute'] as int?,
+    title: json['title'] as String?,
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/publish.dart b/lib/models_new/fav/fav_pgc/publish.dart
index 7c6d895d0..a0be984fc 100644
--- a/lib/models_new/fav/fav_pgc/publish.dart
+++ b/lib/models_new/fav/fav_pgc/publish.dart
@@ -12,9 +12,9 @@ class Publish {
   });
 
   factory Publish.fromJson(Map<String, dynamic> json) => Publish(
-        pubTime: json['pub_time'] as String?,
-        pubTimeShow: json['pub_time_show'] as String?,
-        releaseDate: json['release_date'] as String?,
-        releaseDateShow: json['release_date_show'] as String?,
-      );
+    pubTime: json['pub_time'] as String?,
+    pubTimeShow: json['pub_time_show'] as String?,
+    releaseDate: json['release_date'] as String?,
+    releaseDateShow: json['release_date_show'] as String?,
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/rating.dart b/lib/models_new/fav/fav_pgc/rating.dart
index 50cfade9e..4b7e6fd9f 100644
--- a/lib/models_new/fav/fav_pgc/rating.dart
+++ b/lib/models_new/fav/fav_pgc/rating.dart
@@ -5,7 +5,7 @@ class Rating {
   Rating({this.score, this.count});
 
   factory Rating.fromJson(Map<String, dynamic> json) => Rating(
-        score: (json['score'] as num?)?.toDouble(),
-        count: json['count'] as int?,
-      );
+    score: (json['score'] as num?)?.toDouble(),
+    count: json['count'] as int?,
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/rights.dart b/lib/models_new/fav/fav_pgc/rights.dart
index bdf24c546..3882f251d 100644
--- a/lib/models_new/fav/fav_pgc/rights.dart
+++ b/lib/models_new/fav/fav_pgc/rights.dart
@@ -14,10 +14,10 @@ class Rights {
   });
 
   factory Rights.fromJson(Map<String, dynamic> json) => Rights(
-        allowReview: json['allow_review'] as int?,
-        allowPreview: json['allow_preview'] as int?,
-        isSelection: json['is_selection'] as int?,
-        selectionStyle: json['selection_style'] as int?,
-        isRcmd: json['is_rcmd'] as int?,
-      );
+    allowReview: json['allow_review'] as int?,
+    allowPreview: json['allow_preview'] as int?,
+    isSelection: json['is_selection'] as int?,
+    selectionStyle: json['selection_style'] as int?,
+    isRcmd: json['is_rcmd'] as int?,
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/section.dart b/lib/models_new/fav/fav_pgc/section.dart
index 98e136f28..184b1504e 100644
--- a/lib/models_new/fav/fav_pgc/section.dart
+++ b/lib/models_new/fav/fav_pgc/section.dart
@@ -18,12 +18,12 @@ class Section {
   });
 
   factory Section.fromJson(Map<String, dynamic> json) => Section(
-        sectionId: json['section_id'] as int?,
-        seasonId: json['season_id'] as int?,
-        limitGroup: json['limit_group'] as int?,
-        watchPlatform: json['watch_platform'] as int?,
-        copyright: json['copyright'] as String?,
-        banAreaShow: json['ban_area_show'] as int?,
-        episodeIds: (json['episode_ids'] as List?)?.cast(),
-      );
+    sectionId: json['section_id'] as int?,
+    seasonId: json['season_id'] as int?,
+    limitGroup: json['limit_group'] as int?,
+    watchPlatform: json['watch_platform'] as int?,
+    copyright: json['copyright'] as String?,
+    banAreaShow: json['ban_area_show'] as int?,
+    episodeIds: (json['episode_ids'] as List?)?.cast(),
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/series.dart b/lib/models_new/fav/fav_pgc/series.dart
index 92129a274..82a195e3e 100644
--- a/lib/models_new/fav/fav_pgc/series.dart
+++ b/lib/models_new/fav/fav_pgc/series.dart
@@ -14,10 +14,10 @@ class Series {
   });
 
   factory Series.fromJson(Map<String, dynamic> json) => Series(
-        seriesId: json['series_id'] as int?,
-        title: json['title'] as String?,
-        seasonCount: json['season_count'] as int?,
-        newSeasonId: json['new_season_id'] as int?,
-        seriesOrd: json['series_ord'] as int?,
-      );
+    seriesId: json['series_id'] as int?,
+    title: json['title'] as String?,
+    seasonCount: json['season_count'] as int?,
+    newSeasonId: json['new_season_id'] as int?,
+    seriesOrd: json['series_ord'] as int?,
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/stat.dart b/lib/models_new/fav/fav_pgc/stat.dart
index 7ba3bc624..07674e8a7 100644
--- a/lib/models_new/fav/fav_pgc/stat.dart
+++ b/lib/models_new/fav/fav_pgc/stat.dart
@@ -22,14 +22,14 @@ class Stat {
   });
 
   factory Stat.fromJson(Map<String, dynamic> json) => Stat(
-        follow: json['follow'] as int?,
-        view: json['view'] as int?,
-        danmaku: json['danmaku'] as int?,
-        reply: json['reply'] as int?,
-        coin: json['coin'] as num?,
-        seriesFollow: json['series_follow'] as int?,
-        seriesView: json['series_view'] as int?,
-        likes: json['likes'] as int?,
-        favorite: json['favorite'] as int?,
-      );
+    follow: json['follow'] as int?,
+    view: json['view'] as int?,
+    danmaku: json['danmaku'] as int?,
+    reply: json['reply'] as int?,
+    coin: json['coin'] as num?,
+    seriesFollow: json['series_follow'] as int?,
+    seriesView: json['series_view'] as int?,
+    likes: json['likes'] as int?,
+    favorite: json['favorite'] as int?,
+  );
 }
diff --git a/lib/models_new/fav/fav_pgc/vip_or_pay.dart b/lib/models_new/fav/fav_pgc/vip_or_pay.dart
index 7a5f71134..2b8f30568 100644
--- a/lib/models_new/fav/fav_pgc/vip_or_pay.dart
+++ b/lib/models_new/fav/fav_pgc/vip_or_pay.dart
@@ -16,12 +16,12 @@ class VipOrPay {
   });
 
   factory VipOrPay.fromJson(Map<String, dynamic> json) => VipOrPay(
-        text: json['text'] as String?,
-        bgColor: json['bg_color'] as String?,
-        bgColorNight: json['bg_color_night'] as String?,
-        img: json['img'] as String?,
-        multiImg: json['multi_img'] == null
-            ? null
-            : MultiImg.fromJson(json['multi_img'] as Map<String, dynamic>),
-      );
+    text: json['text'] as String?,
+    bgColor: json['bg_color'] as String?,
+    bgColorNight: json['bg_color_night'] as String?,
+    img: json['img'] as String?,
+    multiImg: json['multi_img'] == null
+        ? null
+        : MultiImg.fromJson(json['multi_img'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/fav/fav_topic/data.dart b/lib/models_new/fav/fav_topic/data.dart
index 0d6e8738f..794ff102c 100644
--- a/lib/models_new/fav/fav_topic/data.dart
+++ b/lib/models_new/fav/fav_topic/data.dart
@@ -6,8 +6,8 @@ class FavTopicData {
   FavTopicData({this.topicList});
 
   factory FavTopicData.fromJson(Map<String, dynamic> json) => FavTopicData(
-        topicList: json['topic_list'] == null
-            ? null
-            : TopicList.fromJson(json['topic_list'] as Map<String, dynamic>),
-      );
+    topicList: json['topic_list'] == null
+        ? null
+        : TopicList.fromJson(json['topic_list'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/fav/fav_topic/page_info.dart b/lib/models_new/fav/fav_topic/page_info.dart
index 32a7afde7..6974f79cd 100644
--- a/lib/models_new/fav/fav_topic/page_info.dart
+++ b/lib/models_new/fav/fav_topic/page_info.dart
@@ -5,7 +5,7 @@ class PageInfo {
   PageInfo({this.curPageNum, this.total});
 
   factory PageInfo.fromJson(Map<String, dynamic> json) => PageInfo(
-        curPageNum: json['cur_page_num'] as int?,
-        total: json['total'] as int?,
-      );
+    curPageNum: json['cur_page_num'] as int?,
+    total: json['total'] as int?,
+  );
 }
diff --git a/lib/models_new/fav/fav_topic/topic_item.dart b/lib/models_new/fav/fav_topic/topic_item.dart
index 74f1b6d5b..e008a87d3 100644
--- a/lib/models_new/fav/fav_topic/topic_item.dart
+++ b/lib/models_new/fav/fav_topic/topic_item.dart
@@ -18,12 +18,12 @@ class FavTopicItem {
   });
 
   factory FavTopicItem.fromJson(Map<String, dynamic> json) => FavTopicItem(
-        id: json['id'] as int?,
-        name: json['name'] as String?,
-        view: json['view'] as int?,
-        discuss: json['discuss'] as int?,
-        jumpUrl: json['jump_url'] as String?,
-        statDesc: json['stat_desc'] as String?,
-        showInteractData: json['show_interact_data'] as bool?,
-      );
+    id: json['id'] as int?,
+    name: json['name'] as String?,
+    view: json['view'] as int?,
+    discuss: json['discuss'] as int?,
+    jumpUrl: json['jump_url'] as String?,
+    statDesc: json['stat_desc'] as String?,
+    showInteractData: json['show_interact_data'] as bool?,
+  );
 }
diff --git a/lib/models_new/fav/fav_topic/topic_list.dart b/lib/models_new/fav/fav_topic/topic_list.dart
index 3c26db8c1..cb61d9b99 100644
--- a/lib/models_new/fav/fav_topic/topic_list.dart
+++ b/lib/models_new/fav/fav_topic/topic_list.dart
@@ -8,11 +8,11 @@ class TopicList {
   TopicList({this.topicItems, this.pageInfo});
 
   factory TopicList.fromJson(Map<String, dynamic> json) => TopicList(
-        topicItems: (json['topic_items'] as List<dynamic>?)
-            ?.map((e) => FavTopicItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        pageInfo: json['page_info'] == null
-            ? null
-            : PageInfo.fromJson(json['page_info'] as Map<String, dynamic>),
-      );
+    topicItems: (json['topic_items'] as List<dynamic>?)
+        ?.map((e) => FavTopicItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    pageInfo: json['page_info'] == null
+        ? null
+        : PageInfo.fromJson(json['page_info'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/follow/data.dart b/lib/models_new/follow/data.dart
index f0d993691..66a3e6e63 100644
--- a/lib/models_new/follow/data.dart
+++ b/lib/models_new/follow/data.dart
@@ -8,10 +8,10 @@ class FollowData {
   FollowData({this.list, this.reVersion, this.total});
 
   factory FollowData.fromJson(Map<String, dynamic> json) => FollowData(
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => FollowItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        reVersion: json['re_version'] as int?,
-        total: json['total'] as int?,
-      );
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => FollowItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    reVersion: json['re_version'] as int?,
+    total: json['total'] as int?,
+  );
 }
diff --git a/lib/models_new/follow/list.dart b/lib/models_new/follow/list.dart
index e0cf6ba7f..0099521ad 100644
--- a/lib/models_new/follow/list.dart
+++ b/lib/models_new/follow/list.dart
@@ -49,7 +49,8 @@ class FollowItemModel {
         officialVerify: json['official_verify'] == null
             ? null
             : BaseOfficialVerify.fromJson(
-                json['official_verify'] as Map<String, dynamic>),
+                json['official_verify'] as Map<String, dynamic>,
+              ),
         vip: json['vip'] == null
             ? null
             : Vip.fromJson(json['vip'] as Map<String, dynamic>),
diff --git a/lib/models_new/history/cursor.dart b/lib/models_new/history/cursor.dart
index 77bb01be6..a644dcd32 100644
--- a/lib/models_new/history/cursor.dart
+++ b/lib/models_new/history/cursor.dart
@@ -7,9 +7,9 @@ class Cursor {
   Cursor({this.max, this.viewAt, this.business, this.ps});
 
   factory Cursor.fromJson(Map<String, dynamic> json) => Cursor(
-        max: json['max'] as int?,
-        viewAt: json['view_at'] as int?,
-        business: json['business'] as String?,
-        ps: json['ps'] as int?,
-      );
+    max: json['max'] as int?,
+    viewAt: json['view_at'] as int?,
+    business: json['business'] as String?,
+    ps: json['ps'] as int?,
+  );
 }
diff --git a/lib/models_new/history/data.dart b/lib/models_new/history/data.dart
index 364e05068..3f6e96f02 100644
--- a/lib/models_new/history/data.dart
+++ b/lib/models_new/history/data.dart
@@ -10,14 +10,14 @@ class HistoryData {
   HistoryData({this.cursor, this.tab, this.list});
 
   factory HistoryData.fromJson(Map<String, dynamic> json) => HistoryData(
-        cursor: json['cursor'] == null
-            ? null
-            : Cursor.fromJson(json['cursor'] as Map<String, dynamic>),
-        tab: (json['tab'] as List<dynamic>?)
-            ?.map((e) => HistoryTab.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => HistoryItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    cursor: json['cursor'] == null
+        ? null
+        : Cursor.fromJson(json['cursor'] as Map<String, dynamic>),
+    tab: (json['tab'] as List<dynamic>?)
+        ?.map((e) => HistoryTab.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => HistoryItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/history/history.dart b/lib/models_new/history/history.dart
index 71f1c7b81..a13a3c0f4 100644
--- a/lib/models_new/history/history.dart
+++ b/lib/models_new/history/history.dart
@@ -20,13 +20,13 @@ class History {
   });
 
   factory History.fromJson(Map<String, dynamic> json) => History(
-        oid: json['oid'],
-        epid: json['epid'],
-        bvid: json['bvid'],
-        page: json['page'],
-        cid: json['cid'] == 0 ? null : json['cid'],
-        part: json['part'],
-        business: json['business'],
-        dt: json['dt'],
-      );
+    oid: json['oid'],
+    epid: json['epid'],
+    bvid: json['bvid'],
+    page: json['page'],
+    cid: json['cid'] == 0 ? null : json['cid'],
+    part: json['part'],
+    business: json['business'],
+    dt: json['dt'],
+  );
 }
diff --git a/lib/models_new/history/tab.dart b/lib/models_new/history/tab.dart
index 37bf0f980..922fbce15 100644
--- a/lib/models_new/history/tab.dart
+++ b/lib/models_new/history/tab.dart
@@ -5,7 +5,7 @@ class HistoryTab {
   HistoryTab({this.type, this.name});
 
   factory HistoryTab.fromJson(Map<String, dynamic> json) => HistoryTab(
-        type: json['type'] as String?,
-        name: json['name'] as String?,
-      );
+    type: json['type'] as String?,
+    name: json['name'] as String?,
+  );
 }
diff --git a/lib/models_new/later/bangumi.dart b/lib/models_new/later/bangumi.dart
index 5fe502e5d..cfa23526d 100644
--- a/lib/models_new/later/bangumi.dart
+++ b/lib/models_new/later/bangumi.dart
@@ -20,14 +20,14 @@ class Bangumi {
   });
 
   factory Bangumi.fromJson(Map<String, dynamic> json) => Bangumi(
-        epId: json['ep_id'] as int?,
-        title: json['title'] as String?,
-        longTitle: json['long_title'] as String?,
-        episodeStatus: json['episode_status'] as int?,
-        follow: json['follow'] as int?,
-        cover: json['cover'] as String?,
-        season: json['season'] == null
-            ? null
-            : Season.fromJson(json['season'] as Map<String, dynamic>),
-      );
+    epId: json['ep_id'] as int?,
+    title: json['title'] as String?,
+    longTitle: json['long_title'] as String?,
+    episodeStatus: json['episode_status'] as int?,
+    follow: json['follow'] as int?,
+    cover: json['cover'] as String?,
+    season: json['season'] == null
+        ? null
+        : Season.fromJson(json['season'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/later/data.dart b/lib/models_new/later/data.dart
index 87b09814d..31f24c4dc 100644
--- a/lib/models_new/later/data.dart
+++ b/lib/models_new/later/data.dart
@@ -7,9 +7,9 @@ class LaterData {
   LaterData({this.count, this.list});
 
   factory LaterData.fromJson(Map<String, dynamic> json) => LaterData(
-        count: json['count'] as int?,
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => LaterItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    count: json['count'] as int?,
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => LaterItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/later/dimension.dart b/lib/models_new/later/dimension.dart
index 3de7639ce..c2fba44eb 100644
--- a/lib/models_new/later/dimension.dart
+++ b/lib/models_new/later/dimension.dart
@@ -6,8 +6,8 @@ class Dimension {
   Dimension({this.width, this.height, this.rotate});
 
   factory Dimension.fromJson(Map<String, dynamic> json) => Dimension(
-        width: json['width'] as int?,
-        height: json['height'] as int?,
-        rotate: json['rotate'] as int?,
-      );
+    width: json['width'] as int?,
+    height: json['height'] as int?,
+    rotate: json['rotate'] as int?,
+  );
 }
diff --git a/lib/models_new/later/list.dart b/lib/models_new/later/list.dart
index 71baf596a..6336374d7 100644
--- a/lib/models_new/later/list.dart
+++ b/lib/models_new/later/list.dart
@@ -103,65 +103,67 @@ class LaterItemModel with MultiSelectData {
   });
 
   factory LaterItemModel.fromJson(Map<String, dynamic> json) => LaterItemModel(
-        aid: json['aid'] as int?,
-        videos: json['videos'] as int?,
-        tid: json['tid'] as int?,
-        tname: json['tname'] as String?,
-        copyright: json['copyright'] as int?,
-        pic: json['pic'] as String?,
-        title: json['title'] as String?,
-        pubdate: json['pubdate'] as int?,
-        ctime: json['ctime'] as int?,
-        desc: json['desc'] as String?,
-        state: json['state'] as int?,
-        duration: json['duration'] as int?,
-        redirectUrl: json['redirect_url'] as String?,
-        rights: json['rights'] == null
-            ? null
-            : Rights.fromJson(json['rights'] as Map<String, dynamic>),
-        owner: json['owner'] == null
-            ? null
-            : Owner.fromJson(json['owner'] as Map<String, dynamic>),
-        stat: json['stat'] == null
-            ? null
-            : Stat.fromJson(json['stat'] as Map<String, dynamic>),
-        dynam1c: json['dynamic'] as String?,
-        dimension: json['dimension'] == null
-            ? null
-            : Dimension.fromJson(json['dimension'] as Map<String, dynamic>),
-        shortLinkV2: json['short_link_v2'] as String?,
-        upFromV2: json['up_from_v2'] as int?,
-        pubLocation: json['pub_location'] as String?,
-        cover43: json['cover43'] as String?,
-        tidv2: json['tidv2'] as int?,
-        tnamev2: json['tnamev2'] as String?,
-        pidV2: json['pid_v2'] as int?,
-        pidNameV2: json['pid_name_v2'] as String?,
-        pages: (json['pages'] as List<dynamic>?)
-            ?.map((e) => Page.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        bangumi: json['bangumi'] == null
-            ? null
-            : Bangumi.fromJson(json['bangumi'] as Map<String, dynamic>),
-        subtitle: json['bangumi'] == null
-            ? null
-            : (json['title'] as String)
-                .replaceFirst('${json['bangumi']['season']['title']} ', ''),
-        cid: json['cid'] as int?,
-        progress: json['progress'] as int?,
-        addAt: json['add_at'] as int?,
-        bvid: json['bvid'] as String?,
-        uri: json['uri'] as String?,
-        viewed: json['viewed'] as bool?,
-        seq: json['seq'] as int?,
-        enableVt: json['enable_vt'] as int?,
-        viewText1: json['view_text_1'] as String?,
-        isPgc: json['is_pgc'] as bool?,
-        pgcLabel: json['pgc_label'] == '' ? null : json['pgc_label'],
-        isPugv: json['is_pugv'] as bool?,
-        missionId: json['mission_id'] as int?,
-        firstFrame: json['first_frame'] as String?,
-        seasonId: json['season_id'] as int?,
-        isCharging: json['charging_pay']?['level'] != null,
-      );
+    aid: json['aid'] as int?,
+    videos: json['videos'] as int?,
+    tid: json['tid'] as int?,
+    tname: json['tname'] as String?,
+    copyright: json['copyright'] as int?,
+    pic: json['pic'] as String?,
+    title: json['title'] as String?,
+    pubdate: json['pubdate'] as int?,
+    ctime: json['ctime'] as int?,
+    desc: json['desc'] as String?,
+    state: json['state'] as int?,
+    duration: json['duration'] as int?,
+    redirectUrl: json['redirect_url'] as String?,
+    rights: json['rights'] == null
+        ? null
+        : Rights.fromJson(json['rights'] as Map<String, dynamic>),
+    owner: json['owner'] == null
+        ? null
+        : Owner.fromJson(json['owner'] as Map<String, dynamic>),
+    stat: json['stat'] == null
+        ? null
+        : Stat.fromJson(json['stat'] as Map<String, dynamic>),
+    dynam1c: json['dynamic'] as String?,
+    dimension: json['dimension'] == null
+        ? null
+        : Dimension.fromJson(json['dimension'] as Map<String, dynamic>),
+    shortLinkV2: json['short_link_v2'] as String?,
+    upFromV2: json['up_from_v2'] as int?,
+    pubLocation: json['pub_location'] as String?,
+    cover43: json['cover43'] as String?,
+    tidv2: json['tidv2'] as int?,
+    tnamev2: json['tnamev2'] as String?,
+    pidV2: json['pid_v2'] as int?,
+    pidNameV2: json['pid_name_v2'] as String?,
+    pages: (json['pages'] as List<dynamic>?)
+        ?.map((e) => Page.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    bangumi: json['bangumi'] == null
+        ? null
+        : Bangumi.fromJson(json['bangumi'] as Map<String, dynamic>),
+    subtitle: json['bangumi'] == null
+        ? null
+        : (json['title'] as String).replaceFirst(
+            '${json['bangumi']['season']['title']} ',
+            '',
+          ),
+    cid: json['cid'] as int?,
+    progress: json['progress'] as int?,
+    addAt: json['add_at'] as int?,
+    bvid: json['bvid'] as String?,
+    uri: json['uri'] as String?,
+    viewed: json['viewed'] as bool?,
+    seq: json['seq'] as int?,
+    enableVt: json['enable_vt'] as int?,
+    viewText1: json['view_text_1'] as String?,
+    isPgc: json['is_pgc'] as bool?,
+    pgcLabel: json['pgc_label'] == '' ? null : json['pgc_label'],
+    isPugv: json['is_pugv'] as bool?,
+    missionId: json['mission_id'] as int?,
+    firstFrame: json['first_frame'] as String?,
+    seasonId: json['season_id'] as int?,
+    isCharging: json['charging_pay']?['level'] != null,
+  );
 }
diff --git a/lib/models_new/later/owner.dart b/lib/models_new/later/owner.dart
index 22e286a83..b0565f08b 100644
--- a/lib/models_new/later/owner.dart
+++ b/lib/models_new/later/owner.dart
@@ -6,8 +6,8 @@ class Owner {
   Owner({this.mid, this.name, this.face});
 
   factory Owner.fromJson(Map<String, dynamic> json) => Owner(
-        mid: json['mid'] as int?,
-        name: json['name'] as String?,
-        face: json['face'] as String?,
-      );
+    mid: json['mid'] as int?,
+    name: json['name'] as String?,
+    face: json['face'] as String?,
+  );
 }
diff --git a/lib/models_new/later/page.dart b/lib/models_new/later/page.dart
index 3b2fbd4ec..3098302b7 100644
--- a/lib/models_new/later/page.dart
+++ b/lib/models_new/later/page.dart
@@ -24,16 +24,16 @@ class Page {
   });
 
   factory Page.fromJson(Map<String, dynamic> json) => Page(
-        cid: json['cid'] as int?,
-        page: json['page'] as int?,
-        from: json['from'] as String?,
-        part: json['part'] as String?,
-        duration: json['duration'] as int?,
-        vid: json['vid'] as String?,
-        weblink: json['weblink'] as String?,
-        dimension: json['dimension'] == null
-            ? null
-            : Dimension.fromJson(json['dimension'] as Map<String, dynamic>),
-        ctime: json['ctime'] as int?,
-      );
+    cid: json['cid'] as int?,
+    page: json['page'] as int?,
+    from: json['from'] as String?,
+    part: json['part'] as String?,
+    duration: json['duration'] as int?,
+    vid: json['vid'] as String?,
+    weblink: json['weblink'] as String?,
+    dimension: json['dimension'] == null
+        ? null
+        : Dimension.fromJson(json['dimension'] as Map<String, dynamic>),
+    ctime: json['ctime'] as int?,
+  );
 }
diff --git a/lib/models_new/later/rights.dart b/lib/models_new/later/rights.dart
index 362eea6d8..70e883f7f 100644
--- a/lib/models_new/later/rights.dart
+++ b/lib/models_new/later/rights.dart
@@ -32,19 +32,19 @@ class Rights {
   });
 
   factory Rights.fromJson(Map<String, dynamic> json) => Rights(
-        bp: json['bp'] as int?,
-        elec: json['elec'] as int?,
-        download: json['download'] as int?,
-        movie: json['movie'] as int?,
-        pay: json['pay'] as int?,
-        hd5: json['hd5'] as int?,
-        noReprint: json['no_reprint'] as int?,
-        autoplay: json['autoplay'] as int?,
-        ugcPay: json['ugc_pay'] as int?,
-        isCooperation: json['is_cooperation'] as int?,
-        ugcPayPreview: json['ugc_pay_preview'] as int?,
-        noBackground: json['no_background'] as int?,
-        arcPay: json['arc_pay'] as int?,
-        payFreeWatch: json['pay_free_watch'] as int?,
-      );
+    bp: json['bp'] as int?,
+    elec: json['elec'] as int?,
+    download: json['download'] as int?,
+    movie: json['movie'] as int?,
+    pay: json['pay'] as int?,
+    hd5: json['hd5'] as int?,
+    noReprint: json['no_reprint'] as int?,
+    autoplay: json['autoplay'] as int?,
+    ugcPay: json['ugc_pay'] as int?,
+    isCooperation: json['is_cooperation'] as int?,
+    ugcPayPreview: json['ugc_pay_preview'] as int?,
+    noBackground: json['no_background'] as int?,
+    arcPay: json['arc_pay'] as int?,
+    payFreeWatch: json['pay_free_watch'] as int?,
+  );
 }
diff --git a/lib/models_new/later/season.dart b/lib/models_new/later/season.dart
index a7d5c75c4..b975f37ab 100644
--- a/lib/models_new/later/season.dart
+++ b/lib/models_new/later/season.dart
@@ -20,13 +20,13 @@ class Season {
   });
 
   factory Season.fromJson(Map<String, dynamic> json) => Season(
-        seasonId: json['season_id'] as int?,
-        title: json['title'] as String?,
-        seasonStatus: json['season_status'] as int?,
-        isFinish: json['is_finish'] as int?,
-        totalCount: json['total_count'] as int?,
-        newestEpId: json['newest_ep_id'] as int?,
-        newestEpIndex: json['newest_ep_index'] as String?,
-        seasonType: json['season_type'] as int?,
-      );
+    seasonId: json['season_id'] as int?,
+    title: json['title'] as String?,
+    seasonStatus: json['season_status'] as int?,
+    isFinish: json['is_finish'] as int?,
+    totalCount: json['total_count'] as int?,
+    newestEpId: json['newest_ep_id'] as int?,
+    newestEpIndex: json['newest_ep_index'] as String?,
+    seasonType: json['season_type'] as int?,
+  );
 }
diff --git a/lib/models_new/later/stat.dart b/lib/models_new/later/stat.dart
index a6dfbd6b8..9f3ff07f5 100644
--- a/lib/models_new/later/stat.dart
+++ b/lib/models_new/later/stat.dart
@@ -30,18 +30,18 @@ class Stat {
   });
 
   factory Stat.fromJson(Map<String, dynamic> json) => Stat(
-        aid: json['aid'] as int?,
-        view: json['view'] as int?,
-        danmaku: json['danmaku'] as int?,
-        reply: json['reply'] as int?,
-        favorite: json['favorite'] as int?,
-        coin: json['coin'] as num?,
-        share: json['share'] as int?,
-        nowRank: json['now_rank'] as int?,
-        hisRank: json['his_rank'] as int?,
-        like: json['like'] as int?,
-        dislike: json['dislike'] as int?,
-        vt: json['vt'] as int?,
-        vv: json['vv'] as int?,
-      );
+    aid: json['aid'] as int?,
+    view: json['view'] as int?,
+    danmaku: json['danmaku'] as int?,
+    reply: json['reply'] as int?,
+    favorite: json['favorite'] as int?,
+    coin: json['coin'] as num?,
+    share: json['share'] as int?,
+    nowRank: json['now_rank'] as int?,
+    hisRank: json['his_rank'] as int?,
+    like: json['like'] as int?,
+    dislike: json['dislike'] as int?,
+    vt: json['vt'] as int?,
+    vv: json['vv'] as int?,
+  );
 }
diff --git a/lib/models_new/live/live_area_list/area_item.dart b/lib/models_new/live/live_area_list/area_item.dart
index 54cb83645..85fdb0c4e 100644
--- a/lib/models_new/live/live_area_list/area_item.dart
+++ b/lib/models_new/live/live_area_list/area_item.dart
@@ -20,15 +20,15 @@ class AreaItem {
   });
 
   factory AreaItem.fromJson(Map<String, dynamic> json) => AreaItem(
-        id: json['id'],
-        name: json['name'] as String?,
-        link: json['link'] as String?,
-        pic: json['pic'] as String?,
-        parentId: json['parent_id'],
-        parentName: json['parent_name'] as String?,
-        areaType: json['area_type'] as int?,
-        tagType: json['tag_type'] as int?,
-      );
+    id: json['id'],
+    name: json['name'] as String?,
+    link: json['link'] as String?,
+    pic: json['pic'] as String?,
+    parentId: json['parent_id'],
+    parentName: json['parent_name'] as String?,
+    areaType: json['area_type'] as int?,
+    tagType: json['tag_type'] as int?,
+  );
 
   @override
   bool operator ==(Object other) {
diff --git a/lib/models_new/live/live_area_list/area_list.dart b/lib/models_new/live/live_area_list/area_list.dart
index e0af83bb4..e9d83bb38 100644
--- a/lib/models_new/live/live_area_list/area_list.dart
+++ b/lib/models_new/live/live_area_list/area_list.dart
@@ -9,11 +9,11 @@ class AreaList {
   AreaList({this.id, this.name, this.parentAreaType, this.areaList});
 
   factory AreaList.fromJson(Map<String, dynamic> json) => AreaList(
-        id: json['id'] as int?,
-        name: json['name'] ?? '',
-        parentAreaType: json['parent_area_type'] as int?,
-        areaList: (json['area_list'] as List<dynamic>?)
-            ?.map((e) => AreaItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    id: json['id'] as int?,
+    name: json['name'] ?? '',
+    parentAreaType: json['parent_area_type'] as int?,
+    areaList: (json['area_list'] as List<dynamic>?)
+        ?.map((e) => AreaItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/live/live_dm_block/shield_info.dart b/lib/models_new/live/live_dm_block/shield_info.dart
index 52f625157..537cb4e72 100644
--- a/lib/models_new/live/live_dm_block/shield_info.dart
+++ b/lib/models_new/live/live_dm_block/shield_info.dart
@@ -17,15 +17,14 @@ class ShieldInfo {
   });
 
   factory ShieldInfo.fromJson(Map<String, dynamic> json) => ShieldInfo(
-        shieldUserList: (json['shield_user_list'] as List<dynamic>?)
-            ?.map((e) => ShieldUserList.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        keywordList: (json['keyword_list'] as List?)?.cast(),
-        shieldRules: json['shield_rules'] == null
-            ? null
-            : ShieldRules.fromJson(
-                json['shield_rules'] as Map<String, dynamic>),
-        isBlock: json['is_block'] as bool?,
-        blockExpired: json['block_expired'] as int?,
-      );
+    shieldUserList: (json['shield_user_list'] as List<dynamic>?)
+        ?.map((e) => ShieldUserList.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    keywordList: (json['keyword_list'] as List?)?.cast(),
+    shieldRules: json['shield_rules'] == null
+        ? null
+        : ShieldRules.fromJson(json['shield_rules'] as Map<String, dynamic>),
+    isBlock: json['is_block'] as bool?,
+    blockExpired: json['block_expired'] as int?,
+  );
 }
diff --git a/lib/models_new/live/live_dm_block/shield_rules.dart b/lib/models_new/live/live_dm_block/shield_rules.dart
index a32ba0934..0cfbf69f9 100644
--- a/lib/models_new/live/live_dm_block/shield_rules.dart
+++ b/lib/models_new/live/live_dm_block/shield_rules.dart
@@ -6,8 +6,8 @@ class ShieldRules {
   ShieldRules({this.rank = 0, this.verify = 0, this.level = 0});
 
   factory ShieldRules.fromJson(Map<String, dynamic> json) => ShieldRules(
-        rank: json['rank'] as int? ?? 0,
-        verify: json['verify'] as int? ?? 0,
-        level: json['level'] as int? ?? 0,
-      );
+    rank: json['rank'] as int? ?? 0,
+    verify: json['verify'] as int? ?? 0,
+    level: json['level'] as int? ?? 0,
+  );
 }
diff --git a/lib/models_new/live/live_dm_info/data.dart b/lib/models_new/live/live_dm_info/data.dart
index 53cf04059..a964c5d4e 100644
--- a/lib/models_new/live/live_dm_info/data.dart
+++ b/lib/models_new/live/live_dm_info/data.dart
@@ -20,14 +20,14 @@ class LiveDmInfoData {
   });
 
   factory LiveDmInfoData.fromJson(Map<String, dynamic> json) => LiveDmInfoData(
-        group: json['group'] as String?,
-        businessId: json['business_id'] as int?,
-        refreshRowFactor: (json['refresh_row_factor'] as num?)?.toDouble(),
-        refreshRate: json['refresh_rate'] as int?,
-        maxDelay: json['max_delay'] as int?,
-        token: json['token'] as String?,
-        hostList: (json['host_list'] as List<dynamic>?)
-            ?.map((e) => HostList.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    group: json['group'] as String?,
+    businessId: json['business_id'] as int?,
+    refreshRowFactor: (json['refresh_row_factor'] as num?)?.toDouble(),
+    refreshRate: json['refresh_rate'] as int?,
+    maxDelay: json['max_delay'] as int?,
+    token: json['token'] as String?,
+    hostList: (json['host_list'] as List<dynamic>?)
+        ?.map((e) => HostList.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/live/live_dm_info/host_list.dart b/lib/models_new/live/live_dm_info/host_list.dart
index 9d97bf14b..883841e5c 100644
--- a/lib/models_new/live/live_dm_info/host_list.dart
+++ b/lib/models_new/live/live_dm_info/host_list.dart
@@ -7,9 +7,9 @@ class HostList {
   HostList({this.host, this.port, this.wssPort, this.wsPort});
 
   factory HostList.fromJson(Map<String, dynamic> json) => HostList(
-        host: json['host'] as String?,
-        port: json['port'] as int?,
-        wssPort: json['wss_port'] as int?,
-        wsPort: json['ws_port'] as int?,
-      );
+    host: json['host'] as String?,
+    port: json['port'] as int?,
+    wssPort: json['wss_port'] as int?,
+    wsPort: json['ws_port'] as int?,
+  );
 }
diff --git a/lib/models_new/live/live_emote/data.dart b/lib/models_new/live/live_emote/data.dart
index 6a39ffee0..bcf3b06e5 100644
--- a/lib/models_new/live/live_emote/data.dart
+++ b/lib/models_new/live/live_emote/data.dart
@@ -6,8 +6,8 @@ class LiveEmoteData {
   LiveEmoteData({this.data});
 
   factory LiveEmoteData.fromJson(Map<String, dynamic> json) => LiveEmoteData(
-        data: (json['data'] as List<dynamic>?)
-            ?.map((e) => LiveEmoteDatum.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    data: (json['data'] as List<dynamic>?)
+        ?.map((e) => LiveEmoteDatum.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/live/live_emote/datum.dart b/lib/models_new/live/live_emote/datum.dart
index 42a0dc832..1289278b4 100644
--- a/lib/models_new/live/live_emote/datum.dart
+++ b/lib/models_new/live/live_emote/datum.dart
@@ -12,10 +12,10 @@ class LiveEmoteDatum {
   });
 
   factory LiveEmoteDatum.fromJson(Map<String, dynamic> json) => LiveEmoteDatum(
-        emoticons: (json['emoticons'] as List<dynamic>?)
-            ?.map((e) => Emoticon.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        pkgType: json['pkg_type'] as int?,
-        currentCover: json['current_cover'] as String?,
-      );
+    emoticons: (json['emoticons'] as List<dynamic>?)
+        ?.map((e) => Emoticon.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    pkgType: json['pkg_type'] as int?,
+    currentCover: json['current_cover'] as String?,
+  );
 }
diff --git a/lib/models_new/live/live_emote/emoticon.dart b/lib/models_new/live/live_emote/emoticon.dart
index 0075302d9..30ac6ae0d 100644
--- a/lib/models_new/live/live_emote/emoticon.dart
+++ b/lib/models_new/live/live_emote/emoticon.dart
@@ -14,10 +14,10 @@ class Emoticon {
   });
 
   factory Emoticon.fromJson(Map<String, dynamic> json) => Emoticon(
-        emoji: json['emoji'] as String?,
-        url: json['url'] as String?,
-        width: json['width'] as int?,
-        height: json['height'] as int?,
-        emoticonUnique: json['emoticon_unique'] as String?,
-      );
+    emoji: json['emoji'] as String?,
+    url: json['url'] as String?,
+    width: json['width'] as int?,
+    height: json['height'] as int?,
+    emoticonUnique: json['emoticon_unique'] as String?,
+  );
 }
diff --git a/lib/models_new/live/live_feed_index/card_data.dart b/lib/models_new/live/live_feed_index/card_data.dart
index 110e7eef7..4da056216 100644
--- a/lib/models_new/live/live_feed_index/card_data.dart
+++ b/lib/models_new/live/live_feed_index/card_data.dart
@@ -15,19 +15,19 @@ class CardData {
   });
 
   factory CardData.fromJson(Map<String, dynamic> json) => CardData(
-        bannerV2: json['banner_v2'] == null
-            ? null
-            : CardDataItem.fromJson(json['banner_v2'] as Map<String, dynamic>),
-        myIdolV1: json['my_idol_v1'] == null
-            ? null
-            : CardDataItem.fromJson(json['my_idol_v1'] as Map<String, dynamic>),
-        areaEntranceV3: json['area_entrance_v3'] == null
-            ? null
-            : CardDataItem.fromJson(
-                json['area_entrance_v3'] as Map<String, dynamic>),
-        smallCardV1: json['small_card_v1'] == null
-            ? null
-            : CardLiveItem.fromJson(
-                json['small_card_v1'] as Map<String, dynamic>),
-      );
+    bannerV2: json['banner_v2'] == null
+        ? null
+        : CardDataItem.fromJson(json['banner_v2'] as Map<String, dynamic>),
+    myIdolV1: json['my_idol_v1'] == null
+        ? null
+        : CardDataItem.fromJson(json['my_idol_v1'] as Map<String, dynamic>),
+    areaEntranceV3: json['area_entrance_v3'] == null
+        ? null
+        : CardDataItem.fromJson(
+            json['area_entrance_v3'] as Map<String, dynamic>,
+          ),
+    smallCardV1: json['small_card_v1'] == null
+        ? null
+        : CardLiveItem.fromJson(json['small_card_v1'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/live/live_feed_index/card_data_item.dart b/lib/models_new/live/live_feed_index/card_data_item.dart
index 1ccc2794a..e6e08ae20 100644
--- a/lib/models_new/live/live_feed_index/card_data_item.dart
+++ b/lib/models_new/live/live_feed_index/card_data_item.dart
@@ -15,17 +15,17 @@ class CardDataItem {
   });
 
   factory CardDataItem.fromJson(Map<String, dynamic> json) => CardDataItem(
-        moduleInfo: json['module_info'] == null
-            ? null
-            : ModuleInfo.fromJson(json['module_info'] as Map<String, dynamic>),
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => CardLiveItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        topView: json['top_view'] as dynamic,
-        extraInfo: json['extra_info'] == null
-            ? null
-            : ExtraInfo.fromJson(json['extra_info'] as Map<String, dynamic>),
-      );
+    moduleInfo: json['module_info'] == null
+        ? null
+        : ModuleInfo.fromJson(json['module_info'] as Map<String, dynamic>),
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => CardLiveItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    topView: json['top_view'] as dynamic,
+    extraInfo: json['extra_info'] == null
+        ? null
+        : ExtraInfo.fromJson(json['extra_info'] as Map<String, dynamic>),
+  );
 }
 
 class ExtraInfo {
diff --git a/lib/models_new/live/live_feed_index/card_data_list_item.dart b/lib/models_new/live/live_feed_index/card_data_list_item.dart
index dac6ff099..ba0d90b8e 100644
--- a/lib/models_new/live/live_feed_index/card_data_list_item.dart
+++ b/lib/models_new/live/live_feed_index/card_data_list_item.dart
@@ -48,29 +48,28 @@ class CardLiveItem {
   });
 
   factory CardLiveItem.fromJson(Map<String, dynamic> json) => CardLiveItem(
-        roomid: json['roomid'] ?? json['id'],
-        uid: json['uid'] as int?,
-        uname: json['uname'] as String?,
-        face: json['face'] as String?,
-        cover: json['cover'] as String?,
-        title: json['title'] as String?,
-        area: json['area'] as int?,
-        liveTime: json['live_time'] as int?,
-        areaName: json['area_name'] as String?,
-        areaV2Id: json['area_v2_id'] as int?,
-        areaV2Name: json['area_v2_name'] as String?,
-        areaV2ParentName: json['area_v2_parent_name'] as String?,
-        areaV2ParentId: json['area_v2_parent_id'] as int?,
-        liveTagName: json['live_tag_name'] as String?,
-        online: json['online'] as int?,
-        link: json['link'] as String?,
-        officialVerify: json['official_verify'] as int?,
-        currentQn: json['current_qn'] as int?,
-        watchedShow: json['watched_show'] == null
-            ? null
-            : WatchedShow.fromJson(
-                json['watched_show'] as Map<String, dynamic>),
-        statusText: json['status_text'] as String?,
-        tagType: json['tag_type'],
-      );
+    roomid: json['roomid'] ?? json['id'],
+    uid: json['uid'] as int?,
+    uname: json['uname'] as String?,
+    face: json['face'] as String?,
+    cover: json['cover'] as String?,
+    title: json['title'] as String?,
+    area: json['area'] as int?,
+    liveTime: json['live_time'] as int?,
+    areaName: json['area_name'] as String?,
+    areaV2Id: json['area_v2_id'] as int?,
+    areaV2Name: json['area_v2_name'] as String?,
+    areaV2ParentName: json['area_v2_parent_name'] as String?,
+    areaV2ParentId: json['area_v2_parent_id'] as int?,
+    liveTagName: json['live_tag_name'] as String?,
+    online: json['online'] as int?,
+    link: json['link'] as String?,
+    officialVerify: json['official_verify'] as int?,
+    currentQn: json['current_qn'] as int?,
+    watchedShow: json['watched_show'] == null
+        ? null
+        : WatchedShow.fromJson(json['watched_show'] as Map<String, dynamic>),
+    statusText: json['status_text'] as String?,
+    tagType: json['tag_type'],
+  );
 }
diff --git a/lib/models_new/live/live_feed_index/card_list.dart b/lib/models_new/live/live_feed_index/card_list.dart
index 5f3526547..2457fca60 100644
--- a/lib/models_new/live/live_feed_index/card_list.dart
+++ b/lib/models_new/live/live_feed_index/card_list.dart
@@ -7,9 +7,9 @@ class LiveCardList {
   LiveCardList({this.cardType, this.cardData});
 
   factory LiveCardList.fromJson(Map<String, dynamic> json) => LiveCardList(
-        cardType: json['card_type'] as String?,
-        cardData: json['card_data'] == null
-            ? null
-            : CardData.fromJson(json['card_data'] as Map<String, dynamic>),
-      );
+    cardType: json['card_type'] as String?,
+    cardData: json['card_data'] == null
+        ? null
+        : CardData.fromJson(json['card_data'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/live/live_feed_index/live_feed_index.dart b/lib/models_new/live/live_feed_index/live_feed_index.dart
index f78719404..4f375cd5f 100644
--- a/lib/models_new/live/live_feed_index/live_feed_index.dart
+++ b/lib/models_new/live/live_feed_index/live_feed_index.dart
@@ -9,11 +9,11 @@ class LiveFeedIndex {
   LiveFeedIndex({this.code, this.message, this.ttl, this.data});
 
   factory LiveFeedIndex.fromJson(Map<String, dynamic> json) => LiveFeedIndex(
-        code: json['code'] as int?,
-        message: json['message'] as String?,
-        ttl: json['ttl'] as int?,
-        data: json['data'] == null
-            ? null
-            : LiveIndexData.fromJson(json['data'] as Map<String, dynamic>),
-      );
+    code: json['code'] as int?,
+    message: json['message'] as String?,
+    ttl: json['ttl'] as int?,
+    data: json['data'] == null
+        ? null
+        : LiveIndexData.fromJson(json['data'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/live/live_feed_index/module_info.dart b/lib/models_new/live/live_feed_index/module_info.dart
index 712237cf5..a9841f2ac 100644
--- a/lib/models_new/live/live_feed_index/module_info.dart
+++ b/lib/models_new/live/live_feed_index/module_info.dart
@@ -18,12 +18,12 @@ class ModuleInfo {
   });
 
   factory ModuleInfo.fromJson(Map<String, dynamic> json) => ModuleInfo(
-        id: json['id'] as int?,
-        link: json['link'] as String?,
-        pic: json['pic'] as String?,
-        title: json['title'] as String?,
-        type: json['type'] as int?,
-        sort: json['sort'] as int?,
-        count: json['count'] as int?,
-      );
+    id: json['id'] as int?,
+    link: json['link'] as String?,
+    pic: json['pic'] as String?,
+    title: json['title'] as String?,
+    type: json['type'] as int?,
+    sort: json['sort'] as int?,
+    count: json['count'] as int?,
+  );
 }
diff --git a/lib/models_new/live/live_feed_index/watched_show.dart b/lib/models_new/live/live_feed_index/watched_show.dart
index 83400e617..9bf391562 100644
--- a/lib/models_new/live/live_feed_index/watched_show.dart
+++ b/lib/models_new/live/live_feed_index/watched_show.dart
@@ -8,7 +8,7 @@ class WatchedShow {
   });
 
   factory WatchedShow.fromJson(Map<String, dynamic> json) => WatchedShow(
-        textSmall: json['text_small'] as String?,
-        textLarge: json['text_large'] as String?,
-      );
+    textSmall: json['text_small'] as String?,
+    textLarge: json['text_large'] as String?,
+  );
 }
diff --git a/lib/models_new/live/live_follow/item.dart b/lib/models_new/live/live_follow/item.dart
index 70946458b..e158bfdd0 100644
--- a/lib/models_new/live/live_follow/item.dart
+++ b/lib/models_new/live/live_follow/item.dart
@@ -54,30 +54,30 @@ class LiveFollowItem {
   });
 
   factory LiveFollowItem.fromJson(Map<String, dynamic> json) => LiveFollowItem(
-        roomid: json['roomid'] as int?,
-        uid: json['uid'] as int?,
-        uname: json['uname'] as String?,
-        title: json['title'] as String?,
-        face: json['face'] as String?,
-        liveStatus: json['live_status'] as int?,
-        recordNum: json['record_num'] as int?,
-        recentRecordId: json['recent_record_id'] as String?,
-        isAttention: json['is_attention'] as int?,
-        clipnum: json['clipnum'] as int?,
-        fansNum: json['fans_num'] as int?,
-        areaName: json['area_name'] as String?,
-        areaValue: json['area_value'] as String?,
-        tags: json['tags'] as String?,
-        recentRecordIdV2: json['recent_record_id_v2'] as String?,
-        recordNumV2: json['record_num_v2'] as int?,
-        recordLiveTime: json['record_live_time'] as int?,
-        areaNameV2: json['area_name_v2'] as String?,
-        roomNews: json['room_news'] as String?,
-        sw1tch: json['switch'] as bool?,
-        watchIcon: json['watch_icon'] as String?,
-        textSmall: json['text_small'] as String?,
-        roomCover: json['room_cover'] as String?,
-        parentAreaId: json['parent_area_id'] as int?,
-        areaId: json['area_id'] as int?,
-      );
+    roomid: json['roomid'] as int?,
+    uid: json['uid'] as int?,
+    uname: json['uname'] as String?,
+    title: json['title'] as String?,
+    face: json['face'] as String?,
+    liveStatus: json['live_status'] as int?,
+    recordNum: json['record_num'] as int?,
+    recentRecordId: json['recent_record_id'] as String?,
+    isAttention: json['is_attention'] as int?,
+    clipnum: json['clipnum'] as int?,
+    fansNum: json['fans_num'] as int?,
+    areaName: json['area_name'] as String?,
+    areaValue: json['area_value'] as String?,
+    tags: json['tags'] as String?,
+    recentRecordIdV2: json['recent_record_id_v2'] as String?,
+    recordNumV2: json['record_num_v2'] as int?,
+    recordLiveTime: json['record_live_time'] as int?,
+    areaNameV2: json['area_name_v2'] as String?,
+    roomNews: json['room_news'] as String?,
+    sw1tch: json['switch'] as bool?,
+    watchIcon: json['watch_icon'] as String?,
+    textSmall: json['text_small'] as String?,
+    roomCover: json['room_cover'] as String?,
+    parentAreaId: json['parent_area_id'] as int?,
+    areaId: json['area_id'] as int?,
+  );
 }
diff --git a/lib/models_new/live/live_room_info_h5/anchor_info.dart b/lib/models_new/live/live_room_info_h5/anchor_info.dart
index 31fc21931..2194a0491 100644
--- a/lib/models_new/live/live_room_info_h5/anchor_info.dart
+++ b/lib/models_new/live/live_room_info_h5/anchor_info.dart
@@ -8,12 +8,11 @@ class AnchorInfo {
   AnchorInfo({this.baseInfo, this.relationInfo});
 
   factory AnchorInfo.fromJson(Map<String, dynamic> json) => AnchorInfo(
-        baseInfo: json['base_info'] == null
-            ? null
-            : BaseInfo.fromJson(json['base_info'] as Map<String, dynamic>),
-        relationInfo: json['relation_info'] == null
-            ? null
-            : RelationInfo.fromJson(
-                json['relation_info'] as Map<String, dynamic>),
-      );
+    baseInfo: json['base_info'] == null
+        ? null
+        : BaseInfo.fromJson(json['base_info'] as Map<String, dynamic>),
+    relationInfo: json['relation_info'] == null
+        ? null
+        : RelationInfo.fromJson(json['relation_info'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/live/live_room_info_h5/area_mask_info.dart b/lib/models_new/live/live_room_info_h5/area_mask_info.dart
index 517725a9f..c0064b5e0 100644
--- a/lib/models_new/live/live_room_info_h5/area_mask_info.dart
+++ b/lib/models_new/live/live_room_info_h5/area_mask_info.dart
@@ -6,8 +6,8 @@ class AreaMaskInfo {
   AreaMaskInfo({this.areaMasks});
 
   factory AreaMaskInfo.fromJson(Map<String, dynamic> json) => AreaMaskInfo(
-        areaMasks: json['area_masks'] == null
-            ? null
-            : AreaMasks.fromJson(json['area_masks'] as Map<String, dynamic>),
-      );
+    areaMasks: json['area_masks'] == null
+        ? null
+        : AreaMasks.fromJson(json['area_masks'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/live/live_room_info_h5/area_masks.dart b/lib/models_new/live/live_room_info_h5/area_masks.dart
index b5748329d..5b4a4d13a 100644
--- a/lib/models_new/live/live_room_info_h5/area_masks.dart
+++ b/lib/models_new/live/live_room_info_h5/area_masks.dart
@@ -6,8 +6,8 @@ class AreaMasks {
   AreaMasks({this.horizontalMasks, this.verticalMasks, this.fullMask});
 
   factory AreaMasks.fromJson(Map<String, dynamic> json) => AreaMasks(
-        horizontalMasks: json['horizontal_masks'] as dynamic,
-        verticalMasks: json['vertical_masks'] as dynamic,
-        fullMask: json['full_mask'] as dynamic,
-      );
+    horizontalMasks: json['horizontal_masks'] as dynamic,
+    verticalMasks: json['vertical_masks'] as dynamic,
+    fullMask: json['full_mask'] as dynamic,
+  );
 }
diff --git a/lib/models_new/live/live_room_info_h5/base_info.dart b/lib/models_new/live/live_room_info_h5/base_info.dart
index 26590ea91..03d669f7d 100644
--- a/lib/models_new/live/live_room_info_h5/base_info.dart
+++ b/lib/models_new/live/live_room_info_h5/base_info.dart
@@ -8,11 +8,10 @@ class BaseInfo {
   BaseInfo({this.uname, this.face, this.officialInfo});
 
   factory BaseInfo.fromJson(Map<String, dynamic> json) => BaseInfo(
-        uname: json['uname'] as String?,
-        face: json['face'] as String?,
-        officialInfo: json['official_info'] == null
-            ? null
-            : OfficialInfo.fromJson(
-                json['official_info'] as Map<String, dynamic>),
-      );
+    uname: json['uname'] as String?,
+    face: json['face'] as String?,
+    officialInfo: json['official_info'] == null
+        ? null
+        : OfficialInfo.fromJson(json['official_info'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/live/live_room_info_h5/block_info.dart b/lib/models_new/live/live_room_info_h5/block_info.dart
index 182a95c83..463d03d36 100644
--- a/lib/models_new/live/live_room_info_h5/block_info.dart
+++ b/lib/models_new/live/live_room_info_h5/block_info.dart
@@ -6,8 +6,8 @@ class BlockInfo {
   BlockInfo({this.block, this.desc, this.business});
 
   factory BlockInfo.fromJson(Map<String, dynamic> json) => BlockInfo(
-        block: json['block'] as bool?,
-        desc: json['desc'] as String?,
-        business: json['business'] as int?,
-      );
+    block: json['block'] as bool?,
+    desc: json['desc'] as String?,
+    business: json['business'] as int?,
+  );
 }
diff --git a/lib/models_new/live/live_room_info_h5/data.dart b/lib/models_new/live/live_room_info_h5/data.dart
index e3477246a..be4bcb791 100644
--- a/lib/models_new/live/live_room_info_h5/data.dart
+++ b/lib/models_new/live/live_room_info_h5/data.dart
@@ -36,35 +36,34 @@ class RoomInfoH5Data {
   });
 
   factory RoomInfoH5Data.fromJson(Map<String, dynamic> json) => RoomInfoH5Data(
-        roomInfo: json['room_info'] == null
-            ? null
-            : RoomInfo.fromJson(json['room_info'] as Map<String, dynamic>),
-        anchorInfo: json['anchor_info'] == null
-            ? null
-            : AnchorInfo.fromJson(json['anchor_info'] as Map<String, dynamic>),
-        newSwitchInfo: json['new_switch_info'] == null
-            ? null
-            : NewSwitchInfo.fromJson(
-                json['new_switch_info'] as Map<String, dynamic>),
-        bannerInfo: json['banner_info'] as List<dynamic>?,
-        isRoomFeed: json['is_room_feed'] as int?,
-        tabInfo: json['tab_info'] as List<dynamic>?,
-        newsInfo: json['news_info'] == null
-            ? null
-            : NewsInfo.fromJson(json['news_info'] as Map<String, dynamic>),
-        watchedShow: json['watched_show'] == null
-            ? null
-            : WatchedShow.fromJson(
-                json['watched_show'] as Map<String, dynamic>),
-        likeInfoV3: json['like_info_v3'] == null
-            ? null
-            : LikeInfoV3.fromJson(json['like_info_v3'] as Map<String, dynamic>),
-        blockInfo: json['block_info'] == null
-            ? null
-            : BlockInfo.fromJson(json['block_info'] as Map<String, dynamic>),
-        areaMaskInfo: json['area_mask_info'] == null
-            ? null
-            : AreaMaskInfo.fromJson(
-                json['area_mask_info'] as Map<String, dynamic>),
-      );
+    roomInfo: json['room_info'] == null
+        ? null
+        : RoomInfo.fromJson(json['room_info'] as Map<String, dynamic>),
+    anchorInfo: json['anchor_info'] == null
+        ? null
+        : AnchorInfo.fromJson(json['anchor_info'] as Map<String, dynamic>),
+    newSwitchInfo: json['new_switch_info'] == null
+        ? null
+        : NewSwitchInfo.fromJson(
+            json['new_switch_info'] as Map<String, dynamic>,
+          ),
+    bannerInfo: json['banner_info'] as List<dynamic>?,
+    isRoomFeed: json['is_room_feed'] as int?,
+    tabInfo: json['tab_info'] as List<dynamic>?,
+    newsInfo: json['news_info'] == null
+        ? null
+        : NewsInfo.fromJson(json['news_info'] as Map<String, dynamic>),
+    watchedShow: json['watched_show'] == null
+        ? null
+        : WatchedShow.fromJson(json['watched_show'] as Map<String, dynamic>),
+    likeInfoV3: json['like_info_v3'] == null
+        ? null
+        : LikeInfoV3.fromJson(json['like_info_v3'] as Map<String, dynamic>),
+    blockInfo: json['block_info'] == null
+        ? null
+        : BlockInfo.fromJson(json['block_info'] as Map<String, dynamic>),
+    areaMaskInfo: json['area_mask_info'] == null
+        ? null
+        : AreaMaskInfo.fromJson(json['area_mask_info'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/live/live_room_info_h5/frame.dart b/lib/models_new/live/live_room_info_h5/frame.dart
index 18e76e79a..1cbcde06d 100644
--- a/lib/models_new/live/live_room_info_h5/frame.dart
+++ b/lib/models_new/live/live_room_info_h5/frame.dart
@@ -6,8 +6,8 @@ class Frame {
   Frame({this.name, this.value, this.desc});
 
   factory Frame.fromJson(Map<String, dynamic> json) => Frame(
-        name: json['name'] as String?,
-        value: json['value'] as String?,
-        desc: json['desc'] as String?,
-      );
+    name: json['name'] as String?,
+    value: json['value'] as String?,
+    desc: json['desc'] as String?,
+  );
 }
diff --git a/lib/models_new/live/live_room_info_h5/like_info_v3.dart b/lib/models_new/live/live_room_info_h5/like_info_v3.dart
index c7d47632a..ffcaf268e 100644
--- a/lib/models_new/live/live_room_info_h5/like_info_v3.dart
+++ b/lib/models_new/live/live_room_info_h5/like_info_v3.dart
@@ -44,25 +44,25 @@ class LikeInfoV3 {
   });
 
   factory LikeInfoV3.fromJson(Map<String, dynamic> json) => LikeInfoV3(
-        totalLikes: json['total_likes'] as int?,
-        clickBlock: json['click_block'] as bool?,
-        countBlock: json['count_block'] as bool?,
-        guildEmoText: json['guild_emo_text'] as String?,
-        guildDmText: json['guild_dm_text'] as String?,
-        likeDmText: json['like_dm_text'] as String?,
-        handIcons: (json['hand_icons'] as List?)?.cast(),
-        dmIcons: (json['dm_icons'] as List?)?.cast(),
-        eggshellsIcon: json['eggshells_icon'] as String?,
-        countShowTime: json['count_show_time'] as int?,
-        processIcon: json['process_icon'] as String?,
-        processColor: json['process_color'] as String?,
-        reportClickLimit: json['report_click_limit'] as int?,
-        reportTimeMin: json['report_time_min'] as int?,
-        reportTimeMax: json['report_time_max'] as int?,
-        icon: json['icon'] as String?,
-        cooldown: (json['cooldown'] as num?)?.toDouble(),
-        handUseFace: json['hand_use_face'] as bool?,
-        guideIconUrls: (json['guide_icon_urls'] as List?)?.cast(),
-        guideIconRatio: (json['guide_icon_ratio'] as num?)?.toDouble(),
-      );
+    totalLikes: json['total_likes'] as int?,
+    clickBlock: json['click_block'] as bool?,
+    countBlock: json['count_block'] as bool?,
+    guildEmoText: json['guild_emo_text'] as String?,
+    guildDmText: json['guild_dm_text'] as String?,
+    likeDmText: json['like_dm_text'] as String?,
+    handIcons: (json['hand_icons'] as List?)?.cast(),
+    dmIcons: (json['dm_icons'] as List?)?.cast(),
+    eggshellsIcon: json['eggshells_icon'] as String?,
+    countShowTime: json['count_show_time'] as int?,
+    processIcon: json['process_icon'] as String?,
+    processColor: json['process_color'] as String?,
+    reportClickLimit: json['report_click_limit'] as int?,
+    reportTimeMin: json['report_time_min'] as int?,
+    reportTimeMax: json['report_time_max'] as int?,
+    icon: json['icon'] as String?,
+    cooldown: (json['cooldown'] as num?)?.toDouble(),
+    handUseFace: json['hand_use_face'] as bool?,
+    guideIconUrls: (json['guide_icon_urls'] as List?)?.cast(),
+    guideIconRatio: (json['guide_icon_ratio'] as num?)?.toDouble(),
+  );
 }
diff --git a/lib/models_new/live/live_room_info_h5/new_switch_info.dart b/lib/models_new/live/live_room_info_h5/new_switch_info.dart
index 2f02d17e9..a25db32cb 100644
--- a/lib/models_new/live/live_room_info_h5/new_switch_info.dart
+++ b/lib/models_new/live/live_room_info_h5/new_switch_info.dart
@@ -16,11 +16,11 @@ class NewSwitchInfo {
   });
 
   factory NewSwitchInfo.fromJson(Map<String, dynamic> json) => NewSwitchInfo(
-        roomInfoPopularity: json['room-info-popularity'] as int?,
-        roomTab: json['room-tab'] as int?,
-        roomPlayerWatermark: json['room-player-watermark'] as int?,
-        roomRecommendLiveOff: json['room-recommend-live_off'] as int?,
-        brandUserCardSwitch: json['brand-user-card-switch'] as int?,
-        brandFollowSwitch: json['brand-follow-switch'] as int?,
-      );
+    roomInfoPopularity: json['room-info-popularity'] as int?,
+    roomTab: json['room-tab'] as int?,
+    roomPlayerWatermark: json['room-player-watermark'] as int?,
+    roomRecommendLiveOff: json['room-recommend-live_off'] as int?,
+    brandUserCardSwitch: json['brand-user-card-switch'] as int?,
+    brandFollowSwitch: json['brand-follow-switch'] as int?,
+  );
 }
diff --git a/lib/models_new/live/live_room_info_h5/news_info.dart b/lib/models_new/live/live_room_info_h5/news_info.dart
index e1ebf398c..c42010d33 100644
--- a/lib/models_new/live/live_room_info_h5/news_info.dart
+++ b/lib/models_new/live/live_room_info_h5/news_info.dart
@@ -6,8 +6,8 @@ class NewsInfo {
   NewsInfo({this.uid, this.ctime, this.content});
 
   factory NewsInfo.fromJson(Map<String, dynamic> json) => NewsInfo(
-        uid: json['uid'] as int?,
-        ctime: json['ctime'] as String?,
-        content: json['content'] as String?,
-      );
+    uid: json['uid'] as int?,
+    ctime: json['ctime'] as String?,
+    content: json['content'] as String?,
+  );
 }
diff --git a/lib/models_new/live/live_room_info_h5/official_info.dart b/lib/models_new/live/live_room_info_h5/official_info.dart
index ced8968d5..426b69636 100644
--- a/lib/models_new/live/live_room_info_h5/official_info.dart
+++ b/lib/models_new/live/live_room_info_h5/official_info.dart
@@ -14,10 +14,10 @@ class OfficialInfo {
   });
 
   factory OfficialInfo.fromJson(Map<String, dynamic> json) => OfficialInfo(
-        role: json['role'] as int?,
-        title: json['title'] as String?,
-        desc: json['desc'] as String?,
-        isNft: json['is_nft'] as int?,
-        nftDmark: json['nft_dmark'] as String?,
-      );
+    role: json['role'] as int?,
+    title: json['title'] as String?,
+    desc: json['desc'] as String?,
+    isNft: json['is_nft'] as int?,
+    nftDmark: json['nft_dmark'] as String?,
+  );
 }
diff --git a/lib/models_new/live/live_room_info_h5/pendants.dart b/lib/models_new/live/live_room_info_h5/pendants.dart
index 78a312646..e3a25817c 100644
--- a/lib/models_new/live/live_room_info_h5/pendants.dart
+++ b/lib/models_new/live/live_room_info_h5/pendants.dart
@@ -6,8 +6,8 @@ class Pendants {
   Pendants({this.frame});
 
   factory Pendants.fromJson(Map<String, dynamic> json) => Pendants(
-        frame: json['frame'] == null
-            ? null
-            : Frame.fromJson(json['frame'] as Map<String, dynamic>),
-      );
+    frame: json['frame'] == null
+        ? null
+        : Frame.fromJson(json['frame'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/live/live_room_info_h5/relation_info.dart b/lib/models_new/live/live_room_info_h5/relation_info.dart
index a03541e7b..dd15816d0 100644
--- a/lib/models_new/live/live_room_info_h5/relation_info.dart
+++ b/lib/models_new/live/live_room_info_h5/relation_info.dart
@@ -4,6 +4,6 @@ class RelationInfo {
   RelationInfo({this.attention});
 
   factory RelationInfo.fromJson(Map<String, dynamic> json) => RelationInfo(
-        attention: json['attention'] as int?,
-      );
+    attention: json['attention'] as int?,
+  );
 }
diff --git a/lib/models_new/live/live_room_info_h5/room_info.dart b/lib/models_new/live/live_room_info_h5/room_info.dart
index 101141232..26c4cc971 100644
--- a/lib/models_new/live/live_room_info_h5/room_info.dart
+++ b/lib/models_new/live/live_room_info_h5/room_info.dart
@@ -42,25 +42,25 @@ class RoomInfo {
   });
 
   factory RoomInfo.fromJson(Map<String, dynamic> json) => RoomInfo(
-        uid: json['uid'] as int?,
-        roomId: json['room_id'] as int?,
-        title: json['title'] as String?,
-        cover: json['cover'] as String?,
-        description: json['description'] as String?,
-        liveStatus: json['live_status'] as int?,
-        liveStartTime: json['live_start_time'] as int?,
-        areaId: json['area_id'] as int?,
-        areaName: json['area_name'] as String?,
-        parentAreaId: json['parent_area_id'] as int?,
-        parentAreaName: json['parent_area_name'] as String?,
-        online: json['online'] as int?,
-        keyframe: json['keyframe'] as String?,
-        background: json['background'] as String?,
-        appBackground: json['app_background'] as String?,
-        pendants: json['pendants'] == null
-            ? null
-            : Pendants.fromJson(json['pendants'] as Map<String, dynamic>),
-        subSessionKey: json['sub_session_key'] as String?,
-        liveId: json['live_id'] as String?,
-      );
+    uid: json['uid'] as int?,
+    roomId: json['room_id'] as int?,
+    title: json['title'] as String?,
+    cover: json['cover'] as String?,
+    description: json['description'] as String?,
+    liveStatus: json['live_status'] as int?,
+    liveStartTime: json['live_start_time'] as int?,
+    areaId: json['area_id'] as int?,
+    areaName: json['area_name'] as String?,
+    parentAreaId: json['parent_area_id'] as int?,
+    parentAreaName: json['parent_area_name'] as String?,
+    online: json['online'] as int?,
+    keyframe: json['keyframe'] as String?,
+    background: json['background'] as String?,
+    appBackground: json['app_background'] as String?,
+    pendants: json['pendants'] == null
+        ? null
+        : Pendants.fromJson(json['pendants'] as Map<String, dynamic>),
+    subSessionKey: json['sub_session_key'] as String?,
+    liveId: json['live_id'] as String?,
+  );
 }
diff --git a/lib/models_new/live/live_room_play_info/codec.dart b/lib/models_new/live/live_room_play_info/codec.dart
index dbcb77721..c8a082f1c 100644
--- a/lib/models_new/live/live_room_play_info/codec.dart
+++ b/lib/models_new/live/live_room_play_info/codec.dart
@@ -24,16 +24,16 @@ class CodecItem {
   });
 
   factory CodecItem.fromJson(Map<String, dynamic> json) => CodecItem(
-        codecName: json['codec_name'] as String?,
-        currentQn: json['current_qn'] as int?,
-        acceptQn: (json['accept_qn'] as List?)?.cast(),
-        baseUrl: json['base_url'] as String?,
-        urlInfo: (json['url_info'] as List<dynamic>?)
-            ?.map((e) => UrlInfo.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        hdrQn: json['hdr_qn'] as dynamic,
-        dolbyType: json['dolby_type'] as int?,
-        attrName: json['attr_name'] as String?,
-        hdrType: json['hdr_type'] as int?,
-      );
+    codecName: json['codec_name'] as String?,
+    currentQn: json['current_qn'] as int?,
+    acceptQn: (json['accept_qn'] as List?)?.cast(),
+    baseUrl: json['base_url'] as String?,
+    urlInfo: (json['url_info'] as List<dynamic>?)
+        ?.map((e) => UrlInfo.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    hdrQn: json['hdr_qn'] as dynamic,
+    dolbyType: json['dolby_type'] as int?,
+    attrName: json['attr_name'] as String?,
+    hdrType: json['hdr_type'] as int?,
+  );
 }
diff --git a/lib/models_new/live/live_room_play_info/data.dart b/lib/models_new/live/live_room_play_info/data.dart
index 6f3b8c41e..d4059ea35 100644
--- a/lib/models_new/live/live_room_play_info/data.dart
+++ b/lib/models_new/live/live_room_play_info/data.dart
@@ -66,7 +66,8 @@ class RoomPlayInfoData {
         playurlInfo: json['playurl_info'] == null
             ? null
             : PlayurlInfo.fromJson(
-                json['playurl_info'] as Map<String, dynamic>),
+                json['playurl_info'] as Map<String, dynamic>,
+              ),
         officialType: json['official_type'] as int?,
         officialRoomId: json['official_room_id'] as int?,
         riskWithDelay: json['risk_with_delay'] as int?,
diff --git a/lib/models_new/live/live_room_play_info/format.dart b/lib/models_new/live/live_room_play_info/format.dart
index 565ef6164..25d0578d8 100644
--- a/lib/models_new/live/live_room_play_info/format.dart
+++ b/lib/models_new/live/live_room_play_info/format.dart
@@ -8,10 +8,10 @@ class Format {
   Format({this.formatName, this.codec, this.masterUrl});
 
   factory Format.fromJson(Map<String, dynamic> json) => Format(
-        formatName: json['format_name'] as String?,
-        codec: (json['codec'] as List<dynamic>?)
-            ?.map((e) => CodecItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        masterUrl: json['master_url'] as String?,
-      );
+    formatName: json['format_name'] as String?,
+    codec: (json['codec'] as List<dynamic>?)
+        ?.map((e) => CodecItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    masterUrl: json['master_url'] as String?,
+  );
 }
diff --git a/lib/models_new/live/live_room_play_info/g_qn_desc.dart b/lib/models_new/live/live_room_play_info/g_qn_desc.dart
index 49d29a258..9992d08d8 100644
--- a/lib/models_new/live/live_room_play_info/g_qn_desc.dart
+++ b/lib/models_new/live/live_room_play_info/g_qn_desc.dart
@@ -16,11 +16,11 @@ class GQnDesc {
   });
 
   factory GQnDesc.fromJson(Map<String, dynamic> json) => GQnDesc(
-        qn: json['qn'] as int?,
-        desc: json['desc'] as String?,
-        hdrDesc: json['hdr_desc'] as String?,
-        attrDesc: json['attr_desc'] as dynamic,
-        hdrType: json['hdr_type'] as int?,
-        mediaBaseDesc: json['media_base_desc'] as dynamic,
-      );
+    qn: json['qn'] as int?,
+    desc: json['desc'] as String?,
+    hdrDesc: json['hdr_desc'] as String?,
+    attrDesc: json['attr_desc'] as dynamic,
+    hdrType: json['hdr_type'] as int?,
+    mediaBaseDesc: json['media_base_desc'] as dynamic,
+  );
 }
diff --git a/lib/models_new/live/live_room_play_info/p2p_data.dart b/lib/models_new/live/live_room_play_info/p2p_data.dart
index 512618b53..e2a1b1f0c 100644
--- a/lib/models_new/live/live_room_play_info/p2p_data.dart
+++ b/lib/models_new/live/live_room_play_info/p2p_data.dart
@@ -7,9 +7,9 @@ class P2pData {
   P2pData({this.p2p, this.p2pType, this.mP2p, this.mServers});
 
   factory P2pData.fromJson(Map<String, dynamic> json) => P2pData(
-        p2p: json['p2p'] as bool?,
-        p2pType: json['p2p_type'] as int?,
-        mP2p: json['m_p2p'] as bool?,
-        mServers: json['m_servers'] as dynamic,
-      );
+    p2p: json['p2p'] as bool?,
+    p2pType: json['p2p_type'] as int?,
+    mP2p: json['m_p2p'] as bool?,
+    mServers: json['m_servers'] as dynamic,
+  );
 }
diff --git a/lib/models_new/live/live_room_play_info/playurl.dart b/lib/models_new/live/live_room_play_info/playurl.dart
index d062aa406..60d0b982e 100644
--- a/lib/models_new/live/live_room_play_info/playurl.dart
+++ b/lib/models_new/live/live_room_play_info/playurl.dart
@@ -18,16 +18,16 @@ class Playurl {
   });
 
   factory Playurl.fromJson(Map<String, dynamic> json) => Playurl(
-        cid: json['cid'] as int?,
-        gQnDesc: (json['g_qn_desc'] as List<dynamic>?)
-            ?.map((e) => GQnDesc.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        stream: (json['stream'] as List<dynamic>?)
-            ?.map((e) => Stream.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        p2pData: json['p2p_data'] == null
-            ? null
-            : P2pData.fromJson(json['p2p_data'] as Map<String, dynamic>),
-        dolbyQn: json['dolby_qn'] as dynamic,
-      );
+    cid: json['cid'] as int?,
+    gQnDesc: (json['g_qn_desc'] as List<dynamic>?)
+        ?.map((e) => GQnDesc.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    stream: (json['stream'] as List<dynamic>?)
+        ?.map((e) => Stream.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    p2pData: json['p2p_data'] == null
+        ? null
+        : P2pData.fromJson(json['p2p_data'] as Map<String, dynamic>),
+    dolbyQn: json['dolby_qn'] as dynamic,
+  );
 }
diff --git a/lib/models_new/live/live_room_play_info/playurl_info.dart b/lib/models_new/live/live_room_play_info/playurl_info.dart
index 1b07c5959..d2ed789c9 100644
--- a/lib/models_new/live/live_room_play_info/playurl_info.dart
+++ b/lib/models_new/live/live_room_play_info/playurl_info.dart
@@ -15,14 +15,15 @@ class PlayurlInfo {
   });
 
   factory PlayurlInfo.fromJson(Map<String, dynamic> json) => PlayurlInfo(
-        confJson: json['conf_json'] as String?,
-        playurl: json['playurl'] == null
-            ? null
-            : Playurl.fromJson(json['playurl'] as Map<String, dynamic>),
-        expectedQuality: json['expected_quality'] == null
-            ? null
-            : ExpectedQuality.fromJson(
-                json['expected_quality'] as Map<String, dynamic>),
-        qnDescMoreAb: json['qn_desc_more_ab'] as int?,
-      );
+    confJson: json['conf_json'] as String?,
+    playurl: json['playurl'] == null
+        ? null
+        : Playurl.fromJson(json['playurl'] as Map<String, dynamic>),
+    expectedQuality: json['expected_quality'] == null
+        ? null
+        : ExpectedQuality.fromJson(
+            json['expected_quality'] as Map<String, dynamic>,
+          ),
+    qnDescMoreAb: json['qn_desc_more_ab'] as int?,
+  );
 }
diff --git a/lib/models_new/live/live_room_play_info/stream.dart b/lib/models_new/live/live_room_play_info/stream.dart
index 37e6ca721..189d6edde 100644
--- a/lib/models_new/live/live_room_play_info/stream.dart
+++ b/lib/models_new/live/live_room_play_info/stream.dart
@@ -7,9 +7,9 @@ class Stream {
   Stream({this.protocolName, this.format});
 
   factory Stream.fromJson(Map<String, dynamic> json) => Stream(
-        protocolName: json['protocol_name'] as String?,
-        format: (json['format'] as List<dynamic>?)
-            ?.map((e) => Format.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    protocolName: json['protocol_name'] as String?,
+    format: (json['format'] as List<dynamic>?)
+        ?.map((e) => Format.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/live/live_room_play_info/url_info.dart b/lib/models_new/live/live_room_play_info/url_info.dart
index 1f47612c4..1252553a0 100644
--- a/lib/models_new/live/live_room_play_info/url_info.dart
+++ b/lib/models_new/live/live_room_play_info/url_info.dart
@@ -6,8 +6,8 @@ class UrlInfo {
   UrlInfo({this.host, this.extra, this.streamTtl});
 
   factory UrlInfo.fromJson(Map<String, dynamic> json) => UrlInfo(
-        host: json['host'] as String?,
-        extra: json['extra'] as String?,
-        streamTtl: json['stream_ttl'] as int?,
-      );
+    host: json['host'] as String?,
+    extra: json['extra'] as String?,
+    streamTtl: json['stream_ttl'] as int?,
+  );
 }
diff --git a/lib/models_new/live/live_search/data.dart b/lib/models_new/live/live_search/data.dart
index ddf9607a7..135081949 100644
--- a/lib/models_new/live/live_search/data.dart
+++ b/lib/models_new/live/live_search/data.dart
@@ -23,17 +23,17 @@ class LiveSearchData {
   });
 
   factory LiveSearchData.fromJson(Map<String, dynamic> json) => LiveSearchData(
-        type: json['type'] as String?,
-        page: json['page'] as int?,
-        pagesize: json['pagesize'] as int?,
-        room: json['room'] == null
-            ? null
-            : Room.fromJson(json['room'] as Map<String, dynamic>),
-        user: json['user'] == null
-            ? null
-            : User.fromJson(json['user'] as Map<String, dynamic>),
-        trackId: json['track_id'] as String?,
-        abtestId: json['abtest_id'] as String?,
-        query: json['query'] as String?,
-      );
+    type: json['type'] as String?,
+    page: json['page'] as int?,
+    pagesize: json['pagesize'] as int?,
+    room: json['room'] == null
+        ? null
+        : Room.fromJson(json['room'] as Map<String, dynamic>),
+    user: json['user'] == null
+        ? null
+        : User.fromJson(json['user'] as Map<String, dynamic>),
+    trackId: json['track_id'] as String?,
+    abtestId: json['abtest_id'] as String?,
+    query: json['query'] as String?,
+  );
 }
diff --git a/lib/models_new/live/live_search/live_search.dart b/lib/models_new/live/live_search/live_search.dart
index f1340e592..867b269cd 100644
--- a/lib/models_new/live/live_search/live_search.dart
+++ b/lib/models_new/live/live_search/live_search.dart
@@ -9,11 +9,11 @@ class LiveSearch {
   LiveSearch({this.code, this.message, this.ttl, this.data});
 
   factory LiveSearch.fromJson(Map<String, dynamic> json) => LiveSearch(
-        code: json['code'] as int?,
-        message: json['message'] as String?,
-        ttl: json['ttl'] as int?,
-        data: json['data'] == null
-            ? null
-            : LiveSearchData.fromJson(json['data'] as Map<String, dynamic>),
-      );
+    code: json['code'] as int?,
+    message: json['message'] as String?,
+    ttl: json['ttl'] as int?,
+    data: json['data'] == null
+        ? null
+        : LiveSearchData.fromJson(json['data'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/live/live_search/room.dart b/lib/models_new/live/live_search/room.dart
index 80d2fe8c0..a1ada0973 100644
--- a/lib/models_new/live/live_search/room.dart
+++ b/lib/models_new/live/live_search/room.dart
@@ -8,11 +8,12 @@ class Room {
   Room({this.list, this.totalRoom, this.totalPage});
 
   factory Room.fromJson(Map<String, dynamic> json) => Room(
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) =>
-                LiveSearchRoomItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        totalRoom: json['total_room'] as int?,
-        totalPage: json['total_page'] as int?,
-      );
+    list: (json['list'] as List<dynamic>?)
+        ?.map(
+          (e) => LiveSearchRoomItemModel.fromJson(e as Map<String, dynamic>),
+        )
+        .toList(),
+    totalRoom: json['total_room'] as int?,
+    totalPage: json['total_page'] as int?,
+  );
 }
diff --git a/lib/models_new/live/live_search/room_item.dart b/lib/models_new/live/live_search/room_item.dart
index 92ffcedbf..6a2e97046 100644
--- a/lib/models_new/live/live_search/room_item.dart
+++ b/lib/models_new/live/live_search/room_item.dart
@@ -33,6 +33,7 @@ class LiveSearchRoomItemModel {
         watchedShow: json['watched_show'] == null
             ? null
             : WatchedShow.fromJson(
-                json['watched_show'] as Map<String, dynamic>),
+                json['watched_show'] as Map<String, dynamic>,
+              ),
       );
 }
diff --git a/lib/models_new/live/live_search/user.dart b/lib/models_new/live/live_search/user.dart
index aa844d5b0..54f348723 100644
--- a/lib/models_new/live/live_search/user.dart
+++ b/lib/models_new/live/live_search/user.dart
@@ -8,10 +8,10 @@ class User {
   User({this.list, this.totalUser, this.totalPage});
 
   factory User.fromJson(Map<String, dynamic> json) => User(
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => LiveSearchUserItemModel.fromJson(e))
-            .toList(),
-        totalUser: json['total_user'] as int?,
-        totalPage: json['total_page'] as int?,
-      );
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => LiveSearchUserItemModel.fromJson(e))
+        .toList(),
+    totalUser: json['total_user'] as int?,
+    totalPage: json['total_page'] as int?,
+  );
 }
diff --git a/lib/models_new/live/live_second_list/data.dart b/lib/models_new/live/live_second_list/data.dart
index 1aa73abbd..b0ce70b5b 100644
--- a/lib/models_new/live/live_second_list/data.dart
+++ b/lib/models_new/live/live_second_list/data.dart
@@ -13,12 +13,12 @@ class LiveSecondData {
   });
 
   factory LiveSecondData.fromJson(Map<String, dynamic> json) => LiveSecondData(
-        count: json['count'] as int?,
-        cardList: (json['list'] as List<dynamic>?)
-            ?.map((e) => CardLiveItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        newTags: (json['new_tags'] as List<dynamic>?)
-            ?.map((e) => LiveSecondTag.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    count: json['count'] as int?,
+    cardList: (json['list'] as List<dynamic>?)
+        ?.map((e) => CardLiveItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    newTags: (json['new_tags'] as List<dynamic>?)
+        ?.map((e) => LiveSecondTag.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/live/live_second_list/tag.dart b/lib/models_new/live/live_second_list/tag.dart
index e617c12c9..ed6ecde86 100644
--- a/lib/models_new/live/live_second_list/tag.dart
+++ b/lib/models_new/live/live_second_list/tag.dart
@@ -10,8 +10,8 @@ class LiveSecondTag {
   });
 
   factory LiveSecondTag.fromJson(Map json) => LiveSecondTag(
-        id: json['id'],
-        name: json['name'],
-        sortType: json['sort_type'],
-      );
+    id: json['id'],
+    name: json['name'],
+    sortType: json['sort_type'],
+  );
 }
diff --git a/lib/models_new/login_log/data.dart b/lib/models_new/login_log/data.dart
index ca3a19e08..18edab6ee 100644
--- a/lib/models_new/login_log/data.dart
+++ b/lib/models_new/login_log/data.dart
@@ -7,9 +7,9 @@ class LoginLogData {
   LoginLogData({this.count, this.list});
 
   factory LoginLogData.fromJson(Map<String, dynamic> json) => LoginLogData(
-        count: json['count'] as int?,
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => LoginLogItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    count: json['count'] as int?,
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => LoginLogItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/login_log/list.dart b/lib/models_new/login_log/list.dart
index eff2e87c2..28a6d1028 100644
--- a/lib/models_new/login_log/list.dart
+++ b/lib/models_new/login_log/list.dart
@@ -16,11 +16,11 @@ class LoginLogItem {
   });
 
   factory LoginLogItem.fromJson(Map<String, dynamic> json) => LoginLogItem(
-        ip: json['ip'] ?? '',
-        time: json['time'] as int?,
-        timeAt: json['time_at'] ?? '',
-        status: json['status'] as bool?,
-        type: json['type'] as int?,
-        geo: json['geo'] ?? '',
-      );
+    ip: json['ip'] ?? '',
+    time: json['time'] as int?,
+    timeAt: json['time_at'] ?? '',
+    status: json['status'] as bool?,
+    type: json['type'] as int?,
+    geo: json['geo'] ?? '',
+  );
 }
diff --git a/lib/models_new/match/match_info/contest.dart b/lib/models_new/match/match_info/contest.dart
index 99ee58c7a..e3dad8056 100644
--- a/lib/models_new/match/match_info/contest.dart
+++ b/lib/models_new/match/match_info/contest.dart
@@ -135,81 +135,82 @@ class MatchContest {
   });
 
   factory MatchContest.fromJson(Map<String, dynamic> json) => MatchContest(
-        id: json['id'] as int?,
-        gameStage: json['game_stage'] as String?,
-        stime: json['stime'] as int?,
-        etime: json['etime'] as int?,
-        homeId: json['home_id'] as int?,
-        awayId: json['away_id'] as int?,
-        homeScore: json['home_score'] as int?,
-        awayScore: json['away_score'] as int?,
-        liveRoom: json['live_room'] as int?,
-        aid: json['aid'] as int?,
-        collection: json['collection'] as int?,
-        collectionBvid: json['collection_bvid'] as String?,
-        gameState: json['game_state'] as int?,
-        dic: json['dic'] as String?,
-        ctime: json['ctime'] as String?,
-        mtime: json['mtime'] as String?,
-        status: json['status'] as int?,
-        sid: json['sid'] as int?,
-        mid: json['mid'] as int?,
-        season: json['season'] == null
-            ? null
-            : Season.fromJson(json['season'] as Map<String, dynamic>),
-        homeTeam: json['home_team'] == null
-            ? null
-            : MatchTeam.fromJson(json['home_team'] as Map<String, dynamic>),
-        awayTeam: json['away_team'] == null
-            ? null
-            : MatchTeam.fromJson(json['away_team'] as Map<String, dynamic>),
-        special: json['special'] as int?,
-        successTeam: json['success_team'] as int?,
-        successTeaminfo: json['success_teaminfo'] == null
-            ? null
-            : SuccessTeaminfo.fromJson(
-                json['success_teaminfo'] as Map<String, dynamic>),
-        specialName: json['special_name'] as String?,
-        specialTips: json['special_tips'] as String?,
-        specialImage: json['special_image'] as String?,
-        playback: json['playback'] as String?,
-        collectionUrl: json['collection_url'] as String?,
-        liveUrl: json['live_url'] as String?,
-        dataType: json['data_type'] as int?,
-        matchId: json['match_id'] as int?,
-        guessType: json['guess_type'] as int?,
-        guessShow: json['guess_show'] as int?,
-        bvid: json['bvid'] as String?,
-        gameStage1: json['game_stage1'] as String?,
-        gameStage2: json['game_stage2'] as String?,
-        liveStatus: json['live_status'] as int?,
-        livePopular: json['live_popular'] as int?,
-        liveCover: json['live_cover'] as String?,
-        pushSwitch: json['push_switch'] as int?,
-        liveTitle: json['live_title'] as String?,
-        seriesId: json['series_id'] as int?,
-        contestStatus: json['contest_status'] as int?,
-        contestFreeze: json['contest_freeze'] as int?,
-        startTime: json['start_time'] as int?,
-        endTime: json['end_time'] as int?,
-        title: json['title'] as String?,
-        playBack: json['play_back'] as String?,
-        seasonId: json['season_id'] as int?,
-        isSub: json['is_sub'] as int?,
-        isGuess: json['is_guess'] as int?,
-        home: json['home'] == null
-            ? null
-            : HomeAway.fromJson(json['home'] as Map<String, dynamic>),
-        away: json['away'] == null
-            ? null
-            : HomeAway.fromJson(json['away'] as Map<String, dynamic>),
-        series: json['series'] as dynamic,
-        prospect: json['prospect'] as String?,
-        afterContestVideo: json['after_contest_video'] as String?,
-        homeSmallScore: json['home_small_score'] as int?,
-        awaySmallScore: json['away_small_score'] as int?,
-        watchPoint: json['watch_point'] as String?,
-        watchPointIcon: json['watch_point_icon'] as String?,
-        hottestPlayer: json['hottest_player'] as dynamic,
-      );
+    id: json['id'] as int?,
+    gameStage: json['game_stage'] as String?,
+    stime: json['stime'] as int?,
+    etime: json['etime'] as int?,
+    homeId: json['home_id'] as int?,
+    awayId: json['away_id'] as int?,
+    homeScore: json['home_score'] as int?,
+    awayScore: json['away_score'] as int?,
+    liveRoom: json['live_room'] as int?,
+    aid: json['aid'] as int?,
+    collection: json['collection'] as int?,
+    collectionBvid: json['collection_bvid'] as String?,
+    gameState: json['game_state'] as int?,
+    dic: json['dic'] as String?,
+    ctime: json['ctime'] as String?,
+    mtime: json['mtime'] as String?,
+    status: json['status'] as int?,
+    sid: json['sid'] as int?,
+    mid: json['mid'] as int?,
+    season: json['season'] == null
+        ? null
+        : Season.fromJson(json['season'] as Map<String, dynamic>),
+    homeTeam: json['home_team'] == null
+        ? null
+        : MatchTeam.fromJson(json['home_team'] as Map<String, dynamic>),
+    awayTeam: json['away_team'] == null
+        ? null
+        : MatchTeam.fromJson(json['away_team'] as Map<String, dynamic>),
+    special: json['special'] as int?,
+    successTeam: json['success_team'] as int?,
+    successTeaminfo: json['success_teaminfo'] == null
+        ? null
+        : SuccessTeaminfo.fromJson(
+            json['success_teaminfo'] as Map<String, dynamic>,
+          ),
+    specialName: json['special_name'] as String?,
+    specialTips: json['special_tips'] as String?,
+    specialImage: json['special_image'] as String?,
+    playback: json['playback'] as String?,
+    collectionUrl: json['collection_url'] as String?,
+    liveUrl: json['live_url'] as String?,
+    dataType: json['data_type'] as int?,
+    matchId: json['match_id'] as int?,
+    guessType: json['guess_type'] as int?,
+    guessShow: json['guess_show'] as int?,
+    bvid: json['bvid'] as String?,
+    gameStage1: json['game_stage1'] as String?,
+    gameStage2: json['game_stage2'] as String?,
+    liveStatus: json['live_status'] as int?,
+    livePopular: json['live_popular'] as int?,
+    liveCover: json['live_cover'] as String?,
+    pushSwitch: json['push_switch'] as int?,
+    liveTitle: json['live_title'] as String?,
+    seriesId: json['series_id'] as int?,
+    contestStatus: json['contest_status'] as int?,
+    contestFreeze: json['contest_freeze'] as int?,
+    startTime: json['start_time'] as int?,
+    endTime: json['end_time'] as int?,
+    title: json['title'] as String?,
+    playBack: json['play_back'] as String?,
+    seasonId: json['season_id'] as int?,
+    isSub: json['is_sub'] as int?,
+    isGuess: json['is_guess'] as int?,
+    home: json['home'] == null
+        ? null
+        : HomeAway.fromJson(json['home'] as Map<String, dynamic>),
+    away: json['away'] == null
+        ? null
+        : HomeAway.fromJson(json['away'] as Map<String, dynamic>),
+    series: json['series'] as dynamic,
+    prospect: json['prospect'] as String?,
+    afterContestVideo: json['after_contest_video'] as String?,
+    homeSmallScore: json['home_small_score'] as int?,
+    awaySmallScore: json['away_small_score'] as int?,
+    watchPoint: json['watch_point'] as String?,
+    watchPointIcon: json['watch_point_icon'] as String?,
+    hottestPlayer: json['hottest_player'] as dynamic,
+  );
 }
diff --git a/lib/models_new/match/match_info/data.dart b/lib/models_new/match/match_info/data.dart
index 16fc482f0..81787db3d 100644
--- a/lib/models_new/match/match_info/data.dart
+++ b/lib/models_new/match/match_info/data.dart
@@ -6,8 +6,8 @@ class MatchInfoData {
   MatchInfoData({this.contest});
 
   factory MatchInfoData.fromJson(Map<String, dynamic> json) => MatchInfoData(
-        contest: json['contest'] == null
-            ? null
-            : MatchContest.fromJson(json['contest'] as Map<String, dynamic>),
-      );
+    contest: json['contest'] == null
+        ? null
+        : MatchContest.fromJson(json['contest'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/match/match_info/home_away.dart b/lib/models_new/match/match_info/home_away.dart
index 8e3edafd5..727cd046d 100644
--- a/lib/models_new/match/match_info/home_away.dart
+++ b/lib/models_new/match/match_info/home_away.dart
@@ -26,16 +26,16 @@ class HomeAway {
   });
 
   factory HomeAway.fromJson(Map<String, dynamic> json) => HomeAway(
-        id: json['id'] as int?,
-        icon: json['icon'] as String?,
-        name: json['name'] as String?,
-        wins: json['wins'] as int?,
-        region: json['region'] as String?,
-        regionId: json['region_id'] as int?,
-        externalTeamId: json['ExternalTeamId'] as int?,
-        divisionName: json['division_name'] as String?,
-        divisionLogo: json['division_logo'] as String?,
-        playerGradeDetail: json['player_grade_detail'] as dynamic,
-        isSuccessTeam: json['is_success_team'] as bool?,
-      );
+    id: json['id'] as int?,
+    icon: json['icon'] as String?,
+    name: json['name'] as String?,
+    wins: json['wins'] as int?,
+    region: json['region'] as String?,
+    regionId: json['region_id'] as int?,
+    externalTeamId: json['ExternalTeamId'] as int?,
+    divisionName: json['division_name'] as String?,
+    divisionLogo: json['division_logo'] as String?,
+    playerGradeDetail: json['player_grade_detail'] as dynamic,
+    isSuccessTeam: json['is_success_team'] as bool?,
+  );
 }
diff --git a/lib/models_new/match/match_info/season.dart b/lib/models_new/match/match_info/season.dart
index 50eecd54b..70d526e54 100644
--- a/lib/models_new/match/match_info/season.dart
+++ b/lib/models_new/match/match_info/season.dart
@@ -54,30 +54,30 @@ class Season {
   });
 
   factory Season.fromJson(Map<String, dynamic> json) => Season(
-        id: json['id'] as int?,
-        mid: json['mid'] as int?,
-        title: json['title'] as String?,
-        subTitle: json['sub_title'] as String?,
-        stime: json['stime'] as int?,
-        etime: json['etime'] as int?,
-        sponsor: json['sponsor'] as String?,
-        logo: json['logo'] as String?,
-        dic: json['dic'] as String?,
-        status: json['status'] as int?,
-        ctime: json['ctime'] as int?,
-        mtime: json['mtime'] as int?,
-        rank: json['rank'] as int?,
-        isApp: json['is_app'] as int?,
-        url: json['url'] as String?,
-        dataFocus: json['data_focus'] as String?,
-        focusUrl: json['focus_url'] as String?,
-        leidaSid: json['leida_sid'] as int?,
-        gameType: json['game_type'] as int?,
-        searchImage: json['search_image'] as String?,
-        syncPlatform: json['sync_platform'] as int?,
-        centreLogo: json['centre_logo'] as String?,
-        centreStatus: json['centre_status'] as int?,
-        centrePcLogo: json['centre_pc_logo'] as String?,
-        seasonType: json['season_type'] as int?,
-      );
+    id: json['id'] as int?,
+    mid: json['mid'] as int?,
+    title: json['title'] as String?,
+    subTitle: json['sub_title'] as String?,
+    stime: json['stime'] as int?,
+    etime: json['etime'] as int?,
+    sponsor: json['sponsor'] as String?,
+    logo: json['logo'] as String?,
+    dic: json['dic'] as String?,
+    status: json['status'] as int?,
+    ctime: json['ctime'] as int?,
+    mtime: json['mtime'] as int?,
+    rank: json['rank'] as int?,
+    isApp: json['is_app'] as int?,
+    url: json['url'] as String?,
+    dataFocus: json['data_focus'] as String?,
+    focusUrl: json['focus_url'] as String?,
+    leidaSid: json['leida_sid'] as int?,
+    gameType: json['game_type'] as int?,
+    searchImage: json['search_image'] as String?,
+    syncPlatform: json['sync_platform'] as int?,
+    centreLogo: json['centre_logo'] as String?,
+    centreStatus: json['centre_status'] as int?,
+    centrePcLogo: json['centre_pc_logo'] as String?,
+    seasonType: json['season_type'] as int?,
+  );
 }
diff --git a/lib/models_new/match/match_info/team.dart b/lib/models_new/match/match_info/team.dart
index ea0b274f9..e3e7c227f 100644
--- a/lib/models_new/match/match_info/team.dart
+++ b/lib/models_new/match/match_info/team.dart
@@ -42,46 +42,46 @@ class MatchTeam {
   });
 
   factory MatchTeam.fromJson(Map<String, dynamic> json) => MatchTeam(
-        id: json['id'] as int?,
-        title: json['title'] as String?,
-        subTitle: json['sub_title'] as String?,
-        eTitle: json['e_title'] as String?,
-        createTime: json['create_time'] as int?,
-        area: json['area'] as String?,
-        logo: json['logo'] as String?,
-        uid: json['uid'] as int?,
-        members: json['members'] as String?,
-        dic: json['dic'] as String?,
-        isDeleted: json['is_deleted'] as int?,
-        videoUrl: json['video_url'] as String?,
-        profile: json['profile'] as String?,
-        leidaTid: json['leida_tid'] as int?,
-        replyId: json['reply_id'] as int?,
-        teamType: json['team_type'] as int?,
-        regionId: json['region_id'] as int?,
-        divisionName: json['division_name'] as String?,
-        divisionLogo: json['division_logo'] as String?,
-      );
+    id: json['id'] as int?,
+    title: json['title'] as String?,
+    subTitle: json['sub_title'] as String?,
+    eTitle: json['e_title'] as String?,
+    createTime: json['create_time'] as int?,
+    area: json['area'] as String?,
+    logo: json['logo'] as String?,
+    uid: json['uid'] as int?,
+    members: json['members'] as String?,
+    dic: json['dic'] as String?,
+    isDeleted: json['is_deleted'] as int?,
+    videoUrl: json['video_url'] as String?,
+    profile: json['profile'] as String?,
+    leidaTid: json['leida_tid'] as int?,
+    replyId: json['reply_id'] as int?,
+    teamType: json['team_type'] as int?,
+    regionId: json['region_id'] as int?,
+    divisionName: json['division_name'] as String?,
+    divisionLogo: json['division_logo'] as String?,
+  );
 
   Map<String, dynamic> toJson() => {
-        'id': id,
-        'title': title,
-        'sub_title': subTitle,
-        'e_title': eTitle,
-        'create_time': createTime,
-        'area': area,
-        'logo': logo,
-        'uid': uid,
-        'members': members,
-        'dic': dic,
-        'is_deleted': isDeleted,
-        'video_url': videoUrl,
-        'profile': profile,
-        'leida_tid': leidaTid,
-        'reply_id': replyId,
-        'team_type': teamType,
-        'region_id': regionId,
-        'division_name': divisionName,
-        'division_logo': divisionLogo,
-      };
+    'id': id,
+    'title': title,
+    'sub_title': subTitle,
+    'e_title': eTitle,
+    'create_time': createTime,
+    'area': area,
+    'logo': logo,
+    'uid': uid,
+    'members': members,
+    'dic': dic,
+    'is_deleted': isDeleted,
+    'video_url': videoUrl,
+    'profile': profile,
+    'leida_tid': leidaTid,
+    'reply_id': replyId,
+    'team_type': teamType,
+    'region_id': regionId,
+    'division_name': divisionName,
+    'division_logo': divisionLogo,
+  };
 }
diff --git a/lib/models_new/media_list/badge.dart b/lib/models_new/media_list/badge.dart
index 04f09315f..f4ebc7cef 100644
--- a/lib/models_new/media_list/badge.dart
+++ b/lib/models_new/media_list/badge.dart
@@ -6,8 +6,8 @@ class Badge {
   Badge({this.text, this.bgStyle, this.img});
 
   factory Badge.fromJson(Map<String, dynamic> json) => Badge(
-        text: json['text'] as String?,
-        bgStyle: json['bg_style'] as int?,
-        img: json['img'] as String?,
-      );
+    text: json['text'] as String?,
+    bgStyle: json['bg_style'] as int?,
+    img: json['img'] as String?,
+  );
 }
diff --git a/lib/models_new/media_list/coin.dart b/lib/models_new/media_list/coin.dart
index c9b9a0561..98bab6dd1 100644
--- a/lib/models_new/media_list/coin.dart
+++ b/lib/models_new/media_list/coin.dart
@@ -5,7 +5,7 @@ class Coin {
   Coin({this.maxNum, this.coinNumber});
 
   factory Coin.fromJson(Map<String, dynamic> json) => Coin(
-        maxNum: json['max_num'] as num?,
-        coinNumber: json['coin_number'] as num?,
-      );
+    maxNum: json['max_num'] as num?,
+    coinNumber: json['coin_number'] as num?,
+  );
 }
diff --git a/lib/models_new/media_list/data.dart b/lib/models_new/media_list/data.dart
index 1e539862b..df1210dbb 100644
--- a/lib/models_new/media_list/data.dart
+++ b/lib/models_new/media_list/data.dart
@@ -6,15 +6,19 @@ class MediaListData {
   int? totalCount;
   String? nextStartKey;
 
-  MediaListData(
-      {this.mediaList, this.hasMore, this.totalCount, this.nextStartKey});
+  MediaListData({
+    this.mediaList,
+    this.hasMore,
+    this.totalCount,
+    this.nextStartKey,
+  });
 
   factory MediaListData.fromJson(Map<String, dynamic> json) => MediaListData(
-        mediaList: (json['media_list'] as List<dynamic>?)
-            ?.map((e) => MediaListItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        hasMore: json['has_more'] as bool?,
-        totalCount: json['total_count'] as int?,
-        nextStartKey: json['next_start_key'] as String?,
-      );
+    mediaList: (json['media_list'] as List<dynamic>?)
+        ?.map((e) => MediaListItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    hasMore: json['has_more'] as bool?,
+    totalCount: json['total_count'] as int?,
+    nextStartKey: json['next_start_key'] as String?,
+  );
 }
diff --git a/lib/models_new/media_list/dimension.dart b/lib/models_new/media_list/dimension.dart
index 3de7639ce..c2fba44eb 100644
--- a/lib/models_new/media_list/dimension.dart
+++ b/lib/models_new/media_list/dimension.dart
@@ -6,8 +6,8 @@ class Dimension {
   Dimension({this.width, this.height, this.rotate});
 
   factory Dimension.fromJson(Map<String, dynamic> json) => Dimension(
-        width: json['width'] as int?,
-        height: json['height'] as int?,
-        rotate: json['rotate'] as int?,
-      );
+    width: json['width'] as int?,
+    height: json['height'] as int?,
+    rotate: json['rotate'] as int?,
+  );
 }
diff --git a/lib/models_new/media_list/media_list.dart b/lib/models_new/media_list/media_list.dart
index 16b21c837..4a690d68f 100644
--- a/lib/models_new/media_list/media_list.dart
+++ b/lib/models_new/media_list/media_list.dart
@@ -83,8 +83,9 @@ class MediaListItemModel {
     attr = json['attr'] as int?;
     tid = json['tid'] as int?;
     copyRight = json['copy_right'] as int?;
-    cntInfo =
-        json['cnt_info'] == null ? null : CntInfo.fromJson(json['cnt_info']);
+    cntInfo = json['cnt_info'] == null
+        ? null
+        : CntInfo.fromJson(json['cnt_info']);
     cover = json['cover'] as String?;
     duration = json['duration'] as int?;
     pubtime = json['pubtime'] as int?;
@@ -101,8 +102,9 @@ class MediaListItemModel {
     rights = json['rights'] == null ? null : Rights.fromJson(json['rights']);
     elecInfo = json['elec_info'] as dynamic;
     coin = json['coin'] == null ? null : Coin.fromJson(json['coin']);
-    ogvInfo =
-        json['ogv_info'] == null ? null : OgvInfo.fromJson(json['ogv_info']);
+    ogvInfo = json['ogv_info'] == null
+        ? null
+        : OgvInfo.fromJson(json['ogv_info']);
     progressPercent = (json['progress_percent'] as num?)?.toDouble();
     badge = json['badge'] == null ? null : Badge.fromJson(json['badge']);
     forbidFav = json['forbid_fav'] as bool?;
diff --git a/lib/models_new/media_list/ogv_info.dart b/lib/models_new/media_list/ogv_info.dart
index 8b9aa8417..f6bd608ee 100644
--- a/lib/models_new/media_list/ogv_info.dart
+++ b/lib/models_new/media_list/ogv_info.dart
@@ -10,12 +10,12 @@ class OgvInfo {
   OgvInfo({this.epid, this.seasonId, this.aid, this.cid, this.dimension});
 
   factory OgvInfo.fromJson(Map<String, dynamic> json) => OgvInfo(
-        epid: json['epid'] as int?,
-        seasonId: json['season_id'] as int?,
-        aid: json['aid'] as int?,
-        cid: json['cid'] as int?,
-        dimension: json['dimension'] == null
-            ? null
-            : Dimension.fromJson(json['dimension'] as Map<String, dynamic>),
-      );
+    epid: json['epid'] as int?,
+    seasonId: json['season_id'] as int?,
+    aid: json['aid'] as int?,
+    cid: json['cid'] as int?,
+    dimension: json['dimension'] == null
+        ? null
+        : Dimension.fromJson(json['dimension'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/media_list/page.dart b/lib/models_new/media_list/page.dart
index d1d8fd61b..874ac740c 100644
--- a/lib/models_new/media_list/page.dart
+++ b/lib/models_new/media_list/page.dart
@@ -22,15 +22,15 @@ class Page {
   });
 
   factory Page.fromJson(Map<String, dynamic> json) => Page(
-        id: json["id"],
-        title: json["title"],
-        intro: json["intro"],
-        duration: json["duration"],
-        link: json["link"],
-        page: json["page"],
-        from: json["from"],
-        dimension: json["dimension"] == null
-            ? null
-            : Dimension.fromJson(json["dimension"]),
-      );
+    id: json["id"],
+    title: json["title"],
+    intro: json["intro"],
+    duration: json["duration"],
+    link: json["link"],
+    page: json["page"],
+    from: json["from"],
+    dimension: json["dimension"] == null
+        ? null
+        : Dimension.fromJson(json["dimension"]),
+  );
 }
diff --git a/lib/models_new/media_list/rights.dart b/lib/models_new/media_list/rights.dart
index df6c21182..278fe7d7c 100644
--- a/lib/models_new/media_list/rights.dart
+++ b/lib/models_new/media_list/rights.dart
@@ -24,15 +24,15 @@ class Rights {
   });
 
   factory Rights.fromJson(Map<String, dynamic> json) => Rights(
-        bp: json['bp'] as int?,
-        elec: json['elec'] as int?,
-        download: json['download'] as int?,
-        movie: json['movie'] as int?,
-        pay: json['pay'] as int?,
-        ugcPay: json['ugc_pay'] as int?,
-        hd5: json['hd5'] as int?,
-        noReprint: json['no_reprint'] as int?,
-        autoplay: json['autoplay'] as int?,
-        noBackground: json['no_background'] as int?,
-      );
+    bp: json['bp'] as int?,
+    elec: json['elec'] as int?,
+    download: json['download'] as int?,
+    movie: json['movie'] as int?,
+    pay: json['pay'] as int?,
+    ugcPay: json['ugc_pay'] as int?,
+    hd5: json['hd5'] as int?,
+    noReprint: json['no_reprint'] as int?,
+    autoplay: json['autoplay'] as int?,
+    noBackground: json['no_background'] as int?,
+  );
 }
diff --git a/lib/models_new/member/search_archive/data.dart b/lib/models_new/member/search_archive/data.dart
index 3caf3708e..1408b99ae 100644
--- a/lib/models_new/member/search_archive/data.dart
+++ b/lib/models_new/member/search_archive/data.dart
@@ -30,7 +30,8 @@ class SearchArchiveData {
         episodicButton: json['episodic_button'] == null
             ? null
             : EpisodicButton.fromJson(
-                json['episodic_button'] as Map<String, dynamic>),
+                json['episodic_button'] as Map<String, dynamic>,
+              ),
         isRisk: json['is_risk'] as bool?,
         gaiaResType: json['gaia_res_type'] as int?,
         gaiaData: json['gaia_data'] as dynamic,
diff --git a/lib/models_new/member/search_archive/page.dart b/lib/models_new/member/search_archive/page.dart
index ef61fd45e..4aecc812e 100644
--- a/lib/models_new/member/search_archive/page.dart
+++ b/lib/models_new/member/search_archive/page.dart
@@ -6,8 +6,8 @@ class Page {
   Page({this.pn, this.ps, this.count});
 
   factory Page.fromJson(Map<String, dynamic> json) => Page(
-        pn: json['pn'] as int?,
-        ps: json['ps'] as int?,
-        count: json['count'] as int?,
-      );
+    pn: json['pn'] as int?,
+    ps: json['ps'] as int?,
+    count: json['count'] as int?,
+  );
 }
diff --git a/lib/models_new/msg/im_user_infos/datum.dart b/lib/models_new/msg/im_user_infos/datum.dart
index 0f5955ef3..b994dbdec 100644
--- a/lib/models_new/msg/im_user_infos/datum.dart
+++ b/lib/models_new/msg/im_user_infos/datum.dart
@@ -64,7 +64,8 @@ class ImUserInfosData {
         official: json['official'] == null
             ? null
             : BaseOfficialVerify.fromJson(
-                json['official'] as Map<String, dynamic>),
+                json['official'] as Map<String, dynamic>,
+              ),
         birthday: json['birthday'] as int?,
         isFakeAccount: json['is_fake_account'] as int?,
         isDeleted: json['is_deleted'] as int?,
diff --git a/lib/models_new/msg/msg_at/content.dart b/lib/models_new/msg/msg_at/content.dart
index 76f909e5f..82cfd65c9 100644
--- a/lib/models_new/msg/msg_at/content.dart
+++ b/lib/models_new/msg/msg_at/content.dart
@@ -34,20 +34,20 @@ class MsgAtContent {
   });
 
   factory MsgAtContent.fromJson(Map<String, dynamic> json) => MsgAtContent(
-        type: json['type'] as String?,
-        business: json['business'] as String?,
-        businessId: json['business_id'] as int?,
-        title: json['title'] as String?,
-        image: json['image'] as String?,
-        uri: json['uri'] as String?,
-        subjectId: json['subject_id'] as int?,
-        rootId: json['root_id'] as int?,
-        targetId: json['target_id'] as int?,
-        sourceId: json['source_id'] as int?,
-        sourceContent: json['source_content'] as String?,
-        nativeUri: json['native_uri'] as String?,
-        atDetails: json['at_details'] as List<dynamic>?,
-        topicDetails: json['topic_details'] as List<dynamic>?,
-        hideReplyButton: json['hide_reply_button'] as bool?,
-      );
+    type: json['type'] as String?,
+    business: json['business'] as String?,
+    businessId: json['business_id'] as int?,
+    title: json['title'] as String?,
+    image: json['image'] as String?,
+    uri: json['uri'] as String?,
+    subjectId: json['subject_id'] as int?,
+    rootId: json['root_id'] as int?,
+    targetId: json['target_id'] as int?,
+    sourceId: json['source_id'] as int?,
+    sourceContent: json['source_content'] as String?,
+    nativeUri: json['native_uri'] as String?,
+    atDetails: json['at_details'] as List<dynamic>?,
+    topicDetails: json['topic_details'] as List<dynamic>?,
+    hideReplyButton: json['hide_reply_button'] as bool?,
+  );
 }
diff --git a/lib/models_new/msg/msg_at/cursor.dart b/lib/models_new/msg/msg_at/cursor.dart
index 91cbf02f5..eb090d608 100644
--- a/lib/models_new/msg/msg_at/cursor.dart
+++ b/lib/models_new/msg/msg_at/cursor.dart
@@ -6,8 +6,8 @@ class Cursor {
   Cursor({this.isEnd, this.id, this.time});
 
   factory Cursor.fromJson(Map<String, dynamic> json) => Cursor(
-        isEnd: json['is_end'] as bool?,
-        id: json['id'] as int?,
-        time: json['time'] as int?,
-      );
+    isEnd: json['is_end'] as bool?,
+    id: json['id'] as int?,
+    time: json['time'] as int?,
+  );
 }
diff --git a/lib/models_new/msg/msg_at/data.dart b/lib/models_new/msg/msg_at/data.dart
index 3d6265b1f..27123aede 100644
--- a/lib/models_new/msg/msg_at/data.dart
+++ b/lib/models_new/msg/msg_at/data.dart
@@ -8,11 +8,11 @@ class MsgAtData {
   MsgAtData({this.cursor, this.items});
 
   factory MsgAtData.fromJson(Map<String, dynamic> json) => MsgAtData(
-        cursor: json['cursor'] == null
-            ? null
-            : Cursor.fromJson(json['cursor'] as Map<String, dynamic>),
-        items: (json['items'] as List<dynamic>?)
-            ?.map((e) => MsgAtItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    cursor: json['cursor'] == null
+        ? null
+        : Cursor.fromJson(json['cursor'] as Map<String, dynamic>),
+    items: (json['items'] as List<dynamic>?)
+        ?.map((e) => MsgAtItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/msg/msg_at/item.dart b/lib/models_new/msg/msg_at/item.dart
index 959638381..08179a57f 100644
--- a/lib/models_new/msg/msg_at/item.dart
+++ b/lib/models_new/msg/msg_at/item.dart
@@ -10,13 +10,13 @@ class MsgAtItem {
   MsgAtItem({this.id, this.user, this.item, this.atTime});
 
   factory MsgAtItem.fromJson(Map<String, dynamic> json) => MsgAtItem(
-        id: json['id'] as int?,
-        user: json['user'] == null
-            ? null
-            : User.fromJson(json['user'] as Map<String, dynamic>),
-        item: json['item'] == null
-            ? null
-            : MsgAtContent.fromJson(json['item'] as Map<String, dynamic>),
-        atTime: json['at_time'] as int?,
-      );
+    id: json['id'] as int?,
+    user: json['user'] == null
+        ? null
+        : User.fromJson(json['user'] as Map<String, dynamic>),
+    item: json['item'] == null
+        ? null
+        : MsgAtContent.fromJson(json['item'] as Map<String, dynamic>),
+    atTime: json['at_time'] as int?,
+  );
 }
diff --git a/lib/models_new/msg/msg_at/user.dart b/lib/models_new/msg/msg_at/user.dart
index edea570ae..46f7a6f77 100644
--- a/lib/models_new/msg/msg_at/user.dart
+++ b/lib/models_new/msg/msg_at/user.dart
@@ -16,11 +16,11 @@ class User {
   });
 
   factory User.fromJson(Map<String, dynamic> json) => User(
-        mid: json['mid'] as int?,
-        fans: json['fans'] as int?,
-        nickname: json['nickname'] as String?,
-        avatar: json['avatar'] as String?,
-        midLink: json['mid_link'] as String?,
-        follow: json['follow'] as bool?,
-      );
+    mid: json['mid'] as int?,
+    fans: json['fans'] as int?,
+    nickname: json['nickname'] as String?,
+    avatar: json['avatar'] as String?,
+    midLink: json['mid_link'] as String?,
+    follow: json['follow'] as bool?,
+  );
 }
diff --git a/lib/models_new/msg/msg_dnd/uid_setting.dart b/lib/models_new/msg/msg_dnd/uid_setting.dart
index 4450fd047..27c2c08a7 100644
--- a/lib/models_new/msg/msg_dnd/uid_setting.dart
+++ b/lib/models_new/msg/msg_dnd/uid_setting.dart
@@ -5,7 +5,7 @@ class UidSetting {
   UidSetting({this.id, this.setting});
 
   factory UidSetting.fromJson(Map<String, dynamic> json) => UidSetting(
-        id: json['id'] as int?,
-        setting: json['setting'] as int?,
-      );
+    id: json['id'] as int?,
+    setting: json['setting'] as int?,
+  );
 }
diff --git a/lib/models_new/msg/msg_like/cursor.dart b/lib/models_new/msg/msg_like/cursor.dart
index 91cbf02f5..eb090d608 100644
--- a/lib/models_new/msg/msg_like/cursor.dart
+++ b/lib/models_new/msg/msg_like/cursor.dart
@@ -6,8 +6,8 @@ class Cursor {
   Cursor({this.isEnd, this.id, this.time});
 
   factory Cursor.fromJson(Map<String, dynamic> json) => Cursor(
-        isEnd: json['is_end'] as bool?,
-        id: json['id'] as int?,
-        time: json['time'] as int?,
-      );
+    isEnd: json['is_end'] as bool?,
+    id: json['id'] as int?,
+    time: json['time'] as int?,
+  );
 }
diff --git a/lib/models_new/msg/msg_like/data.dart b/lib/models_new/msg/msg_like/data.dart
index 024555982..bdcf16e1e 100644
--- a/lib/models_new/msg/msg_like/data.dart
+++ b/lib/models_new/msg/msg_like/data.dart
@@ -8,11 +8,11 @@ class MsgLikeData {
   MsgLikeData({this.latest, this.total});
 
   factory MsgLikeData.fromJson(Map<String, dynamic> json) => MsgLikeData(
-        latest: json['latest'] == null
-            ? null
-            : Latest.fromJson(json['latest'] as Map<String, dynamic>),
-        total: json['total'] == null
-            ? null
-            : Total.fromJson(json['total'] as Map<String, dynamic>),
-      );
+    latest: json['latest'] == null
+        ? null
+        : Latest.fromJson(json['latest'] as Map<String, dynamic>),
+    total: json['total'] == null
+        ? null
+        : Total.fromJson(json['total'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/msg/msg_like/item.dart b/lib/models_new/msg/msg_like/item.dart
index 400c1dbf8..2afe529bd 100644
--- a/lib/models_new/msg/msg_like/item.dart
+++ b/lib/models_new/msg/msg_like/item.dart
@@ -20,15 +20,15 @@ class MsgLikeItem {
   });
 
   factory MsgLikeItem.fromJson(Map<String, dynamic> json) => MsgLikeItem(
-        id: json['id'] as int?,
-        users: (json['users'] as List<dynamic>?)
-            ?.map((e) => User.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        item: json['item'] == null
-            ? null
-            : MsgLikeContent.fromJson(json['item'] as Map<String, dynamic>),
-        counts: json['counts'] as int?,
-        likeTime: json['like_time'] as int?,
-        noticeState: json['notice_state'] as int?,
-      );
+    id: json['id'] as int?,
+    users: (json['users'] as List<dynamic>?)
+        ?.map((e) => User.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    item: json['item'] == null
+        ? null
+        : MsgLikeContent.fromJson(json['item'] as Map<String, dynamic>),
+    counts: json['counts'] as int?,
+    likeTime: json['like_time'] as int?,
+    noticeState: json['notice_state'] as int?,
+  );
 }
diff --git a/lib/models_new/msg/msg_like/latest.dart b/lib/models_new/msg/msg_like/latest.dart
index fbccc97a9..8cee050db 100644
--- a/lib/models_new/msg/msg_like/latest.dart
+++ b/lib/models_new/msg/msg_like/latest.dart
@@ -7,9 +7,9 @@ class Latest {
   Latest({this.items, this.lastViewAt});
 
   factory Latest.fromJson(Map<String, dynamic> json) => Latest(
-        items: (json['items'] as List<dynamic>?)
-            ?.map((e) => MsgLikeItem.fromJson(e))
-            .toList(),
-        lastViewAt: json['last_view_at'] as int?,
-      );
+    items: (json['items'] as List<dynamic>?)
+        ?.map((e) => MsgLikeItem.fromJson(e))
+        .toList(),
+    lastViewAt: json['last_view_at'] as int?,
+  );
 }
diff --git a/lib/models_new/msg/msg_like/total.dart b/lib/models_new/msg/msg_like/total.dart
index ee0bf36c4..e7265b4f8 100644
--- a/lib/models_new/msg/msg_like/total.dart
+++ b/lib/models_new/msg/msg_like/total.dart
@@ -8,11 +8,11 @@ class Total {
   Total({this.cursor, this.items});
 
   factory Total.fromJson(Map<String, dynamic> json) => Total(
-        cursor: json['cursor'] == null
-            ? null
-            : Cursor.fromJson(json['cursor'] as Map<String, dynamic>),
-        items: (json['items'] as List<dynamic>?)
-            ?.map((e) => MsgLikeItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    cursor: json['cursor'] == null
+        ? null
+        : Cursor.fromJson(json['cursor'] as Map<String, dynamic>),
+    items: (json['items'] as List<dynamic>?)
+        ?.map((e) => MsgLikeItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/msg/msg_like/user.dart b/lib/models_new/msg/msg_like/user.dart
index edea570ae..46f7a6f77 100644
--- a/lib/models_new/msg/msg_like/user.dart
+++ b/lib/models_new/msg/msg_like/user.dart
@@ -16,11 +16,11 @@ class User {
   });
 
   factory User.fromJson(Map<String, dynamic> json) => User(
-        mid: json['mid'] as int?,
-        fans: json['fans'] as int?,
-        nickname: json['nickname'] as String?,
-        avatar: json['avatar'] as String?,
-        midLink: json['mid_link'] as String?,
-        follow: json['follow'] as bool?,
-      );
+    mid: json['mid'] as int?,
+    fans: json['fans'] as int?,
+    nickname: json['nickname'] as String?,
+    avatar: json['avatar'] as String?,
+    midLink: json['mid_link'] as String?,
+    follow: json['follow'] as bool?,
+  );
 }
diff --git a/lib/models_new/msg/msg_reply/cursor.dart b/lib/models_new/msg/msg_reply/cursor.dart
index 91cbf02f5..eb090d608 100644
--- a/lib/models_new/msg/msg_reply/cursor.dart
+++ b/lib/models_new/msg/msg_reply/cursor.dart
@@ -6,8 +6,8 @@ class Cursor {
   Cursor({this.isEnd, this.id, this.time});
 
   factory Cursor.fromJson(Map<String, dynamic> json) => Cursor(
-        isEnd: json['is_end'] as bool?,
-        id: json['id'] as int?,
-        time: json['time'] as int?,
-      );
+    isEnd: json['is_end'] as bool?,
+    id: json['id'] as int?,
+    time: json['time'] as int?,
+  );
 }
diff --git a/lib/models_new/msg/msg_reply/data.dart b/lib/models_new/msg/msg_reply/data.dart
index 0bcaa4f7c..41c8b4d20 100644
--- a/lib/models_new/msg/msg_reply/data.dart
+++ b/lib/models_new/msg/msg_reply/data.dart
@@ -9,12 +9,12 @@ class MsgReplyData {
   MsgReplyData({this.cursor, this.items, this.lastViewAt});
 
   factory MsgReplyData.fromJson(Map<String, dynamic> json) => MsgReplyData(
-        cursor: json['cursor'] == null
-            ? null
-            : Cursor.fromJson(json['cursor'] as Map<String, dynamic>),
-        items: (json['items'] as List<dynamic>?)
-            ?.map((e) => MsgReplyItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        lastViewAt: json['last_view_at'] as int?,
-      );
+    cursor: json['cursor'] == null
+        ? null
+        : Cursor.fromJson(json['cursor'] as Map<String, dynamic>),
+    items: (json['items'] as List<dynamic>?)
+        ?.map((e) => MsgReplyItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    lastViewAt: json['last_view_at'] as int?,
+  );
 }
diff --git a/lib/models_new/msg/msg_reply/item.dart b/lib/models_new/msg/msg_reply/item.dart
index 44c35af34..c68650680 100644
--- a/lib/models_new/msg/msg_reply/item.dart
+++ b/lib/models_new/msg/msg_reply/item.dart
@@ -20,15 +20,15 @@ class MsgReplyItem {
   });
 
   factory MsgReplyItem.fromJson(Map<String, dynamic> json) => MsgReplyItem(
-        id: json['id'] as int?,
-        user: json['user'] == null
-            ? null
-            : User.fromJson(json['user'] as Map<String, dynamic>),
-        item: json['item'] == null
-            ? null
-            : MsgReplyContent.fromJson(json['item'] as Map<String, dynamic>),
-        counts: json['counts'] as int?,
-        isMulti: json['is_multi'] as int?,
-        replyTime: json['reply_time'] as int?,
-      );
+    id: json['id'] as int?,
+    user: json['user'] == null
+        ? null
+        : User.fromJson(json['user'] as Map<String, dynamic>),
+    item: json['item'] == null
+        ? null
+        : MsgReplyContent.fromJson(json['item'] as Map<String, dynamic>),
+    counts: json['counts'] as int?,
+    isMulti: json['is_multi'] as int?,
+    replyTime: json['reply_time'] as int?,
+  );
 }
diff --git a/lib/models_new/msg/msg_reply/user.dart b/lib/models_new/msg/msg_reply/user.dart
index edea570ae..46f7a6f77 100644
--- a/lib/models_new/msg/msg_reply/user.dart
+++ b/lib/models_new/msg/msg_reply/user.dart
@@ -16,11 +16,11 @@ class User {
   });
 
   factory User.fromJson(Map<String, dynamic> json) => User(
-        mid: json['mid'] as int?,
-        fans: json['fans'] as int?,
-        nickname: json['nickname'] as String?,
-        avatar: json['avatar'] as String?,
-        midLink: json['mid_link'] as String?,
-        follow: json['follow'] as bool?,
-      );
+    mid: json['mid'] as int?,
+    fans: json['fans'] as int?,
+    nickname: json['nickname'] as String?,
+    avatar: json['avatar'] as String?,
+    midLink: json['mid_link'] as String?,
+    follow: json['follow'] as bool?,
+  );
 }
diff --git a/lib/models_new/msg/msg_sys/publisher.dart b/lib/models_new/msg/msg_sys/publisher.dart
index 0f8543876..aa8233cef 100644
--- a/lib/models_new/msg/msg_sys/publisher.dart
+++ b/lib/models_new/msg/msg_sys/publisher.dart
@@ -6,8 +6,8 @@ class Publisher {
   Publisher({this.name, this.mid, this.face});
 
   factory Publisher.fromJson(Map<String, dynamic> json) => Publisher(
-        name: json['name'] as String?,
-        mid: json['mid'] as int?,
-        face: json['face'] as String?,
-      );
+    name: json['name'] as String?,
+    mid: json['mid'] as int?,
+    face: json['face'] as String?,
+  );
 }
diff --git a/lib/models_new/msg/msg_sys/source.dart b/lib/models_new/msg/msg_sys/source.dart
index b20e43332..cc53af09c 100644
--- a/lib/models_new/msg/msg_sys/source.dart
+++ b/lib/models_new/msg/msg_sys/source.dart
@@ -5,7 +5,7 @@ class Source {
   Source({this.name, this.logo});
 
   factory Source.fromJson(Map<String, dynamic> json) => Source(
-        name: json['name'] as String?,
-        logo: json['logo'] as String?,
-      );
+    name: json['name'] as String?,
+    logo: json['logo'] as String?,
+  );
 }
diff --git a/lib/models_new/msg/session_ss/data.dart b/lib/models_new/msg/session_ss/data.dart
index b1d9b2991..9bd03d490 100644
--- a/lib/models_new/msg/session_ss/data.dart
+++ b/lib/models_new/msg/session_ss/data.dart
@@ -12,9 +12,9 @@ class SessionSsData {
   });
 
   factory SessionSsData.fromJson(Map<String, dynamic> json) => SessionSsData(
-        followStatus: json['follow_status'] as int?,
-        special: json['special'] as int?,
-        pushSetting: json['push_setting'] as int?,
-        showPushSetting: json['show_push_setting'] as int?,
-      );
+    followStatus: json['follow_status'] as int?,
+    special: json['special'] as int?,
+    pushSetting: json['push_setting'] as int?,
+    showPushSetting: json['show_push_setting'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_index_result/badge_info.dart b/lib/models_new/pgc/pgc_index_result/badge_info.dart
index 3b929ee6c..a5c15c028 100644
--- a/lib/models_new/pgc/pgc_index_result/badge_info.dart
+++ b/lib/models_new/pgc/pgc_index_result/badge_info.dart
@@ -6,8 +6,8 @@ class BadgeInfo {
   BadgeInfo({this.bgColor, this.bgColorNight, this.text});
 
   factory BadgeInfo.fromJson(Map<String, dynamic> json) => BadgeInfo(
-        bgColor: json['bg_color'] as String?,
-        bgColorNight: json['bg_color_night'] as String?,
-        text: json['text'] as String?,
-      );
+    bgColor: json['bg_color'] as String?,
+    bgColorNight: json['bg_color_night'] as String?,
+    text: json['text'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_index_result/data.dart b/lib/models_new/pgc/pgc_index_result/data.dart
index 63b93cf14..45b565e54 100644
--- a/lib/models_new/pgc/pgc_index_result/data.dart
+++ b/lib/models_new/pgc/pgc_index_result/data.dart
@@ -10,12 +10,12 @@ class PgcIndexResult {
   PgcIndexResult({this.hasNext, this.list, this.num, this.size, this.total});
 
   factory PgcIndexResult.fromJson(Map<String, dynamic> json) => PgcIndexResult(
-        hasNext: json['has_next'] as int?,
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => PgcIndexItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        num: json['num'] as int?,
-        size: json['size'] as int?,
-        total: json['total'] as int?,
-      );
+    hasNext: json['has_next'] as int?,
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => PgcIndexItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    num: json['num'] as int?,
+    size: json['size'] as int?,
+    total: json['total'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_index_result/first_ep.dart b/lib/models_new/pgc/pgc_index_result/first_ep.dart
index 8b95a4562..8b449bf65 100644
--- a/lib/models_new/pgc/pgc_index_result/first_ep.dart
+++ b/lib/models_new/pgc/pgc_index_result/first_ep.dart
@@ -5,7 +5,7 @@ class FirstEp {
   FirstEp({this.cover, this.epId});
 
   factory FirstEp.fromJson(Map<String, dynamic> json) => FirstEp(
-        cover: json['cover'] as String?,
-        epId: json['ep_id'] as int?,
-      );
+    cover: json['cover'] as String?,
+    epId: json['ep_id'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_index_result/list.dart b/lib/models_new/pgc/pgc_index_result/list.dart
index ca9292c2d..59d41004d 100644
--- a/lib/models_new/pgc/pgc_index_result/list.dart
+++ b/lib/models_new/pgc/pgc_index_result/list.dart
@@ -43,27 +43,27 @@ class PgcIndexItem {
   });
 
   factory PgcIndexItem.fromJson(Map<String, dynamic> json) => PgcIndexItem(
-        badge: json['badge'] as String?,
-        badgeInfo: json['badge_info'] == null
-            ? null
-            : BadgeInfo.fromJson(json['badge_info'] as Map<String, dynamic>),
-        badgeType: json['badge_type'] as int?,
-        cover: json['cover'] as String?,
-        firstEp: json['first_ep'] == null
-            ? null
-            : FirstEp.fromJson(json['first_ep'] as Map<String, dynamic>),
-        indexShow: json['index_show'] as String?,
-        isFinish: json['is_finish'] as int?,
-        link: json['link'] as String?,
-        mediaId: json['media_id'] as int?,
-        order: json['order'] as String?,
-        orderType: json['order_type'] as String?,
-        score: json['score'] as String?,
-        seasonId: json['season_id'] as int?,
-        seasonStatus: json['season_status'] as int?,
-        seasonType: json['season_type'] as int?,
-        subTitle: json['subTitle'] as String?,
-        title: json['title'] as String?,
-        titleIcon: json['title_icon'] as String?,
-      );
+    badge: json['badge'] as String?,
+    badgeInfo: json['badge_info'] == null
+        ? null
+        : BadgeInfo.fromJson(json['badge_info'] as Map<String, dynamic>),
+    badgeType: json['badge_type'] as int?,
+    cover: json['cover'] as String?,
+    firstEp: json['first_ep'] == null
+        ? null
+        : FirstEp.fromJson(json['first_ep'] as Map<String, dynamic>),
+    indexShow: json['index_show'] as String?,
+    isFinish: json['is_finish'] as int?,
+    link: json['link'] as String?,
+    mediaId: json['media_id'] as int?,
+    order: json['order'] as String?,
+    orderType: json['order_type'] as String?,
+    score: json['score'] as String?,
+    seasonId: json['season_id'] as int?,
+    seasonStatus: json['season_status'] as int?,
+    seasonType: json['season_type'] as int?,
+    subTitle: json['subTitle'] as String?,
+    title: json['title'] as String?,
+    titleIcon: json['title_icon'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/activity.dart b/lib/models_new/pgc/pgc_info_model/activity.dart
index 5cf410342..99fce2371 100644
--- a/lib/models_new/pgc/pgc_info_model/activity.dart
+++ b/lib/models_new/pgc/pgc_info_model/activity.dart
@@ -6,8 +6,8 @@ class Activity {
   Activity({this.headBgUrl, this.id, this.title});
 
   factory Activity.fromJson(Map<String, dynamic> json) => Activity(
-        headBgUrl: json['head_bg_url'] as String?,
-        id: json['id'] as int?,
-        title: json['title'] as String?,
-      );
+    headBgUrl: json['head_bg_url'] as String?,
+    id: json['id'] as int?,
+    title: json['title'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/area.dart b/lib/models_new/pgc/pgc_info_model/area.dart
index 5f1e57637..8540bf56f 100644
--- a/lib/models_new/pgc/pgc_info_model/area.dart
+++ b/lib/models_new/pgc/pgc_info_model/area.dart
@@ -5,7 +5,7 @@ class Area {
   Area({this.id, this.name});
 
   factory Area.fromJson(Map<String, dynamic> json) => Area(
-        id: json['id'] as int?,
-        name: json['name'] as String?,
-      );
+    id: json['id'] as int?,
+    name: json['name'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/badge_info.dart b/lib/models_new/pgc/pgc_info_model/badge_info.dart
index 3b929ee6c..a5c15c028 100644
--- a/lib/models_new/pgc/pgc_info_model/badge_info.dart
+++ b/lib/models_new/pgc/pgc_info_model/badge_info.dart
@@ -6,8 +6,8 @@ class BadgeInfo {
   BadgeInfo({this.bgColor, this.bgColorNight, this.text});
 
   factory BadgeInfo.fromJson(Map<String, dynamic> json) => BadgeInfo(
-        bgColor: json['bg_color'] as String?,
-        bgColorNight: json['bg_color_night'] as String?,
-        text: json['text'] as String?,
-      );
+    bgColor: json['bg_color'] as String?,
+    bgColorNight: json['bg_color_night'] as String?,
+    text: json['text'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/danmaku.dart b/lib/models_new/pgc/pgc_info_model/danmaku.dart
index ea31c5ef4..b5bef5ae4 100644
--- a/lib/models_new/pgc/pgc_info_model/danmaku.dart
+++ b/lib/models_new/pgc/pgc_info_model/danmaku.dart
@@ -7,9 +7,9 @@ class Danmaku {
   Danmaku({this.icon, this.pureText, this.text, this.value});
 
   factory Danmaku.fromJson(Map<String, dynamic> json) => Danmaku(
-        icon: json['icon'] as String?,
-        pureText: json['pure_text'] as String?,
-        text: json['text'] as String?,
-        value: json['value'] as int?,
-      );
+    icon: json['icon'] as String?,
+    pureText: json['pure_text'] as String?,
+    text: json['text'] as String?,
+    value: json['value'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/dimension.dart b/lib/models_new/pgc/pgc_info_model/dimension.dart
index 5b7cb9018..6fda48974 100644
--- a/lib/models_new/pgc/pgc_info_model/dimension.dart
+++ b/lib/models_new/pgc/pgc_info_model/dimension.dart
@@ -6,8 +6,8 @@ class Dimension {
   Dimension({this.height, this.rotate, this.width});
 
   factory Dimension.fromJson(Map<String, dynamic> json) => Dimension(
-        height: json['height'] as int?,
-        rotate: json['rotate'] as int?,
-        width: json['width'] as int?,
-      );
+    height: json['height'] as int?,
+    rotate: json['rotate'] as int?,
+    width: json['width'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/ed.dart b/lib/models_new/pgc/pgc_info_model/ed.dart
index 012f33da5..cb828732d 100644
--- a/lib/models_new/pgc/pgc_info_model/ed.dart
+++ b/lib/models_new/pgc/pgc_info_model/ed.dart
@@ -5,7 +5,7 @@ class Ed {
   Ed({this.end, this.start});
 
   factory Ed.fromJson(Map<String, dynamic> json) => Ed(
-        end: json['end'] as int?,
-        start: json['start'] as int?,
-      );
+    end: json['end'] as int?,
+    start: json['start'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/episode.dart b/lib/models_new/pgc/pgc_info_model/episode.dart
index 99b7dc358..06596ec80 100644
--- a/lib/models_new/pgc/pgc_info_model/episode.dart
+++ b/lib/models_new/pgc/pgc_info_model/episode.dart
@@ -71,44 +71,44 @@ class EpisodeItem {
   });
 
   factory EpisodeItem.fromJson(Map<String, dynamic> json) => EpisodeItem(
-        aid: json['aid'] as int?,
-        badge: json['badge'] as String?,
-        badgeInfo: json['badge_info'] == null
-            ? null
-            : BadgeInfo.fromJson(json['badge_info'] as Map<String, dynamic>),
-        badgeType: json['badge_type'] as int?,
-        bvid: json['bvid'] as String?,
-        cid: json['cid'] as int?,
-        cover: json['cover'] as String?,
-        dimension: json['dimension'] == null
-            ? null
-            : Dimension.fromJson(json['dimension'] as Map<String, dynamic>),
-        duration: json['duration'] as int?,
-        enableVt: json['enable_vt'] as bool?,
-        epId: json['ep_id'] as int?,
-        from: json['from'] as String?,
-        id: json['id'] as int?,
-        isViewHide: json['is_view_hide'] as bool?,
-        link: json['link'] as String?,
-        longTitle: json['long_title'] as String?,
-        pubTime: json['pub_time'] as int?,
-        pv: json['pv'] as int?,
-        releaseDate: json['release_date'] as String?,
-        rights: json['rights'] == null
-            ? null
-            : Rights.fromJson(json['rights'] as Map<String, dynamic>),
-        sectionType: json['section_type'] as int?,
-        shareCopy: json['share_copy'] as String?,
-        shareUrl: json['share_url'] as String?,
-        shortLink: json['short_link'] as String?,
-        showDrmLoginDialog: json['showDrmLoginDialog'] as bool?,
-        showTitle: json['show_title'] as String?,
-        skip: json['skip'] == null
-            ? null
-            : Skip.fromJson(json['skip'] as Map<String, dynamic>),
-        status: json['status'] as int?,
-        subtitle: json['subtitle'] as String?,
-        title: json['title'] as String?,
-        vid: json['vid'] as String?,
-      );
+    aid: json['aid'] as int?,
+    badge: json['badge'] as String?,
+    badgeInfo: json['badge_info'] == null
+        ? null
+        : BadgeInfo.fromJson(json['badge_info'] as Map<String, dynamic>),
+    badgeType: json['badge_type'] as int?,
+    bvid: json['bvid'] as String?,
+    cid: json['cid'] as int?,
+    cover: json['cover'] as String?,
+    dimension: json['dimension'] == null
+        ? null
+        : Dimension.fromJson(json['dimension'] as Map<String, dynamic>),
+    duration: json['duration'] as int?,
+    enableVt: json['enable_vt'] as bool?,
+    epId: json['ep_id'] as int?,
+    from: json['from'] as String?,
+    id: json['id'] as int?,
+    isViewHide: json['is_view_hide'] as bool?,
+    link: json['link'] as String?,
+    longTitle: json['long_title'] as String?,
+    pubTime: json['pub_time'] as int?,
+    pv: json['pv'] as int?,
+    releaseDate: json['release_date'] as String?,
+    rights: json['rights'] == null
+        ? null
+        : Rights.fromJson(json['rights'] as Map<String, dynamic>),
+    sectionType: json['section_type'] as int?,
+    shareCopy: json['share_copy'] as String?,
+    shareUrl: json['share_url'] as String?,
+    shortLink: json['short_link'] as String?,
+    showDrmLoginDialog: json['showDrmLoginDialog'] as bool?,
+    showTitle: json['show_title'] as String?,
+    skip: json['skip'] == null
+        ? null
+        : Skip.fromJson(json['skip'] as Map<String, dynamic>),
+    status: json['status'] as int?,
+    subtitle: json['subtitle'] as String?,
+    title: json['title'] as String?,
+    vid: json['vid'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/freya.dart b/lib/models_new/pgc/pgc_info_model/freya.dart
index ad9705e76..044f9149e 100644
--- a/lib/models_new/pgc/pgc_info_model/freya.dart
+++ b/lib/models_new/pgc/pgc_info_model/freya.dart
@@ -5,7 +5,7 @@ class Freya {
   Freya({this.bubbleShowCnt, this.iconShow});
 
   factory Freya.fromJson(Map<String, dynamic> json) => Freya(
-        bubbleShowCnt: json['bubble_show_cnt'] as int?,
-        iconShow: json['icon_show'] as int?,
-      );
+    bubbleShowCnt: json['bubble_show_cnt'] as int?,
+    iconShow: json['icon_show'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/icon_font.dart b/lib/models_new/pgc/pgc_info_model/icon_font.dart
index ce163b037..0c5e2d35c 100644
--- a/lib/models_new/pgc/pgc_info_model/icon_font.dart
+++ b/lib/models_new/pgc/pgc_info_model/icon_font.dart
@@ -5,7 +5,7 @@ class IconFont {
   IconFont({this.name, this.text});
 
   factory IconFont.fromJson(Map<String, dynamic> json) => IconFont(
-        name: json['name'] as String?,
-        text: json['text'] as String?,
-      );
+    name: json['name'] as String?,
+    text: json['text'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/new_ep.dart b/lib/models_new/pgc/pgc_info_model/new_ep.dart
index 5ff26beaf..a11fcb57e 100644
--- a/lib/models_new/pgc/pgc_info_model/new_ep.dart
+++ b/lib/models_new/pgc/pgc_info_model/new_ep.dart
@@ -7,9 +7,9 @@ class NewEp {
   NewEp({this.desc, this.id, this.isNew, this.title});
 
   factory NewEp.fromJson(Map<String, dynamic> json) => NewEp(
-        desc: json['desc'] as String?,
-        id: json['id'] as int?,
-        isNew: json['is_new'] as int?,
-        title: json['title'] as String?,
-      );
+    desc: json['desc'] as String?,
+    id: json['id'] as int?,
+    isNew: json['is_new'] as int?,
+    title: json['title'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/op.dart b/lib/models_new/pgc/pgc_info_model/op.dart
index e5bb3dfd2..fa1170b35 100644
--- a/lib/models_new/pgc/pgc_info_model/op.dart
+++ b/lib/models_new/pgc/pgc_info_model/op.dart
@@ -5,7 +5,7 @@ class Op {
   Op({this.end, this.start});
 
   factory Op.fromJson(Map<String, dynamic> json) => Op(
-        end: json['end'] as int?,
-        start: json['start'] as int?,
-      );
+    end: json['end'] as int?,
+    start: json['start'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/pay_type.dart b/lib/models_new/pgc/pgc_info_model/pay_type.dart
index 935d5de9b..d0eed292e 100644
--- a/lib/models_new/pgc/pgc_info_model/pay_type.dart
+++ b/lib/models_new/pgc/pgc_info_model/pay_type.dart
@@ -16,11 +16,11 @@ class PayType {
   });
 
   factory PayType.fromJson(Map<String, dynamic> json) => PayType(
-        allowDiscount: json['allow_discount'] as int?,
-        allowPack: json['allow_pack'] as int?,
-        allowTicket: json['allow_ticket'] as int?,
-        allowTimeLimit: json['allow_time_limit'] as int?,
-        allowVipDiscount: json['allow_vip_discount'] as int?,
-        forbidBb: json['forbid_bb'] as int?,
-      );
+    allowDiscount: json['allow_discount'] as int?,
+    allowPack: json['allow_pack'] as int?,
+    allowTicket: json['allow_ticket'] as int?,
+    allowTimeLimit: json['allow_time_limit'] as int?,
+    allowVipDiscount: json['allow_vip_discount'] as int?,
+    forbidBb: json['forbid_bb'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/payment.dart b/lib/models_new/pgc/pgc_info_model/payment.dart
index 567a2468b..c47870d79 100644
--- a/lib/models_new/pgc/pgc_info_model/payment.dart
+++ b/lib/models_new/pgc/pgc_info_model/payment.dart
@@ -26,17 +26,17 @@ class Payment {
   });
 
   factory Payment.fromJson(Map<String, dynamic> json) => Payment(
-        discount: json['discount'] as int?,
-        payType: json['pay_type'] == null
-            ? null
-            : PayType.fromJson(json['pay_type'] as Map<String, dynamic>),
-        price: json['price'] as String?,
-        promotion: json['promotion'] as String?,
-        tip: json['tip'] as String?,
-        viewStartTime: json['view_start_time'] as int?,
-        vipDiscount: json['vip_discount'] as int?,
-        vipFirstPromotion: json['vip_first_promotion'] as String?,
-        vipPrice: json['vip_price'] as String?,
-        vipPromotion: json['vip_promotion'] as String?,
-      );
+    discount: json['discount'] as int?,
+    payType: json['pay_type'] == null
+        ? null
+        : PayType.fromJson(json['pay_type'] as Map<String, dynamic>),
+    price: json['price'] as String?,
+    promotion: json['promotion'] as String?,
+    tip: json['tip'] as String?,
+    viewStartTime: json['view_start_time'] as int?,
+    vipDiscount: json['vip_discount'] as int?,
+    vipFirstPromotion: json['vip_first_promotion'] as String?,
+    vipPrice: json['vip_price'] as String?,
+    vipPromotion: json['vip_promotion'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/play_strategy.dart b/lib/models_new/pgc/pgc_info_model/play_strategy.dart
index 5bf729d02..4211cdffa 100644
--- a/lib/models_new/pgc/pgc_info_model/play_strategy.dart
+++ b/lib/models_new/pgc/pgc_info_model/play_strategy.dart
@@ -4,6 +4,6 @@ class PlayStrategy {
   PlayStrategy({this.strategies});
 
   factory PlayStrategy.fromJson(Map<String, dynamic> json) => PlayStrategy(
-        strategies: json['strategies'],
-      );
+    strategies: json['strategies'],
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/positive.dart b/lib/models_new/pgc/pgc_info_model/positive.dart
index 41c859a73..9b986cdf6 100644
--- a/lib/models_new/pgc/pgc_info_model/positive.dart
+++ b/lib/models_new/pgc/pgc_info_model/positive.dart
@@ -5,7 +5,7 @@ class Positive {
   Positive({this.id, this.title});
 
   factory Positive.fromJson(Map<String, dynamic> json) => Positive(
-        id: json['id'] as int?,
-        title: json['title'] as String?,
-      );
+    id: json['id'] as int?,
+    title: json['title'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/publish.dart b/lib/models_new/pgc/pgc_info_model/publish.dart
index 071511247..065cad121 100644
--- a/lib/models_new/pgc/pgc_info_model/publish.dart
+++ b/lib/models_new/pgc/pgc_info_model/publish.dart
@@ -16,11 +16,11 @@ class Publish {
   });
 
   factory Publish.fromJson(Map<String, dynamic> json) => Publish(
-        isFinish: json['is_finish'] as int?,
-        isStarted: json['is_started'] as int?,
-        pubTime: json['pub_time'] as String?,
-        pubTimeShow: json['pub_time_show'] as String?,
-        unknowPubDate: json['unknow_pub_date'] as int?,
-        weekday: json['weekday'] as int?,
-      );
+    isFinish: json['is_finish'] as int?,
+    isStarted: json['is_started'] as int?,
+    pubTime: json['pub_time'] as String?,
+    pubTimeShow: json['pub_time_show'] as String?,
+    unknowPubDate: json['unknow_pub_date'] as int?,
+    weekday: json['weekday'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/rating.dart b/lib/models_new/pgc/pgc_info_model/rating.dart
index 23300acdf..0f082f86d 100644
--- a/lib/models_new/pgc/pgc_info_model/rating.dart
+++ b/lib/models_new/pgc/pgc_info_model/rating.dart
@@ -5,7 +5,7 @@ class Rating {
   Rating({this.count, this.score});
 
   factory Rating.fromJson(Map<String, dynamic> json) => Rating(
-        count: json['count'] as int?,
-        score: (json['score'] as num?)?.toDouble(),
-      );
+    count: json['count'] as int?,
+    score: (json['score'] as num?)?.toDouble(),
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/result.dart b/lib/models_new/pgc/pgc_info_model/result.dart
index 63ad218fd..910c98a5e 100644
--- a/lib/models_new/pgc/pgc_info_model/result.dart
+++ b/lib/models_new/pgc/pgc_info_model/result.dart
@@ -116,90 +116,89 @@ class PgcInfoModel {
   });
 
   factory PgcInfoModel.fromJson(Map<String, dynamic> json) => PgcInfoModel(
-        activity: json['activity'] == null
-            ? null
-            : Activity.fromJson(json['activity'] as Map<String, dynamic>),
-        actors: json['actors'] as String?,
-        alias: json['alias'] as String?,
-        areas: (json['areas'] as List<dynamic>?)
-            ?.map((e) => Area.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        bkgCover: json['bkg_cover'] as String?,
-        cover: json['cover'] as String?,
-        deliveryFragmentVideo: json['delivery_fragment_video'] as bool?,
-        enableVt: json['enable_vt'] as bool?,
-        episodes: (json['episodes'] as List<dynamic>?)
-            ?.map((e) => EpisodeItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        evaluate: json['evaluate'] as String?,
-        freya: json['freya'] == null
-            ? null
-            : Freya.fromJson(json['freya'] as Map<String, dynamic>),
-        hideEpVvVtDm: json['hide_ep_vv_vt_dm'] as int?,
-        iconFont: json['icon_font'] == null
-            ? null
-            : IconFont.fromJson(json['icon_font'] as Map<String, dynamic>),
-        jpTitle: json['jp_title'] as String?,
-        link: json['link'] as String?,
-        mediaId: json['media_id'] as int?,
-        mode: json['mode'] as int?,
-        newEp: json['new_ep'] == null
-            ? null
-            : NewEp.fromJson(json['new_ep'] as Map<String, dynamic>),
-        payment: json['payment'] == null
-            ? null
-            : Payment.fromJson(json['payment'] as Map<String, dynamic>),
-        playStrategy: json['play_strategy'] == null
-            ? null
-            : PlayStrategy.fromJson(
-                json['play_strategy'] as Map<String, dynamic>),
-        positive: json['positive'] == null
-            ? null
-            : Positive.fromJson(json['positive'] as Map<String, dynamic>),
-        publish: json['publish'] == null
-            ? null
-            : Publish.fromJson(json['publish'] as Map<String, dynamic>),
-        rating: json['rating'] == null
-            ? null
-            : Rating.fromJson(json['rating'] as Map<String, dynamic>),
-        record: json['record'] as String?,
-        rights: json['rights'] == null
-            ? null
-            : Rights.fromJson(json['rights'] as Map<String, dynamic>),
-        seasonId: json['season_id'] as int?,
-        seasonTitle: json['season_title'] as String?,
-        seasons: (json['seasons'] as List<dynamic>?)
-            ?.map((e) => Season.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        section: (json['section'] as List<dynamic>?)
-            ?.map((e) => Section.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        series: json['series'] == null
-            ? null
-            : Series.fromJson(json['series'] as Map<String, dynamic>),
-        shareCopy: json['share_copy'] as String?,
-        shareSubTitle: json['share_sub_title'] as String?,
-        shareUrl: json['share_url'] as String?,
-        show: json['show'] == null
-            ? null
-            : Show.fromJson(json['show'] as Map<String, dynamic>),
-        showSeasonType: json['show_season_type'] as int?,
-        squareCover: json['square_cover'] as String?,
-        staff: json['staff'] as String?,
-        stat: json['stat'] == null
-            ? null
-            : Stat.fromJson(json['stat'] as Map<String, dynamic>),
-        status: json['status'] as int?,
-        styles: json['styles'],
-        subtitle: json['subtitle'] as String?,
-        title: json['title'] as String?,
-        total: json['total'] as int?,
-        type: json['type'] as int?,
-        upInfo: json['up_info'] == null
-            ? null
-            : UpInfo.fromJson(json['up_info'] as Map<String, dynamic>),
-        userStatus: json['user_status'] == null
-            ? null
-            : UserStatus.fromJson(json['user_status'] as Map<String, dynamic>),
-      );
+    activity: json['activity'] == null
+        ? null
+        : Activity.fromJson(json['activity'] as Map<String, dynamic>),
+    actors: json['actors'] as String?,
+    alias: json['alias'] as String?,
+    areas: (json['areas'] as List<dynamic>?)
+        ?.map((e) => Area.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    bkgCover: json['bkg_cover'] as String?,
+    cover: json['cover'] as String?,
+    deliveryFragmentVideo: json['delivery_fragment_video'] as bool?,
+    enableVt: json['enable_vt'] as bool?,
+    episodes: (json['episodes'] as List<dynamic>?)
+        ?.map((e) => EpisodeItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    evaluate: json['evaluate'] as String?,
+    freya: json['freya'] == null
+        ? null
+        : Freya.fromJson(json['freya'] as Map<String, dynamic>),
+    hideEpVvVtDm: json['hide_ep_vv_vt_dm'] as int?,
+    iconFont: json['icon_font'] == null
+        ? null
+        : IconFont.fromJson(json['icon_font'] as Map<String, dynamic>),
+    jpTitle: json['jp_title'] as String?,
+    link: json['link'] as String?,
+    mediaId: json['media_id'] as int?,
+    mode: json['mode'] as int?,
+    newEp: json['new_ep'] == null
+        ? null
+        : NewEp.fromJson(json['new_ep'] as Map<String, dynamic>),
+    payment: json['payment'] == null
+        ? null
+        : Payment.fromJson(json['payment'] as Map<String, dynamic>),
+    playStrategy: json['play_strategy'] == null
+        ? null
+        : PlayStrategy.fromJson(json['play_strategy'] as Map<String, dynamic>),
+    positive: json['positive'] == null
+        ? null
+        : Positive.fromJson(json['positive'] as Map<String, dynamic>),
+    publish: json['publish'] == null
+        ? null
+        : Publish.fromJson(json['publish'] as Map<String, dynamic>),
+    rating: json['rating'] == null
+        ? null
+        : Rating.fromJson(json['rating'] as Map<String, dynamic>),
+    record: json['record'] as String?,
+    rights: json['rights'] == null
+        ? null
+        : Rights.fromJson(json['rights'] as Map<String, dynamic>),
+    seasonId: json['season_id'] as int?,
+    seasonTitle: json['season_title'] as String?,
+    seasons: (json['seasons'] as List<dynamic>?)
+        ?.map((e) => Season.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    section: (json['section'] as List<dynamic>?)
+        ?.map((e) => Section.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    series: json['series'] == null
+        ? null
+        : Series.fromJson(json['series'] as Map<String, dynamic>),
+    shareCopy: json['share_copy'] as String?,
+    shareSubTitle: json['share_sub_title'] as String?,
+    shareUrl: json['share_url'] as String?,
+    show: json['show'] == null
+        ? null
+        : Show.fromJson(json['show'] as Map<String, dynamic>),
+    showSeasonType: json['show_season_type'] as int?,
+    squareCover: json['square_cover'] as String?,
+    staff: json['staff'] as String?,
+    stat: json['stat'] == null
+        ? null
+        : Stat.fromJson(json['stat'] as Map<String, dynamic>),
+    status: json['status'] as int?,
+    styles: json['styles'],
+    subtitle: json['subtitle'] as String?,
+    title: json['title'] as String?,
+    total: json['total'] as int?,
+    type: json['type'] as int?,
+    upInfo: json['up_info'] == null
+        ? null
+        : UpInfo.fromJson(json['up_info'] as Map<String, dynamic>),
+    userStatus: json['user_status'] == null
+        ? null
+        : UserStatus.fromJson(json['user_status'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/rights.dart b/lib/models_new/pgc/pgc_info_model/rights.dart
index b774a73a9..2f70a13d1 100644
--- a/lib/models_new/pgc/pgc_info_model/rights.dart
+++ b/lib/models_new/pgc/pgc_info_model/rights.dart
@@ -6,8 +6,8 @@ class Rights {
   Rights({this.allowDm, this.allowDownload, this.areaLimit});
 
   factory Rights.fromJson(Map<String, dynamic> json) => Rights(
-        allowDm: json['allow_dm'] as int?,
-        allowDownload: json['allow_download'] as int?,
-        areaLimit: json['area_limit'] as int?,
-      );
+    allowDm: json['allow_dm'] as int?,
+    allowDownload: json['allow_download'] as int?,
+    areaLimit: json['area_limit'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/season.dart b/lib/models_new/pgc/pgc_info_model/season.dart
index b9c1e1b97..66ed9b30d 100644
--- a/lib/models_new/pgc/pgc_info_model/season.dart
+++ b/lib/models_new/pgc/pgc_info_model/season.dart
@@ -37,27 +37,27 @@ class Season {
   });
 
   factory Season.fromJson(Map<String, dynamic> json) => Season(
-        badge: json['badge'] as String?,
-        badgeInfo: json['badge_info'] == null
-            ? null
-            : BadgeInfo.fromJson(json['badge_info'] as Map<String, dynamic>),
-        badgeType: json['badge_type'] as int?,
-        cover: json['cover'] as String?,
-        enableVt: json['enable_vt'] as bool?,
-        horizontalCover1610: json['horizontal_cover_1610'] as String?,
-        horizontalCover169: json['horizontal_cover_169'] as String?,
-        iconFont: json['icon_font'] == null
-            ? null
-            : IconFont.fromJson(json['icon_font'] as Map<String, dynamic>),
-        mediaId: json['media_id'] as int?,
-        newEp: json['new_ep'] == null
-            ? null
-            : NewEp.fromJson(json['new_ep'] as Map<String, dynamic>),
-        seasonId: json['season_id'] as int?,
-        seasonTitle: json['season_title'] as String?,
-        seasonType: json['season_type'] as int?,
-        stat: json['stat'] == null
-            ? null
-            : Stat.fromJson(json['stat'] as Map<String, dynamic>),
-      );
+    badge: json['badge'] as String?,
+    badgeInfo: json['badge_info'] == null
+        ? null
+        : BadgeInfo.fromJson(json['badge_info'] as Map<String, dynamic>),
+    badgeType: json['badge_type'] as int?,
+    cover: json['cover'] as String?,
+    enableVt: json['enable_vt'] as bool?,
+    horizontalCover1610: json['horizontal_cover_1610'] as String?,
+    horizontalCover169: json['horizontal_cover_169'] as String?,
+    iconFont: json['icon_font'] == null
+        ? null
+        : IconFont.fromJson(json['icon_font'] as Map<String, dynamic>),
+    mediaId: json['media_id'] as int?,
+    newEp: json['new_ep'] == null
+        ? null
+        : NewEp.fromJson(json['new_ep'] as Map<String, dynamic>),
+    seasonId: json['season_id'] as int?,
+    seasonTitle: json['season_title'] as String?,
+    seasonType: json['season_type'] as int?,
+    stat: json['stat'] == null
+        ? null
+        : Stat.fromJson(json['stat'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/section.dart b/lib/models_new/pgc/pgc_info_model/section.dart
index 4f1310b58..ad208740d 100644
--- a/lib/models_new/pgc/pgc_info_model/section.dart
+++ b/lib/models_new/pgc/pgc_info_model/section.dart
@@ -22,15 +22,15 @@ class Section {
   });
 
   factory Section.fromJson(Map<String, dynamic> json) => Section(
-        attr: json['attr'] as int?,
-        episodeId: json['episode_id'] as int?,
-        episodeIds: json['episode_ids'] as List<dynamic>?,
-        episodes: (json['episodes'] as List<dynamic>?)
-            ?.map((e) => EpisodeItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        id: json['id'] as int?,
-        title: json['title'] as String?,
-        type: json['type'] as int?,
-        type2: json['type2'] as int?,
-      );
+    attr: json['attr'] as int?,
+    episodeId: json['episode_id'] as int?,
+    episodeIds: json['episode_ids'] as List<dynamic>?,
+    episodes: (json['episodes'] as List<dynamic>?)
+        ?.map((e) => EpisodeItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    id: json['id'] as int?,
+    title: json['title'] as String?,
+    type: json['type'] as int?,
+    type2: json['type2'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/series.dart b/lib/models_new/pgc/pgc_info_model/series.dart
index 9ac034d98..a359d21b7 100644
--- a/lib/models_new/pgc/pgc_info_model/series.dart
+++ b/lib/models_new/pgc/pgc_info_model/series.dart
@@ -6,8 +6,8 @@ class Series {
   Series({this.displayType, this.seriesId, this.seriesTitle});
 
   factory Series.fromJson(Map<String, dynamic> json) => Series(
-        displayType: json['display_type'] as int?,
-        seriesId: json['series_id'] as int?,
-        seriesTitle: json['series_title'] as String?,
-      );
+    displayType: json['display_type'] as int?,
+    seriesId: json['series_id'] as int?,
+    seriesTitle: json['series_title'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/show.dart b/lib/models_new/pgc/pgc_info_model/show.dart
index 3e4b1184c..3310f59be 100644
--- a/lib/models_new/pgc/pgc_info_model/show.dart
+++ b/lib/models_new/pgc/pgc_info_model/show.dart
@@ -4,6 +4,6 @@ class Show {
   Show({this.wideScreen});
 
   factory Show.fromJson(Map<String, dynamic> json) => Show(
-        wideScreen: json['wide_screen'] as int?,
-      );
+    wideScreen: json['wide_screen'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/skip.dart b/lib/models_new/pgc/pgc_info_model/skip.dart
index afb0270e4..106e098cd 100644
--- a/lib/models_new/pgc/pgc_info_model/skip.dart
+++ b/lib/models_new/pgc/pgc_info_model/skip.dart
@@ -8,11 +8,11 @@ class Skip {
   Skip({this.ed, this.op});
 
   factory Skip.fromJson(Map<String, dynamic> json) => Skip(
-        ed: json['ed'] == null
-            ? null
-            : Ed.fromJson(json['ed'] as Map<String, dynamic>),
-        op: json['op'] == null
-            ? null
-            : Op.fromJson(json['op'] as Map<String, dynamic>),
-      );
+    ed: json['ed'] == null
+        ? null
+        : Ed.fromJson(json['ed'] as Map<String, dynamic>),
+    op: json['op'] == null
+        ? null
+        : Op.fromJson(json['op'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/stat.dart b/lib/models_new/pgc/pgc_info_model/stat.dart
index bc0a3b2c6..23eae9d99 100644
--- a/lib/models_new/pgc/pgc_info_model/stat.dart
+++ b/lib/models_new/pgc/pgc_info_model/stat.dart
@@ -24,15 +24,15 @@ class Stat {
   });
 
   factory Stat.fromJson(Map<String, dynamic> json) => Stat(
-        coins: json["coins"],
-        danmakus: json["danmakus"],
-        favorite: json["favorite"],
-        favorites: json["favorites"],
-        followText: json["follow_text"],
-        likes: json["likes"],
-        reply: json["reply"],
-        share: json["share"],
-        views: json["views"],
-        vt: json["vt"],
-      );
+    coins: json["coins"],
+    danmakus: json["danmakus"],
+    favorite: json["favorite"],
+    favorites: json["favorites"],
+    followText: json["follow_text"],
+    likes: json["likes"],
+    reply: json["reply"],
+    share: json["share"],
+    views: json["views"],
+    vt: json["vt"],
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/stat_for_unity.dart b/lib/models_new/pgc/pgc_info_model/stat_for_unity.dart
index d5be058d5..f8c420480 100644
--- a/lib/models_new/pgc/pgc_info_model/stat_for_unity.dart
+++ b/lib/models_new/pgc/pgc_info_model/stat_for_unity.dart
@@ -11,14 +11,14 @@ class StatForUnity {
   StatForUnity({this.coin, this.danmaku, this.likes, this.reply, this.vt});
 
   factory StatForUnity.fromJson(Map<String, dynamic> json) => StatForUnity(
-        coin: json['coin'] as num?,
-        danmaku: json['danmaku'] == null
-            ? null
-            : Danmaku.fromJson(json['danmaku'] as Map<String, dynamic>),
-        likes: json['likes'] as int?,
-        reply: json['reply'] as int?,
-        vt: json['vt'] == null
-            ? null
-            : Vt.fromJson(json['vt'] as Map<String, dynamic>),
-      );
+    coin: json['coin'] as num?,
+    danmaku: json['danmaku'] == null
+        ? null
+        : Danmaku.fromJson(json['danmaku'] as Map<String, dynamic>),
+    likes: json['likes'] as int?,
+    reply: json['reply'] as int?,
+    vt: json['vt'] == null
+        ? null
+        : Vt.fromJson(json['vt'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/up_info.dart b/lib/models_new/pgc/pgc_info_model/up_info.dart
index 2a6d219ec..2f2f57e29 100644
--- a/lib/models_new/pgc/pgc_info_model/up_info.dart
+++ b/lib/models_new/pgc/pgc_info_model/up_info.dart
@@ -26,16 +26,16 @@ class UpInfo {
   });
 
   factory UpInfo.fromJson(Map<String, dynamic> json) => UpInfo(
-        avatar: json['avatar'] as String?,
-        avatarSubscriptUrl: json['avatar_subscript_url'] as String?,
-        follower: json['follower'] as int?,
-        isFollow: json['is_follow'] as int?,
-        mid: json['mid'] as int?,
-        nicknameColor: json['nickname_color'] as String?,
-        themeType: json['theme_type'] as int?,
-        uname: json['uname'] as String?,
-        verifyType: json['verify_type'] as int?,
-        vipStatus: json['vip_status'] as int?,
-        vipType: json['vip_type'] as int?,
-      );
+    avatar: json['avatar'] as String?,
+    avatarSubscriptUrl: json['avatar_subscript_url'] as String?,
+    follower: json['follower'] as int?,
+    isFollow: json['is_follow'] as int?,
+    mid: json['mid'] as int?,
+    nicknameColor: json['nickname_color'] as String?,
+    themeType: json['theme_type'] as int?,
+    uname: json['uname'] as String?,
+    verifyType: json['verify_type'] as int?,
+    vipStatus: json['vip_status'] as int?,
+    vipType: json['vip_type'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/user_status.dart b/lib/models_new/pgc/pgc_info_model/user_status.dart
index 588a0db97..8c68d562f 100644
--- a/lib/models_new/pgc/pgc_info_model/user_status.dart
+++ b/lib/models_new/pgc/pgc_info_model/user_status.dart
@@ -24,16 +24,16 @@ class UserStatus {
   });
 
   factory UserStatus.fromJson(Map<String, dynamic> json) => UserStatus(
-        areaLimit: json['area_limit'] as int?,
-        banAreaShow: json['ban_area_show'] as int?,
-        follow: json['follow'] as int?,
-        followStatus: json['follow_status'] as int?,
-        login: json['login'] as int?,
-        pay: json['pay'] as int?,
-        payPackPaid: json['pay_pack_paid'] as int?,
-        sponsor: json['sponsor'] as int?,
-        progress: json['progress'] == null
-            ? null
-            : UserProgress.fromJson(json['progress']),
-      );
+    areaLimit: json['area_limit'] as int?,
+    banAreaShow: json['ban_area_show'] as int?,
+    follow: json['follow'] as int?,
+    followStatus: json['follow_status'] as int?,
+    login: json['login'] as int?,
+    pay: json['pay'] as int?,
+    payPackPaid: json['pay_pack_paid'] as int?,
+    sponsor: json['sponsor'] as int?,
+    progress: json['progress'] == null
+        ? null
+        : UserProgress.fromJson(json['progress']),
+  );
 }
diff --git a/lib/models_new/pgc/pgc_info_model/vt.dart b/lib/models_new/pgc/pgc_info_model/vt.dart
index 6f269ed50..c1b0a4bfa 100644
--- a/lib/models_new/pgc/pgc_info_model/vt.dart
+++ b/lib/models_new/pgc/pgc_info_model/vt.dart
@@ -7,9 +7,9 @@ class Vt {
   Vt({this.icon, this.pureText, this.text, this.value});
 
   factory Vt.fromJson(Map<String, dynamic> json) => Vt(
-        icon: json['icon'] as String?,
-        pureText: json['pure_text'] as String?,
-        text: json['text'] as String?,
-        value: json['value'] as int?,
-      );
+    icon: json['icon'] as String?,
+    pureText: json['pure_text'] as String?,
+    text: json['text'] as String?,
+    value: json['value'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_rank/badge_info.dart b/lib/models_new/pgc/pgc_rank/badge_info.dart
index 3b929ee6c..a5c15c028 100644
--- a/lib/models_new/pgc/pgc_rank/badge_info.dart
+++ b/lib/models_new/pgc/pgc_rank/badge_info.dart
@@ -6,8 +6,8 @@ class BadgeInfo {
   BadgeInfo({this.bgColor, this.bgColorNight, this.text});
 
   factory BadgeInfo.fromJson(Map<String, dynamic> json) => BadgeInfo(
-        bgColor: json['bg_color'] as String?,
-        bgColorNight: json['bg_color_night'] as String?,
-        text: json['text'] as String?,
-      );
+    bgColor: json['bg_color'] as String?,
+    bgColorNight: json['bg_color_night'] as String?,
+    text: json['text'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_rank/data.dart b/lib/models_new/pgc/pgc_rank/data.dart
index d04270ab5..49e7f2374 100644
--- a/lib/models_new/pgc/pgc_rank/data.dart
+++ b/lib/models_new/pgc/pgc_rank/data.dart
@@ -8,10 +8,10 @@ class Data {
   Data({this.list, this.note, this.seasonType});
 
   factory Data.fromJson(Map<String, dynamic> json) => Data(
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => PgcRankItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        note: json['note'] as String?,
-        seasonType: json['season_type'] as int?,
-      );
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => PgcRankItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    note: json['note'] as String?,
+    seasonType: json['season_type'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_rank/icon_font.dart b/lib/models_new/pgc/pgc_rank/icon_font.dart
index ce163b037..0c5e2d35c 100644
--- a/lib/models_new/pgc/pgc_rank/icon_font.dart
+++ b/lib/models_new/pgc/pgc_rank/icon_font.dart
@@ -5,7 +5,7 @@ class IconFont {
   IconFont({this.name, this.text});
 
   factory IconFont.fromJson(Map<String, dynamic> json) => IconFont(
-        name: json['name'] as String?,
-        text: json['text'] as String?,
-      );
+    name: json['name'] as String?,
+    text: json['text'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_rank/new_ep.dart b/lib/models_new/pgc/pgc_rank/new_ep.dart
index fcb815594..37c5c1bf7 100644
--- a/lib/models_new/pgc/pgc_rank/new_ep.dart
+++ b/lib/models_new/pgc/pgc_rank/new_ep.dart
@@ -5,7 +5,7 @@ class NewEp {
   NewEp({this.cover, this.indexShow});
 
   factory NewEp.fromJson(Map<String, dynamic> json) => NewEp(
-        cover: json['cover'] as String?,
-        indexShow: json['index_show'] as String?,
-      );
+    cover: json['cover'] as String?,
+    indexShow: json['index_show'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_rank/stat.dart b/lib/models_new/pgc/pgc_rank/stat.dart
index 23c6cd3d2..0a06129ac 100644
--- a/lib/models_new/pgc/pgc_rank/stat.dart
+++ b/lib/models_new/pgc/pgc_rank/stat.dart
@@ -7,9 +7,9 @@ class Stat {
   Stat({this.danmaku, this.follow, this.seriesFollow, this.view});
 
   factory Stat.fromJson(Map<String, dynamic> json) => Stat(
-        danmaku: json['danmaku'] as int?,
-        follow: (json['follow'] as int?) ?? 0,
-        seriesFollow: json['series_follow'] as int?,
-        view: (json['view'] as int?) ?? 0,
-      );
+    danmaku: json['danmaku'] as int?,
+    follow: (json['follow'] as int?) ?? 0,
+    seriesFollow: json['series_follow'] as int?,
+    view: (json['view'] as int?) ?? 0,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_review/author.dart b/lib/models_new/pgc/pgc_review/author.dart
index 789e9a04f..09e0e7595 100644
--- a/lib/models_new/pgc/pgc_review/author.dart
+++ b/lib/models_new/pgc/pgc_review/author.dart
@@ -16,12 +16,12 @@ class Author {
   });
 
   factory Author.fromJson(Map<String, dynamic> json) => Author(
-        avatar: json['avatar'] as String?,
-        level: json['level'] as int?,
-        mid: json['mid'] as int?,
-        uname: json['uname'] as String?,
-        vip: json['vip'] == null
-            ? null
-            : Vip.fromJson(json['vip'] as Map<String, dynamic>),
-      );
+    avatar: json['avatar'] as String?,
+    level: json['level'] as int?,
+    mid: json['mid'] as int?,
+    uname: json['uname'] as String?,
+    vip: json['vip'] == null
+        ? null
+        : Vip.fromJson(json['vip'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/pgc/pgc_review/data.dart b/lib/models_new/pgc/pgc_review/data.dart
index 12eb6bb28..b2686c54b 100644
--- a/lib/models_new/pgc/pgc_review/data.dart
+++ b/lib/models_new/pgc/pgc_review/data.dart
@@ -8,10 +8,10 @@ class PgcReviewData {
   PgcReviewData({this.list, this.next, this.count});
 
   factory PgcReviewData.fromJson(Map<String, dynamic> json) => PgcReviewData(
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => PgcReviewItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        next: json['next'] as String?,
-        count: json['count'] ?? json['total'],
-      );
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => PgcReviewItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    next: json['next'] as String?,
+    count: json['count'] ?? json['total'],
+  );
 }
diff --git a/lib/models_new/pgc/pgc_review/stat.dart b/lib/models_new/pgc/pgc_review/stat.dart
index def54cfd2..e8795d026 100644
--- a/lib/models_new/pgc/pgc_review/stat.dart
+++ b/lib/models_new/pgc/pgc_review/stat.dart
@@ -6,8 +6,8 @@ class Stat {
   Stat({this.disliked, this.liked, this.likes});
 
   factory Stat.fromJson(Map<String, dynamic> json) => Stat(
-        disliked: json['disliked'] as int?,
-        liked: json['liked'] as int?,
-        likes: json['likes'] as int?,
-      );
+    disliked: json['disliked'] as int?,
+    liked: json['liked'] as int?,
+    likes: json['likes'] as int?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_timeline/episode.dart b/lib/models_new/pgc/pgc_timeline/episode.dart
index e77908a83..417c6d175 100644
--- a/lib/models_new/pgc/pgc_timeline/episode.dart
+++ b/lib/models_new/pgc/pgc_timeline/episode.dart
@@ -44,26 +44,26 @@ class Episode {
   });
 
   factory Episode.fromJson(Map<String, dynamic> json) => Episode(
-        cover: json['cover'] as String?,
-        delay: json['delay'] as int?,
-        delayId: json['delay_id'] as int?,
-        delayIndex: json['delay_index'] as String?,
-        delayReason: json['delay_reason'] as String?,
-        enableVt: json['enable_vt'] as bool?,
-        epCover: json['ep_cover'] as String?,
-        episodeId: json['episode_id'] as int?,
-        follow: json['follow'] as int?,
-        follows: json['follows'] as String?,
-        iconFont: json['icon_font'] == null
-            ? null
-            : IconFont.fromJson(json['icon_font'] as Map<String, dynamic>),
-        plays: json['plays'] as String?,
-        pubIndex: json['pub_index'] as String?,
-        pubTime: json['pub_time'] as String?,
-        pubTs: json['pub_ts'] as int?,
-        published: json['published'] as int?,
-        seasonId: json['season_id'] as int?,
-        squareCover: json['square_cover'] as String?,
-        title: json['title'] as String?,
-      );
+    cover: json['cover'] as String?,
+    delay: json['delay'] as int?,
+    delayId: json['delay_id'] as int?,
+    delayIndex: json['delay_index'] as String?,
+    delayReason: json['delay_reason'] as String?,
+    enableVt: json['enable_vt'] as bool?,
+    epCover: json['ep_cover'] as String?,
+    episodeId: json['episode_id'] as int?,
+    follow: json['follow'] as int?,
+    follows: json['follows'] as String?,
+    iconFont: json['icon_font'] == null
+        ? null
+        : IconFont.fromJson(json['icon_font'] as Map<String, dynamic>),
+    plays: json['plays'] as String?,
+    pubIndex: json['pub_index'] as String?,
+    pubTime: json['pub_time'] as String?,
+    pubTs: json['pub_ts'] as int?,
+    published: json['published'] as int?,
+    seasonId: json['season_id'] as int?,
+    squareCover: json['square_cover'] as String?,
+    title: json['title'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_timeline/icon_font.dart b/lib/models_new/pgc/pgc_timeline/icon_font.dart
index ce163b037..0c5e2d35c 100644
--- a/lib/models_new/pgc/pgc_timeline/icon_font.dart
+++ b/lib/models_new/pgc/pgc_timeline/icon_font.dart
@@ -5,7 +5,7 @@ class IconFont {
   IconFont({this.name, this.text});
 
   factory IconFont.fromJson(Map<String, dynamic> json) => IconFont(
-        name: json['name'] as String?,
-        text: json['text'] as String?,
-      );
+    name: json['name'] as String?,
+    text: json['text'] as String?,
+  );
 }
diff --git a/lib/models_new/pgc/pgc_timeline/pgc_timeline.dart b/lib/models_new/pgc/pgc_timeline/pgc_timeline.dart
index 7bf71bc35..1f8c1dcba 100644
--- a/lib/models_new/pgc/pgc_timeline/pgc_timeline.dart
+++ b/lib/models_new/pgc/pgc_timeline/pgc_timeline.dart
@@ -8,10 +8,10 @@ class PgcTimeline {
   PgcTimeline({this.code, this.message, this.result});
 
   factory PgcTimeline.fromJson(Map<String, dynamic> json) => PgcTimeline(
-        code: json['code'] as int?,
-        message: json['message'] as String?,
-        result: (json['result'] as List<dynamic>?)
-            ?.map((e) => Result.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    code: json['code'] as int?,
+    message: json['message'] as String?,
+    result: (json['result'] as List<dynamic>?)
+        ?.map((e) => Result.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/pgc/pgc_timeline/result.dart b/lib/models_new/pgc/pgc_timeline/result.dart
index da4b14bfe..a897aa462 100644
--- a/lib/models_new/pgc/pgc_timeline/result.dart
+++ b/lib/models_new/pgc/pgc_timeline/result.dart
@@ -16,12 +16,12 @@ class Result {
   });
 
   factory Result.fromJson(Map<String, dynamic> json) => Result(
-        date: json['date'] as String?,
-        dateTs: json['date_ts'] as int?,
-        dayOfWeek: json['day_of_week'] as int?,
-        episodes: (json['episodes'] as List<dynamic>?)
-            ?.map((e) => Episode.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        isToday: json['is_today'] as int?,
-      );
+    date: json['date'] as String?,
+    dateTs: json['date_ts'] as int?,
+    dayOfWeek: json['day_of_week'] as int?,
+    episodes: (json['episodes'] as List<dynamic>?)
+        ?.map((e) => Episode.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    isToday: json['is_today'] as int?,
+  );
 }
diff --git a/lib/models_new/reply/content.dart b/lib/models_new/reply/content.dart
index ad6390066..c9da86bfb 100644
--- a/lib/models_new/reply/content.dart
+++ b/lib/models_new/reply/content.dart
@@ -18,13 +18,13 @@ class ReplyContent {
   });
 
   factory ReplyContent.fromJson(Map<String, dynamic> json) => ReplyContent(
-        message: json['message'] as String?,
-        members: json['members'] as List<dynamic>?,
-        jumpUrl: json['jump_url'],
-        maxLine: json['max_line'] as int?,
-        pictures: (json['pictures'] as List<dynamic>?)
-            ?.map((e) => ReplyPicture.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        pictureScale: (json['picture_scale'] as num?)?.toDouble(),
-      );
+    message: json['message'] as String?,
+    members: json['members'] as List<dynamic>?,
+    jumpUrl: json['jump_url'],
+    maxLine: json['max_line'] as int?,
+    pictures: (json['pictures'] as List<dynamic>?)
+        ?.map((e) => ReplyPicture.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    pictureScale: (json['picture_scale'] as num?)?.toDouble(),
+  );
 }
diff --git a/lib/models_new/reply/control.dart b/lib/models_new/reply/control.dart
index 8e211efd9..baf34d268 100644
--- a/lib/models_new/reply/control.dart
+++ b/lib/models_new/reply/control.dart
@@ -42,24 +42,24 @@ class ReplyControl {
   });
 
   factory ReplyControl.fromJson(Map<String, dynamic> json) => ReplyControl(
-        inputDisable: json['input_disable'] as bool?,
-        rootInputText: json['root_input_text'] as String?,
-        childInputText: json['child_input_text'] as String?,
-        giveupInputText: json['giveup_input_text'] as String?,
-        screenshotIconState: json['screenshot_icon_state'] as int?,
-        uploadPictureIconState: json['upload_picture_icon_state'] as int?,
-        answerGuideText: json['answer_guide_text'] as String?,
-        answerGuideIconUrl: json['answer_guide_icon_url'] as String?,
-        answerGuideIosUrl: json['answer_guide_ios_url'] as String?,
-        answerGuideAndroidUrl: json['answer_guide_android_url'] as String?,
-        bgText: json['bg_text'] as String?,
-        emptyPage: json['empty_page'] as dynamic,
-        showType: json['show_type'] as int?,
-        showText: json['show_text'] as String?,
-        webSelection: json['web_selection'] as bool?,
-        disableJumpEmote: json['disable_jump_emote'] as bool?,
-        enableCharged: json['enable_charged'] as bool?,
-        enableCmBizHelper: json['enable_cm_biz_helper'] as bool?,
-        preloadResources: json['preload_resources'] as dynamic,
-      );
+    inputDisable: json['input_disable'] as bool?,
+    rootInputText: json['root_input_text'] as String?,
+    childInputText: json['child_input_text'] as String?,
+    giveupInputText: json['giveup_input_text'] as String?,
+    screenshotIconState: json['screenshot_icon_state'] as int?,
+    uploadPictureIconState: json['upload_picture_icon_state'] as int?,
+    answerGuideText: json['answer_guide_text'] as String?,
+    answerGuideIconUrl: json['answer_guide_icon_url'] as String?,
+    answerGuideIosUrl: json['answer_guide_ios_url'] as String?,
+    answerGuideAndroidUrl: json['answer_guide_android_url'] as String?,
+    bgText: json['bg_text'] as String?,
+    emptyPage: json['empty_page'] as dynamic,
+    showType: json['show_type'] as int?,
+    showText: json['show_text'] as String?,
+    webSelection: json['web_selection'] as bool?,
+    disableJumpEmote: json['disable_jump_emote'] as bool?,
+    enableCharged: json['enable_charged'] as bool?,
+    enableCmBizHelper: json['enable_cm_biz_helper'] as bool?,
+    preloadResources: json['preload_resources'] as dynamic,
+  );
 }
diff --git a/lib/models_new/reply/cursor.dart b/lib/models_new/reply/cursor.dart
index 4a4a046dc..03be1a4d7 100644
--- a/lib/models_new/reply/cursor.dart
+++ b/lib/models_new/reply/cursor.dart
@@ -28,19 +28,20 @@ class ReplyCursor {
   });
 
   factory ReplyCursor.fromJson(Map<String, dynamic> json) => ReplyCursor(
-        isBegin: json['is_begin'] as bool?,
-        prev: json['prev'] as int?,
-        next: json['next'] as int?,
-        isEnd: json['is_end'] as bool?,
-        paginationReply: json['pagination_reply'] == null
-            ? null
-            : PaginationReply.fromJson(
-                json['pagination_reply'] as Map<String, dynamic>),
-        sessionId: json['session_id'] as String?,
-        mode: json['mode'] as int?,
-        modeText: json['mode_text'] as String?,
-        allCount: json['all_count'] as int?,
-        supportMode: (json['support_mode'] as List?)?.cast(),
-        name: json['name'] as String?,
-      );
+    isBegin: json['is_begin'] as bool?,
+    prev: json['prev'] as int?,
+    next: json['next'] as int?,
+    isEnd: json['is_end'] as bool?,
+    paginationReply: json['pagination_reply'] == null
+        ? null
+        : PaginationReply.fromJson(
+            json['pagination_reply'] as Map<String, dynamic>,
+          ),
+    sessionId: json['session_id'] as String?,
+    mode: json['mode'] as int?,
+    modeText: json['mode_text'] as String?,
+    allCount: json['all_count'] as int?,
+    supportMode: (json['support_mode'] as List?)?.cast(),
+    name: json['name'] as String?,
+  );
 }
diff --git a/lib/models_new/reply/data.dart b/lib/models_new/reply/data.dart
index 59e8adc64..0820e5b87 100644
--- a/lib/models_new/reply/data.dart
+++ b/lib/models_new/reply/data.dart
@@ -39,34 +39,33 @@ class ReplyData {
   });
 
   factory ReplyData.fromJson(Map<String, dynamic> json) => ReplyData(
-        cursor: json['cursor'] == null
-            ? null
-            : ReplyCursor.fromJson(json['cursor'] as Map<String, dynamic>),
-        replies: (json['replies'] as List<dynamic>?)
-            ?.map((e) => ReplyItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        top: json['top'] == null
-            ? null
-            : Top.fromJson(json['top'] as Map<String, dynamic>),
-        topReplies: (json['top_replies'] as List<dynamic>?)
-            ?.map((e) => ReplyItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        upSelection: json['up_selection'] == null
-            ? null
-            : UpSelection.fromJson(
-                json['up_selection'] as Map<String, dynamic>),
-        assist: json['assist'] as int?,
-        blacklist: json['blacklist'] as int?,
-        vote: json['vote'] as int?,
-        upper: json['upper'] == null
-            ? null
-            : Upper.fromJson(json['upper'] as Map<String, dynamic>),
-        control: json['control'] == null
-            ? null
-            : ReplyControl.fromJson(json['control'] as Map<String, dynamic>),
-        note: json['note'] as int?,
-        esportsGradeCard: json['esports_grade_card'] as dynamic,
-        callbacks: json['callbacks'] as dynamic,
-        contextFeature: json['context_feature'] as String?,
-      );
+    cursor: json['cursor'] == null
+        ? null
+        : ReplyCursor.fromJson(json['cursor'] as Map<String, dynamic>),
+    replies: (json['replies'] as List<dynamic>?)
+        ?.map((e) => ReplyItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    top: json['top'] == null
+        ? null
+        : Top.fromJson(json['top'] as Map<String, dynamic>),
+    topReplies: (json['top_replies'] as List<dynamic>?)
+        ?.map((e) => ReplyItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    upSelection: json['up_selection'] == null
+        ? null
+        : UpSelection.fromJson(json['up_selection'] as Map<String, dynamic>),
+    assist: json['assist'] as int?,
+    blacklist: json['blacklist'] as int?,
+    vote: json['vote'] as int?,
+    upper: json['upper'] == null
+        ? null
+        : Upper.fromJson(json['upper'] as Map<String, dynamic>),
+    control: json['control'] == null
+        ? null
+        : ReplyControl.fromJson(json['control'] as Map<String, dynamic>),
+    note: json['note'] as int?,
+    esportsGradeCard: json['esports_grade_card'] as dynamic,
+    callbacks: json['callbacks'] as dynamic,
+    contextFeature: json['context_feature'] as String?,
+  );
 }
diff --git a/lib/models_new/reply/folder.dart b/lib/models_new/reply/folder.dart
index 41916d47a..4318e81e9 100644
--- a/lib/models_new/reply/folder.dart
+++ b/lib/models_new/reply/folder.dart
@@ -6,8 +6,8 @@ class ReplyFolder {
   ReplyFolder({this.hasFolded, this.isFolded, this.rule});
 
   factory ReplyFolder.fromJson(Map<String, dynamic> json) => ReplyFolder(
-        hasFolded: json['has_folded'] as bool?,
-        isFolded: json['is_folded'] as bool?,
-        rule: json['rule'] as String?,
-      );
+    hasFolded: json['has_folded'] as bool?,
+    isFolded: json['is_folded'] as bool?,
+    rule: json['rule'] as String?,
+  );
 }
diff --git a/lib/models_new/reply/level_info.dart b/lib/models_new/reply/level_info.dart
index 087c7bab5..faf85966f 100644
--- a/lib/models_new/reply/level_info.dart
+++ b/lib/models_new/reply/level_info.dart
@@ -12,9 +12,9 @@ class LevelInfo {
   });
 
   factory LevelInfo.fromJson(Map<String, dynamic> json) => LevelInfo(
-        currentLevel: json['current_level'] as int?,
-        currentMin: json['current_min'] as int?,
-        currentExp: json['current_exp'] as int?,
-        nextExp: json['next_exp'] as int?,
-      );
+    currentLevel: json['current_level'] as int?,
+    currentMin: json['current_min'] as int?,
+    currentExp: json['current_exp'] as int?,
+    nextExp: json['next_exp'] as int?,
+  );
 }
diff --git a/lib/models_new/reply/member.dart b/lib/models_new/reply/member.dart
index 3c50530f6..20accc12f 100644
--- a/lib/models_new/reply/member.dart
+++ b/lib/models_new/reply/member.dart
@@ -46,36 +46,37 @@ class ReplyMember {
   });
 
   factory ReplyMember.fromJson(Map<String, dynamic> json) => ReplyMember(
-        mid: json['mid'] as String?,
-        uname: json['uname'] as String?,
-        sex: json['sex'] as String?,
-        sign: json['sign'] as String?,
-        avatar: json['avatar'] as String?,
-        rank: json['rank'] as String?,
-        faceNftNew: json['face_nft_new'] as int?,
-        isSeniorMember: json['is_senior_member'] as int?,
-        senior: json['senior'] == null
-            ? null
-            : Senior.fromJson(json['senior'] as Map<String, dynamic>),
-        levelInfo: json['level_info'] == null
-            ? null
-            : LevelInfo.fromJson(json['level_info'] as Map<String, dynamic>),
-        pendant: json['pendant'] == null
-            ? null
-            : Pendant.fromJson(json['pendant'] as Map<String, dynamic>),
-        nameplate: json['nameplate'] == null
-            ? null
-            : Nameplate.fromJson(json['nameplate'] as Map<String, dynamic>),
-        officialVerify: json['official_verify'] == null
-            ? null
-            : BaseOfficialVerify.fromJson(
-                json['official_verify'] as Map<String, dynamic>),
-        vip: json['vip'] == null
-            ? null
-            : Vip.fromJson(json['vip'] as Map<String, dynamic>),
-        fansDetail: json['fans_detail'] as dynamic,
-        isContractor: json['is_contractor'] as bool?,
-        contractDesc: json['contract_desc'] as String?,
-        nftInteraction: json['nft_interaction'] as dynamic,
-      );
+    mid: json['mid'] as String?,
+    uname: json['uname'] as String?,
+    sex: json['sex'] as String?,
+    sign: json['sign'] as String?,
+    avatar: json['avatar'] as String?,
+    rank: json['rank'] as String?,
+    faceNftNew: json['face_nft_new'] as int?,
+    isSeniorMember: json['is_senior_member'] as int?,
+    senior: json['senior'] == null
+        ? null
+        : Senior.fromJson(json['senior'] as Map<String, dynamic>),
+    levelInfo: json['level_info'] == null
+        ? null
+        : LevelInfo.fromJson(json['level_info'] as Map<String, dynamic>),
+    pendant: json['pendant'] == null
+        ? null
+        : Pendant.fromJson(json['pendant'] as Map<String, dynamic>),
+    nameplate: json['nameplate'] == null
+        ? null
+        : Nameplate.fromJson(json['nameplate'] as Map<String, dynamic>),
+    officialVerify: json['official_verify'] == null
+        ? null
+        : BaseOfficialVerify.fromJson(
+            json['official_verify'] as Map<String, dynamic>,
+          ),
+    vip: json['vip'] == null
+        ? null
+        : Vip.fromJson(json['vip'] as Map<String, dynamic>),
+    fansDetail: json['fans_detail'] as dynamic,
+    isContractor: json['is_contractor'] as bool?,
+    contractDesc: json['contract_desc'] as String?,
+    nftInteraction: json['nft_interaction'] as dynamic,
+  );
 }
diff --git a/lib/models_new/reply/nameplate.dart b/lib/models_new/reply/nameplate.dart
index 0ad7bd5ea..ccf0b89fc 100644
--- a/lib/models_new/reply/nameplate.dart
+++ b/lib/models_new/reply/nameplate.dart
@@ -16,11 +16,11 @@ class Nameplate {
   });
 
   factory Nameplate.fromJson(Map<String, dynamic> json) => Nameplate(
-        nid: json['nid'] as int?,
-        name: json['name'] as String?,
-        image: json['image'] as String?,
-        imageSmall: json['image_small'] as String?,
-        level: json['level'] as String?,
-        condition: json['condition'] as String?,
-      );
+    nid: json['nid'] as int?,
+    name: json['name'] as String?,
+    image: json['image'] as String?,
+    imageSmall: json['image_small'] as String?,
+    level: json['level'] as String?,
+    condition: json['condition'] as String?,
+  );
 }
diff --git a/lib/models_new/reply/picture.dart b/lib/models_new/reply/picture.dart
index 329885b48..cf29748fa 100644
--- a/lib/models_new/reply/picture.dart
+++ b/lib/models_new/reply/picture.dart
@@ -16,11 +16,11 @@ class ReplyPicture {
   });
 
   factory ReplyPicture.fromJson(Map<String, dynamic> json) => ReplyPicture(
-        imgSrc: json['img_src'] as String?,
-        imgWidth: json['img_width'] as int?,
-        imgHeight: json['img_height'] as int?,
-        imgSize: (json['img_size'] as num?)?.toDouble(),
-        topRightIcon: json['top_right_icon'] as String?,
-        playGifThumbnail: json['play_gif_thumbnail'] as bool?,
-      );
+    imgSrc: json['img_src'] as String?,
+    imgWidth: json['img_width'] as int?,
+    imgHeight: json['img_height'] as int?,
+    imgSize: (json['img_size'] as num?)?.toDouble(),
+    topRightIcon: json['top_right_icon'] as String?,
+    playGifThumbnail: json['play_gif_thumbnail'] as bool?,
+  );
 }
diff --git a/lib/models_new/reply/reply.dart b/lib/models_new/reply/reply.dart
index 80a197934..713afd351 100644
--- a/lib/models_new/reply/reply.dart
+++ b/lib/models_new/reply/reply.dart
@@ -76,51 +76,50 @@ class ReplyItemModel {
   });
 
   factory ReplyItemModel.fromJson(Map<String, dynamic> json) => ReplyItemModel(
-        rpid: json['rpid'] as int?,
-        oid: json['oid'] as int?,
-        type: json['type'] as int?,
-        mid: json['mid'] as int?,
-        root: json['root'] as int?,
-        parent: json['parent'] as int?,
-        dialog: json['dialog'] as int?,
-        count: json['count'] as int?,
-        rcount: json['rcount'] as int?,
-        state: json['state'] as int?,
-        fansgrade: json['fansgrade'] as int?,
-        attr: json['attr'] as int?,
-        ctime: json['ctime'] as int?,
-        midStr: json['mid_str'] as String?,
-        oidStr: json['oid_str'] as String?,
-        rpidStr: json['rpid_str'] as String?,
-        rootStr: json['root_str'] as String?,
-        parentStr: json['parent_str'] as String?,
-        dialogStr: json['dialog_str'] as String?,
-        like: json['like'] as int?,
-        action: json['action'] as int?,
-        member: json['member'] == null
-            ? null
-            : ReplyMember.fromJson(json['member'] as Map<String, dynamic>),
-        content: json['content'] == null
-            ? null
-            : ReplyContent.fromJson(json['content'] as Map<String, dynamic>),
-        replies: (json['replies'] as List<dynamic>?)
-            ?.map((e) => ReplyItemModel.fromJson(e))
-            .toList(),
-        assist: json['assist'] as int?,
-        upAction: json['up_action'] == null
-            ? null
-            : UpAction.fromJson(json['up_action'] as Map<String, dynamic>),
-        invisible: json['invisible'] as bool?,
-        replyControl: json['reply_control'] == null
-            ? null
-            : ReplyControl.fromJson(
-                json['reply_control'] as Map<String, dynamic>),
-        folder: json['folder'] == null
-            ? null
-            : ReplyFolder.fromJson(json['folder'] as Map<String, dynamic>),
-        dynamicId: json['dynamic_id'] as int?,
-        dynamicIdStr: json['dynamic_id_str'] as String?,
-        noteCvidStr: json['note_cvid_str'] as String?,
-        trackInfo: json['track_info'] as String?,
-      );
+    rpid: json['rpid'] as int?,
+    oid: json['oid'] as int?,
+    type: json['type'] as int?,
+    mid: json['mid'] as int?,
+    root: json['root'] as int?,
+    parent: json['parent'] as int?,
+    dialog: json['dialog'] as int?,
+    count: json['count'] as int?,
+    rcount: json['rcount'] as int?,
+    state: json['state'] as int?,
+    fansgrade: json['fansgrade'] as int?,
+    attr: json['attr'] as int?,
+    ctime: json['ctime'] as int?,
+    midStr: json['mid_str'] as String?,
+    oidStr: json['oid_str'] as String?,
+    rpidStr: json['rpid_str'] as String?,
+    rootStr: json['root_str'] as String?,
+    parentStr: json['parent_str'] as String?,
+    dialogStr: json['dialog_str'] as String?,
+    like: json['like'] as int?,
+    action: json['action'] as int?,
+    member: json['member'] == null
+        ? null
+        : ReplyMember.fromJson(json['member'] as Map<String, dynamic>),
+    content: json['content'] == null
+        ? null
+        : ReplyContent.fromJson(json['content'] as Map<String, dynamic>),
+    replies: (json['replies'] as List<dynamic>?)
+        ?.map((e) => ReplyItemModel.fromJson(e))
+        .toList(),
+    assist: json['assist'] as int?,
+    upAction: json['up_action'] == null
+        ? null
+        : UpAction.fromJson(json['up_action'] as Map<String, dynamic>),
+    invisible: json['invisible'] as bool?,
+    replyControl: json['reply_control'] == null
+        ? null
+        : ReplyControl.fromJson(json['reply_control'] as Map<String, dynamic>),
+    folder: json['folder'] == null
+        ? null
+        : ReplyFolder.fromJson(json['folder'] as Map<String, dynamic>),
+    dynamicId: json['dynamic_id'] as int?,
+    dynamicIdStr: json['dynamic_id_str'] as String?,
+    noteCvidStr: json['note_cvid_str'] as String?,
+    trackInfo: json['track_info'] as String?,
+  );
 }
diff --git a/lib/models_new/reply/reply_control.dart b/lib/models_new/reply/reply_control.dart
index 3f9202736..a6a4682b6 100644
--- a/lib/models_new/reply/reply_control.dart
+++ b/lib/models_new/reply/reply_control.dart
@@ -16,11 +16,11 @@ class ReplyControl {
   });
 
   factory ReplyControl.fromJson(Map<String, dynamic> json) => ReplyControl(
-        maxLine: json['max_line'] as int?,
-        timeDesc: json['time_desc'] as String?,
-        bizScene: json['biz_scene'] as String?,
-        location: json['location'] as String?,
-        isNoteV2: json['is_note_v2'] as bool?,
-        translationSwitch: json['translation_switch'] as int?,
-      );
+    maxLine: json['max_line'] as int?,
+    timeDesc: json['time_desc'] as String?,
+    bizScene: json['biz_scene'] as String?,
+    location: json['location'] as String?,
+    isNoteV2: json['is_note_v2'] as bool?,
+    translationSwitch: json['translation_switch'] as int?,
+  );
 }
diff --git a/lib/models_new/reply/senior.dart b/lib/models_new/reply/senior.dart
index 8494a57d2..9e2f23b13 100644
--- a/lib/models_new/reply/senior.dart
+++ b/lib/models_new/reply/senior.dart
@@ -4,6 +4,6 @@ class Senior {
   Senior({this.status});
 
   factory Senior.fromJson(Map<String, dynamic> json) => Senior(
-        status: json['status'] as int?,
-      );
+    status: json['status'] as int?,
+  );
 }
diff --git a/lib/models_new/reply/top.dart b/lib/models_new/reply/top.dart
index bb0135232..80e4bdc3e 100644
--- a/lib/models_new/reply/top.dart
+++ b/lib/models_new/reply/top.dart
@@ -8,10 +8,10 @@ class Top {
   Top({this.admin, this.upper, this.vote});
 
   factory Top.fromJson(Map<String, dynamic> json) => Top(
-        admin: json['admin'] as dynamic,
-        upper: json['upper'] == null
-            ? null
-            : Upper.fromJson(json['upper'] as Map<String, dynamic>),
-        vote: json['vote'] as dynamic,
-      );
+    admin: json['admin'] as dynamic,
+    upper: json['upper'] == null
+        ? null
+        : Upper.fromJson(json['upper'] as Map<String, dynamic>),
+    vote: json['vote'] as dynamic,
+  );
 }
diff --git a/lib/models_new/reply/top_reply.dart b/lib/models_new/reply/top_reply.dart
index e1d7e7d07..18cefccdb 100644
--- a/lib/models_new/reply/top_reply.dart
+++ b/lib/models_new/reply/top_reply.dart
@@ -75,50 +75,49 @@ class TopReply {
   });
 
   factory TopReply.fromJson(Map<String, dynamic> json) => TopReply(
-        rpid: json['rpid'] as int?,
-        oid: json['oid'] as int?,
-        type: json['type'] as int?,
-        mid: json['mid'] as int?,
-        root: json['root'] as int?,
-        parent: json['parent'] as int?,
-        dialog: json['dialog'] as int?,
-        count: json['count'] as int?,
-        rcount: json['rcount'] as int?,
-        state: json['state'] as int?,
-        fansgrade: json['fansgrade'] as int?,
-        attr: json['attr'] as int?,
-        ctime: json['ctime'] as int?,
-        midStr: json['mid_str'] as String?,
-        oidStr: json['oid_str'] as String?,
-        rpidStr: json['rpid_str'] as String?,
-        rootStr: json['root_str'] as String?,
-        parentStr: json['parent_str'] as String?,
-        dialogStr: json['dialog_str'] as String?,
-        like: json['like'] as int?,
-        action: json['action'] as int?,
-        member: json['member'] == null
-            ? null
-            : ReplyMember.fromJson(json['member'] as Map<String, dynamic>),
-        content: json['content'] == null
-            ? null
-            : ReplyContent.fromJson(json['content'] as Map<String, dynamic>),
-        replies: (json['replies'] as List<dynamic>?)
-            ?.map((e) => ReplyItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        assist: json['assist'] as int?,
-        upAction: json['up_action'] == null
-            ? null
-            : UpAction.fromJson(json['up_action'] as Map<String, dynamic>),
-        invisible: json['invisible'] as bool?,
-        replyControl: json['reply_control'] == null
-            ? null
-            : ReplyControl.fromJson(
-                json['reply_control'] as Map<String, dynamic>),
-        folder: json['folder'] == null
-            ? null
-            : ReplyFolder.fromJson(json['folder'] as Map<String, dynamic>),
-        dynamicIdStr: json['dynamic_id_str'] as String?,
-        noteCvidStr: json['note_cvid_str'] as String?,
-        trackInfo: json['track_info'] as String?,
-      );
+    rpid: json['rpid'] as int?,
+    oid: json['oid'] as int?,
+    type: json['type'] as int?,
+    mid: json['mid'] as int?,
+    root: json['root'] as int?,
+    parent: json['parent'] as int?,
+    dialog: json['dialog'] as int?,
+    count: json['count'] as int?,
+    rcount: json['rcount'] as int?,
+    state: json['state'] as int?,
+    fansgrade: json['fansgrade'] as int?,
+    attr: json['attr'] as int?,
+    ctime: json['ctime'] as int?,
+    midStr: json['mid_str'] as String?,
+    oidStr: json['oid_str'] as String?,
+    rpidStr: json['rpid_str'] as String?,
+    rootStr: json['root_str'] as String?,
+    parentStr: json['parent_str'] as String?,
+    dialogStr: json['dialog_str'] as String?,
+    like: json['like'] as int?,
+    action: json['action'] as int?,
+    member: json['member'] == null
+        ? null
+        : ReplyMember.fromJson(json['member'] as Map<String, dynamic>),
+    content: json['content'] == null
+        ? null
+        : ReplyContent.fromJson(json['content'] as Map<String, dynamic>),
+    replies: (json['replies'] as List<dynamic>?)
+        ?.map((e) => ReplyItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    assist: json['assist'] as int?,
+    upAction: json['up_action'] == null
+        ? null
+        : UpAction.fromJson(json['up_action'] as Map<String, dynamic>),
+    invisible: json['invisible'] as bool?,
+    replyControl: json['reply_control'] == null
+        ? null
+        : ReplyControl.fromJson(json['reply_control'] as Map<String, dynamic>),
+    folder: json['folder'] == null
+        ? null
+        : ReplyFolder.fromJson(json['folder'] as Map<String, dynamic>),
+    dynamicIdStr: json['dynamic_id_str'] as String?,
+    noteCvidStr: json['note_cvid_str'] as String?,
+    trackInfo: json['track_info'] as String?,
+  );
 }
diff --git a/lib/models_new/reply/up_action.dart b/lib/models_new/reply/up_action.dart
index bf79c76fb..c7f62373b 100644
--- a/lib/models_new/reply/up_action.dart
+++ b/lib/models_new/reply/up_action.dart
@@ -5,7 +5,7 @@ class UpAction {
   UpAction({this.like, this.reply});
 
   factory UpAction.fromJson(Map<String, dynamic> json) => UpAction(
-        like: json['like'] as bool?,
-        reply: json['reply'] as bool?,
-      );
+    like: json['like'] as bool?,
+    reply: json['reply'] as bool?,
+  );
 }
diff --git a/lib/models_new/reply/up_selection.dart b/lib/models_new/reply/up_selection.dart
index 91463d860..e40207d54 100644
--- a/lib/models_new/reply/up_selection.dart
+++ b/lib/models_new/reply/up_selection.dart
@@ -5,7 +5,7 @@ class UpSelection {
   UpSelection({this.pendingCount, this.ignoreCount});
 
   factory UpSelection.fromJson(Map<String, dynamic> json) => UpSelection(
-        pendingCount: json['pending_count'] as int?,
-        ignoreCount: json['ignore_count'] as int?,
-      );
+    pendingCount: json['pending_count'] as int?,
+    ignoreCount: json['ignore_count'] as int?,
+  );
 }
diff --git a/lib/models_new/reply/upper.dart b/lib/models_new/reply/upper.dart
index 65d66de2a..020524552 100644
--- a/lib/models_new/reply/upper.dart
+++ b/lib/models_new/reply/upper.dart
@@ -75,50 +75,49 @@ class Upper {
   });
 
   factory Upper.fromJson(Map<String, dynamic> json) => Upper(
-        rpid: json['rpid'] as int?,
-        oid: json['oid'] as int?,
-        type: json['type'] as int?,
-        mid: json['mid'] as int?,
-        root: json['root'] as int?,
-        parent: json['parent'] as int?,
-        dialog: json['dialog'] as int?,
-        count: json['count'] as int?,
-        rcount: json['rcount'] as int?,
-        state: json['state'] as int?,
-        fansgrade: json['fansgrade'] as int?,
-        attr: json['attr'] as int?,
-        ctime: json['ctime'] as int?,
-        midStr: json['mid_str'] as String?,
-        oidStr: json['oid_str'] as String?,
-        rpidStr: json['rpid_str'] as String?,
-        rootStr: json['root_str'] as String?,
-        parentStr: json['parent_str'] as String?,
-        dialogStr: json['dialog_str'] as String?,
-        like: json['like'] as int?,
-        action: json['action'] as int?,
-        member: json['member'] == null
-            ? null
-            : ReplyMember.fromJson(json['member'] as Map<String, dynamic>),
-        content: json['content'] == null
-            ? null
-            : ReplyContent.fromJson(json['content'] as Map<String, dynamic>),
-        replies: (json['replies'] as List<dynamic>?)
-            ?.map((e) => ReplyItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        assist: json['assist'] as int?,
-        upAction: json['up_action'] == null
-            ? null
-            : UpAction.fromJson(json['up_action'] as Map<String, dynamic>),
-        invisible: json['invisible'] as bool?,
-        replyControl: json['reply_control'] == null
-            ? null
-            : ReplyControl.fromJson(
-                json['reply_control'] as Map<String, dynamic>),
-        folder: json['folder'] == null
-            ? null
-            : ReplyFolder.fromJson(json['folder'] as Map<String, dynamic>),
-        dynamicIdStr: json['dynamic_id_str'] as String?,
-        noteCvidStr: json['note_cvid_str'] as String?,
-        trackInfo: json['track_info'] as String?,
-      );
+    rpid: json['rpid'] as int?,
+    oid: json['oid'] as int?,
+    type: json['type'] as int?,
+    mid: json['mid'] as int?,
+    root: json['root'] as int?,
+    parent: json['parent'] as int?,
+    dialog: json['dialog'] as int?,
+    count: json['count'] as int?,
+    rcount: json['rcount'] as int?,
+    state: json['state'] as int?,
+    fansgrade: json['fansgrade'] as int?,
+    attr: json['attr'] as int?,
+    ctime: json['ctime'] as int?,
+    midStr: json['mid_str'] as String?,
+    oidStr: json['oid_str'] as String?,
+    rpidStr: json['rpid_str'] as String?,
+    rootStr: json['root_str'] as String?,
+    parentStr: json['parent_str'] as String?,
+    dialogStr: json['dialog_str'] as String?,
+    like: json['like'] as int?,
+    action: json['action'] as int?,
+    member: json['member'] == null
+        ? null
+        : ReplyMember.fromJson(json['member'] as Map<String, dynamic>),
+    content: json['content'] == null
+        ? null
+        : ReplyContent.fromJson(json['content'] as Map<String, dynamic>),
+    replies: (json['replies'] as List<dynamic>?)
+        ?.map((e) => ReplyItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    assist: json['assist'] as int?,
+    upAction: json['up_action'] == null
+        ? null
+        : UpAction.fromJson(json['up_action'] as Map<String, dynamic>),
+    invisible: json['invisible'] as bool?,
+    replyControl: json['reply_control'] == null
+        ? null
+        : ReplyControl.fromJson(json['reply_control'] as Map<String, dynamic>),
+    folder: json['folder'] == null
+        ? null
+        : ReplyFolder.fromJson(json['folder'] as Map<String, dynamic>),
+    dynamicIdStr: json['dynamic_id_str'] as String?,
+    noteCvidStr: json['note_cvid_str'] as String?,
+    trackInfo: json['track_info'] as String?,
+  );
 }
diff --git a/lib/models_new/reply2reply/data.dart b/lib/models_new/reply2reply/data.dart
index fb6154af2..b847267f8 100644
--- a/lib/models_new/reply2reply/data.dart
+++ b/lib/models_new/reply2reply/data.dart
@@ -20,20 +20,20 @@ class ReplyReplyData {
   });
 
   factory ReplyReplyData.fromJson(Map<String, dynamic> json) => ReplyReplyData(
-        page: json['page'] == null
-            ? null
-            : ReplyPage.fromJson(json['page'] as Map<String, dynamic>),
-        upper: json['upper'] == null
-            ? null
-            : Upper.fromJson(json['upper'] as Map<String, dynamic>),
-        replies: (json['replies'] as List<dynamic>?)
-            ?.map((e) => ReplyItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        root: json['root'] == null
-            ? null
-            : ReplyRoot.fromJson(json['root'] as Map<String, dynamic>),
-        control: json['control'] == null
-            ? null
-            : ReplyControl.fromJson(json['control'] as Map<String, dynamic>),
-      );
+    page: json['page'] == null
+        ? null
+        : ReplyPage.fromJson(json['page'] as Map<String, dynamic>),
+    upper: json['upper'] == null
+        ? null
+        : Upper.fromJson(json['upper'] as Map<String, dynamic>),
+    replies: (json['replies'] as List<dynamic>?)
+        ?.map((e) => ReplyItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    root: json['root'] == null
+        ? null
+        : ReplyRoot.fromJson(json['root'] as Map<String, dynamic>),
+    control: json['control'] == null
+        ? null
+        : ReplyControl.fromJson(json['control'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/reply2reply/page.dart b/lib/models_new/reply2reply/page.dart
index 326c773e7..c3152a0ea 100644
--- a/lib/models_new/reply2reply/page.dart
+++ b/lib/models_new/reply2reply/page.dart
@@ -6,8 +6,8 @@ class ReplyPage {
   ReplyPage({this.num, this.size, this.count});
 
   factory ReplyPage.fromJson(Map<String, dynamic> json) => ReplyPage(
-        num: json['num'] as int?,
-        size: json['size'] as int?,
-        count: json['count'] as int?,
-      );
+    num: json['num'] as int?,
+    size: json['size'] as int?,
+    count: json['count'] as int?,
+  );
 }
diff --git a/lib/models_new/reply2reply/root.dart b/lib/models_new/reply2reply/root.dart
index 620348077..7ccb496ca 100644
--- a/lib/models_new/reply2reply/root.dart
+++ b/lib/models_new/reply2reply/root.dart
@@ -74,48 +74,47 @@ class ReplyRoot {
   });
 
   factory ReplyRoot.fromJson(Map<String, dynamic> json) => ReplyRoot(
-        rpid: json['rpid'] as int?,
-        oid: json['oid'] as int?,
-        type: json['type'] as int?,
-        mid: json['mid'] as int?,
-        root: json['root'] as int?,
-        parent: json['parent'] as int?,
-        dialog: json['dialog'] as int?,
-        count: json['count'] as int?,
-        rcount: json['rcount'] as int?,
-        state: json['state'] as int?,
-        fansgrade: json['fansgrade'] as int?,
-        attr: json['attr'] as int?,
-        ctime: json['ctime'] as int?,
-        midStr: json['mid_str'] as String?,
-        oidStr: json['oid_str'] as String?,
-        rpidStr: json['rpid_str'] as String?,
-        rootStr: json['root_str'] as String?,
-        parentStr: json['parent_str'] as String?,
-        dialogStr: json['dialog_str'] as String?,
-        like: json['like'] as int?,
-        action: json['action'] as int?,
-        member: json['member'] == null
-            ? null
-            : ReplyMember.fromJson(json['member'] as Map<String, dynamic>),
-        content: json['content'] == null
-            ? null
-            : ReplyContent.fromJson(json['content'] as Map<String, dynamic>),
-        replies: json['replies'] as dynamic,
-        assist: json['assist'] as int?,
-        upAction: json['up_action'] == null
-            ? null
-            : UpAction.fromJson(json['up_action'] as Map<String, dynamic>),
-        invisible: json['invisible'] as bool?,
-        replyControl: json['reply_control'] == null
-            ? null
-            : ReplyControl.fromJson(
-                json['reply_control'] as Map<String, dynamic>),
-        folder: json['folder'] == null
-            ? null
-            : ReplyFolder.fromJson(json['folder'] as Map<String, dynamic>),
-        dynamicIdStr: json['dynamic_id_str'] as String?,
-        noteCvidStr: json['note_cvid_str'] as String?,
-        trackInfo: json['track_info'] as String?,
-      );
+    rpid: json['rpid'] as int?,
+    oid: json['oid'] as int?,
+    type: json['type'] as int?,
+    mid: json['mid'] as int?,
+    root: json['root'] as int?,
+    parent: json['parent'] as int?,
+    dialog: json['dialog'] as int?,
+    count: json['count'] as int?,
+    rcount: json['rcount'] as int?,
+    state: json['state'] as int?,
+    fansgrade: json['fansgrade'] as int?,
+    attr: json['attr'] as int?,
+    ctime: json['ctime'] as int?,
+    midStr: json['mid_str'] as String?,
+    oidStr: json['oid_str'] as String?,
+    rpidStr: json['rpid_str'] as String?,
+    rootStr: json['root_str'] as String?,
+    parentStr: json['parent_str'] as String?,
+    dialogStr: json['dialog_str'] as String?,
+    like: json['like'] as int?,
+    action: json['action'] as int?,
+    member: json['member'] == null
+        ? null
+        : ReplyMember.fromJson(json['member'] as Map<String, dynamic>),
+    content: json['content'] == null
+        ? null
+        : ReplyContent.fromJson(json['content'] as Map<String, dynamic>),
+    replies: json['replies'] as dynamic,
+    assist: json['assist'] as int?,
+    upAction: json['up_action'] == null
+        ? null
+        : UpAction.fromJson(json['up_action'] as Map<String, dynamic>),
+    invisible: json['invisible'] as bool?,
+    replyControl: json['reply_control'] == null
+        ? null
+        : ReplyControl.fromJson(json['reply_control'] as Map<String, dynamic>),
+    folder: json['folder'] == null
+        ? null
+        : ReplyFolder.fromJson(json['folder'] as Map<String, dynamic>),
+    dynamicIdStr: json['dynamic_id_str'] as String?,
+    noteCvidStr: json['note_cvid_str'] as String?,
+    trackInfo: json['track_info'] as String?,
+  );
 }
diff --git a/lib/models_new/search/search_rcmd/data.dart b/lib/models_new/search/search_rcmd/data.dart
index 967fb869e..8fefebb98 100644
--- a/lib/models_new/search/search_rcmd/data.dart
+++ b/lib/models_new/search/search_rcmd/data.dart
@@ -6,9 +6,10 @@ class SearchRcmdData {
   SearchRcmdData({this.list});
 
   factory SearchRcmdData.fromJson(Map<String, dynamic> json) => SearchRcmdData(
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) =>
-                SearchTrendingItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    list: (json['list'] as List<dynamic>?)
+        ?.map(
+          (e) => SearchTrendingItemModel.fromJson(e as Map<String, dynamic>),
+        )
+        .toList(),
+  );
 }
diff --git a/lib/models_new/search/search_trending/data.dart b/lib/models_new/search/search_trending/data.dart
index aa3761541..8fc2fb2c0 100644
--- a/lib/models_new/search/search_trending/data.dart
+++ b/lib/models_new/search/search_trending/data.dart
@@ -9,12 +9,16 @@ class SearchTrendingData extends SearchRcmdData {
   factory SearchTrendingData.fromJson(Map<String, dynamic> json) =>
       SearchTrendingData(
         list: (json['list'] as List<dynamic>?)
-            ?.map((e) =>
-                SearchTrendingItemModel.fromJson(e as Map<String, dynamic>))
+            ?.map(
+              (e) =>
+                  SearchTrendingItemModel.fromJson(e as Map<String, dynamic>),
+            )
             .toList(),
         topList: (json['top_list'] as List<dynamic>?)
-            ?.map((e) =>
-                SearchTrendingItemModel.fromJson(e as Map<String, dynamic>))
+            ?.map(
+              (e) =>
+                  SearchTrendingItemModel.fromJson(e as Map<String, dynamic>),
+            )
             .toList(),
       );
 }
diff --git a/lib/models_new/space/space/achieve.dart b/lib/models_new/space/space/achieve.dart
index b93e050f1..22b362f20 100644
--- a/lib/models_new/space/space/achieve.dart
+++ b/lib/models_new/space/space/achieve.dart
@@ -6,8 +6,8 @@ class Achieve {
   Achieve({this.isDefault, this.image, this.achieveUrl});
 
   factory Achieve.fromJson(Map<String, dynamic> json) => Achieve(
-        isDefault: json['is_default'] as bool?,
-        image: json['image'] as String?,
-        achieveUrl: json['achieve_url'] as String?,
-      );
+    isDefault: json['is_default'] as bool?,
+    image: json['image'] as String?,
+    achieveUrl: json['achieve_url'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/archive.dart b/lib/models_new/space/space/archive.dart
index f4f11226e..7e0d4bc7f 100644
--- a/lib/models_new/space/space/archive.dart
+++ b/lib/models_new/space/space/archive.dart
@@ -11,16 +11,17 @@ class Archive {
   Archive({this.episodicButton, this.order, this.count, this.item});
 
   factory Archive.fromJson(Map<String, dynamic> json) => Archive(
-        episodicButton: json['episodic_button'] == null
-            ? null
-            : EpisodicButton.fromJson(
-                json['episodic_button'] as Map<String, dynamic>),
-        order: (json['order'] as List<dynamic>?)
-            ?.map((e) => Order.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        count: json['count'] as int?,
-        item: (json['item'] as List<dynamic>?)
-            ?.map((e) => SpaceArchiveItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    episodicButton: json['episodic_button'] == null
+        ? null
+        : EpisodicButton.fromJson(
+            json['episodic_button'] as Map<String, dynamic>,
+          ),
+    order: (json['order'] as List<dynamic>?)
+        ?.map((e) => Order.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    count: json['count'] as int?,
+    item: (json['item'] as List<dynamic>?)
+        ?.map((e) => SpaceArchiveItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/space/space/article.dart b/lib/models_new/space/space/article.dart
index f5af2edb6..c0fad7de7 100644
--- a/lib/models_new/space/space/article.dart
+++ b/lib/models_new/space/space/article.dart
@@ -10,13 +10,13 @@ class Article {
   Article({this.count, this.item, this.listsCount, this.lists});
 
   factory Article.fromJson(Map<String, dynamic> json) => Article(
-        count: json['count'] as int?,
-        item: (json['item'] as List<dynamic>?)
-            ?.map((e) => SpaceArticleItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        listsCount: json['lists_count'] as int?,
-        lists: (json['lists'] as List<dynamic>?)
-            ?.map((e) => ListItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    count: json['count'] as int?,
+    item: (json['item'] as List<dynamic>?)
+        ?.map((e) => SpaceArticleItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    listsCount: json['lists_count'] as int?,
+    lists: (json['lists'] as List<dynamic>?)
+        ?.map((e) => ListItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/space/space/attention_tip.dart b/lib/models_new/space/space/attention_tip.dart
index 0c4699b46..7e75236d2 100644
--- a/lib/models_new/space/space/attention_tip.dart
+++ b/lib/models_new/space/space/attention_tip.dart
@@ -5,7 +5,7 @@ class AttentionTip {
   AttentionTip({this.cardNum, this.tip});
 
   factory AttentionTip.fromJson(Map<String, dynamic> json) => AttentionTip(
-        cardNum: json['card_num'] as int?,
-        tip: json['tip'] as String?,
-      );
+    cardNum: json['card_num'] as int?,
+    tip: json['tip'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/audios.dart b/lib/models_new/space/space/audios.dart
index 61b0d794d..8bda61410 100644
--- a/lib/models_new/space/space/audios.dart
+++ b/lib/models_new/space/space/audios.dart
@@ -7,9 +7,9 @@ class Audios {
   Audios({this.count, this.item});
 
   factory Audios.fromJson(Map<String, dynamic> json) => Audios(
-        count: json['count'] as int?,
-        item: (json['item'] as List<dynamic>?)
-            ?.map((e) => SpaceAudioItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    count: json['count'] as int?,
+    item: (json['item'] as List<dynamic>?)
+        ?.map((e) => SpaceAudioItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/space/space/author.dart b/lib/models_new/space/space/author.dart
index 51f92ba2f..4eda4c594 100644
--- a/lib/models_new/space/space/author.dart
+++ b/lib/models_new/space/space/author.dart
@@ -22,21 +22,22 @@ class Author {
   });
 
   factory Author.fromJson(Map<String, dynamic> json) => Author(
-        mid: json['mid'] as int?,
-        name: json['name'] as String?,
-        face: json['face'] as String?,
-        pendant: json['pendant'] == null
-            ? null
-            : Pendant.fromJson(json['pendant'] as Map<String, dynamic>),
-        officialVerify: json['official_verify'] == null
-            ? null
-            : OfficialVerify.fromJson(
-                json['official_verify'] as Map<String, dynamic>),
-        nameplate: json['nameplate'] == null
-            ? null
-            : Nameplate.fromJson(json['nameplate'] as Map<String, dynamic>),
-        vip: json['vip'] == null
-            ? null
-            : Vip.fromJson(json['vip'] as Map<String, dynamic>),
-      );
+    mid: json['mid'] as int?,
+    name: json['name'] as String?,
+    face: json['face'] as String?,
+    pendant: json['pendant'] == null
+        ? null
+        : Pendant.fromJson(json['pendant'] as Map<String, dynamic>),
+    officialVerify: json['official_verify'] == null
+        ? null
+        : OfficialVerify.fromJson(
+            json['official_verify'] as Map<String, dynamic>,
+          ),
+    nameplate: json['nameplate'] == null
+        ? null
+        : Nameplate.fromJson(json['nameplate'] as Map<String, dynamic>),
+    vip: json['vip'] == null
+        ? null
+        : Vip.fromJson(json['vip'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/space/space/badge.dart b/lib/models_new/space/space/badge.dart
index 341dcf24d..8e814f817 100644
--- a/lib/models_new/space/space/badge.dart
+++ b/lib/models_new/space/space/badge.dart
@@ -20,13 +20,13 @@ class Badge {
   });
 
   factory Badge.fromJson(Map<String, dynamic> json) => Badge(
-        text: json['text'] as String?,
-        textColor: json['text_color'] as String?,
-        textColorNight: json['text_color_night'] as String?,
-        bgColor: json['bg_color'] as String?,
-        bgColorNight: json['bg_color_night'] as String?,
-        borderColor: json['border_color'] as String?,
-        borderColorNight: json['border_color_night'] as String?,
-        bgStyle: json['bg_style'] as int?,
-      );
+    text: json['text'] as String?,
+    textColor: json['text_color'] as String?,
+    textColorNight: json['text_color_night'] as String?,
+    bgColor: json['bg_color'] as String?,
+    bgColorNight: json['bg_color_night'] as String?,
+    borderColor: json['border_color'] as String?,
+    borderColorNight: json['border_color_night'] as String?,
+    bgStyle: json['bg_style'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space/button.dart b/lib/models_new/space/space/button.dart
index 4adb16792..3f1f813a5 100644
--- a/lib/models_new/space/space/button.dart
+++ b/lib/models_new/space/space/button.dart
@@ -6,8 +6,8 @@ class Button {
   Button({this.type, this.text, this.jumpUrl});
 
   factory Button.fromJson(Map<String, dynamic> json) => Button(
-        type: json['type'] as int?,
-        text: json['text'] as String?,
-        jumpUrl: json['jump_url'] as String?,
-      );
+    type: json['type'] as int?,
+    text: json['text'] as String?,
+    jumpUrl: json['jump_url'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/card.dart b/lib/models_new/space/space/card.dart
index c5208ac0d..57f7c6a9c 100644
--- a/lib/models_new/space/space/card.dart
+++ b/lib/models_new/space/space/card.dart
@@ -105,83 +105,87 @@ class SpaceCard {
   });
 
   factory SpaceCard.fromJson(Map<String, dynamic> json) => SpaceCard(
-        mid: json['mid'] as String?,
-        name: json['name'] as String?,
-        approve: json['approve'] as bool?,
-        rank: json['rank'] as String?,
-        face: json['face'] as String?,
-        displayRank: json['DisplayRank'] as String?,
-        regtime: json['regtime'] as int?,
-        spacesta: json['spacesta'] as int?,
-        birthday: json['birthday'] as String?,
-        place: json['place'] as String?,
-        description: json['description'] as String?,
-        article: json['article'] as int?,
-        attentions: json['attentions'] as dynamic,
-        fans: json['fans'] as int?,
-        friend: json['friend'] as int?,
-        attention: json['attention'] as int?,
-        sign: json['sign'] as String?,
-        levelInfo: json['level_info'] == null
-            ? null
-            : LevelInfo.fromJson(json['level_info'] as Map<String, dynamic>),
-        pendant: json['pendant'] == null
-            ? null
-            : Pendant.fromJson(json['pendant'] as Map<String, dynamic>),
-        nameplate: json['nameplate'] == null
-            ? null
-            : Nameplate.fromJson(json['nameplate'] as Map<String, dynamic>),
-        officialVerify: json['official_verify'] == null
-            ? null
-            : OfficialVerify.fromJson(
-                json['official_verify'] as Map<String, dynamic>),
-        professionVerify: json['profession_verify'] == null
-            ? null
-            : ProfessionVerify.fromJson(
-                json['profession_verify'] as Map<String, dynamic>),
-        vip: json['vip'] == null
-            ? null
-            : Vip.fromJson(json['vip'] as Map<String, dynamic>),
-        silence: json['silence'] as int?,
-        endTime: json['end_time'] as int?,
-        silenceUrl: json['silence_url'] as String?,
-        likes: json['likes'] == null
-            ? null
-            : Likes.fromJson(json['likes'] as Map<String, dynamic>),
-        achieve: json['achieve'] == null
-            ? null
-            : Achieve.fromJson(json['achieve'] as Map<String, dynamic>),
-        relation: json['relation'] == null
-            ? null
-            : SpaceRelation.fromJson(json['relation'] as Map<String, dynamic>),
-        isDeleted: json['is_deleted'] as int?,
-        honours: json['honours'] == null
-            ? null
-            : Honours.fromJson(json['honours'] as Map<String, dynamic>),
-        liveFansWearing: json['live_fans_wearing'] == null
-            ? null
-            : LiveFansWearing.fromJson(
-                json['live_fans_wearing'] as Map<String, dynamic>),
-        spaceTag: (json['space_tag'] as List<dynamic>?)
-            ?.where((e) => (e?['title'] as String?)?.startsWith('IP') == true)
-            .map((e) => SpaceTag.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        faceNftNew: json['face_nft_new'] as int?,
-        hasFaceNft: json['has_face_nft'] as bool?,
-        nftCertificate: json['nft_certificate'] == null
-            ? null
-            : NftCertificate.fromJson(
-                json['nft_certificate'] as Map<String, dynamic>),
-        entrance: json['entrance'] == null
-            ? null
-            : Entrance.fromJson(json['entrance'] as Map<String, dynamic>),
-        nftId: json['nft_id'] as String?,
-        nftFaceIcon: json['nft_face_icon'] as dynamic,
-        digitalId: json['digital_id'] as String?,
-        digitalType: json['digital_type'] as int?,
-        hasDigitalAsset: json['has_digital_asset'] as bool?,
-        prInfo: json['pr_info'] == null
-            ? null
-            : SpacePrInfo.fromJson(json['pr_info'] as Map<String, dynamic>),
-      );
+    mid: json['mid'] as String?,
+    name: json['name'] as String?,
+    approve: json['approve'] as bool?,
+    rank: json['rank'] as String?,
+    face: json['face'] as String?,
+    displayRank: json['DisplayRank'] as String?,
+    regtime: json['regtime'] as int?,
+    spacesta: json['spacesta'] as int?,
+    birthday: json['birthday'] as String?,
+    place: json['place'] as String?,
+    description: json['description'] as String?,
+    article: json['article'] as int?,
+    attentions: json['attentions'] as dynamic,
+    fans: json['fans'] as int?,
+    friend: json['friend'] as int?,
+    attention: json['attention'] as int?,
+    sign: json['sign'] as String?,
+    levelInfo: json['level_info'] == null
+        ? null
+        : LevelInfo.fromJson(json['level_info'] as Map<String, dynamic>),
+    pendant: json['pendant'] == null
+        ? null
+        : Pendant.fromJson(json['pendant'] as Map<String, dynamic>),
+    nameplate: json['nameplate'] == null
+        ? null
+        : Nameplate.fromJson(json['nameplate'] as Map<String, dynamic>),
+    officialVerify: json['official_verify'] == null
+        ? null
+        : OfficialVerify.fromJson(
+            json['official_verify'] as Map<String, dynamic>,
+          ),
+    professionVerify: json['profession_verify'] == null
+        ? null
+        : ProfessionVerify.fromJson(
+            json['profession_verify'] as Map<String, dynamic>,
+          ),
+    vip: json['vip'] == null
+        ? null
+        : Vip.fromJson(json['vip'] as Map<String, dynamic>),
+    silence: json['silence'] as int?,
+    endTime: json['end_time'] as int?,
+    silenceUrl: json['silence_url'] as String?,
+    likes: json['likes'] == null
+        ? null
+        : Likes.fromJson(json['likes'] as Map<String, dynamic>),
+    achieve: json['achieve'] == null
+        ? null
+        : Achieve.fromJson(json['achieve'] as Map<String, dynamic>),
+    relation: json['relation'] == null
+        ? null
+        : SpaceRelation.fromJson(json['relation'] as Map<String, dynamic>),
+    isDeleted: json['is_deleted'] as int?,
+    honours: json['honours'] == null
+        ? null
+        : Honours.fromJson(json['honours'] as Map<String, dynamic>),
+    liveFansWearing: json['live_fans_wearing'] == null
+        ? null
+        : LiveFansWearing.fromJson(
+            json['live_fans_wearing'] as Map<String, dynamic>,
+          ),
+    spaceTag: (json['space_tag'] as List<dynamic>?)
+        ?.where((e) => (e?['title'] as String?)?.startsWith('IP') == true)
+        .map((e) => SpaceTag.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    faceNftNew: json['face_nft_new'] as int?,
+    hasFaceNft: json['has_face_nft'] as bool?,
+    nftCertificate: json['nft_certificate'] == null
+        ? null
+        : NftCertificate.fromJson(
+            json['nft_certificate'] as Map<String, dynamic>,
+          ),
+    entrance: json['entrance'] == null
+        ? null
+        : Entrance.fromJson(json['entrance'] as Map<String, dynamic>),
+    nftId: json['nft_id'] as String?,
+    nftFaceIcon: json['nft_face_icon'] as dynamic,
+    digitalId: json['digital_id'] as String?,
+    digitalType: json['digital_type'] as int?,
+    hasDigitalAsset: json['has_digital_asset'] as bool?,
+    prInfo: json['pr_info'] == null
+        ? null
+        : SpacePrInfo.fromJson(json['pr_info'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/space/space/category.dart b/lib/models_new/space/space/category.dart
index 6109f8f4b..7b202e701 100644
--- a/lib/models_new/space/space/category.dart
+++ b/lib/models_new/space/space/category.dart
@@ -6,8 +6,8 @@ class Category {
   Category({this.id, this.parentId, this.name});
 
   factory Category.fromJson(Map<String, dynamic> json) => Category(
-        id: json['id'] as int?,
-        parentId: json['parent_id'] as int?,
-        name: json['name'] as String?,
-      );
+    id: json['id'] as int?,
+    parentId: json['parent_id'] as int?,
+    name: json['name'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/cheese.dart b/lib/models_new/space/space/cheese.dart
index 85bcc4a9f..185dbfec9 100644
--- a/lib/models_new/space/space/cheese.dart
+++ b/lib/models_new/space/space/cheese.dart
@@ -7,9 +7,9 @@ class Cheese {
   Cheese({this.count, this.item});
 
   factory Cheese.fromJson(Map<String, dynamic> json) => Cheese(
-        count: json['count'] as int?,
-        item: (json['item'] as List<dynamic>?)
-            ?.map((e) => Item.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    count: json['count'] as int?,
+    item: (json['item'] as List<dynamic>?)
+        ?.map((e) => Item.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/space/space/coin_archive.dart b/lib/models_new/space/space/coin_archive.dart
index 3562eac7b..2ce8a8650 100644
--- a/lib/models_new/space/space/coin_archive.dart
+++ b/lib/models_new/space/space/coin_archive.dart
@@ -7,9 +7,9 @@ class CoinArchive {
   CoinArchive({this.count, this.item});
 
   factory CoinArchive.fromJson(Map<String, dynamic> json) => CoinArchive(
-        count: json['count'] as int?,
-        item: (json['item'] as List<dynamic>?)
-            ?.map((e) => SpaceArchiveItem.fromJson(e))
-            .toList(),
-      );
+    count: json['count'] as int?,
+    item: (json['item'] as List<dynamic>?)
+        ?.map((e) => SpaceArchiveItem.fromJson(e))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/space/space/color_config.dart b/lib/models_new/space/space/color_config.dart
index 76d5f33e3..10e68358f 100644
--- a/lib/models_new/space/space/color_config.dart
+++ b/lib/models_new/space/space/color_config.dart
@@ -9,12 +9,12 @@ class ColorConfig {
   ColorConfig({this.isDarkModeAware, this.day, this.night});
 
   factory ColorConfig.fromJson(Map<String, dynamic> json) => ColorConfig(
-        isDarkModeAware: json['is_dark_mode_aware'] as bool?,
-        day: json['day'] == null
-            ? null
-            : Day.fromJson(json['day'] as Map<String, dynamic>),
-        night: json['night'] == null
-            ? null
-            : Night.fromJson(json['night'] as Map<String, dynamic>),
-      );
+    isDarkModeAware: json['is_dark_mode_aware'] as bool?,
+    day: json['day'] == null
+        ? null
+        : Day.fromJson(json['day'] as Map<String, dynamic>),
+    night: json['night'] == null
+        ? null
+        : Night.fromJson(json['night'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/space/space/colour.dart b/lib/models_new/space/space/colour.dart
index aa57cf1f7..2bb5ef6f7 100644
--- a/lib/models_new/space/space/colour.dart
+++ b/lib/models_new/space/space/colour.dart
@@ -5,7 +5,7 @@ class Colour {
   Colour({this.dark, this.normal});
 
   factory Colour.fromJson(Map<String, dynamic> json) => Colour(
-        dark: json['dark'] as String?,
-        normal: json['normal'] as String?,
-      );
+    dark: json['dark'] as String?,
+    normal: json['normal'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/comic.dart b/lib/models_new/space/space/comic.dart
index cdd5ede33..f5857d109 100644
--- a/lib/models_new/space/space/comic.dart
+++ b/lib/models_new/space/space/comic.dart
@@ -7,9 +7,9 @@ class Comic {
   Comic({this.count, this.item});
 
   factory Comic.fromJson(Map<String, dynamic> json) => Comic(
-        count: json['count'] as int?,
-        item: (json['item'] as List<dynamic>?)
-            ?.map((e) => SpaceArchiveItem.fromJson(e))
-            .toList(),
-      );
+    count: json['count'] as int?,
+    item: (json['item'] as List<dynamic>?)
+        ?.map((e) => SpaceArchiveItem.fromJson(e))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/space/space/container_size.dart b/lib/models_new/space/space/container_size.dart
index cac342e49..8d2252460 100644
--- a/lib/models_new/space/space/container_size.dart
+++ b/lib/models_new/space/space/container_size.dart
@@ -5,7 +5,7 @@ class ContainerSize {
   ContainerSize({this.width, this.height});
 
   factory ContainerSize.fromJson(Map<String, dynamic> json) => ContainerSize(
-        width: (json['width'] as num?)?.toDouble(),
-        height: (json['height'] as num?)?.toDouble(),
-      );
+    width: (json['width'] as num?)?.toDouble(),
+    height: (json['height'] as num?)?.toDouble(),
+  );
 }
diff --git a/lib/models_new/space/space/cover.dart b/lib/models_new/space/space/cover.dart
index 00dcc69dd..6463e3786 100644
--- a/lib/models_new/space/space/cover.dart
+++ b/lib/models_new/space/space/cover.dart
@@ -4,6 +4,6 @@ class Cover {
   Cover({this.url});
 
   factory Cover.fromJson(Map<String, dynamic> json) => Cover(
-        url: json['url'] as String?,
-      );
+    url: json['url'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/data.dart b/lib/models_new/space/space/data.dart
index 8f8036b44..b2456c2ef 100644
--- a/lib/models_new/space/space/data.dart
+++ b/lib/models_new/space/space/data.dart
@@ -164,7 +164,8 @@ class SpaceData {
     nftShowModule = json['nft_show_module'] == null
         ? null
         : NftShowModule.fromJson(
-            json['nft_show_module'] as Map<String, dynamic>);
+            json['nft_show_module'] as Map<String, dynamic>,
+          );
     tab2 = (json['tab2'] as List<dynamic>?)
         ?.map((e) => SpaceTab2.fromJson(e as Map<String, dynamic>))
         .toList();
@@ -177,7 +178,8 @@ class SpaceData {
         ?.map((e) => SpaceButtonList.fromJson(e as Map<String, dynamic>))
         .toList();
     relSpecial = (json['rel_special'] as num?)?.toInt();
-    hasItem = archive?.item?.isNotEmpty == true ||
+    hasItem =
+        archive?.item?.isNotEmpty == true ||
         favourite2?.item?.isNotEmpty == true ||
         coinArchive?.item?.isNotEmpty == true ||
         likeArchive?.item?.isNotEmpty == true ||
diff --git a/lib/models_new/space/space/day.dart b/lib/models_new/space/space/day.dart
index 5808406ac..ac458a786 100644
--- a/lib/models_new/space/space/day.dart
+++ b/lib/models_new/space/space/day.dart
@@ -4,6 +4,6 @@ class Day {
   Day({this.argb});
 
   factory Day.fromJson(Map<String, dynamic> json) => Day(
-        argb: json['argb'] as String?,
-      );
+    argb: json['argb'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/digital_info.dart b/lib/models_new/space/space/digital_info.dart
index 76290cdd5..eef172c60 100644
--- a/lib/models_new/space/space/digital_info.dart
+++ b/lib/models_new/space/space/digital_info.dart
@@ -28,17 +28,17 @@ class DigitalInfo {
   });
 
   factory DigitalInfo.fromJson(Map<String, dynamic> json) => DigitalInfo(
-        active: json['active'] as bool?,
-        jumpUrl: json['jump_url'] as String?,
-        nftType: json['nft_type'] as int?,
-        backgroundHandle: json['background_handle'] as int?,
-        animationFirstFrame: json['animation_first_frame'] as String?,
-        musicAlbum: json['music_album'] as dynamic,
-        animation: json['animation'] as dynamic,
-        nftRegionTitle: json['nft_region_title'] as String?,
-        cardId: json['card_id'] as int?,
-        cutSpaceBg: json['cut_space_bg'] as String?,
-        partType: json['part_type'] as int?,
-        itemJumpUrl: json['item_jump_url'] as String?,
-      );
+    active: json['active'] as bool?,
+    jumpUrl: json['jump_url'] as String?,
+    nftType: json['nft_type'] as int?,
+    backgroundHandle: json['background_handle'] as int?,
+    animationFirstFrame: json['animation_first_frame'] as String?,
+    musicAlbum: json['music_album'] as dynamic,
+    animation: json['animation'] as dynamic,
+    nftRegionTitle: json['nft_region_title'] as String?,
+    cardId: json['card_id'] as int?,
+    cutSpaceBg: json['cut_space_bg'] as String?,
+    partType: json['part_type'] as int?,
+    itemJumpUrl: json['item_jump_url'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/display.dart b/lib/models_new/space/space/display.dart
index 66632c433..a7beb2f52 100644
--- a/lib/models_new/space/space/display.dart
+++ b/lib/models_new/space/space/display.dart
@@ -12,9 +12,9 @@ class Display {
   });
 
   factory Display.fromJson(Map<String, dynamic> json) => Display(
-        bgThemeLight: json['bg_theme_light'] as String?,
-        bgThemeNight: json['bg_theme_night'] as String?,
-        nftPoster: json['nft_poster'] as String?,
-        nftRaw: json['nft_raw'] as String?,
-      );
+    bgThemeLight: json['bg_theme_light'] as String?,
+    bgThemeNight: json['bg_theme_night'] as String?,
+    nftPoster: json['nft_poster'] as String?,
+    nftRaw: json['nft_raw'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/draw.dart b/lib/models_new/space/space/draw.dart
index 1a71d1240..6408c3314 100644
--- a/lib/models_new/space/space/draw.dart
+++ b/lib/models_new/space/space/draw.dart
@@ -8,11 +8,10 @@ class Draw {
   Draw({this.drawType, this.fillMode, this.colorConfig});
 
   factory Draw.fromJson(Map<String, dynamic> json) => Draw(
-        drawType: json['draw_type'] as int?,
-        fillMode: json['fill_mode'] as int?,
-        colorConfig: json['color_config'] == null
-            ? null
-            : ColorConfig.fromJson(
-                json['color_config'] as Map<String, dynamic>),
-      );
+    drawType: json['draw_type'] as int?,
+    fillMode: json['fill_mode'] as int?,
+    colorConfig: json['color_config'] == null
+        ? null
+        : ColorConfig.fromJson(json['color_config'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/space/space/draw_src.dart b/lib/models_new/space/space/draw_src.dart
index 142b31c4a..58a3e6001 100644
--- a/lib/models_new/space/space/draw_src.dart
+++ b/lib/models_new/space/space/draw_src.dart
@@ -7,9 +7,9 @@ class DrawSrc {
   DrawSrc({this.srcType, this.draw});
 
   factory DrawSrc.fromJson(Map<String, dynamic> json) => DrawSrc(
-        srcType: json['src_type'] as int?,
-        draw: json['draw'] == null
-            ? null
-            : Draw.fromJson(json['draw'] as Map<String, dynamic>),
-      );
+    srcType: json['src_type'] as int?,
+    draw: json['draw'] == null
+        ? null
+        : Draw.fromJson(json['draw'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/space/space/elec.dart b/lib/models_new/space/space/elec.dart
index 56e6da01a..1db500ad5 100644
--- a/lib/models_new/space/space/elec.dart
+++ b/lib/models_new/space/space/elec.dart
@@ -33,22 +33,22 @@ class Elec {
   });
 
   factory Elec.fromJson(Map<String, dynamic> json) => Elec(
-        show: json['show'] as bool?,
-        total: json['total'] as int?,
-        count: json['count'] as int?,
-        elecNum: json['elec_num'] as int?,
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => ListItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        elecSet: json['elec_set'] == null
-            ? null
-            : ElecSet.fromJson(json['elec_set'] as Map<String, dynamic>),
-        state: json['state'] as int?,
-        upowerTitle: json['upower_title'] as String?,
-        upowerJumpUrl: json['upower_jump_url'] as String?,
-        upowerIconUrl: json['upower_icon_url'] as String?,
-        upowerState: json['upower_state'] as int?,
-        rankTitle: json['rank_title'] as String?,
-        rankUrl: json['rank_url'] as String?,
-      );
+    show: json['show'] as bool?,
+    total: json['total'] as int?,
+    count: json['count'] as int?,
+    elecNum: json['elec_num'] as int?,
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => ListItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    elecSet: json['elec_set'] == null
+        ? null
+        : ElecSet.fromJson(json['elec_set'] as Map<String, dynamic>),
+    state: json['state'] as int?,
+    upowerTitle: json['upower_title'] as String?,
+    upowerJumpUrl: json['upower_jump_url'] as String?,
+    upowerIconUrl: json['upower_icon_url'] as String?,
+    upowerState: json['upower_state'] as int?,
+    rankTitle: json['rank_title'] as String?,
+    rankUrl: json['rank_url'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/elec_list.dart b/lib/models_new/space/space/elec_list.dart
index b1df3e1a0..0696d5d67 100644
--- a/lib/models_new/space/space/elec_list.dart
+++ b/lib/models_new/space/space/elec_list.dart
@@ -28,17 +28,17 @@ class ElecList {
   });
 
   factory ElecList.fromJson(Map<String, dynamic> json) => ElecList(
-        title: json['title'] as String?,
-        elecNum: json['elec_num'] as int?,
-        isCustomize: json['is_customize'] as int?,
-        bpNum: json['bp_num'] as String?,
-        minBp: json['min_bp'] as String?,
-        maxBp: json['max_bp'] as String?,
-        bpNumFen: json['bp_num_fen'] as int?,
-        isDefault: json['is_default'] as int?,
-        minElec: json['min_elec'] as int?,
-        maxElec: json['max_elec'] as int?,
-        minBpFen: json['min_bp_fen'] as int?,
-        maxBpFen: json['max_bp_fen'] as int?,
-      );
+    title: json['title'] as String?,
+    elecNum: json['elec_num'] as int?,
+    isCustomize: json['is_customize'] as int?,
+    bpNum: json['bp_num'] as String?,
+    minBp: json['min_bp'] as String?,
+    maxBp: json['max_bp'] as String?,
+    bpNumFen: json['bp_num_fen'] as int?,
+    isDefault: json['is_default'] as int?,
+    minElec: json['min_elec'] as int?,
+    maxElec: json['max_elec'] as int?,
+    minBpFen: json['min_bp_fen'] as int?,
+    maxBpFen: json['max_bp_fen'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space/elec_set.dart b/lib/models_new/space/space/elec_set.dart
index ff928a1b8..a48c581d9 100644
--- a/lib/models_new/space/space/elec_set.dart
+++ b/lib/models_new/space/space/elec_set.dart
@@ -18,13 +18,13 @@ class ElecSet {
   });
 
   factory ElecSet.fromJson(Map<String, dynamic> json) => ElecSet(
-        elecTheme: json['elec_theme'] as int?,
-        rmbRate: json['rmb_rate'] as int?,
-        integrityRate: json['integrity_rate'] as int?,
-        roundMode: json['round_mode'] as int?,
-        elecList: (json['elec_list'] as List<dynamic>?)
-            ?.map((e) => ElecList.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        batteryItemDesc: json['battery_item_desc'] as String?,
-      );
+    elecTheme: json['elec_theme'] as int?,
+    rmbRate: json['rmb_rate'] as int?,
+    integrityRate: json['integrity_rate'] as int?,
+    roundMode: json['round_mode'] as int?,
+    elecList: (json['elec_list'] as List<dynamic>?)
+        ?.map((e) => ElecList.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    batteryItemDesc: json['battery_item_desc'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/entrance.dart b/lib/models_new/space/space/entrance.dart
index 5930842ac..e2c6dd941 100644
--- a/lib/models_new/space/space/entrance.dart
+++ b/lib/models_new/space/space/entrance.dart
@@ -6,8 +6,8 @@ class Entrance {
   Entrance({this.icon, this.jumpUrl, this.isShowEntrance});
 
   factory Entrance.fromJson(Map<String, dynamic> json) => Entrance(
-        icon: json['icon'] as String?,
-        jumpUrl: json['jump_url'] as String?,
-        isShowEntrance: json['is_show_entrance'] as bool?,
-      );
+    icon: json['icon'] as String?,
+    jumpUrl: json['jump_url'] as String?,
+    isShowEntrance: json['is_show_entrance'] as bool?,
+  );
 }
diff --git a/lib/models_new/space/space/entry.dart b/lib/models_new/space/space/entry.dart
index fba4d52df..183e48434 100644
--- a/lib/models_new/space/space/entry.dart
+++ b/lib/models_new/space/space/entry.dart
@@ -7,9 +7,9 @@ class Entry {
   Entry({this.icon, this.jumpLink, this.accessibility, this.needLogin});
 
   factory Entry.fromJson(Map<String, dynamic> json) => Entry(
-        icon: json['icon'] as String?,
-        jumpLink: json['jump_link'] as String?,
-        accessibility: json['accessibility'] as String?,
-        needLogin: json['need_login'] as bool?,
-      );
+    icon: json['icon'] as String?,
+    jumpLink: json['jump_link'] as String?,
+    accessibility: json['accessibility'] as String?,
+    needLogin: json['need_login'] as bool?,
+  );
 }
diff --git a/lib/models_new/space/space/extra.dart b/lib/models_new/space/space/extra.dart
index b5c68c4fe..4fa04ed16 100644
--- a/lib/models_new/space/space/extra.dart
+++ b/lib/models_new/space/space/extra.dart
@@ -14,11 +14,11 @@ class Extra {
   });
 
   factory Extra.fromJson(Map<String, dynamic> json) => Extra(
-        card: json['card'] == null
-            ? null
-            : SpaceCard.fromJson(json['card'] as Map<String, dynamic>),
-        salesType: json['sales_type'] as int?,
-        upzoneEntranceType: json['upzone_entrance_type'] as int?,
-        upzoneEntranceReportId: json['upzone_entrance_report_id'] as String?,
-      );
+    card: json['card'] == null
+        ? null
+        : SpaceCard.fromJson(json['card'] as Map<String, dynamic>),
+    salesType: json['sales_type'] as int?,
+    upzoneEntranceType: json['upzone_entrance_type'] as int?,
+    upzoneEntranceReportId: json['upzone_entrance_report_id'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/favourite2.dart b/lib/models_new/space/space/favourite2.dart
index c011ae54d..70cc6a664 100644
--- a/lib/models_new/space/space/favourite2.dart
+++ b/lib/models_new/space/space/favourite2.dart
@@ -7,9 +7,9 @@ class Favourite2 {
   Favourite2({this.count, this.item});
 
   factory Favourite2.fromJson(Map<String, dynamic> json) => Favourite2(
-        count: json['count'] as int?,
-        item: (json['item'] as List<dynamic>?)
-            ?.map((e) => SpaceFavItemModel.fromJson(e))
-            .toList(),
-      );
+    count: json['count'] as int?,
+    item: (json['item'] as List<dynamic>?)
+        ?.map((e) => SpaceFavItemModel.fromJson(e))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/space/space/general_spec.dart b/lib/models_new/space/space/general_spec.dart
index d4bbc1304..c69b0515b 100644
--- a/lib/models_new/space/space/general_spec.dart
+++ b/lib/models_new/space/space/general_spec.dart
@@ -10,14 +10,14 @@ class GeneralSpec {
   GeneralSpec({this.posSpec, this.sizeSpec, this.renderSpec});
 
   factory GeneralSpec.fromJson(Map<String, dynamic> json) => GeneralSpec(
-        posSpec: json['pos_spec'] == null
-            ? null
-            : PosSpec.fromJson(json['pos_spec'] as Map<String, dynamic>),
-        sizeSpec: json['size_spec'] == null
-            ? null
-            : SizeSpec.fromJson(json['size_spec'] as Map<String, dynamic>),
-        renderSpec: json['render_spec'] == null
-            ? null
-            : RenderSpec.fromJson(json['render_spec'] as Map<String, dynamic>),
-      );
+    posSpec: json['pos_spec'] == null
+        ? null
+        : PosSpec.fromJson(json['pos_spec'] as Map<String, dynamic>),
+    sizeSpec: json['size_spec'] == null
+        ? null
+        : SizeSpec.fromJson(json['size_spec'] as Map<String, dynamic>),
+    renderSpec: json['render_spec'] == null
+        ? null
+        : RenderSpec.fromJson(json['render_spec'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/space/space/guard.dart b/lib/models_new/space/space/guard.dart
index 6e0983011..0c2bace36 100644
--- a/lib/models_new/space/space/guard.dart
+++ b/lib/models_new/space/space/guard.dart
@@ -10,12 +10,12 @@ class Guard {
   Guard({this.uri, this.desc, this.highLight, this.item, this.buttonMsg});
 
   factory Guard.fromJson(Map<String, dynamic> json) => Guard(
-        uri: json['uri'] as String?,
-        desc: json['desc'] as String?,
-        highLight: json['high_light'] as String?,
-        item: (json['item'] as List<dynamic>?)
-            ?.map((e) => Item.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        buttonMsg: json['button_msg'] as String?,
-      );
+    uri: json['uri'] as String?,
+    desc: json['desc'] as String?,
+    highLight: json['high_light'] as String?,
+    item: (json['item'] as List<dynamic>?)
+        ?.map((e) => Item.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    buttonMsg: json['button_msg'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/honours.dart b/lib/models_new/space/space/honours.dart
index 950a279c2..da7d9d573 100644
--- a/lib/models_new/space/space/honours.dart
+++ b/lib/models_new/space/space/honours.dart
@@ -7,9 +7,9 @@ class Honours {
   Honours({this.colour, this.tags});
 
   factory Honours.fromJson(Map<String, dynamic> json) => Honours(
-        colour: json['colour'] == null
-            ? null
-            : Colour.fromJson(json['colour'] as Map<String, dynamic>),
-        tags: json['tags'] as List<dynamic>?,
-      );
+    colour: json['colour'] == null
+        ? null
+        : Colour.fromJson(json['colour'] as Map<String, dynamic>),
+    tags: json['tags'] as List<dynamic>?,
+  );
 }
diff --git a/lib/models_new/space/space/images.dart b/lib/models_new/space/space/images.dart
index bdd110be6..5ada250f1 100644
--- a/lib/models_new/space/space/images.dart
+++ b/lib/models_new/space/space/images.dart
@@ -25,25 +25,27 @@ class SpaceImages {
   });
 
   factory SpaceImages.fromJson(Map<String, dynamic> json) => SpaceImages(
-        imgUrl: json['imgUrl'] as String?,
-        nightImgurl: json['night_imgurl'] as String?,
-        goodsAvailable: json['goods_available'] as bool?,
-        purchaseButton: json['purchase_button'] == null
-            ? null
-            : PurchaseButton.fromJson(
-                json['purchase_button'] as Map<String, dynamic>),
-        entranceButton: json['entrance_button'] == null
-            ? null
-            : EntranceButton.fromJson(
-                json['entrance_button'] as Map<String, dynamic>),
-        digitalInfo: json['digital_info'] == null
-            ? null
-            : DigitalInfo.fromJson(
-                json['digital_info'] as Map<String, dynamic>),
-        showDigital: json['show_digital'] as bool?,
-        collectionTopSimple: json['collection_top_simple'] == null
-            ? null
-            : CollectionTopSimple.fromJson(
-                json['collection_top_simple'] as Map<String, dynamic>),
-      );
+    imgUrl: json['imgUrl'] as String?,
+    nightImgurl: json['night_imgurl'] as String?,
+    goodsAvailable: json['goods_available'] as bool?,
+    purchaseButton: json['purchase_button'] == null
+        ? null
+        : PurchaseButton.fromJson(
+            json['purchase_button'] as Map<String, dynamic>,
+          ),
+    entranceButton: json['entrance_button'] == null
+        ? null
+        : EntranceButton.fromJson(
+            json['entrance_button'] as Map<String, dynamic>,
+          ),
+    digitalInfo: json['digital_info'] == null
+        ? null
+        : DigitalInfo.fromJson(json['digital_info'] as Map<String, dynamic>),
+    showDigital: json['show_digital'] as bool?,
+    collectionTopSimple: json['collection_top_simple'] == null
+        ? null
+        : CollectionTopSimple.fromJson(
+            json['collection_top_simple'] as Map<String, dynamic>,
+          ),
+  );
 }
diff --git a/lib/models_new/space/space/item.dart b/lib/models_new/space/space/item.dart
index b22ce70c7..ccbd3aa9e 100644
--- a/lib/models_new/space/space/item.dart
+++ b/lib/models_new/space/space/item.dart
@@ -70,39 +70,39 @@ class Item {
   });
 
   factory Item.fromJson(Map<String, dynamic> json) => Item(
-        title: json['title'] as String?,
-        subtitle: json['subtitle'] as String?,
-        tname: json['tname'] as String?,
-        cover: json['cover'] as String?,
-        coverIcon: json['cover_icon'] as String?,
-        uri: json['uri'] as String?,
-        param: json['param'] as String?,
-        goto: json['goto'] as String?,
-        length: json['length'] as String?,
-        duration: json['duration'] as int?,
-        isPopular: json['is_popular'] as bool?,
-        isSteins: json['is_steins'] as bool?,
-        isUgcpay: json['is_ugcpay'] as bool?,
-        isCooperation: json['is_cooperation'] as bool?,
-        isPgc: json['is_pgc'] as bool?,
-        isLivePlayback: json['is_live_playback'] as bool?,
-        isPugv: json['is_pugv'] as bool?,
-        isFold: json['is_fold'] as bool?,
-        isOneself: json['is_oneself'] as bool?,
-        play: json['play'] as int?,
-        danmaku: json['danmaku'] as int?,
-        ctime: json['ctime'] as int?,
-        ugcPay: json['ugc_pay'] as int?,
-        badges: (json['badges'] as List<dynamic>?)
-            ?.map((e) => Badge.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        author: json['author'] as String?,
-        state: json['state'] as bool?,
-        bvid: json['bvid'] as String?,
-        videos: json['videos'] as int?,
-        firstCid: json['first_cid'] as int?,
-        viewContent: json['view_content'] as String?,
-        iconType: json['icon_type'] as int?,
-        publishTimeText: json['publish_time_text'] as String?,
-      );
+    title: json['title'] as String?,
+    subtitle: json['subtitle'] as String?,
+    tname: json['tname'] as String?,
+    cover: json['cover'] as String?,
+    coverIcon: json['cover_icon'] as String?,
+    uri: json['uri'] as String?,
+    param: json['param'] as String?,
+    goto: json['goto'] as String?,
+    length: json['length'] as String?,
+    duration: json['duration'] as int?,
+    isPopular: json['is_popular'] as bool?,
+    isSteins: json['is_steins'] as bool?,
+    isUgcpay: json['is_ugcpay'] as bool?,
+    isCooperation: json['is_cooperation'] as bool?,
+    isPgc: json['is_pgc'] as bool?,
+    isLivePlayback: json['is_live_playback'] as bool?,
+    isPugv: json['is_pugv'] as bool?,
+    isFold: json['is_fold'] as bool?,
+    isOneself: json['is_oneself'] as bool?,
+    play: json['play'] as int?,
+    danmaku: json['danmaku'] as int?,
+    ctime: json['ctime'] as int?,
+    ugcPay: json['ugc_pay'] as int?,
+    badges: (json['badges'] as List<dynamic>?)
+        ?.map((e) => Badge.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    author: json['author'] as String?,
+    state: json['state'] as bool?,
+    bvid: json['bvid'] as String?,
+    videos: json['videos'] as int?,
+    firstCid: json['first_cid'] as int?,
+    viewContent: json['view_content'] as String?,
+    iconType: json['icon_type'] as int?,
+    publishTimeText: json['publish_time_text'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/label.dart b/lib/models_new/space/space/label.dart
index 45f6920bd..3368bab8d 100644
--- a/lib/models_new/space/space/label.dart
+++ b/lib/models_new/space/space/label.dart
@@ -20,13 +20,13 @@ class Label {
   });
 
   factory Label.fromJson(Map<String, dynamic> json) => Label(
-        path: json['path'] as String?,
-        text: json['text'] as String?,
-        labelTheme: json['label_theme'] as String?,
-        textColor: json['text_color'] as String?,
-        bgStyle: json['bg_style'] as int?,
-        bgColor: json['bg_color'] as String?,
-        borderColor: json['border_color'] as String?,
-        image: json['image'] as String?,
-      );
+    path: json['path'] as String?,
+    text: json['text'] as String?,
+    labelTheme: json['label_theme'] as String?,
+    textColor: json['text_color'] as String?,
+    bgStyle: json['bg_style'] as int?,
+    bgColor: json['bg_color'] as String?,
+    borderColor: json['border_color'] as String?,
+    image: json['image'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/level_info.dart b/lib/models_new/space/space/level_info.dart
index 47f93f959..38f32ed7c 100644
--- a/lib/models_new/space/space/level_info.dart
+++ b/lib/models_new/space/space/level_info.dart
@@ -18,14 +18,15 @@ class LevelInfo {
   });
 
   factory LevelInfo.fromJson(Map<String, dynamic> json) => LevelInfo(
-        currentLevel: json['current_level'] as int?,
-        currentMin: json['current_min'] as int?,
-        currentExp: json['current_exp'] as int?,
-        nextExp: json['next_exp'] as dynamic,
-        identity: json['identity'] as int?,
-        seniorInquiry: json['senior_inquiry'] == null
-            ? null
-            : SeniorInquiry.fromJson(
-                json['senior_inquiry'] as Map<String, dynamic>),
-      );
+    currentLevel: json['current_level'] as int?,
+    currentMin: json['current_min'] as int?,
+    currentExp: json['current_exp'] as int?,
+    nextExp: json['next_exp'] as dynamic,
+    identity: json['identity'] as int?,
+    seniorInquiry: json['senior_inquiry'] == null
+        ? null
+        : SeniorInquiry.fromJson(
+            json['senior_inquiry'] as Map<String, dynamic>,
+          ),
+  );
 }
diff --git a/lib/models_new/space/space/like_archive.dart b/lib/models_new/space/space/like_archive.dart
index d5202ea12..ae2bf9e76 100644
--- a/lib/models_new/space/space/like_archive.dart
+++ b/lib/models_new/space/space/like_archive.dart
@@ -7,9 +7,9 @@ class LikeArchive {
   LikeArchive({this.count, this.item});
 
   factory LikeArchive.fromJson(Map<String, dynamic> json) => LikeArchive(
-        count: json['count'] as int?,
-        item: (json['item'] as List<dynamic>?)
-            ?.map((e) => SpaceArchiveItem.fromJson(e))
-            .toList(),
-      );
+    count: json['count'] as int?,
+    item: (json['item'] as List<dynamic>?)
+        ?.map((e) => SpaceArchiveItem.fromJson(e))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/space/space/likes.dart b/lib/models_new/space/space/likes.dart
index 87521ad78..4fc295371 100644
--- a/lib/models_new/space/space/likes.dart
+++ b/lib/models_new/space/space/likes.dart
@@ -5,7 +5,7 @@ class Likes {
   Likes({this.likeNum, this.skrTip});
 
   factory Likes.fromJson(Map<String, dynamic> json) => Likes(
-        likeNum: json['like_num'] as int?,
-        skrTip: json['skr_tip'] as String?,
-      );
+    likeNum: json['like_num'] as int?,
+    skrTip: json['skr_tip'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/list.dart b/lib/models_new/space/space/list.dart
index 1fe78d8a1..33bad5ddb 100644
--- a/lib/models_new/space/space/list.dart
+++ b/lib/models_new/space/space/list.dart
@@ -20,13 +20,13 @@ class ListItem {
   });
 
   factory ListItem.fromJson(Map<String, dynamic> json) => ListItem(
-        payMid: json['pay_mid'] as int?,
-        rank: json['rank'] as int?,
-        trendType: json['trend_type'] as int?,
-        message: json['message'] as String?,
-        mid: json['mid'] as int?,
-        vipInfo: json['vip_info'] as dynamic,
-        uname: json['uname'] as String?,
-        avatar: json['avatar'] as String?,
-      );
+    payMid: json['pay_mid'] as int?,
+    rank: json['rank'] as int?,
+    trendType: json['trend_type'] as int?,
+    message: json['message'] as String?,
+    mid: json['mid'] as int?,
+    vipInfo: json['vip_info'] as dynamic,
+    uname: json['uname'] as String?,
+    avatar: json['avatar'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/live.dart b/lib/models_new/space/space/live.dart
index 766fcedab..4571eaa87 100644
--- a/lib/models_new/space/space/live.dart
+++ b/lib/models_new/space/space/live.dart
@@ -26,16 +26,16 @@ class Live {
   });
 
   factory Live.fromJson(Map<String, dynamic> json) => Live(
-        roomStatus: json['roomStatus'] as int?,
-        roundStatus: json['roundStatus'] as int?,
-        liveStatus: json['liveStatus'] as int?,
-        url: json['url'] as String?,
-        title: json['title'] as String?,
-        cover: json['cover'] as String?,
-        online: json['online'] as int?,
-        roomid: json['roomid'] as int?,
-        broadcastType: json['broadcast_type'] as int?,
-        onlineHidden: json['online_hidden'] as int?,
-        link: json['link'] as String?,
-      );
+    roomStatus: json['roomStatus'] as int?,
+    roundStatus: json['roundStatus'] as int?,
+    liveStatus: json['liveStatus'] as int?,
+    url: json['url'] as String?,
+    title: json['title'] as String?,
+    cover: json['cover'] as String?,
+    online: json['online'] as int?,
+    roomid: json['roomid'] as int?,
+    broadcastType: json['broadcast_type'] as int?,
+    onlineHidden: json['online_hidden'] as int?,
+    link: json['link'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/media.dart b/lib/models_new/space/space/media.dart
index a42c16c03..64a3ffabc 100644
--- a/lib/models_new/space/space/media.dart
+++ b/lib/models_new/space/space/media.dart
@@ -20,13 +20,13 @@ class Media {
   });
 
   factory Media.fromJson(Map<String, dynamic> json) => Media(
-        score: json['score'] as int?,
-        mediaId: json['media_id'] as int?,
-        title: json['title'] as String?,
-        cover: json['cover'] as String?,
-        area: json['area'] as String?,
-        typeId: json['type_id'] as int?,
-        typeName: json['type_name'] as String?,
-        spoiler: json['spoiler'] as int?,
-      );
+    score: json['score'] as int?,
+    mediaId: json['media_id'] as int?,
+    title: json['title'] as String?,
+    cover: json['cover'] as String?,
+    area: json['area'] as String?,
+    typeId: json['type_id'] as int?,
+    typeName: json['type_name'] as String?,
+    spoiler: json['spoiler'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space/nameplate.dart b/lib/models_new/space/space/nameplate.dart
index 0ad7bd5ea..ccf0b89fc 100644
--- a/lib/models_new/space/space/nameplate.dart
+++ b/lib/models_new/space/space/nameplate.dart
@@ -16,11 +16,11 @@ class Nameplate {
   });
 
   factory Nameplate.fromJson(Map<String, dynamic> json) => Nameplate(
-        nid: json['nid'] as int?,
-        name: json['name'] as String?,
-        image: json['image'] as String?,
-        imageSmall: json['image_small'] as String?,
-        level: json['level'] as String?,
-        condition: json['condition'] as String?,
-      );
+    nid: json['nid'] as int?,
+    name: json['name'] as String?,
+    image: json['image'] as String?,
+    imageSmall: json['image_small'] as String?,
+    level: json['level'] as String?,
+    condition: json['condition'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/nft.dart b/lib/models_new/space/space/nft.dart
index 314a8d911..112337d58 100644
--- a/lib/models_new/space/space/nft.dart
+++ b/lib/models_new/space/space/nft.dart
@@ -18,13 +18,13 @@ class Nft {
   });
 
   factory Nft.fromJson(Map<String, dynamic> json) => Nft(
-        itemName: json['item_name'] as String?,
-        issuer: json['issuer'] as String?,
-        serialNumber: json['serial_number'] as String?,
-        detailUrl: json['detail_url'] as String?,
-        nftStatus: json['nft_status'] as int?,
-        display: json['display'] == null
-            ? null
-            : Display.fromJson(json['display'] as Map<String, dynamic>),
-      );
+    itemName: json['item_name'] as String?,
+    issuer: json['issuer'] as String?,
+    serialNumber: json['serial_number'] as String?,
+    detailUrl: json['detail_url'] as String?,
+    nftStatus: json['nft_status'] as int?,
+    display: json['display'] == null
+        ? null
+        : Display.fromJson(json['display'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/space/space/nft_show_module.dart b/lib/models_new/space/space/nft_show_module.dart
index 7851c344d..8cb0cc34a 100644
--- a/lib/models_new/space/space/nft_show_module.dart
+++ b/lib/models_new/space/space/nft_show_module.dart
@@ -14,11 +14,11 @@ class NftShowModule {
   });
 
   factory NftShowModule.fromJson(Map<String, dynamic> json) => NftShowModule(
-        total: json['total'] as int?,
-        artsMoreJump: json['arts_more_jump'] as String?,
-        nfts: (json['nfts'] as List<dynamic>?)
-            ?.map((e) => Nft.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        floorTitle: json['floor_title'] as String?,
-      );
+    total: json['total'] as int?,
+    artsMoreJump: json['arts_more_jump'] as String?,
+    nfts: (json['nfts'] as List<dynamic>?)
+        ?.map((e) => Nft.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    floorTitle: json['floor_title'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/night.dart b/lib/models_new/space/space/night.dart
index 9995ca35c..c9fb6c9a7 100644
--- a/lib/models_new/space/space/night.dart
+++ b/lib/models_new/space/space/night.dart
@@ -4,6 +4,6 @@ class Night {
   Night({this.argb});
 
   factory Night.fromJson(Map<String, dynamic> json) => Night(
-        argb: json['argb'] as String?,
-      );
+    argb: json['argb'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/order.dart b/lib/models_new/space/space/order.dart
index 724ef2ebd..f0bb1b5eb 100644
--- a/lib/models_new/space/space/order.dart
+++ b/lib/models_new/space/space/order.dart
@@ -5,7 +5,7 @@ class Order {
   Order({this.title, this.value});
 
   factory Order.fromJson(Map<String, dynamic> json) => Order(
-        title: json['title'] as String?,
-        value: json['value'] as String?,
-      );
+    title: json['title'] as String?,
+    value: json['value'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/play_game.dart b/lib/models_new/space/space/play_game.dart
index 2f6bf6d11..b0d7b0eb8 100644
--- a/lib/models_new/space/space/play_game.dart
+++ b/lib/models_new/space/space/play_game.dart
@@ -5,7 +5,7 @@ class PlayGame {
   PlayGame({this.count, this.item});
 
   factory PlayGame.fromJson(Map<String, dynamic> json) => PlayGame(
-        count: json['count'] as int?,
-        item: json['item'] as List<dynamic>?,
-      );
+    count: json['count'] as int?,
+    item: json['item'] as List<dynamic>?,
+  );
 }
diff --git a/lib/models_new/space/space/pos_spec.dart b/lib/models_new/space/space/pos_spec.dart
index 1ce180515..140da9c10 100644
--- a/lib/models_new/space/space/pos_spec.dart
+++ b/lib/models_new/space/space/pos_spec.dart
@@ -6,8 +6,8 @@ class PosSpec {
   PosSpec({this.coordinatePos, this.axisX, this.axisY});
 
   factory PosSpec.fromJson(Map<String, dynamic> json) => PosSpec(
-        coordinatePos: json['coordinate_pos'] as int?,
-        axisX: (json['axis_x'] as num?)?.toDouble(),
-        axisY: (json['axis_y'] as num?)?.toDouble(),
-      );
+    coordinatePos: json['coordinate_pos'] as int?,
+    axisX: (json['axis_x'] as num?)?.toDouble(),
+    axisY: (json['axis_y'] as num?)?.toDouble(),
+  );
 }
diff --git a/lib/models_new/space/space/preference.dart b/lib/models_new/space/space/preference.dart
index c9ac6b032..c7373363c 100644
--- a/lib/models_new/space/space/preference.dart
+++ b/lib/models_new/space/space/preference.dart
@@ -6,8 +6,8 @@ class Preference {
   Preference({this.collectionPublic, this.garbFirstGain, this.orderType});
 
   factory Preference.fromJson(Map<String, dynamic> json) => Preference(
-        collectionPublic: json['collection_public'] as bool?,
-        garbFirstGain: json['garb_first_gain'] as String?,
-        orderType: json['order_type'] as int?,
-      );
+    collectionPublic: json['collection_public'] as bool?,
+    garbFirstGain: json['garb_first_gain'] as String?,
+    orderType: json['order_type'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space/relation.dart b/lib/models_new/space/space/relation.dart
index 7f5bbfa12..3c988ebbf 100644
--- a/lib/models_new/space/space/relation.dart
+++ b/lib/models_new/space/space/relation.dart
@@ -10,8 +10,8 @@ class SpaceRelation {
   });
 
   factory SpaceRelation.fromJson(Map<String, dynamic> json) => SpaceRelation(
-        status: json['status'] as int?,
-        isFollow: json['is_follow'] as int?,
-        isFollowed: json['is_followed'] as int?,
-      );
+    status: json['status'] as int?,
+    isFollow: json['is_follow'] as int?,
+    isFollowed: json['is_followed'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space/render_spec.dart b/lib/models_new/space/space/render_spec.dart
index bdfb0dc1a..022738977 100644
--- a/lib/models_new/space/space/render_spec.dart
+++ b/lib/models_new/space/space/render_spec.dart
@@ -4,6 +4,6 @@ class RenderSpec {
   RenderSpec({this.opacity});
 
   factory RenderSpec.fromJson(Map<String, dynamic> json) => RenderSpec(
-        opacity: json['opacity'] as int?,
-      );
+    opacity: json['opacity'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space/res_native_draw.dart b/lib/models_new/space/space/res_native_draw.dart
index 4defb5fda..4e057efe2 100644
--- a/lib/models_new/space/space/res_native_draw.dart
+++ b/lib/models_new/space/space/res_native_draw.dart
@@ -6,8 +6,8 @@ class ResNativeDraw {
   ResNativeDraw({this.drawSrc});
 
   factory ResNativeDraw.fromJson(Map<String, dynamic> json) => ResNativeDraw(
-        drawSrc: json['draw_src'] == null
-            ? null
-            : DrawSrc.fromJson(json['draw_src'] as Map<String, dynamic>),
-      );
+    drawSrc: json['draw_src'] == null
+        ? null
+        : DrawSrc.fromJson(json['draw_src'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/space/space/resource.dart b/lib/models_new/space/space/resource.dart
index 8f84324e8..fef0f52ff 100644
--- a/lib/models_new/space/space/resource.dart
+++ b/lib/models_new/space/space/resource.dart
@@ -7,10 +7,11 @@ class Resource {
   Resource({this.resType, this.resNativeDraw});
 
   factory Resource.fromJson(Map<String, dynamic> json) => Resource(
-        resType: json['res_type'] as int?,
-        resNativeDraw: json['res_native_draw'] == null
-            ? null
-            : ResNativeDraw.fromJson(
-                json['res_native_draw'] as Map<String, dynamic>),
-      );
+    resType: json['res_type'] as int?,
+    resNativeDraw: json['res_native_draw'] == null
+        ? null
+        : ResNativeDraw.fromJson(
+            json['res_native_draw'] as Map<String, dynamic>,
+          ),
+  );
 }
diff --git a/lib/models_new/space/space/season.dart b/lib/models_new/space/space/season.dart
index d176d5c93..97b887c8e 100644
--- a/lib/models_new/space/space/season.dart
+++ b/lib/models_new/space/space/season.dart
@@ -7,9 +7,9 @@ class SpaceSeason {
   SpaceSeason({this.count, this.item});
 
   factory SpaceSeason.fromJson(Map<String, dynamic> json) => SpaceSeason(
-        count: json['count'] as int?,
-        item: (json['item'] as List<dynamic>?)
-            ?.map((e) => SpaceArchiveItem.fromJson(e))
-            .toList(),
-      );
+    count: json['count'] as int?,
+    item: (json['item'] as List<dynamic>?)
+        ?.map((e) => SpaceArchiveItem.fromJson(e))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/space/space/senior_inquiry.dart b/lib/models_new/space/space/senior_inquiry.dart
index e9114266f..94a9518b9 100644
--- a/lib/models_new/space/space/senior_inquiry.dart
+++ b/lib/models_new/space/space/senior_inquiry.dart
@@ -5,7 +5,7 @@ class SeniorInquiry {
   SeniorInquiry({this.inquiryText, this.inquiryUrl});
 
   factory SeniorInquiry.fromJson(Map<String, dynamic> json) => SeniorInquiry(
-        inquiryText: json['inquiry_text'] as String?,
-        inquiryUrl: json['inquiry_url'] as String?,
-      );
+    inquiryText: json['inquiry_text'] as String?,
+    inquiryUrl: json['inquiry_url'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/series.dart b/lib/models_new/space/space/series.dart
index cf7e41b54..061806583 100644
--- a/lib/models_new/space/space/series.dart
+++ b/lib/models_new/space/space/series.dart
@@ -6,8 +6,8 @@ class SpaceSeries {
   SpaceSeries({this.item});
 
   factory SpaceSeries.fromJson(Map<String, dynamic> json) => SpaceSeries(
-        item: (json['item'] as List<dynamic>?)
-            ?.map((e) => Item.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    item: (json['item'] as List<dynamic>?)
+        ?.map((e) => Item.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/space/space/setting.dart b/lib/models_new/space/space/setting.dart
index d820ad4a5..d7c35286e 100644
--- a/lib/models_new/space/space/setting.dart
+++ b/lib/models_new/space/space/setting.dart
@@ -42,24 +42,24 @@ class SpaceSetting {
   });
 
   factory SpaceSetting.fromJson(Map<String, dynamic> json) => SpaceSetting(
-        channel: json['channel'] as int?,
-        favVideo: json['fav_video'] as int?,
-        coinsVideo: json['coins_video'] as int?,
-        likesVideo: json['likes_video'] as int?,
-        bangumi: json['bangumi'] as int?,
-        playedGame: json['played_game'] as int?,
-        groups: json['groups'] as int?,
-        comic: json['comic'] as int?,
-        bbq: json['bbq'] as int?,
-        dressUp: json['dress_up'] as int?,
-        disableFollowing: json['disable_following'] as int?,
-        livePlayback: json['live_playback'] as int?,
-        closeSpaceMedal: json['close_space_medal'] as int?,
-        onlyShowWearing: json['only_show_wearing'] as int?,
-        disableShowSchool: json['disable_show_school'] as int?,
-        disableShowNft: json['disable_show_nft'] as int?,
-        disableShowFans: json['disable_show_fans'] as int?,
-        chargeVideo: json['charge_video'] as int?,
-        lessonVideo: json['lesson_video'] as int?,
-      );
+    channel: json['channel'] as int?,
+    favVideo: json['fav_video'] as int?,
+    coinsVideo: json['coins_video'] as int?,
+    likesVideo: json['likes_video'] as int?,
+    bangumi: json['bangumi'] as int?,
+    playedGame: json['played_game'] as int?,
+    groups: json['groups'] as int?,
+    comic: json['comic'] as int?,
+    bbq: json['bbq'] as int?,
+    dressUp: json['dress_up'] as int?,
+    disableFollowing: json['disable_following'] as int?,
+    livePlayback: json['live_playback'] as int?,
+    closeSpaceMedal: json['close_space_medal'] as int?,
+    onlyShowWearing: json['only_show_wearing'] as int?,
+    disableShowSchool: json['disable_show_school'] as int?,
+    disableShowNft: json['disable_show_nft'] as int?,
+    disableShowFans: json['disable_show_fans'] as int?,
+    chargeVideo: json['charge_video'] as int?,
+    lessonVideo: json['lesson_video'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space/size_spec.dart b/lib/models_new/space/space/size_spec.dart
index 004dca751..07ec50441 100644
--- a/lib/models_new/space/space/size_spec.dart
+++ b/lib/models_new/space/space/size_spec.dart
@@ -5,7 +5,7 @@ class SizeSpec {
   SizeSpec({this.width, this.height});
 
   factory SizeSpec.fromJson(Map<String, dynamic> json) => SizeSpec(
-        width: (json['width'] as num?)?.toDouble(),
-        height: (json['height'] as num?)?.toDouble(),
-      );
+    width: (json['width'] as num?)?.toDouble(),
+    height: (json['height'] as num?)?.toDouble(),
+  );
 }
diff --git a/lib/models_new/space/space/space_tag.dart b/lib/models_new/space/space/space_tag.dart
index b8311822d..b1e9b0b7b 100644
--- a/lib/models_new/space/space/space_tag.dart
+++ b/lib/models_new/space/space/space_tag.dart
@@ -20,13 +20,13 @@ class SpaceTag {
   });
 
   factory SpaceTag.fromJson(Map<String, dynamic> json) => SpaceTag(
-        type: json['type'] as String?,
-        title: json['title'] as String?,
-        textColor: json['text_color'] as String?,
-        nightTextColor: json['night_text_color'] as String?,
-        backgroundColor: json['background_color'] as String?,
-        nightBackgroundColor: json['night_background_color'] as String?,
-        uri: json['uri'] as String?,
-        icon: json['icon'] as String?,
-      );
+    type: json['type'] as String?,
+    title: json['title'] as String?,
+    textColor: json['text_color'] as String?,
+    nightTextColor: json['night_text_color'] as String?,
+    backgroundColor: json['background_color'] as String?,
+    nightBackgroundColor: json['night_background_color'] as String?,
+    uri: json['uri'] as String?,
+    icon: json['icon'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space/stats.dart b/lib/models_new/space/space/stats.dart
index 09f5ad609..590b8c79a 100644
--- a/lib/models_new/space/space/stats.dart
+++ b/lib/models_new/space/space/stats.dart
@@ -20,13 +20,13 @@ class Stats {
   });
 
   factory Stats.fromJson(Map<String, dynamic> json) => Stats(
-        view: json['view'] as int?,
-        favorite: json['favorite'] as int?,
-        like: json['like'] as int?,
-        dislike: json['dislike'] as int?,
-        reply: json['reply'] as int?,
-        share: json['share'] as int?,
-        coin: json['coin'] as num?,
-        dynam1c: json['dynamic'] as int?,
-      );
+    view: json['view'] as int?,
+    favorite: json['favorite'] as int?,
+    like: json['like'] as int?,
+    dislike: json['dislike'] as int?,
+    reply: json['reply'] as int?,
+    share: json['share'] as int?,
+    coin: json['coin'] as num?,
+    dynam1c: json['dynamic'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space/tab2.dart b/lib/models_new/space/space/tab2.dart
index 11bd7cc57..b6c2fa889 100644
--- a/lib/models_new/space/space/tab2.dart
+++ b/lib/models_new/space/space/tab2.dart
@@ -6,12 +6,12 @@ class SpaceTab2 {
   const SpaceTab2({this.title, this.param, this.items});
 
   factory SpaceTab2.fromJson(Map<String, dynamic> json) => SpaceTab2(
-        title: json['title'] as String?,
-        param: json['param'] as String?,
-        items: (json['items'] as List<dynamic>?)
-            ?.map((e) => SpaceTab2Item.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    title: json['title'] as String?,
+    param: json['param'] as String?,
+    items: (json['items'] as List<dynamic>?)
+        ?.map((e) => SpaceTab2Item.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
 
 class SpaceTab2Item {
@@ -32,17 +32,17 @@ class SpaceTab2Item {
   });
 
   factory SpaceTab2Item.fromJson(Map<String, dynamic> json) => SpaceTab2Item(
-        title: json["title"],
-        param: json["param"],
-        items: (json["items"] as List?)
-            ?.map((e) => SpaceTab2SubItem.fromJson(e))
-            .toList(),
-        filter: (json["filter"] as List?)
-            ?.map((e) => SpaceTabFilter.fromJson(e))
-            .toList(),
-        seasonId: json['season_id'],
-        seriesId: json['series_id'],
-      );
+    title: json["title"],
+    param: json["param"],
+    items: (json["items"] as List?)
+        ?.map((e) => SpaceTab2SubItem.fromJson(e))
+        .toList(),
+    filter: (json["filter"] as List?)
+        ?.map((e) => SpaceTabFilter.fromJson(e))
+        .toList(),
+    seasonId: json['season_id'],
+    seriesId: json['series_id'],
+  );
 }
 
 class SpaceTab2SubItem {
@@ -84,10 +84,10 @@ class SpaceTabFilter {
   });
 
   factory SpaceTabFilter.fromJson(Map<String, dynamic> json) => SpaceTabFilter(
-        text: json["text"],
-        meta: json["meta"] ?? 'all',
-        tabName: json["tab_name"],
-      );
+    text: json["text"],
+    meta: json["meta"] ?? 'all',
+    tabName: json["tab_name"],
+  );
 
   @override
   bool operator ==(Object other) {
diff --git a/lib/models_new/space/space/top.dart b/lib/models_new/space/space/top.dart
index 376e7bc39..65100d5e3 100644
--- a/lib/models_new/space/space/top.dart
+++ b/lib/models_new/space/space/top.dart
@@ -4,6 +4,6 @@ class Top {
   Top({this.result});
 
   factory Top.fromJson(Map<String, dynamic> json) => Top(
-        result: json['result'] as dynamic,
-      );
+    result: json['result'] as dynamic,
+  );
 }
diff --git a/lib/models_new/space/space/ugc_season.dart b/lib/models_new/space/space/ugc_season.dart
index 5cfad8f78..fa16ac75f 100644
--- a/lib/models_new/space/space/ugc_season.dart
+++ b/lib/models_new/space/space/ugc_season.dart
@@ -7,9 +7,9 @@ class UgcSeason {
   UgcSeason({this.count, this.item});
 
   factory UgcSeason.fromJson(Map<String, dynamic> json) => UgcSeason(
-        count: json['count'] as int?,
-        item: (json['item'] as List<dynamic>?)
-            ?.map((e) => Item.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    count: json['count'] as int?,
+    item: (json['item'] as List<dynamic>?)
+        ?.map((e) => Item.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/space/space_archive/badge.dart b/lib/models_new/space/space_archive/badge.dart
index 341dcf24d..8e814f817 100644
--- a/lib/models_new/space/space_archive/badge.dart
+++ b/lib/models_new/space/space_archive/badge.dart
@@ -20,13 +20,13 @@ class Badge {
   });
 
   factory Badge.fromJson(Map<String, dynamic> json) => Badge(
-        text: json['text'] as String?,
-        textColor: json['text_color'] as String?,
-        textColorNight: json['text_color_night'] as String?,
-        bgColor: json['bg_color'] as String?,
-        bgColorNight: json['bg_color_night'] as String?,
-        borderColor: json['border_color'] as String?,
-        borderColorNight: json['border_color_night'] as String?,
-        bgStyle: json['bg_style'] as int?,
-      );
+    text: json['text'] as String?,
+    textColor: json['text_color'] as String?,
+    textColorNight: json['text_color_night'] as String?,
+    bgColor: json['bg_color'] as String?,
+    bgColorNight: json['bg_color_night'] as String?,
+    borderColor: json['border_color'] as String?,
+    borderColorNight: json['border_color_night'] as String?,
+    bgStyle: json['bg_style'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space_archive/cursor_attr.dart b/lib/models_new/space/space_archive/cursor_attr.dart
index 49b130798..37abe1d5e 100644
--- a/lib/models_new/space/space_archive/cursor_attr.dart
+++ b/lib/models_new/space/space_archive/cursor_attr.dart
@@ -5,7 +5,7 @@ class CursorAttr {
   CursorAttr({this.isLastWatchedArc, this.rank});
 
   factory CursorAttr.fromJson(Map<String, dynamic> json) => CursorAttr(
-        isLastWatchedArc: json['is_last_watched_arc'] as bool?,
-        rank: json['rank'] as int?,
-      );
+    isLastWatchedArc: json['is_last_watched_arc'] as bool?,
+    rank: json['rank'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space_archive/data.dart b/lib/models_new/space/space_archive/data.dart
index 53b6afe7d..bdd2b2293 100644
--- a/lib/models_new/space/space_archive/data.dart
+++ b/lib/models_new/space/space_archive/data.dart
@@ -29,7 +29,8 @@ class SpaceArchiveData {
         episodicButton: json['episodic_button'] == null
             ? null
             : EpisodicButton.fromJson(
-                json['episodic_button'] as Map<String, dynamic>),
+                json['episodic_button'] as Map<String, dynamic>,
+              ),
         order: (json['order'] as List<dynamic>?)
             ?.map((e) => Order.fromJson(e as Map<String, dynamic>))
             .toList(),
@@ -40,7 +41,8 @@ class SpaceArchiveData {
         lastWatchedLocator: json['last_watched_locator'] == null
             ? null
             : LastWatchedLocator.fromJson(
-                json['last_watched_locator'] as Map<String, dynamic>),
+                json['last_watched_locator'] as Map<String, dynamic>,
+              ),
         hasNext: json['has_next'] as bool?,
         hasPrev: json['has_prev'] as bool?,
         next: json['next'],
diff --git a/lib/models_new/space/space_archive/history.dart b/lib/models_new/space/space_archive/history.dart
index a80e24fb7..b32fdf8e4 100644
--- a/lib/models_new/space/space_archive/history.dart
+++ b/lib/models_new/space/space_archive/history.dart
@@ -5,7 +5,7 @@ class History {
   History({this.progress, this.duration});
 
   factory History.fromJson(Map<String, dynamic> json) => History(
-        progress: json['progress'] as int?,
-        duration: json['duration'] as int?,
-      );
+    progress: json['progress'] as int?,
+    duration: json['duration'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space_archive/order.dart b/lib/models_new/space/space_archive/order.dart
index 724ef2ebd..f0bb1b5eb 100644
--- a/lib/models_new/space/space_archive/order.dart
+++ b/lib/models_new/space/space_archive/order.dart
@@ -5,7 +5,7 @@ class Order {
   Order({this.title, this.value});
 
   factory Order.fromJson(Map<String, dynamic> json) => Order(
-        title: json['title'] as String?,
-        value: json['value'] as String?,
-      );
+    title: json['title'] as String?,
+    value: json['value'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space_article/author.dart b/lib/models_new/space/space_article/author.dart
index 727a6aac6..1a23e45dd 100644
--- a/lib/models_new/space/space_article/author.dart
+++ b/lib/models_new/space/space_article/author.dart
@@ -18,18 +18,19 @@ class Author {
   });
 
   factory Author.fromJson(Map<String, dynamic> json) => Author(
-        mid: json['mid'] as int?,
-        name: json['name'] as String?,
-        face: json['face'] as String?,
-        pendant: json['pendant'] == null
-            ? null
-            : Pendant.fromJson(json['pendant'] as Map<String, dynamic>),
-        officialVerify: json['official_verify'] == null
-            ? null
-            : BaseOfficialVerify.fromJson(
-                json['official_verify'] as Map<String, dynamic>),
-        vip: json['vip'] == null
-            ? null
-            : Vip.fromJson(json['vip'] as Map<String, dynamic>),
-      );
+    mid: json['mid'] as int?,
+    name: json['name'] as String?,
+    face: json['face'] as String?,
+    pendant: json['pendant'] == null
+        ? null
+        : Pendant.fromJson(json['pendant'] as Map<String, dynamic>),
+    officialVerify: json['official_verify'] == null
+        ? null
+        : BaseOfficialVerify.fromJson(
+            json['official_verify'] as Map<String, dynamic>,
+          ),
+    vip: json['vip'] == null
+        ? null
+        : Vip.fromJson(json['vip'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/space/space_article/category.dart b/lib/models_new/space/space_article/category.dart
index 6109f8f4b..7b202e701 100644
--- a/lib/models_new/space/space_article/category.dart
+++ b/lib/models_new/space/space_article/category.dart
@@ -6,8 +6,8 @@ class Category {
   Category({this.id, this.parentId, this.name});
 
   factory Category.fromJson(Map<String, dynamic> json) => Category(
-        id: json['id'] as int?,
-        parentId: json['parent_id'] as int?,
-        name: json['name'] as String?,
-      );
+    id: json['id'] as int?,
+    parentId: json['parent_id'] as int?,
+    name: json['name'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space_article/media.dart b/lib/models_new/space/space_article/media.dart
index a42c16c03..64a3ffabc 100644
--- a/lib/models_new/space/space_article/media.dart
+++ b/lib/models_new/space/space_article/media.dart
@@ -20,13 +20,13 @@ class Media {
   });
 
   factory Media.fromJson(Map<String, dynamic> json) => Media(
-        score: json['score'] as int?,
-        mediaId: json['media_id'] as int?,
-        title: json['title'] as String?,
-        cover: json['cover'] as String?,
-        area: json['area'] as String?,
-        typeId: json['type_id'] as int?,
-        typeName: json['type_name'] as String?,
-        spoiler: json['spoiler'] as int?,
-      );
+    score: json['score'] as int?,
+    mediaId: json['media_id'] as int?,
+    title: json['title'] as String?,
+    cover: json['cover'] as String?,
+    area: json['area'] as String?,
+    typeId: json['type_id'] as int?,
+    typeName: json['type_name'] as String?,
+    spoiler: json['spoiler'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space_article/stats.dart b/lib/models_new/space/space_article/stats.dart
index 09f5ad609..590b8c79a 100644
--- a/lib/models_new/space/space_article/stats.dart
+++ b/lib/models_new/space/space_article/stats.dart
@@ -20,13 +20,13 @@ class Stats {
   });
 
   factory Stats.fromJson(Map<String, dynamic> json) => Stats(
-        view: json['view'] as int?,
-        favorite: json['favorite'] as int?,
-        like: json['like'] as int?,
-        dislike: json['dislike'] as int?,
-        reply: json['reply'] as int?,
-        share: json['share'] as int?,
-        coin: json['coin'] as num?,
-        dynam1c: json['dynamic'] as int?,
-      );
+    view: json['view'] as int?,
+    favorite: json['favorite'] as int?,
+    like: json['like'] as int?,
+    dislike: json['dislike'] as int?,
+    reply: json['reply'] as int?,
+    share: json['share'] as int?,
+    coin: json['coin'] as num?,
+    dynam1c: json['dynamic'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space_audio/data.dart b/lib/models_new/space/space_audio/data.dart
index 5cd91cd5f..d6ba1999e 100644
--- a/lib/models_new/space/space_audio/data.dart
+++ b/lib/models_new/space/space_audio/data.dart
@@ -16,12 +16,12 @@ class SpaceAudioData {
   });
 
   factory SpaceAudioData.fromJson(Map<String, dynamic> json) => SpaceAudioData(
-        curPage: json['curPage'] as int?,
-        pageCount: json['pageCount'] as int?,
-        totalSize: json['totalSize'] as int?,
-        pageSize: json['pageSize'] as int?,
-        items: (json['data'] as List<dynamic>?)
-            ?.map((e) => SpaceAudioItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    curPage: json['curPage'] as int?,
+    pageCount: json['pageCount'] as int?,
+    totalSize: json['totalSize'] as int?,
+    pageSize: json['pageSize'] as int?,
+    items: (json['data'] as List<dynamic>?)
+        ?.map((e) => SpaceAudioItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/space/space_audio/item.dart b/lib/models_new/space/space_audio/item.dart
index 69c4a00d0..901706419 100644
--- a/lib/models_new/space/space_audio/item.dart
+++ b/lib/models_new/space/space_audio/item.dart
@@ -58,33 +58,33 @@ class SpaceAudioItem {
   });
 
   factory SpaceAudioItem.fromJson(Map<String, dynamic> json) => SpaceAudioItem(
-        id: json['id'] as int?,
-        uid: json['uid'] as int?,
-        uname: json['uname'] as String?,
-        author: json['author'] as String?,
-        title: json['title'] as String?,
-        cover: json['cover'] as String?,
-        intro: json['intro'] as String?,
-        lyric: json['lyric'] as String?,
-        crtype: json['crtype'] as int?,
-        duration: json['duration'] as int?,
-        passtime: json['passtime'] as int?,
-        curtime: json['curtime'] as int?,
-        aid: json['aid'] as int?,
-        bvid: json['bvid'] as String?,
-        cid: json['cid'] as int?,
-        msid: json['msid'] as int?,
-        attr: json['attr'] as int?,
-        limit: json['limit'] as int?,
-        activityId: json['activityId'] as int?,
-        limitdesc: json['limitdesc'] as String?,
-        coinNum: json['coin_num'] as num?,
-        ctime: json['ctime'] as int?,
-        statistic: json['statistic'] == null
-            ? null
-            : Statistic.fromJson(json['statistic'] as Map<String, dynamic>),
-        vipInfo: json['vipInfo'] as dynamic,
-        collectIds: json['collectIds'] as dynamic,
-        isCooper: json['is_cooper'] as int?,
-      );
+    id: json['id'] as int?,
+    uid: json['uid'] as int?,
+    uname: json['uname'] as String?,
+    author: json['author'] as String?,
+    title: json['title'] as String?,
+    cover: json['cover'] as String?,
+    intro: json['intro'] as String?,
+    lyric: json['lyric'] as String?,
+    crtype: json['crtype'] as int?,
+    duration: json['duration'] as int?,
+    passtime: json['passtime'] as int?,
+    curtime: json['curtime'] as int?,
+    aid: json['aid'] as int?,
+    bvid: json['bvid'] as String?,
+    cid: json['cid'] as int?,
+    msid: json['msid'] as int?,
+    attr: json['attr'] as int?,
+    limit: json['limit'] as int?,
+    activityId: json['activityId'] as int?,
+    limitdesc: json['limitdesc'] as String?,
+    coinNum: json['coin_num'] as num?,
+    ctime: json['ctime'] as int?,
+    statistic: json['statistic'] == null
+        ? null
+        : Statistic.fromJson(json['statistic'] as Map<String, dynamic>),
+    vipInfo: json['vipInfo'] as dynamic,
+    collectIds: json['collectIds'] as dynamic,
+    isCooper: json['is_cooper'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space_audio/statistic.dart b/lib/models_new/space/space_audio/statistic.dart
index 5c7635ebc..fc4e5bb14 100644
--- a/lib/models_new/space/space_audio/statistic.dart
+++ b/lib/models_new/space/space_audio/statistic.dart
@@ -8,10 +8,10 @@ class Statistic {
   Statistic({this.sid, this.play, this.collect, this.comment, this.share});
 
   factory Statistic.fromJson(Map<String, dynamic> json) => Statistic(
-        sid: json['sid'] as int?,
-        play: json['play'] as int?,
-        collect: json['collect'] as int?,
-        comment: json['comment'] as int?,
-        share: json['share'] as int?,
-      );
+    sid: json['sid'] as int?,
+    play: json['play'] as int?,
+    collect: json['collect'] as int?,
+    comment: json['comment'] as int?,
+    share: json['share'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space_fav/data.dart b/lib/models_new/space/space_fav/data.dart
index 7a178b2ef..ab13fcd10 100644
--- a/lib/models_new/space/space_fav/data.dart
+++ b/lib/models_new/space/space_fav/data.dart
@@ -9,12 +9,13 @@ class SpaceFavData {
   SpaceFavData({this.id, this.name, this.mediaListResponse, this.uri});
 
   factory SpaceFavData.fromJson(Map<String, dynamic> json) => SpaceFavData(
-        id: json['id'] as int?,
-        name: json['name'] as String?,
-        mediaListResponse: json['mediaListResponse'] == null
-            ? null
-            : MediaListResponse.fromJson(
-                json['mediaListResponse'] as Map<String, dynamic>),
-        uri: json['uri'] as String?,
-      );
+    id: json['id'] as int?,
+    name: json['name'] as String?,
+    mediaListResponse: json['mediaListResponse'] == null
+        ? null
+        : MediaListResponse.fromJson(
+            json['mediaListResponse'] as Map<String, dynamic>,
+          ),
+    uri: json['uri'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space_opus/data.dart b/lib/models_new/space/space_opus/data.dart
index 951a3d846..75a6d3456 100644
--- a/lib/models_new/space/space_opus/data.dart
+++ b/lib/models_new/space/space_opus/data.dart
@@ -9,11 +9,11 @@ class SpaceOpusData {
   SpaceOpusData({this.hasMore, this.items, this.offset, this.updateNum});
 
   factory SpaceOpusData.fromJson(Map<String, dynamic> json) => SpaceOpusData(
-        hasMore: json['has_more'] as bool?,
-        items: (json['items'] as List<dynamic>?)
-            ?.map((e) => SpaceOpusItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        offset: json['offset'] as String?,
-        updateNum: json['update_num'] as int?,
-      );
+    hasMore: json['has_more'] as bool?,
+    items: (json['items'] as List<dynamic>?)
+        ?.map((e) => SpaceOpusItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    offset: json['offset'] as String?,
+    updateNum: json['update_num'] as int?,
+  );
 }
diff --git a/lib/models_new/space/space_opus/item.dart b/lib/models_new/space/space_opus/item.dart
index cccb9b152..820792fde 100644
--- a/lib/models_new/space/space_opus/item.dart
+++ b/lib/models_new/space/space_opus/item.dart
@@ -8,8 +8,13 @@ class SpaceOpusItemModel {
   Stat? stat;
   Cover? cover;
 
-  SpaceOpusItemModel(
-      {this.content, this.jumpUrl, this.opusId, this.stat, this.cover});
+  SpaceOpusItemModel({
+    this.content,
+    this.jumpUrl,
+    this.opusId,
+    this.stat,
+    this.cover,
+  });
 
   factory SpaceOpusItemModel.fromJson(Map<String, dynamic> json) =>
       SpaceOpusItemModel(
diff --git a/lib/models_new/space/space_opus/stat.dart b/lib/models_new/space/space_opus/stat.dart
index 2a01ca93c..228afc060 100644
--- a/lib/models_new/space/space_opus/stat.dart
+++ b/lib/models_new/space/space_opus/stat.dart
@@ -4,6 +4,6 @@ class Stat {
   Stat({this.like});
 
   factory Stat.fromJson(Map<String, dynamic> json) => Stat(
-        like: json['like'] as String?,
-      );
+    like: json['like'] as String?,
+  );
 }
diff --git a/lib/models_new/space/space_season_series/archive.dart b/lib/models_new/space/space_season_series/archive.dart
index a3a78a238..41a9f693d 100644
--- a/lib/models_new/space/space_season_series/archive.dart
+++ b/lib/models_new/space/space_season_series/archive.dart
@@ -36,20 +36,20 @@ class SpaceSsArchive {
   });
 
   factory SpaceSsArchive.fromJson(Map<String, dynamic> json) => SpaceSsArchive(
-        aid: json["aid"],
-        bvid: json["bvid"],
-        ctime: json["ctime"],
-        duration: json["duration"],
-        enableVt: json["enable_vt"],
-        interactiveVideo: json["interactive_video"],
-        pic: json["pic"],
-        playbackPosition: json["playback_position"],
-        pubdate: json["pubdate"],
-        stat: json["stat"] == null ? null : SpaceSsStat.fromJson(json["stat"]),
-        state: json["state"],
-        title: json["title"],
-        ugcPay: json["ugc_pay"],
-        vtDisplay: json["vt_display"],
-        isLessonVideo: json["is_lesson_video"],
-      );
+    aid: json["aid"],
+    bvid: json["bvid"],
+    ctime: json["ctime"],
+    duration: json["duration"],
+    enableVt: json["enable_vt"],
+    interactiveVideo: json["interactive_video"],
+    pic: json["pic"],
+    playbackPosition: json["playback_position"],
+    pubdate: json["pubdate"],
+    stat: json["stat"] == null ? null : SpaceSsStat.fromJson(json["stat"]),
+    state: json["state"],
+    title: json["title"],
+    ugcPay: json["ugc_pay"],
+    vtDisplay: json["vt_display"],
+    isLessonVideo: json["is_lesson_video"],
+  );
 }
diff --git a/lib/models_new/space/space_season_series/item.dart b/lib/models_new/space/space_season_series/item.dart
index c14289838..3fec8a7b4 100644
--- a/lib/models_new/space/space_season_series/item.dart
+++ b/lib/models_new/space/space_season_series/item.dart
@@ -13,12 +13,12 @@ class SpaceSsData {
   });
 
   factory SpaceSsData.fromJson(Map<String, dynamic> json) => SpaceSsData(
-        page: json["page"] == null ? null : SpaceSsPage.fromJson(json["page"]),
-        seasonsList: (json["seasons_list"] as List?)
-            ?.map((e) => SpaceSsModel.fromJson(e))
-            .toList(),
-        seriesList: (json["series_list"] as List?)
-            ?.map((e) => SpaceSsModel.fromJson(e))
-            .toList(),
-      );
+    page: json["page"] == null ? null : SpaceSsPage.fromJson(json["page"]),
+    seasonsList: (json["seasons_list"] as List?)
+        ?.map((e) => SpaceSsModel.fromJson(e))
+        .toList(),
+    seriesList: (json["series_list"] as List?)
+        ?.map((e) => SpaceSsModel.fromJson(e))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/space/space_season_series/page.dart b/lib/models_new/space/space_season_series/page.dart
index 18edde300..8ad41acd3 100644
--- a/lib/models_new/space/space_season_series/page.dart
+++ b/lib/models_new/space/space_season_series/page.dart
@@ -10,8 +10,8 @@ class SpaceSsPage {
   });
 
   factory SpaceSsPage.fromJson(Map<String, dynamic> json) => SpaceSsPage(
-        pageNum: json["page_num"],
-        pageSize: json["page_size"],
-        total: json["total"],
-      );
+    pageNum: json["page_num"],
+    pageSize: json["page_size"],
+    total: json["total"],
+  );
 }
diff --git a/lib/models_new/space/space_season_series/season.dart b/lib/models_new/space/space_season_series/season.dart
index 271338ccb..9af14aa21 100644
--- a/lib/models_new/space/space_season_series/season.dart
+++ b/lib/models_new/space/space_season_series/season.dart
@@ -13,10 +13,10 @@ class SpaceSsModel {
   });
 
   factory SpaceSsModel.fromJson(Map<String, dynamic> json) => SpaceSsModel(
-        archives: (json["archives"] as List?)
-            ?.map((e) => SpaceSsArchive.fromJson(e))
-            .toList(),
-        meta: json["meta"] == null ? null : SpaceSsMeta.fromJson(json["meta"]),
-        recentAids: (json["recent_aids"] as List?)?.cast(),
-      );
+    archives: (json["archives"] as List?)
+        ?.map((e) => SpaceSsArchive.fromJson(e))
+        .toList(),
+    meta: json["meta"] == null ? null : SpaceSsMeta.fromJson(json["meta"]),
+    recentAids: (json["recent_aids"] as List?)?.cast(),
+  );
 }
diff --git a/lib/models_new/space/space_season_series/stat.dart b/lib/models_new/space/space_season_series/stat.dart
index f0a6ca111..a9dfe5073 100644
--- a/lib/models_new/space/space_season_series/stat.dart
+++ b/lib/models_new/space/space_season_series/stat.dart
@@ -8,9 +8,9 @@ class SpaceSsStat {
   });
 
   factory SpaceSsStat.fromJson(Map<String, dynamic> json) => SpaceSsStat(
-        view: json["view"],
-        vt: json["vt"],
-      );
+    view: json["view"],
+    vt: json["vt"],
+  );
 }
 
 class SpaceSsMeta {
@@ -37,14 +37,14 @@ class SpaceSsMeta {
   });
 
   factory SpaceSsMeta.fromJson(Map<String, dynamic> json) => SpaceSsMeta(
-        category: json["category"],
-        cover: json["cover"],
-        description: json["description"],
-        mid: json["mid"],
-        name: json["name"],
-        ptime: json["ptime"],
-        total: json["total"],
-        seasonId: json["season_id"],
-        seriesId: json["series_id"],
-      );
+    category: json["category"],
+    cover: json["cover"],
+    description: json["description"],
+    mid: json["mid"],
+    name: json["name"],
+    ptime: json["ptime"],
+    total: json["total"],
+    seasonId: json["season_id"],
+    seriesId: json["series_id"],
+  );
 }
diff --git a/lib/models_new/space_setting/privacy.dart b/lib/models_new/space_setting/privacy.dart
index f049d8da8..620f0a07b 100644
--- a/lib/models_new/space_setting/privacy.dart
+++ b/lib/models_new/space_setting/privacy.dart
@@ -26,91 +26,91 @@ class Privacy {
   });
 
   factory Privacy.fromJson(Map<String, dynamic> json) => Privacy(
-        list1: [
-          SpaceSettingModel(
-            name: '公开我的收藏',
-            key: 'fav_video',
-            value: json['fav_video'],
-          ),
-          SpaceSettingModel(
-            name: '公开我的追番追剧',
-            key: 'bangumi',
-            value: json['bangumi'],
-          ),
-          SpaceSettingModel(
-            name: '公开我的追漫',
-            key: 'comic',
-            value: json['comic'],
-          ),
-          SpaceSettingModel(
-            name: '公开最近投币的视频',
-            key: 'coins_video',
-            value: json['coins_video'],
-          ),
-          SpaceSettingModel(
-            name: '公开最近点赞的视频',
-            key: 'likes_video',
-            value: json['likes_video'],
-          ),
-          SpaceSettingModel(
-            name: '公开最近玩过的游戏',
-            key: 'played_game',
-            value: json['played_game'],
-          ),
-          SpaceSettingModel(
-            name: '公开拥有的粉丝装扮',
-            key: 'dress_up',
-            value: json['dress_up'],
-          ),
-          SpaceSettingModel(
-            name: '公开我的关注列表',
-            key: 'disable_following',
-            value: json['disable_following'],
-            isReverse: true,
-          ),
-          SpaceSettingModel(
-            name: '公开我的粉丝列表',
-            key: 'disable_show_fans',
-            value: json['disable_show_fans'],
-            isReverse: true,
-          ),
-        ],
-        list2: [
-          SpaceSettingModel(
-            name: '公开佩戴的粉丝勋章',
-            key: 'close_space_medal',
-            value: json['close_space_medal'],
-            isReverse: true,
-          ),
-          SpaceSettingModel(
-            name: '勋章墙公开显示所有粉丝勋章',
-            key: 'only_show_wearing',
-            value: json['only_show_wearing'],
-            isReverse: true,
-          ),
-          SpaceSettingModel(
-            name: '公开学校信息',
-            key: 'disable_show_school',
-            value: json['disable_show_school'],
-            isReverse: true,
-          ),
-        ],
-        list3: [
-          SpaceSettingModel(
-            name: '投稿视频列表中展现直播回放',
-            key: 'live_playback',
-            value: json['live_playback'],
-          ),
-          SpaceSettingModel(
-            name: '投稿视频列表中展现包月充电专属视频',
-            key: 'charge_video',
-            value: json['charge_video'],
-          ),
-          SpaceSettingModel(
-            name: '投稿视频列表中展现课堂视频',
-            key: 'lesson_video',
-            value: json['lesson_video'],
-          ),
-        ],
-      );
+    list1: [
+      SpaceSettingModel(
+        name: '公开我的收藏',
+        key: 'fav_video',
+        value: json['fav_video'],
+      ),
+      SpaceSettingModel(
+        name: '公开我的追番追剧',
+        key: 'bangumi',
+        value: json['bangumi'],
+      ),
+      SpaceSettingModel(
+        name: '公开我的追漫',
+        key: 'comic',
+        value: json['comic'],
+      ),
+      SpaceSettingModel(
+        name: '公开最近投币的视频',
+        key: 'coins_video',
+        value: json['coins_video'],
+      ),
+      SpaceSettingModel(
+        name: '公开最近点赞的视频',
+        key: 'likes_video',
+        value: json['likes_video'],
+      ),
+      SpaceSettingModel(
+        name: '公开最近玩过的游戏',
+        key: 'played_game',
+        value: json['played_game'],
+      ),
+      SpaceSettingModel(
+        name: '公开拥有的粉丝装扮',
+        key: 'dress_up',
+        value: json['dress_up'],
+      ),
+      SpaceSettingModel(
+        name: '公开我的关注列表',
+        key: 'disable_following',
+        value: json['disable_following'],
+        isReverse: true,
+      ),
+      SpaceSettingModel(
+        name: '公开我的粉丝列表',
+        key: 'disable_show_fans',
+        value: json['disable_show_fans'],
+        isReverse: true,
+      ),
+    ],
+    list2: [
+      SpaceSettingModel(
+        name: '公开佩戴的粉丝勋章',
+        key: 'close_space_medal',
+        value: json['close_space_medal'],
+        isReverse: true,
+      ),
+      SpaceSettingModel(
+        name: '勋章墙公开显示所有粉丝勋章',
+        key: 'only_show_wearing',
+        value: json['only_show_wearing'],
+        isReverse: true,
+      ),
+      SpaceSettingModel(
+        name: '公开学校信息',
+        key: 'disable_show_school',
+        value: json['disable_show_school'],
+        isReverse: true,
+      ),
+    ],
+    list3: [
+      SpaceSettingModel(
+        name: '投稿视频列表中展现直播回放',
+        key: 'live_playback',
+        value: json['live_playback'],
+      ),
+      SpaceSettingModel(
+        name: '投稿视频列表中展现包月充电专属视频',
+        key: 'charge_video',
+        value: json['charge_video'],
+      ),
+      SpaceSettingModel(
+        name: '投稿视频列表中展现课堂视频',
+        key: 'lesson_video',
+        value: json['lesson_video'],
+      ),
+    ],
+  );
 }
diff --git a/lib/models_new/sub/sub/data.dart b/lib/models_new/sub/sub/data.dart
index 51f1451c3..67c8e77f5 100644
--- a/lib/models_new/sub/sub/data.dart
+++ b/lib/models_new/sub/sub/data.dart
@@ -8,10 +8,10 @@ class SubData {
   SubData({this.count, this.list, this.hasMore});
 
   factory SubData.fromJson(Map<String, dynamic> json) => SubData(
-        count: json['count'] as int?,
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => SubItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        hasMore: json['has_more'] as bool?,
-      );
+    count: json['count'] as int?,
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => SubItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    hasMore: json['has_more'] as bool?,
+  );
 }
diff --git a/lib/models_new/sub/sub/list.dart b/lib/models_new/sub/sub/list.dart
index 9bd3fa3d1..8cb56b23b 100644
--- a/lib/models_new/sub/sub/list.dart
+++ b/lib/models_new/sub/sub/list.dart
@@ -52,30 +52,30 @@ class SubItemModel {
   });
 
   factory SubItemModel.fromJson(Map<String, dynamic> json) => SubItemModel(
-        id: json['id'] as int?,
-        fid: json['fid'] as int?,
-        mid: json['mid'] as int?,
-        attr: json['attr'] as int?,
-        attrDesc: json['attr_desc'] as String?,
-        title: json['title'] as String?,
-        cover: json['cover'] as String?,
-        upper: json['upper'] == null
-            ? null
-            : Owner.fromJson(json['upper'] as Map<String, dynamic>),
-        coverType: json['cover_type'] as int?,
-        intro: json['intro'] as String?,
-        ctime: json['ctime'] as int?,
-        mtime: json['mtime'] as int?,
-        state: json['state'] as int?,
-        favState: json['fav_state'] as int?,
-        mediaCount: json['media_count'] as int?,
-        viewCount: json['view_count'] as int?,
-        vt: json['vt'] as int?,
-        isTop: json['is_top'] as bool?,
-        recentFav: json['recent_fav'] as dynamic,
-        playSwitch: json['play_switch'] as int?,
-        type: json['type'] as int?,
-        link: json['link'] as String?,
-        bvid: json['bvid'] as String?,
-      );
+    id: json['id'] as int?,
+    fid: json['fid'] as int?,
+    mid: json['mid'] as int?,
+    attr: json['attr'] as int?,
+    attrDesc: json['attr_desc'] as String?,
+    title: json['title'] as String?,
+    cover: json['cover'] as String?,
+    upper: json['upper'] == null
+        ? null
+        : Owner.fromJson(json['upper'] as Map<String, dynamic>),
+    coverType: json['cover_type'] as int?,
+    intro: json['intro'] as String?,
+    ctime: json['ctime'] as int?,
+    mtime: json['mtime'] as int?,
+    state: json['state'] as int?,
+    favState: json['fav_state'] as int?,
+    mediaCount: json['media_count'] as int?,
+    viewCount: json['view_count'] as int?,
+    vt: json['vt'] as int?,
+    isTop: json['is_top'] as bool?,
+    recentFav: json['recent_fav'] as dynamic,
+    playSwitch: json['play_switch'] as int?,
+    type: json['type'] as int?,
+    link: json['link'] as String?,
+    bvid: json['bvid'] as String?,
+  );
 }
diff --git a/lib/models_new/sub/sub_detail/data.dart b/lib/models_new/sub/sub_detail/data.dart
index 1f1161b02..d4d52c3f9 100644
--- a/lib/models_new/sub/sub_detail/data.dart
+++ b/lib/models_new/sub/sub_detail/data.dart
@@ -8,11 +8,11 @@ class SubDetailData {
   SubDetailData({this.info, this.medias});
 
   factory SubDetailData.fromJson(Map<String, dynamic> json) => SubDetailData(
-        info: json['info'] == null
-            ? null
-            : Info.fromJson(json['info'] as Map<String, dynamic>),
-        medias: (json['medias'] as List<dynamic>?)
-            ?.map((e) => SubDetailItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    info: json['info'] == null
+        ? null
+        : Info.fromJson(json['info'] as Map<String, dynamic>),
+    medias: (json['medias'] as List<dynamic>?)
+        ?.map((e) => SubDetailItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/sub/sub_detail/info.dart b/lib/models_new/sub/sub_detail/info.dart
index 701dc6563..c3ce52b43 100644
--- a/lib/models_new/sub/sub_detail/info.dart
+++ b/lib/models_new/sub/sub_detail/info.dart
@@ -25,18 +25,18 @@ class Info {
   });
 
   factory Info.fromJson(Map<String, dynamic> json) => Info(
-        id: json['id'] as int?,
-        seasonType: json['season_type'] as int?,
-        title: json['title'] as String?,
-        cover: json['cover'] as String?,
-        upper: json['upper'] == null
-            ? null
-            : Owner.fromJson(json['upper'] as Map<String, dynamic>),
-        cntInfo: json['cnt_info'] == null
-            ? null
-            : CntInfo.fromJson(json['cnt_info'] as Map<String, dynamic>),
-        mediaCount: json['media_count'] as int?,
-        intro: json['intro'] as String?,
-        enableVt: json['enable_vt'] as int?,
-      );
+    id: json['id'] as int?,
+    seasonType: json['season_type'] as int?,
+    title: json['title'] as String?,
+    cover: json['cover'] as String?,
+    upper: json['upper'] == null
+        ? null
+        : Owner.fromJson(json['upper'] as Map<String, dynamic>),
+    cntInfo: json['cnt_info'] == null
+        ? null
+        : CntInfo.fromJson(json['cnt_info'] as Map<String, dynamic>),
+    mediaCount: json['media_count'] as int?,
+    intro: json['intro'] as String?,
+    enableVt: json['enable_vt'] as int?,
+  );
 }
diff --git a/lib/models_new/triple/pgc_triple.dart b/lib/models_new/triple/pgc_triple.dart
index 3b4ca62ca..708f659c0 100644
--- a/lib/models_new/triple/pgc_triple.dart
+++ b/lib/models_new/triple/pgc_triple.dart
@@ -18,12 +18,12 @@ class PgcTriple {
   });
 
   factory PgcTriple.fromJson(Map<String, dynamic> json) => PgcTriple(
-        coin: json["coin"],
-        coinNumber: json["coin_number"],
-        favorite: json["favorite"],
-        fmid: json["fmid"],
-        follow: json["follow"],
-        like: json["like"],
-        relation: json["relation"],
-      );
+    coin: json["coin"],
+    coinNumber: json["coin_number"],
+    favorite: json["favorite"],
+    fmid: json["fmid"],
+    follow: json["follow"],
+    like: json["like"],
+    relation: json["relation"],
+  );
 }
diff --git a/lib/models_new/triple/ugc_triple.dart b/lib/models_new/triple/ugc_triple.dart
index 6d357ee9a..80425d678 100644
--- a/lib/models_new/triple/ugc_triple.dart
+++ b/lib/models_new/triple/ugc_triple.dart
@@ -18,12 +18,12 @@ class UgcTriple {
   });
 
   factory UgcTriple.fromJson(Map<String, dynamic> json) => UgcTriple(
-        like: json["like"],
-        coin: json["coin"],
-        fav: json["fav"],
-        multiply: json["multiply"],
-        isRisk: json["is_risk"],
-        gaiaResType: json["gaia_res_type"],
-        gaiaData: json["gaia_data"],
-      );
+    like: json["like"],
+    coin: json["coin"],
+    fav: json["fav"],
+    multiply: json["multiply"],
+    isRisk: json["is_risk"],
+    gaiaResType: json["gaia_res_type"],
+    gaiaData: json["gaia_data"],
+  );
 }
diff --git a/lib/models_new/upload_bfs/data.dart b/lib/models_new/upload_bfs/data.dart
index 4d1263a97..c4f3e0c60 100644
--- a/lib/models_new/upload_bfs/data.dart
+++ b/lib/models_new/upload_bfs/data.dart
@@ -4,8 +4,12 @@ class UploadBfsResData {
   int? imageHeight;
   double? imgSize;
 
-  UploadBfsResData(
-      {this.imageUrl, this.imageWidth, this.imageHeight, this.imgSize});
+  UploadBfsResData({
+    this.imageUrl,
+    this.imageWidth,
+    this.imageHeight,
+    this.imgSize,
+  });
 
   factory UploadBfsResData.fromJson(Map<String, dynamic> json) =>
       UploadBfsResData(
diff --git a/lib/models_new/upower_rank/data.dart b/lib/models_new/upower_rank/data.dart
index 369a5f121..ddb69ed3e 100644
--- a/lib/models_new/upower_rank/data.dart
+++ b/lib/models_new/upower_rank/data.dart
@@ -25,21 +25,21 @@ class UpowerRankData {
   });
 
   factory UpowerRankData.fromJson(Map<String, dynamic> json) => UpowerRankData(
-        upInfo: json['up_info'] == null
-            ? null
-            : UpInfo.fromJson(json['up_info'] as Map<String, dynamic>),
-        rankInfo: (json['rank_info'] as List<dynamic>?)
-            ?.map((e) => UpowerRankInfo.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        userInfo: json['user_info'] == null
-            ? null
-            : UserInfo.fromJson(json['user_info'] as Map<String, dynamic>),
-        memberTotal: json['member_total'] as int?,
-        privilegeType: json['privilege_type'] as int?,
-        isCharge: json['is_charge'] as bool?,
-        tabs: (json['tabs'] as List?)?.cast(),
-        levelInfo: (json['level_info'] as List<dynamic>?)
-            ?.map((e) => LevelInfo.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    upInfo: json['up_info'] == null
+        ? null
+        : UpInfo.fromJson(json['up_info'] as Map<String, dynamic>),
+    rankInfo: (json['rank_info'] as List<dynamic>?)
+        ?.map((e) => UpowerRankInfo.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    userInfo: json['user_info'] == null
+        ? null
+        : UserInfo.fromJson(json['user_info'] as Map<String, dynamic>),
+    memberTotal: json['member_total'] as int?,
+    privilegeType: json['privilege_type'] as int?,
+    isCharge: json['is_charge'] as bool?,
+    tabs: (json['tabs'] as List?)?.cast(),
+    levelInfo: (json['level_info'] as List<dynamic>?)
+        ?.map((e) => LevelInfo.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/upower_rank/level_info.dart b/lib/models_new/upower_rank/level_info.dart
index 0313de3d6..4b0868c80 100644
--- a/lib/models_new/upower_rank/level_info.dart
+++ b/lib/models_new/upower_rank/level_info.dart
@@ -7,9 +7,9 @@ class LevelInfo {
   LevelInfo({this.privilegeType, this.name, this.price, this.memberTotal});
 
   factory LevelInfo.fromJson(Map<String, dynamic> json) => LevelInfo(
-        privilegeType: json['privilege_type'] as int?,
-        name: json['name'] as String?,
-        price: json['price'] as int?,
-        memberTotal: json['member_total'] as int?,
-      );
+    privilegeType: json['privilege_type'] as int?,
+    name: json['name'] as String?,
+    price: json['price'] as int?,
+    memberTotal: json['member_total'] as int?,
+  );
 }
diff --git a/lib/models_new/upower_rank/rank_info.dart b/lib/models_new/upower_rank/rank_info.dart
index 4a886dfe5..96923927d 100644
--- a/lib/models_new/upower_rank/rank_info.dart
+++ b/lib/models_new/upower_rank/rank_info.dart
@@ -18,12 +18,12 @@ class UpowerRankInfo {
   });
 
   factory UpowerRankInfo.fromJson(Map<String, dynamic> json) => UpowerRankInfo(
-        mid: json['mid'] as int?,
-        nickname: json['nickname'] as String?,
-        avatar: json['avatar'] as String?,
-        rank: json['rank'] as int?,
-        day: json['day'] as int?,
-        expireAt: json['expire_at'] as int?,
-        remainDays: json['remain_days'] as int?,
-      );
+    mid: json['mid'] as int?,
+    nickname: json['nickname'] as String?,
+    avatar: json['avatar'] as String?,
+    rank: json['rank'] as int?,
+    day: json['day'] as int?,
+    expireAt: json['expire_at'] as int?,
+    remainDays: json['remain_days'] as int?,
+  );
 }
diff --git a/lib/models_new/upower_rank/up_info.dart b/lib/models_new/upower_rank/up_info.dart
index 9292fe957..6a6afe97b 100644
--- a/lib/models_new/upower_rank/up_info.dart
+++ b/lib/models_new/upower_rank/up_info.dart
@@ -16,11 +16,11 @@ class UpInfo {
   });
 
   factory UpInfo.fromJson(Map<String, dynamic> json) => UpInfo(
-        mid: json['mid'] as int?,
-        nickname: json['nickname'] as String?,
-        avatar: json['avatar'] as String?,
-        type: json['type'] as int?,
-        title: json['title'] as String?,
-        upowerState: json['upower_state'] as int?,
-      );
+    mid: json['mid'] as int?,
+    nickname: json['nickname'] as String?,
+    avatar: json['avatar'] as String?,
+    type: json['type'] as int?,
+    title: json['title'] as String?,
+    upowerState: json['upower_state'] as int?,
+  );
 }
diff --git a/lib/models_new/upower_rank/user_info.dart b/lib/models_new/upower_rank/user_info.dart
index 37d5abc07..3d3f67924 100644
--- a/lib/models_new/upower_rank/user_info.dart
+++ b/lib/models_new/upower_rank/user_info.dart
@@ -18,12 +18,12 @@ class UserInfo {
   });
 
   factory UserInfo.fromJson(Map<String, dynamic> json) => UserInfo(
-        mid: json['mid'] as int?,
-        nickname: json['nickname'] as String?,
-        avatar: json['avatar'] as String?,
-        rank: json['rank'] as int?,
-        day: json['day'] as int?,
-        expireAt: json['expire_at'] as int?,
-        remainDays: json['remain_days'] as int?,
-      );
+    mid: json['mid'] as int?,
+    nickname: json['nickname'] as String?,
+    avatar: json['avatar'] as String?,
+    rank: json['rank'] as int?,
+    day: json['day'] as int?,
+    expireAt: json['expire_at'] as int?,
+    remainDays: json['remain_days'] as int?,
+  );
 }
diff --git a/lib/models_new/video/video_ai_conclusion/data.dart b/lib/models_new/video/video_ai_conclusion/data.dart
index 8a496d304..9c38494b3 100644
--- a/lib/models_new/video/video_ai_conclusion/data.dart
+++ b/lib/models_new/video/video_ai_conclusion/data.dart
@@ -23,7 +23,8 @@ class AiConclusionData {
         modelResult: json['model_result'] == null
             ? null
             : AiConclusionResult.fromJson(
-                json['model_result'] as Map<String, dynamic>),
+                json['model_result'] as Map<String, dynamic>,
+              ),
         stid: json['stid'] as String?,
         status: json['status'] as int?,
         likeNum: json['like_num'] as int?,
diff --git a/lib/models_new/video/video_ai_conclusion/model_result.dart b/lib/models_new/video/video_ai_conclusion/model_result.dart
index 202bee6cb..d6caee563 100644
--- a/lib/models_new/video/video_ai_conclusion/model_result.dart
+++ b/lib/models_new/video/video_ai_conclusion/model_result.dart
@@ -7,8 +7,12 @@ class AiConclusionResult {
   List<Outline>? outline;
   List<Subtitle>? subtitle;
 
-  AiConclusionResult(
-      {this.resultType, this.summary, this.outline, this.subtitle});
+  AiConclusionResult({
+    this.resultType,
+    this.summary,
+    this.outline,
+    this.subtitle,
+  });
 
   factory AiConclusionResult.fromJson(Map<String, dynamic> json) =>
       AiConclusionResult(
diff --git a/lib/models_new/video/video_ai_conclusion/outline.dart b/lib/models_new/video/video_ai_conclusion/outline.dart
index 222a1f707..724656b8c 100644
--- a/lib/models_new/video/video_ai_conclusion/outline.dart
+++ b/lib/models_new/video/video_ai_conclusion/outline.dart
@@ -8,10 +8,10 @@ class Outline {
   Outline({this.title, this.partOutline, this.timestamp});
 
   factory Outline.fromJson(Map<String, dynamic> json) => Outline(
-        title: json['title'] as String?,
-        partOutline: (json['part_outline'] as List<dynamic>?)
-            ?.map((e) => PartOutline.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        timestamp: json['timestamp'] as int?,
-      );
+    title: json['title'] as String?,
+    partOutline: (json['part_outline'] as List<dynamic>?)
+        ?.map((e) => PartOutline.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    timestamp: json['timestamp'] as int?,
+  );
 }
diff --git a/lib/models_new/video/video_ai_conclusion/part_outline.dart b/lib/models_new/video/video_ai_conclusion/part_outline.dart
index 6fa35c54f..547a02be2 100644
--- a/lib/models_new/video/video_ai_conclusion/part_outline.dart
+++ b/lib/models_new/video/video_ai_conclusion/part_outline.dart
@@ -5,7 +5,7 @@ class PartOutline {
   PartOutline({this.timestamp, this.content});
 
   factory PartOutline.fromJson(Map<String, dynamic> json) => PartOutline(
-        timestamp: json['timestamp'] as int?,
-        content: json['content'] as String?,
-      );
+    timestamp: json['timestamp'] as int?,
+    content: json['content'] as String?,
+  );
 }
diff --git a/lib/models_new/video/video_ai_conclusion/part_subtitle.dart b/lib/models_new/video/video_ai_conclusion/part_subtitle.dart
index c41540c2a..18e4f7f51 100644
--- a/lib/models_new/video/video_ai_conclusion/part_subtitle.dart
+++ b/lib/models_new/video/video_ai_conclusion/part_subtitle.dart
@@ -6,8 +6,8 @@ class PartSubtitle {
   PartSubtitle({this.startTimestamp, this.endTimestamp, this.content});
 
   factory PartSubtitle.fromJson(Map<String, dynamic> json) => PartSubtitle(
-        startTimestamp: json['start_timestamp'] as int?,
-        endTimestamp: json['end_timestamp'] as int?,
-        content: json['content'] as String?,
-      );
+    startTimestamp: json['start_timestamp'] as int?,
+    endTimestamp: json['end_timestamp'] as int?,
+    content: json['content'] as String?,
+  );
 }
diff --git a/lib/models_new/video/video_ai_conclusion/subtitle.dart b/lib/models_new/video/video_ai_conclusion/subtitle.dart
index 4a2abf235..24e5d37b8 100644
--- a/lib/models_new/video/video_ai_conclusion/subtitle.dart
+++ b/lib/models_new/video/video_ai_conclusion/subtitle.dart
@@ -8,10 +8,10 @@ class Subtitle {
   Subtitle({this.title, this.partSubtitle, this.timestamp});
 
   factory Subtitle.fromJson(Map<String, dynamic> json) => Subtitle(
-        title: json['title'] as String?,
-        partSubtitle: (json['part_subtitle'] as List<dynamic>?)
-            ?.map((e) => PartSubtitle.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        timestamp: json['timestamp'] as int?,
-      );
+    title: json['title'] as String?,
+    partSubtitle: (json['part_subtitle'] as List<dynamic>?)
+        ?.map((e) => PartSubtitle.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    timestamp: json['timestamp'] as int?,
+  );
 }
diff --git a/lib/models_new/video/video_detail/arc.dart b/lib/models_new/video/video_detail/arc.dart
index 370a2b022..b347869da 100644
--- a/lib/models_new/video/video_detail/arc.dart
+++ b/lib/models_new/video/video_detail/arc.dart
@@ -57,37 +57,37 @@ class Arc {
   });
 
   factory Arc.fromJson(Map<String, dynamic> json) => Arc(
-        aid: json['aid'] as int?,
-        videos: json['videos'] as int?,
-        typeId: json['type_id'] as int?,
-        typeName: json['type_name'] as String?,
-        copyright: json['copyright'] as int?,
-        pic: json['pic'] as String?,
-        title: json['title'] as String?,
-        pubdate: json['pubdate'] as int?,
-        ctime: json['ctime'] as int?,
-        desc: json['desc'] as String?,
-        state: json['state'] as int?,
-        duration: json['duration'] as int?,
-        rights: json['rights'] == null
-            ? null
-            : Rights.fromJson(json['rights'] as Map<String, dynamic>),
-        author: json['author'] == null
-            ? null
-            : Owner.fromJson(json['author'] as Map<String, dynamic>),
-        stat: json['stat'] == null
-            ? null
-            : Stat.fromJson(json['stat'] as Map<String, dynamic>),
-        dynam1c: json['dynamic'] as String?,
-        dimension: json['dimension'] == null
-            ? null
-            : Dimension.fromJson(json['dimension'] as Map<String, dynamic>),
-        isChargeableSeason: json['is_chargeable_season'] as bool?,
-        isBlooper: json['is_blooper'] as bool?,
-        enableVt: json['enable_vt'] as int?,
-        vtDisplay: json['vt_display'] as String?,
-        typeIdV2: json['type_id_v2'] as int?,
-        typeNameV2: json['type_name_v2'] as String?,
-        isLessonVideo: json['is_lesson_video'] as int?,
-      );
+    aid: json['aid'] as int?,
+    videos: json['videos'] as int?,
+    typeId: json['type_id'] as int?,
+    typeName: json['type_name'] as String?,
+    copyright: json['copyright'] as int?,
+    pic: json['pic'] as String?,
+    title: json['title'] as String?,
+    pubdate: json['pubdate'] as int?,
+    ctime: json['ctime'] as int?,
+    desc: json['desc'] as String?,
+    state: json['state'] as int?,
+    duration: json['duration'] as int?,
+    rights: json['rights'] == null
+        ? null
+        : Rights.fromJson(json['rights'] as Map<String, dynamic>),
+    author: json['author'] == null
+        ? null
+        : Owner.fromJson(json['author'] as Map<String, dynamic>),
+    stat: json['stat'] == null
+        ? null
+        : Stat.fromJson(json['stat'] as Map<String, dynamic>),
+    dynam1c: json['dynamic'] as String?,
+    dimension: json['dimension'] == null
+        ? null
+        : Dimension.fromJson(json['dimension'] as Map<String, dynamic>),
+    isChargeableSeason: json['is_chargeable_season'] as bool?,
+    isBlooper: json['is_blooper'] as bool?,
+    enableVt: json['enable_vt'] as int?,
+    vtDisplay: json['vt_display'] as String?,
+    typeIdV2: json['type_id_v2'] as int?,
+    typeNameV2: json['type_name_v2'] as String?,
+    isLessonVideo: json['is_lesson_video'] as int?,
+  );
 }
diff --git a/lib/models_new/video/video_detail/argue_info.dart b/lib/models_new/video/video_detail/argue_info.dart
index b1919dff0..58faca860 100644
--- a/lib/models_new/video/video_detail/argue_info.dart
+++ b/lib/models_new/video/video_detail/argue_info.dart
@@ -6,8 +6,8 @@ class ArgueInfo {
   ArgueInfo({this.argueMsg, this.argueType, this.argueLink});
 
   factory ArgueInfo.fromJson(Map<String, dynamic> json) => ArgueInfo(
-        argueMsg: json['argue_msg'] as String?,
-        argueType: json['argue_type'] as int?,
-        argueLink: json['argue_link'] as String?,
-      );
+    argueMsg: json['argue_msg'] as String?,
+    argueType: json['argue_type'] as int?,
+    argueLink: json['argue_link'] as String?,
+  );
 }
diff --git a/lib/models_new/video/video_detail/data.dart b/lib/models_new/video/video_detail/data.dart
index 2dc945ed8..daa1d0d59 100644
--- a/lib/models_new/video/video_detail/data.dart
+++ b/lib/models_new/video/video_detail/data.dart
@@ -181,7 +181,7 @@ class VideoDetailData {
         epId: json['redirect_url'] == null
             ? null
             : PiliScheme.uriDigitRegExp
-                .firstMatch(json['redirect_url'])
-                ?.group(1),
+                  .firstMatch(json['redirect_url'])
+                  ?.group(1),
       );
 }
diff --git a/lib/models_new/video/video_detail/desc_v2.dart b/lib/models_new/video/video_detail/desc_v2.dart
index a7bcc744d..2997424ce 100644
--- a/lib/models_new/video/video_detail/desc_v2.dart
+++ b/lib/models_new/video/video_detail/desc_v2.dart
@@ -6,8 +6,8 @@ class DescV2 {
   DescV2({this.rawText, this.type, this.bizId});
 
   factory DescV2.fromJson(Map<String, dynamic> json) => DescV2(
-        rawText: json['raw_text'] as String?,
-        type: json['type'] as int?,
-        bizId: json['biz_id'] as int?,
-      );
+    rawText: json['raw_text'] as String?,
+    type: json['type'] as int?,
+    bizId: json['biz_id'] as int?,
+  );
 }
diff --git a/lib/models_new/video/video_detail/dimension.dart b/lib/models_new/video/video_detail/dimension.dart
index 3de7639ce..c2fba44eb 100644
--- a/lib/models_new/video/video_detail/dimension.dart
+++ b/lib/models_new/video/video_detail/dimension.dart
@@ -6,8 +6,8 @@ class Dimension {
   Dimension({this.width, this.height, this.rotate});
 
   factory Dimension.fromJson(Map<String, dynamic> json) => Dimension(
-        width: json['width'] as int?,
-        height: json['height'] as int?,
-        rotate: json['rotate'] as int?,
-      );
+    width: json['width'] as int?,
+    height: json['height'] as int?,
+    rotate: json['rotate'] as int?,
+  );
 }
diff --git a/lib/models_new/video/video_detail/episode.dart b/lib/models_new/video/video_detail/episode.dart
index 88c49d9ec..39efe79fc 100644
--- a/lib/models_new/video/video_detail/episode.dart
+++ b/lib/models_new/video/video_detail/episode.dart
@@ -31,23 +31,23 @@ class EpisodeItem {
   });
 
   factory EpisodeItem.fromJson(Map<String, dynamic> json) => EpisodeItem(
-        seasonId: json['season_id'] as int?,
-        sectionId: json['section_id'] as int?,
-        id: json['id'] as int?,
-        aid: json['aid'] as int?,
-        cid: json['cid'] as int?,
-        title: json['title'] as String?,
-        attribute: json['attribute'] as int?,
-        arc: json['arc'] == null
-            ? null
-            : Arc.fromJson(json['arc'] as Map<String, dynamic>),
-        page: json['page'] == null
-            ? null
-            : Part.fromJson(json['page'] as Map<String, dynamic>),
-        bvid: json['bvid'] as String?,
-        pages: (json['pages'] as List<dynamic>?)
-            ?.map((e) => Part.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        badge: json['badge'],
-      );
+    seasonId: json['season_id'] as int?,
+    sectionId: json['section_id'] as int?,
+    id: json['id'] as int?,
+    aid: json['aid'] as int?,
+    cid: json['cid'] as int?,
+    title: json['title'] as String?,
+    attribute: json['attribute'] as int?,
+    arc: json['arc'] == null
+        ? null
+        : Arc.fromJson(json['arc'] as Map<String, dynamic>),
+    page: json['page'] == null
+        ? null
+        : Part.fromJson(json['page'] as Map<String, dynamic>),
+    bvid: json['bvid'] as String?,
+    pages: (json['pages'] as List<dynamic>?)
+        ?.map((e) => Part.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    badge: json['badge'],
+  );
 }
diff --git a/lib/models_new/video/video_detail/owner.dart b/lib/models_new/video/video_detail/owner.dart
index 22e286a83..b0565f08b 100644
--- a/lib/models_new/video/video_detail/owner.dart
+++ b/lib/models_new/video/video_detail/owner.dart
@@ -6,8 +6,8 @@ class Owner {
   Owner({this.mid, this.name, this.face});
 
   factory Owner.fromJson(Map<String, dynamic> json) => Owner(
-        mid: json['mid'] as int?,
-        name: json['name'] as String?,
-        face: json['face'] as String?,
-      );
+    mid: json['mid'] as int?,
+    name: json['name'] as String?,
+    face: json['face'] as String?,
+  );
 }
diff --git a/lib/models_new/video/video_detail/page.dart b/lib/models_new/video/video_detail/page.dart
index 03866367f..546a3dd6a 100644
--- a/lib/models_new/video/video_detail/page.dart
+++ b/lib/models_new/video/video_detail/page.dart
@@ -28,18 +28,18 @@ class Part {
   });
 
   factory Part.fromJson(Map<String, dynamic> json) => Part(
-        cid: json['cid'] as int?,
-        page: json['page'] as int?,
-        from: json['from'] as String?,
-        pagePart: json['part'] as String?,
-        duration: json['duration'] as int?,
-        vid: json['vid'] as String?,
-        weblink: json['weblink'] as String?,
-        dimension: json['dimension'] == null
-            ? null
-            : Dimension.fromJson(json['dimension'] as Map<String, dynamic>),
-        ctime: json['ctime'] as int?,
-        firstFrame: json['first_frame'] as String?,
-        badge: json["badge"],
-      );
+    cid: json['cid'] as int?,
+    page: json['page'] as int?,
+    from: json['from'] as String?,
+    pagePart: json['part'] as String?,
+    duration: json['duration'] as int?,
+    vid: json['vid'] as String?,
+    weblink: json['weblink'] as String?,
+    dimension: json['dimension'] == null
+        ? null
+        : Dimension.fromJson(json['dimension'] as Map<String, dynamic>),
+    ctime: json['ctime'] as int?,
+    firstFrame: json['first_frame'] as String?,
+    badge: json["badge"],
+  );
 }
diff --git a/lib/models_new/video/video_detail/rights.dart b/lib/models_new/video/video_detail/rights.dart
index ca849c79c..a35c3695a 100644
--- a/lib/models_new/video/video_detail/rights.dart
+++ b/lib/models_new/video/video_detail/rights.dart
@@ -40,23 +40,23 @@ class Rights {
   });
 
   factory Rights.fromJson(Map<String, dynamic> json) => Rights(
-        bp: json['bp'] as int?,
-        elec: json['elec'] as int?,
-        download: json['download'] as int?,
-        movie: json['movie'] as int?,
-        pay: json['pay'] as int?,
-        hd5: json['hd5'] as int?,
-        noReprint: json['no_reprint'] as int?,
-        autoplay: json['autoplay'] as int?,
-        ugcPay: json['ugc_pay'] as int?,
-        isCooperation: json['is_cooperation'] as int?,
-        ugcPayPreview: json['ugc_pay_preview'] as int?,
-        noBackground: json['no_background'] as int?,
-        cleanMode: json['clean_mode'] as int?,
-        isSteinGate: json['is_stein_gate'] as int?,
-        is360: json['is_360'] as int?,
-        noShare: json['no_share'] as int?,
-        arcPay: json['arc_pay'] as int?,
-        freeWatch: json['free_watch'] as int?,
-      );
+    bp: json['bp'] as int?,
+    elec: json['elec'] as int?,
+    download: json['download'] as int?,
+    movie: json['movie'] as int?,
+    pay: json['pay'] as int?,
+    hd5: json['hd5'] as int?,
+    noReprint: json['no_reprint'] as int?,
+    autoplay: json['autoplay'] as int?,
+    ugcPay: json['ugc_pay'] as int?,
+    isCooperation: json['is_cooperation'] as int?,
+    ugcPayPreview: json['ugc_pay_preview'] as int?,
+    noBackground: json['no_background'] as int?,
+    cleanMode: json['clean_mode'] as int?,
+    isSteinGate: json['is_stein_gate'] as int?,
+    is360: json['is_360'] as int?,
+    noShare: json['no_share'] as int?,
+    arcPay: json['arc_pay'] as int?,
+    freeWatch: json['free_watch'] as int?,
+  );
 }
diff --git a/lib/models_new/video/video_detail/section.dart b/lib/models_new/video/video_detail/section.dart
index 9c6f3a63e..f40ee780b 100644
--- a/lib/models_new/video/video_detail/section.dart
+++ b/lib/models_new/video/video_detail/section.dart
@@ -11,12 +11,12 @@ class SectionItem {
   SectionItem({this.seasonId, this.id, this.title, this.type, this.episodes});
 
   factory SectionItem.fromJson(Map<String, dynamic> json) => SectionItem(
-        seasonId: json['season_id'] as int?,
-        id: json['id'] as int?,
-        title: json['title'] as String?,
-        type: json['type'] as int?,
-        episodes: (json['episodes'] as List<dynamic>?)
-            ?.map((e) => EpisodeItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    seasonId: json['season_id'] as int?,
+    id: json['id'] as int?,
+    title: json['title'] as String?,
+    type: json['type'] as int?,
+    episodes: (json['episodes'] as List<dynamic>?)
+        ?.map((e) => EpisodeItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/video/video_detail/stat.dart b/lib/models_new/video/video_detail/stat.dart
index 90ddbaaaf..d93e235c8 100644
--- a/lib/models_new/video/video_detail/stat.dart
+++ b/lib/models_new/video/video_detail/stat.dart
@@ -30,18 +30,18 @@ class Stat {
   });
 
   factory Stat.fromJson(Map<String, dynamic> json) => Stat(
-        aid: json['aid'] as int?,
-        view: json['view'] as int?,
-        danmaku: json['danmaku'] as int?,
-        reply: json['reply'] as int?,
-        favorite: json['favorite'] as int?,
-        coin: json['coin'] as num?,
-        share: json['share'] as int?,
-        nowRank: json['now_rank'] as int?,
-        hisRank: json['his_rank'] as int?,
-        like: json['like'] as int?,
-        dislike: json['dislike'] as int?,
-        evaluation: json['evaluation'] as String?,
-        vt: json['vt'] as int?,
-      );
+    aid: json['aid'] as int?,
+    view: json['view'] as int?,
+    danmaku: json['danmaku'] as int?,
+    reply: json['reply'] as int?,
+    favorite: json['favorite'] as int?,
+    coin: json['coin'] as num?,
+    share: json['share'] as int?,
+    nowRank: json['now_rank'] as int?,
+    hisRank: json['his_rank'] as int?,
+    like: json['like'] as int?,
+    dislike: json['dislike'] as int?,
+    evaluation: json['evaluation'] as String?,
+    vt: json['vt'] as int?,
+  );
 }
diff --git a/lib/models_new/video/video_detail/subtitle.dart b/lib/models_new/video/video_detail/subtitle.dart
index 6bbf63934..c50efaf4f 100644
--- a/lib/models_new/video/video_detail/subtitle.dart
+++ b/lib/models_new/video/video_detail/subtitle.dart
@@ -5,7 +5,7 @@ class Subtitle {
   Subtitle({this.allowSubmit, this.list});
 
   factory Subtitle.fromJson(Map<String, dynamic> json) => Subtitle(
-        allowSubmit: json['allow_submit'] as bool?,
-        list: json['list'] as List<dynamic>?,
-      );
+    allowSubmit: json['allow_submit'] as bool?,
+    list: json['list'] as List<dynamic>?,
+  );
 }
diff --git a/lib/models_new/video/video_detail/ugc_season.dart b/lib/models_new/video/video_detail/ugc_season.dart
index 1f81455aa..463e88c9b 100644
--- a/lib/models_new/video/video_detail/ugc_season.dart
+++ b/lib/models_new/video/video_detail/ugc_season.dart
@@ -33,22 +33,22 @@ class UgcSeason {
   });
 
   factory UgcSeason.fromJson(Map<String, dynamic> json) => UgcSeason(
-        id: json['id'] as int?,
-        title: json['title'] as String?,
-        cover: json['cover'] as String?,
-        mid: json['mid'] as int?,
-        intro: json['intro'] as String?,
-        signState: json['sign_state'] as int?,
-        attribute: json['attribute'] as int?,
-        sections: (json['sections'] as List<dynamic>?)
-            ?.map((e) => SectionItem.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        stat: json['stat'] == null
-            ? null
-            : Stat.fromJson(json['stat'] as Map<String, dynamic>),
-        epCount: json['ep_count'] as int?,
-        seasonType: json['season_type'] as int?,
-        isPaySeason: json['is_pay_season'] as bool?,
-        enableVt: json['enable_vt'] as int?,
-      );
+    id: json['id'] as int?,
+    title: json['title'] as String?,
+    cover: json['cover'] as String?,
+    mid: json['mid'] as int?,
+    intro: json['intro'] as String?,
+    signState: json['sign_state'] as int?,
+    attribute: json['attribute'] as int?,
+    sections: (json['sections'] as List<dynamic>?)
+        ?.map((e) => SectionItem.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    stat: json['stat'] == null
+        ? null
+        : Stat.fromJson(json['stat'] as Map<String, dynamic>),
+    epCount: json['ep_count'] as int?,
+    seasonType: json['season_type'] as int?,
+    isPaySeason: json['is_pay_season'] as bool?,
+    enableVt: json['enable_vt'] as int?,
+  );
 }
diff --git a/lib/models_new/video/video_detail/user_garb.dart b/lib/models_new/video/video_detail/user_garb.dart
index 73bdde80c..0c86befb6 100644
--- a/lib/models_new/video/video_detail/user_garb.dart
+++ b/lib/models_new/video/video_detail/user_garb.dart
@@ -4,6 +4,6 @@ class UserGarb {
   UserGarb({this.urlImageAniCut});
 
   factory UserGarb.fromJson(Map<String, dynamic> json) => UserGarb(
-        urlImageAniCut: json['url_image_ani_cut'] as String?,
-      );
+    urlImageAniCut: json['url_image_ani_cut'] as String?,
+  );
 }
diff --git a/lib/models_new/video/video_note_list/author.dart b/lib/models_new/video/video_note_list/author.dart
index 1d071f709..22ce71edb 100644
--- a/lib/models_new/video/video_note_list/author.dart
+++ b/lib/models_new/video/video_note_list/author.dart
@@ -24,21 +24,20 @@ class Author {
   });
 
   factory Author.fromJson(Map<String, dynamic> json) => Author(
-        mid: json['mid'] as int?,
-        name: json['name'] as String?,
-        face: json['face'] as String?,
-        level: json['level'] as int?,
-        isSeniorMember: json['is_senior_member'] as int?,
-        vipInfo: json['vip_info'] == null
-            ? null
-            : Vip.fromJson(json['vip_info'] as Map<String, dynamic>),
-        pendant: json['pendant'] == null
-            ? null
-            : Pendant.fromJson(json['pendant'] as Map<String, dynamic>),
-        official: json['official'] == null
-            ? null
-            : BaseOfficialVerify.fromJson(
-                json['official'] as Map<String, dynamic>),
-        follower: json['follower'] as int?,
-      );
+    mid: json['mid'] as int?,
+    name: json['name'] as String?,
+    face: json['face'] as String?,
+    level: json['level'] as int?,
+    isSeniorMember: json['is_senior_member'] as int?,
+    vipInfo: json['vip_info'] == null
+        ? null
+        : Vip.fromJson(json['vip_info'] as Map<String, dynamic>),
+    pendant: json['pendant'] == null
+        ? null
+        : Pendant.fromJson(json['pendant'] as Map<String, dynamic>),
+    official: json['official'] == null
+        ? null
+        : BaseOfficialVerify.fromJson(json['official'] as Map<String, dynamic>),
+    follower: json['follower'] as int?,
+  );
 }
diff --git a/lib/models_new/video/video_note_list/data.dart b/lib/models_new/video/video_note_list/data.dart
index 8205d8a7d..6c5527144 100644
--- a/lib/models_new/video/video_note_list/data.dart
+++ b/lib/models_new/video/video_note_list/data.dart
@@ -10,13 +10,13 @@ class VideoNoteData {
   VideoNoteData({this.list, this.page, this.showPublicNote, this.message});
 
   factory VideoNoteData.fromJson(Map<String, dynamic> json) => VideoNoteData(
-        list: (json['list'] as List<dynamic>?)
-            ?.map((e) => VideoNoteItemModel.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        page: json['page'] == null
-            ? null
-            : Page.fromJson(json['page'] as Map<String, dynamic>),
-        showPublicNote: json['show_public_note'] as bool?,
-        message: json['message'] as String?,
-      );
+    list: (json['list'] as List<dynamic>?)
+        ?.map((e) => VideoNoteItemModel.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    page: json['page'] == null
+        ? null
+        : Page.fromJson(json['page'] as Map<String, dynamic>),
+    showPublicNote: json['show_public_note'] as bool?,
+    message: json['message'] as String?,
+  );
 }
diff --git a/lib/models_new/video/video_note_list/page.dart b/lib/models_new/video/video_note_list/page.dart
index ad1920e0e..22984a071 100644
--- a/lib/models_new/video/video_note_list/page.dart
+++ b/lib/models_new/video/video_note_list/page.dart
@@ -6,8 +6,8 @@ class Page {
   Page({this.total, this.size, this.num});
 
   factory Page.fromJson(Map<String, dynamic> json) => Page(
-        total: json['total'] as int?,
-        size: json['size'] as int?,
-        num: json['num'] as int?,
-      );
+    total: json['total'] as int?,
+    size: json['size'] as int?,
+    num: json['num'] as int?,
+  );
 }
diff --git a/lib/models_new/video/video_pbp/data.dart b/lib/models_new/video/video_pbp/data.dart
index 8ce518914..adcdc201b 100644
--- a/lib/models_new/video/video_pbp/data.dart
+++ b/lib/models_new/video/video_pbp/data.dart
@@ -8,9 +8,9 @@ class PbpData {
   });
 
   factory PbpData.fromJson(Map<String, dynamic> json) => PbpData(
-        stepSec: json["step_sec"],
-        events: json["events"] == null ? null : Events.fromJson(json["events"]),
-      );
+    stepSec: json["step_sec"],
+    events: json["events"] == null ? null : Events.fromJson(json["events"]),
+  );
 }
 
 class Events {
@@ -21,8 +21,8 @@ class Events {
   });
 
   factory Events.fromJson(Map<String, dynamic> json) => Events(
-        eDefault: (json["default"] as List?)
-            ?.map((e) => (e as num).toDouble())
-            .toList(),
-      );
+    eDefault: (json["default"] as List?)
+        ?.map((e) => (e as num).toDouble())
+        .toList(),
+  );
 }
diff --git a/lib/models_new/video/video_play_info/data.dart b/lib/models_new/video/video_play_info/data.dart
index 0a7a87d8a..aa5fcf29a 100644
--- a/lib/models_new/video/video_play_info/data.dart
+++ b/lib/models_new/video/video_play_info/data.dart
@@ -16,15 +16,15 @@ class PlayInfoData {
   });
 
   factory PlayInfoData.fromJson(Map<String, dynamic> json) => PlayInfoData(
-        lastPlayCid: json['last_play_cid'] as int?,
-        subtitle: json['subtitle'] == null
-            ? null
-            : SubtitleInfo.fromJson(json['subtitle'] as Map<String, dynamic>),
-        viewPoints: (json['view_points'] as List?)
-            ?.map((e) => ViewPoint.fromJson(e))
-            .toList(),
-        interaction: json["interaction"] == null
-            ? null
-            : Interaction.fromJson(json["interaction"]),
-      );
+    lastPlayCid: json['last_play_cid'] as int?,
+    subtitle: json['subtitle'] == null
+        ? null
+        : SubtitleInfo.fromJson(json['subtitle'] as Map<String, dynamic>),
+    viewPoints: (json['view_points'] as List?)
+        ?.map((e) => ViewPoint.fromJson(e))
+        .toList(),
+    interaction: json["interaction"] == null
+        ? null
+        : Interaction.fromJson(json["interaction"]),
+  );
 }
diff --git a/lib/models_new/video/video_play_info/interaction.dart b/lib/models_new/video/video_play_info/interaction.dart
index 0ce3d7c1c..a6aea573a 100644
--- a/lib/models_new/video/video_play_info/interaction.dart
+++ b/lib/models_new/video/video_play_info/interaction.dart
@@ -8,11 +8,11 @@ class Interaction {
   });
 
   factory Interaction.fromJson(Map<String, dynamic> json) => Interaction(
-        historyNode: json["history_node"] == null
-            ? null
-            : HistoryNode.fromJson(json["history_node"]),
-        graphVersion: json["graph_version"],
-      );
+    historyNode: json["history_node"] == null
+        ? null
+        : HistoryNode.fromJson(json["history_node"]),
+    graphVersion: json["graph_version"],
+  );
 }
 
 class HistoryNode {
@@ -27,8 +27,8 @@ class HistoryNode {
   });
 
   factory HistoryNode.fromJson(Map<String, dynamic> json) => HistoryNode(
-        nodeId: json["node_id"],
-        title: json["title"],
-        cid: json["cid"],
-      );
+    nodeId: json["node_id"],
+    title: json["title"],
+    cid: json["cid"],
+  );
 }
diff --git a/lib/models_new/video/video_play_info/subtitle.dart b/lib/models_new/video/video_play_info/subtitle.dart
index 82e9db4fc..445d3c71f 100644
--- a/lib/models_new/video/video_play_info/subtitle.dart
+++ b/lib/models_new/video/video_play_info/subtitle.dart
@@ -12,9 +12,9 @@ class Subtitle {
   });
 
   factory Subtitle.fromJson(Map<String, dynamic> json) => Subtitle(
-        lan: json["lan"],
-        lanDoc: json["lan_doc"],
-        subtitleUrl: json["subtitle_url"],
-        subtitleUrlV2: json["subtitle_url_v2"],
-      );
+    lan: json["lan"],
+    lanDoc: json["lan_doc"],
+    subtitleUrl: json["subtitle_url"],
+    subtitleUrlV2: json["subtitle_url_v2"],
+  );
 }
diff --git a/lib/models_new/video/video_play_info/subtitle_info.dart b/lib/models_new/video/video_play_info/subtitle_info.dart
index 97896a764..b70956089 100644
--- a/lib/models_new/video/video_play_info/subtitle_info.dart
+++ b/lib/models_new/video/video_play_info/subtitle_info.dart
@@ -8,10 +8,10 @@ class SubtitleInfo {
   SubtitleInfo({this.lan, this.lanDoc, this.subtitles});
 
   factory SubtitleInfo.fromJson(Map<String, dynamic> json) => SubtitleInfo(
-        lan: json['lan'] as String?,
-        lanDoc: json['lan_doc'] as String?,
-        subtitles: (json['subtitles'] as List<dynamic>?)
-            ?.map((e) => Subtitle.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    lan: json['lan'] as String?,
+    lanDoc: json['lan_doc'] as String?,
+    subtitles: (json['subtitles'] as List<dynamic>?)
+        ?.map((e) => Subtitle.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/video/video_play_info/view_point.dart b/lib/models_new/video/video_play_info/view_point.dart
index 2e58c2f8d..41a69bb18 100644
--- a/lib/models_new/video/video_play_info/view_point.dart
+++ b/lib/models_new/video/video_play_info/view_point.dart
@@ -20,13 +20,13 @@ class ViewPoint {
   });
 
   factory ViewPoint.fromJson(Map<String, dynamic> json) => ViewPoint(
-        type: json["type"],
-        from: json["from"],
-        to: json["to"],
-        content: json["content"],
-        imgUrl: json["imgUrl"],
-        logoUrl: json["logoUrl"],
-        teamType: json["team_type"],
-        teamName: json["team_name"],
-      );
+    type: json["type"],
+    from: json["from"],
+    to: json["to"],
+    content: json["content"],
+    imgUrl: json["imgUrl"],
+    logoUrl: json["logoUrl"],
+    teamType: json["team_type"],
+    teamName: json["team_name"],
+  );
 }
diff --git a/lib/models_new/video/video_relation/data.dart b/lib/models_new/video/video_relation/data.dart
index 53e9a4c00..74a801450 100644
--- a/lib/models_new/video/video_relation/data.dart
+++ b/lib/models_new/video/video_relation/data.dart
@@ -16,11 +16,11 @@ class VideoRelation {
   });
 
   factory VideoRelation.fromJson(Map<String, dynamic> json) => VideoRelation(
-        attention: json['attention'] as bool?,
-        favorite: json['favorite'] as bool?,
-        seasonFav: json['season_fav'] as bool?,
-        like: json['like'] as bool?,
-        dislike: json['dislike'] as bool?,
-        coin: json['coin'] as num?,
-      );
+    attention: json['attention'] as bool?,
+    favorite: json['favorite'] as bool?,
+    seasonFav: json['season_fav'] as bool?,
+    like: json['like'] as bool?,
+    dislike: json['dislike'] as bool?,
+    coin: json['coin'] as num?,
+  );
 }
diff --git a/lib/models_new/video/video_shot/data.dart b/lib/models_new/video/video_shot/data.dart
index e0ae69df6..19a9576f4 100644
--- a/lib/models_new/video/video_shot/data.dart
+++ b/lib/models_new/video/video_shot/data.dart
@@ -18,12 +18,12 @@ class VideoShotData {
   });
 
   factory VideoShotData.fromJson(Map<String, dynamic> json) => VideoShotData(
-        pvdata: json["pvdata"],
-        imgXLen: json["img_x_len"],
-        imgYLen: json["img_y_len"],
-        imgXSize: json["img_x_size"],
-        imgYSize: json["img_y_size"],
-        image: (json["image"] as List?)?.cast(),
-        index: (json["index"] as List?)?.cast(),
-      );
+    pvdata: json["pvdata"],
+    imgXLen: json["img_x_len"],
+    imgYLen: json["img_y_len"],
+    imgXSize: json["img_x_size"],
+    imgYSize: json["img_y_size"],
+    image: (json["image"] as List?)?.cast(),
+    index: (json["index"] as List?)?.cast(),
+  );
 }
diff --git a/lib/models_new/video/video_stein_edgeinfo/choice.dart b/lib/models_new/video/video_stein_edgeinfo/choice.dart
index 954d2bb13..334c94d9b 100644
--- a/lib/models_new/video/video_stein_edgeinfo/choice.dart
+++ b/lib/models_new/video/video_stein_edgeinfo/choice.dart
@@ -18,12 +18,12 @@ class Choice {
   });
 
   factory Choice.fromJson(Map<String, dynamic> json) => Choice(
-        id: json['id'] as int?,
-        platformAction: json['platform_action'] as String?,
-        nativeAction: json['native_action'] as String?,
-        condition: json['condition'] as String?,
-        cid: json['cid'] as int?,
-        option: json['option'] as String?,
-        isDefault: json['is_default'] as int?,
-      );
+    id: json['id'] as int?,
+    platformAction: json['platform_action'] as String?,
+    nativeAction: json['native_action'] as String?,
+    condition: json['condition'] as String?,
+    cid: json['cid'] as int?,
+    option: json['option'] as String?,
+    isDefault: json['is_default'] as int?,
+  );
 }
diff --git a/lib/models_new/video/video_stein_edgeinfo/data.dart b/lib/models_new/video/video_stein_edgeinfo/data.dart
index 2a979029d..1b3ed20e4 100644
--- a/lib/models_new/video/video_stein_edgeinfo/data.dart
+++ b/lib/models_new/video/video_stein_edgeinfo/data.dart
@@ -22,18 +22,18 @@ class EdgeInfoData {
   });
 
   factory EdgeInfoData.fromJson(Map<String, dynamic> json) => EdgeInfoData(
-        title: json['title'] as String?,
-        edgeId: json['edge_id'] as int?,
-        storyList: (json['story_list'] as List<dynamic>?)
-            ?.map((e) => StoryList.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        edges: json['edges'] == null
-            ? null
-            : Edges.fromJson(json['edges'] as Map<String, dynamic>),
-        buvid: json['buvid'] as String?,
-        preload: json['preload'] == null
-            ? null
-            : Preload.fromJson(json['preload'] as Map<String, dynamic>),
-        isLeaf: json['is_leaf'] as int?,
-      );
+    title: json['title'] as String?,
+    edgeId: json['edge_id'] as int?,
+    storyList: (json['story_list'] as List<dynamic>?)
+        ?.map((e) => StoryList.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    edges: json['edges'] == null
+        ? null
+        : Edges.fromJson(json['edges'] as Map<String, dynamic>),
+    buvid: json['buvid'] as String?,
+    preload: json['preload'] == null
+        ? null
+        : Preload.fromJson(json['preload'] as Map<String, dynamic>),
+    isLeaf: json['is_leaf'] as int?,
+  );
 }
diff --git a/lib/models_new/video/video_stein_edgeinfo/dimension.dart b/lib/models_new/video/video_stein_edgeinfo/dimension.dart
index 6837c0b77..8e89e5b6e 100644
--- a/lib/models_new/video/video_stein_edgeinfo/dimension.dart
+++ b/lib/models_new/video/video_stein_edgeinfo/dimension.dart
@@ -7,9 +7,9 @@ class Dimension {
   Dimension({this.width, this.height, this.rotate, this.sar});
 
   factory Dimension.fromJson(Map<String, dynamic> json) => Dimension(
-        width: json['width'] as int?,
-        height: json['height'] as int?,
-        rotate: json['rotate'] as int?,
-        sar: json['sar'] as String?,
-      );
+    width: json['width'] as int?,
+    height: json['height'] as int?,
+    rotate: json['rotate'] as int?,
+    sar: json['sar'] as String?,
+  );
 }
diff --git a/lib/models_new/video/video_stein_edgeinfo/edges.dart b/lib/models_new/video/video_stein_edgeinfo/edges.dart
index 821e246f6..1a9001e47 100644
--- a/lib/models_new/video/video_stein_edgeinfo/edges.dart
+++ b/lib/models_new/video/video_stein_edgeinfo/edges.dart
@@ -10,14 +10,14 @@ class Edges {
   Edges({this.dimension, this.questions, this.skin});
 
   factory Edges.fromJson(Map<String, dynamic> json) => Edges(
-        dimension: json['dimension'] == null
-            ? null
-            : Dimension.fromJson(json['dimension'] as Map<String, dynamic>),
-        questions: (json['questions'] as List<dynamic>?)
-            ?.map((e) => Question.fromJson(e as Map<String, dynamic>))
-            .toList(),
-        skin: json['skin'] == null
-            ? null
-            : Skin.fromJson(json['skin'] as Map<String, dynamic>),
-      );
+    dimension: json['dimension'] == null
+        ? null
+        : Dimension.fromJson(json['dimension'] as Map<String, dynamic>),
+    questions: (json['questions'] as List<dynamic>?)
+        ?.map((e) => Question.fromJson(e as Map<String, dynamic>))
+        .toList(),
+    skin: json['skin'] == null
+        ? null
+        : Skin.fromJson(json['skin'] as Map<String, dynamic>),
+  );
 }
diff --git a/lib/models_new/video/video_stein_edgeinfo/preload.dart b/lib/models_new/video/video_stein_edgeinfo/preload.dart
index 21b70dd9a..c3ab32c2a 100644
--- a/lib/models_new/video/video_stein_edgeinfo/preload.dart
+++ b/lib/models_new/video/video_stein_edgeinfo/preload.dart
@@ -6,8 +6,8 @@ class Preload {
   Preload({this.video});
 
   factory Preload.fromJson(Map<String, dynamic> json) => Preload(
-        video: (json['video'] as List<dynamic>?)
-            ?.map((e) => Video.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    video: (json['video'] as List<dynamic>?)
+        ?.map((e) => Video.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/video/video_stein_edgeinfo/question.dart b/lib/models_new/video/video_stein_edgeinfo/question.dart
index f933b1a9e..d437b3c93 100644
--- a/lib/models_new/video/video_stein_edgeinfo/question.dart
+++ b/lib/models_new/video/video_stein_edgeinfo/question.dart
@@ -20,14 +20,14 @@ class Question {
   });
 
   factory Question.fromJson(Map<String, dynamic> json) => Question(
-        id: json['id'] as int?,
-        type: json['type'] as int?,
-        startTimeR: json['start_time_r'] as int?,
-        duration: json['duration'] as int?,
-        pauseVideo: json['pause_video'] as int?,
-        title: json['title'] as String?,
-        choices: (json['choices'] as List<dynamic>?)
-            ?.map((e) => Choice.fromJson(e as Map<String, dynamic>))
-            .toList(),
-      );
+    id: json['id'] as int?,
+    type: json['type'] as int?,
+    startTimeR: json['start_time_r'] as int?,
+    duration: json['duration'] as int?,
+    pauseVideo: json['pause_video'] as int?,
+    title: json['title'] as String?,
+    choices: (json['choices'] as List<dynamic>?)
+        ?.map((e) => Choice.fromJson(e as Map<String, dynamic>))
+        .toList(),
+  );
 }
diff --git a/lib/models_new/video/video_stein_edgeinfo/skin.dart b/lib/models_new/video/video_stein_edgeinfo/skin.dart
index 05bb3b930..61a73034f 100644
--- a/lib/models_new/video/video_stein_edgeinfo/skin.dart
+++ b/lib/models_new/video/video_stein_edgeinfo/skin.dart
@@ -18,12 +18,12 @@ class Skin {
   });
 
   factory Skin.fromJson(Map<String, dynamic> json) => Skin(
-        choiceImage: json['choice_image'] as String?,
-        titleTextColor: json['title_text_color'] as String?,
-        titleShadowColor: json['title_shadow_color'] as String?,
-        titleShadowOffsetY: json['title_shadow_offset_y'] as int?,
-        titleShadowRadius: json['title_shadow_radius'] as int?,
-        progressbarColor: json['progressbar_color'] as String?,
-        progressbarShadowColor: json['progressbar_shadow_color'] as String?,
-      );
+    choiceImage: json['choice_image'] as String?,
+    titleTextColor: json['title_text_color'] as String?,
+    titleShadowColor: json['title_shadow_color'] as String?,
+    titleShadowOffsetY: json['title_shadow_offset_y'] as int?,
+    titleShadowRadius: json['title_shadow_radius'] as int?,
+    progressbarColor: json['progressbar_color'] as String?,
+    progressbarShadowColor: json['progressbar_shadow_color'] as String?,
+  );
 }
diff --git a/lib/models_new/video/video_stein_edgeinfo/story_list.dart b/lib/models_new/video/video_stein_edgeinfo/story_list.dart
index 8de99f86c..74d8c39c0 100644
--- a/lib/models_new/video/video_stein_edgeinfo/story_list.dart
+++ b/lib/models_new/video/video_stein_edgeinfo/story_list.dart
@@ -20,13 +20,13 @@ class StoryList {
   });
 
   factory StoryList.fromJson(Map<String, dynamic> json) => StoryList(
-        nodeId: json['node_id'] as int?,
-        edgeId: json['edge_id'] as int?,
-        title: json['title'] as String?,
-        cid: json['cid'] as int?,
-        startPos: json['start_pos'] as int?,
-        cover: json['cover'] as String?,
-        isCurrent: json['is_current'] as int?,
-        cursor: json['cursor'] as int?,
-      );
+    nodeId: json['node_id'] as int?,
+    edgeId: json['edge_id'] as int?,
+    title: json['title'] as String?,
+    cid: json['cid'] as int?,
+    startPos: json['start_pos'] as int?,
+    cover: json['cover'] as String?,
+    isCurrent: json['is_current'] as int?,
+    cursor: json['cursor'] as int?,
+  );
 }
diff --git a/lib/models_new/video/video_stein_edgeinfo/video.dart b/lib/models_new/video/video_stein_edgeinfo/video.dart
index acaa97d1e..2a79d285b 100644
--- a/lib/models_new/video/video_stein_edgeinfo/video.dart
+++ b/lib/models_new/video/video_stein_edgeinfo/video.dart
@@ -5,7 +5,7 @@ class Video {
   Video({this.aid, this.cid});
 
   factory Video.fromJson(Map<String, dynamic> json) => Video(
-        aid: json['aid'] as int?,
-        cid: json['cid'] as int?,
-      );
+    aid: json['aid'] as int?,
+    cid: json['cid'] as int?,
+  );
 }
diff --git a/lib/models_new/video/video_tag/data.dart b/lib/models_new/video/video_tag/data.dart
index ec2b045d7..0cb7cbad7 100644
--- a/lib/models_new/video/video_tag/data.dart
+++ b/lib/models_new/video/video_tag/data.dart
@@ -12,9 +12,9 @@ class VideoTagItem {
   });
 
   factory VideoTagItem.fromJson(Map<String, dynamic> json) => VideoTagItem(
-        tagId: json["tag_id"],
-        tagName: json["tag_name"],
-        musicId: json["music_id"],
-        jumpUrl: json["jump_url"],
-      );
+    tagId: json["tag_id"],
+    tagName: json["tag_name"],
+    musicId: json["music_id"],
+    jumpUrl: json["jump_url"],
+  );
 }
diff --git a/lib/pages/about/view.dart b/lib/pages/about/view.dart
index f14f4972c..1519d9709 100644
--- a/lib/pages/about/view.dart
+++ b/lib/pages/about/view.dart
@@ -47,8 +47,9 @@ class _AboutPageState extends State<AboutPage> {
   }
 
   Future<void> getCacheSize() async {
-    cacheSize.value =
-        CacheManage.formatSize(await CacheManage().loadApplicationCache());
+    cacheSize.value = CacheManage.formatSize(
+      await CacheManage().loadApplicationCache(),
+    );
   }
 
   Future<void> getCurrentApp() async {
@@ -64,8 +65,9 @@ class _AboutPageState extends State<AboutPage> {
     final outline = theme.colorScheme.outline;
     final subTitleStyle = TextStyle(fontSize: 13, color: outline);
     return Scaffold(
-      appBar:
-          widget.showAppBar == false ? null : AppBar(title: const Text('关于')),
+      appBar: widget.showAppBar == false
+          ? null
+          : AppBar(title: const Text('关于')),
       body: ListView(
         children: [
           GestureDetector(
@@ -143,7 +145,8 @@ Commit Hash: ${BuildConfig.commitHash}''',
             ),
             leading: const Icon(Icons.info_outline),
             onTap: () => PageUtils.launchURL(
-                'https://github.com/bggRGjQaUbCoE/PiliPlus/commit/${BuildConfig.commitHash}'),
+              'https://github.com/bggRGjQaUbCoE/PiliPlus/commit/${BuildConfig.commitHash}',
+            ),
             onLongPress: () => Utils.copyText(BuildConfig.commitHash),
           ),
           Divider(
@@ -236,8 +239,9 @@ Commit Hash: ${BuildConfig.commitHash}''',
                     title: const Text('导入', style: style),
                     onTap: () async {
                       Get.back();
-                      ClipboardData? data =
-                          await Clipboard.getData('text/plain');
+                      ClipboardData? data = await Clipboard.getData(
+                        'text/plain',
+                      );
                       if (data?.text?.isNotEmpty != true) {
                         SmartDialog.showToast('剪贴板无数据');
                         return;
@@ -264,19 +268,24 @@ Commit Hash: ${BuildConfig.commitHash}''',
                                   Get.back();
                                   try {
                                     final res = (jsonDecode(data.text!) as Map)
-                                        .map((key, value) => MapEntry(
-                                            key, LoginAccount.fromJson(value)));
+                                        .map(
+                                          (key, value) => MapEntry(
+                                            key,
+                                            LoginAccount.fromJson(value),
+                                          ),
+                                        );
                                     Accounts.account
                                         .putAll(res)
                                         .whenComplete(() => Accounts.refresh())
                                         .whenComplete(() {
-                                      MineController.anonymity.value =
-                                          !Accounts.get(AccountType.heartbeat)
-                                              .isLogin;
-                                      if (Accounts.main.isLogin) {
-                                        return LoginUtils.onLoginMain();
-                                      }
-                                    });
+                                          MineController.anonymity.value =
+                                              !Accounts.get(
+                                                AccountType.heartbeat,
+                                              ).isLogin;
+                                          if (Accounts.main.isLogin) {
+                                            return LoginUtils.onLoginMain();
+                                          }
+                                        });
                                   } catch (e) {
                                     SmartDialog.showToast('导入失败：$e');
                                   }
@@ -318,8 +327,9 @@ Commit Hash: ${BuildConfig.commitHash}''',
                       title: const Text('从剪贴板导入设置', style: style),
                       onTap: () async {
                         Get.back();
-                        ClipboardData? data =
-                            await Clipboard.getData('text/plain');
+                        ClipboardData? data = await Clipboard.getData(
+                          'text/plain',
+                        );
                         if (data == null ||
                             data.text == null ||
                             data.text!.isEmpty) {
@@ -348,7 +358,8 @@ Commit Hash: ${BuildConfig.commitHash}''',
                                     Get.back();
                                     try {
                                       await GStorage.importAllSettings(
-                                          data.text!);
+                                        data.text!,
+                                      );
                                       SmartDialog.showToast('导入成功');
                                     } catch (e) {
                                       SmartDialog.showToast('导入失败：$e');
diff --git a/lib/pages/article/controller.dart b/lib/pages/article/controller.dart
index ca5064c87..150ec801b 100644
--- a/lib/pages/article/controller.dart
+++ b/lib/pages/article/controller.dart
@@ -54,8 +54,9 @@ class ArticleController extends ReplyController<MainListReply> {
 
     // to opus
     if (type == 'read') {
-      UrlUtils.parseRedirectUrl('https://www.bilibili.com/read/cv$id/')
-          .then((url) {
+      UrlUtils.parseRedirectUrl('https://www.bilibili.com/read/cv$id/').then((
+        url,
+      ) {
         if (url != null) {
           id = url.split('/').last;
           type = 'opus';
@@ -188,8 +189,8 @@ class ArticleController extends ReplyController<MainListReply> {
     bool isFav = stats.value?.favorite?.status == true;
     final res = type == 'read'
         ? isFav
-            ? await FavHttp.delFavArticle(id: commentId)
-            : await FavHttp.addFavArticle(id: commentId)
+              ? await FavHttp.delFavArticle(id: commentId)
+              : await FavHttp.addFavArticle(id: commentId)
         : await FavHttp.communityAction(opusId: id, action: isFav ? 4 : 3);
     if (res['status']) {
       stats.value?.favorite?.status = !isFav;
@@ -209,8 +210,9 @@ class ArticleController extends ReplyController<MainListReply> {
   Future<void> onLike() async {
     bool isLike = stats.value?.like?.status == true;
     final res = await DynamicsHttp.thumbDynamic(
-        dynamicId: opusData?.idStr ?? articleData?.dynIdStr,
-        up: isLike ? 2 : 1);
+      dynamicId: opusData?.idStr ?? articleData?.dynIdStr,
+      up: isLike ? 2 : 1,
+    );
     if (res['status']) {
       stats.value?.like?.status = !isLike;
       int count = stats.value?.like?.count ?? 0;
diff --git a/lib/pages/article/view.dart b/lib/pages/article/view.dart
index 46b0a5ae6..2be0dd022 100644
--- a/lib/pages/article/view.dart
+++ b/lib/pages/article/view.dart
@@ -70,44 +70,44 @@ class _ArticlePageState extends State<ArticlePage>
 
   Function(dynamic imgList, dynamic index)? get _getImageCallback =>
       _horizontalPreview
-          ? (imgList, index) {
-              _imageStatus = true;
-              bool isFabVisible = _isFabVisible;
+      ? (imgList, index) {
+          _imageStatus = true;
+          bool isFabVisible = _isFabVisible;
+          if (isFabVisible) {
+            _hideFab();
+          }
+          final ctr = AnimationController(
+            vsync: this,
+            duration: const Duration(milliseconds: 200),
+          )..forward();
+          PageUtils.onHorizontalPreview(
+            _key,
+            AnimationController(
+              vsync: this,
+              duration: Duration.zero,
+            ),
+            ctr,
+            imgList,
+            index,
+            (value) async {
+              _imageStatus = null;
               if (isFabVisible) {
-                _hideFab();
+                isFabVisible = false;
+                _showFab();
               }
-              final ctr = AnimationController(
-                vsync: this,
-                duration: const Duration(milliseconds: 200),
-              )..forward();
-              PageUtils.onHorizontalPreview(
-                _key,
-                AnimationController(
-                  vsync: this,
-                  duration: Duration.zero,
-                ),
-                ctr,
-                imgList,
-                index,
-                (value) async {
-                  _imageStatus = null;
-                  if (isFabVisible) {
-                    isFabVisible = false;
-                    _showFab();
-                  }
-                  if (value == false) {
-                    await ctr.reverse();
-                  }
-                  try {
-                    ctr.dispose();
-                  } catch (_) {}
-                  if (value == false) {
-                    Get.back();
-                  }
-                },
-              );
-            }
-          : null;
+              if (value == false) {
+                await ctr.reverse();
+              }
+              try {
+                ctr.dispose();
+              } catch (_) {}
+              if (value == false) {
+                Get.back();
+              }
+            },
+          );
+        }
+      : null;
 
   @override
   void initState() {
@@ -116,13 +116,16 @@ class _ArticlePageState extends State<ArticlePage>
       vsync: this,
       duration: const Duration(milliseconds: 300),
     );
-    _anim = Tween<Offset>(
-      begin: const Offset(0, 1),
-      end: Offset.zero,
-    ).animate(CurvedAnimation(
-      parent: fabAnimationCtr,
-      curve: Curves.easeInOut,
-    ));
+    _anim =
+        Tween<Offset>(
+          begin: const Offset(0, 1),
+          end: Offset.zero,
+        ).animate(
+          CurvedAnimation(
+            parent: fabAnimationCtr,
+            curve: Curves.easeInOut,
+          ),
+        );
     fabAnimationCtr.forward();
     _articleCtr.scrollController.addListener(listener);
   }
@@ -182,28 +185,27 @@ class _ArticlePageState extends State<ArticlePage>
       Widget replyReplyPage({
         bool automaticallyImplyLeading = true,
         VoidCallback? onDispose,
-      }) =>
-          Scaffold(
-            appBar: AppBar(
-              title: const Text('评论详情'),
-              titleSpacing: automaticallyImplyLeading ? null : 12,
-              automaticallyImplyLeading: automaticallyImplyLeading,
-            ),
-            body: SafeArea(
-              top: false,
-              bottom: false,
-              child: VideoReplyReplyPanel(
-                enableSlide: false,
-                id: id,
-                oid: oid,
-                rpid: rpid,
-                isVideoDetail: false,
-                replyType: _articleCtr.commentType,
-                firstFloor: replyItem,
-                onDispose: onDispose,
-              ),
-            ),
-          );
+      }) => Scaffold(
+        appBar: AppBar(
+          title: const Text('评论详情'),
+          titleSpacing: automaticallyImplyLeading ? null : 12,
+          automaticallyImplyLeading: automaticallyImplyLeading,
+        ),
+        body: SafeArea(
+          top: false,
+          bottom: false,
+          child: VideoReplyReplyPanel(
+            enableSlide: false,
+            id: id,
+            oid: oid,
+            rpid: rpid,
+            isVideoDetail: false,
+            replyType: _articleCtr.commentType,
+            firstFloor: replyItem,
+            onDispose: onDispose,
+          ),
+        ),
+      );
       if (this.context.orientation == Orientation.portrait) {
         Get.to(
           replyReplyPage,
@@ -266,32 +268,42 @@ class _ArticlePageState extends State<ArticlePage>
                 builder: (context) {
                   final isPortrait =
                       context.orientation == Orientation.portrait;
-                  double padding =
-                      max(context.width / 2 - Grid.smallCardWidth, 0);
+                  double padding = max(
+                    context.width / 2 - Grid.smallCardWidth,
+                    0,
+                  );
                   if (isPortrait) {
-                    return LayoutBuilder(builder: (context, constraints) {
-                      final maxWidth = constraints.maxWidth - 2 * padding - 24;
-                      return Padding(
-                        padding: EdgeInsets.symmetric(horizontal: padding),
-                        child: CustomScrollView(
-                          controller: _articleCtr.scrollController,
-                          physics: const AlwaysScrollableScrollPhysics(),
-                          slivers: [
-                            _buildContent(theme, maxWidth),
-                            SliverToBoxAdapter(
-                              child: Divider(
-                                thickness: 8,
-                                color:
-                                    theme.dividerColor.withValues(alpha: 0.05),
+                    return LayoutBuilder(
+                      builder: (context, constraints) {
+                        final maxWidth =
+                            constraints.maxWidth - 2 * padding - 24;
+                        return Padding(
+                          padding: EdgeInsets.symmetric(horizontal: padding),
+                          child: CustomScrollView(
+                            controller: _articleCtr.scrollController,
+                            physics: const AlwaysScrollableScrollPhysics(),
+                            slivers: [
+                              _buildContent(theme, maxWidth),
+                              SliverToBoxAdapter(
+                                child: Divider(
+                                  thickness: 8,
+                                  color: theme.dividerColor.withValues(
+                                    alpha: 0.05,
+                                  ),
+                                ),
                               ),
-                            ),
-                            _buildReplyHeader(theme),
-                            Obx(() => _buildReplyList(
-                                theme, _articleCtr.loadingState.value)),
-                          ],
-                        ),
-                      );
-                    });
+                              _buildReplyHeader(theme),
+                              Obx(
+                                () => _buildReplyList(
+                                  theme,
+                                  _articleCtr.loadingState.value,
+                                ),
+                              ),
+                            ],
+                          ),
+                        );
+                      },
+                    );
                   } else {
                     return Row(
                       crossAxisAlignment: CrossAxisAlignment.start,
@@ -311,7 +323,7 @@ class _ArticlePageState extends State<ArticlePage>
                                       left: padding / 4,
                                       bottom:
                                           MediaQuery.paddingOf(context).bottom +
-                                              80,
+                                          80,
                                     ),
                                     sliver: _buildContent(theme, maxWidth),
                                   ),
@@ -339,8 +351,12 @@ class _ArticlePageState extends State<ArticlePage>
                                       const AlwaysScrollableScrollPhysics(),
                                   slivers: [
                                     _buildReplyHeader(theme),
-                                    Obx(() => _buildReplyList(
-                                        theme, _articleCtr.loadingState.value)),
+                                    Obx(
+                                      () => _buildReplyList(
+                                        theme,
+                                        _articleCtr.loadingState.value,
+                                      ),
+                                    ),
                                   ],
                                 ),
                               ),
@@ -361,286 +377,302 @@ class _ArticlePageState extends State<ArticlePage>
   }
 
   Widget _buildContent(ThemeData theme, double maxWidth) => SliverPadding(
-        padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-        sliver: Obx(
-          () {
-            if (_articleCtr.isLoaded.value) {
-              late Widget content;
-              if (_articleCtr.opus != null) {
-                if (kDebugMode) debugPrint('json page');
-                content = OpusContent(
-                  opus: _articleCtr.opus!,
-                  callback: _getImageCallback,
+    padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+    sliver: Obx(
+      () {
+        if (_articleCtr.isLoaded.value) {
+          late Widget content;
+          if (_articleCtr.opus != null) {
+            if (kDebugMode) debugPrint('json page');
+            content = OpusContent(
+              opus: _articleCtr.opus!,
+              callback: _getImageCallback,
+              maxWidth: maxWidth,
+            );
+          } else if (_articleCtr.opusData?.modules.moduleBlocked != null) {
+            if (kDebugMode) debugPrint('moduleBlocked');
+            final moduleBlocked = _articleCtr.opusData!.modules.moduleBlocked!;
+            content = SliverToBoxAdapter(
+              child: moduleBlockedItem(theme, moduleBlocked, maxWidth),
+            );
+          } else if (_articleCtr.articleData?.content != null) {
+            if (_articleCtr.articleData?.type == 3) {
+              // json
+              return ArticleOpus(ops: _articleCtr.articleData?.ops);
+            }
+            if (kDebugMode) debugPrint('html page');
+            final res = parser.parse(_articleCtr.articleData!.content!);
+            if (res.body!.children.isEmpty) {
+              content = SliverToBoxAdapter(
+                child: htmlRender(
+                  context: context,
+                  html: _articleCtr.articleData!.content!,
                   maxWidth: maxWidth,
-                );
-              } else if (_articleCtr.opusData?.modules.moduleBlocked != null) {
-                if (kDebugMode) debugPrint('moduleBlocked');
-                final moduleBlocked =
-                    _articleCtr.opusData!.modules.moduleBlocked!;
-                content = SliverToBoxAdapter(
-                  child: moduleBlockedItem(theme, moduleBlocked, maxWidth),
-                );
-              } else if (_articleCtr.articleData?.content != null) {
-                if (_articleCtr.articleData?.type == 3) {
-                  // json
-                  return ArticleOpus(ops: _articleCtr.articleData?.ops);
-                }
-                if (kDebugMode) debugPrint('html page');
-                final res = parser.parse(_articleCtr.articleData!.content!);
-                if (res.body!.children.isEmpty) {
-                  content = SliverToBoxAdapter(
-                    child: htmlRender(
-                      context: context,
-                      html: _articleCtr.articleData!.content!,
-                      maxWidth: maxWidth,
-                      callback: _getImageCallback,
-                    ),
+                  callback: _getImageCallback,
+                ),
+              );
+            } else {
+              content = SliverList.separated(
+                itemCount: res.body!.children.length,
+                itemBuilder: (context, index) {
+                  return htmlRender(
+                    context: context,
+                    element: res.body!.children[index],
+                    maxWidth: maxWidth,
+                    callback: _getImageCallback,
                   );
-                } else {
-                  content = SliverList.separated(
-                    itemCount: res.body!.children.length,
-                    itemBuilder: (context, index) {
-                      return htmlRender(
-                        context: context,
-                        element: res.body!.children[index],
-                        maxWidth: maxWidth,
-                        callback: _getImageCallback,
-                      );
-                    },
-                    separatorBuilder: (context, index) =>
-                        const SizedBox(height: 10),
-                  );
-                }
-              } else {
-                content = const SliverToBoxAdapter(child: Text('NULL'));
-              }
-
-              int? pubTime =
-                  _articleCtr.opusData?.modules.moduleAuthor?.pubTs ??
-                      _articleCtr.articleData?.publishTime;
-              return SliverMainAxisGroup(
-                slivers: [
-                  if (_articleCtr.type != 'read' &&
-                      _articleCtr.opusData?.modules.moduleTop?.display?.album
-                              ?.pics?.isNotEmpty ==
-                          true)
-                    SliverToBoxAdapter(
-                      child: Builder(
-                        builder: (context) {
-                          final pics = _articleCtr.opusData!.modules.moduleTop!
-                              .display!.album!.pics!;
-                          final length = pics.length;
-                          final first = pics.first;
-                          double height;
-                          double paddingRight;
-                          if (first.height != null && first.width != null) {
-                            final ratio = first.height! / first.width!;
-                            height = min(maxWidth * ratio, Get.height * 0.55);
-                            paddingRight = (maxWidth - height / ratio) / 2 + 12;
-                          } else {
-                            height = Get.height * 0.55;
-                            paddingRight = 12;
-                          }
-                          return Stack(
-                            clipBehavior: Clip.none,
-                            children: [
-                              Container(
-                                height: height,
-                                width: maxWidth,
-                                margin: const EdgeInsets.only(bottom: 10),
-                                child: PageView.builder(
-                                  physics: const ClampingScrollPhysics(),
-                                  onPageChanged: (value) {
-                                    _articleCtr.topIndex.value = value;
-                                  },
-                                  itemCount: length,
-                                  itemBuilder: (context, index) {
-                                    final pic = pics[index];
-                                    return GestureDetector(
-                                      behavior: HitTestBehavior.opaque,
-                                      onTap: () => context.imageView(
-                                        quality: 60,
-                                        imgList: pics
-                                            .map(
-                                                (e) => SourceModel(url: e.url!))
-                                            .toList(),
-                                        initialPage: index,
-                                      ),
-                                      child: Hero(
-                                        tag: pic.url!,
-                                        child: Stack(
-                                          clipBehavior: Clip.none,
-                                          alignment: Alignment.center,
-                                          children: [
-                                            Positioned.fill(
-                                              child: CachedNetworkImage(
-                                                fit: pic.isLongPic == true
-                                                    ? BoxFit.cover
-                                                    : null,
-                                                imageUrl:
-                                                    ImageUtil.thumbnailUrl(
-                                                        pic.url, 60),
-                                                fadeInDuration: const Duration(
-                                                    milliseconds: 120),
-                                                fadeOutDuration: const Duration(
-                                                    milliseconds: 120),
-                                              ),
-                                            ),
-                                            if (pic.isLongPic == true)
-                                              PBadge(
-                                                text: '长图',
-                                                type: PBadgeType.primary,
-                                                right: paddingRight,
-                                                bottom: 12,
-                                              ),
-                                          ],
-                                        ),
-                                      ),
-                                    );
-                                  },
-                                ),
-                              ),
-                              Obx(
-                                () => PBadge(
-                                    top: 12,
-                                    right: paddingRight,
-                                    type: PBadgeType.gray,
-                                    text:
-                                        '${_articleCtr.topIndex.value + 1}/$length'),
-                              ),
-                            ],
-                          );
-                        },
-                      ),
-                    ),
-                  if (_articleCtr.summary.title != null)
-                    SliverToBoxAdapter(
-                      child: Text(
-                        _articleCtr.summary.title!,
-                        style: const TextStyle(
-                          fontSize: 17,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                    ),
-                  SliverToBoxAdapter(
-                    child: Padding(
-                      padding: const EdgeInsets.symmetric(vertical: 10),
-                      child: GestureDetector(
-                        onTap: () => Get.toNamed(
-                            '/member?mid=${_articleCtr.summary.author?.mid}'),
-                        child: Row(
-                          children: [
-                            NetworkImgLayer(
-                              width: 40,
-                              height: 40,
-                              type: ImageType.avatar,
-                              src: _articleCtr.summary.author?.face,
-                            ),
-                            const SizedBox(width: 10),
-                            Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Text(
-                                  _articleCtr.summary.author?.name ?? '',
-                                  style: TextStyle(
-                                    fontSize:
-                                        theme.textTheme.titleSmall!.fontSize,
-                                  ),
-                                ),
-                                if (pubTime != null)
-                                  Text(
-                                    DateUtil.format(pubTime),
-                                    style: TextStyle(
-                                      color: theme.colorScheme.outline,
-                                      fontSize:
-                                          theme.textTheme.labelSmall!.fontSize,
-                                    ),
-                                  ),
-                              ],
-                            ),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                  if (_articleCtr.type != 'read' &&
-                      _articleCtr.opusData?.modules.moduleCollection != null)
-                    SliverToBoxAdapter(
-                      child: opusCollection(
-                        theme,
-                        _articleCtr.opusData!.modules.moduleCollection!,
-                      ),
-                    ),
-                  content,
-                ],
+                },
+                separatorBuilder: (context, index) =>
+                    const SizedBox(height: 10),
               );
             }
+          } else {
+            content = const SliverToBoxAdapter(child: Text('NULL'));
+          }
 
-            return const SliverToBoxAdapter();
-          },
-        ),
-      );
+          int? pubTime =
+              _articleCtr.opusData?.modules.moduleAuthor?.pubTs ??
+              _articleCtr.articleData?.publishTime;
+          return SliverMainAxisGroup(
+            slivers: [
+              if (_articleCtr.type != 'read' &&
+                  _articleCtr
+                          .opusData
+                          ?.modules
+                          .moduleTop
+                          ?.display
+                          ?.album
+                          ?.pics
+                          ?.isNotEmpty ==
+                      true)
+                SliverToBoxAdapter(
+                  child: Builder(
+                    builder: (context) {
+                      final pics = _articleCtr
+                          .opusData!
+                          .modules
+                          .moduleTop!
+                          .display!
+                          .album!
+                          .pics!;
+                      final length = pics.length;
+                      final first = pics.first;
+                      double height;
+                      double paddingRight;
+                      if (first.height != null && first.width != null) {
+                        final ratio = first.height! / first.width!;
+                        height = min(maxWidth * ratio, Get.height * 0.55);
+                        paddingRight = (maxWidth - height / ratio) / 2 + 12;
+                      } else {
+                        height = Get.height * 0.55;
+                        paddingRight = 12;
+                      }
+                      return Stack(
+                        clipBehavior: Clip.none,
+                        children: [
+                          Container(
+                            height: height,
+                            width: maxWidth,
+                            margin: const EdgeInsets.only(bottom: 10),
+                            child: PageView.builder(
+                              physics: const ClampingScrollPhysics(),
+                              onPageChanged: (value) {
+                                _articleCtr.topIndex.value = value;
+                              },
+                              itemCount: length,
+                              itemBuilder: (context, index) {
+                                final pic = pics[index];
+                                return GestureDetector(
+                                  behavior: HitTestBehavior.opaque,
+                                  onTap: () => context.imageView(
+                                    quality: 60,
+                                    imgList: pics
+                                        .map((e) => SourceModel(url: e.url!))
+                                        .toList(),
+                                    initialPage: index,
+                                  ),
+                                  child: Hero(
+                                    tag: pic.url!,
+                                    child: Stack(
+                                      clipBehavior: Clip.none,
+                                      alignment: Alignment.center,
+                                      children: [
+                                        Positioned.fill(
+                                          child: CachedNetworkImage(
+                                            fit: pic.isLongPic == true
+                                                ? BoxFit.cover
+                                                : null,
+                                            imageUrl: ImageUtil.thumbnailUrl(
+                                              pic.url,
+                                              60,
+                                            ),
+                                            fadeInDuration: const Duration(
+                                              milliseconds: 120,
+                                            ),
+                                            fadeOutDuration: const Duration(
+                                              milliseconds: 120,
+                                            ),
+                                          ),
+                                        ),
+                                        if (pic.isLongPic == true)
+                                          PBadge(
+                                            text: '长图',
+                                            type: PBadgeType.primary,
+                                            right: paddingRight,
+                                            bottom: 12,
+                                          ),
+                                      ],
+                                    ),
+                                  ),
+                                );
+                              },
+                            ),
+                          ),
+                          Obx(
+                            () => PBadge(
+                              top: 12,
+                              right: paddingRight,
+                              type: PBadgeType.gray,
+                              text: '${_articleCtr.topIndex.value + 1}/$length',
+                            ),
+                          ),
+                        ],
+                      );
+                    },
+                  ),
+                ),
+              if (_articleCtr.summary.title != null)
+                SliverToBoxAdapter(
+                  child: Text(
+                    _articleCtr.summary.title!,
+                    style: const TextStyle(
+                      fontSize: 17,
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                ),
+              SliverToBoxAdapter(
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 10),
+                  child: GestureDetector(
+                    onTap: () => Get.toNamed(
+                      '/member?mid=${_articleCtr.summary.author?.mid}',
+                    ),
+                    child: Row(
+                      children: [
+                        NetworkImgLayer(
+                          width: 40,
+                          height: 40,
+                          type: ImageType.avatar,
+                          src: _articleCtr.summary.author?.face,
+                        ),
+                        const SizedBox(width: 10),
+                        Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text(
+                              _articleCtr.summary.author?.name ?? '',
+                              style: TextStyle(
+                                fontSize: theme.textTheme.titleSmall!.fontSize,
+                              ),
+                            ),
+                            if (pubTime != null)
+                              Text(
+                                DateUtil.format(pubTime),
+                                style: TextStyle(
+                                  color: theme.colorScheme.outline,
+                                  fontSize:
+                                      theme.textTheme.labelSmall!.fontSize,
+                                ),
+                              ),
+                          ],
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+              if (_articleCtr.type != 'read' &&
+                  _articleCtr.opusData?.modules.moduleCollection != null)
+                SliverToBoxAdapter(
+                  child: opusCollection(
+                    theme,
+                    _articleCtr.opusData!.modules.moduleCollection!,
+                  ),
+                ),
+              content,
+            ],
+          );
+        }
+
+        return const SliverToBoxAdapter();
+      },
+    ),
+  );
 
   Widget _buildReplyList(
-      ThemeData theme, LoadingState<List<ReplyInfo>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<ReplyInfo>?> loadingState,
+  ) {
     return switch (loadingState) {
       Loading() => SliverList.builder(
-          itemCount: 12,
-          itemBuilder: (context, index) {
-            return const VideoReplySkeleton();
-          },
-        ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverList.builder(
-              itemCount: response!.length + 1,
-              itemBuilder: (context, index) {
-                if (index == response.length) {
-                  _articleCtr.onLoadMore();
-                  return Container(
-                    alignment: Alignment.center,
-                    margin: EdgeInsets.only(
-                        bottom: MediaQuery.paddingOf(context).bottom),
-                    height: 125,
-                    child: Text(
-                      _articleCtr.isEnd ? '没有更多了' : '加载中...',
-                      style: TextStyle(
-                        fontSize: 12,
-                        color: theme.colorScheme.outline,
+        itemCount: 12,
+        itemBuilder: (context, index) {
+          return const VideoReplySkeleton();
+        },
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverList.builder(
+                itemCount: response!.length + 1,
+                itemBuilder: (context, index) {
+                  if (index == response.length) {
+                    _articleCtr.onLoadMore();
+                    return Container(
+                      alignment: Alignment.center,
+                      margin: EdgeInsets.only(
+                        bottom: MediaQuery.paddingOf(context).bottom,
                       ),
-                    ),
-                  );
-                } else {
-                  return ReplyItemGrpc(
-                    replyItem: response[index],
-                    replyLevel: 1,
-                    replyReply: (replyItem, id) =>
-                        replyReply(context, replyItem, id),
-                    onReply: (replyItem) => _articleCtr.onReply(
-                      context,
-                      replyItem: replyItem,
-                    ),
-                    onDelete: (item, subIndex) =>
-                        _articleCtr.onRemove(index, item, subIndex),
-                    upMid: _articleCtr.upMid,
-                    callback: _getImageCallback,
-                    onCheckReply: (item) =>
-                        _articleCtr.onCheckReply(item, isManual: true),
-                    onToggleTop: (item) => _articleCtr.onToggleTop(
-                      item,
-                      index,
-                      _articleCtr.commentId,
-                      _articleCtr.commentType,
-                    ),
-                  );
-                }
-              },
-            )
-          : HttpError(onReload: _articleCtr.onReload),
+                      height: 125,
+                      child: Text(
+                        _articleCtr.isEnd ? '没有更多了' : '加载中...',
+                        style: TextStyle(
+                          fontSize: 12,
+                          color: theme.colorScheme.outline,
+                        ),
+                      ),
+                    );
+                  } else {
+                    return ReplyItemGrpc(
+                      replyItem: response[index],
+                      replyLevel: 1,
+                      replyReply: (replyItem, id) =>
+                          replyReply(context, replyItem, id),
+                      onReply: (replyItem) => _articleCtr.onReply(
+                        context,
+                        replyItem: replyItem,
+                      ),
+                      onDelete: (item, subIndex) =>
+                          _articleCtr.onRemove(index, item, subIndex),
+                      upMid: _articleCtr.upMid,
+                      callback: _getImageCallback,
+                      onCheckReply: (item) =>
+                          _articleCtr.onCheckReply(item, isManual: true),
+                      onToggleTop: (item) => _articleCtr.onToggleTop(
+                        item,
+                        index,
+                        _articleCtr.commentId,
+                        _articleCtr.commentType,
+                      ),
+                    );
+                  }
+                },
+              )
+            : HttpError(onReload: _articleCtr.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _articleCtr.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _articleCtr.onReload,
+      ),
     };
   }
 
@@ -656,8 +688,11 @@ class _ArticlePageState extends State<ArticlePage>
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              Obx(() => Text(
-                  '${_articleCtr.count.value == -1 ? 0 : NumUtil.numFormat(_articleCtr.count.value)}条回复')),
+              Obx(
+                () => Text(
+                  '${_articleCtr.count.value == -1 ? 0 : NumUtil.numFormat(_articleCtr.count.value)}条回复',
+                ),
+              ),
               SizedBox(
                 height: 35,
                 child: TextButton.icon(
@@ -670,7 +705,7 @@ class _ArticlePageState extends State<ArticlePage>
                     ),
                   ),
                 ),
-              )
+              ),
             ],
           ),
         ),
@@ -679,373 +714,398 @@ class _ArticlePageState extends State<ArticlePage>
   }
 
   PreferredSizeWidget get _buildAppBar => AppBar(
-        title: Obx(() {
-          if (_articleCtr.isLoaded.value && _articleCtr.showTitle.value) {
-            return Text(_articleCtr.summary.title ?? '');
-          }
-          return const SizedBox.shrink();
-        }),
-        actions: [
-          const SizedBox(width: 4),
-          if (context.orientation == Orientation.landscape)
-            IconButton(
-              tooltip: '页面比例调节',
-              onPressed: () => showDialog(
-                context: context,
-                builder: (context) => Align(
-                  alignment: Alignment.topRight,
-                  child: Container(
-                    margin: const EdgeInsets.only(
-                      top: 56,
-                      right: 16,
-                    ),
-                    width: context.width / 4,
-                    height: 32,
-                    child: Builder(
-                      builder: (context) => Slider(
-                        min: 1,
-                        max: 100,
-                        value: _ratio.first,
-                        onChanged: (value) {
-                          if (value >= 10 && value <= 90) {
-                            _ratio[0] = value.toPrecision(2);
-                            _ratio[1] = 100 - value;
-                            GStorage.setting.put(
-                              SettingBoxKey.dynamicDetailRatio,
-                              _ratio,
-                            );
-                            (context as Element).markNeedsBuild();
-                            setState(() {});
-                          }
-                        },
-                      ),
-                    ),
+    title: Obx(() {
+      if (_articleCtr.isLoaded.value && _articleCtr.showTitle.value) {
+        return Text(_articleCtr.summary.title ?? '');
+      }
+      return const SizedBox.shrink();
+    }),
+    actions: [
+      const SizedBox(width: 4),
+      if (context.orientation == Orientation.landscape)
+        IconButton(
+          tooltip: '页面比例调节',
+          onPressed: () => showDialog(
+            context: context,
+            builder: (context) => Align(
+              alignment: Alignment.topRight,
+              child: Container(
+                margin: const EdgeInsets.only(
+                  top: 56,
+                  right: 16,
+                ),
+                width: context.width / 4,
+                height: 32,
+                child: Builder(
+                  builder: (context) => Slider(
+                    min: 1,
+                    max: 100,
+                    value: _ratio.first,
+                    onChanged: (value) {
+                      if (value >= 10 && value <= 90) {
+                        _ratio[0] = value.toPrecision(2);
+                        _ratio[1] = 100 - value;
+                        GStorage.setting.put(
+                          SettingBoxKey.dynamicDetailRatio,
+                          _ratio,
+                        );
+                        (context as Element).markNeedsBuild();
+                        setState(() {});
+                      }
+                    },
                   ),
                 ),
               ),
-              icon: Transform.rotate(
-                angle: pi / 2,
-                child: const Icon(Icons.splitscreen, size: 19),
-              ),
             ),
-          IconButton(
-            tooltip: '浏览器打开',
-            onPressed: () => PageUtils.inAppWebview(_articleCtr.url),
-            icon: const Icon(Icons.open_in_browser_outlined, size: 19),
           ),
-          PopupMenuButton(
-            icon: const Icon(Icons.more_vert, size: 19),
-            itemBuilder: (BuildContext context) => <PopupMenuEntry>[
-              PopupMenuItem(
-                onTap: () => Utils.shareText(_articleCtr.url),
-                child: const Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Icon(Icons.share_outlined, size: 19),
-                    SizedBox(width: 10),
-                    Text('分享'),
-                  ],
-                ),
-              ),
-              PopupMenuItem(
-                onTap: () => Utils.copyText(_articleCtr.url),
-                child: const Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Icon(Icons.copy_rounded, size: 19),
-                    SizedBox(width: 10),
-                    Text('复制链接'),
-                  ],
-                ),
-              ),
-              if (_articleCtr.commentType == 12 &&
-                  _articleCtr.stats.value != null &&
-                  _articleCtr.opusData?.modules.moduleBlocked == null)
-                PopupMenuItem(
-                  onTap: () async {
-                    try {
-                      if (_articleCtr.summary.cover == null) {
-                        if (!await _articleCtr.getArticleInfo(true)) {
-                          return;
-                        }
-                      }
-                      if (mounted) {
-                        PageUtils.pmShare(
-                          this.context,
-                          content: {
-                            "id": _articleCtr.commentId,
-                            "title": "- 哔哩哔哩专栏",
-                            "headline": _articleCtr.summary.title!, // throw
-                            "source": 6,
-                            "thumb": _articleCtr.summary.cover!,
-                            "author": _articleCtr.summary.author!.name,
-                            "author_id":
-                                _articleCtr.summary.author!.mid.toString(),
-                          },
-                        );
-                      }
-                    } catch (e) {
-                      SmartDialog.showToast(e.toString());
+          icon: Transform.rotate(
+            angle: pi / 2,
+            child: const Icon(Icons.splitscreen, size: 19),
+          ),
+        ),
+      IconButton(
+        tooltip: '浏览器打开',
+        onPressed: () => PageUtils.inAppWebview(_articleCtr.url),
+        icon: const Icon(Icons.open_in_browser_outlined, size: 19),
+      ),
+      PopupMenuButton(
+        icon: const Icon(Icons.more_vert, size: 19),
+        itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+          PopupMenuItem(
+            onTap: () => Utils.shareText(_articleCtr.url),
+            child: const Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Icon(Icons.share_outlined, size: 19),
+                SizedBox(width: 10),
+                Text('分享'),
+              ],
+            ),
+          ),
+          PopupMenuItem(
+            onTap: () => Utils.copyText(_articleCtr.url),
+            child: const Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Icon(Icons.copy_rounded, size: 19),
+                SizedBox(width: 10),
+                Text('复制链接'),
+              ],
+            ),
+          ),
+          if (_articleCtr.commentType == 12 &&
+              _articleCtr.stats.value != null &&
+              _articleCtr.opusData?.modules.moduleBlocked == null)
+            PopupMenuItem(
+              onTap: () async {
+                try {
+                  if (_articleCtr.summary.cover == null) {
+                    if (!await _articleCtr.getArticleInfo(true)) {
+                      return;
                     }
-                  },
-                  child: const Row(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      Icon(Icons.forward_to_inbox, size: 19),
-                      SizedBox(width: 10),
-                      Text('分享至消息'),
-                    ],
-                  ),
-                ),
-            ],
-          ),
-          const SizedBox(width: 6)
+                  }
+                  if (mounted) {
+                    PageUtils.pmShare(
+                      this.context,
+                      content: {
+                        "id": _articleCtr.commentId,
+                        "title": "- 哔哩哔哩专栏",
+                        "headline": _articleCtr.summary.title!, // throw
+                        "source": 6,
+                        "thumb": _articleCtr.summary.cover!,
+                        "author": _articleCtr.summary.author!.name,
+                        "author_id": _articleCtr.summary.author!.mid.toString(),
+                      },
+                    );
+                  }
+                } catch (e) {
+                  SmartDialog.showToast(e.toString());
+                }
+              },
+              child: const Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Icon(Icons.forward_to_inbox, size: 19),
+                  SizedBox(width: 10),
+                  Text('分享至消息'),
+                ],
+              ),
+            ),
         ],
-      );
+      ),
+      const SizedBox(width: 6),
+    ],
+  );
 
   Widget _buildBottom(ThemeData theme) => Positioned(
-        left: 0,
-        bottom: 0,
-        right: 0,
-        child: SlideTransition(
-          position: _anim,
-          child: Builder(
-            builder: (context) {
-              Widget button() => FloatingActionButton(
-                    heroTag: null,
-                    onPressed: () {
-                      feedBack();
-                      _articleCtr.onReply(
-                        context,
-                        oid: _articleCtr.commentId,
-                        replyType: _articleCtr.commentType,
-                      );
-                    },
-                    tooltip: '评论动态',
-                    child: const Icon(Icons.reply),
-                  );
-              return !_articleCtr.showDynActionBar
-                  ? Align(
-                      alignment: Alignment.bottomRight,
-                      child: Padding(
+    left: 0,
+    bottom: 0,
+    right: 0,
+    child: SlideTransition(
+      position: _anim,
+      child: Builder(
+        builder: (context) {
+          Widget button() => FloatingActionButton(
+            heroTag: null,
+            onPressed: () {
+              feedBack();
+              _articleCtr.onReply(
+                context,
+                oid: _articleCtr.commentId,
+                replyType: _articleCtr.commentType,
+              );
+            },
+            tooltip: '评论动态',
+            child: const Icon(Icons.reply),
+          );
+          return !_articleCtr.showDynActionBar
+              ? Align(
+                  alignment: Alignment.bottomRight,
+                  child: Padding(
+                    padding: EdgeInsets.only(
+                      right: 14,
+                      bottom: MediaQuery.paddingOf(context).bottom + 14,
+                    ),
+                    child: button(),
+                  ),
+                )
+              : Obx(() {
+                  Widget textIconButton({
+                    required IconData icon,
+                    required String text,
+                    required DynamicStat? stat,
+                    required VoidCallback callback,
+                    IconData? activitedIcon,
+                  }) {
+                    final show = stat?.status == true;
+                    final color = show
+                        ? theme.colorScheme.primary
+                        : theme.colorScheme.outline;
+                    return TextButton.icon(
+                      onPressed: callback,
+                      icon: Icon(
+                        stat?.status == true ? activitedIcon : icon,
+                        size: 16,
+                        color: color,
+                        semanticLabel: text,
+                      ),
+                      style: TextButton.styleFrom(
+                        padding: const EdgeInsets.symmetric(horizontal: 15),
+                        foregroundColor: theme.colorScheme.outline,
+                      ),
+                      label: Text(
+                        stat?.count != null
+                            ? NumUtil.numFormat(stat!.count)
+                            : text,
+                      ),
+                    );
+                  }
+
+                  return Column(
+                    mainAxisSize: MainAxisSize.min,
+                    crossAxisAlignment: CrossAxisAlignment.end,
+                    children: [
+                      Padding(
                         padding: EdgeInsets.only(
                           right: 14,
-                          bottom: MediaQuery.paddingOf(context).bottom + 14,
+                          bottom:
+                              14 +
+                              (_articleCtr.stats.value != null
+                                  ? 0
+                                  : MediaQuery.paddingOf(context).bottom),
                         ),
                         child: button(),
                       ),
-                    )
-                  : Obx(() {
-                      Widget textIconButton({
-                        required IconData icon,
-                        required String text,
-                        required DynamicStat? stat,
-                        required VoidCallback callback,
-                        IconData? activitedIcon,
-                      }) {
-                        final show = stat?.status == true;
-                        final color = show
-                            ? theme.colorScheme.primary
-                            : theme.colorScheme.outline;
-                        return TextButton.icon(
-                          onPressed: callback,
-                          icon: Icon(
-                            stat?.status == true ? activitedIcon : icon,
-                            size: 16,
-                            color: color,
-                            semanticLabel: text,
-                          ),
-                          style: TextButton.styleFrom(
-                            padding: const EdgeInsets.symmetric(horizontal: 15),
-                            foregroundColor: theme.colorScheme.outline,
-                          ),
-                          label: Text(stat?.count != null
-                              ? NumUtil.numFormat(stat!.count)
-                              : text),
-                        );
-                      }
-
-                      return Column(
-                        mainAxisSize: MainAxisSize.min,
-                        crossAxisAlignment: CrossAxisAlignment.end,
-                        children: [
-                          Padding(
-                            padding: EdgeInsets.only(
-                              right: 14,
-                              bottom: 14 +
-                                  (_articleCtr.stats.value != null
-                                      ? 0
-                                      : MediaQuery.paddingOf(context).bottom),
-                            ),
-                            child: button(),
-                          ),
-                          _articleCtr.stats.value != null
-                              ? Container(
-                                  decoration: BoxDecoration(
-                                    color: theme.colorScheme.surface,
-                                    border: Border(
-                                      top: BorderSide(
-                                        color: theme.colorScheme.outline
-                                            .withValues(alpha: 0.08),
-                                      ),
+                      _articleCtr.stats.value != null
+                          ? Container(
+                              decoration: BoxDecoration(
+                                color: theme.colorScheme.surface,
+                                border: Border(
+                                  top: BorderSide(
+                                    color: theme.colorScheme.outline.withValues(
+                                      alpha: 0.08,
                                     ),
                                   ),
-                                  padding: EdgeInsets.only(
-                                      bottom:
-                                          MediaQuery.paddingOf(context).bottom),
-                                  child: Row(
-                                    mainAxisAlignment:
-                                        MainAxisAlignment.spaceAround,
-                                    children: [
-                                      Expanded(
-                                        child: Builder(
-                                          builder: (btnContext) =>
-                                              textIconButton(
-                                            text: '转发',
-                                            icon: FontAwesomeIcons
-                                                .shareFromSquare,
-                                            stat: _articleCtr
-                                                .stats.value?.forward,
-                                            callback: () {
-                                              if (_articleCtr.opusData ==
-                                                      null &&
-                                                  _articleCtr.articleData
-                                                          ?.dynIdStr ==
-                                                      null) {
-                                                SmartDialog.showToast(
-                                                    'err: ${_articleCtr.id}');
-                                                return;
-                                              }
-                                              showModalBottomSheet(
-                                                context: context,
-                                                isScrollControlled: true,
-                                                useSafeArea: true,
-                                                builder: (context) =>
-                                                    RepostPanel(
-                                                  item: _articleCtr.opusData,
-                                                  dynIdStr: _articleCtr
-                                                      .articleData?.dynIdStr,
-                                                  pic:
-                                                      _articleCtr.summary.cover,
-                                                  title:
-                                                      _articleCtr.summary.title,
-                                                  uname: _articleCtr
-                                                      .summary.author?.name,
-                                                  callback: () {
-                                                    int count = _articleCtr
-                                                            .stats
-                                                            .value
-                                                            ?.forward
-                                                            ?.count ??
-                                                        0;
+                                ),
+                              ),
+                              padding: EdgeInsets.only(
+                                bottom: MediaQuery.paddingOf(context).bottom,
+                              ),
+                              child: Row(
+                                mainAxisAlignment:
+                                    MainAxisAlignment.spaceAround,
+                                children: [
+                                  Expanded(
+                                    child: Builder(
+                                      builder: (btnContext) => textIconButton(
+                                        text: '转发',
+                                        icon: FontAwesomeIcons.shareFromSquare,
+                                        stat: _articleCtr.stats.value?.forward,
+                                        callback: () {
+                                          if (_articleCtr.opusData == null &&
+                                              _articleCtr
+                                                      .articleData
+                                                      ?.dynIdStr ==
+                                                  null) {
+                                            SmartDialog.showToast(
+                                              'err: ${_articleCtr.id}',
+                                            );
+                                            return;
+                                          }
+                                          showModalBottomSheet(
+                                            context: context,
+                                            isScrollControlled: true,
+                                            useSafeArea: true,
+                                            builder: (context) => RepostPanel(
+                                              item: _articleCtr.opusData,
+                                              dynIdStr: _articleCtr
+                                                  .articleData
+                                                  ?.dynIdStr,
+                                              pic: _articleCtr.summary.cover,
+                                              title: _articleCtr.summary.title,
+                                              uname: _articleCtr
+                                                  .summary
+                                                  .author
+                                                  ?.name,
+                                              callback: () {
+                                                int count =
                                                     _articleCtr
                                                         .stats
                                                         .value
                                                         ?.forward
-                                                        ?.count = count + 1;
-                                                    if (btnContext.mounted) {
-                                                      (btnContext as Element?)
-                                                          ?.markNeedsBuild();
-                                                    }
-                                                  },
-                                                ),
-                                              );
-                                            },
-                                          ),
-                                        ),
+                                                        ?.count ??
+                                                    0;
+                                                _articleCtr
+                                                        .stats
+                                                        .value
+                                                        ?.forward
+                                                        ?.count =
+                                                    count + 1;
+                                                if (btnContext.mounted) {
+                                                  (btnContext as Element?)
+                                                      ?.markNeedsBuild();
+                                                }
+                                              },
+                                            ),
+                                          );
+                                        },
                                       ),
-                                      Expanded(
-                                          child: textIconButton(
-                                        text: '分享',
-                                        icon: CustomIcon.share_node,
-                                        stat: null,
-                                        callback: () =>
-                                            Utils.shareText(_articleCtr.url),
-                                      )),
-                                      if (_articleCtr.stats.value != null)
-                                        Expanded(
-                                            child: textIconButton(
-                                          icon: FontAwesomeIcons.star,
-                                          activitedIcon:
-                                              FontAwesomeIcons.solidStar,
-                                          text: '收藏',
-                                          stat:
-                                              _articleCtr.stats.value!.favorite,
-                                          callback: _articleCtr.onFav,
-                                        )),
-                                      Expanded(
-                                        child: Builder(
-                                          builder: (context) => TextButton.icon(
-                                            onPressed: _articleCtr.onLike,
-                                            icon: Icon(
-                                              _articleCtr.stats.value?.like
-                                                          ?.status ==
-                                                      true
-                                                  ? FontAwesomeIcons
-                                                      .solidThumbsUp
-                                                  : FontAwesomeIcons.thumbsUp,
-                                              size: 16,
-                                              color: _articleCtr.stats.value
-                                                          ?.like?.status ==
-                                                      true
-                                                  ? theme.colorScheme.primary
-                                                  : theme.colorScheme.outline,
-                                              semanticLabel: _articleCtr
+                                    ),
+                                  ),
+                                  Expanded(
+                                    child: textIconButton(
+                                      text: '分享',
+                                      icon: CustomIcon.share_node,
+                                      stat: null,
+                                      callback: () =>
+                                          Utils.shareText(_articleCtr.url),
+                                    ),
+                                  ),
+                                  if (_articleCtr.stats.value != null)
+                                    Expanded(
+                                      child: textIconButton(
+                                        icon: FontAwesomeIcons.star,
+                                        activitedIcon:
+                                            FontAwesomeIcons.solidStar,
+                                        text: '收藏',
+                                        stat: _articleCtr.stats.value!.favorite,
+                                        callback: _articleCtr.onFav,
+                                      ),
+                                    ),
+                                  Expanded(
+                                    child: Builder(
+                                      builder: (context) => TextButton.icon(
+                                        onPressed: _articleCtr.onLike,
+                                        icon: Icon(
+                                          _articleCtr
+                                                      .stats
+                                                      .value
+                                                      ?.like
+                                                      ?.status ==
+                                                  true
+                                              ? FontAwesomeIcons.solidThumbsUp
+                                              : FontAwesomeIcons.thumbsUp,
+                                          size: 16,
+                                          color:
+                                              _articleCtr
+                                                      .stats
+                                                      .value
+                                                      ?.like
+                                                      ?.status ==
+                                                  true
+                                              ? theme.colorScheme.primary
+                                              : theme.colorScheme.outline,
+                                          semanticLabel:
+                                              _articleCtr
+                                                      .stats
+                                                      .value
+                                                      ?.like
+                                                      ?.status ==
+                                                  true
+                                              ? "已赞"
+                                              : "点赞",
+                                        ),
+                                        style: TextButton.styleFrom(
+                                          padding: const EdgeInsets.symmetric(
+                                            horizontal: 15,
+                                          ),
+                                          foregroundColor:
+                                              theme.colorScheme.outline,
+                                        ),
+                                        label: AnimatedSwitcher(
+                                          duration: const Duration(
+                                            milliseconds: 400,
+                                          ),
+                                          transitionBuilder:
+                                              (
+                                                Widget child,
+                                                Animation<double> animation,
+                                              ) {
+                                                return ScaleTransition(
+                                                  scale: animation,
+                                                  child: child,
+                                                );
+                                              },
+                                          child: Text(
+                                            _articleCtr
+                                                        .stats
+                                                        .value
+                                                        ?.like
+                                                        ?.count !=
+                                                    null
+                                                ? NumUtil.numFormat(
+                                                    _articleCtr
+                                                        .stats
+                                                        .value!
+                                                        .like!
+                                                        .count,
+                                                  )
+                                                : '点赞',
+                                            style: TextStyle(
+                                              color:
+                                                  _articleCtr
                                                           .stats
                                                           .value
                                                           ?.like
                                                           ?.status ==
                                                       true
-                                                  ? "已赞"
-                                                  : "点赞",
-                                            ),
-                                            style: TextButton.styleFrom(
-                                              padding:
-                                                  const EdgeInsets.symmetric(
-                                                      horizontal: 15),
-                                              foregroundColor:
-                                                  theme.colorScheme.outline,
-                                            ),
-                                            label: AnimatedSwitcher(
-                                              duration: const Duration(
-                                                  milliseconds: 400),
-                                              transitionBuilder: (Widget child,
-                                                  Animation<double> animation) {
-                                                return ScaleTransition(
-                                                    scale: animation,
-                                                    child: child);
-                                              },
-                                              child: Text(
-                                                _articleCtr.stats.value?.like
-                                                            ?.count !=
-                                                        null
-                                                    ? NumUtil.numFormat(
-                                                        _articleCtr.stats.value!
-                                                            .like!.count)
-                                                    : '点赞',
-                                                style: TextStyle(
-                                                  color: _articleCtr.stats.value
-                                                              ?.like?.status ==
-                                                          true
-                                                      ? theme
-                                                          .colorScheme.primary
-                                                      : theme
-                                                          .colorScheme.outline,
-                                                ),
-                                              ),
+                                                  ? theme.colorScheme.primary
+                                                  : theme.colorScheme.outline,
                                             ),
                                           ),
                                         ),
                                       ),
-                                    ],
+                                    ),
                                   ),
-                                )
-                              : const SizedBox.shrink(),
-                        ],
-                      );
-                    });
-            },
-          ),
-        ),
-      );
+                                ],
+                              ),
+                            )
+                          : const SizedBox.shrink(),
+                    ],
+                  );
+                });
+        },
+      ),
+    ),
+  );
 }
diff --git a/lib/pages/article/widgets/html_render.dart b/lib/pages/article/widgets/html_render.dart
index 8933fbdf6..006554791 100644
--- a/lib/pages/article/widgets/html_render.dart
+++ b/lib/pages/article/widgets/html_render.dart
@@ -35,9 +35,9 @@ Widget htmlRender({
           }
 
           String? clazz = attributes['class'];
-          String? height = RegExp(r'max-height:(\d+)px')
-              .firstMatch('${attributes['style']}')
-              ?.group(1);
+          String? height = RegExp(
+            r'max-height:(\d+)px',
+          ).firstMatch('${attributes['style']}')?.group(1);
           if (clazz?.contains('cut-off') == true || height != null) {
             return CachedNetworkImage(
               width: maxWidth,
diff --git a/lib/pages/article/widgets/opus_content.dart b/lib/pages/article/widgets/opus_content.dart
index 18606cf47..40e1379fe 100644
--- a/lib/pages/article/widgets/opus_content.dart
+++ b/lib/pages/article/widgets/opus_content.dart
@@ -37,8 +37,9 @@ class OpusContent extends StatelessWidget {
 
   static TextStyle _getStyle(Style? style, [Color? color, double? fontSize]) =>
       TextStyle(
-        decoration:
-            style?.strikethrough == true ? TextDecoration.lineThrough : null,
+        decoration: style?.strikethrough == true
+            ? TextDecoration.lineThrough
+            : null,
         decorationColor: color,
         fontStyle: style?.italic == true ? FontStyle.italic : null,
         fontWeight: style?.bold == true ? FontWeight.bold : null,
@@ -47,12 +48,13 @@ class OpusContent extends StatelessWidget {
       );
 
   static TextSpan _getSpan(Word? word, [Color? defaultColor]) => TextSpan(
-      text: word?.words,
-      style: _getStyle(
-        word?.style,
-        word?.color != null ? Color(word!.color!) : defaultColor,
-        word?.fontSize,
-      ));
+    text: word?.words,
+    style: _getStyle(
+      word?.style,
+      word?.color != null ? Color(word!.color!) : defaultColor,
+      word?.fontSize,
+    ),
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -74,78 +76,87 @@ class OpusContent extends StatelessWidget {
                 child: Text.rich(
                   textAlign: element.align == 1 ? TextAlign.center : null,
                   TextSpan(
-                      children: element.text?.nodes?.map((item) {
-                    switch (item.type) {
-                      case 'TEXT_NODE_TYPE_RICH' when (item.rich != null):
-                        Rich rich = item.rich!;
-                        switch (rich.type) {
-                          case 'RICH_TEXT_NODE_TYPE_EMOJI':
-                            Emoji emoji = rich.emoji!;
-                            final size = 20.0 * emoji.size;
-                            return WidgetSpan(
-                              child: NetworkImgLayer(
-                                width: size,
-                                height: size,
-                                src: emoji.url,
-                                type: ImageType.emote,
+                    children: element.text?.nodes?.map((item) {
+                      switch (item.type) {
+                        case 'TEXT_NODE_TYPE_RICH' when (item.rich != null):
+                          Rich rich = item.rich!;
+                          switch (rich.type) {
+                            case 'RICH_TEXT_NODE_TYPE_EMOJI':
+                              Emoji emoji = rich.emoji!;
+                              final size = 20.0 * emoji.size;
+                              return WidgetSpan(
+                                child: NetworkImgLayer(
+                                  width: size,
+                                  height: size,
+                                  src: emoji.url,
+                                  type: ImageType.emote,
+                                ),
+                              );
+                            default:
+                              return TextSpan(
+                                text:
+                                    '${rich.type == 'RICH_TEXT_NODE_TYPE_WEB' ? '\u{1F517}' : ''}${item.rich!.text}',
+                                style: _getStyle(
+                                  rich.style,
+                                  rich.type == 'RICH_TEXT_NODE_TYPE_TEXT'
+                                      ? null
+                                      : colorScheme.primary,
+                                ),
+                                recognizer: TapGestureRecognizer()
+                                  ..onTap = () {
+                                    switch (rich.type) {
+                                      case 'RICH_TEXT_NODE_TYPE_AT':
+                                        Get.toNamed('/member?mid=${rich.rid}');
+                                      // case 'RICH_TEXT_NODE_TYPE_TOPIC':
+                                      default:
+                                        if (rich.jumpUrl != null) {
+                                          PiliScheme.routePushFromUrl(
+                                            rich.jumpUrl!,
+                                          );
+                                        }
+                                    }
+                                  },
+                              );
+                          }
+                        case 'TEXT_NODE_TYPE_FORMULA'
+                            when (item.formula != null):
+                          return WidgetSpan(
+                            child: CachedNetworkSVGImage(
+                              height: 65,
+                              'https://api.bilibili.com/x/web-frontend/mathjax/tex?formula=${Uri.encodeComponent(item.formula!.latexContent!)}',
+                              colorFilter: ColorFilter.mode(
+                                colorScheme.onSurfaceVariant,
+                                BlendMode.srcIn,
                               ),
-                            );
-                          default:
-                            return TextSpan(
-                              text:
-                                  '${rich.type == 'RICH_TEXT_NODE_TYPE_WEB' ? '\u{1F517}' : ''}${item.rich!.text}',
-                              style: _getStyle(
-                                rich.style,
-                                rich.type == 'RICH_TEXT_NODE_TYPE_TEXT'
-                                    ? null
-                                    : colorScheme.primary,
-                              ),
-                              recognizer: TapGestureRecognizer()
-                                ..onTap = () {
-                                  switch (rich.type) {
-                                    case 'RICH_TEXT_NODE_TYPE_AT':
-                                      Get.toNamed('/member?mid=${rich.rid}');
-                                    // case 'RICH_TEXT_NODE_TYPE_TOPIC':
-                                    default:
-                                      if (rich.jumpUrl != null) {
-                                        PiliScheme.routePushFromUrl(
-                                          rich.jumpUrl!,
-                                        );
-                                      }
-                                  }
-                                },
-                            );
-                        }
-                      case 'TEXT_NODE_TYPE_FORMULA' when (item.formula != null):
-                        return WidgetSpan(
-                          child: CachedNetworkSVGImage(
-                            height: 65,
-                            'https://api.bilibili.com/x/web-frontend/mathjax/tex?formula=${Uri.encodeComponent(item.formula!.latexContent!)}',
-                            colorFilter: ColorFilter.mode(
-                              colorScheme.onSurfaceVariant,
-                              BlendMode.srcIn,
+                              alignment: Alignment.centerLeft,
+                              placeholderBuilder: (_) =>
+                                  const SizedBox.shrink(),
                             ),
-                            alignment: Alignment.centerLeft,
-                            placeholderBuilder: (_) => const SizedBox.shrink(),
-                          ),
-                        );
-                      default:
-                        return _getSpan(
-                          item.word,
-                          isQuote ? colorScheme.onSurfaceVariant : null,
-                        );
-                    }
-                  }).toList()),
+                          );
+                        default:
+                          return _getSpan(
+                            item.word,
+                            isQuote ? colorScheme.onSurfaceVariant : null,
+                          );
+                      }
+                    }).toList(),
+                  ),
                 ),
               );
               if (isQuote) {
                 widget = Container(
                   padding: const EdgeInsets.only(
-                      left: 8, top: 4, right: 4, bottom: 4),
+                    left: 8,
+                    top: 4,
+                    right: 4,
+                    bottom: 4,
+                  ),
                   decoration: BoxDecoration(
                     border: Border(
                       left: BorderSide(
-                          color: colorScheme.outlineVariant, width: 4),
+                        color: colorScheme.outlineVariant,
+                        width: 4,
+                      ),
                     ),
                     borderRadius: const BorderRadius.all(Radius.circular(6)),
                     color: colorScheme.onInverseSurface,
@@ -191,11 +202,17 @@ class OpusContent extends StatelessWidget {
                 );
               } else {
                 return imageView(
-                    maxWidth,
-                    element.pic!.pics!
-                        .map((e) => ImageModel(
-                            width: e.width, height: e.height, url: e.url!))
-                        .toList());
+                  maxWidth,
+                  element.pic!.pics!
+                      .map(
+                        (e) => ImageModel(
+                          width: e.width,
+                          height: e.height,
+                          url: e.url!,
+                        ),
+                      )
+                      .toList(),
+                );
               }
             case 3 when (element.line != null):
               return CachedNetworkImage(
@@ -248,18 +265,18 @@ class OpusContent extends StatelessWidget {
                             }
                             String? url =
                                 switch (element.linkCard!.card!.type) {
-                              'LINK_CARD_TYPE_UGC' =>
-                                element.linkCard!.card!.ugc!.jumpUrl,
-                              'LINK_CARD_TYPE_COMMON' =>
-                                element.linkCard!.card!.common!.jumpUrl,
-                              'LINK_CARD_TYPE_LIVE' =>
-                                element.linkCard!.card!.live!.jumpUrl,
-                              'LINK_CARD_TYPE_OPUS' =>
-                                element.linkCard!.card!.opus!.jumpUrl,
-                              'LINK_CARD_TYPE_MUSIC' =>
-                                element.linkCard!.card!.music!.jumpUrl,
-                              _ => null,
-                            };
+                                  'LINK_CARD_TYPE_UGC' =>
+                                    element.linkCard!.card!.ugc!.jumpUrl,
+                                  'LINK_CARD_TYPE_COMMON' =>
+                                    element.linkCard!.card!.common!.jumpUrl,
+                                  'LINK_CARD_TYPE_LIVE' =>
+                                    element.linkCard!.card!.live!.jumpUrl,
+                                  'LINK_CARD_TYPE_OPUS' =>
+                                    element.linkCard!.card!.opus!.jumpUrl,
+                                  'LINK_CARD_TYPE_MUSIC' =>
+                                    element.linkCard!.card!.music!.jumpUrl,
+                                  _ => null,
+                                };
                             if (url?.isNotEmpty == true) {
                               PiliScheme.routePushFromUrl(url!);
                             }
@@ -270,255 +287,259 @@ class OpusContent extends StatelessWidget {
                     padding: const EdgeInsets.all(8),
                     child: switch (element.linkCard?.card?.type) {
                       'LINK_CARD_TYPE_UGC' => Row(
-                          spacing: 10,
-                          children: [
-                            NetworkImgLayer(
-                              radius: 6,
-                              width: 65 * StyleString.aspectRatio,
-                              height: 65,
-                              src: element.linkCard!.card!.ugc!.cover,
-                            ),
-                            Expanded(
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  Text(element.linkCard!.card!.ugc!.title!),
-                                  Text(
-                                    element.linkCard!.card!.ugc!.descSecond!,
-                                    style: TextStyle(
-                                      fontSize: 13,
-                                      color: colorScheme.outline,
-                                    ),
+                        spacing: 10,
+                        children: [
+                          NetworkImgLayer(
+                            radius: 6,
+                            width: 65 * StyleString.aspectRatio,
+                            height: 65,
+                            src: element.linkCard!.card!.ugc!.cover,
+                          ),
+                          Expanded(
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Text(element.linkCard!.card!.ugc!.title!),
+                                Text(
+                                  element.linkCard!.card!.ugc!.descSecond!,
+                                  style: TextStyle(
+                                    fontSize: 13,
+                                    color: colorScheme.outline,
                                   ),
-                                ],
-                              ),
-                            ),
-                          ],
-                        ),
-                      'LINK_CARD_TYPE_ITEM_NULL' => Row(
-                          children: [
-                            if (element.linkCard?.card?.itemNull?.icon
-                                    ?.isNullOrEmpty ==
-                                true)
-                              const Icon(Icons.info, size: 20),
-                            Text(' ${element.linkCard?.card?.itemNull?.text}'),
-                          ],
-                        ),
-                      'LINK_CARD_TYPE_COMMON' => Row(
-                          spacing: 10,
-                          children: [
-                            NetworkImgLayer(
-                              radius: 6,
-                              width: 65 * StyleString.aspectRatio,
-                              height: 65,
-                              src: element.linkCard!.card!.common!.cover,
-                            ),
-                            Expanded(
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  Text(element.linkCard!.card!.common!.title!),
-                                  if (element.linkCard!.card!.common!.desc1 !=
-                                      null)
-                                    Text(
-                                      element.linkCard!.card!.common!.desc1!,
-                                      style: TextStyle(
-                                        fontSize: 13,
-                                        color: colorScheme.outline,
-                                      ),
-                                    ),
-                                  if (element.linkCard!.card!.common!.desc2 !=
-                                      null)
-                                    Text(
-                                      element.linkCard!.card!.common!.desc2!,
-                                      style: TextStyle(
-                                        fontSize: 13,
-                                        color: colorScheme.outline,
-                                      ),
-                                    ),
-                                ],
-                              ),
-                            ),
-                          ],
-                        ),
-                      'LINK_CARD_TYPE_LIVE' => Row(
-                          spacing: 10,
-                          children: [
-                            NetworkImgLayer(
-                              radius: 6,
-                              width: 65 * StyleString.aspectRatio,
-                              height: 65,
-                              src: element.linkCard!.card!.live!.cover,
-                            ),
-                            Expanded(
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  Text(element.linkCard!.card!.live!.title!),
-                                  if (element.linkCard!.card!.live!.descFirst !=
-                                      null)
-                                    Text(
-                                      element.linkCard!.card!.live!.descFirst!,
-                                      style: TextStyle(
-                                        fontSize: 13,
-                                        color: colorScheme.outline,
-                                      ),
-                                    ),
-                                  if (element
-                                          .linkCard!.card!.live!.descSecond !=
-                                      null)
-                                    Text(
-                                      element.linkCard!.card!.live!.descSecond!,
-                                      style: TextStyle(
-                                        fontSize: 13,
-                                        color: colorScheme.outline,
-                                      ),
-                                    ),
-                                ],
-                              ),
-                            ),
-                          ],
-                        ),
-                      'LINK_CARD_TYPE_OPUS' => Row(
-                          spacing: 10,
-                          children: [
-                            NetworkImgLayer(
-                              radius: 6,
-                              width: 65 * StyleString.aspectRatio,
-                              height: 65,
-                              src: element.linkCard!.card!.opus!.cover,
-                            ),
-                            Expanded(
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  Text(element.linkCard!.card!.opus!.title!),
-                                  Text(
-                                    '${element.linkCard!.card!.opus!.authorName} · ${element.linkCard!.card!.opus!.statView ?? 0}阅读',
-                                    style: TextStyle(
-                                      fontSize: 13,
-                                      color: colorScheme.outline,
-                                    ),
-                                  ),
-                                ],
-                              ),
-                            ),
-                          ],
-                        ),
-                      'LINK_CARD_TYPE_VOTE' => Row(
-                          spacing: 10,
-                          children: [
-                            Container(
-                              decoration: BoxDecoration(
-                                borderRadius: const BorderRadius.all(
-                                  Radius.circular(6),
                                 ),
-                                color: colorScheme.secondaryContainer,
-                              ),
-                              width: 70,
-                              height: 50,
-                              alignment: Alignment.center,
-                              child: Icon(
-                                Icons.bar_chart_rounded,
-                                color: colorScheme.onSurfaceVariant,
-                              ),
+                              ],
                             ),
-                            Expanded(
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  Text(element.linkCard!.card!.vote!.desc!),
+                          ),
+                        ],
+                      ),
+                      'LINK_CARD_TYPE_ITEM_NULL' => Row(
+                        children: [
+                          if (element
+                                  .linkCard
+                                  ?.card
+                                  ?.itemNull
+                                  ?.icon
+                                  ?.isNullOrEmpty ==
+                              true)
+                            const Icon(Icons.info, size: 20),
+                          Text(' ${element.linkCard?.card?.itemNull?.text}'),
+                        ],
+                      ),
+                      'LINK_CARD_TYPE_COMMON' => Row(
+                        spacing: 10,
+                        children: [
+                          NetworkImgLayer(
+                            radius: 6,
+                            width: 65 * StyleString.aspectRatio,
+                            height: 65,
+                            src: element.linkCard!.card!.common!.cover,
+                          ),
+                          Expanded(
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Text(element.linkCard!.card!.common!.title!),
+                                if (element.linkCard!.card!.common!.desc1 !=
+                                    null)
                                   Text(
-                                    '${element.linkCard!.card!.vote!.joinNum}人参与',
+                                    element.linkCard!.card!.common!.desc1!,
                                     style: TextStyle(
                                       fontSize: 13,
                                       color: colorScheme.outline,
                                     ),
                                   ),
-                                ],
-                              ),
+                                if (element.linkCard!.card!.common!.desc2 !=
+                                    null)
+                                  Text(
+                                    element.linkCard!.card!.common!.desc2!,
+                                    style: TextStyle(
+                                      fontSize: 13,
+                                      color: colorScheme.outline,
+                                    ),
+                                  ),
+                              ],
                             ),
-                          ],
-                        ),
+                          ),
+                        ],
+                      ),
+                      'LINK_CARD_TYPE_LIVE' => Row(
+                        spacing: 10,
+                        children: [
+                          NetworkImgLayer(
+                            radius: 6,
+                            width: 65 * StyleString.aspectRatio,
+                            height: 65,
+                            src: element.linkCard!.card!.live!.cover,
+                          ),
+                          Expanded(
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Text(element.linkCard!.card!.live!.title!),
+                                if (element.linkCard!.card!.live!.descFirst !=
+                                    null)
+                                  Text(
+                                    element.linkCard!.card!.live!.descFirst!,
+                                    style: TextStyle(
+                                      fontSize: 13,
+                                      color: colorScheme.outline,
+                                    ),
+                                  ),
+                                if (element.linkCard!.card!.live!.descSecond !=
+                                    null)
+                                  Text(
+                                    element.linkCard!.card!.live!.descSecond!,
+                                    style: TextStyle(
+                                      fontSize: 13,
+                                      color: colorScheme.outline,
+                                    ),
+                                  ),
+                              ],
+                            ),
+                          ),
+                        ],
+                      ),
+                      'LINK_CARD_TYPE_OPUS' => Row(
+                        spacing: 10,
+                        children: [
+                          NetworkImgLayer(
+                            radius: 6,
+                            width: 65 * StyleString.aspectRatio,
+                            height: 65,
+                            src: element.linkCard!.card!.opus!.cover,
+                          ),
+                          Expanded(
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Text(element.linkCard!.card!.opus!.title!),
+                                Text(
+                                  '${element.linkCard!.card!.opus!.authorName} · ${element.linkCard!.card!.opus!.statView ?? 0}阅读',
+                                  style: TextStyle(
+                                    fontSize: 13,
+                                    color: colorScheme.outline,
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ],
+                      ),
+                      'LINK_CARD_TYPE_VOTE' => Row(
+                        spacing: 10,
+                        children: [
+                          Container(
+                            decoration: BoxDecoration(
+                              borderRadius: const BorderRadius.all(
+                                Radius.circular(6),
+                              ),
+                              color: colorScheme.secondaryContainer,
+                            ),
+                            width: 70,
+                            height: 50,
+                            alignment: Alignment.center,
+                            child: Icon(
+                              Icons.bar_chart_rounded,
+                              color: colorScheme.onSurfaceVariant,
+                            ),
+                          ),
+                          Expanded(
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Text(element.linkCard!.card!.vote!.desc!),
+                                Text(
+                                  '${element.linkCard!.card!.vote!.joinNum}人参与',
+                                  style: TextStyle(
+                                    fontSize: 13,
+                                    color: colorScheme.outline,
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ],
+                      ),
                       'LINK_CARD_TYPE_MUSIC' => Row(
-                          spacing: 10,
-                          children: [
-                            NetworkImgLayer(
-                              radius: 6,
-                              width: 65 * StyleString.aspectRatio,
-                              height: 65,
-                              src: element.linkCard!.card!.music!.cover,
-                            ),
-                            Expanded(
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  Text(element.linkCard!.card!.music!.title!),
-                                  if (element.linkCard!.card!.music!.label !=
-                                      null)
-                                    Text(
-                                      element.linkCard!.card!.music!.label!,
-                                      style: TextStyle(
-                                        fontSize: 13,
-                                        color: colorScheme.outline,
-                                      ),
+                        spacing: 10,
+                        children: [
+                          NetworkImgLayer(
+                            radius: 6,
+                            width: 65 * StyleString.aspectRatio,
+                            height: 65,
+                            src: element.linkCard!.card!.music!.cover,
+                          ),
+                          Expanded(
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Text(element.linkCard!.card!.music!.title!),
+                                if (element.linkCard!.card!.music!.label !=
+                                    null)
+                                  Text(
+                                    element.linkCard!.card!.music!.label!,
+                                    style: TextStyle(
+                                      fontSize: 13,
+                                      color: colorScheme.outline,
                                     ),
-                                ],
-                              ),
+                                  ),
+                              ],
                             ),
-                          ],
-                        ),
+                          ),
+                        ],
+                      ),
                       'LINK_CARD_TYPE_GOODS' => Column(
-                          children:
-                              element.linkCard!.card!.goods!.items!.map((e) {
-                            return GestureDetector(
-                              onTap: () {
-                                if (e.jumpUrl?.isNotEmpty == true) {
-                                  PiliScheme.routePushFromUrl(e.jumpUrl!);
-                                }
-                              },
-                              child: Row(
-                                spacing: 10,
-                                children: [
-                                  NetworkImgLayer(
-                                    radius: 6,
-                                    width: 65 * StyleString.aspectRatio,
-                                    height: 65,
-                                    src: e.cover,
-                                  ),
-                                  Expanded(
-                                    child: Column(
-                                      crossAxisAlignment:
-                                          CrossAxisAlignment.start,
-                                      children: [
-                                        Text(e.name!),
-                                        if (e.brief?.isNotEmpty == true)
-                                          Text(
-                                            e.brief!,
-                                            style: TextStyle(
-                                              fontSize: 13,
-                                              color: colorScheme.outline,
-                                            ),
+                        children: element.linkCard!.card!.goods!.items!.map((
+                          e,
+                        ) {
+                          return GestureDetector(
+                            onTap: () {
+                              if (e.jumpUrl?.isNotEmpty == true) {
+                                PiliScheme.routePushFromUrl(e.jumpUrl!);
+                              }
+                            },
+                            child: Row(
+                              spacing: 10,
+                              children: [
+                                NetworkImgLayer(
+                                  radius: 6,
+                                  width: 65 * StyleString.aspectRatio,
+                                  height: 65,
+                                  src: e.cover,
+                                ),
+                                Expanded(
+                                  child: Column(
+                                    crossAxisAlignment:
+                                        CrossAxisAlignment.start,
+                                    children: [
+                                      Text(e.name!),
+                                      if (e.brief?.isNotEmpty == true)
+                                        Text(
+                                          e.brief!,
+                                          style: TextStyle(
+                                            fontSize: 13,
+                                            color: colorScheme.outline,
                                           ),
-                                        if (e.price?.isNotEmpty == true)
-                                          Text(
-                                            '${e.price!}起',
-                                            style: TextStyle(
-                                              fontSize: 13,
-                                              color: colorScheme.outline,
-                                            ),
+                                        ),
+                                      if (e.price?.isNotEmpty == true)
+                                        Text(
+                                          '${e.price!}起',
+                                          style: TextStyle(
+                                            fontSize: 13,
+                                            color: colorScheme.outline,
                                           ),
-                                      ],
-                                    ),
+                                        ),
+                                    ],
                                   ),
-                                ],
-                              ),
-                            );
-                          }).toList(),
-                        ),
+                                ),
+                              ],
+                            ),
+                          );
+                        }).toList(),
+                      ),
                       _ => throw UnimplementedError(
-                          '\nparaType: ${element.paraType},\ncard type: ${element.linkCard?.card?.type}',
-                        ),
+                        '\nparaType: ${element.paraType},\ncard type: ${element.linkCard?.card?.type}',
+                      ),
                     },
                   ),
                 ),
@@ -527,16 +548,19 @@ class OpusContent extends StatelessWidget {
               final Highlight highlight = Highlight()
                 ..registerLanguages(builtinAllLanguages);
               final HighlightResult result = highlight.highlightAuto(
-                  element.code!.content!,
-                  element.code!.lang == 'language-clike'
-                      ? const ['c', 'java']
-                      : [
-                          element.code!.lang!
-                              .replaceAll('language-', '')
-                              .replaceAll('like', ''),
-                        ]);
+                element.code!.content!,
+                element.code!.lang == 'language-clike'
+                    ? const ['c', 'java']
+                    : [
+                        element.code!.lang!
+                            .replaceAll('language-', '')
+                            .replaceAll('like', ''),
+                      ],
+              );
               final TextSpanRenderer renderer = TextSpanRenderer(
-                  const TextStyle(), builtinAllThemes['github']!);
+                const TextStyle(),
+                builtinAllThemes['github']!,
+              );
               result.render(renderer);
               return Container(
                 padding: const EdgeInsets.all(12),
@@ -554,9 +578,10 @@ class OpusContent extends StatelessWidget {
                   child: Text.rich(
                     textAlign: element.align == 1 ? TextAlign.center : null,
                     TextSpan(
-                        children: element.text!.nodes!
-                            .map<TextSpan>((item) => _getSpan(item.word))
-                            .toList()),
+                      children: element.text!.nodes!
+                          .map<TextSpan>((item) => _getSpan(item.word))
+                          .toList(),
+                    ),
                   ),
                 );
               }
@@ -589,7 +614,10 @@ class OpusContent extends StatelessWidget {
 }
 
 Widget moduleBlockedItem(
-    ThemeData theme, ModuleBlocked moduleBlocked, double maxWidth) {
+  ThemeData theme,
+  ModuleBlocked moduleBlocked,
+  double maxWidth,
+) {
   BoxDecoration? bgImg() {
     return moduleBlocked.bgImg == null
         ? null
@@ -629,8 +657,9 @@ Widget moduleBlockedItem(
         padding: padding,
         tapTargetSize: MaterialTapTargetSize.shrinkWrap,
         visualDensity: visualDensity,
-        backgroundColor:
-            Get.isDarkMode ? const Color(0xFF8F0030) : const Color(0xFFFF6699),
+        backgroundColor: Get.isDarkMode
+            ? const Color(0xFF8F0030)
+            : const Color(0xFFFF6699),
         foregroundColor: Colors.white,
         shape: shape,
       ),
diff --git a/lib/pages/article_list/view.dart b/lib/pages/article_list/view.dart
index e149bac5b..14fcf0326 100644
--- a/lib/pages/article_list/view.dart
+++ b/lib/pages/article_list/view.dart
@@ -25,8 +25,10 @@ class ArticleListPage extends StatefulWidget {
 }
 
 class _ArticleListPageState extends State<ArticleListPage> {
-  final _controller =
-      Get.put(ArticleListController(), tag: Utils.generateRandomString(8));
+  final _controller = Get.put(
+    ArticleListController(),
+    tag: Utils.generateRandomString(8),
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -43,9 +45,11 @@ class _ArticleListPageState extends State<ArticleListPage> {
               Obx(() => _buildHeader(theme, _controller.list.value)),
               SliverPadding(
                 padding: EdgeInsets.only(
-                    bottom: MediaQuery.paddingOf(context).bottom + 80),
+                  bottom: MediaQuery.paddingOf(context).bottom + 80,
+                ),
                 sliver: Obx(
-                    () => _buildBody(theme, _controller.loadingState.value)),
+                  () => _buildBody(theme, _controller.loadingState.value),
+                ),
               ),
             ],
           ),
@@ -55,38 +59,42 @@ class _ArticleListPageState extends State<ArticleListPage> {
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<ArticleListItemModel>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<ArticleListItemModel>?> loadingState,
+  ) {
     return switch (loadingState) {
       Loading() => SliverPadding(
-          padding: EdgeInsets.only(
-              top: MediaQuery.paddingOf(context).top + kToolbarHeight + 120),
-          sliver: SliverGrid(
-            gridDelegate: Grid.videoCardHDelegate(context),
-            delegate: SliverChildBuilderDelegate(
-              (context, index) {
-                return const VideoCardHSkeleton();
-              },
-              childCount: 10,
-            ),
+        padding: EdgeInsets.only(
+          top: MediaQuery.paddingOf(context).top + kToolbarHeight + 120,
+        ),
+        sliver: SliverGrid(
+          gridDelegate: Grid.videoCardHDelegate(context),
+          delegate: SliverChildBuilderDelegate(
+            (context, index) {
+              return const VideoCardHSkeleton();
+            },
+            childCount: 10,
           ),
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  return ArticleListItem(
-                    item: response[index],
-                  );
-                },
-                childCount: response!.length,
-              ),
-            )
-          : HttpError(onReload: _controller.onReload),
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    return ArticleListItem(
+                      item: response[index],
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
@@ -160,8 +168,8 @@ class _ArticleListPageState extends State<ArticleListPage> {
                     TextSpan(
                       children: [
                         TextSpan(
-                            text:
-                                '${NumUtil.numFormat(item.articlesCount)}篇专栏'),
+                          text: '${NumUtil.numFormat(item.articlesCount)}篇专栏',
+                        ),
                         divider,
                         TextSpan(text: '${NumUtil.numFormat(item.words)}个字'),
                         divider,
@@ -174,7 +182,8 @@ class _ArticleListPageState extends State<ArticleListPage> {
                     TextSpan(
                       children: [
                         TextSpan(
-                            text: '${DateUtil.dateFormat(item.updateTime)}更新'),
+                          text: '${DateUtil.dateFormat(item.updateTime)}更新',
+                        ),
                         divider,
                         TextSpan(text: '文集号: ${item.id}'),
                       ],
@@ -191,7 +200,8 @@ class _ArticleListPageState extends State<ArticleListPage> {
         IconButton(
           tooltip: '浏览器打开',
           onPressed: () => PageUtils.inAppWebview(
-              '${HttpString.baseUrl}/read/mobile-readlist/rl${_controller.id}'),
+            '${HttpString.baseUrl}/read/mobile-readlist/rl${_controller.id}',
+          ),
           icon: const Icon(Icons.open_in_browser_outlined, size: 19),
         ),
         const SizedBox(width: 10),
diff --git a/lib/pages/blacklist/view.dart b/lib/pages/blacklist/view.dart
index 41e22d67f..52892c75c 100644
--- a/lib/pages/blacklist/view.dart
+++ b/lib/pages/blacklist/view.dart
@@ -37,7 +37,8 @@ class _BlackListPageState extends State<BlackListPage> {
       appBar: AppBar(
         title: Obx(
           () => Text(
-              '黑名单管理${_blackListController.total.value == -1 ? '' : ': ${_blackListController.total.value}'}'),
+            '黑名单管理${_blackListController.total.value == -1 ? '' : ': ${_blackListController.total.value}'}',
+          ),
         ),
       ),
       body: refreshIndicator(
@@ -48,10 +49,12 @@ class _BlackListPageState extends State<BlackListPage> {
           slivers: [
             SliverPadding(
               padding: EdgeInsets.only(
-                  bottom: MediaQuery.paddingOf(context).bottom + 80),
+                bottom: MediaQuery.paddingOf(context).bottom + 80,
+              ),
               sliver: Obx(
-                  () => _buildBody(_blackListController.loadingState.value)),
-            )
+                () => _buildBody(_blackListController.loadingState.value),
+              ),
+            ),
           ],
         ),
       ),
@@ -62,57 +65,58 @@ class _BlackListPageState extends State<BlackListPage> {
     late final style = TextStyle(color: Theme.of(context).colorScheme.outline);
     return switch (loadingState) {
       Loading() => SliverList.builder(
-          itemCount: 12,
-          itemBuilder: (context, index) {
-            return const MsgFeedTopSkeleton();
-          },
-        ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverList.builder(
-              itemCount: response!.length,
-              itemBuilder: (BuildContext context, int index) {
-                if (index == response.length - 1) {
-                  _blackListController.onLoadMore();
-                }
-                final item = response[index];
-                return ListTile(
-                  onTap: () => Get.toNamed('/member?mid=${item.mid}'),
-                  leading: NetworkImgLayer(
-                    width: 45,
-                    height: 45,
-                    type: ImageType.avatar,
-                    src: item.face,
-                  ),
-                  title: Text(
-                    item.uname!,
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
-                    style: const TextStyle(fontSize: 14),
-                  ),
-                  subtitle: Text(
-                    '添加时间: ${DateUtil.format(item.mtime, format: DateUtil.longFormatDs)}',
-                    maxLines: 1,
-                    style: style,
-                    overflow: TextOverflow.ellipsis,
-                  ),
-                  dense: true,
-                  trailing: TextButton(
-                    onPressed: () => _blackListController.onRemove(
-                      context,
-                      index,
-                      item.uname,
-                      item.mid,
+        itemCount: 12,
+        itemBuilder: (context, index) {
+          return const MsgFeedTopSkeleton();
+        },
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverList.builder(
+                itemCount: response!.length,
+                itemBuilder: (BuildContext context, int index) {
+                  if (index == response.length - 1) {
+                    _blackListController.onLoadMore();
+                  }
+                  final item = response[index];
+                  return ListTile(
+                    onTap: () => Get.toNamed('/member?mid=${item.mid}'),
+                    leading: NetworkImgLayer(
+                      width: 45,
+                      height: 45,
+                      type: ImageType.avatar,
+                      src: item.face,
                     ),
-                    child: const Text('移除'),
-                  ),
-                );
-              },
-            )
-          : HttpError(onReload: _blackListController.onReload),
+                    title: Text(
+                      item.uname!,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      style: const TextStyle(fontSize: 14),
+                    ),
+                    subtitle: Text(
+                      '添加时间: ${DateUtil.format(item.mtime, format: DateUtil.longFormatDs)}',
+                      maxLines: 1,
+                      style: style,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                    dense: true,
+                    trailing: TextButton(
+                      onPressed: () => _blackListController.onRemove(
+                        context,
+                        index,
+                        item.uname,
+                        item.mid,
+                      ),
+                      child: const Text('移除'),
+                    ),
+                  );
+                },
+              )
+            : HttpError(onReload: _blackListController.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _blackListController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _blackListController.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/coin_log/view.dart b/lib/pages/coin_log/view.dart
index cc45d4e19..8f1f368ad 100644
--- a/lib/pages/coin_log/view.dart
+++ b/lib/pages/coin_log/view.dart
@@ -47,78 +47,81 @@ class _CoinLogPageState extends State<CoinLogPage> {
   Widget _buildBody(LoadingState<List<CoinLogItem>?> loadingState) {
     return switch (loadingState) {
       Loading() => linearLoading,
-      Success(:var response) => response?.isNotEmpty == true
-          ? Builder(
-              builder: (context) {
-                final them = Theme.of(context);
-                final outline = them.colorScheme.outline.withValues(alpha: 0.1);
-                final divider = Divider(
-                  height: 1,
-                  color: outline,
-                );
-                final sliverDivider = SliverToBoxAdapter(
-                  child: divider,
-                );
-                final dividerV = VerticalDivider(
-                  width: 1,
-                  color: outline,
-                );
-                return SliverMainAxisGroup(
-                  slivers: [
-                    sliverDivider,
-                    SliverToBoxAdapter(
-                      child: ColoredBox(
-                        color: them.colorScheme.onInverseSurface,
-                        child: _item(
-                          const CoinLogItem(
-                            time: '时间',
-                            delta: '变化',
-                            reason: '原因',
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? Builder(
+                builder: (context) {
+                  final them = Theme.of(context);
+                  final outline = them.colorScheme.outline.withValues(
+                    alpha: 0.1,
+                  );
+                  final divider = Divider(
+                    height: 1,
+                    color: outline,
+                  );
+                  final sliverDivider = SliverToBoxAdapter(
+                    child: divider,
+                  );
+                  final dividerV = VerticalDivider(
+                    width: 1,
+                    color: outline,
+                  );
+                  return SliverMainAxisGroup(
+                    slivers: [
+                      sliverDivider,
+                      SliverToBoxAdapter(
+                        child: ColoredBox(
+                          color: them.colorScheme.onInverseSurface,
+                          child: _item(
+                            const CoinLogItem(
+                              time: '时间',
+                              delta: '变化',
+                              reason: '原因',
+                            ),
+                            dividerV,
+                            isHeader: true,
                           ),
-                          dividerV,
-                          isHeader: true,
                         ),
                       ),
-                    ),
-                    sliverDivider,
-                    SliverList.separated(
-                      itemCount: response!.length,
-                      itemBuilder: (context, index) {
-                        return _item(response[index], dividerV);
-                      },
-                      separatorBuilder: (context, index) => divider,
-                    ),
-                    sliverDivider,
-                  ],
-                );
-              },
-            )
-          : HttpError(onReload: _controller.onReload),
+                      sliverDivider,
+                      SliverList.separated(
+                        itemCount: response!.length,
+                        itemBuilder: (context, index) {
+                          return _item(response[index], dividerV);
+                        },
+                        separatorBuilder: (context, index) => divider,
+                      ),
+                      sliverDivider,
+                    ],
+                  );
+                },
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
   Widget _item(CoinLogItem item, Widget divider, {bool isHeader = false}) {
     Widget text(int flex, String text) => Expanded(
-          flex: flex,
-          child: Padding(
-            padding: isHeader
-                ? const EdgeInsets.symmetric(vertical: 6)
-                : const EdgeInsets.symmetric(vertical: 8),
-            child: Center(
-              child: Text(
-                text,
-                textAlign: TextAlign.center,
-                style: isHeader
-                    ? const TextStyle(fontSize: 13, fontWeight: FontWeight.bold)
-                    : const TextStyle(fontSize: 13),
-              ),
-            ),
+      flex: flex,
+      child: Padding(
+        padding: isHeader
+            ? const EdgeInsets.symmetric(vertical: 6)
+            : const EdgeInsets.symmetric(vertical: 8),
+        child: Center(
+          child: Text(
+            text,
+            textAlign: TextAlign.center,
+            style: isHeader
+                ? const TextStyle(fontSize: 13, fontWeight: FontWeight.bold)
+                : const TextStyle(fontSize: 13),
           ),
-        );
+        ),
+      ),
+    );
     Widget content = Row(
       children: [
         divider,
diff --git a/lib/pages/common/common_controller.dart b/lib/pages/common/common_controller.dart
index d6c9eeb6f..498d7d3e0 100644
--- a/lib/pages/common/common_controller.dart
+++ b/lib/pages/common/common_controller.dart
@@ -17,7 +17,10 @@ mixin ScrollOrRefreshMixin {
     if (scrollController.hasClients) {
       if (scrollController.position.pixels == 0) {
         EasyThrottle.throttle(
-            'topOrRefresh', const Duration(milliseconds: 500), onRefresh);
+          'topOrRefresh',
+          const Duration(milliseconds: 500),
+          onRefresh,
+        );
       } else {
         animateToTop();
       }
diff --git a/lib/pages/common/common_search_page.dart b/lib/pages/common/common_search_page.dart
index bd41668bb..884e4a0dc 100644
--- a/lib/pages/common/common_search_page.dart
+++ b/lib/pages/common/common_search_page.dart
@@ -71,15 +71,16 @@ abstract class CommonSearchPageState<S extends CommonSearchPage, R, T>
   Widget _buildBody(LoadingState<List<T>?> loadingState) {
     return switch (loadingState) {
       Loading() => const HttpError(),
-      Success(:var response) => response?.isNotEmpty == true
-          ? buildList(response!)
-          : HttpError(
-              onReload: controller.onReload,
-            ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? buildList(response!)
+            : HttpError(
+                onReload: controller.onReload,
+              ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: controller.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/common/common_slide_page.dart b/lib/pages/common/common_slide_page.dart
index 7e781c161..d6cdd1ad5 100644
--- a/lib/pages/common/common_slide_page.dart
+++ b/lib/pages/common/common_slide_page.dart
@@ -30,8 +30,10 @@ abstract class CommonSlidePageState<T extends CommonSlidePage> extends State<T>
         vsync: this,
         reverseDuration: const Duration(milliseconds: 500),
       );
-      _anim = Tween<Offset>(begin: Offset.zero, end: const Offset(0, 1))
-          .animate(_animController!);
+      _anim = Tween<Offset>(
+        begin: Offset.zero,
+        end: const Offset(0, 1),
+      ).animate(_animController!);
     }
   }
 
@@ -57,63 +59,63 @@ abstract class CommonSlidePageState<T extends CommonSlidePage> extends State<T>
   Widget buildList(ThemeData theme) => throw UnimplementedError();
 
   Widget slideList(ThemeData theme) => LayoutBuilder(
-        builder: (_, constrains) {
-          final maxWidth = constrains.maxWidth;
+    builder: (_, constrains) {
+      final maxWidth = constrains.maxWidth;
 
-          void onDismiss() {
-            if (isSliding == true) {
-              if (_animController!.value * maxWidth + downPos!.dx >= 100) {
-                Get.back();
-              } else {
-                _animController!.reverse();
-              }
-            }
-            downPos = null;
-            isSliding = null;
+      void onDismiss() {
+        if (isSliding == true) {
+          if (_animController!.value * maxWidth + downPos!.dx >= 100) {
+            Get.back();
+          } else {
+            _animController!.reverse();
           }
+        }
+        downPos = null;
+        isSliding = null;
+      }
 
-          void onPan(Offset localPosition) {
-            if (isSliding == false) {
-              return;
-            } else if (isSliding == null) {
-              if (downPos != null) {
-                Offset cumulativeDelta = localPosition - downPos!;
-                if (cumulativeDelta.dx.abs() >= cumulativeDelta.dy.abs()) {
-                  downPos = localPosition;
-                  isSliding = true;
-                } else {
-                  isSliding = false;
-                }
-              }
-            } else if (isSliding == true) {
-              if (localPosition.dx < 0) {
-                return;
-              }
-              _animController!.value =
-                  max(0, (localPosition.dx - downPos!.dx)) / maxWidth;
+      void onPan(Offset localPosition) {
+        if (isSliding == false) {
+          return;
+        } else if (isSliding == null) {
+          if (downPos != null) {
+            Offset cumulativeDelta = localPosition - downPos!;
+            if (cumulativeDelta.dx.abs() >= cumulativeDelta.dy.abs()) {
+              downPos = localPosition;
+              isSliding = true;
+            } else {
+              isSliding = false;
             }
           }
+        } else if (isSliding == true) {
+          if (localPosition.dx < 0) {
+            return;
+          }
+          _animController!.value =
+              max(0, (localPosition.dx - downPos!.dx)) / maxWidth;
+        }
+      }
 
-          return GestureDetector(
-            onPanDown: (details) {
-              if (details.localPosition.dx > 30) {
-                isSliding = false;
-              } else {
-                downPos = details.localPosition;
-              }
-            },
-            onPanStart: (details) {
-              onPan(details.localPosition);
-            },
-            onPanUpdate: (details) {
-              onPan(details.localPosition);
-            },
-            onPanCancel: onDismiss,
-            onPanEnd: (_) {
-              onDismiss();
-            },
-            child: buildList(theme),
-          );
+      return GestureDetector(
+        onPanDown: (details) {
+          if (details.localPosition.dx > 30) {
+            isSliding = false;
+          } else {
+            downPos = details.localPosition;
+          }
         },
+        onPanStart: (details) {
+          onPan(details.localPosition);
+        },
+        onPanUpdate: (details) {
+          onPan(details.localPosition);
+        },
+        onPanCancel: onDismiss,
+        onPanEnd: (_) {
+          onDismiss();
+        },
+        child: buildList(theme),
       );
+    },
+  );
 }
diff --git a/lib/pages/common/common_whisper_controller.dart b/lib/pages/common/common_whisper_controller.dart
index 62d953a9d..479228cb2 100644
--- a/lib/pages/common/common_whisper_controller.dart
+++ b/lib/pages/common/common_whisper_controller.dart
@@ -25,7 +25,11 @@ abstract class CommonWhisperController<R>
   }
 
   Future<void> onSetTop(
-      Session item, int index, bool isTop, SessionId sessionId) async {
+    Session item,
+    int index,
+    bool isTop,
+    SessionId sessionId,
+  ) async {
     var res = isTop
         ? await ImGrpc.unpinSession(sessionId: sessionId)
         : await ImGrpc.pinSession(sessionId: sessionId);
diff --git a/lib/pages/common/publish/common_publish_page.dart b/lib/pages/common/publish/common_publish_page.dart
index d2a36199a..b48dab39e 100644
--- a/lib/pages/common/publish/common_publish_page.dart
+++ b/lib/pages/common/publish/common_publish_page.dart
@@ -29,7 +29,8 @@ abstract class CommonPublishPage<T> extends StatefulWidget {
 }
 
 abstract class CommonPublishPageState<T extends CommonPublishPage>
-    extends State<T> with WidgetsBindingObserver {
+    extends State<T>
+    with WidgetsBindingObserver {
   late final focusNode = FocusNode();
   late final controller = ChatBottomPanelContainerController<PanelType>();
   TextEditingController get editController;
@@ -218,23 +219,24 @@ abstract class CommonPublishPageState<T extends CommonPublishPage>
       final cancelToken = CancelToken();
       try {
         pictures = await Future.wait<Map<String, dynamic>>(
-            pathList.map((path) async {
-              Map result = await MsgHttp.uploadBfs(
-                path: path,
-                category: 'daily',
-                biz: 'new_dyn',
-                cancelToken: cancelToken,
-              );
-              if (!result['status']) throw HttpException(result['msg']);
-              UploadBfsResData data = result['data'];
-              return {
-                'img_width': data.imageWidth,
-                'img_height': data.imageHeight,
-                'img_size': data.imgSize,
-                'img_src': data.imageUrl,
-              };
-            }).toList(),
-            eagerError: true);
+          pathList.map((path) async {
+            Map result = await MsgHttp.uploadBfs(
+              path: path,
+              category: 'daily',
+              biz: 'new_dyn',
+              cancelToken: cancelToken,
+            );
+            if (!result['status']) throw HttpException(result['msg']);
+            UploadBfsResData data = result['data'];
+            return {
+              'img_width': data.imageWidth,
+              'img_height': data.imageHeight,
+              'img_size': data.imgSize,
+              'img_src': data.imageUrl,
+            };
+          }).toList(),
+          eagerError: true,
+        );
         SmartDialog.dismiss();
       } on HttpException catch (e) {
         cancelToken.cancel();
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 5eeec8740..a7201f227 100644
--- a/lib/pages/common/publish/common_rich_text_pub_page.dart
+++ b/lib/pages/common/publish/common_rich_text_pub_page.dart
@@ -40,9 +40,9 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
   @override
   late final RichTextEditingController editController =
       RichTextEditingController(
-    items: widget.items,
-    onMention: onMention,
-  );
+        items: widget.items,
+        onMention: onMention,
+      );
 
   @override
   void initPubState() {
@@ -58,8 +58,9 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
   }
 
   Widget buildImage(int index, double height) {
-    final color =
-        Theme.of(context).colorScheme.secondaryContainer.withValues(alpha: 0.5);
+    final color = Theme.of(
+      context,
+    ).colorScheme.secondaryContainer.withValues(alpha: 0.5);
 
     void onClear() {
       pathList.removeAt(index);
@@ -76,10 +77,12 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
             controller.keepChatPanel();
             await context.imageView(
               imgList: pathList
-                  .map((path) => SourceModel(
-                        url: path,
-                        sourceType: SourceType.fileImage,
-                      ))
+                  .map(
+                    (path) => SourceModel(
+                      url: path,
+                      sourceType: SourceType.fileImage,
+                    ),
+                  )
                   .toList(),
               initialPage: index,
             );
@@ -145,28 +148,31 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
   }
 
   void onPickImage([VoidCallback? callback]) {
-    EasyThrottle.throttle('imagePicker', const Duration(milliseconds: 500),
-        () async {
-      try {
-        List<XFile> pickedFiles = await imagePicker.pickMultiImage(
-          limit: limit,
-          imageQuality: 100,
-        );
-        if (pickedFiles.isNotEmpty) {
-          for (int i = 0; i < pickedFiles.length; i++) {
-            if (pathList.length == limit) {
-              SmartDialog.showToast('最多选择$limit张图片');
-              break;
-            } else {
-              pathList.add(pickedFiles[i].path);
+    EasyThrottle.throttle(
+      'imagePicker',
+      const Duration(milliseconds: 500),
+      () async {
+        try {
+          List<XFile> pickedFiles = await imagePicker.pickMultiImage(
+            limit: limit,
+            imageQuality: 100,
+          );
+          if (pickedFiles.isNotEmpty) {
+            for (int i = 0; i < pickedFiles.length; i++) {
+              if (pathList.length == limit) {
+                SmartDialog.showToast('最多选择$limit张图片');
+                break;
+              } else {
+                pathList.add(pickedFiles[i].path);
+              }
             }
+            callback?.call();
           }
-          callback?.call();
+        } catch (e) {
+          SmartDialog.showToast(e.toString());
         }
-      } catch (e) {
-        SmartDialog.showToast(e.toString());
-      }
-    });
+      },
+    );
   }
 
   void onChooseEmote(dynamic emote, double? width, double? height) {
@@ -294,8 +300,10 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
           delta = RichTextEditingDeltaReplacement(
             oldText: oldValue.text,
             replacementText: text,
-            replacedRange:
-                TextRange(start: selection.start - 1, end: selection.end),
+            replacedRange: TextRange(
+              start: selection.start - 1,
+              end: selection.end,
+            ),
             selection: TextSelection.collapsed(
               offset: selection.start - 1 + text.length,
             ),
@@ -376,49 +384,49 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
   }
 
   Widget get emojiBtn => Obx(
-        () {
-          final isEmoji = panelType.value == PanelType.emoji;
-          return ToolbarIconButton(
-            tooltip: isEmoji ? '输入' : '表情',
-            onPressed: () {
-              if (isEmoji) {
-                updatePanelType(PanelType.keyboard);
-              } else {
-                updatePanelType(PanelType.emoji);
-              }
-            },
-            icon: isEmoji
-                ? const Icon(Icons.keyboard, size: 22)
-                : const Icon(Icons.emoji_emotions, size: 22),
-            selected: isEmoji,
-          );
+    () {
+      final isEmoji = panelType.value == PanelType.emoji;
+      return ToolbarIconButton(
+        tooltip: isEmoji ? '输入' : '表情',
+        onPressed: () {
+          if (isEmoji) {
+            updatePanelType(PanelType.keyboard);
+          } else {
+            updatePanelType(PanelType.emoji);
+          }
         },
+        icon: isEmoji
+            ? const Icon(Icons.keyboard, size: 22)
+            : const Icon(Icons.emoji_emotions, size: 22),
+        selected: isEmoji,
       );
+    },
+  );
 
   Widget get atBtn => ToolbarIconButton(
-        onPressed: () => onMention(true),
-        icon: const Icon(Icons.alternate_email, size: 22),
-        tooltip: '@',
-        selected: false,
-      );
+    onPressed: () => onMention(true),
+    icon: const Icon(Icons.alternate_email, size: 22),
+    tooltip: '@',
+    selected: false,
+  );
 
   Widget get moreBtn => Obx(
-        () {
-          final isMore = panelType.value == PanelType.more;
-          return ToolbarIconButton(
-            tooltip: isMore ? '输入' : '更多',
-            onPressed: () {
-              if (isMore) {
-                updatePanelType(PanelType.keyboard);
-              } else {
-                updatePanelType(PanelType.more);
-              }
-            },
-            icon: isMore
-                ? const Icon(Icons.keyboard, size: 22)
-                : const Icon(Icons.add_circle_outline, size: 22),
-            selected: isMore,
-          );
+    () {
+      final isMore = panelType.value == PanelType.more;
+      return ToolbarIconButton(
+        tooltip: isMore ? '输入' : '更多',
+        onPressed: () {
+          if (isMore) {
+            updatePanelType(PanelType.keyboard);
+          } else {
+            updatePanelType(PanelType.more);
+          }
         },
+        icon: isMore
+            ? const Icon(Icons.keyboard, size: 22)
+            : const Icon(Icons.add_circle_outline, size: 22),
+        selected: isMore,
       );
+    },
+  );
 }
diff --git a/lib/pages/common/publish/common_text_pub_page.dart b/lib/pages/common/publish/common_text_pub_page.dart
index a6f8c772a..12615355c 100644
--- a/lib/pages/common/publish/common_text_pub_page.dart
+++ b/lib/pages/common/publish/common_text_pub_page.dart
@@ -12,8 +12,9 @@ abstract class CommonTextPubPage extends CommonPublishPage<String> {
 abstract class CommonTextPubPageState<T extends CommonTextPubPage>
     extends CommonPublishPageState<T> {
   @override
-  late final TextEditingController editController =
-      TextEditingController(text: widget.initialValue);
+  late final TextEditingController editController = TextEditingController(
+    text: widget.initialValue,
+  );
 
   @override
   void initPubState() {
diff --git a/lib/pages/common/reply_controller.dart b/lib/pages/common/reply_controller.dart
index eaaa6d6dd..c959f13ac 100644
--- a/lib/pages/common/reply_controller.dart
+++ b/lib/pages/common/reply_controller.dart
@@ -129,73 +129,75 @@ abstract class ReplyController<R> extends CommonListController<R, ReplyInfo> {
     dynamic key = oid ?? replyItem!.oid + replyItem.id;
     Navigator.of(context)
         .push(
-      GetDialogRoute(
-        pageBuilder: (buildContext, animation, secondaryAnimation) {
-          return ReplyPage(
-            oid: oid ?? replyItem!.oid.toInt(),
-            root: oid != null ? 0 : replyItem!.id.toInt(),
-            parent: oid != null ? 0 : replyItem!.id.toInt(),
-            replyType: replyItem?.type.toInt() ?? replyType!,
-            replyItem: replyItem,
-            items: savedReplies[key],
-            onSave: (reply) {
-              if (reply.isEmpty) {
-                savedReplies.remove(key);
-              } else {
-                savedReplies[key] = reply.toList();
-              }
+          GetDialogRoute(
+            pageBuilder: (buildContext, animation, secondaryAnimation) {
+              return ReplyPage(
+                oid: oid ?? replyItem!.oid.toInt(),
+                root: oid != null ? 0 : replyItem!.id.toInt(),
+                parent: oid != null ? 0 : replyItem!.id.toInt(),
+                replyType: replyItem?.type.toInt() ?? replyType!,
+                replyItem: replyItem,
+                items: savedReplies[key],
+                onSave: (reply) {
+                  if (reply.isEmpty) {
+                    savedReplies.remove(key);
+                  } else {
+                    savedReplies[key] = reply.toList();
+                  }
+                },
+                hint: hint,
+              );
             },
-            hint: hint,
-          );
-        },
-        transitionDuration: const Duration(milliseconds: 500),
-        transitionBuilder: (context, animation, secondaryAnimation, child) {
-          const begin = Offset(0.0, 1.0);
-          const end = Offset.zero;
-          const curve = Curves.linear;
+            transitionDuration: const Duration(milliseconds: 500),
+            transitionBuilder: (context, animation, secondaryAnimation, child) {
+              const begin = Offset(0.0, 1.0);
+              const end = Offset.zero;
+              const curve = Curves.linear;
 
-          var tween =
-              Tween(begin: begin, end: end).chain(CurveTween(curve: curve));
+              var tween = Tween(
+                begin: begin,
+                end: end,
+              ).chain(CurveTween(curve: curve));
 
-          return SlideTransition(
-            position: animation.drive(tween),
-            child: child,
-          );
-        },
-        settings: RouteSettings(arguments: Get.arguments),
-      ),
-    )
+              return SlideTransition(
+                position: animation.drive(tween),
+                child: child,
+              );
+            },
+            settings: RouteSettings(arguments: Get.arguments),
+          ),
+        )
         .then(
-      (res) {
-        if (res != null) {
-          savedReplies.remove(key);
-          ReplyInfo replyInfo = RequestUtils.replyCast(res);
-          if (loadingState.value.isSuccess) {
-            List<ReplyInfo>? list = loadingState.value.data;
-            if (list == null) {
-              loadingState.value = Success([replyInfo]);
-            } else {
-              if (oid != null) {
-                list.insert(hasUpTop ? 1 : 0, replyInfo);
+          (res) {
+            if (res != null) {
+              savedReplies.remove(key);
+              ReplyInfo replyInfo = RequestUtils.replyCast(res);
+              if (loadingState.value.isSuccess) {
+                List<ReplyInfo>? list = loadingState.value.data;
+                if (list == null) {
+                  loadingState.value = Success([replyInfo]);
+                } else {
+                  if (oid != null) {
+                    list.insert(hasUpTop ? 1 : 0, replyInfo);
+                  } else {
+                    replyItem!
+                      ..count += 1
+                      ..replies.add(replyInfo);
+                  }
+                  loadingState.refresh();
+                }
               } else {
-                replyItem!
-                  ..count += 1
-                  ..replies.add(replyInfo);
+                loadingState.value = Success([replyInfo]);
               }
-              loadingState.refresh();
-            }
-          } else {
-            loadingState.value = Success([replyInfo]);
-          }
-          count.value += 1;
+              count.value += 1;
 
-          // check reply
-          if (enableCommAntifraud) {
-            onCheckReply(replyInfo, isManual: false);
-          }
-        }
-      },
-    );
+              // check reply
+              if (enableCommAntifraud) {
+                onCheckReply(replyInfo, isManual: false);
+              }
+            }
+          },
+        );
   }
 
   void onRemove(int index, ReplyInfo item, int? subIndex) {
diff --git a/lib/pages/danmaku/view.dart b/lib/pages/danmaku/view.dart
index b75dd8bf3..81a70a9b0 100644
--- a/lib/pages/danmaku/view.dart
+++ b/lib/pages/danmaku/view.dart
@@ -100,8 +100,8 @@ class _PlDanmakuState extends State<PlDanmaku> {
     }
     latestAddedPosition = currentPosition;
 
-    List<DanmakuElem>? currentDanmakuList =
-        _plDanmakuController.getCurrentDanmaku(currentPosition);
+    List<DanmakuElem>? currentDanmakuList = _plDanmakuController
+        .getCurrentDanmaku(currentPosition);
     if (currentDanmakuList != null) {
       for (DanmakuElem e in currentDanmakuList) {
         if (e.mode == 7) {
@@ -122,7 +122,8 @@ class _PlDanmakuState extends State<PlDanmaku> {
                   ? Colors.white
                   : DmUtils.decimalToColor(e.color),
               type: DmUtils.getPosition(e.mode),
-              isColorful: playerController.showVipDanmaku &&
+              isColorful:
+                  playerController.showVipDanmaku &&
                       e.colorful == DmColorfulType.VipGradualColor
                   ? true
                   : null,
@@ -147,39 +148,43 @@ class _PlDanmakuState extends State<PlDanmaku> {
 
   double _getFontSize(bool isFullScreen) =>
       !isFullScreen || widget.isPipMode == true
-          ? 15 * playerController.danmakuFontScale
-          : 15 * playerController.danmakuFontScaleFS;
+      ? 15 * playerController.danmakuFontScale
+      : 15 * playerController.danmakuFontScaleFS;
 
   @override
   Widget build(BuildContext context) {
-    return LayoutBuilder(builder: (context, box) {
-      // double initDuration = box.maxWidth / 12;
-      return Obx(
-        () => AnimatedOpacity(
-          opacity: playerController.enableShowDanmaku.value ? 1 : 0,
-          duration: const Duration(milliseconds: 100),
-          child: DanmakuScreen(
-            createdController: (DanmakuController e) {
-              playerController.danmakuController = _controller = e;
-            },
-            option: DanmakuOption(
-              fontSize: _getFontSize(playerController.isFullScreen.value),
-              fontWeight: playerController.fontWeight,
-              area: playerController.showArea,
-              opacity: playerController.danmakuOpacity,
-              hideTop: playerController.blockTypes.contains(5),
-              hideScroll: playerController.blockTypes.contains(2),
-              hideBottom: playerController.blockTypes.contains(4),
-              duration: playerController.danmakuDuration /
-                  playerController.playbackSpeed,
-              staticDuration: playerController.danmakuStaticDuration /
-                  playerController.playbackSpeed,
-              strokeWidth: playerController.strokeWidth,
-              lineHeight: playerController.danmakuLineHeight,
+    return LayoutBuilder(
+      builder: (context, box) {
+        // double initDuration = box.maxWidth / 12;
+        return Obx(
+          () => AnimatedOpacity(
+            opacity: playerController.enableShowDanmaku.value ? 1 : 0,
+            duration: const Duration(milliseconds: 100),
+            child: DanmakuScreen(
+              createdController: (DanmakuController e) {
+                playerController.danmakuController = _controller = e;
+              },
+              option: DanmakuOption(
+                fontSize: _getFontSize(playerController.isFullScreen.value),
+                fontWeight: playerController.fontWeight,
+                area: playerController.showArea,
+                opacity: playerController.danmakuOpacity,
+                hideTop: playerController.blockTypes.contains(5),
+                hideScroll: playerController.blockTypes.contains(2),
+                hideBottom: playerController.blockTypes.contains(4),
+                duration:
+                    playerController.danmakuDuration /
+                    playerController.playbackSpeed,
+                staticDuration:
+                    playerController.danmakuStaticDuration /
+                    playerController.playbackSpeed,
+                strokeWidth: playerController.strokeWidth,
+                lineHeight: playerController.danmakuLineHeight,
+              ),
             ),
           ),
-        ),
-      );
-    });
+        );
+      },
+    );
   }
 }
diff --git a/lib/pages/danmaku_block/controller.dart b/lib/pages/danmaku_block/controller.dart
index ec36ade1f..c481c2913 100644
--- a/lib/pages/danmaku_block/controller.dart
+++ b/lib/pages/danmaku_block/controller.dart
@@ -10,8 +10,10 @@ import 'package:get/get.dart';
 
 class DanmakuBlockController extends GetxController
     with GetSingleTickerProviderStateMixin {
-  late final List<RxList<SimpleRule>> rules =
-      List.generate(DmBlockType.values.length, (_) => <SimpleRule>[].obs);
+  late final List<RxList<SimpleRule>> rules = List.generate(
+    DmBlockType.values.length,
+    (_) => <SimpleRule>[].obs,
+  );
 
   late TabController tabController;
 
@@ -57,14 +59,18 @@ class DanmakuBlockController extends GetxController
     }
   }
 
-  Future<void> danmakuFilterAdd(
-      {required String filter, required int type}) async {
+  Future<void> danmakuFilterAdd({
+    required String filter,
+    required int type,
+  }) async {
     if (type == 2) {
       filter = Crc32Xz().convert(utf8.encode(filter)).toRadixString(16);
     }
     SmartDialog.showLoading(msg: '正在添加弹幕屏蔽规则……');
-    var result =
-        await DanmakuFilterHttp.danmakuFilterAdd(filter: filter, type: type);
+    var result = await DanmakuFilterHttp.danmakuFilterAdd(
+      filter: filter,
+      type: type,
+    );
     SmartDialog.dismiss();
     if (result['status']) {
       SimpleRule rule = result['data'];
diff --git a/lib/pages/danmaku_block/view.dart b/lib/pages/danmaku_block/view.dart
index d688bca5d..d333fc749 100644
--- a/lib/pages/danmaku_block/view.dart
+++ b/lib/pages/danmaku_block/view.dart
@@ -48,18 +48,26 @@ class _DanmakuBlockPageState extends State<DanmakuBlockPage> {
         bottom: TabBar(
           controller: _controller.tabController,
           tabs: DmBlockType.values
-              .map((e) => Obx(() => Tab(
-                  text: '${e.label}(${_controller.rules[e.index].length})')))
+              .map(
+                (e) => Obx(
+                  () => Tab(
+                    text: '${e.label}(${_controller.rules[e.index].length})',
+                  ),
+                ),
+              )
               .toList(),
         ),
       ),
       body: tabBarView(
         controller: _controller.tabController,
         children: DmBlockType.values
-            .map((e) => KeepAliveWrapper(
-                  builder: (context) => Obx(() =>
-                      tabViewBuilder(e.index, _controller.rules[e.index])),
-                ))
+            .map(
+              (e) => KeepAliveWrapper(
+                builder: (context) => Obx(
+                  () => tabViewBuilder(e.index, _controller.rules[e.index]),
+                ),
+              ),
+            )
             .toList(),
       ),
       floatingActionButton: FloatingActionButton(
@@ -76,8 +84,9 @@ class _DanmakuBlockPageState extends State<DanmakuBlockPage> {
     }
     return ListView.builder(
       itemCount: list.length,
-      padding:
-          EdgeInsets.only(bottom: MediaQuery.paddingOf(context).bottom + 80),
+      padding: EdgeInsets.only(
+        bottom: MediaQuery.paddingOf(context).bottom + 80,
+      ),
       itemBuilder: (context, itemIndex) {
         final SimpleRule item = list[itemIndex];
         return ListTile(
@@ -125,9 +134,10 @@ class _DanmakuBlockPageState extends State<DanmakuBlockPage> {
                 initialValue: filter,
                 onChanged: (value) => filter = value,
                 keyboardType: isUid ? TextInputType.number : null,
-                inputFormatters:
-                    isUid ? [FilteringTextInputFormatter.digitsOnly] : null,
-              )
+                inputFormatters: isUid
+                    ? [FilteringTextInputFormatter.digitsOnly]
+                    : null,
+              ),
             ],
           ),
           actions: [
@@ -144,7 +154,9 @@ class _DanmakuBlockPageState extends State<DanmakuBlockPage> {
                 if (filter.isNotEmpty) {
                   Get.back();
                   _controller.danmakuFilterAdd(
-                      filter: filter, type: type.index);
+                    filter: filter,
+                    type: type.index,
+                  );
                 } else {
                   SmartDialog.showToast('输入内容不能为空');
                 }
diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart
index 2634c306f..ee13df055 100644
--- a/lib/pages/dynamics/controller.dart
+++ b/lib/pages/dynamics/controller.dart
@@ -40,7 +40,8 @@ class DynamicsController extends GetxController
   DynamicsTabController? get controller {
     try {
       return Get.find<DynamicsTabController>(
-          tag: DynamicsTabType.values[tabController.index].name);
+        tag: DynamicsTabType.values[tabController.index].name,
+      );
     } catch (_) {
       return null;
     }
@@ -196,7 +197,10 @@ class DynamicsController extends GetxController
           scrollController.animToTop();
         }
         EasyThrottle.throttle(
-            'topOrRefresh', const Duration(milliseconds: 500), onRefresh);
+          'topOrRefresh',
+          const Duration(milliseconds: 500),
+          onRefresh,
+        );
       } else {
         animateToTop();
       }
diff --git a/lib/pages/dynamics/view.dart b/lib/pages/dynamics/view.dart
index 27b9e1baf..e87e57c11 100644
--- a/lib/pages/dynamics/view.dart
+++ b/lib/pages/dynamics/view.dart
@@ -26,32 +26,31 @@ class _DynamicsPageState extends State<DynamicsPage>
   bool get wantKeepAlive => true;
 
   Widget _createDynamicBtn(ThemeData theme, [bool isRight = true]) => Center(
-        child: Container(
-          width: 34,
-          height: 34,
-          margin:
-              EdgeInsets.only(left: !isRight ? 16 : 0, right: isRight ? 16 : 0),
-          child: IconButton(
-            tooltip: '发布动态',
-            style: ButtonStyle(
-              padding: WidgetStateProperty.all(EdgeInsets.zero),
-              backgroundColor: WidgetStateProperty.resolveWith((states) {
-                return theme.colorScheme.secondaryContainer;
-              }),
-            ),
-            onPressed: () {
-              if (_dynamicsController.accountService.isLogin.value) {
-                CreateDynPanel.onCreateDyn(context);
-              }
-            },
-            icon: Icon(
-              Icons.add,
-              size: 18,
-              color: theme.colorScheme.onSecondaryContainer,
-            ),
-          ),
+    child: Container(
+      width: 34,
+      height: 34,
+      margin: EdgeInsets.only(left: !isRight ? 16 : 0, right: isRight ? 16 : 0),
+      child: IconButton(
+        tooltip: '发布动态',
+        style: ButtonStyle(
+          padding: WidgetStateProperty.all(EdgeInsets.zero),
+          backgroundColor: WidgetStateProperty.resolveWith((states) {
+            return theme.colorScheme.secondaryContainer;
+          }),
         ),
-      );
+        onPressed: () {
+          if (_dynamicsController.accountService.isLogin.value) {
+            CreateDynPanel.onCreateDyn(context);
+          }
+        },
+        icon: Icon(
+          Icons.add,
+          size: 18,
+          color: theme.colorScheme.onSecondaryContainer,
+        ),
+      ),
+    ),
+  );
 
   @override
   void initState() {
@@ -132,9 +131,10 @@ class _DynamicsPageState extends State<DynamicsPage>
             unselectedLabelColor: theme.colorScheme.onSurface,
             labelStyle:
                 TabBarTheme.of(context).labelStyle?.copyWith(fontSize: 13) ??
-                    const TextStyle(fontSize: 13),
-            tabs:
-                DynamicsTabType.values.map((e) => Tab(text: e.label)).toList(),
+                const TextStyle(fontSize: 13),
+            tabs: DynamicsTabType.values
+                .map((e) => Tab(text: e.label))
+                .toList(),
             onTap: (index) {
               if (!_dynamicsController.tabController.indexIsChanging) {
                 _dynamicsController.animateToTop();
diff --git a/lib/pages/dynamics/widgets/action_panel.dart b/lib/pages/dynamics/widgets/action_panel.dart
index c23501ba5..9c8ebb0e1 100644
--- a/lib/pages/dynamics/widgets/action_panel.dart
+++ b/lib/pages/dynamics/widgets/action_panel.dart
@@ -98,7 +98,8 @@ class _ActionPanelState extends State<ActionPanel> {
             label: Text(
               widget.item.modules.moduleStat!.forward!.count != null
                   ? NumUtil.numFormat(
-                      widget.item.modules.moduleStat!.forward!.count)
+                      widget.item.modules.moduleStat!.forward!.count,
+                    )
                   : '转发',
             ),
           ),
@@ -121,7 +122,8 @@ class _ActionPanelState extends State<ActionPanel> {
             label: Text(
               widget.item.modules.moduleStat!.comment!.count != null
                   ? NumUtil.numFormat(
-                      widget.item.modules.moduleStat!.comment!.count)
+                      widget.item.modules.moduleStat!.comment!.count,
+                    )
                   : '评论',
             ),
           ),
@@ -138,8 +140,9 @@ class _ActionPanelState extends State<ActionPanel> {
               color: widget.item.modules.moduleStat!.like!.status!
                   ? primary
                   : color,
-              semanticLabel:
-                  widget.item.modules.moduleStat!.like!.status! ? "已赞" : "点赞",
+              semanticLabel: widget.item.modules.moduleStat!.like!.status!
+                  ? "已赞"
+                  : "点赞",
             ),
             style: TextButton.styleFrom(
               padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
@@ -153,11 +156,13 @@ class _ActionPanelState extends State<ActionPanel> {
               child: Text(
                 widget.item.modules.moduleStat!.like!.count != null
                     ? NumUtil.numFormat(
-                        widget.item.modules.moduleStat!.like!.count)
+                        widget.item.modules.moduleStat!.like!.count,
+                      )
                     : '点赞',
                 key: ValueKey<String>(
-                    widget.item.modules.moduleStat!.like!.count?.toString() ??
-                        '点赞'),
+                  widget.item.modules.moduleStat!.like!.count?.toString() ??
+                      '点赞',
+                ),
                 style: TextStyle(
                   color: widget.item.modules.moduleStat!.like!.status!
                       ? primary
@@ -166,7 +171,7 @@ class _ActionPanelState extends State<ActionPanel> {
               ),
             ),
           ),
-        )
+        ),
       ],
     );
   }
diff --git a/lib/pages/dynamics/widgets/additional_panel.dart b/lib/pages/dynamics/widgets/additional_panel.dart
index ea83fa3c1..9de889026 100644
--- a/lib/pages/dynamics/widgets/additional_panel.dart
+++ b/lib/pages/dynamics/widgets/additional_panel.dart
@@ -12,8 +12,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 
-Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
-    {floor = 1}) {
+Widget addWidget(
+  ThemeData theme,
+  DynamicItemModel item,
+  BuildContext context, {
+  floor = 1,
+}) {
   final type = item.modules.moduleDynamic?.additional?.type;
   late final Color bgColor = floor == 1
       ? theme.dividerColor.withValues(alpha: 0.08)
@@ -35,8 +39,10 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                   ? null
                   : () => PiliScheme.routePushFromUrl(ugc.jumpUrl!),
               child: Padding(
-                padding:
-                    const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 12,
+                  vertical: 8,
+                ),
                 child: Row(
                   children: [
                     NetworkImgLayer(
@@ -61,7 +67,7 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                               color: theme.colorScheme.outline,
                               fontSize: theme.textTheme.labelMedium!.fontSize,
                             ),
-                          )
+                          ),
                         ],
                       ),
                     ),
@@ -77,163 +83,182 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
         late final borderRadius = floor == 1 ? null : StyleString.mdRadius;
         return reserve.state != -1
             ? reserve.title != null
-                ? Padding(
-                    padding: const EdgeInsets.only(top: 6),
-                    child: Material(
-                      color: bgColor,
-                      borderRadius: borderRadius,
-                      child: InkWell(
-                        onTap: () {},
+                  ? Padding(
+                      padding: const EdgeInsets.only(top: 6),
+                      child: Material(
+                        color: bgColor,
                         borderRadius: borderRadius,
-                        child: Padding(
-                          padding: const EdgeInsets.symmetric(
-                              horizontal: 12, vertical: 10),
-                          child: Row(
-                            children: [
-                              Expanded(
-                                child: Column(
-                                  crossAxisAlignment: CrossAxisAlignment.start,
-                                  children: [
-                                    Text(
-                                      reserve.title!,
-                                      maxLines: 1,
-                                      overflow: TextOverflow.ellipsis,
-                                    ),
-                                    const SizedBox(height: 1),
-                                    Text.rich(
-                                      TextSpan(
-                                        style: TextStyle(
-                                          color: theme.colorScheme.outline,
-                                          fontSize: 13,
-                                        ),
-                                        children: [
-                                          if (reserve.desc1?.text?.isNotEmpty ==
-                                              true)
-                                            TextSpan(text: reserve.desc1!.text),
-                                          if (reserve.desc2?.text?.isNotEmpty ==
-                                              true)
-                                            TextSpan(
+                        child: InkWell(
+                          onTap: () {},
+                          borderRadius: borderRadius,
+                          child: Padding(
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: 12,
+                              vertical: 10,
+                            ),
+                            child: Row(
+                              children: [
+                                Expanded(
+                                  child: Column(
+                                    crossAxisAlignment:
+                                        CrossAxisAlignment.start,
+                                    children: [
+                                      Text(
+                                        reserve.title!,
+                                        maxLines: 1,
+                                        overflow: TextOverflow.ellipsis,
+                                      ),
+                                      const SizedBox(height: 1),
+                                      Text.rich(
+                                        TextSpan(
+                                          style: TextStyle(
+                                            color: theme.colorScheme.outline,
+                                            fontSize: 13,
+                                          ),
+                                          children: [
+                                            if (reserve
+                                                    .desc1
+                                                    ?.text
+                                                    ?.isNotEmpty ==
+                                                true)
+                                              TextSpan(
+                                                text: reserve.desc1!.text,
+                                              ),
+                                            if (reserve
+                                                    .desc2
+                                                    ?.text
+                                                    ?.isNotEmpty ==
+                                                true)
+                                              TextSpan(
                                                 text:
-                                                    '    ${reserve.desc2!.text}'),
-                                          if (reserve.desc3?.text?.isNotEmpty ==
-                                              true) ...[
-                                            const TextSpan(text: '\n'),
-                                            WidgetSpan(
-                                              alignment:
-                                                  PlaceholderAlignment.middle,
-                                              child: Icon(
-                                                size: 17,
-                                                Icons.card_giftcard,
-                                                color:
-                                                    theme.colorScheme.primary,
+                                                    '    ${reserve.desc2!.text}',
                                               ),
-                                            ),
-                                            TextSpan(
-                                              text: ' ${reserve.desc3!.text}',
-                                              style: TextStyle(
-                                                color:
-                                                    theme.colorScheme.primary,
+                                            if (reserve
+                                                    .desc3
+                                                    ?.text
+                                                    ?.isNotEmpty ==
+                                                true) ...[
+                                              const TextSpan(text: '\n'),
+                                              WidgetSpan(
+                                                alignment:
+                                                    PlaceholderAlignment.middle,
+                                                child: Icon(
+                                                  size: 17,
+                                                  Icons.card_giftcard,
+                                                  color:
+                                                      theme.colorScheme.primary,
+                                                ),
                                               ),
-                                              recognizer:
-                                                  reserve.desc3!.jumpUrl == null
-                                                      ? null
-                                                      : (TapGestureRecognizer()
+                                              TextSpan(
+                                                text: ' ${reserve.desc3!.text}',
+                                                style: TextStyle(
+                                                  color:
+                                                      theme.colorScheme.primary,
+                                                ),
+                                                recognizer:
+                                                    reserve.desc3!.jumpUrl ==
+                                                        null
+                                                    ? null
+                                                    : (TapGestureRecognizer()
                                                         ..onTap = () {
                                                           Get.toNamed(
                                                             '/webview',
                                                             parameters: {
                                                               'url': reserve
                                                                   .desc3!
-                                                                  .jumpUrl!
+                                                                  .jumpUrl!,
                                                             },
                                                           );
                                                         }),
-                                            ),
+                                              ),
+                                            ],
                                           ],
-                                        ],
+                                        ),
                                       ),
-                                    )
-                                  ],
+                                    ],
+                                  ),
                                 ),
-                              ),
-                              if (reserve.button != null) ...[
-                                const SizedBox(width: 10),
-                                Builder(
-                                  builder: (context) {
-                                    final btn = reserve.button!;
-                                    final isReserved = btn.status == btn.type;
-                                    final bool canJump = btn.jumpUrl != null;
-                                    return FilledButton.tonal(
-                                      style: FilledButton.styleFrom(
-                                        foregroundColor: canJump
-                                            ? null
-                                            : isReserved
-                                                ? theme.colorScheme.onSurface
-                                                    .withValues(alpha: 0.38)
-                                                : null,
-                                        backgroundColor: canJump
-                                            ? null
-                                            : isReserved
-                                                ? theme.colorScheme.onSurface
-                                                    .withValues(alpha: 0.12)
-                                                : null,
-                                        visualDensity: VisualDensity.compact,
-                                        padding: const EdgeInsets.symmetric(
-                                            horizontal: 16),
-                                        tapTargetSize:
-                                            MaterialTapTargetSize.shrinkWrap,
-                                      ),
-                                      onPressed: canJump
-                                          ? () => PiliScheme.routePushFromUrl(
-                                              btn.jumpUrl!)
-                                          : btn.disable == 1
+                                if (reserve.button != null) ...[
+                                  const SizedBox(width: 10),
+                                  Builder(
+                                    builder: (context) {
+                                      final btn = reserve.button!;
+                                      final isReserved = btn.status == btn.type;
+                                      final bool canJump = btn.jumpUrl != null;
+                                      return FilledButton.tonal(
+                                        style: FilledButton.styleFrom(
+                                          foregroundColor: canJump
                                               ? null
-                                              : () async {
-                                                  var res = await DynamicsHttp
-                                                      .dynReserve(
-                                                    reserveId: reserve.rid,
-                                                    curBtnStatus: btn.status,
-                                                    dynamicIdStr: item.idStr,
-                                                    reserveTotal:
-                                                        reserve.reserveTotal,
-                                                  );
-                                                  if (res['status']) {
-                                                    DynReserveData data =
-                                                        res['data'];
-                                                    reserve
-                                                      ..desc2?.text =
-                                                          data.descUpdate
-                                                      ..reserveTotal =
-                                                          data.reserveUpdate
-                                                      ..button!.status =
-                                                          data.finalBtnStatus;
-                                                    if (context.mounted) {
-                                                      (context as Element?)
-                                                          ?.markNeedsBuild();
-                                                    }
-                                                  } else {
-                                                    SmartDialog.showToast(
-                                                        res['msg']);
+                                              : isReserved
+                                              ? theme.colorScheme.onSurface
+                                                    .withValues(alpha: 0.38)
+                                              : null,
+                                          backgroundColor: canJump
+                                              ? null
+                                              : isReserved
+                                              ? theme.colorScheme.onSurface
+                                                    .withValues(alpha: 0.12)
+                                              : null,
+                                          visualDensity: VisualDensity.compact,
+                                          padding: const EdgeInsets.symmetric(
+                                            horizontal: 16,
+                                          ),
+                                          tapTargetSize:
+                                              MaterialTapTargetSize.shrinkWrap,
+                                        ),
+                                        onPressed: canJump
+                                            ? () => PiliScheme.routePushFromUrl(
+                                                btn.jumpUrl!,
+                                              )
+                                            : btn.disable == 1
+                                            ? null
+                                            : () async {
+                                                var res =
+                                                    await DynamicsHttp.dynReserve(
+                                                      reserveId: reserve.rid,
+                                                      curBtnStatus: btn.status,
+                                                      dynamicIdStr: item.idStr,
+                                                      reserveTotal:
+                                                          reserve.reserveTotal,
+                                                    );
+                                                if (res['status']) {
+                                                  DynReserveData data =
+                                                      res['data'];
+                                                  reserve
+                                                    ..desc2?.text =
+                                                        data.descUpdate
+                                                    ..reserveTotal =
+                                                        data.reserveUpdate
+                                                    ..button!.status =
+                                                        data.finalBtnStatus;
+                                                  if (context.mounted) {
+                                                    (context as Element?)
+                                                        ?.markNeedsBuild();
                                                   }
-                                                },
-                                      child: Text(
-                                        btn.jumpText != null
-                                            ? btn.jumpText!
-                                            : isReserved
-                                                ? btn.checkText!
-                                                : btn.uncheckText!,
-                                      ),
-                                    );
-                                  },
-                                ),
+                                                } else {
+                                                  SmartDialog.showToast(
+                                                    res['msg'],
+                                                  );
+                                                }
+                                              },
+                                        child: Text(
+                                          btn.jumpText != null
+                                              ? btn.jumpText!
+                                              : isReserved
+                                              ? btn.checkText!
+                                              : btn.uncheckText!,
+                                        ),
+                                      );
+                                    },
+                                  ),
+                                ],
                               ],
-                            ],
+                            ),
                           ),
                         ),
                       ),
-                    ),
-                  )
-                : const SizedBox.shrink()
+                    )
+                  : const SizedBox.shrink()
             : const SizedBox.shrink();
       case 'ADDITIONAL_TYPE_UPOWER_LOTTERY':
         final content = item.modules.moduleDynamic!.additional!.upowerLottery!;
@@ -249,8 +274,10 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                   ? null
                   : () => PiliScheme.routePushFromUrl(content.jumpUrl!),
               child: Padding(
-                padding:
-                    const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 12,
+                  vertical: 8,
+                ),
                 child: Row(
                   children: [
                     Expanded(
@@ -290,14 +317,14 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                                     recognizer: content.desc!.jumpUrl == null
                                         ? null
                                         : (TapGestureRecognizer()
-                                          ..onTap = () {
-                                            Get.toNamed(
-                                              '/webview',
-                                              parameters: {
-                                                'url': content.desc!.jumpUrl!
-                                              },
-                                            );
-                                          }),
+                                            ..onTap = () {
+                                              Get.toNamed(
+                                                '/webview',
+                                                parameters: {
+                                                  'url': content.desc!.jumpUrl!,
+                                                },
+                                              );
+                                            }),
                                   ),
                                 ],
                               ),
@@ -311,20 +338,24 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                         onPressed: content.button!.jumpUrl == null
                             ? null
                             : () => PiliScheme.routePushFromUrl(
-                                  content.button!.jumpUrl!,
-                                ),
+                                content.button!.jumpUrl!,
+                              ),
                         style: FilledButton.styleFrom(
                           shape: const RoundedRectangleBorder(
                             borderRadius: BorderRadius.all(Radius.circular(6)),
                           ),
                           padding: const EdgeInsets.symmetric(horizontal: 10),
-                          visualDensity:
-                              const VisualDensity(horizontal: -2, vertical: -3),
+                          visualDensity: const VisualDensity(
+                            horizontal: -2,
+                            vertical: -3,
+                          ),
                           tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                         ),
-                        child: Text(content.button!.jumpStyle?.text ??
-                            content.button!.check?.text ??
-                            ''),
+                        child: Text(
+                          content.button!.jumpStyle?.text ??
+                              content.button!.check?.text ??
+                              '',
+                        ),
                       ),
                     ],
                   ],
@@ -351,7 +382,9 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                     onTap: () => PiliScheme.routePushFromUrl(e.jumpUrl!),
                     child: Padding(
                       padding: const EdgeInsets.symmetric(
-                          horizontal: 12, vertical: 8),
+                        horizontal: 12,
+                        vertical: 8,
+                      ),
                       child: Row(
                         children: [
                           if (e.cover?.isNotEmpty == true) ...[
@@ -399,13 +432,17 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                                   PiliScheme.routePushFromUrl(e.jumpUrl!),
                               style: FilledButton.styleFrom(
                                 shape: const RoundedRectangleBorder(
-                                  borderRadius:
-                                      BorderRadius.all(Radius.circular(6)),
+                                  borderRadius: BorderRadius.all(
+                                    Radius.circular(6),
+                                  ),
+                                ),
+                                padding: const EdgeInsets.symmetric(
+                                  horizontal: 10,
                                 ),
-                                padding:
-                                    const EdgeInsets.symmetric(horizontal: 10),
                                 visualDensity: const VisualDensity(
-                                    horizontal: -2, vertical: -3),
+                                  horizontal: -2,
+                                  vertical: -3,
+                                ),
                                 tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                               ),
                               child: Text(e.jumpDesc!),
@@ -437,12 +474,14 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                 item.idStr is int
                     ? item.idStr
                     : item.idStr is String
-                        ? int.parse(item.idStr)
-                        : null,
+                    ? int.parse(item.idStr)
+                    : null,
               ),
               child: Padding(
-                padding:
-                    const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 12,
+                  vertical: 8,
+                ),
                 child: Row(
                   children: [
                     Container(
@@ -450,8 +489,9 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                         color: floor == 1
                             ? theme.colorScheme.surface
                             : theme.dividerColor.withValues(alpha: 0.08),
-                        borderRadius:
-                            const BorderRadius.all(Radius.circular(8)),
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(8),
+                        ),
                       ),
                       width: 70,
                       height: 50,
@@ -475,7 +515,9 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                             maxLines: 1,
                             overflow: TextOverflow.ellipsis,
                             style: TextStyle(
-                                fontSize: 13, color: theme.colorScheme.outline),
+                              fontSize: 13,
+                              color: theme.colorScheme.outline,
+                            ),
                           ),
                         ],
                       ),
@@ -488,16 +530,18 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                         item.idStr is int
                             ? item.idStr
                             : item.idStr is String
-                                ? int.parse(item.idStr)
-                                : null,
+                            ? int.parse(item.idStr)
+                            : null,
                       ),
                       style: FilledButton.styleFrom(
                         shape: const RoundedRectangleBorder(
                           borderRadius: BorderRadius.all(Radius.circular(6)),
                         ),
                         padding: const EdgeInsets.symmetric(horizontal: 10),
-                        visualDensity:
-                            const VisualDensity(horizontal: -2, vertical: -3),
+                        visualDensity: const VisualDensity(
+                          horizontal: -2,
+                          vertical: -3,
+                        ),
                         tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                       ),
                       child: const Text('参与'),
@@ -522,8 +566,10 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                   ? null
                   : () => PiliScheme.routePushFromUrl(content.jumpUrl!),
               child: Padding(
-                padding:
-                    const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 12,
+                  vertical: 8,
+                ),
                 child: Row(
                   children: [
                     if (content.cover?.isNotEmpty == true) ...[
@@ -573,8 +619,10 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                             borderRadius: BorderRadius.all(Radius.circular(6)),
                           ),
                           padding: const EdgeInsets.symmetric(horizontal: 10),
-                          visualDensity:
-                              const VisualDensity(horizontal: -2, vertical: -3),
+                          visualDensity: const VisualDensity(
+                            horizontal: -2,
+                            vertical: -3,
+                          ),
                           tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                         ),
                         child: Text(content.button!.jumpStyle?.text ?? ''),
@@ -600,8 +648,10 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                   ? null
                   : () => PiliScheme.routePushFromUrl(content.jumpUrl!),
               child: Padding(
-                padding:
-                    const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 12,
+                  vertical: 8,
+                ),
                 child: Row(
                   children: [
                     Column(
@@ -636,7 +686,7 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                           Text(
                             content.matchInfo!.leftTeam!.name!,
                             style: const TextStyle(fontSize: 13),
-                          )
+                          ),
                         ],
                       ),
                       const SizedBox(width: 16),
@@ -679,7 +729,7 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                           Text(
                             content.matchInfo!.rightTeam!.name!,
                             style: const TextStyle(fontSize: 13),
-                          )
+                          ),
                         ],
                       ),
                     ],
@@ -694,8 +744,10 @@ Widget addWidget(ThemeData theme, DynamicItemModel item, BuildContext context,
                             borderRadius: BorderRadius.all(Radius.circular(6)),
                           ),
                           padding: const EdgeInsets.symmetric(horizontal: 10),
-                          visualDensity:
-                              const VisualDensity(horizontal: -2, vertical: -3),
+                          visualDensity: const VisualDensity(
+                            horizontal: -2,
+                            vertical: -3,
+                          ),
                           tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                         ),
                         child: Text(content.button!.jumpStyle?.text ?? ''),
diff --git a/lib/pages/dynamics/widgets/author_panel.dart b/lib/pages/dynamics/widgets/author_panel.dart
index f05954791..07097688c 100644
--- a/lib/pages/dynamics/widgets/author_panel.dart
+++ b/lib/pages/dynamics/widgets/author_panel.dart
@@ -61,9 +61,11 @@ class AuthorPanel extends StatelessWidget {
     final theme = Theme.of(context);
     final pubTime = item.modules.moduleAuthor?.pubTs != null
         ? isSave
-            ? DateUtil.format(item.modules.moduleAuthor!.pubTs,
-                format: DateUtil.longFormatDs)
-            : DateUtil.dateFormat(item.modules.moduleAuthor!.pubTs)
+              ? DateUtil.format(
+                  item.modules.moduleAuthor!.pubTs,
+                  format: DateUtil.longFormatDs,
+                )
+              : DateUtil.dateFormat(item.modules.moduleAuthor!.pubTs)
         : item.modules.moduleAuthor?.pubTime;
     return Stack(
       clipBehavior: Clip.none,
@@ -77,7 +79,8 @@ class AuthorPanel extends StatelessWidget {
                 ? () {
                     feedBack();
                     Get.toNamed(
-                        '/member?mid=${item.modules.moduleAuthor!.mid}');
+                      '/member?mid=${item.modules.moduleAuthor!.mid}',
+                    );
                   }
                 : null,
             child: Row(
@@ -91,7 +94,8 @@ class AuthorPanel extends StatelessWidget {
                     Text(
                       item.modules.moduleAuthor?.name ?? '',
                       style: TextStyle(
-                        color: item.modules.moduleAuthor!.vip != null &&
+                        color:
+                            item.modules.moduleAuthor!.vip != null &&
                                 item.modules.moduleAuthor!.vip!.status > 0 &&
                                 item.modules.moduleAuthor!.vip!.type == 2
                             ? context.vipColor
@@ -121,10 +125,13 @@ class AuthorPanel extends StatelessWidget {
                   children: [
                     Container(
                       padding: const EdgeInsets.symmetric(
-                          horizontal: 4, vertical: 2),
+                        horizontal: 4,
+                        vertical: 2,
+                      ),
                       decoration: BoxDecoration(
-                        borderRadius:
-                            const BorderRadius.all(Radius.circular(4)),
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(4),
+                        ),
                         border: Border.all(
                           width: 1.25,
                           color: theme.colorScheme.primary,
@@ -148,51 +155,69 @@ class AuthorPanel extends StatelessWidget {
                   ],
                 )
               : item.modules.moduleAuthor!.decorate != null
-                  ? Row(
-                      mainAxisSize: MainAxisSize.min,
+              ? Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Stack(
+                      clipBehavior: Clip.none,
+                      alignment: Alignment.centerRight,
                       children: [
-                        Stack(
-                          clipBehavior: Clip.none,
-                          alignment: Alignment.centerRight,
-                          children: [
-                            CachedNetworkImage(
-                              height: 32,
-                              imageUrl: item.modules.moduleAuthor!.decorate!
-                                  .cardUrl.http2https,
-                            ),
-                            if (item.modules.moduleAuthor?.decorate?.fan?.numStr
-                                    ?.isNotEmpty ==
-                                true)
-                              Padding(
-                                padding: const EdgeInsets.only(right: 32),
-                                child: Text(
-                                  '${item.modules.moduleAuthor!.decorate!.fan!.numStr}',
-                                  style: TextStyle(
-                                    height: 1,
-                                    fontSize: 11,
-                                    fontFamily: 'digital_id_num',
-                                    color: item.modules.moduleAuthor!.decorate!
-                                                .fan?.color
-                                                ?.startsWith('#') ==
-                                            true
-                                        ? Color(
-                                            int.parse(
-                                              item.modules.moduleAuthor!
-                                                  .decorate!.fan!.color!
-                                                  .replaceFirst('#', '0xFF'),
-                                            ),
-                                          )
-                                        : null,
-                                  ),
-                                ),
-                              ),
-                          ],
+                        CachedNetworkImage(
+                          height: 32,
+                          imageUrl: item
+                              .modules
+                              .moduleAuthor!
+                              .decorate!
+                              .cardUrl
+                              .http2https,
                         ),
-                        _moreWidget(context),
+                        if (item
+                                .modules
+                                .moduleAuthor
+                                ?.decorate
+                                ?.fan
+                                ?.numStr
+                                ?.isNotEmpty ==
+                            true)
+                          Padding(
+                            padding: const EdgeInsets.only(right: 32),
+                            child: Text(
+                              '${item.modules.moduleAuthor!.decorate!.fan!.numStr}',
+                              style: TextStyle(
+                                height: 1,
+                                fontSize: 11,
+                                fontFamily: 'digital_id_num',
+                                color:
+                                    item
+                                            .modules
+                                            .moduleAuthor!
+                                            .decorate!
+                                            .fan
+                                            ?.color
+                                            ?.startsWith('#') ==
+                                        true
+                                    ? Color(
+                                        int.parse(
+                                          item
+                                              .modules
+                                              .moduleAuthor!
+                                              .decorate!
+                                              .fan!
+                                              .color!
+                                              .replaceFirst('#', '0xFF'),
+                                        ),
+                                      )
+                                    : null,
+                              ),
+                            ),
+                          ),
                       ],
-                    )
-                  : _moreWidget(context),
-        )
+                    ),
+                    _moreWidget(context),
+                  ],
+                )
+              : _moreWidget(context),
+        ),
       ],
     );
   }
@@ -216,14 +241,16 @@ class AuthorPanel extends StatelessWidget {
     String? bvid;
     try {
       String? getBvid(String? type, DynamicMajorModel? major) => switch (type) {
-            'DYNAMIC_TYPE_AV' => major?.archive?.bvid,
-            'DYNAMIC_TYPE_UGC_SEASON' => major?.ugcSeason?.bvid,
-            _ => null,
-          };
+        'DYNAMIC_TYPE_AV' => major?.archive?.bvid,
+        'DYNAMIC_TYPE_UGC_SEASON' => major?.ugcSeason?.bvid,
+        _ => null,
+      };
       bvid = getBvid(item.type, item.modules.moduleDynamic?.major);
       if (bvid == null && item.orig != null) {
-        bvid =
-            getBvid(item.orig!.type, item.orig?.modules.moduleDynamic?.major);
+        bvid = getBvid(
+          item.orig!.type,
+          item.orig?.modules.moduleDynamic?.major,
+        );
       }
     } catch (_) {}
 
@@ -237,8 +264,9 @@ class AuthorPanel extends StatelessWidget {
       builder: (context1) {
         final theme = Theme.of(context);
         return Padding(
-          padding:
-              EdgeInsets.only(bottom: MediaQuery.paddingOf(context1).bottom),
+          padding: EdgeInsets.only(
+            bottom: MediaQuery.paddingOf(context1).bottom,
+          ),
           child: Column(
             mainAxisSize: MainAxisSize.min,
             children: [
@@ -253,9 +281,11 @@ class AuthorPanel extends StatelessWidget {
                       width: 32,
                       height: 3,
                       decoration: BoxDecoration(
-                          color: theme.colorScheme.outline,
-                          borderRadius:
-                              const BorderRadius.all(Radius.circular(3))),
+                        color: theme.colorScheme.outline,
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(3),
+                        ),
+                      ),
                     ),
                   ),
                 ),
@@ -296,7 +326,8 @@ class AuthorPanel extends StatelessWidget {
                 onTap: () {
                   Get.back();
                   Utils.shareText(
-                      '${HttpString.dynamicShareBaseUrl}/${item.idStr}');
+                    '${HttpString.dynamicShareBaseUrl}/${item.idStr}',
+                  );
                 },
                 minLeadingWidth: 0,
               ),
@@ -320,15 +351,27 @@ class AuthorPanel extends StatelessWidget {
                         title = item.modules.moduleDynamic!.desc!.text!;
                       } else if (item.modules.moduleDynamic?.major != null) {
                         title = item
-                            .modules.moduleDynamic!.major!.opus!.summary!.text!;
+                            .modules
+                            .moduleDynamic!
+                            .major!
+                            .opus!
+                            .summary!
+                            .text!;
                       } else {
                         throw UnsupportedError(
-                            'error getting title: {"type": ${item.basic!.commentType}, "id": $id}');
+                          'error getting title: {"type": ${item.basic!.commentType}, "id": $id}',
+                        );
                       }
                       String? thumb = isDyn
                           ? item.modules.moduleAuthor?.face
-                          : item.modules.moduleDynamic?.major?.opus?.pics
-                              ?.firstOrNull?.url;
+                          : item
+                                .modules
+                                .moduleDynamic
+                                ?.major
+                                ?.opus
+                                ?.pics
+                                ?.firstOrNull
+                                ?.url;
                       PageUtils.pmShare(
                         context,
                         content: {
@@ -338,7 +381,8 @@ class AuthorPanel extends StatelessWidget {
                           "source": source,
                           if (thumb?.isNotEmpty == true) "thumb": thumb,
                           "author": item.modules.moduleAuthor!.name,
-                          "author_id": item.modules.moduleAuthor!.mid.toString()
+                          "author_id": item.modules.moduleAuthor!.mid
+                              .toString(),
                         },
                       );
                     } catch (e) {
@@ -357,11 +401,12 @@ class AuthorPanel extends StatelessWidget {
                   Get.back();
                   onBlock?.call();
                   try {
-                    Get.find<DynamicsController>()
-                        .tempBannedList
-                        .add(item.modules.moduleAuthor!.mid!);
+                    Get.find<DynamicsController>().tempBannedList.add(
+                      item.modules.moduleAuthor!.mid!,
+                    );
                     SmartDialog.showToast(
-                        '已临时屏蔽${item.modules.moduleAuthor?.name}(${item.modules.moduleAuthor!.mid!})，重启恢复');
+                      '已临时屏蔽${item.modules.moduleAuthor?.name}(${item.modules.moduleAuthor!.mid!})，重启恢复',
+                    );
                   } catch (_) {}
                 },
                 minLeadingWidth: 0,
@@ -371,7 +416,9 @@ class AuthorPanel extends StatelessWidget {
                   onTap: () {
                     Get.back();
                     RequestUtils.checkCreatedDyn(
-                        id: item.idStr, isManual: true);
+                      id: item.idStr,
+                      isManual: true,
+                    );
                   },
                   minLeadingWidth: 0,
                   leading: const Stack(
@@ -389,13 +436,16 @@ class AuthorPanel extends StatelessWidget {
                     onTap: () {
                       Get.back();
                       onSetTop!(
-                          item.modules.moduleTag?.text != null, item.idStr);
+                        item.modules.moduleTag?.text != null,
+                        item.idStr,
+                      );
                     },
                     minLeadingWidth: 0,
                     leading: const Icon(Icons.vertical_align_top, size: 19),
                     title: Text(
-                        '${item.modules.moduleTag?.text != null ? '取消' : ''}置顶',
-                        style: theme.textTheme.titleSmall!),
+                      '${item.modules.moduleTag?.text != null ? '取消' : ''}置顶',
+                      style: theme.textTheme.titleSmall!,
+                    ),
                   ),
                 if (onRemove != null)
                   ListTile(
@@ -427,11 +477,17 @@ class AuthorPanel extends StatelessWidget {
                       );
                     },
                     minLeadingWidth: 0,
-                    leading: Icon(Icons.delete_outline,
-                        color: theme.colorScheme.error, size: 19),
-                    title: Text('删除',
-                        style: theme.textTheme.titleSmall!
-                            .copyWith(color: theme.colorScheme.error)),
+                    leading: Icon(
+                      Icons.delete_outline,
+                      color: theme.colorScheme.error,
+                      size: 19,
+                    ),
+                    title: Text(
+                      '删除',
+                      style: theme.textTheme.titleSmall!.copyWith(
+                        color: theme.colorScheme.error,
+                      ),
+                    ),
                   ),
               ],
               if (Accounts.main.isLogin)
diff --git a/lib/pages/dynamics/widgets/content_panel.dart b/lib/pages/dynamics/widgets/content_panel.dart
index 259b2a968..14e90dce3 100644
--- a/lib/pages/dynamics/widgets/content_panel.dart
+++ b/lib/pages/dynamics/widgets/content_panel.dart
@@ -55,8 +55,8 @@ Widget content(
                 fontSize: floor != 1
                     ? 14
                     : isDetail && !isSave
-                        ? 16
-                        : 15,
+                    ? 16
+                    : 15,
                 color: theme.colorScheme.primary,
               ),
             ),
diff --git a/lib/pages/dynamics/widgets/dynamic_panel.dart b/lib/pages/dynamics/widgets/dynamic_panel.dart
index f5680aded..c00493209 100644
--- a/lib/pages/dynamics/widgets/dynamic_panel.dart
+++ b/lib/pages/dynamics/widgets/dynamic_panel.dart
@@ -44,7 +44,8 @@ class DynamicPanel extends StatelessWidget {
     final child = Material(
       type: MaterialType.transparency,
       child: InkWell(
-        onTap: isDetail &&
+        onTap:
+            isDetail &&
                 !const {
                   'DYNAMIC_TYPE_AV',
                   'DYNAMIC_TYPE_UGC_SEASON',
diff --git a/lib/pages/dynamics/widgets/live_panel.dart b/lib/pages/dynamics/widgets/live_panel.dart
index 8e3862522..459bb4242 100644
--- a/lib/pages/dynamics/widgets/live_panel.dart
+++ b/lib/pages/dynamics/widgets/live_panel.dart
@@ -54,7 +54,7 @@ Widget livePanel(
                         color: theme.colorScheme.outline,
                         fontSize: theme.textTheme.labelMedium!.fontSize,
                       ),
-                    )
+                    ),
                 ],
               ),
             ),
@@ -64,7 +64,7 @@ Widget livePanel(
                 style: TextStyle(
                   fontSize: theme.textTheme.labelMedium!.fontSize,
                 ),
-              )
+              ),
           ],
         ),
       ),
diff --git a/lib/pages/dynamics/widgets/live_panel_sub.dart b/lib/pages/dynamics/widgets/live_panel_sub.dart
index 84dec24cd..ec962c56e 100644
--- a/lib/pages/dynamics/widgets/live_panel_sub.dart
+++ b/lib/pages/dynamics/widgets/live_panel_sub.dart
@@ -109,8 +109,9 @@ Widget livePanelSub(
       const SizedBox(height: 6),
       if (content.title != null)
         Padding(
-          padding:
-              const EdgeInsets.symmetric(horizontal: StyleString.safeSpace),
+          padding: const EdgeInsets.symmetric(
+            horizontal: StyleString.safeSpace,
+          ),
           child: Text(
             content.title!,
             maxLines: isDetail ? null : 1,
diff --git a/lib/pages/dynamics/widgets/live_rcmd_panel.dart b/lib/pages/dynamics/widgets/live_rcmd_panel.dart
index 8da7e148e..12a5f2f20 100644
--- a/lib/pages/dynamics/widgets/live_rcmd_panel.dart
+++ b/lib/pages/dynamics/widgets/live_rcmd_panel.dart
@@ -109,8 +109,9 @@ Widget liveRcmdPanel(
       const SizedBox(height: 6),
       if (liveRcmd.title != null)
         Padding(
-          padding:
-              const EdgeInsets.symmetric(horizontal: StyleString.safeSpace),
+          padding: const EdgeInsets.symmetric(
+            horizontal: StyleString.safeSpace,
+          ),
           child: Text(
             liveRcmd.title!,
             maxLines: isDetail ? null : 1,
diff --git a/lib/pages/dynamics/widgets/module_panel.dart b/lib/pages/dynamics/widgets/module_panel.dart
index 990d8de88..e8d548186 100644
--- a/lib/pages/dynamics/widgets/module_panel.dart
+++ b/lib/pages/dynamics/widgets/module_panel.dart
@@ -38,8 +38,15 @@ Widget module(
     // 视频
     case 'DYNAMIC_TYPE_AV':
       return videoSeasonWidget(
-          theme, isSave, isDetail, item, context, 'archive', callback,
-          floor: floor);
+        theme,
+        isSave,
+        isDetail,
+        item,
+        context,
+        'archive',
+        callback,
+        floor: floor,
+      );
     // 转发
     case 'DYNAMIC_TYPE_FORWARD':
       final orig = item.orig!;
@@ -121,7 +128,8 @@ Widget module(
                   GestureDetector(
                     onTap: isNormalAuth
                         ? () => Get.toNamed(
-                            '/member?mid=${orig.modules.moduleAuthor!.mid}')
+                            '/member?mid=${orig.modules.moduleAuthor!.mid}',
+                          )
                         : null,
                     child: Text(
                       '${isNormalAuth ? '@' : ''}${orig.modules.moduleAuthor!.name}',
@@ -131,20 +139,37 @@ Widget module(
                   const SizedBox(width: 6),
                   Text(
                     isSave
-                        ? DateUtil.format(orig.modules.moduleAuthor!.pubTs,
-                            format: DateUtil.longFormatDs)
+                        ? DateUtil.format(
+                            orig.modules.moduleAuthor!.pubTs,
+                            format: DateUtil.longFormatDs,
+                          )
                         : DateUtil.dateFormat(orig.modules.moduleAuthor!.pubTs),
                     style: TextStyle(
-                        color: theme.colorScheme.outline,
-                        fontSize: theme.textTheme.labelSmall!.fontSize),
+                      color: theme.colorScheme.outline,
+                      fontSize: theme.textTheme.labelSmall!.fontSize,
+                    ),
                   ),
                 ],
               ),
               const SizedBox(height: 5),
-              content(theme, isSave, context, orig, isDetail, callback,
-                  floor: floor + 1),
-              module(theme, isSave, orig, context, isDetail, callback,
-                  floor: floor + 1),
+              content(
+                theme,
+                isSave,
+                context,
+                orig,
+                isDetail,
+                callback,
+                floor: floor + 1,
+              ),
+              module(
+                theme,
+                isSave,
+                orig,
+                context,
+                isDetail,
+                callback,
+                floor: floor + 1,
+              ),
               if (orig.modules.moduleDynamic?.additional != null)
                 addWidget(theme, orig, context, floor: floor + 1),
               if (orig.modules.moduleDynamic?.major?.blocked != null)
@@ -162,21 +187,42 @@ Widget module(
     // 合集
     case 'DYNAMIC_TYPE_UGC_SEASON':
       return videoSeasonWidget(
-          theme, isSave, isDetail, item, context, 'ugcSeason', callback);
+        theme,
+        isSave,
+        isDetail,
+        item,
+        context,
+        'ugcSeason',
+        callback,
+      );
     case 'DYNAMIC_TYPE_PGC':
       return videoSeasonWidget(
-          theme, isSave, isDetail, item, context, 'pgc', callback,
-          floor: floor);
+        theme,
+        isSave,
+        isDetail,
+        item,
+        context,
+        'pgc',
+        callback,
+        floor: floor,
+      );
     case 'DYNAMIC_TYPE_PGC_UNION':
       return videoSeasonWidget(
-          theme, isSave, isDetail, item, context, 'pgc', callback,
-          floor: floor);
+        theme,
+        isSave,
+        isDetail,
+        item,
+        context,
+        'pgc',
+        callback,
+        floor: floor,
+      );
     case 'DYNAMIC_TYPE_NONE':
       return Row(
         spacing: 4,
         children: [
           const Icon(FontAwesomeIcons.ghost, size: 14),
-          Text(item.modules.moduleDynamic!.major!.none!.tips!)
+          Text(item.modules.moduleDynamic!.major!.none!.tips!),
         ],
       );
     // 课堂
@@ -214,12 +260,21 @@ Widget module(
             } catch (_) {}
           },
           child: Padding(
-            padding:
-                const EdgeInsets.only(left: 12, top: 10, right: 12, bottom: 10),
+            padding: const EdgeInsets.only(
+              left: 12,
+              top: 10,
+              right: 12,
+              bottom: 10,
+            ),
             child: Row(
               spacing: 10,
               children: [
-                if (item.modules.moduleDynamic!.major!.common!.cover
+                if (item
+                        .modules
+                        .moduleDynamic!
+                        .major!
+                        .common!
+                        .cover
                         ?.isNotEmpty ==
                     true)
                   ClipRRect(
@@ -228,8 +283,13 @@ Widget module(
                       width: 45,
                       height: 45,
                       fit: BoxFit.cover,
-                      imageUrl: item.modules.moduleDynamic!.major!.common!
-                          .cover!.http2https,
+                      imageUrl: item
+                          .modules
+                          .moduleDynamic!
+                          .major!
+                          .common!
+                          .cover!
+                          .http2https,
                     ),
                   ),
                 Expanded(
@@ -243,7 +303,12 @@ Widget module(
                         maxLines: 1,
                         overflow: TextOverflow.ellipsis,
                       ),
-                      if (item.modules.moduleDynamic!.major!.common!.desc
+                      if (item
+                              .modules
+                              .moduleDynamic!
+                              .major!
+                              .common!
+                              .desc
                               ?.isNotEmpty ==
                           true)
                         Text(
@@ -269,8 +334,12 @@ Widget module(
         onTap: () => PageUtils.handleWebview("https:${music['jump_url']}"),
         child: Container(
           width: double.infinity,
-          padding:
-              const EdgeInsets.only(left: 12, top: 10, right: 12, bottom: 10),
+          padding: const EdgeInsets.only(
+            left: 12,
+            top: 10,
+            right: 12,
+            bottom: 10,
+          ),
           color: theme.dividerColor.withValues(alpha: 0.08),
           child: Row(
             children: [
@@ -303,7 +372,7 @@ Widget module(
                     overflow: TextOverflow.ellipsis,
                   ),
                 ],
-              )
+              ),
             ],
           ),
         ),
@@ -331,7 +400,7 @@ Widget module(
                   top: 6,
                   text:
                       item.modules.moduleDynamic!.major!.medialist!.badge?.text,
-                )
+                ),
               ],
             ),
             const SizedBox(width: 14),
@@ -347,8 +416,9 @@ Widget module(
                   Text(
                     item.modules.moduleDynamic!.major!.medialist!.title!,
                     style: TextStyle(
-                        fontSize: theme.textTheme.titleMedium!.fontSize,
-                        fontWeight: FontWeight.bold),
+                      fontSize: theme.textTheme.titleMedium!.fontSize,
+                      fontWeight: FontWeight.bold,
+                    ),
                   ),
                   if (item.modules.moduleDynamic?.major?.medialist?.subTitle !=
                       null) ...[
@@ -356,8 +426,9 @@ Widget module(
                     Text(
                       item.modules.moduleDynamic!.major!.medialist!.subTitle!,
                       style: TextStyle(
-                          fontSize: theme.textTheme.labelLarge!.fontSize,
-                          color: theme.colorScheme.outline),
+                        fontSize: theme.textTheme.labelLarge!.fontSize,
+                        color: theme.colorScheme.outline,
+                      ),
                     ),
                   ],
                 ],
diff --git a/lib/pages/dynamics/widgets/rich_node_panel.dart b/lib/pages/dynamics/widgets/rich_node_panel.dart
index 6d0a29b22..c527f4710 100644
--- a/lib/pages/dynamics/widgets/rich_node_panel.dart
+++ b/lib/pages/dynamics/widgets/rich_node_panel.dart
@@ -77,12 +77,14 @@ TextSpan? richNode(
                 style: style,
                 recognizer: TapGestureRecognizer()
                   ..onTap = () => Get.toNamed(
-                        '/searchResult',
-                        parameters: {
-                          'keyword':
-                              i.origText!.substring(1, i.origText!.length - 1),
-                        },
+                    '/searchResult',
+                    parameters: {
+                      'keyword': i.origText!.substring(
+                        1,
+                        i.origText!.length - 1,
                       ),
+                    },
+                  ),
               ),
             );
             break;
@@ -106,8 +108,8 @@ TextSpan? richNode(
                   recognizer: i.origText == null
                       ? null
                       : (TapGestureRecognizer()
-                        ..onTap =
-                            () => PiliScheme.routePushFromUrl(i.origText!)),
+                          ..onTap = () =>
+                              PiliScheme.routePushFromUrl(i.origText!)),
                 ),
               );
             break;
@@ -131,8 +133,9 @@ TextSpan? richNode(
                   recognizer: TapGestureRecognizer()
                     ..onTap = () {
                       final dynIdStr = item.basic?.commentIdStr;
-                      final dynId =
-                          dynIdStr != null ? int.tryParse(dynIdStr) : null;
+                      final dynId = dynIdStr != null
+                          ? int.tryParse(dynIdStr)
+                          : null;
                       showVoteDialog(context, int.parse(i.rid!), dynId);
                     },
                 ),
@@ -171,12 +174,12 @@ TextSpan? richNode(
                   style: style,
                   recognizer: TapGestureRecognizer()
                     ..onTap = () => Get.toNamed(
-                          '/webview',
-                          parameters: {
-                            'url':
-                                'https://www.bilibili.com/h5/lottery/result?business_id=${item.idStr}'
-                          },
-                        ),
+                      '/webview',
+                      parameters: {
+                        'url':
+                            'https://www.bilibili.com/h5/lottery/result?business_id=${item.idStr}',
+                      },
+                    ),
                 ),
               );
             break;
@@ -200,8 +203,8 @@ TextSpan? richNode(
                   recognizer: i.jumpUrl == null
                       ? null
                       : (TapGestureRecognizer()
-                        ..onTap =
-                            () => PiliScheme.routePushFromUrl(i.jumpUrl!)),
+                          ..onTap = () =>
+                              PiliScheme.routePushFromUrl(i.jumpUrl!)),
                 ),
               );
             break;
@@ -252,11 +255,13 @@ TextSpan? richNode(
                         return imageView(
                           constraints.maxWidth,
                           i.pics!
-                              .map((item) => ImageModel(
-                                    url: item.src ?? '',
-                                    width: item.width,
-                                    height: item.height,
-                                  ))
+                              .map(
+                                (item) => ImageModel(
+                                  url: item.src ?? '',
+                                  width: item.width,
+                                  height: item.height,
+                                ),
+                              )
                               .toList(),
                         );
                       },
@@ -272,9 +277,10 @@ TextSpan? richNode(
                     ..onTap = () {
                       void onView(List<OpusPicModel> list) {
                         Get.context!.imageView(
-                            imgList: list
-                                .map((e) => SourceModel(url: e.src!))
-                                .toList());
+                          imgList: list
+                              .map((e) => SourceModel(url: e.src!))
+                              .toList(),
+                        );
                       }
 
                       if (i.pics?.isNotEmpty == true) {
diff --git a/lib/pages/dynamics/widgets/up_panel.dart b/lib/pages/dynamics/widgets/up_panel.dart
index 5b5593bc2..bd4d42f55 100644
--- a/lib/pages/dynamics/widgets/up_panel.dart
+++ b/lib/pages/dynamics/widgets/up_panel.dart
@@ -135,7 +135,8 @@ class _UpPanelState extends State<UpPanel> {
   }
 
   Widget upItemBuild(ThemeData theme, UserItem data) {
-    bool isCurrent = widget.dynamicsController.currentMid == data.mid ||
+    bool isCurrent =
+        widget.dynamicsController.currentMid == data.mid ||
         widget.dynamicsController.currentMid == -1;
     final isLive = data is LiveUserItem;
     return SizedBox(
@@ -191,11 +192,13 @@ class _UpPanelState extends State<UpPanel> {
                       label: isLive ? const Text(' Live ') : null,
                       textColor: theme.colorScheme.onSecondaryContainer,
                       alignment: AlignmentDirectional.topStart,
-                      isLabelVisible: isLive ||
+                      isLabelVisible:
+                          isLive ||
                           (data is UpItem && (data.hasUpdate ?? false)),
                       backgroundColor: isLive
-                          ? theme.colorScheme.secondaryContainer
-                              .withValues(alpha: 0.75)
+                          ? theme.colorScheme.secondaryContainer.withValues(
+                              alpha: 0.75,
+                            )
                           : theme.colorScheme.primary,
                     ),
                   ),
diff --git a/lib/pages/dynamics/widgets/video_panel.dart b/lib/pages/dynamics/widgets/video_panel.dart
index d4743b395..0734f3623 100644
--- a/lib/pages/dynamics/widgets/video_panel.dart
+++ b/lib/pages/dynamics/widgets/video_panel.dart
@@ -146,8 +146,9 @@ Widget videoSeasonWidget(
       if (itemContent.cover != null)
         if (floor == 1)
           Padding(
-            padding:
-                const EdgeInsets.symmetric(horizontal: StyleString.safeSpace),
+            padding: const EdgeInsets.symmetric(
+              horizontal: StyleString.safeSpace,
+            ),
             child: buildCover(),
           )
         else
diff --git a/lib/pages/dynamics/widgets/vote.dart b/lib/pages/dynamics/widgets/vote.dart
index 84171786d..6f7f833e8 100644
--- a/lib/pages/dynamics/widgets/vote.dart
+++ b/lib/pages/dynamics/widgets/vote.dart
@@ -29,7 +29,8 @@ class _VotePanelState extends State<VotePanel> {
   late VoteInfo _voteInfo;
   late final RxSet<int> groupValue = (_voteInfo.myVotes?.toSet() ?? {}).obs;
   late var _percentage = _cnt2Percentage(_voteInfo.options);
-  late bool _enabled = groupValue.isEmpty &&
+  late bool _enabled =
+      groupValue.isEmpty &&
       _voteInfo.endTime! * 1000 > DateTime.now().millisecondsSinceEpoch;
   late bool _showPercentage = !_enabled;
   late final _maxCnt = _voteInfo.choiceCnt ?? _voteInfo.options.length;
@@ -81,10 +82,10 @@ class _VotePanelState extends State<VotePanel> {
               _enabled
                   ? '投票选项'
                   : groupValue.isEmpty
-                      ? '已结束'
-                      : '已完成',
+                  ? '已结束'
+                  : '已完成',
             ),
-            if (_enabled) Obx(() => Text('${groupValue.length} / $_maxCnt'))
+            if (_enabled) Obx(() => Text('${groupValue.length} / $_maxCnt')),
           ],
         ),
         Flexible(fit: FlexFit.loose, child: _buildContext()),
@@ -122,23 +123,23 @@ class _VotePanelState extends State<VotePanel> {
   }
 
   List<Widget> get _checkBoxs => [
-        CheckBoxText(
-          text: '显示比例',
-          selected: _showPercentage,
-          onChanged: (value) {
-            setState(() {
-              _showPercentage = value;
-            });
-          },
-        ),
-        CheckBoxText(
-          text: '匿名',
-          selected: anonymity,
-          onChanged: (val) {
-            anonymity = val;
-          },
-        ),
-      ];
+    CheckBoxText(
+      text: '显示比例',
+      selected: _showPercentage,
+      onChanged: (value) {
+        setState(() {
+          _showPercentage = value;
+        });
+      },
+    ),
+    CheckBoxText(
+      text: '匿名',
+      selected: anonymity,
+      onChanged: (val) {
+        anonymity = val;
+      },
+    ),
+  ];
 
   Widget _buildOptions(int index) {
     return Padding(
@@ -185,7 +186,7 @@ class _VotePanelState extends State<VotePanel> {
           itemCount: _voteInfo.options.length,
           itemBuilder: (context, index) => _buildOptions(index),
         ),
-        if (_enabled) SliverList.list(children: _checkBoxs)
+        if (_enabled) SliverList.list(children: _checkBoxs),
       ],
     );
   }
@@ -277,27 +278,31 @@ class PercentageChip extends StatelessWidget {
   }
 }
 
-Future showVoteDialog(BuildContext context, int voteId,
-    [int? dynamicId]) async {
+Future showVoteDialog(
+  BuildContext context,
+  int voteId, [
+  int? dynamicId,
+]) async {
   final voteInfo = await DynamicsHttp.voteInfo(voteId);
   if (context.mounted) {
     if (voteInfo.isSuccess) {
       showDialog(
-          context: context,
-          builder: (context) => AlertDialog(
-                content: SizedBox(
-                  width: 160,
-                  child: VotePanel(
-                    voteInfo: voteInfo.data,
-                    callback: (votes, anonymity) => DynamicsHttp.doVote(
-                      voteId: voteId,
-                      votes: votes.toList(),
-                      anonymity: anonymity,
-                      dynamicId: dynamicId,
-                    ),
-                  ),
-                ),
-              ));
+        context: context,
+        builder: (context) => AlertDialog(
+          content: SizedBox(
+            width: 160,
+            child: VotePanel(
+              voteInfo: voteInfo.data,
+              callback: (votes, anonymity) => DynamicsHttp.doVote(
+                voteId: voteId,
+                votes: votes.toList(),
+                anonymity: anonymity,
+                dynamicId: dynamicId,
+              ),
+            ),
+          ),
+        ),
+      );
     } else {
       voteInfo.toast();
     }
diff --git a/lib/pages/dynamics_create/view.dart b/lib/pages/dynamics_create/view.dart
index 30447b430..994c3c5a9 100644
--- a/lib/pages/dynamics_create/view.dart
+++ b/lib/pages/dynamics_create/view.dart
@@ -115,8 +115,9 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
                         TextButton(
                           style: TextButton.styleFrom(
                             overlayColor: hasTopic ? Colors.transparent : null,
-                            splashFactory:
-                                hasTopic ? NoSplash.splashFactory : null,
+                            splashFactory: hasTopic
+                                ? NoSplash.splashFactory
+                                : null,
                             shape: hasTopic
                                 ? null
                                 : RoundedRectangleBorder(
@@ -124,7 +125,7 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
                                       color: hasTopic
                                           ? Colors.transparent
                                           : theme.colorScheme.outline
-                                              .withValues(alpha: 0.2),
+                                                .withValues(alpha: 0.2),
                                     ),
                                     borderRadius: const BorderRadius.all(
                                       Radius.circular(25),
@@ -239,107 +240,108 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
   }
 
   Widget _buildImageList(ThemeData theme) => SizedBox(
-        height: 100,
-        width: double.infinity,
-        child: SingleChildScrollView(
-          scrollDirection: Axis.horizontal,
-          padding: const EdgeInsets.symmetric(horizontal: 16),
-          child: Obx(
-            () => Row(
-              spacing: 10,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                ...List.generate(
-                    pathList.length, (index) => buildImage(index, 100)),
-                if (pathList.length != limit)
-                  Builder(
-                    builder: (context) {
-                      const borderRadius = StyleString.mdRadius;
-                      return Material(
-                        borderRadius: borderRadius,
-                        child: InkWell(
+    height: 100,
+    width: double.infinity,
+    child: SingleChildScrollView(
+      scrollDirection: Axis.horizontal,
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      child: Obx(
+        () => Row(
+          spacing: 10,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            ...List.generate(
+              pathList.length,
+              (index) => buildImage(index, 100),
+            ),
+            if (pathList.length != limit)
+              Builder(
+                builder: (context) {
+                  const borderRadius = StyleString.mdRadius;
+                  return Material(
+                    borderRadius: borderRadius,
+                    child: InkWell(
+                      borderRadius: borderRadius,
+                      onTap: () => onPickImage(() {
+                        if (pathList.isNotEmpty && !enablePublish.value) {
+                          enablePublish.value = true;
+                        }
+                      }),
+                      child: Ink(
+                        width: 100,
+                        height: 100,
+                        decoration: BoxDecoration(
                           borderRadius: borderRadius,
-                          onTap: () => onPickImage(() {
-                            if (pathList.isNotEmpty && !enablePublish.value) {
-                              enablePublish.value = true;
-                            }
-                          }),
-                          child: Ink(
-                            width: 100,
-                            height: 100,
-                            decoration: BoxDecoration(
-                              borderRadius: borderRadius,
-                              color: theme.colorScheme.secondaryContainer,
-                            ),
-                            child:
-                                const Center(child: Icon(Icons.add, size: 35)),
-                          ),
+                          color: theme.colorScheme.secondaryContainer,
                         ),
-                      );
-                    },
-                  ),
-              ],
+                        child: const Center(child: Icon(Icons.add, size: 35)),
+                      ),
+                    ),
+                  );
+                },
+              ),
+          ],
+        ),
+      ),
+    ),
+  );
+
+  Widget _buildAppBar(ThemeData theme) => Container(
+    height: 66,
+    padding: const EdgeInsets.all(16),
+    child: Stack(
+      clipBehavior: Clip.none,
+      children: [
+        Align(
+          alignment: Alignment.centerLeft,
+          child: SizedBox(
+            width: 34,
+            height: 34,
+            child: IconButton(
+              tooltip: '返回',
+              style: ButtonStyle(
+                padding: WidgetStateProperty.all(EdgeInsets.zero),
+                backgroundColor: WidgetStateProperty.resolveWith(
+                  (states) {
+                    return theme.colorScheme.secondaryContainer;
+                  },
+                ),
+              ),
+              onPressed: Get.back,
+              icon: Icon(
+                Icons.arrow_back_outlined,
+                size: 18,
+                color: theme.colorScheme.onSecondaryContainer,
+              ),
             ),
           ),
         ),
-      );
-
-  Widget _buildAppBar(ThemeData theme) => Container(
-        height: 66,
-        padding: const EdgeInsets.all(16),
-        child: Stack(
-          clipBehavior: Clip.none,
-          children: [
-            Align(
-              alignment: Alignment.centerLeft,
-              child: SizedBox(
-                width: 34,
-                height: 34,
-                child: IconButton(
-                  tooltip: '返回',
-                  style: ButtonStyle(
-                    padding: WidgetStateProperty.all(EdgeInsets.zero),
-                    backgroundColor: WidgetStateProperty.resolveWith(
-                      (states) {
-                        return theme.colorScheme.secondaryContainer;
-                      },
-                    ),
-                  ),
-                  onPressed: Get.back,
-                  icon: Icon(
-                    Icons.arrow_back_outlined,
-                    size: 18,
-                    color: theme.colorScheme.onSecondaryContainer,
-                  ),
-                ),
-              ),
-            ),
-            const Center(
-              child: Text(
-                '发布动态',
-                style: TextStyle(fontSize: 15, fontWeight: FontWeight.bold),
-              ),
-            ),
-            Align(
-              alignment: Alignment.centerRight,
-              child: Obx(
-                () => FilledButton.tonal(
-                  onPressed: enablePublish.value ? onPublish : null,
-                  style: FilledButton.styleFrom(
-                    tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                    padding: const EdgeInsets.symmetric(
-                      horizontal: 20,
-                      vertical: 10,
-                    ),
-                    visualDensity: VisualDensity.compact,
-                  ),
-                  child: Text(_publishTime.value == null ? '发布' : '定时发布'),
-                ),
-              ),
-            ),
-          ],
+        const Center(
+          child: Text(
+            '发布动态',
+            style: TextStyle(fontSize: 15, fontWeight: FontWeight.bold),
+          ),
         ),
-      );
+        Align(
+          alignment: Alignment.centerRight,
+          child: Obx(
+            () => FilledButton.tonal(
+              onPressed: enablePublish.value ? onPublish : null,
+              style: FilledButton.styleFrom(
+                tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 20,
+                  vertical: 10,
+                ),
+                visualDensity: VisualDensity.compact,
+              ),
+              child: Text(_publishTime.value == null ? '发布' : '定时发布'),
+            ),
+          ),
+        ),
+      ],
+    ),
+  );
 
   Widget _buildPrivateWidget(ThemeData theme) {
     final color = _isPrivate.value
@@ -530,23 +532,23 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
         );
 
   Widget get _buildToolbar => Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-        child: Row(
-          spacing: 16,
-          children: [
-            emojiBtn,
-            atBtn,
-            voteBtn,
-            moreBtn,
-            // if (kDebugMode)
-            //   ToolbarIconButton(
-            //     onPressed: editController.clear,
-            //     icon: const Icon(Icons.clear, size: 22),
-            //     selected: false,
-            //   ),
-          ],
-        ),
-      );
+    padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+    child: Row(
+      spacing: 16,
+      children: [
+        emojiBtn,
+        atBtn,
+        voteBtn,
+        moreBtn,
+        // if (kDebugMode)
+        //   ToolbarIconButton(
+        //     onPressed: editController.clear,
+        //     icon: const Icon(Icons.clear, size: 22),
+        //     selected: false,
+        //   ),
+      ],
+    ),
+  );
 
   @override
   Widget buildMorePanel(ThemeData theme) {
@@ -612,88 +614,90 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
   }
 
   Widget get voteBtn => ToolbarIconButton(
-        onPressed: () async {
-          controller.keepChatPanel();
-          RichTextItem? voteItem = editController.items
-              .firstWhereOrNull((e) => e.type == RichTextType.vote);
-          VoteInfo? voteInfo = await Navigator.of(context).push(
-            GetPageRoute(
-                page: () => CreateVotePage(
-                    voteId: voteItem?.id == null
-                        ? null
-                        : int.parse(voteItem!.id!))),
-          );
-          if (voteInfo != null) {
-            if (voteItem != null) {
-              final range = voteItem.range;
-              final text = ' ${voteInfo.title} ';
-              final selection =
-                  TextSelection.collapsed(offset: range.start + text.length);
-              final delta = RichTextEditingDeltaReplacement(
-                oldText: editController.text,
-                replacementText: text,
-                replacedRange: range,
-                selection: selection,
-                composing: TextRange.empty,
-                type: RichTextType.vote,
-                id: voteInfo.voteId.toString(),
-                rawText: voteInfo.title,
-              );
-              final newValue = delta.apply(editController.value);
-              editController
-                ..syncRichText(delta)
-                ..value = newValue;
-            } else {
-              onInsertText(
-                '我发起了一个投票',
-                RichTextType.text,
-              );
-              onInsertText(
-                ' ${voteInfo.title} ',
-                RichTextType.vote,
-                rawText: voteInfo.title,
-                id: voteInfo.voteId.toString(),
-              );
-            }
-          }
-          controller.restoreChatPanel();
-        },
-        icon: const Icon(Icons.bar_chart_rounded, size: 24),
-        tooltip: '投票',
-        selected: false,
+    onPressed: () async {
+      controller.keepChatPanel();
+      RichTextItem? voteItem = editController.items.firstWhereOrNull(
+        (e) => e.type == RichTextType.vote,
       );
-
-  Widget _buildEditWidget(ThemeData theme) => Form(
-        autovalidateMode: AutovalidateMode.onUserInteraction,
-        child: Listener(
-          onPointerUp: (event) {
-            if (readOnly.value) {
-              updatePanelType(PanelType.keyboard);
-            }
-          },
-          child: Obx(
-            () => RichTextField(
-              key: key,
-              controller: editController,
-              minLines: 4,
-              maxLines: null,
-              focusNode: focusNode,
-              readOnly: readOnly.value,
-              onChanged: onChanged,
-              decoration: InputDecoration(
-                hintText: '说点什么吧',
-                hintStyle: TextStyle(color: theme.colorScheme.outline),
-                border: const OutlineInputBorder(
-                  borderSide: BorderSide.none,
-                  gapPadding: 0,
-                ),
-                contentPadding: EdgeInsets.zero,
-              ),
-              // inputFormatters: [LengthLimitingTextInputFormatter(1000)],
-            ),
+      VoteInfo? voteInfo = await Navigator.of(context).push(
+        GetPageRoute(
+          page: () => CreateVotePage(
+            voteId: voteItem?.id == null ? null : int.parse(voteItem!.id!),
           ),
         ),
       );
+      if (voteInfo != null) {
+        if (voteItem != null) {
+          final range = voteItem.range;
+          final text = ' ${voteInfo.title} ';
+          final selection = TextSelection.collapsed(
+            offset: range.start + text.length,
+          );
+          final delta = RichTextEditingDeltaReplacement(
+            oldText: editController.text,
+            replacementText: text,
+            replacedRange: range,
+            selection: selection,
+            composing: TextRange.empty,
+            type: RichTextType.vote,
+            id: voteInfo.voteId.toString(),
+            rawText: voteInfo.title,
+          );
+          final newValue = delta.apply(editController.value);
+          editController
+            ..syncRichText(delta)
+            ..value = newValue;
+        } else {
+          onInsertText(
+            '我发起了一个投票',
+            RichTextType.text,
+          );
+          onInsertText(
+            ' ${voteInfo.title} ',
+            RichTextType.vote,
+            rawText: voteInfo.title,
+            id: voteInfo.voteId.toString(),
+          );
+        }
+      }
+      controller.restoreChatPanel();
+    },
+    icon: const Icon(Icons.bar_chart_rounded, size: 24),
+    tooltip: '投票',
+    selected: false,
+  );
+
+  Widget _buildEditWidget(ThemeData theme) => Form(
+    autovalidateMode: AutovalidateMode.onUserInteraction,
+    child: Listener(
+      onPointerUp: (event) {
+        if (readOnly.value) {
+          updatePanelType(PanelType.keyboard);
+        }
+      },
+      child: Obx(
+        () => RichTextField(
+          key: key,
+          controller: editController,
+          minLines: 4,
+          maxLines: null,
+          focusNode: focusNode,
+          readOnly: readOnly.value,
+          onChanged: onChanged,
+          decoration: InputDecoration(
+            hintText: '说点什么吧',
+            hintStyle: TextStyle(color: theme.colorScheme.outline),
+            border: const OutlineInputBorder(
+              borderSide: BorderSide.none,
+              gapPadding: 0,
+            ),
+            contentPadding: EdgeInsets.zero,
+          ),
+          // inputFormatters: [LengthLimitingTextInputFormatter(1000)],
+        ),
+      ),
+    ),
+  );
 
   @override
   Widget? get customPanel => EmotePanel(onChoose: onChooseEmote);
@@ -788,8 +792,7 @@ class _CreateDynPanelState extends CommonRichTextPubPageState<CreateDynPanel> {
                     Text('直播预约: ${reserveCard.title}'),
                     Text(
                       '${DateUtil.longFormatD.format(
-                        DateTime.fromMillisecondsSinceEpoch(
-                            reserveCard.livePlanStartTime! * 1000),
+                        DateTime.fromMillisecondsSinceEpoch(reserveCard.livePlanStartTime! * 1000),
                       )} 直播',
                     ),
                   ],
diff --git a/lib/pages/dynamics_create_reserve/controller.dart b/lib/pages/dynamics_create_reserve/controller.dart
index 25f9b4819..fbd79aad6 100644
--- a/lib/pages/dynamics_create_reserve/controller.dart
+++ b/lib/pages/dynamics_create_reserve/controller.dart
@@ -33,8 +33,9 @@ class CreateReserveController extends GetxController {
       ReserveInfoData data = res.data;
       key = Utils.generateRandomString(6);
       title.value = data.title!;
-      date.value =
-          DateTime.fromMillisecondsSinceEpoch(data.livePlanStartTime! * 1000);
+      date.value = DateTime.fromMillisecondsSinceEpoch(
+        data.livePlanStartTime! * 1000,
+      );
       canCreate.value = true;
     } else {
       res.toast();
diff --git a/lib/pages/dynamics_create_reserve/view.dart b/lib/pages/dynamics_create_reserve/view.dart
index d8611d642..b90cdad1e 100644
--- a/lib/pages/dynamics_create_reserve/view.dart
+++ b/lib/pages/dynamics_create_reserve/view.dart
@@ -17,8 +17,10 @@ class CreateReservePage extends StatefulWidget {
 }
 
 class _CreateReservePageState extends State<CreateReservePage> {
-  late final _controller = Get.put(CreateReserveController(widget.sid),
-      tag: Utils.generateRandomString(6));
+  late final _controller = Get.put(
+    CreateReserveController(widget.sid),
+    tag: Utils.generateRandomString(6),
+  );
   late TextStyle _leadingStyle;
 
   @override
@@ -71,8 +73,9 @@ class _CreateReservePageState extends State<CreateReservePage> {
                       ),
                     ];
                   },
-                  child:
-                      Text(_controller.subType.value == 0 ? '公开直播' : '大航海直播'),
+                  child: Text(
+                    _controller.subType.value == 0 ? '公开直播' : '大航海直播',
+                  ),
                 ),
               ),
             ],
@@ -99,8 +102,9 @@ class _CreateReservePageState extends State<CreateReservePage> {
                     if (newDate != null && context.mounted) {
                       TimeOfDay? newTime = await showTimePicker(
                         context: context,
-                        initialTime:
-                            TimeOfDay.fromDateTime(_controller.date.value),
+                        initialTime: TimeOfDay.fromDateTime(
+                          _controller.date.value,
+                        ),
                       );
                       if (newTime != null) {
                         final newEndtime = DateTime(
@@ -123,7 +127,8 @@ class _CreateReservePageState extends State<CreateReservePage> {
                     padding: const EdgeInsets.symmetric(vertical: 4),
                     child: Obx(
                       () => Text(
-                          DateUtil.longFormatD.format(_controller.date.value)),
+                        DateUtil.longFormatD.format(_controller.date.value),
+                      ),
                     ),
                   ),
                 ),
@@ -148,8 +153,9 @@ class _CreateReservePageState extends State<CreateReservePage> {
           const SizedBox(height: 25),
           Obx(() {
             return FilledButton.tonal(
-              onPressed:
-                  _controller.canCreate.value ? _controller.onCreate : null,
+              onPressed: _controller.canCreate.value
+                  ? _controller.onCreate
+                  : null,
               child: const Text('添加预约'),
             );
           }),
diff --git a/lib/pages/dynamics_create_vote/controller.dart b/lib/pages/dynamics_create_vote/controller.dart
index 814087e41..aef0a09d9 100644
--- a/lib/pages/dynamics_create_vote/controller.dart
+++ b/lib/pages/dynamics_create_vote/controller.dart
@@ -29,10 +29,12 @@ class CreateVoteController extends GetxController {
 
   void updateCanCreate() {
     if (type.value == 0) {
-      canCreate.value = title.value.isNotEmpty &&
+      canCreate.value =
+          title.value.isNotEmpty &&
           options.every((e) => e.optDesc?.isNotEmpty == true);
     } else {
-      canCreate.value = title.value.isNotEmpty &&
+      canCreate.value =
+          title.value.isNotEmpty &&
           options.every(
             (e) =>
                 e.optDesc?.isNotEmpty == true && e.imgUrl?.isNotEmpty == true,
diff --git a/lib/pages/dynamics_create_vote/view.dart b/lib/pages/dynamics_create_vote/view.dart
index 820fc34a5..c0c456912 100644
--- a/lib/pages/dynamics_create_vote/view.dart
+++ b/lib/pages/dynamics_create_vote/view.dart
@@ -21,8 +21,10 @@ class CreateVotePage extends StatefulWidget {
 }
 
 class _CreateVotePageState extends State<CreateVotePage> {
-  late final _controller = Get.put(CreateVoteController(widget.voteId),
-      tag: Utils.generateRandomString(8));
+  late final _controller = Get.put(
+    CreateVoteController(widget.voteId),
+    tag: Utils.generateRandomString(8),
+  );
   late final imagePicker = ImagePicker();
 
   late TextStyle _leadingStyle;
@@ -92,29 +94,31 @@ class _CreateVotePageState extends State<CreateVotePage> {
               for (int i = 0; i < _controller.options.length; i++) {
                 final e = _controller.options[i];
                 children
-                  ..add(_buildInput(
-                    theme,
-                    key: ValueKey(e.hashCode),
-                    showDel: showDel,
-                    onDel: () {
-                      FocusManager.instance.primaryFocus?.unfocus();
-                      _controller.onDel(i);
-                    },
-                    showImg: showImg,
-                    imgUrl: e.imgUrl,
-                    onPickImg: () => EasyThrottle.throttle(
-                      'picImg',
-                      const Duration(milliseconds: 500),
-                      () => _onPickImg(i),
+                  ..add(
+                    _buildInput(
+                      theme,
+                      key: ValueKey(e.hashCode),
+                      showDel: showDel,
+                      onDel: () {
+                        FocusManager.instance.primaryFocus?.unfocus();
+                        _controller.onDel(i);
+                      },
+                      showImg: showImg,
+                      imgUrl: e.imgUrl,
+                      onPickImg: () => EasyThrottle.throttle(
+                        'picImg',
+                        const Duration(milliseconds: 500),
+                        () => _onPickImg(i),
+                      ),
+                      initialValue: e.optDesc,
+                      onChanged: (value) => _controller
+                        ..options[i].optDesc = value
+                        ..updateCanCreate(),
+                      desc: '选项${i + 1}',
+                      hintText: '选项内容，最多20字',
+                      inputFormatters: [LengthLimitingTextInputFormatter(20)],
                     ),
-                    initialValue: e.optDesc,
-                    onChanged: (value) => _controller
-                      ..options[i].optDesc = value
-                      ..updateCanCreate(),
-                    desc: '选项${i + 1}',
-                    hintText: '选项内容，最多20字',
-                    inputFormatters: [LengthLimitingTextInputFormatter(20)],
-                  ))
+                  )
                   ..add(divider);
               }
               return Column(
@@ -130,7 +134,11 @@ class _CreateVotePageState extends State<CreateVotePage> {
                       style: FilledButton.styleFrom(
                         minimumSize: Size.zero,
                         padding: const EdgeInsets.only(
-                            left: 10, right: 14, top: 4, bottom: 4),
+                          left: 10,
+                          right: 14,
+                          top: 4,
+                          bottom: 4,
+                        ),
                         tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                         foregroundColor: theme.colorScheme.onSurfaceVariant,
                         backgroundColor: theme.colorScheme.onInverseSurface,
@@ -160,23 +168,28 @@ class _CreateVotePageState extends State<CreateVotePage> {
               ),
               Obx(() {
                 final choiceCnt = _controller.choiceCnt.value;
-                final choices =
-                    List.generate(_controller.options.length, (i) => i + 1);
+                final choices = List.generate(
+                  _controller.options.length,
+                  (i) => i + 1,
+                );
                 return Listener(
                   onPointerDown: (_) =>
                       FocusManager.instance.primaryFocus?.unfocus(),
                   child: PopupMenuButton<int>(
                     initialValue: choiceCnt,
                     requestFocus: false,
-                    child:
-                        Text(choiceCnt == 1 ? '单选         ' : '最多选$choiceCnt项'),
+                    child: Text(
+                      choiceCnt == 1 ? '单选         ' : '最多选$choiceCnt项',
+                    ),
                     onSelected: (value) => _controller.choiceCnt.value = value,
                     itemBuilder: (context) {
                       return choices
-                          .map((e) => PopupMenuItem(
-                                value: e,
-                                child: Text(e == 1 ? '单选' : '最多选$e项'),
-                              ))
+                          .map(
+                            (e) => PopupMenuItem(
+                              value: e,
+                              child: Text(e == 1 ? '单选' : '最多选$e项'),
+                            ),
+                          )
                           .toList();
                     },
                   ),
@@ -206,8 +219,9 @@ class _CreateVotePageState extends State<CreateVotePage> {
                   if (newDate != null && context.mounted) {
                     TimeOfDay? newTime = await showTimePicker(
                       context: context,
-                      initialTime:
-                          TimeOfDay.fromDateTime(_controller.endtime.value),
+                      initialTime: TimeOfDay.fromDateTime(
+                        _controller.endtime.value,
+                      ),
                     );
                     if (newTime != null) {
                       final newEndtime = DateTime(
@@ -228,9 +242,11 @@ class _CreateVotePageState extends State<CreateVotePage> {
                 },
                 child: Padding(
                   padding: const EdgeInsets.symmetric(vertical: 4),
-                  child: Obx(() => Text(
-                        DateUtil.longFormatD.format(_controller.endtime.value),
-                      )),
+                  child: Obx(
+                    () => Text(
+                      DateUtil.longFormatD.format(_controller.endtime.value),
+                    ),
+                  ),
                 ),
               ),
             ],
@@ -317,91 +333,93 @@ class _CreateVotePageState extends State<CreateVotePage> {
   }
 
   Widget _buildType(ThemeData theme) => Obx(
-        () {
-          return Row(
-            spacing: 16,
-            children: List.generate(
-              2,
-              (index) {
-                final isEnable = index == _controller.type.value;
-                final style = TextButton.styleFrom(
-                  tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                  visualDensity: VisualDensity.compact,
-                  padding:
-                      const EdgeInsets.symmetric(horizontal: 14, vertical: 17),
-                  shape: RoundedRectangleBorder(
-                    side: BorderSide(
-                      color: isEnable
-                          ? theme.colorScheme.secondary
-                          : theme.colorScheme.outline,
-                    ),
-                    borderRadius: const BorderRadius.all(Radius.circular(6)),
-                  ),
-                  backgroundColor: isEnable
-                      ? theme.colorScheme.secondaryContainer
-                      : Colors.transparent,
-                  foregroundColor: isEnable
-                      ? theme.colorScheme.onSecondaryContainer
-                      : theme.colorScheme.onSurfaceVariant,
-                );
-                Widget child = TextButton(
-                  style: style,
-                  onPressed: () => _controller
-                    ..type.value = index
-                    ..updateCanCreate(),
-                  child: Text(
-                    '${const ['文字', '图片'][index]}投票',
-                    strutStyle: const StrutStyle(forceStrutHeight: true),
-                  ),
-                );
-                if (isEnable) {
-                  child = Stack(
-                    clipBehavior: Clip.none,
-                    children: [
-                      child,
-                      Positioned(
-                        right: 0,
-                        bottom: 0,
-                        child: Container(
-                          padding: const EdgeInsets.all(1),
-                          decoration: BoxDecoration(
-                            borderRadius: const BorderRadius.only(
-                              topLeft: Radius.circular(4),
-                              bottomRight: Radius.circular(6),
-                            ),
-                            color: theme.colorScheme.primary,
-                          ),
-                          child: Icon(
-                            size: 10,
-                            Icons.check,
-                            color: theme.colorScheme.onPrimary,
-                          ),
+    () {
+      return Row(
+        spacing: 16,
+        children: List.generate(
+          2,
+          (index) {
+            final isEnable = index == _controller.type.value;
+            final style = TextButton.styleFrom(
+              tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+              visualDensity: VisualDensity.compact,
+              padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 17),
+              shape: RoundedRectangleBorder(
+                side: BorderSide(
+                  color: isEnable
+                      ? theme.colorScheme.secondary
+                      : theme.colorScheme.outline,
+                ),
+                borderRadius: const BorderRadius.all(Radius.circular(6)),
+              ),
+              backgroundColor: isEnable
+                  ? theme.colorScheme.secondaryContainer
+                  : Colors.transparent,
+              foregroundColor: isEnable
+                  ? theme.colorScheme.onSecondaryContainer
+                  : theme.colorScheme.onSurfaceVariant,
+            );
+            Widget child = TextButton(
+              style: style,
+              onPressed: () => _controller
+                ..type.value = index
+                ..updateCanCreate(),
+              child: Text(
+                '${const ['文字', '图片'][index]}投票',
+                strutStyle: const StrutStyle(forceStrutHeight: true),
+              ),
+            );
+            if (isEnable) {
+              child = Stack(
+                clipBehavior: Clip.none,
+                children: [
+                  child,
+                  Positioned(
+                    right: 0,
+                    bottom: 0,
+                    child: Container(
+                      padding: const EdgeInsets.all(1),
+                      decoration: BoxDecoration(
+                        borderRadius: const BorderRadius.only(
+                          topLeft: Radius.circular(4),
+                          bottomRight: Radius.circular(6),
                         ),
+                        color: theme.colorScheme.primary,
                       ),
-                    ],
-                  );
-                }
-                return child;
-              },
-            ),
-          );
-        },
+                      child: Icon(
+                        size: 10,
+                        Icons.check,
+                        color: theme.colorScheme.onPrimary,
+                      ),
+                    ),
+                  ),
+                ],
+              );
+            }
+            return child;
+          },
+        ),
       );
+    },
+  );
 
   void _onPickImg(int index) {
-    EasyThrottle.throttle('imagePicker', const Duration(milliseconds: 500),
-        () async {
-      try {
-        XFile? pickedFile = await imagePicker.pickImage(
-          imageQuality: 100,
-          source: ImageSource.gallery,
-        );
-        if (pickedFile != null) {
-          _controller.onUpload(index, pickedFile);
+    EasyThrottle.throttle(
+      'imagePicker',
+      const Duration(milliseconds: 500),
+      () async {
+        try {
+          XFile? pickedFile = await imagePicker.pickImage(
+            imageQuality: 100,
+            source: ImageSource.gallery,
+          );
+          if (pickedFile != null) {
+            _controller.onUpload(index, pickedFile);
+          }
+        } catch (e) {
+          SmartDialog.showToast(e.toString());
         }
-      } catch (e) {
-        SmartDialog.showToast(e.toString());
-      }
-    });
+      },
+    );
   }
 }
diff --git a/lib/pages/dynamics_detail/controller.dart b/lib/pages/dynamics_detail/controller.dart
index f6c6a0df7..d3f750197 100644
--- a/lib/pages/dynamics_detail/controller.dart
+++ b/lib/pages/dynamics_detail/controller.dart
@@ -56,10 +56,10 @@ class DynamicDetailController extends ReplyController<MainListReply> {
 
   @override
   Future<LoadingState<MainListReply>> customGetData() => ReplyGrpc.mainList(
-        type: replyType,
-        oid: oid,
-        mode: mode.value,
-        cursorNext: cursorNext,
-        offset: paginationReply?.nextOffset,
-      );
+    type: replyType,
+    oid: oid,
+    mode: mode.value,
+    cursorNext: cursorNext,
+    offset: paginationReply?.nextOffset,
+  );
 }
diff --git a/lib/pages/dynamics_detail/view.dart b/lib/pages/dynamics_detail/view.dart
index 76b916f7e..7607ac863 100644
--- a/lib/pages/dynamics_detail/view.dart
+++ b/lib/pages/dynamics_detail/view.dart
@@ -40,8 +40,10 @@ class DynamicDetailPage extends StatefulWidget {
 
 class _DynamicDetailPageState extends State<DynamicDetailPage>
     with TickerProviderStateMixin {
-  final _controller =
-      Get.put(DynamicDetailController(), tag: Utils.generateRandomString(8));
+  final _controller = Get.put(
+    DynamicDetailController(),
+    tag: Utils.generateRandomString(8),
+  );
   late final AnimationController _fabAnimationCtr;
   late final Animation<Offset> _anim;
 
@@ -59,44 +61,44 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
 
   Function(dynamic imgList, dynamic index)? get _getImageCallback =>
       _horizontalPreview
-          ? (imgList, index) {
-              _imageStatus = true;
-              bool isFabVisible = _isFabVisible;
+      ? (imgList, index) {
+          _imageStatus = true;
+          bool isFabVisible = _isFabVisible;
+          if (isFabVisible) {
+            _hideFab();
+          }
+          final ctr = AnimationController(
+            vsync: this,
+            duration: const Duration(milliseconds: 200),
+          )..forward();
+          PageUtils.onHorizontalPreview(
+            _key,
+            AnimationController(
+              vsync: this,
+              duration: Duration.zero,
+            ),
+            ctr,
+            imgList,
+            index,
+            (value) async {
+              _imageStatus = null;
               if (isFabVisible) {
-                _hideFab();
+                isFabVisible = false;
+                _showFab();
               }
-              final ctr = AnimationController(
-                vsync: this,
-                duration: const Duration(milliseconds: 200),
-              )..forward();
-              PageUtils.onHorizontalPreview(
-                _key,
-                AnimationController(
-                  vsync: this,
-                  duration: Duration.zero,
-                ),
-                ctr,
-                imgList,
-                index,
-                (value) async {
-                  _imageStatus = null;
-                  if (isFabVisible) {
-                    isFabVisible = false;
-                    _showFab();
-                  }
-                  if (value == false) {
-                    await ctr.reverse();
-                  }
-                  try {
-                    ctr.dispose();
-                  } catch (_) {}
-                  if (value == false) {
-                    Get.back();
-                  }
-                },
-              );
-            }
-          : null;
+              if (value == false) {
+                await ctr.reverse();
+              }
+              try {
+                ctr.dispose();
+              } catch (_) {}
+              if (value == false) {
+                Get.back();
+              }
+            },
+          );
+        }
+      : null;
 
   @override
   void initState() {
@@ -105,13 +107,16 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
       vsync: this,
       duration: const Duration(milliseconds: 300),
     );
-    _anim = Tween<Offset>(
-      begin: const Offset(0, 1),
-      end: Offset.zero,
-    ).animate(CurvedAnimation(
-      parent: _fabAnimationCtr,
-      curve: Curves.easeInOut,
-    ));
+    _anim =
+        Tween<Offset>(
+          begin: const Offset(0, 1),
+          end: Offset.zero,
+        ).animate(
+          CurvedAnimation(
+            parent: _fabAnimationCtr,
+            curve: Curves.easeInOut,
+          ),
+        );
     _fabAnimationCtr.forward();
     _controller.scrollController.addListener(listener);
   }
@@ -124,28 +129,27 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
       Widget replyReplyPage({
         bool automaticallyImplyLeading = true,
         VoidCallback? onDispose,
-      }) =>
-          Scaffold(
-            appBar: AppBar(
-              title: const Text('评论详情'),
-              titleSpacing: automaticallyImplyLeading ? null : 12,
-              automaticallyImplyLeading: automaticallyImplyLeading,
-            ),
-            body: SafeArea(
-              top: false,
-              bottom: false,
-              child: VideoReplyReplyPanel(
-                enableSlide: false,
-                id: id,
-                oid: oid,
-                rpid: rpid,
-                isVideoDetail: false,
-                replyType: _controller.replyType,
-                firstFloor: replyItem,
-                onDispose: onDispose,
-              ),
-            ),
-          );
+      }) => Scaffold(
+        appBar: AppBar(
+          title: const Text('评论详情'),
+          titleSpacing: automaticallyImplyLeading ? null : 12,
+          automaticallyImplyLeading: automaticallyImplyLeading,
+        ),
+        body: SafeArea(
+          top: false,
+          bottom: false,
+          child: VideoReplyReplyPanel(
+            enableSlide: false,
+            id: id,
+            oid: oid,
+            rpid: rpid,
+            isVideoDetail: false,
+            replyType: _controller.replyType,
+            firstFloor: replyItem,
+            onDispose: onDispose,
+          ),
+        ),
+      );
       if (this.context.orientation == Orientation.portrait) {
         Get.to(
           replyReplyPage,
@@ -324,252 +328,345 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
   }
 
   Widget _buildBody(Orientation orientation, ThemeData theme) => Stack(
-        clipBehavior: Clip.none,
-        children: [
-          Builder(
-            builder: (context) {
-              double padding = max(context.width / 2 - Grid.smallCardWidth, 0);
-              if (orientation == Orientation.portrait) {
-                return CustomScrollView(
-                  controller: _controller.scrollController,
-                  physics: const AlwaysScrollableScrollPhysics(),
-                  slivers: [
-                    SliverToBoxAdapter(
-                      child: DynamicPanel(
-                        item: _controller.dynItem,
-                        isDetail: true,
-                        callback: _getImageCallback,
-                      ),
-                    ),
-                    replyPersistentHeader(theme),
-                    Obx(
-                      () => replyList(theme, _controller.loadingState.value),
-                    ),
-                  ]
-                      .map<Widget>((e) => SliverPadding(
+    clipBehavior: Clip.none,
+    children: [
+      Builder(
+        builder: (context) {
+          double padding = max(context.width / 2 - Grid.smallCardWidth, 0);
+          if (orientation == Orientation.portrait) {
+            return CustomScrollView(
+              controller: _controller.scrollController,
+              physics: const AlwaysScrollableScrollPhysics(),
+              slivers:
+                  [
+                        SliverToBoxAdapter(
+                          child: DynamicPanel(
+                            item: _controller.dynItem,
+                            isDetail: true,
+                            callback: _getImageCallback,
+                          ),
+                        ),
+                        replyPersistentHeader(theme),
+                        Obx(
+                          () =>
+                              replyList(theme, _controller.loadingState.value),
+                        ),
+                      ]
+                      .map<Widget>(
+                        (e) => SliverPadding(
                           padding: EdgeInsets.symmetric(horizontal: padding),
-                          sliver: e))
+                          sliver: e,
+                        ),
+                      )
                       .toList(),
-                );
-              } else {
-                return Row(
-                  children: [
-                    Expanded(
-                      flex: _ratio[0].toInt(),
+            );
+          } else {
+            return Row(
+              children: [
+                Expanded(
+                  flex: _ratio[0].toInt(),
+                  child: CustomScrollView(
+                    controller: _controller.scrollController,
+                    physics: const AlwaysScrollableScrollPhysics(),
+                    slivers: [
+                      SliverPadding(
+                        padding: EdgeInsets.only(
+                          left: padding / 4,
+                          bottom: MediaQuery.paddingOf(context).bottom + 80,
+                        ),
+                        sliver: SliverToBoxAdapter(
+                          child: DynamicPanel(
+                            item: _controller.dynItem,
+                            isDetail: true,
+                            callback: _getImageCallback,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                Expanded(
+                  flex: _ratio[1].toInt(),
+                  child: Scaffold(
+                    key: _key,
+                    backgroundColor: Colors.transparent,
+                    body: refreshIndicator(
+                      onRefresh: _controller.onRefresh,
                       child: CustomScrollView(
                         controller: _controller.scrollController,
                         physics: const AlwaysScrollableScrollPhysics(),
                         slivers: [
                           SliverPadding(
-                            padding: EdgeInsets.only(
-                              left: padding / 4,
-                              bottom: MediaQuery.paddingOf(context).bottom + 80,
-                            ),
-                            sliver: SliverToBoxAdapter(
-                              child: DynamicPanel(
-                                item: _controller.dynItem,
-                                isDetail: true,
-                                callback: _getImageCallback,
+                            padding: EdgeInsets.only(right: padding / 4),
+                            sliver: replyPersistentHeader(theme),
+                          ),
+                          SliverPadding(
+                            padding: EdgeInsets.only(right: padding / 4),
+                            sliver: Obx(
+                              () => replyList(
+                                theme,
+                                _controller.loadingState.value,
                               ),
                             ),
                           ),
                         ],
                       ),
                     ),
-                    Expanded(
-                      flex: _ratio[1].toInt(),
-                      child: Scaffold(
-                        key: _key,
-                        backgroundColor: Colors.transparent,
-                        body: refreshIndicator(
-                          onRefresh: _controller.onRefresh,
-                          child: CustomScrollView(
-                            controller: _controller.scrollController,
-                            physics: const AlwaysScrollableScrollPhysics(),
-                            slivers: [
-                              SliverPadding(
-                                padding: EdgeInsets.only(right: padding / 4),
-                                sliver: replyPersistentHeader(theme),
-                              ),
-                              SliverPadding(
-                                padding: EdgeInsets.only(right: padding / 4),
-                                sliver: Obx(
-                                  () => replyList(
-                                      theme, _controller.loadingState.value),
-                                ),
-                              ),
-                            ],
-                          ),
+                  ),
+                ),
+              ],
+            );
+          }
+        },
+      ),
+      Positioned(
+        left: 0,
+        right: 0,
+        bottom: 0,
+        child: SlideTransition(
+          position: _anim,
+          child: Builder(
+            builder: (context) {
+              Widget button() => FloatingActionButton(
+                heroTag: null,
+                onPressed: () {
+                  feedBack();
+                  _controller.onReply(
+                    context,
+                    oid: _controller.oid,
+                    replyType: _controller.replyType,
+                  );
+                },
+                tooltip: '评论动态',
+                child: const Icon(Icons.reply),
+              );
+              return !_controller.showDynActionBar
+                  ? Align(
+                      alignment: Alignment.bottomRight,
+                      child: Padding(
+                        padding: EdgeInsets.only(
+                          right: 14,
+                          bottom: MediaQuery.paddingOf(context).bottom + 14,
                         ),
+                        child: button(),
                       ),
-                    ),
-                  ],
-                );
-              }
-            },
-          ),
-          Positioned(
-            left: 0,
-            right: 0,
-            bottom: 0,
-            child: SlideTransition(
-              position: _anim,
-              child: Builder(
-                builder: (context) {
-                  Widget button() => FloatingActionButton(
-                        heroTag: null,
-                        onPressed: () {
-                          feedBack();
-                          _controller.onReply(
-                            context,
-                            oid: _controller.oid,
-                            replyType: _controller.replyType,
-                          );
-                        },
-                        tooltip: '评论动态',
-                        child: const Icon(Icons.reply),
-                      );
-                  return !_controller.showDynActionBar
-                      ? Align(
-                          alignment: Alignment.bottomRight,
-                          child: Padding(
-                            padding: EdgeInsets.only(
-                              right: 14,
-                              bottom: MediaQuery.paddingOf(context).bottom + 14,
-                            ),
-                            child: button(),
-                          ),
-                        )
-                      : Column(
-                          mainAxisSize: MainAxisSize.min,
-                          crossAxisAlignment: CrossAxisAlignment.end,
-                          children: [
-                            Padding(
-                              padding:
-                                  const EdgeInsets.only(right: 14, bottom: 14),
-                              child: button(),
-                            ),
-                            Container(
-                              decoration: BoxDecoration(
-                                color: theme.colorScheme.surface,
-                                border: Border(
-                                  top: BorderSide(
-                                    color: theme.colorScheme.outline
-                                        .withValues(alpha: 0.08),
-                                  ),
+                    )
+                  : Column(
+                      mainAxisSize: MainAxisSize.min,
+                      crossAxisAlignment: CrossAxisAlignment.end,
+                      children: [
+                        Padding(
+                          padding: const EdgeInsets.only(right: 14, bottom: 14),
+                          child: button(),
+                        ),
+                        Container(
+                          decoration: BoxDecoration(
+                            color: theme.colorScheme.surface,
+                            border: Border(
+                              top: BorderSide(
+                                color: theme.colorScheme.outline.withValues(
+                                  alpha: 0.08,
                                 ),
                               ),
-                              padding: EdgeInsets.only(
-                                  bottom: MediaQuery.paddingOf(context).bottom),
-                              child: Row(
-                                mainAxisAlignment:
-                                    MainAxisAlignment.spaceAround,
-                                children: [
-                                  Expanded(
-                                    child: Builder(
-                                      builder: (btnContext) => TextButton.icon(
-                                        onPressed: () => showModalBottomSheet(
-                                          context: context,
-                                          isScrollControlled: true,
-                                          useSafeArea: true,
-                                          builder: (context) => RepostPanel(
-                                            item: _controller.dynItem,
-                                            callback: () {
-                                              int count = _controller
-                                                      .dynItem
-                                                      .modules
-                                                      .moduleStat
-                                                      ?.forward
-                                                      ?.count ??
-                                                  0;
-                                              _controller.dynItem.modules
-                                                      .moduleStat ??=
-                                                  ModuleStatModel();
+                            ),
+                          ),
+                          padding: EdgeInsets.only(
+                            bottom: MediaQuery.paddingOf(context).bottom,
+                          ),
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceAround,
+                            children: [
+                              Expanded(
+                                child: Builder(
+                                  builder: (btnContext) => TextButton.icon(
+                                    onPressed: () => showModalBottomSheet(
+                                      context: context,
+                                      isScrollControlled: true,
+                                      useSafeArea: true,
+                                      builder: (context) => RepostPanel(
+                                        item: _controller.dynItem,
+                                        callback: () {
+                                          int count =
                                               _controller
                                                   .dynItem
                                                   .modules
                                                   .moduleStat
-                                                  ?.forward ??= DynamicStat();
+                                                  ?.forward
+                                                  ?.count ??
+                                              0;
+                                          _controller
+                                                  .dynItem
+                                                  .modules
+                                                  .moduleStat ??=
+                                              ModuleStatModel();
+                                          _controller
+                                                  .dynItem
+                                                  .modules
+                                                  .moduleStat
+                                                  ?.forward ??=
+                                              DynamicStat();
+                                          _controller
+                                                  .dynItem
+                                                  .modules
+                                                  .moduleStat!
+                                                  .forward!
+                                                  .count =
+                                              count + 1;
+                                          if (btnContext.mounted) {
+                                            (btnContext as Element?)
+                                                ?.markNeedsBuild();
+                                          }
+                                        },
+                                      ),
+                                    ),
+                                    icon: Icon(
+                                      FontAwesomeIcons.shareFromSquare,
+                                      size: 16,
+                                      color: theme.colorScheme.outline,
+                                      semanticLabel: "转发",
+                                    ),
+                                    style: TextButton.styleFrom(
+                                      padding: const EdgeInsets.fromLTRB(
+                                        15,
+                                        0,
+                                        15,
+                                        0,
+                                      ),
+                                      foregroundColor:
+                                          theme.colorScheme.outline,
+                                    ),
+                                    label: Text(
+                                      _controller
+                                                  .dynItem
+                                                  .modules
+                                                  .moduleStat
+                                                  ?.forward
+                                                  ?.count !=
+                                              null
+                                          ? NumUtil.numFormat(
                                               _controller
                                                   .dynItem
                                                   .modules
                                                   .moduleStat!
                                                   .forward!
-                                                  .count = count + 1;
-                                              if (btnContext.mounted) {
-                                                (btnContext as Element?)
-                                                    ?.markNeedsBuild();
-                                              }
-                                            },
-                                          ),
-                                        ),
-                                        icon: Icon(
-                                          FontAwesomeIcons.shareFromSquare,
-                                          size: 16,
-                                          color: theme.colorScheme.outline,
-                                          semanticLabel: "转发",
-                                        ),
-                                        style: TextButton.styleFrom(
-                                          padding: const EdgeInsets.fromLTRB(
-                                              15, 0, 15, 0),
-                                          foregroundColor:
-                                              theme.colorScheme.outline,
-                                        ),
-                                        label: Text(
-                                          _controller.dynItem.modules.moduleStat
-                                                      ?.forward?.count !=
-                                                  null
-                                              ? NumUtil.numFormat(_controller
+                                                  .count,
+                                            )
+                                          : '转发',
+                                    ),
+                                  ),
+                                ),
+                              ),
+                              Expanded(
+                                child: TextButton.icon(
+                                  onPressed: () => Utils.shareText(
+                                    '${HttpString.dynamicShareBaseUrl}/${_controller.dynItem.idStr}',
+                                  ),
+                                  icon: Icon(
+                                    CustomIcon.share_node,
+                                    size: 16,
+                                    color: theme.colorScheme.outline,
+                                    semanticLabel: "分享",
+                                  ),
+                                  style: TextButton.styleFrom(
+                                    padding: const EdgeInsets.fromLTRB(
+                                      15,
+                                      0,
+                                      15,
+                                      0,
+                                    ),
+                                    foregroundColor: theme.colorScheme.outline,
+                                  ),
+                                  label: const Text('分享'),
+                                ),
+                              ),
+                              Expanded(
+                                child: Builder(
+                                  builder: (context) => TextButton.icon(
+                                    onPressed: () => RequestUtils.onLikeDynamic(
+                                      _controller.dynItem,
+                                      () {
+                                        if (context.mounted) {
+                                          (context as Element?)
+                                              ?.markNeedsBuild();
+                                        }
+                                      },
+                                    ),
+                                    icon: Icon(
+                                      _controller
                                                   .dynItem
                                                   .modules
-                                                  .moduleStat!
-                                                  .forward!
-                                                  .count)
-                                              : '转发',
-                                        ),
-                                      ),
+                                                  .moduleStat
+                                                  ?.like
+                                                  ?.status ==
+                                              true
+                                          ? FontAwesomeIcons.solidThumbsUp
+                                          : FontAwesomeIcons.thumbsUp,
+                                      size: 16,
+                                      color:
+                                          _controller
+                                                  .dynItem
+                                                  .modules
+                                                  .moduleStat
+                                                  ?.like
+                                                  ?.status ==
+                                              true
+                                          ? theme.colorScheme.primary
+                                          : theme.colorScheme.outline,
+                                      semanticLabel:
+                                          _controller
+                                                  .dynItem
+                                                  .modules
+                                                  .moduleStat
+                                                  ?.like
+                                                  ?.status ==
+                                              true
+                                          ? "已赞"
+                                          : "点赞",
                                     ),
-                                  ),
-                                  Expanded(
-                                    child: TextButton.icon(
-                                      onPressed: () => Utils.shareText(
-                                          '${HttpString.dynamicShareBaseUrl}/${_controller.dynItem.idStr}'),
-                                      icon: Icon(
-                                        CustomIcon.share_node,
-                                        size: 16,
-                                        color: theme.colorScheme.outline,
-                                        semanticLabel: "分享",
+                                    style: TextButton.styleFrom(
+                                      padding: const EdgeInsets.fromLTRB(
+                                        15,
+                                        0,
+                                        15,
+                                        0,
                                       ),
-                                      style: TextButton.styleFrom(
-                                        padding: const EdgeInsets.fromLTRB(
-                                            15, 0, 15, 0),
-                                        foregroundColor:
-                                            theme.colorScheme.outline,
-                                      ),
-                                      label: const Text('分享'),
+                                      foregroundColor:
+                                          theme.colorScheme.outline,
                                     ),
-                                  ),
-                                  Expanded(
-                                    child: Builder(
-                                      builder: (context) => TextButton.icon(
-                                        onPressed: () =>
-                                            RequestUtils.onLikeDynamic(
-                                          _controller.dynItem,
-                                          () {
-                                            if (context.mounted) {
-                                              (context as Element?)
-                                                  ?.markNeedsBuild();
-                                            }
+                                    label: AnimatedSwitcher(
+                                      duration: const Duration(
+                                        milliseconds: 400,
+                                      ),
+                                      transitionBuilder:
+                                          (
+                                            Widget child,
+                                            Animation<double> animation,
+                                          ) {
+                                            return ScaleTransition(
+                                              scale: animation,
+                                              child: child,
+                                            );
                                           },
-                                        ),
-                                        icon: Icon(
-                                          _controller.dynItem.modules.moduleStat
-                                                      ?.like?.status ==
-                                                  true
-                                              ? FontAwesomeIcons.solidThumbsUp
-                                              : FontAwesomeIcons.thumbsUp,
-                                          size: 16,
-                                          color: _controller
+                                      child: Text(
+                                        _controller
+                                                    .dynItem
+                                                    .modules
+                                                    .moduleStat
+                                                    ?.like
+                                                    ?.count !=
+                                                null
+                                            ? NumUtil.numFormat(
+                                                _controller
+                                                    .dynItem
+                                                    .modules
+                                                    .moduleStat!
+                                                    .like!
+                                                    .count,
+                                              )
+                                            : '点赞',
+                                        style: TextStyle(
+                                          color:
+                                              _controller
                                                       .dynItem
                                                       .modules
                                                       .moduleStat
@@ -578,72 +675,23 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                                                   true
                                               ? theme.colorScheme.primary
                                               : theme.colorScheme.outline,
-                                          semanticLabel: _controller
-                                                      .dynItem
-                                                      .modules
-                                                      .moduleStat
-                                                      ?.like
-                                                      ?.status ==
-                                                  true
-                                              ? "已赞"
-                                              : "点赞",
-                                        ),
-                                        style: TextButton.styleFrom(
-                                          padding: const EdgeInsets.fromLTRB(
-                                              15, 0, 15, 0),
-                                          foregroundColor:
-                                              theme.colorScheme.outline,
-                                        ),
-                                        label: AnimatedSwitcher(
-                                          duration:
-                                              const Duration(milliseconds: 400),
-                                          transitionBuilder: (Widget child,
-                                              Animation<double> animation) {
-                                            return ScaleTransition(
-                                                scale: animation, child: child);
-                                          },
-                                          child: Text(
-                                            _controller
-                                                        .dynItem
-                                                        .modules
-                                                        .moduleStat
-                                                        ?.like
-                                                        ?.count !=
-                                                    null
-                                                ? NumUtil.numFormat(_controller
-                                                    .dynItem
-                                                    .modules
-                                                    .moduleStat!
-                                                    .like!
-                                                    .count)
-                                                : '点赞',
-                                            style: TextStyle(
-                                              color: _controller
-                                                          .dynItem
-                                                          .modules
-                                                          .moduleStat
-                                                          ?.like
-                                                          ?.status ==
-                                                      true
-                                                  ? theme.colorScheme.primary
-                                                  : theme.colorScheme.outline,
-                                            ),
-                                          ),
                                         ),
                                       ),
                                     ),
                                   ),
-                                ],
+                                ),
                               ),
-                            ),
-                          ],
-                        );
-                },
-              ),
-            ),
+                            ],
+                          ),
+                        ),
+                      ],
+                    );
+            },
           ),
-        ],
-      );
+        ),
+      ),
+    ],
+  );
 
   SliverPersistentHeader replyPersistentHeader(ThemeData theme) {
     return SliverPersistentHeader(
@@ -659,8 +707,8 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                   duration: const Duration(milliseconds: 400),
                   transitionBuilder:
                       (Widget child, Animation<double> animation) {
-                    return ScaleTransition(scale: animation, child: child);
-                  },
+                        return ScaleTransition(scale: animation, child: child);
+                      },
                   child: Text(
                     '${_controller.count.value == -1 ? 0 : NumUtil.numFormat(_controller.count.value)}条回复',
                     key: ValueKey<int>(_controller.count.value),
@@ -677,15 +725,17 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                     size: 16,
                     color: theme.colorScheme.secondary,
                   ),
-                  label: Obx(() => Text(
-                        _controller.sortType.value.label,
-                        style: TextStyle(
-                          fontSize: 13,
-                          color: theme.colorScheme.secondary,
-                        ),
-                      )),
+                  label: Obx(
+                    () => Text(
+                      _controller.sortType.value.label,
+                      style: TextStyle(
+                        fontSize: 13,
+                        color: theme.colorScheme.secondary,
+                      ),
+                    ),
+                  ),
                 ),
-              )
+              ),
             ],
           ),
         ),
@@ -695,66 +745,70 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
   }
 
   Widget replyList(
-      ThemeData theme, LoadingState<List<ReplyInfo>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<ReplyInfo>?> loadingState,
+  ) {
     return switch (loadingState) {
       Loading() => SliverList.builder(
-          itemBuilder: (context, index) {
-            return const VideoReplySkeleton();
-          },
-          itemCount: 8,
-        ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverList.builder(
-              itemBuilder: (context, index) {
-                if (index == response.length) {
-                  _controller.onLoadMore();
-                  return Container(
-                    alignment: Alignment.center,
-                    margin: EdgeInsets.only(
-                        bottom: MediaQuery.paddingOf(context).bottom),
-                    height: 125,
-                    child: Text(
-                      _controller.isEnd ? '没有更多了' : '加载中...',
-                      style: TextStyle(
-                        fontSize: 12,
-                        color: theme.colorScheme.outline,
+        itemBuilder: (context, index) {
+          return const VideoReplySkeleton();
+        },
+        itemCount: 8,
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverList.builder(
+                itemBuilder: (context, index) {
+                  if (index == response.length) {
+                    _controller.onLoadMore();
+                    return Container(
+                      alignment: Alignment.center,
+                      margin: EdgeInsets.only(
+                        bottom: MediaQuery.paddingOf(context).bottom,
                       ),
-                    ),
-                  );
-                } else {
-                  return ReplyItemGrpc(
-                    replyItem: response[index],
-                    replyLevel: 1,
-                    replyReply: (replyItem, id) =>
-                        replyReply(context, replyItem, id),
-                    onReply: (replyItem) => _controller.onReply(
-                      context,
-                      replyItem: replyItem,
-                    ),
-                    onDelete: (item, subIndex) =>
-                        _controller.onRemove(index, item, subIndex),
-                    upMid: _controller.upMid,
-                    callback: _getImageCallback,
-                    onCheckReply: (item) =>
-                        _controller.onCheckReply(item, isManual: true),
-                    onToggleTop: (item) => _controller.onToggleTop(
-                      item,
-                      index,
-                      _controller.oid,
-                      _controller.replyType,
-                    ),
-                  );
-                }
-              },
-              itemCount: response!.length + 1,
-            )
-          : HttpError(
-              onReload: _controller.onReload,
-            ),
+                      height: 125,
+                      child: Text(
+                        _controller.isEnd ? '没有更多了' : '加载中...',
+                        style: TextStyle(
+                          fontSize: 12,
+                          color: theme.colorScheme.outline,
+                        ),
+                      ),
+                    );
+                  } else {
+                    return ReplyItemGrpc(
+                      replyItem: response[index],
+                      replyLevel: 1,
+                      replyReply: (replyItem, id) =>
+                          replyReply(context, replyItem, id),
+                      onReply: (replyItem) => _controller.onReply(
+                        context,
+                        replyItem: replyItem,
+                      ),
+                      onDelete: (item, subIndex) =>
+                          _controller.onRemove(index, item, subIndex),
+                      upMid: _controller.upMid,
+                      callback: _getImageCallback,
+                      onCheckReply: (item) =>
+                          _controller.onCheckReply(item, isManual: true),
+                      onToggleTop: (item) => _controller.onToggleTop(
+                        item,
+                        index,
+                        _controller.oid,
+                        _controller.replyType,
+                      ),
+                    );
+                  }
+                },
+                itemCount: response!.length + 1,
+              )
+            : HttpError(
+                onReload: _controller.onReload,
+              ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/dynamics_mention/view.dart b/lib/pages/dynamics_mention/view.dart
index dd49a010c..47101cffa 100644
--- a/lib/pages/dynamics_mention/view.dart
+++ b/lib/pages/dynamics_mention/view.dart
@@ -71,11 +71,14 @@ class _DynMentionPanelState extends State<DynMentionPanel> {
     _sub = _ctr.stream
         .debounce(const Duration(milliseconds: 300), trailing: true)
         .listen((value) {
-      _controller
-        ..enableClear.value = value.isNotEmpty
-        ..onRefresh().whenComplete(() => WidgetsBinding.instance
-            .addPostFrameCallback((_) => widget.scrollController?.jumpToTop()));
-    });
+          _controller
+            ..enableClear.value = value.isNotEmpty
+            ..onRefresh().whenComplete(
+              () => WidgetsBinding.instance.addPostFrameCallback(
+                (_) => widget.scrollController?.jumpToTop(),
+              ),
+            );
+        });
   }
 
   @override
@@ -126,10 +129,14 @@ class _DynMentionPanelState extends State<DynMentionPanel> {
                 padding: EdgeInsets.only(left: 12, right: 4),
                 child: Icon(Icons.search, size: 20),
               ),
-              prefixIconConstraints:
-                  const BoxConstraints(minHeight: 0, minWidth: 0),
-              contentPadding:
-                  const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
+              prefixIconConstraints: const BoxConstraints(
+                minHeight: 0,
+                minWidth: 0,
+              ),
+              contentPadding: const EdgeInsets.symmetric(
+                horizontal: 16,
+                vertical: 6,
+              ),
               suffixIcon: Obx(
                 () => _controller.enableClear.value
                     ? Padding(
@@ -150,16 +157,20 @@ class _DynMentionPanelState extends State<DynMentionPanel> {
                           onTap: () => _controller
                             ..enableClear.value = false
                             ..controller.clear()
-                            ..onRefresh().whenComplete(() => WidgetsBinding
-                                .instance
-                                .addPostFrameCallback((_) =>
-                                    widget.scrollController?.jumpToTop())),
+                            ..onRefresh().whenComplete(
+                              () =>
+                                  WidgetsBinding.instance.addPostFrameCallback(
+                                    (_) => widget.scrollController?.jumpToTop(),
+                                  ),
+                            ),
                         ),
                       )
                     : const SizedBox.shrink(),
               ),
-              suffixIconConstraints:
-                  const BoxConstraints(minHeight: 0, minWidth: 0),
+              suffixIconConstraints: const BoxConstraints(
+                minHeight: 0,
+                minWidth: 0,
+              ),
             ),
           ),
         ),
@@ -181,8 +192,9 @@ class _DynMentionPanelState extends State<DynMentionPanel> {
                 child: CustomScrollView(
                   controller: widget.scrollController,
                   slivers: [
-                    Obx(() =>
-                        _buildBody(theme, _controller.loadingState.value)),
+                    Obx(
+                      () => _buildBody(theme, _controller.loadingState.value),
+                    ),
                     SliverToBoxAdapter(
                       child: SizedBox(
                         height: padding + viewInset + 80,
@@ -194,7 +206,8 @@ class _DynMentionPanelState extends State<DynMentionPanel> {
               Obx(() {
                 return Positioned(
                   right: 16,
-                  bottom: padding +
+                  bottom:
+                      padding +
                       16 +
                       (_controller.showBtn.value ? viewInset : 0),
                   child: AnimatedSlide(
@@ -224,55 +237,58 @@ class _DynMentionPanelState extends State<DynMentionPanel> {
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<MentionGroup>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<MentionGroup>?> loadingState,
+  ) {
     return switch (loadingState) {
       Loading() => SliverPadding(
-          padding: const EdgeInsets.only(top: 8),
-          sliver: linearLoading,
-        ),
-      Success<List<MentionGroup>?>(:var response) => response?.isNotEmpty ==
-              true
-          ? SliverMainAxisGroup(
-              slivers: response!.map((group) {
-                if (group.items.isNullOrEmpty) {
-                  return const SliverToBoxAdapter();
-                }
-                return SliverMainAxisGroup(
-                  slivers: [
-                    SliverPersistentHeader(
-                      pinned: true,
-                      delegate: CustomSliverPersistentHeaderDelegate(
-                        extent: 40,
-                        needRebuild: true,
-                        bgColor: theme.colorScheme.surface,
-                        child: Container(
-                          height: 40,
-                          alignment: Alignment.centerLeft,
-                          padding: const EdgeInsets.symmetric(horizontal: 16),
-                          child: Text(group.groupName!),
+        padding: const EdgeInsets.only(top: 8),
+        sliver: linearLoading,
+      ),
+      Success<List<MentionGroup>?>(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverMainAxisGroup(
+                slivers: response!.map((group) {
+                  if (group.items.isNullOrEmpty) {
+                    return const SliverToBoxAdapter();
+                  }
+                  return SliverMainAxisGroup(
+                    slivers: [
+                      SliverPersistentHeader(
+                        pinned: true,
+                        delegate: CustomSliverPersistentHeaderDelegate(
+                          extent: 40,
+                          needRebuild: true,
+                          bgColor: theme.colorScheme.surface,
+                          child: Container(
+                            height: 40,
+                            alignment: Alignment.centerLeft,
+                            padding: const EdgeInsets.symmetric(horizontal: 16),
+                            child: Text(group.groupName!),
+                          ),
                         ),
                       ),
-                    ),
-                    SliverList.builder(
-                      itemCount: group.items!.length,
-                      itemBuilder: (context, index) {
-                        final item = group.items![index];
-                        return DynMentionItem(
-                          item: item,
-                          onTap: () => Get.back(result: item),
-                          onCheck: (value) => _controller.onCheck(value, item),
-                        );
-                      },
-                    ),
-                  ],
-                );
-              }).toList(),
-            )
-          : HttpError(onReload: _controller.onReload),
+                      SliverList.builder(
+                        itemCount: group.items!.length,
+                        itemBuilder: (context, index) {
+                          final item = group.items![index];
+                          return DynMentionItem(
+                            item: item,
+                            onTap: () => Get.back(result: item),
+                            onCheck: (value) =>
+                                _controller.onCheck(value, item),
+                          );
+                        },
+                      ),
+                    ],
+                  );
+                }).toList(),
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/dynamics_repost/view.dart b/lib/pages/dynamics_repost/view.dart
index de33d3e2d..e96bba9d1 100644
--- a/lib/pages/dynamics_repost/view.dart
+++ b/lib/pages/dynamics_repost/view.dart
@@ -52,12 +52,14 @@ class _RepostPanelState extends CommonRichTextPubPageState<RepostPanel> {
 
   late final _key = GlobalKey();
 
-  late final _pic = widget.pic ??
+  late final _pic =
+      widget.pic ??
       widget.item?.modules.moduleDynamic?.major?.archive?.cover ??
       widget.item?.modules.moduleDynamic?.major?.pgc?.cover ??
       widget.item?.modules.moduleDynamic?.major?.opus?.pics?.firstOrNull?.url;
 
-  late final _text = widget.title ??
+  late final _text =
+      widget.title ??
       widget.item?.modules.moduleDynamic?.major?.opus?.summary?.text ??
       widget.item?.modules.moduleDynamic?.desc?.text ??
       widget.item?.modules.moduleDynamic?.major?.archive?.title ??
@@ -79,29 +81,29 @@ class _RepostPanelState extends CommonRichTextPubPageState<RepostPanel> {
     final ThemeData theme = Theme.of(context);
 
     Widget page([ScrollController? scrollController]) => Column(
-          key: _isMax ? _key : null,
-          mainAxisSize: _isMax ? MainAxisSize.max : MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (!_isMax) const SizedBox(height: 10),
-            _buildAppBar(theme),
-            if (_isMax) ...[
-              Expanded(
-                child: ListView(
-                  padding: EdgeInsets.zero,
-                  controller: scrollController,
-                  physics: const ClampingScrollPhysics(),
-                  children: _buildEditPanel(theme),
-                ),
-              ),
-              _buildToolbar,
-              buildPanelContainer(theme, Colors.transparent),
-            ] else ...[
-              ..._buildEditPanel(theme),
-              ..._biuldDismiss(theme),
-            ],
-          ],
-        );
+      key: _isMax ? _key : null,
+      mainAxisSize: _isMax ? MainAxisSize.max : MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        if (!_isMax) const SizedBox(height: 10),
+        _buildAppBar(theme),
+        if (_isMax) ...[
+          Expanded(
+            child: ListView(
+              padding: EdgeInsets.zero,
+              controller: scrollController,
+              physics: const ClampingScrollPhysics(),
+              children: _buildEditPanel(theme),
+            ),
+          ),
+          _buildToolbar,
+          buildPanelContainer(theme, Colors.transparent),
+        ] else ...[
+          ..._buildEditPanel(theme),
+          ..._biuldDismiss(theme),
+        ],
+      ],
+    );
 
     Widget child() => _isMax
         ? DraggableScrollableSheet(
@@ -126,124 +128,124 @@ class _RepostPanelState extends CommonRichTextPubPageState<RepostPanel> {
   }
 
   List<Widget> _buildEditPanel(ThemeData theme) => [
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 16),
-          child: _isMax
-              ? _buildEditWidget(theme)
-              : DecoratedBox(
-                  decoration: BoxDecoration(
-                    border: Border(
-                      left: BorderSide(
-                        width: 2,
-                        color: theme.colorScheme.primary,
-                      ),
-                    ),
+    Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      child: _isMax
+          ? _buildEditWidget(theme)
+          : DecoratedBox(
+              decoration: BoxDecoration(
+                border: Border(
+                  left: BorderSide(
+                    width: 2,
+                    color: theme.colorScheme.primary,
                   ),
-                  child: _buildEditPlaceHolder(theme),
                 ),
-        ),
-        const SizedBox(height: 10),
-        _buildRefWidget(theme),
-      ];
+              ),
+              child: _buildEditPlaceHolder(theme),
+            ),
+    ),
+    const SizedBox(height: 10),
+    _buildRefWidget(theme),
+  ];
 
   Widget _buildRefWidget(ThemeData theme) => Card(
-        margin: const EdgeInsets.symmetric(horizontal: 16),
-        shape: const RoundedRectangleBorder(
-          borderRadius: BorderRadius.all(Radius.circular(12)),
-        ),
-        child: Padding(
-          padding: const EdgeInsets.all(10),
-          child: Row(
-            children: [
-              if (_pic != null) ...[
-                NetworkImgLayer(
-                  radius: 6,
-                  width: 40,
-                  height: 40,
-                  src: _pic,
-                ),
-                const SizedBox(width: 10),
-              ],
-              Expanded(
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    if (_uname?.isNotEmpty == true)
-                      Text(
-                        '@$_uname',
-                        style: TextStyle(
-                          color: theme.colorScheme.primary,
-                          fontSize: 13,
-                        ),
-                      ),
-                    Text(
-                      _text,
-                      maxLines: 2,
-                      overflow: TextOverflow.ellipsis,
+    margin: const EdgeInsets.symmetric(horizontal: 16),
+    shape: const RoundedRectangleBorder(
+      borderRadius: BorderRadius.all(Radius.circular(12)),
+    ),
+    child: Padding(
+      padding: const EdgeInsets.all(10),
+      child: Row(
+        children: [
+          if (_pic != null) ...[
+            NetworkImgLayer(
+              radius: 6,
+              width: 40,
+              height: 40,
+              src: _pic,
+            ),
+            const SizedBox(width: 10),
+          ],
+          Expanded(
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                if (_uname?.isNotEmpty == true)
+                  Text(
+                    '@$_uname',
+                    style: TextStyle(
+                      color: theme.colorScheme.primary,
+                      fontSize: 13,
                     ),
-                  ],
+                  ),
+                Text(
+                  _text,
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis,
                 ),
-              ),
-            ],
+              ],
+            ),
           ),
-        ),
-      );
+        ],
+      ),
+    ),
+  );
 
   Widget _buildEditPlaceHolder(ThemeData theme) => GestureDetector(
-        behavior: HitTestBehavior.opaque,
-        onTap: () {
-          setState(() => _isMax = true);
-          Future.delayed(const Duration(milliseconds: 300), () {
-            _isExpanded = true;
-            if (mounted) {
-              focusNode.requestFocus();
-            }
-          });
-        },
-        child: SizedBox(
-          width: double.infinity,
-          child: Text(
-            '说点什么吧',
-            style: TextStyle(
-              height: 1.75,
-              fontSize: 15,
-              color: theme.colorScheme.outline,
-            ),
-          ),
+    behavior: HitTestBehavior.opaque,
+    onTap: () {
+      setState(() => _isMax = true);
+      Future.delayed(const Duration(milliseconds: 300), () {
+        _isExpanded = true;
+        if (mounted) {
+          focusNode.requestFocus();
+        }
+      });
+    },
+    child: SizedBox(
+      width: double.infinity,
+      child: Text(
+        '说点什么吧',
+        style: TextStyle(
+          height: 1.75,
+          fontSize: 15,
+          color: theme.colorScheme.outline,
         ),
-      );
+      ),
+    ),
+  );
 
   Widget _buildEditWidget(ThemeData theme) => Form(
-        autovalidateMode: AutovalidateMode.onUserInteraction,
-        child: Listener(
-          onPointerUp: (event) {
-            if (readOnly.value) {
-              updatePanelType(PanelType.keyboard);
-            }
-          },
-          child: Obx(
-            () => RichTextField(
-              key: key,
-              controller: editController,
-              minLines: 4,
-              maxLines: null,
-              focusNode: focusNode,
-              readOnly: readOnly.value,
-              decoration: InputDecoration(
-                hintText: '说点什么吧',
-                hintStyle: TextStyle(color: theme.colorScheme.outline),
-                border: const OutlineInputBorder(
-                  borderSide: BorderSide.none,
-                  gapPadding: 0,
-                ),
-                contentPadding: EdgeInsets.zero,
-              ),
-              // inputFormatters: [LengthLimitingTextInputFormatter(1000)],
+    autovalidateMode: AutovalidateMode.onUserInteraction,
+    child: Listener(
+      onPointerUp: (event) {
+        if (readOnly.value) {
+          updatePanelType(PanelType.keyboard);
+        }
+      },
+      child: Obx(
+        () => RichTextField(
+          key: key,
+          controller: editController,
+          minLines: 4,
+          maxLines: null,
+          focusNode: focusNode,
+          readOnly: readOnly.value,
+          decoration: InputDecoration(
+            hintText: '说点什么吧',
+            hintStyle: TextStyle(color: theme.colorScheme.outline),
+            border: const OutlineInputBorder(
+              borderSide: BorderSide.none,
+              gapPadding: 0,
             ),
+            contentPadding: EdgeInsets.zero,
           ),
+          // inputFormatters: [LengthLimitingTextInputFormatter(1000)],
         ),
-      );
+      ),
+    ),
+  );
 
   Widget _buildAppBar(ThemeData theme) => !_isMax
       ? Row(
@@ -257,8 +259,10 @@ class _RepostPanelState extends CommonRichTextPubPageState<RepostPanel> {
             TextButton(
               onPressed: onPublish,
               style: TextButton.styleFrom(
-                padding:
-                    const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 20,
+                  vertical: 10,
+                ),
                 visualDensity: VisualDensity.compact,
               ),
               child: Text(widget.rid != null ? '立即发布' : '立即转发'),
@@ -281,8 +285,9 @@ class _RepostPanelState extends CommonRichTextPubPageState<RepostPanel> {
                     tooltip: '返回',
                     style: ButtonStyle(
                       padding: WidgetStateProperty.all(EdgeInsets.zero),
-                      backgroundColor:
-                          WidgetStateProperty.resolveWith((states) {
+                      backgroundColor: WidgetStateProperty.resolveWith((
+                        states,
+                      ) {
                         return theme.colorScheme.secondaryContainer;
                       }),
                     ),
@@ -299,7 +304,9 @@ class _RepostPanelState extends CommonRichTextPubPageState<RepostPanel> {
                 child: Text(
                   widget.rid != null ? '分享至动态' : '转发动态',
                   style: const TextStyle(
-                      fontSize: 15, fontWeight: FontWeight.bold),
+                    fontSize: 15,
+                    fontWeight: FontWeight.bold,
+                  ),
                 ),
               ),
               Align(
@@ -322,34 +329,34 @@ class _RepostPanelState extends CommonRichTextPubPageState<RepostPanel> {
         );
 
   Widget get _buildToolbar => Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-        child: Row(
-          spacing: 16,
-          children: [
-            emojiBtn,
-            atBtn,
-          ],
-        ),
-      );
+    padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+    child: Row(
+      spacing: 16,
+      children: [
+        emojiBtn,
+        atBtn,
+      ],
+    ),
+  );
 
   List<Widget> _biuldDismiss(ThemeData theme) => [
-        const SizedBox(height: 10),
-        Divider(
-          height: 1,
-          color: theme.colorScheme.outline.withValues(alpha: 0.1),
+    const SizedBox(height: 10),
+    Divider(
+      height: 1,
+      color: theme.colorScheme.outline.withValues(alpha: 0.1),
+    ),
+    ListTile(
+      dense: true,
+      onTap: Get.back,
+      title: Center(
+        child: Text(
+          '取消',
+          style: TextStyle(color: theme.colorScheme.outline),
         ),
-        ListTile(
-          dense: true,
-          onTap: Get.back,
-          title: Center(
-            child: Text(
-              '取消',
-              style: TextStyle(color: theme.colorScheme.outline),
-            ),
-          ),
-        ),
-        SizedBox(height: 10 + MediaQuery.paddingOf(context).bottom),
-      ];
+      ),
+    ),
+    SizedBox(height: 10 + MediaQuery.paddingOf(context).bottom),
+  ];
 
   @override
   Widget? get customPanel => EmotePanel(onChoose: onChooseEmote);
@@ -398,8 +405,9 @@ class _RepostPanelState extends CommonRichTextPubPageState<RepostPanel> {
     SmartDialog.showLoading();
     List<Map<String, dynamic>>? richContent = getRichContent();
     final hasRichText = richContent != null;
-    List<Map<String, dynamic>>? repostContent =
-        widget.item?.orig != null ? getRepostContent(widget.item!) : null;
+    List<Map<String, dynamic>>? repostContent = widget.item?.orig != null
+        ? getRepostContent(widget.item!)
+        : null;
     if (hasRichText && repostContent != null) {
       richContent.addAll(repostContent);
     }
diff --git a/lib/pages/dynamics_select_topic/view.dart b/lib/pages/dynamics_select_topic/view.dart
index bbbdc037d..98d48f150 100644
--- a/lib/pages/dynamics_select_topic/view.dart
+++ b/lib/pages/dynamics_select_topic/view.dart
@@ -69,11 +69,14 @@ class _SelectTopicPanelState extends State<SelectTopicPanel> {
     _sub = _ctr.stream
         .debounce(const Duration(milliseconds: 300), trailing: true)
         .listen((value) {
-      _controller
-        ..enableClear.value = value.isNotEmpty
-        ..onRefresh().whenComplete(() => WidgetsBinding.instance
-            .addPostFrameCallback((_) => widget.scrollController?.jumpToTop()));
-    });
+          _controller
+            ..enableClear.value = value.isNotEmpty
+            ..onRefresh().whenComplete(
+              () => WidgetsBinding.instance.addPostFrameCallback(
+                (_) => widget.scrollController?.jumpToTop(),
+              ),
+            );
+        });
   }
 
   @override
@@ -122,10 +125,14 @@ class _SelectTopicPanelState extends State<SelectTopicPanel> {
                 padding: EdgeInsets.only(left: 12, right: 4),
                 child: Icon(Icons.search, size: 20),
               ),
-              prefixIconConstraints:
-                  const BoxConstraints(minHeight: 0, minWidth: 0),
-              contentPadding:
-                  const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
+              prefixIconConstraints: const BoxConstraints(
+                minHeight: 0,
+                minWidth: 0,
+              ),
+              contentPadding: const EdgeInsets.symmetric(
+                horizontal: 16,
+                vertical: 6,
+              ),
               suffixIcon: Obx(
                 () => _controller.enableClear.value
                     ? Padding(
@@ -146,16 +153,20 @@ class _SelectTopicPanelState extends State<SelectTopicPanel> {
                           onTap: () => _controller
                             ..enableClear.value = false
                             ..controller.clear()
-                            ..onRefresh().whenComplete(() => WidgetsBinding
-                                .instance
-                                .addPostFrameCallback((_) =>
-                                    widget.scrollController?.jumpToTop())),
+                            ..onRefresh().whenComplete(
+                              () =>
+                                  WidgetsBinding.instance.addPostFrameCallback(
+                                    (_) => widget.scrollController?.jumpToTop(),
+                                  ),
+                            ),
                         ),
                       )
                     : const SizedBox.shrink(),
               ),
-              suffixIconConstraints:
-                  const BoxConstraints(minHeight: 0, minWidth: 0),
+              suffixIconConstraints: const BoxConstraints(
+                minHeight: 0,
+                minWidth: 0,
+              ),
             ),
           ),
         ),
@@ -179,36 +190,40 @@ class _SelectTopicPanelState extends State<SelectTopicPanel> {
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<TopicItem>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<TopicItem>?> loadingState,
+  ) {
     return switch (loadingState) {
       Loading() => loadingWidget,
-      Success<List<TopicItem>?>(:var response) => response?.isNotEmpty == true
-          ? ListView.builder(
-              padding: EdgeInsets.only(
-                bottom: MediaQuery.paddingOf(context).bottom +
-                    MediaQuery.viewInsetsOf(context).bottom +
-                    80,
-              ),
-              controller: widget.scrollController,
-              itemBuilder: (context, index) {
-                if (index == response.length - 1) {
-                  _controller.onLoadMore();
-                }
-                return DynTopicItem(
-                  item: response[index],
-                  onTap: (item) => Get.back(result: item),
-                );
-              },
-              itemCount: response!.length,
-            )
-          : _errWidget(),
+      Success<List<TopicItem>?>(:var response) =>
+        response?.isNotEmpty == true
+            ? ListView.builder(
+                padding: EdgeInsets.only(
+                  bottom:
+                      MediaQuery.paddingOf(context).bottom +
+                      MediaQuery.viewInsetsOf(context).bottom +
+                      80,
+                ),
+                controller: widget.scrollController,
+                itemBuilder: (context, index) {
+                  if (index == response.length - 1) {
+                    _controller.onLoadMore();
+                  }
+                  return DynTopicItem(
+                    item: response[index],
+                    onTap: (item) => Get.back(result: item),
+                  );
+                },
+                itemCount: response!.length,
+              )
+            : _errWidget(),
       Error(:var errMsg) => _errWidget(errMsg),
     };
   }
 
   Widget _errWidget([String? errMsg]) => scrollErrorWidget(
-        errMsg: errMsg,
-        controller: widget.scrollController,
-        onReload: _controller.onReload,
-      );
+    errMsg: errMsg,
+    controller: widget.scrollController,
+    onReload: _controller.onReload,
+  );
 }
diff --git a/lib/pages/dynamics_tab/view.dart b/lib/pages/dynamics_tab/view.dart
index 4bf2b8eb1..1a8fb4fee 100644
--- a/lib/pages/dynamics_tab/view.dart
+++ b/lib/pages/dynamics_tab/view.dart
@@ -41,7 +41,7 @@ class DynamicsTabPage extends CommonPage {
               itemCount: 10,
             ),
           ),
-          const SliverFillRemaining()
+          const SliverFillRemaining(),
         ],
       );
     }
@@ -135,61 +135,64 @@ class _DynamicsTabPageState
 
   Widget _buildBody(LoadingState<List<DynamicItemModel>?> loadingState) {
     return switch (loadingState) {
-      Loading() =>
-        DynamicsTabPage.dynSkeleton(GlobalData().dynamicsWaterfallFlow),
-      Success(:var response) => response?.isNotEmpty == true
-          ? GlobalData().dynamicsWaterfallFlow
-              ? SliverWaterfallFlow.extent(
-                  maxCrossAxisExtent: Grid.smallCardWidth * 2,
-                  crossAxisSpacing: StyleString.cardSpace / 2,
-                  lastChildLayoutTypeBuilder: (index) {
-                    if (index == response.length - 1) {
-                      controller.onLoadMore();
-                    }
-                    return index == response.length
-                        ? LastChildLayoutType.foot
-                        : LastChildLayoutType.none;
-                  },
-                  children: [
-                    for (int index = 0; index < response!.length; index++)
-                      DynamicPanel(
-                        item: response[index],
-                        onRemove: (idStr) => controller.onRemove(index, idStr),
-                        onBlock: () => controller.onBlock(index),
-                      )
-                  ],
-                )
-              : SliverCrossAxisGroup(
-                  slivers: [
-                    const SliverFillRemaining(),
-                    SliverConstrainedCrossAxis(
-                      maxExtent: Grid.smallCardWidth * 2,
-                      sliver: SliverList.builder(
-                        itemBuilder: (context, index) {
-                          if (index == response.length - 1) {
-                            controller.onLoadMore();
-                          }
-                          final item = response[index];
-                          return DynamicPanel(
-                            item: item,
+      Loading() => DynamicsTabPage.dynSkeleton(
+        GlobalData().dynamicsWaterfallFlow,
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? GlobalData().dynamicsWaterfallFlow
+                  ? SliverWaterfallFlow.extent(
+                      maxCrossAxisExtent: Grid.smallCardWidth * 2,
+                      crossAxisSpacing: StyleString.cardSpace / 2,
+                      lastChildLayoutTypeBuilder: (index) {
+                        if (index == response.length - 1) {
+                          controller.onLoadMore();
+                        }
+                        return index == response.length
+                            ? LastChildLayoutType.foot
+                            : LastChildLayoutType.none;
+                      },
+                      children: [
+                        for (int index = 0; index < response!.length; index++)
+                          DynamicPanel(
+                            item: response[index],
                             onRemove: (idStr) =>
                                 controller.onRemove(index, idStr),
                             onBlock: () => controller.onBlock(index),
-                          );
-                        },
-                        itemCount: response!.length,
-                      ),
-                    ),
-                    const SliverFillRemaining(),
-                  ],
-                )
-          : HttpError(
-              onReload: controller.onReload,
-            ),
+                          ),
+                      ],
+                    )
+                  : SliverCrossAxisGroup(
+                      slivers: [
+                        const SliverFillRemaining(),
+                        SliverConstrainedCrossAxis(
+                          maxExtent: Grid.smallCardWidth * 2,
+                          sliver: SliverList.builder(
+                            itemBuilder: (context, index) {
+                              if (index == response.length - 1) {
+                                controller.onLoadMore();
+                              }
+                              final item = response[index];
+                              return DynamicPanel(
+                                item: item,
+                                onRemove: (idStr) =>
+                                    controller.onRemove(index, idStr),
+                                onBlock: () => controller.onBlock(index),
+                              );
+                            },
+                            itemCount: response!.length,
+                          ),
+                        ),
+                        const SliverFillRemaining(),
+                      ],
+                    )
+            : HttpError(
+                onReload: controller.onReload,
+              ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/dynamics_topic/view.dart b/lib/pages/dynamics_topic/view.dart
index 111443ced..37bf391e5 100644
--- a/lib/pages/dynamics_topic/view.dart
+++ b/lib/pages/dynamics_topic/view.dart
@@ -34,8 +34,10 @@ class DynTopicPage extends StatefulWidget {
 }
 
 class _DynTopicPageState extends State<DynTopicPage> {
-  final DynTopicController _controller =
-      Get.put(DynTopicController(), tag: Utils.generateRandomString(8));
+  final DynTopicController _controller = Get.put(
+    DynTopicController(),
+    tag: Utils.generateRandomString(8),
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -82,17 +84,22 @@ class _DynTopicPageState extends State<DynTopicPage> {
                         child: Builder(
                           builder: (context) {
                             return Padding(
-                              padding:
-                                  const EdgeInsets.only(left: 12, bottom: 6),
+                              padding: const EdgeInsets.only(
+                                left: 12,
+                                bottom: 6,
+                              ),
                               child: ToggleButtons(
                                 fillColor: theme.colorScheme.secondaryContainer,
                                 selectedColor:
                                     theme.colorScheme.onSecondaryContainer,
                                 constraints: const BoxConstraints(
-                                    minWidth: 54, minHeight: 24),
+                                  minWidth: 54,
+                                  minHeight: 24,
+                                ),
                                 tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                                borderRadius:
-                                    const BorderRadius.all(Radius.circular(25)),
+                                borderRadius: const BorderRadius.all(
+                                  Radius.circular(25),
+                                ),
                                 onPressed: (index) {
                                   _controller.onSort(allSortBy[index].sortBy!);
                                   (context as Element).markNeedsBuild();
@@ -173,7 +180,8 @@ class _DynTopicPageState extends State<DynTopicPage> {
                   child: GestureDetector(
                     behavior: HitTestBehavior.opaque,
                     onTap: () => Get.toNamed(
-                        '/member?mid=${response.topicCreator!.uid}'),
+                      '/member?mid=${response.topicCreator!.uid}',
+                    ),
                     child: Row(
                       mainAxisSize: MainAxisSize.min,
                       children: [
@@ -226,15 +234,18 @@ class _DynTopicPageState extends State<DynTopicPage> {
                       style: OutlinedButton.styleFrom(
                         side: BorderSide(
                           width: 1,
-                          color:
-                              theme.colorScheme.outline.withValues(alpha: 0.2),
+                          color: theme.colorScheme.outline.withValues(
+                            alpha: 0.2,
+                          ),
                         ),
                         foregroundColor: _controller.isLike.value == true
                             ? null
                             : theme.colorScheme.onSurfaceVariant,
                         padding: const EdgeInsets.symmetric(horizontal: 10),
-                        visualDensity:
-                            const VisualDensity(horizontal: -4, vertical: -4),
+                        visualDensity: const VisualDensity(
+                          horizontal: -4,
+                          vertical: -4,
+                        ),
                         tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                       ),
                       onPressed: _controller.onLike,
@@ -252,15 +263,18 @@ class _DynTopicPageState extends State<DynTopicPage> {
                       style: OutlinedButton.styleFrom(
                         side: BorderSide(
                           width: 1,
-                          color:
-                              theme.colorScheme.outline.withValues(alpha: 0.2),
+                          color: theme.colorScheme.outline.withValues(
+                            alpha: 0.2,
+                          ),
                         ),
                         foregroundColor: _controller.isFav.value == true
                             ? null
                             : theme.colorScheme.onSurfaceVariant,
                         padding: const EdgeInsets.symmetric(horizontal: 10),
-                        visualDensity:
-                            const VisualDensity(horizontal: -4, vertical: -4),
+                        visualDensity: const VisualDensity(
+                          horizontal: -4,
+                          vertical: -4,
+                        ),
                         tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                       ),
                       onPressed: _controller.onFav,
@@ -282,9 +296,9 @@ class _DynTopicPageState extends State<DynTopicPage> {
           actions: [
             IconButton(
               onPressed: () => Utils.shareText(
-                  '${_controller.topicName} https://m.bilibili.com/topic-detail?topic_id=${_controller.topicId}')
+                '${_controller.topicName} https://m.bilibili.com/topic-detail?topic_id=${_controller.topicId}',
+              ),
               // https://www.bilibili.com/v/topic/detail?topic_id=${_controller.topicId}
-              ,
               icon: const Icon(MdiIcons.share),
             ),
             PopupMenuButton(
@@ -293,7 +307,8 @@ class _DynTopicPageState extends State<DynTopicPage> {
                   PopupMenuItem(
                     onTap: _controller.onFav,
                     child: Text(
-                        '${_controller.isFav.value == true ? '取消' : ''}收藏'),
+                      '${_controller.isFav.value == true ? '取消' : ''}收藏',
+                    ),
                   ),
                   PopupMenuItem(
                     child: const Text('举报'),
@@ -304,7 +319,8 @@ class _DynTopicPageState extends State<DynTopicPage> {
                       }
                       final isDark = Get.isDarkMode;
                       PageUtils.inAppWebview(
-                          'https://www.bilibili.com/h5/topic-active/topic-report?topic_id=${_controller.topicId}&topic_name=${_controller.topicName}&native.theme=${isDark ? 2 : 1}&night=${isDark ? 1 : 0}');
+                        'https://www.bilibili.com/h5/topic-active/topic-report?topic_id=${_controller.topicId}&topic_name=${_controller.topicName}&native.theme=${isDark ? 2 : 1}&night=${isDark ? 1 : 0}',
+                      );
                     },
                   ),
                 ];
@@ -314,69 +330,71 @@ class _DynTopicPageState extends State<DynTopicPage> {
           ],
         ),
       _ => SliverAppBar(
-          pinned: true,
-          title: Text(_controller.topicName),
-        ),
+        pinned: true,
+        title: Text(_controller.topicName),
+      ),
     };
   }
 
   Widget _buildBody(LoadingState<List<TopicCardItem>?> loadingState) {
     return switch (loadingState) {
-      Loading() =>
-        DynamicsTabPage.dynSkeleton(GlobalData().dynamicsWaterfallFlow),
-      Success(:var response) => response?.isNotEmpty == true
-          ? GlobalData().dynamicsWaterfallFlow
-              ? SliverWaterfallFlow.extent(
-                  maxCrossAxisExtent: Grid.smallCardWidth * 2,
-                  crossAxisSpacing: StyleString.cardSpace / 2,
-                  lastChildLayoutTypeBuilder: (index) {
-                    if (index == response.length - 1) {
-                      _controller.onLoadMore();
-                    }
-                    return index == response.length
-                        ? LastChildLayoutType.foot
-                        : LastChildLayoutType.none;
-                  },
-                  children: [
-                    for (var item in response!)
-                      if (item.dynamicCardItem != null)
-                        DynamicPanel(item: item.dynamicCardItem!)
-                      else
-                        Text(item.topicType ?? 'err'),
-                  ],
-                )
-              : SliverCrossAxisGroup(
-                  slivers: [
-                    const SliverFillRemaining(),
-                    SliverConstrainedCrossAxis(
-                      maxExtent: Grid.smallCardWidth * 2,
-                      sliver: SliverList.builder(
-                        itemBuilder: (context, index) {
-                          if (index == response.length - 1) {
-                            _controller.onLoadMore();
-                          }
-                          final item = response[index];
-                          if (item.dynamicCardItem != null) {
-                            return DynamicPanel(
-                              item: item.dynamicCardItem!,
-                            );
-                          } else {
-                            return Text(item.topicType ?? 'err');
-                          }
-                        },
-                        itemCount: response!.length,
-                      ),
-                    ),
-                    const SliverFillRemaining(),
-                  ],
-                )
-          : HttpError(
-              onReload: _controller.onReload,
-            ),
+      Loading() => DynamicsTabPage.dynSkeleton(
+        GlobalData().dynamicsWaterfallFlow,
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? GlobalData().dynamicsWaterfallFlow
+                  ? SliverWaterfallFlow.extent(
+                      maxCrossAxisExtent: Grid.smallCardWidth * 2,
+                      crossAxisSpacing: StyleString.cardSpace / 2,
+                      lastChildLayoutTypeBuilder: (index) {
+                        if (index == response.length - 1) {
+                          _controller.onLoadMore();
+                        }
+                        return index == response.length
+                            ? LastChildLayoutType.foot
+                            : LastChildLayoutType.none;
+                      },
+                      children: [
+                        for (var item in response!)
+                          if (item.dynamicCardItem != null)
+                            DynamicPanel(item: item.dynamicCardItem!)
+                          else
+                            Text(item.topicType ?? 'err'),
+                      ],
+                    )
+                  : SliverCrossAxisGroup(
+                      slivers: [
+                        const SliverFillRemaining(),
+                        SliverConstrainedCrossAxis(
+                          maxExtent: Grid.smallCardWidth * 2,
+                          sliver: SliverList.builder(
+                            itemBuilder: (context, index) {
+                              if (index == response.length - 1) {
+                                _controller.onLoadMore();
+                              }
+                              final item = response[index];
+                              if (item.dynamicCardItem != null) {
+                                return DynamicPanel(
+                                  item: item.dynamicCardItem!,
+                                );
+                              } else {
+                                return Text(item.topicType ?? 'err');
+                              }
+                            },
+                            itemCount: response!.length,
+                          ),
+                        ),
+                        const SliverFillRemaining(),
+                      ],
+                    )
+            : HttpError(
+                onReload: _controller.onReload,
+              ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/dynamics_topic_rcmd/view.dart b/lib/pages/dynamics_topic_rcmd/view.dart
index 0bcb0fc64..d23d35e92 100644
--- a/lib/pages/dynamics_topic_rcmd/view.dart
+++ b/lib/pages/dynamics_topic_rcmd/view.dart
@@ -46,27 +46,28 @@ class _DynTopicRcmdPageState extends State<DynTopicRcmdPage> {
   Widget _buildBody(LoadingState<List<TopicItem>?> loadingState) {
     return switch (loadingState) {
       Loading() => linearLoading,
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverList.builder(
-              itemCount: response!.length,
-              itemBuilder: (context, index) {
-                return DynTopicItem(
-                  item: response[index],
-                  onTap: (item) => Get.toNamed(
-                    '/dynTopic',
-                    parameters: {
-                      'id': item.id.toString(),
-                      'name': item.name,
-                    },
-                  ),
-                );
-              },
-            )
-          : HttpError(onReload: _controller.onReload),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverList.builder(
+                itemCount: response!.length,
+                itemBuilder: (context, index) {
+                  return DynTopicItem(
+                    item: response[index],
+                    onTap: (item) => Get.toNamed(
+                      '/dynTopic',
+                      parameters: {
+                        'id': item.id.toString(),
+                        'name': item.name,
+                      },
+                    ),
+                  );
+                },
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/emote/controller.dart b/lib/pages/emote/controller.dart
index 11d20ce4e..f50bdc1aa 100644
--- a/lib/pages/emote/controller.dart
+++ b/lib/pages/emote/controller.dart
@@ -18,8 +18,10 @@ class EmotePanelController extends CommonListController<List<Package>?, Package>
   @override
   bool customHandleResponse(bool isRefresh, Success<List<Package>?> response) {
     if (response.response?.isNotEmpty == true) {
-      tabController =
-          TabController(length: response.response!.length, vsync: this);
+      tabController = TabController(
+        length: response.response!.length,
+        vsync: this,
+      );
     }
     loadingState.value = response;
     return true;
diff --git a/lib/pages/emote/view.dart b/lib/pages/emote/view.dart
index 97c780d92..11d63c61a 100644
--- a/lib/pages/emote/view.dart
+++ b/lib/pages/emote/view.dart
@@ -22,8 +22,9 @@ class EmotePanel extends StatefulWidget {
 
 class _EmotePanelState extends State<EmotePanel>
     with AutomaticKeepAliveClientMixin {
-  final EmotePanelController _emotePanelController =
-      Get.put(EmotePanelController());
+  final EmotePanelController _emotePanelController = Get.put(
+    EmotePanelController(),
+  );
 
   @override
   bool get wantKeepAlive => true;
@@ -33,179 +34,193 @@ class _EmotePanelState extends State<EmotePanel>
     super.build(context);
     final ThemeData theme = Theme.of(context);
     return Obx(
-        () => _buildBody(theme, _emotePanelController.loadingState.value));
+      () => _buildBody(theme, _emotePanelController.loadingState.value),
+    );
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<Package>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<Package>?> loadingState,
+  ) {
     late final color = Get.currentRoute.startsWith('/whisperDetail')
         ? theme.colorScheme.surface
         : theme.colorScheme.onInverseSurface;
     return switch (loadingState) {
       Loading() => loadingWidget,
-      Success(:var response) => response?.isNotEmpty == true
-          ? Column(
-              children: [
-                Expanded(
-                  child: tabBarView(
-                    controller: _emotePanelController.tabController,
-                    children: response!.map(
-                      (e) {
-                        double size = e.emote!.first.meta!.size == 1 ? 40 : 60;
-                        bool isTextEmote = e.type == 4;
-                        return GridView.builder(
-                          padding: const EdgeInsets.only(
-                              left: 12, right: 12, bottom: 12),
-                          gridDelegate:
-                              SliverGridDelegateWithMaxCrossAxisExtent(
-                            maxCrossAxisExtent: isTextEmote ? 100 : size,
-                            crossAxisSpacing: 8,
-                            mainAxisSpacing: 8,
-                            mainAxisExtent: size,
-                          ),
-                          itemCount: e.emote!.length,
-                          itemBuilder: (context, index) {
-                            final item = e.emote![index];
-                            Widget child = Padding(
-                              padding: const EdgeInsets.all(6),
-                              child: isTextEmote
-                                  ? Center(
-                                      child: Text(
-                                        item.text!,
-                                        overflow: TextOverflow.clip,
-                                        maxLines: 1,
-                                      ),
-                                    )
-                                  : NetworkImgLayer(
-                                      src: item.url!,
-                                      width: size,
-                                      height: size,
-                                      type: ImageType.emote,
-                                      boxFit: BoxFit.contain,
-                                    ),
-                            );
-                            if (!isTextEmote) {
-                              child = CustomTooltip(
-                                indicator: () => CustomPaint(
-                                  size: const Size(14, 8),
-                                  painter: TrianglePainter(color),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? Column(
+                children: [
+                  Expanded(
+                    child: tabBarView(
+                      controller: _emotePanelController.tabController,
+                      children: response!.map(
+                        (e) {
+                          double size = e.emote!.first.meta!.size == 1
+                              ? 40
+                              : 60;
+                          bool isTextEmote = e.type == 4;
+                          return GridView.builder(
+                            padding: const EdgeInsets.only(
+                              left: 12,
+                              right: 12,
+                              bottom: 12,
+                            ),
+                            gridDelegate:
+                                SliverGridDelegateWithMaxCrossAxisExtent(
+                                  maxCrossAxisExtent: isTextEmote ? 100 : size,
+                                  crossAxisSpacing: 8,
+                                  mainAxisSpacing: 8,
+                                  mainAxisExtent: size,
                                 ),
-                                overlayWidget: () => Container(
-                                  padding: const EdgeInsets.all(8),
-                                  decoration: BoxDecoration(
-                                    color: color,
-                                    borderRadius: const BorderRadius.all(
-                                        Radius.circular(8)),
-                                  ),
-                                  child: Column(
-                                    spacing: 4,
-                                    mainAxisSize: MainAxisSize.min,
-                                    children: [
-                                      NetworkImgLayer(
+                            itemCount: e.emote!.length,
+                            itemBuilder: (context, index) {
+                              final item = e.emote![index];
+                              Widget child = Padding(
+                                padding: const EdgeInsets.all(6),
+                                child: isTextEmote
+                                    ? Center(
+                                        child: Text(
+                                          item.text!,
+                                          overflow: TextOverflow.clip,
+                                          maxLines: 1,
+                                        ),
+                                      )
+                                    : NetworkImgLayer(
                                         src: item.url!,
-                                        width: 65,
-                                        height: 65,
+                                        width: size,
+                                        height: size,
                                         type: ImageType.emote,
                                         boxFit: BoxFit.contain,
                                       ),
-                                      Text(
-                                        item.meta?.alias ??
-                                            item.text!.substring(
-                                                1, item.text!.length - 1),
-                                        style: const TextStyle(fontSize: 12),
-                                      ),
-                                    ],
-                                  ),
-                                ),
-                                child: child,
                               );
-                            }
-                            return Material(
-                              type: MaterialType.transparency,
-                              child: InkWell(
-                                borderRadius:
-                                    const BorderRadius.all(Radius.circular(6)),
-                                onTap: () => widget.onChoose(
+                              if (!isTextEmote) {
+                                child = CustomTooltip(
+                                  indicator: () => CustomPaint(
+                                    size: const Size(14, 8),
+                                    painter: TrianglePainter(color),
+                                  ),
+                                  overlayWidget: () => Container(
+                                    padding: const EdgeInsets.all(8),
+                                    decoration: BoxDecoration(
+                                      color: color,
+                                      borderRadius: const BorderRadius.all(
+                                        Radius.circular(8),
+                                      ),
+                                    ),
+                                    child: Column(
+                                      spacing: 4,
+                                      mainAxisSize: MainAxisSize.min,
+                                      children: [
+                                        NetworkImgLayer(
+                                          src: item.url!,
+                                          width: 65,
+                                          height: 65,
+                                          type: ImageType.emote,
+                                          boxFit: BoxFit.contain,
+                                        ),
+                                        Text(
+                                          item.meta?.alias ??
+                                              item.text!.substring(
+                                                1,
+                                                item.text!.length - 1,
+                                              ),
+                                          style: const TextStyle(fontSize: 12),
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+                                  child: child,
+                                );
+                              }
+                              return Material(
+                                type: MaterialType.transparency,
+                                child: InkWell(
+                                  borderRadius: const BorderRadius.all(
+                                    Radius.circular(6),
+                                  ),
+                                  onTap: () => widget.onChoose(
                                     item,
                                     isTextEmote
                                         ? null
                                         : e.emote!.first.meta!.size == 1
-                                            ? 24
-                                            : 42,
-                                    null),
-                                child: child,
-                              ),
-                            );
-                          },
-                        );
-                      },
-                    ).toList(),
-                  ),
-                ),
-                Divider(
-                  height: 1,
-                  color: theme.dividerColor.withValues(alpha: 0.1),
-                ),
-                Row(
-                  children: [
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 10),
-                      child: iconButton(
-                        iconSize: 20,
-                        iconColor: theme.colorScheme.onSurfaceVariant
-                            .withValues(alpha: 0.8),
-                        bgColor: Colors.transparent,
-                        context: context,
-                        onPressed: () => Get.toNamed(
-                          '/webview',
-                          parameters: {
-                            'url':
-                                'https://www.bilibili.com/h5/mall/emoji-package/home?navhide=1&native.theme=1&night=${Get.isDarkMode ? 1 : 0}',
-                          },
-                        ),
-                        icon: Icons.settings,
-                      ),
-                    ),
-                    Expanded(
-                      child: Material(
-                        type: MaterialType.transparency,
-                        child: TabBar(
-                          controller: _emotePanelController.tabController,
-                          padding: const EdgeInsets.only(right: 60),
-                          dividerColor: Colors.transparent,
-                          dividerHeight: 0,
-                          isScrollable: true,
-                          tabs: response
-                              .map(
-                                (e) => Padding(
-                                  padding: const EdgeInsets.all(8),
-                                  child: NetworkImgLayer(
-                                    width: 24,
-                                    height: 24,
-                                    type: ImageType.emote,
-                                    src: e.url,
+                                        ? 24
+                                        : 42,
+                                    null,
                                   ),
+                                  child: child,
                                 ),
-                              )
-                              .toList(),
+                              );
+                            },
+                          );
+                        },
+                      ).toList(),
+                    ),
+                  ),
+                  Divider(
+                    height: 1,
+                    color: theme.dividerColor.withValues(alpha: 0.1),
+                  ),
+                  Row(
+                    children: [
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 10),
+                        child: iconButton(
+                          iconSize: 20,
+                          iconColor: theme.colorScheme.onSurfaceVariant
+                              .withValues(alpha: 0.8),
+                          bgColor: Colors.transparent,
+                          context: context,
+                          onPressed: () => Get.toNamed(
+                            '/webview',
+                            parameters: {
+                              'url':
+                                  'https://www.bilibili.com/h5/mall/emoji-package/home?navhide=1&native.theme=1&night=${Get.isDarkMode ? 1 : 0}',
+                            },
+                          ),
+                          icon: Icons.settings,
                         ),
                       ),
-                    ),
-                  ],
-                ),
-                SizedBox(height: MediaQuery.paddingOf(context).bottom),
-              ],
-            )
-          : _errorWidget(),
+                      Expanded(
+                        child: Material(
+                          type: MaterialType.transparency,
+                          child: TabBar(
+                            controller: _emotePanelController.tabController,
+                            padding: const EdgeInsets.only(right: 60),
+                            dividerColor: Colors.transparent,
+                            dividerHeight: 0,
+                            isScrollable: true,
+                            tabs: response
+                                .map(
+                                  (e) => Padding(
+                                    padding: const EdgeInsets.all(8),
+                                    child: NetworkImgLayer(
+                                      width: 24,
+                                      height: 24,
+                                      type: ImageType.emote,
+                                      src: e.url,
+                                    ),
+                                  ),
+                                )
+                                .toList(),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                  SizedBox(height: MediaQuery.paddingOf(context).bottom),
+                ],
+              )
+            : _errorWidget(),
       Error(:var errMsg) => _errorWidget(errMsg),
     };
   }
 
   Widget _errorWidget([String? errMsg]) => Center(
-        child: TextButton.icon(
-          onPressed: _emotePanelController.onReload,
-          icon: const Icon(Icons.refresh),
-          label: Text(errMsg ?? '没有数据'),
-        ),
-      );
+    child: TextButton.icon(
+      onPressed: _emotePanelController.onReload,
+      icon: const Icon(Icons.refresh),
+      label: Text(errMsg ?? '没有数据'),
+    ),
+  );
 }
diff --git a/lib/pages/episode_panel/view.dart b/lib/pages/episode_panel/view.dart
index c33d9a737..db7833042 100644
--- a/lib/pages/episode_panel/view.dart
+++ b/lib/pages/episode_panel/view.dart
@@ -100,9 +100,9 @@ class _EpisodePanelState extends CommonSlidePageState<EpisodePanel> {
   // item
   late int _currentItemIndex;
   int get _findCurrentItemIndex => max(
-        0,
-        _getCurrEpisodes.indexWhere((item) => item.cid == widget.cid),
-      );
+    0,
+    _getCurrEpisodes.indexWhere((item) => item.cid == widget.cid),
+  );
 
   late final List<bool> _isReversed;
   late final List<ItemScrollController> _itemScrollController;
@@ -152,8 +152,10 @@ class _EpisodePanelState extends CommonSlidePageState<EpisodePanel> {
   @override
   void initState() {
     super.initState();
-    _itemScrollController =
-        List.generate(widget.list.length, (_) => ItemScrollController());
+    _itemScrollController = List.generate(
+      widget.list.length,
+      (_) => ItemScrollController(),
+    );
     _isReversed = List.generate(widget.list.length, (_) => false);
 
     if (widget.type == EpisodeType.season && Accounts.main.isLogin) {
@@ -176,8 +178,9 @@ class _EpisodePanelState extends CommonSlidePageState<EpisodePanel> {
         });
         WidgetsBinding.instance.addPostFrameCallback((_) {
           try {
-            _itemScrollController[widget.initialTabIndex]
-                .jumpTo(index: _currentItemIndex);
+            _itemScrollController[widget.initialTabIndex].jumpTo(
+              index: _currentItemIndex,
+            );
           } catch (_) {}
         });
       }
@@ -208,13 +211,13 @@ class _EpisodePanelState extends CommonSlidePageState<EpisodePanel> {
     final isMulti = widget.type == EpisodeType.season && widget.list.length > 1;
 
     Widget tabbar() => TabBar(
-          controller: _tabController,
-          padding: const EdgeInsets.only(right: 60),
-          isScrollable: true,
-          tabs: widget.list.map((item) => Tab(text: item.title)).toList(),
-          dividerHeight: 1,
-          dividerColor: theme.dividerColor.withValues(alpha: 0.1),
-        );
+      controller: _tabController,
+      padding: const EdgeInsets.only(right: 60),
+      isScrollable: true,
+      tabs: widget.list.map((item) => Tab(text: item.title)).toList(),
+      dividerHeight: 1,
+      dividerColor: theme.dividerColor.withValues(alpha: 0.1),
+    );
 
     if (isMulti && enableSlide) {
       return CustomTabBarView(
@@ -303,13 +306,15 @@ class _EpisodePanelState extends CommonSlidePageState<EpisodePanel> {
                     episodeItem,
                     Padding(
                       padding: const EdgeInsets.symmetric(
-                          horizontal: 12, vertical: 5),
+                        horizontal: 12,
+                        vertical: 5,
+                      ),
                       child: PagesPanel(
                         list:
                             widget.initialTabIndex == _currentTabIndex.value &&
-                                    itemIndex == _currentItemIndex
-                                ? null
-                                : episode.pages,
+                                itemIndex == _currentItemIndex
+                            ? null
+                            : episode.pages,
                         cover: episode.arc?.pic,
                         heroTag: widget.heroTag,
                         videoIntroController: widget.videoIntroController,
@@ -411,8 +416,8 @@ class _EpisodePanelState extends CommonSlidePageState<EpisodePanel> {
             if (widget.type == EpisodeType.season) {
               try {
                 Get.find<VideoDetailController>(
-                        tag: widget.videoIntroController.heroTag)
-                    .seasonCid = episode.cid;
+                  tag: widget.videoIntroController.heroTag,
+                ).seasonCid = episode.cid;
               } catch (_) {}
             }
           },
@@ -541,135 +546,134 @@ class _EpisodePanelState extends CommonSlidePageState<EpisodePanel> {
   Widget _buildFavBtn(LoadingState loadingState) {
     return switch (loadingState) {
       Success(:var response) => mediumButton(
-          tooltip: response ? '取消订阅' : '订阅',
-          icon: response
-              ? Icons.notifications_off_outlined
-              : Icons.notifications_active_outlined,
-          onPressed: () async {
-            var result = await FavHttp.seasonFav(
-              isFav: response,
-              seasonId: widget.seasonId,
-            );
-            if (result['status']) {
-              SmartDialog.showToast('${response ? '取消' : ''}订阅成功');
-              _favState!.value = Success(!response);
-            } else {
-              SmartDialog.showToast(result['msg']);
-            }
-          },
-        ),
+        tooltip: response ? '取消订阅' : '订阅',
+        icon: response
+            ? Icons.notifications_off_outlined
+            : Icons.notifications_active_outlined,
+        onPressed: () async {
+          var result = await FavHttp.seasonFav(
+            isFav: response,
+            seasonId: widget.seasonId,
+          );
+          if (result['status']) {
+            SmartDialog.showToast('${response ? '取消' : ''}订阅成功');
+            _favState!.value = Success(!response);
+          } else {
+            SmartDialog.showToast(result['msg']);
+          }
+        },
+      ),
       _ => const SizedBox.shrink(),
     };
   }
 
   Widget get _buildReverseBtn => mediumButton(
-        tooltip: widget.isReversed == true ? '正序播放' : '倒序播放',
-        icon: widget.isReversed == true
-            ? MdiIcons.sortDescending
-            : MdiIcons.sortAscending,
-        onPressed: () => widget.onReverse?.call(),
-      );
+    tooltip: widget.isReversed == true ? '正序播放' : '倒序播放',
+    icon: widget.isReversed == true
+        ? MdiIcons.sortDescending
+        : MdiIcons.sortAscending,
+    onPressed: () => widget.onReverse?.call(),
+  );
 
   Widget _buildToolbar(ThemeData theme) => Container(
-        height: 45,
-        padding: EdgeInsets.symmetric(horizontal: widget.showTitle ? 14 : 6),
-        decoration: BoxDecoration(
-          border: Border(
-            bottom: BorderSide(
-              color: theme.dividerColor.withValues(alpha: 0.1),
-            ),
+    height: 45,
+    padding: EdgeInsets.symmetric(horizontal: widget.showTitle ? 14 : 6),
+    decoration: BoxDecoration(
+      border: Border(
+        bottom: BorderSide(
+          color: theme.dividerColor.withValues(alpha: 0.1),
+        ),
+      ),
+    ),
+    child: Row(
+      children: [
+        if (widget.showTitle)
+          Text(
+            widget.type.title,
+            style: theme.textTheme.titleMedium,
           ),
+        if (_favState != null) Obx(() => _buildFavBtn(_favState!.value)),
+        mediumButton(
+          tooltip: '跳至顶部',
+          icon: Icons.vertical_align_top,
+          onPressed: () {
+            try {
+              final currentTabIndex = _currentTabIndex.value;
+              _itemScrollController[currentTabIndex].scrollTo(
+                index: !_isReversed[currentTabIndex]
+                    ? 0
+                    : _getCurrEpisodes.length - 1,
+                duration: const Duration(milliseconds: 200),
+              );
+            } catch (e) {
+              if (kDebugMode) debugPrint('to top: $e');
+            }
+          },
         ),
-        child: Row(
-          children: [
-            if (widget.showTitle)
-              Text(
-                widget.type.title,
-                style: theme.textTheme.titleMedium,
-              ),
-            if (_favState != null) Obx(() => _buildFavBtn(_favState!.value)),
-            mediumButton(
-              tooltip: '跳至顶部',
-              icon: Icons.vertical_align_top,
-              onPressed: () {
-                try {
-                  final currentTabIndex = _currentTabIndex.value;
-                  _itemScrollController[currentTabIndex].scrollTo(
-                    index: !_isReversed[currentTabIndex]
-                        ? 0
-                        : _getCurrEpisodes.length - 1,
-                    duration: const Duration(milliseconds: 200),
-                  );
-                } catch (e) {
-                  if (kDebugMode) debugPrint('to top: $e');
-                }
-              },
-            ),
-            mediumButton(
-              tooltip: '跳至底部',
-              icon: Icons.vertical_align_bottom,
-              onPressed: () {
-                try {
-                  final currentTabIndex = _currentTabIndex.value;
-                  _itemScrollController[currentTabIndex].scrollTo(
-                    index: !_isReversed[currentTabIndex]
-                        ? _getCurrEpisodes.length - 1
-                        : 0,
-                    duration: const Duration(milliseconds: 200),
-                  );
-                } catch (e) {
-                  if (kDebugMode) debugPrint('to bottom: $e');
-                }
-              },
-            ),
-            mediumButton(
-              tooltip: '跳至当前',
-              icon: Icons.my_location,
-              onPressed: () async {
-                try {
-                  final currentTabIndex = _currentTabIndex.value;
-                  if (currentTabIndex != widget.initialTabIndex) {
-                    _tabController.animateTo(widget.initialTabIndex);
-                    await Future.delayed(const Duration(milliseconds: 225));
-                  }
-                  _itemScrollController[currentTabIndex].scrollTo(
-                    index: _currentItemIndex,
-                    duration: const Duration(milliseconds: 200),
-                  );
-                } catch (_) {}
-              },
-            ),
-            if (widget.isSupportReverse == true)
-              Obx(
-                () {
-                  return _currentTabIndex.value == widget.initialTabIndex
-                      ? _buildReverseBtn
-                      : const SizedBox.shrink();
-                },
-              ),
-            const Spacer(),
-            Obx(
-              () {
-                final currentTabIndex = _currentTabIndex.value;
-                return mediumButton(
-                  tooltip: _isReversed[currentTabIndex] ? '顺序' : '倒序',
-                  icon: !_isReversed[currentTabIndex]
-                      ? MdiIcons.sortNumericAscending
-                      : MdiIcons.sortNumericDescending,
-                  onPressed: () => setState(() {
-                    _isReversed[currentTabIndex] =
-                        !_isReversed[currentTabIndex];
-                  }),
-                );
-              },
-            ),
-            if (widget.onClose != null)
-              mediumButton(
-                tooltip: '关闭',
-                icon: Icons.close,
-                onPressed: widget.onClose,
-              ),
-          ],
+        mediumButton(
+          tooltip: '跳至底部',
+          icon: Icons.vertical_align_bottom,
+          onPressed: () {
+            try {
+              final currentTabIndex = _currentTabIndex.value;
+              _itemScrollController[currentTabIndex].scrollTo(
+                index: !_isReversed[currentTabIndex]
+                    ? _getCurrEpisodes.length - 1
+                    : 0,
+                duration: const Duration(milliseconds: 200),
+              );
+            } catch (e) {
+              if (kDebugMode) debugPrint('to bottom: $e');
+            }
+          },
         ),
-      );
+        mediumButton(
+          tooltip: '跳至当前',
+          icon: Icons.my_location,
+          onPressed: () async {
+            try {
+              final currentTabIndex = _currentTabIndex.value;
+              if (currentTabIndex != widget.initialTabIndex) {
+                _tabController.animateTo(widget.initialTabIndex);
+                await Future.delayed(const Duration(milliseconds: 225));
+              }
+              _itemScrollController[currentTabIndex].scrollTo(
+                index: _currentItemIndex,
+                duration: const Duration(milliseconds: 200),
+              );
+            } catch (_) {}
+          },
+        ),
+        if (widget.isSupportReverse == true)
+          Obx(
+            () {
+              return _currentTabIndex.value == widget.initialTabIndex
+                  ? _buildReverseBtn
+                  : const SizedBox.shrink();
+            },
+          ),
+        const Spacer(),
+        Obx(
+          () {
+            final currentTabIndex = _currentTabIndex.value;
+            return mediumButton(
+              tooltip: _isReversed[currentTabIndex] ? '顺序' : '倒序',
+              icon: !_isReversed[currentTabIndex]
+                  ? MdiIcons.sortNumericAscending
+                  : MdiIcons.sortNumericDescending,
+              onPressed: () => setState(() {
+                _isReversed[currentTabIndex] = !_isReversed[currentTabIndex];
+              }),
+            );
+          },
+        ),
+        if (widget.onClose != null)
+          mediumButton(
+            tooltip: '关闭',
+            icon: Icons.close,
+            onPressed: widget.onClose,
+          ),
+      ],
+    ),
+  );
 }
diff --git a/lib/pages/exp_log/view.dart b/lib/pages/exp_log/view.dart
index c36d3fdc8..37aa9ddd3 100644
--- a/lib/pages/exp_log/view.dart
+++ b/lib/pages/exp_log/view.dart
@@ -47,78 +47,81 @@ class _ExpLogPageState extends State<ExpLogPage> {
   Widget _buildBody(LoadingState<List<CoinLogItem>?> loadingState) {
     return switch (loadingState) {
       Loading() => linearLoading,
-      Success(:var response) => response?.isNotEmpty == true
-          ? Builder(
-              builder: (context) {
-                final them = Theme.of(context);
-                final outline = them.colorScheme.outline.withValues(alpha: 0.1);
-                final divider = Divider(
-                  height: 1,
-                  color: outline,
-                );
-                final sliverDivider = SliverToBoxAdapter(
-                  child: divider,
-                );
-                final dividerV = VerticalDivider(
-                  width: 1,
-                  color: outline,
-                );
-                return SliverMainAxisGroup(
-                  slivers: [
-                    sliverDivider,
-                    SliverToBoxAdapter(
-                      child: ColoredBox(
-                        color: them.colorScheme.onInverseSurface,
-                        child: _item(
-                          const CoinLogItem(
-                            time: '时间',
-                            delta: '变化',
-                            reason: '原因',
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? Builder(
+                builder: (context) {
+                  final them = Theme.of(context);
+                  final outline = them.colorScheme.outline.withValues(
+                    alpha: 0.1,
+                  );
+                  final divider = Divider(
+                    height: 1,
+                    color: outline,
+                  );
+                  final sliverDivider = SliverToBoxAdapter(
+                    child: divider,
+                  );
+                  final dividerV = VerticalDivider(
+                    width: 1,
+                    color: outline,
+                  );
+                  return SliverMainAxisGroup(
+                    slivers: [
+                      sliverDivider,
+                      SliverToBoxAdapter(
+                        child: ColoredBox(
+                          color: them.colorScheme.onInverseSurface,
+                          child: _item(
+                            const CoinLogItem(
+                              time: '时间',
+                              delta: '变化',
+                              reason: '原因',
+                            ),
+                            dividerV,
+                            isHeader: true,
                           ),
-                          dividerV,
-                          isHeader: true,
                         ),
                       ),
-                    ),
-                    sliverDivider,
-                    SliverList.separated(
-                      itemCount: response!.length,
-                      itemBuilder: (context, index) {
-                        return _item(response[index], dividerV);
-                      },
-                      separatorBuilder: (context, index) => divider,
-                    ),
-                    sliverDivider,
-                  ],
-                );
-              },
-            )
-          : HttpError(onReload: _controller.onReload),
+                      sliverDivider,
+                      SliverList.separated(
+                        itemCount: response!.length,
+                        itemBuilder: (context, index) {
+                          return _item(response[index], dividerV);
+                        },
+                        separatorBuilder: (context, index) => divider,
+                      ),
+                      sliverDivider,
+                    ],
+                  );
+                },
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
   Widget _item(CoinLogItem item, Widget divider, {bool isHeader = false}) {
     Widget text(int flex, String text) => Expanded(
-          flex: flex,
-          child: Padding(
-            padding: isHeader
-                ? const EdgeInsets.symmetric(vertical: 6)
-                : const EdgeInsets.symmetric(vertical: 8),
-            child: Center(
-              child: Text(
-                text,
-                textAlign: TextAlign.center,
-                style: isHeader
-                    ? const TextStyle(fontSize: 13, fontWeight: FontWeight.bold)
-                    : const TextStyle(fontSize: 13),
-              ),
-            ),
+      flex: flex,
+      child: Padding(
+        padding: isHeader
+            ? const EdgeInsets.symmetric(vertical: 6)
+            : const EdgeInsets.symmetric(vertical: 8),
+        child: Center(
+          child: Text(
+            text,
+            textAlign: TextAlign.center,
+            style: isHeader
+                ? const TextStyle(fontSize: 13, fontWeight: FontWeight.bold)
+                : const TextStyle(fontSize: 13),
           ),
-        );
+        ),
+      ),
+    );
     Widget content = Row(
       children: [
         divider,
diff --git a/lib/pages/fan/controller.dart b/lib/pages/fan/controller.dart
index 517092d37..8052da531 100644
--- a/lib/pages/fan/controller.dart
+++ b/lib/pages/fan/controller.dart
@@ -25,11 +25,11 @@ class FansController extends CommonListController<FansData, FansItemModel> {
 
   @override
   Future<LoadingState<FansData>> customGetData() => FanHttp.fans(
-        vmid: mid,
-        pn: page,
-        ps: ps,
-        orderType: 'attention',
-      );
+    vmid: mid,
+    pn: page,
+    ps: ps,
+    orderType: 'attention',
+  );
 
   Future<void> onRemoveFan(int index, int mid) async {
     final res = await VideoHttp.relationMod(
diff --git a/lib/pages/fan/view.dart b/lib/pages/fan/view.dart
index 8673c488e..9bc746dac 100644
--- a/lib/pages/fan/view.dart
+++ b/lib/pages/fan/view.dart
@@ -38,7 +38,8 @@ class _FansPageState extends State<FansPage> {
   void initState() {
     super.initState();
     AccountService accountService = Get.find<AccountService>();
-    mid = widget.mid ??
+    mid =
+        widget.mid ??
         (Get.parameters['mid'] != null
             ? int.parse(Get.parameters['mid']!)
             : accountService.mid);
@@ -63,9 +64,11 @@ class _FansPageState extends State<FansPage> {
             slivers: [
               SliverPadding(
                 padding: EdgeInsets.only(
-                    bottom: MediaQuery.paddingOf(context).bottom + 80),
-                sliver:
-                    Obx(() => _buildBody(_fansController.loadingState.value)),
+                  bottom: MediaQuery.paddingOf(context).bottom + 80,
+                ),
+                sliver: Obx(
+                  () => _buildBody(_fansController.loadingState.value),
+                ),
               ),
             ],
           ),
@@ -77,80 +80,83 @@ class _FansPageState extends State<FansPage> {
   Widget _buildBody(LoadingState<List<FansItemModel>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
-            maxCrossAxisExtent: Grid.smallCardWidth * 2,
-            mainAxisExtent: 66,
-          ),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) {
-              return const MsgFeedTopSkeleton();
-            },
-            childCount: 16,
-          ),
+        gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
+          maxCrossAxisExtent: Grid.smallCardWidth * 2,
+          mainAxisExtent: 66,
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
-                maxCrossAxisExtent: Grid.smallCardWidth * 2,
-                mainAxisExtent: 66,
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            return const MsgFeedTopSkeleton();
+          },
+          childCount: 16,
+        ),
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
+                  maxCrossAxisExtent: Grid.smallCardWidth * 2,
+                  mainAxisExtent: 66,
+                ),
+                delegate: SliverChildBuilderDelegate(
+                  (BuildContext context, int index) {
+                    if (index == response.length - 1) {
+                      _fansController.onLoadMore();
+                    }
+                    final item = response[index];
+                    return ListTile(
+                      onTap: () {
+                        if (widget.onSelect != null) {
+                          widget.onSelect!(
+                            UserModel(
+                              mid: item.mid!,
+                              name: item.uname!,
+                              avatar: item.face!,
+                            ),
+                          );
+                          return;
+                        }
+                        Get.toNamed('/member?mid=${item.mid}');
+                      },
+                      onLongPress: widget.onSelect != null
+                          ? null
+                          : isOwner
+                          ? () => showConfirmDialog(
+                              context: context,
+                              title: '确定移除 ${item.uname} ？',
+                              onConfirm: () =>
+                                  _fansController.onRemoveFan(index, item.mid!),
+                            )
+                          : null,
+                      leading: NetworkImgLayer(
+                        width: 45,
+                        height: 45,
+                        type: ImageType.avatar,
+                        src: item.face,
+                      ),
+                      title: Text(
+                        item.uname!,
+                        style: const TextStyle(fontSize: 14),
+                      ),
+                      subtitle: Text(
+                        item.sign ?? '',
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                      dense: true,
+                      trailing: const SizedBox(width: 6),
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(
+                onReload: _fansController.onReload,
               ),
-              delegate: SliverChildBuilderDelegate(
-                (BuildContext context, int index) {
-                  if (index == response.length - 1) {
-                    _fansController.onLoadMore();
-                  }
-                  final item = response[index];
-                  return ListTile(
-                    onTap: () {
-                      if (widget.onSelect != null) {
-                        widget.onSelect!(UserModel(
-                          mid: item.mid!,
-                          name: item.uname!,
-                          avatar: item.face!,
-                        ));
-                        return;
-                      }
-                      Get.toNamed('/member?mid=${item.mid}');
-                    },
-                    onLongPress: widget.onSelect != null
-                        ? null
-                        : isOwner
-                            ? () => showConfirmDialog(
-                                  context: context,
-                                  title: '确定移除 ${item.uname} ？',
-                                  onConfirm: () => _fansController.onRemoveFan(
-                                      index, item.mid!),
-                                )
-                            : null,
-                    leading: NetworkImgLayer(
-                      width: 45,
-                      height: 45,
-                      type: ImageType.avatar,
-                      src: item.face,
-                    ),
-                    title: Text(
-                      item.uname!,
-                      style: const TextStyle(fontSize: 14),
-                    ),
-                    subtitle: Text(
-                      item.sign ?? '',
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                    ),
-                    dense: true,
-                    trailing: const SizedBox(width: 6),
-                  );
-                },
-                childCount: response!.length,
-              ),
-            )
-          : HttpError(
-              onReload: _fansController.onReload,
-            ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _fansController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _fansController.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/fav/article/view.dart b/lib/pages/fav/article/view.dart
index 8acd36cf4..39ed93f3a 100644
--- a/lib/pages/fav/article/view.dart
+++ b/lib/pages/fav/article/view.dart
@@ -20,8 +20,9 @@ class FavArticlePage extends StatefulWidget {
 
 class _FavArticlePageState extends State<FavArticlePage>
     with AutomaticKeepAliveClientMixin {
-  final FavArticleController _favArticleController =
-      Get.put(FavArticleController());
+  final FavArticleController _favArticleController = Get.put(
+    FavArticleController(),
+  );
 
   @override
   bool get wantKeepAlive => true;
@@ -40,8 +41,9 @@ class _FavArticlePageState extends State<FavArticlePage>
               top: StyleString.safeSpace - 5,
               bottom: MediaQuery.paddingOf(context).bottom + 80,
             ),
-            sliver:
-                Obx(() => _buildBody(_favArticleController.loadingState.value)),
+            sliver: Obx(
+              () => _buildBody(_favArticleController.loadingState.value),
+            ),
           ),
         ],
       ),
@@ -51,41 +53,42 @@ class _FavArticlePageState extends State<FavArticlePage>
   Widget _buildBody(LoadingState<List<FavArticleItemModel>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: Grid.videoCardHDelegate(context),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) {
-              return const VideoCardHSkeleton();
-            },
-            childCount: 10,
-          ),
+        gridDelegate: Grid.videoCardHDelegate(context),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            return const VideoCardHSkeleton();
+          },
+          childCount: 10,
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  if (index == response.length - 1) {
-                    _favArticleController.onLoadMore();
-                  }
-                  final item = response[index];
-                  return FavArticleItem(
-                    item: item,
-                    onDelete: () => showConfirmDialog(
-                      context: context,
-                      title: '确定取消收藏？',
-                      onConfirm: () =>
-                          _favArticleController.onRemove(index, item.opusId),
-                    ),
-                  );
-                },
-                childCount: response!.length,
-              ),
-            )
-          : HttpError(onReload: _favArticleController.onReload),
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    if (index == response.length - 1) {
+                      _favArticleController.onLoadMore();
+                    }
+                    final item = response[index];
+                    return FavArticleItem(
+                      item: item,
+                      onDelete: () => showConfirmDialog(
+                        context: context,
+                        title: '确定取消收藏？',
+                        onConfirm: () =>
+                            _favArticleController.onRemove(index, item.opusId),
+                      ),
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(onReload: _favArticleController.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _favArticleController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _favArticleController.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/fav/article/widget/item.dart b/lib/pages/fav/article/widget/item.dart
index 13898de83..30649150d 100644
--- a/lib/pages/fav/article/widget/item.dart
+++ b/lib/pages/fav/article/widget/item.dart
@@ -45,14 +45,17 @@ class FavArticleItem extends StatelessWidget {
                     AspectRatio(
                       aspectRatio: StyleString.aspectRatio,
                       child: LayoutBuilder(
-                        builder: (BuildContext context,
-                            BoxConstraints boxConstraints) {
-                          return NetworkImgLayer(
-                            src: item.cover!.url,
-                            width: boxConstraints.maxWidth,
-                            height: boxConstraints.maxHeight,
-                          );
-                        },
+                        builder:
+                            (
+                              BuildContext context,
+                              BoxConstraints boxConstraints,
+                            ) {
+                              return NetworkImgLayer(
+                                src: item.cover!.url,
+                                width: boxConstraints.maxWidth,
+                                height: boxConstraints.maxHeight,
+                              );
+                            },
                       ),
                     ),
                     const SizedBox(width: 10),
diff --git a/lib/pages/fav/note/child_view.dart b/lib/pages/fav/note/child_view.dart
index 2d707786e..ba4c26866 100644
--- a/lib/pages/fav/note/child_view.dart
+++ b/lib/pages/fav/note/child_view.dart
@@ -22,8 +22,10 @@ class FavNoteChildPage extends StatefulWidget {
 
 class _FavNoteChildPageState extends State<FavNoteChildPage>
     with AutomaticKeepAliveClientMixin {
-  late final FavNoteController _favNoteController =
-      Get.put(FavNoteController(widget.isPublish), tag: '${widget.isPublish}');
+  late final FavNoteController _favNoteController = Get.put(
+    FavNoteController(widget.isPublish),
+    tag: '${widget.isPublish}',
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -41,9 +43,11 @@ class _FavNoteChildPageState extends State<FavNoteChildPage>
               slivers: [
                 SliverPadding(
                   padding: EdgeInsets.only(
-                      bottom: MediaQuery.paddingOf(context).bottom + 80),
+                    bottom: MediaQuery.paddingOf(context).bottom + 80,
+                  ),
                   sliver: Obx(
-                      () => _buildBody(_favNoteController.loadingState.value)),
+                    () => _buildBody(_favNoteController.loadingState.value),
+                  ),
                 ),
               ],
             ),
@@ -86,14 +90,16 @@ class _FavNoteChildPageState extends State<FavNoteChildPage>
                           value: _favNoteController.allSelected.value,
                           onChanged: (value) {
                             _favNoteController.handleSelect(
-                                !_favNoteController.allSelected.value);
+                              !_favNoteController.allSelected.value,
+                            );
                           },
                         ),
                       ),
                       GestureDetector(
                         behavior: HitTestBehavior.opaque,
                         onTap: () => _favNoteController.handleSelect(
-                            !_favNoteController.allSelected.value),
+                          !_favNoteController.allSelected.value,
+                        ),
                         child: const Padding(
                           padding: EdgeInsets.only(
                             top: 14,
@@ -135,37 +141,38 @@ class _FavNoteChildPageState extends State<FavNoteChildPage>
   Widget _buildBody(LoadingState<List<FavNoteItemModel>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: Grid.videoCardHDelegate(context),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) {
-              return const VideoCardHSkeleton();
-            },
-            childCount: 10,
-          ),
+        gridDelegate: Grid.videoCardHDelegate(context),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            return const VideoCardHSkeleton();
+          },
+          childCount: 10,
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  if (index == response.length - 1) {
-                    _favNoteController.onLoadMore();
-                  }
-                  final item = response[index];
-                  return FavNoteItem(
-                    item: item,
-                    ctr: _favNoteController,
-                    onSelect: () => _favNoteController.onSelect(item),
-                  );
-                },
-                childCount: response!.length,
-              ),
-            )
-          : HttpError(onReload: _favNoteController.onReload),
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    if (index == response.length - 1) {
+                      _favNoteController.onLoadMore();
+                    }
+                    final item = response[index];
+                    return FavNoteItem(
+                      item: item,
+                      ctr: _favNoteController,
+                      onSelect: () => _favNoteController.onSelect(item),
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(onReload: _favNoteController.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _favNoteController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _favNoteController.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/fav/note/controller.dart b/lib/pages/fav/note/controller.dart
index 0cc8018ab..e8bb70f3a 100644
--- a/lib/pages/fav/note/controller.dart
+++ b/lib/pages/fav/note/controller.dart
@@ -36,8 +36,9 @@ class FavNoteController
 
   Future<void> onRemove() async {
     List<FavNoteItemModel> dataList = loadingState.value.data!;
-    Set<FavNoteItemModel> removeList =
-        dataList.where((item) => item.checked == true).toSet();
+    Set<FavNoteItemModel> removeList = dataList
+        .where((item) => item.checked == true)
+        .toSet();
     final res = await FavHttp.delNote(
       isPublish: isPublish,
       noteIds: removeList
@@ -45,8 +46,10 @@ class FavNoteController
           .toList(),
     );
     if (res['status']) {
-      List<FavNoteItemModel> remainList =
-          dataList.toSet().difference(removeList).toList();
+      List<FavNoteItemModel> remainList = dataList
+          .toSet()
+          .difference(removeList)
+          .toList();
       loadingState.value = Success(remainList);
       enableMultiSelect.value = false;
       SmartDialog.showToast('删除成功');
diff --git a/lib/pages/fav/note/view.dart b/lib/pages/fav/note/view.dart
index 95f735307..7c9782a37 100644
--- a/lib/pages/fav/note/view.dart
+++ b/lib/pages/fav/note/view.dart
@@ -13,8 +13,10 @@ class FavNotePage extends StatefulWidget {
 
 class _FavNotePageState extends State<FavNotePage>
     with SingleTickerProviderStateMixin, AutomaticKeepAliveClientMixin {
-  late final TabController _tabController =
-      TabController(length: 2, vsync: this);
+  late final TabController _tabController = TabController(
+    length: 2,
+    vsync: this,
+  );
 
   @override
   bool get wantKeepAlive => true;
@@ -44,16 +46,19 @@ class _FavNotePageState extends State<FavNotePage>
                 padding: const EdgeInsets.symmetric(horizontal: 8),
                 dividerHeight: 0,
                 indicatorWeight: 0,
-                indicatorPadding:
-                    const EdgeInsets.symmetric(horizontal: 3, vertical: 8),
+                indicatorPadding: const EdgeInsets.symmetric(
+                  horizontal: 3,
+                  vertical: 8,
+                ),
                 indicator: BoxDecoration(
                   color: theme.colorScheme.secondaryContainer,
                   borderRadius: const BorderRadius.all(Radius.circular(20)),
                 ),
                 indicatorSize: TabBarIndicatorSize.tab,
-                labelStyle: TabBarTheme.of(context)
-                        .labelStyle
-                        ?.copyWith(fontSize: 14) ??
+                labelStyle:
+                    TabBarTheme.of(
+                      context,
+                    ).labelStyle?.copyWith(fontSize: 14) ??
                     const TextStyle(fontSize: 14),
                 labelColor: theme.colorScheme.onSecondaryContainer,
                 unselectedLabelColor: theme.colorScheme.outline,
@@ -65,9 +70,8 @@ class _FavNotePageState extends State<FavNotePage>
                   try {
                     if (!_tabController.indexIsChanging) {
                       Get.find<FavNoteController>(
-                              tag: index == 0 ? 'false' : 'true')
-                          .scrollController
-                          .animToTop();
+                        tag: index == 0 ? 'false' : 'true',
+                      ).scrollController.animToTop();
                     }
                   } catch (_) {}
                 },
diff --git a/lib/pages/fav/note/widget/item.dart b/lib/pages/fav/note/widget/item.dart
index 67d7fee23..08c35dec8 100644
--- a/lib/pages/fav/note/widget/item.dart
+++ b/lib/pages/fav/note/widget/item.dart
@@ -66,40 +66,45 @@ class FavNoteItem extends StatelessWidget {
                           Positioned.fill(
                             child: IgnorePointer(
                               child: LayoutBuilder(
-                                builder: (context, constraints) =>
-                                    AnimatedOpacity(
+                                builder: (context, constraints) => AnimatedOpacity(
                                   opacity: item.checked == true ? 1 : 0,
                                   duration: const Duration(milliseconds: 200),
                                   child: Container(
                                     alignment: Alignment.center,
                                     height: constraints.maxHeight,
-                                    width: constraints.maxHeight *
+                                    width:
+                                        constraints.maxHeight *
                                         StyleString.aspectRatio,
                                     decoration: BoxDecoration(
                                       borderRadius: StyleString.mdRadius,
-                                      color:
-                                          Colors.black.withValues(alpha: 0.6),
+                                      color: Colors.black.withValues(
+                                        alpha: 0.6,
+                                      ),
                                     ),
                                     child: SizedBox(
                                       width: 34,
                                       height: 34,
                                       child: AnimatedScale(
                                         scale: item.checked == true ? 1 : 0,
-                                        duration:
-                                            const Duration(milliseconds: 250),
+                                        duration: const Duration(
+                                          milliseconds: 250,
+                                        ),
                                         curve: Curves.easeInOut,
                                         child: IconButton(
                                           tooltip: '取消选择',
                                           style: ButtonStyle(
                                             padding: WidgetStateProperty.all(
-                                                EdgeInsets.zero),
+                                              EdgeInsets.zero,
+                                            ),
                                             backgroundColor:
                                                 WidgetStateProperty.resolveWith(
-                                              (states) {
-                                                return theme.colorScheme.surface
-                                                    .withValues(alpha: 0.8);
-                                              },
-                                            ),
+                                                  (states) {
+                                                    return theme
+                                                        .colorScheme
+                                                        .surface
+                                                        .withValues(alpha: 0.8);
+                                                  },
+                                                ),
                                           ),
                                           onPressed: null,
                                           icon: Icon(
diff --git a/lib/pages/fav/pgc/child_view.dart b/lib/pages/fav/pgc/child_view.dart
index bab9cb25c..7d45dfdf6 100644
--- a/lib/pages/fav/pgc/child_view.dart
+++ b/lib/pages/fav/pgc/child_view.dart
@@ -48,9 +48,11 @@ class _FavPgcChildPageState extends State<FavPgcChildPage>
               slivers: [
                 SliverPadding(
                   padding: EdgeInsets.only(
-                      bottom: MediaQuery.paddingOf(context).bottom + 80),
+                    bottom: MediaQuery.paddingOf(context).bottom + 80,
+                  ),
                   sliver: Obx(
-                      () => _buildBody(_favPgcController.loadingState.value)),
+                    () => _buildBody(_favPgcController.loadingState.value),
+                  ),
                 ),
               ],
             ),
@@ -93,14 +95,16 @@ class _FavPgcChildPageState extends State<FavPgcChildPage>
                           value: _favPgcController.allSelected.value,
                           onChanged: (value) {
                             _favPgcController.handleSelect(
-                                !_favPgcController.allSelected.value);
+                              !_favPgcController.allSelected.value,
+                            );
                           },
                         ),
                       ),
                       GestureDetector(
                         behavior: HitTestBehavior.opaque,
-                        onTap: () => _favPgcController
-                            .handleSelect(!_favPgcController.allSelected.value),
+                        onTap: () => _favPgcController.handleSelect(
+                          !_favPgcController.allSelected.value,
+                        ),
                         child: const Padding(
                           padding: EdgeInsets.only(
                             top: 14,
@@ -112,12 +116,13 @@ class _FavPgcChildPageState extends State<FavPgcChildPage>
                       ),
                       const Spacer(),
                       ...const [
-                        (followStatus: 1, title: '想看'),
-                        (followStatus: 2, title: '在看'),
-                        (followStatus: 3, title: '看过'),
-                      ]
-                          .where((item) =>
-                              item.followStatus != widget.followStatus)
+                            (followStatus: 1, title: '想看'),
+                            (followStatus: 2, title: '在看'),
+                            (followStatus: 3, title: '看过'),
+                          ]
+                          .where(
+                            (item) => item.followStatus != widget.followStatus,
+                          )
                           .map(
                             (item) => Padding(
                               padding: const EdgeInsets.only(left: 25),
@@ -126,13 +131,16 @@ class _FavPgcChildPageState extends State<FavPgcChildPage>
                                 onTap: () {
                                   if (_favPgcController.checkedCount.value !=
                                       0) {
-                                    _favPgcController
-                                        .onUpdateList(item.followStatus);
+                                    _favPgcController.onUpdateList(
+                                      item.followStatus,
+                                    );
                                   }
                                 },
                                 child: Padding(
                                   padding: const EdgeInsets.symmetric(
-                                      vertical: 14, horizontal: 5),
+                                    vertical: 14,
+                                    horizontal: 5,
+                                  ),
                                   child: Text(
                                     '标记为${item.title}',
                                     style: TextStyle(
@@ -158,56 +166,57 @@ class _FavPgcChildPageState extends State<FavPgcChildPage>
   Widget _buildBody(LoadingState<List<FavPgcItemModel>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: Grid.videoCardHDelegate(context),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) {
-              return const FavPgcItemSkeleton();
-            },
-            childCount: 10,
-          ),
+        gridDelegate: Grid.videoCardHDelegate(context),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            return const FavPgcItemSkeleton();
+          },
+          childCount: 10,
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  if (index == response.length - 1) {
-                    _favPgcController.onLoadMore();
-                  }
-                  final item = response[index];
-                  return FavPgcItem(
-                    item: item,
-                    ctr: _favPgcController,
-                    onSelect: () => _favPgcController.onSelect(item),
-                    onUpdateStatus: () => showPgcFollowDialog(
-                      context: context,
-                      type: widget.type == 0 ? '追番' : '追剧',
-                      followStatus: widget.followStatus,
-                      onUpdateStatus: (followStatus) {
-                        if (followStatus == -1) {
-                          _favPgcController.pgcDel(
-                            index,
-                            item.seasonId,
-                          );
-                        } else {
-                          _favPgcController.onUpdate(
-                            index,
-                            followStatus,
-                            item.seasonId,
-                          );
-                        }
-                      },
-                    ),
-                  );
-                },
-                childCount: response!.length,
-              ),
-            )
-          : HttpError(onReload: _favPgcController.onReload),
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    if (index == response.length - 1) {
+                      _favPgcController.onLoadMore();
+                    }
+                    final item = response[index];
+                    return FavPgcItem(
+                      item: item,
+                      ctr: _favPgcController,
+                      onSelect: () => _favPgcController.onSelect(item),
+                      onUpdateStatus: () => showPgcFollowDialog(
+                        context: context,
+                        type: widget.type == 0 ? '追番' : '追剧',
+                        followStatus: widget.followStatus,
+                        onUpdateStatus: (followStatus) {
+                          if (followStatus == -1) {
+                            _favPgcController.pgcDel(
+                              index,
+                              item.seasonId,
+                            );
+                          } else {
+                            _favPgcController.onUpdate(
+                              index,
+                              followStatus,
+                              item.seasonId,
+                            );
+                          }
+                        },
+                      ),
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(onReload: _favPgcController.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _favPgcController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _favPgcController.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/fav/pgc/controller.dart b/lib/pages/fav/pgc/controller.dart
index c38da3e38..f0f738468 100644
--- a/lib/pages/fav/pgc/controller.dart
+++ b/lib/pages/fav/pgc/controller.dart
@@ -41,11 +41,11 @@ class FavPgcController
 
   @override
   Future<LoadingState<FavPgcData>> customGetData() => FavHttp.favPgc(
-        mid: Accounts.main.mid,
-        type: type,
-        followStatus: followStatus,
-        pn: page,
-      );
+    mid: Accounts.main.mid,
+    type: type,
+    followStatus: followStatus,
+    pn: page,
+  );
 
   void onDisable() {
     if (checkedCount.value != 0) {
@@ -67,24 +67,28 @@ class FavPgcController
 
   Future<void> onUpdateList(int followStatus) async {
     List<FavPgcItemModel> dataList = loadingState.value.data!;
-    Set<FavPgcItemModel> updateList =
-        dataList.where((item) => item.checked == true).toSet();
+    Set<FavPgcItemModel> updateList = dataList
+        .where((item) => item.checked == true)
+        .toSet();
     final res = await VideoHttp.pgcUpdate(
       seasonId: updateList.map((item) => item.seasonId).toList(),
       status: followStatus,
     );
     if (res['status']) {
-      List<FavPgcItemModel> remainList =
-          dataList.toSet().difference(updateList).toList();
+      List<FavPgcItemModel> remainList = dataList
+          .toSet()
+          .difference(updateList)
+          .toList();
       loadingState.value = Success(remainList);
       enableMultiSelect.value = false;
       try {
         final ctr = Get.find<FavPgcController>(tag: '$type$followStatus');
         if (ctr.loadingState.value.isSuccess) {
           ctr.loadingState
-            ..value
-                .data!
-                .insertAll(0, updateList.map((item) => item..checked = null))
+            ..value.data!.insertAll(
+              0,
+              updateList.map((item) => item..checked = null),
+            )
             ..refresh();
           ctr.allSelected.value = false;
         }
diff --git a/lib/pages/fav/pgc/view.dart b/lib/pages/fav/pgc/view.dart
index cee4d5520..ee7806a36 100644
--- a/lib/pages/fav/pgc/view.dart
+++ b/lib/pages/fav/pgc/view.dart
@@ -15,8 +15,11 @@ class FavPgcPage extends StatefulWidget {
 
 class _FavPgcPageState extends State<FavPgcPage>
     with AutomaticKeepAliveClientMixin, SingleTickerProviderStateMixin {
-  late final TabController _tabController =
-      TabController(length: 3, vsync: this, initialIndex: 1);
+  late final TabController _tabController = TabController(
+    length: 3,
+    vsync: this,
+    initialIndex: 1,
+  );
 
   @override
   bool get wantKeepAlive => true;
@@ -46,16 +49,19 @@ class _FavPgcPageState extends State<FavPgcPage>
                 padding: const EdgeInsets.symmetric(horizontal: 8),
                 dividerHeight: 0,
                 indicatorWeight: 0,
-                indicatorPadding:
-                    const EdgeInsets.symmetric(horizontal: 3, vertical: 8),
+                indicatorPadding: const EdgeInsets.symmetric(
+                  horizontal: 3,
+                  vertical: 8,
+                ),
                 indicator: BoxDecoration(
                   color: theme.colorScheme.secondaryContainer,
                   borderRadius: const BorderRadius.all(Radius.circular(20)),
                 ),
                 indicatorSize: TabBarIndicatorSize.tab,
-                labelStyle: TabBarTheme.of(context)
-                        .labelStyle
-                        ?.copyWith(fontSize: 14) ??
+                labelStyle:
+                    TabBarTheme.of(
+                      context,
+                    ).labelStyle?.copyWith(fontSize: 14) ??
                     const TextStyle(fontSize: 14),
                 labelColor: theme.colorScheme.onSecondaryContainer,
                 unselectedLabelColor: theme.colorScheme.outline,
diff --git a/lib/pages/fav/pgc/widget/item.dart b/lib/pages/fav/pgc/widget/item.dart
index c4ee6e507..40bb05ae5 100644
--- a/lib/pages/fav/pgc/widget/item.dart
+++ b/lib/pages/fav/pgc/widget/item.dart
@@ -55,8 +55,7 @@ class FavPgcItem extends StatelessWidget {
                   AspectRatio(
                     aspectRatio: 3 / 4,
                     child: LayoutBuilder(
-                      builder: (BuildContext context,
-                          BoxConstraints boxConstraints) {
+                      builder: (BuildContext context, BoxConstraints boxConstraints) {
                         return Stack(
                           clipBehavior: Clip.none,
                           children: [
@@ -82,52 +81,66 @@ class FavPgcItem extends StatelessWidget {
                                 child: LayoutBuilder(
                                   builder: (context, constraints) =>
                                       AnimatedOpacity(
-                                    opacity: item.checked == true ? 1 : 0,
-                                    duration: const Duration(milliseconds: 200),
-                                    child: Container(
-                                      alignment: Alignment.center,
-                                      height: constraints.maxHeight,
-                                      width: constraints.maxHeight *
-                                          StyleString.aspectRatio,
-                                      decoration: BoxDecoration(
-                                        borderRadius: const BorderRadius.all(
-                                            Radius.circular(4)),
-                                        color:
-                                            Colors.black.withValues(alpha: 0.6),
-                                      ),
-                                      child: SizedBox(
-                                        width: 34,
-                                        height: 34,
-                                        child: AnimatedScale(
-                                          scale: item.checked == true ? 1 : 0,
-                                          duration:
-                                              const Duration(milliseconds: 250),
-                                          curve: Curves.easeInOut,
-                                          child: IconButton(
-                                            tooltip: '取消选择',
-                                            style: ButtonStyle(
-                                              padding: WidgetStateProperty.all(
-                                                  EdgeInsets.zero),
-                                              backgroundColor:
-                                                  WidgetStateProperty
-                                                      .resolveWith(
-                                                (states) {
-                                                  return theme
-                                                      .colorScheme.surface
-                                                      .withValues(alpha: 0.8);
-                                                },
-                                              ),
+                                        opacity: item.checked == true ? 1 : 0,
+                                        duration: const Duration(
+                                          milliseconds: 200,
+                                        ),
+                                        child: Container(
+                                          alignment: Alignment.center,
+                                          height: constraints.maxHeight,
+                                          width:
+                                              constraints.maxHeight *
+                                              StyleString.aspectRatio,
+                                          decoration: BoxDecoration(
+                                            borderRadius:
+                                                const BorderRadius.all(
+                                                  Radius.circular(4),
+                                                ),
+                                            color: Colors.black.withValues(
+                                              alpha: 0.6,
                                             ),
-                                            onPressed: null,
-                                            icon: Icon(
-                                              Icons.done_all_outlined,
-                                              color: theme.colorScheme.primary,
+                                          ),
+                                          child: SizedBox(
+                                            width: 34,
+                                            height: 34,
+                                            child: AnimatedScale(
+                                              scale: item.checked == true
+                                                  ? 1
+                                                  : 0,
+                                              duration: const Duration(
+                                                milliseconds: 250,
+                                              ),
+                                              curve: Curves.easeInOut,
+                                              child: IconButton(
+                                                tooltip: '取消选择',
+                                                style: ButtonStyle(
+                                                  padding:
+                                                      WidgetStateProperty.all(
+                                                        EdgeInsets.zero,
+                                                      ),
+                                                  backgroundColor:
+                                                      WidgetStateProperty.resolveWith(
+                                                        (states) {
+                                                          return theme
+                                                              .colorScheme
+                                                              .surface
+                                                              .withValues(
+                                                                alpha: 0.8,
+                                                              );
+                                                        },
+                                                      ),
+                                                ),
+                                                onPressed: null,
+                                                icon: Icon(
+                                                  Icons.done_all_outlined,
+                                                  color:
+                                                      theme.colorScheme.primary,
+                                                ),
+                                              ),
                                             ),
                                           ),
                                         ),
                                       ),
-                                    ),
-                                  ),
                                 ),
                               ),
                             ),
@@ -155,7 +168,8 @@ class FavPgcItem extends StatelessWidget {
                         ],
                         if (item.progress != null) ...[
                           SizedBox(
-                              height: item.newEp?.indexShow != null ? 2 : 6),
+                            height: item.newEp?.indexShow != null ? 2 : 6,
+                          ),
                           Text(
                             item.progress!,
                             style: TextStyle(
diff --git a/lib/pages/fav/topic/view.dart b/lib/pages/fav/topic/view.dart
index b2af06b55..a5860ee7c 100644
--- a/lib/pages/fav/topic/view.dart
+++ b/lib/pages/fav/topic/view.dart
@@ -40,8 +40,9 @@ class _FavTopicPageState extends State<FavTopicPage>
               top: StyleString.safeSpace,
               bottom: MediaQuery.paddingOf(context).bottom + 80,
             ),
-            sliver:
-                Obx(() => _buildBody(theme, _controller.loadingState.value)),
+            sliver: Obx(
+              () => _buildBody(theme, _controller.loadingState.value),
+            ),
           ),
         ],
       ),
@@ -49,74 +50,81 @@ class _FavTopicPageState extends State<FavTopicPage>
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<FavTopicItem>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<FavTopicItem>?> loadingState,
+  ) {
     return switch (loadingState) {
       Loading() => const SliverToBoxAdapter(
-          child: SizedBox(
-            height: 125,
-            child: Center(
-              child: CircularProgressIndicator(),
-            ),
+        child: SizedBox(
+          height: 125,
+          child: Center(
+            child: CircularProgressIndicator(),
           ),
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
-                mainAxisSpacing: 12,
-                crossAxisSpacing: 12,
-                maxCrossAxisExtent: Grid.smallCardWidth,
-                mainAxisExtent: MediaQuery.textScalerOf(context).scale(30),
-              ),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  if (index == response.length - 1) {
-                    _controller.onLoadMore();
-                  }
-                  final item = response[index];
-                  return Material(
-                    color: theme.colorScheme.onInverseSurface,
-                    borderRadius: const BorderRadius.all(Radius.circular(6)),
-                    child: InkWell(
-                      onTap: () => Get.toNamed(
-                        '/dynTopic',
-                        parameters: {
-                          'id': item.id!.toString(),
-                          'name': item.name!,
-                        },
-                      ),
-                      onLongPress: () => showConfirmDialog(
-                        context: context,
-                        title: '确定取消收藏？',
-                        onConfirm: () {
-                          _controller.onRemove(index, item.id);
-                        },
-                      ),
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
+                  mainAxisSpacing: 12,
+                  crossAxisSpacing: 12,
+                  maxCrossAxisExtent: Grid.smallCardWidth,
+                  mainAxisExtent: MediaQuery.textScalerOf(context).scale(30),
+                ),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    if (index == response.length - 1) {
+                      _controller.onLoadMore();
+                    }
+                    final item = response[index];
+                    return Material(
+                      color: theme.colorScheme.onInverseSurface,
                       borderRadius: const BorderRadius.all(Radius.circular(6)),
-                      child: Container(
-                        alignment: Alignment.centerLeft,
-                        padding: const EdgeInsets.symmetric(
-                            horizontal: 11, vertical: 5),
-                        child: Text(
-                          '# ${item.name}',
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                          style: TextStyle(
-                            fontSize: 14,
-                            color: theme.colorScheme.onSurfaceVariant,
+                      child: InkWell(
+                        onTap: () => Get.toNamed(
+                          '/dynTopic',
+                          parameters: {
+                            'id': item.id!.toString(),
+                            'name': item.name!,
+                          },
+                        ),
+                        onLongPress: () => showConfirmDialog(
+                          context: context,
+                          title: '确定取消收藏？',
+                          onConfirm: () {
+                            _controller.onRemove(index, item.id);
+                          },
+                        ),
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(6),
+                        ),
+                        child: Container(
+                          alignment: Alignment.centerLeft,
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 11,
+                            vertical: 5,
+                          ),
+                          child: Text(
+                            '# ${item.name}',
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: TextStyle(
+                              fontSize: 14,
+                              color: theme.colorScheme.onSurfaceVariant,
+                            ),
                           ),
                         ),
                       ),
-                    ),
-                  );
-                },
-                childCount: response!.length,
-              ),
-            )
-          : HttpError(onReload: _controller.onReload),
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/fav/video/controller.dart b/lib/pages/fav/video/controller.dart
index d35383394..969009194 100644
--- a/lib/pages/fav/video/controller.dart
+++ b/lib/pages/fav/video/controller.dart
@@ -34,8 +34,8 @@ class FavController extends CommonListController<FavFolderData, FavFolderInfo> {
 
   @override
   Future<LoadingState<FavFolderData>> customGetData() => FavHttp.userfavFolder(
-        pn: page,
-        ps: 20,
-        mid: accountService.mid,
-      );
+    pn: page,
+    ps: 20,
+    mid: accountService.mid,
+  );
 }
diff --git a/lib/pages/fav/video/view.dart b/lib/pages/fav/video/view.dart
index be2e62fb8..87282bf79 100644
--- a/lib/pages/fav/video/view.dart
+++ b/lib/pages/fav/video/view.dart
@@ -51,54 +51,55 @@ class _FavVideoPageState extends State<FavVideoPage>
   Widget _buildBody(LoadingState<List<FavFolderInfo>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: Grid.videoCardHDelegate(context),
-          delegate: SliverChildBuilderDelegate(
-            (BuildContext context, int index) {
-              return const VideoCardHSkeleton();
-            },
-            childCount: 10,
-          ),
+        gridDelegate: Grid.videoCardHDelegate(context),
+        delegate: SliverChildBuilderDelegate(
+          (BuildContext context, int index) {
+            return const VideoCardHSkeleton();
+          },
+          childCount: 10,
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                childCount: response!.length,
-                (BuildContext context, int index) {
-                  if (index == response.length - 1) {
-                    _favController.onLoadMore();
-                  }
-                  final item = response[index];
-                  String heroTag = Utils.makeHeroTag(item.fid);
-                  return FavVideoItem(
-                    heroTag: heroTag,
-                    item: item,
-                    onTap: () async {
-                      var res = await Get.toNamed(
-                        '/favDetail',
-                        arguments: item,
-                        parameters: {
-                          'heroTag': heroTag,
-                          'mediaId': item.id.toString(),
-                        },
-                      );
-                      if (res == true) {
-                        _favController.loadingState
-                          ..value.data!.removeAt(index)
-                          ..refresh();
-                      }
-                    },
-                  );
-                },
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  childCount: response!.length,
+                  (BuildContext context, int index) {
+                    if (index == response.length - 1) {
+                      _favController.onLoadMore();
+                    }
+                    final item = response[index];
+                    String heroTag = Utils.makeHeroTag(item.fid);
+                    return FavVideoItem(
+                      heroTag: heroTag,
+                      item: item,
+                      onTap: () async {
+                        var res = await Get.toNamed(
+                          '/favDetail',
+                          arguments: item,
+                          parameters: {
+                            'heroTag': heroTag,
+                            'mediaId': item.id.toString(),
+                          },
+                        );
+                        if (res == true) {
+                          _favController.loadingState
+                            ..value.data!.removeAt(index)
+                            ..refresh();
+                        }
+                      },
+                    );
+                  },
+                ),
+              )
+            : HttpError(
+                onReload: _favController.onReload,
               ),
-            )
-          : HttpError(
-              onReload: _favController.onReload,
-            ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _favController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _favController.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/fav/video/widgets/item.dart b/lib/pages/fav/video/widgets/item.dart
index f6d1e15e1..42824e164 100644
--- a/lib/pages/fav/video/widgets/item.dart
+++ b/lib/pages/fav/video/widgets/item.dart
@@ -25,13 +25,14 @@ class FavVideoItem extends StatelessWidget {
       type: MaterialType.transparency,
       child: InkWell(
         onTap: onTap,
-        onLongPress: onLongPress ??
+        onLongPress:
+            onLongPress ??
             (onTap == null
                 ? null
                 : () => imageSaveDialog(
-                      title: item.title,
-                      cover: item.cover,
-                    )),
+                    title: item.title,
+                    cover: item.cover,
+                  )),
         child: Padding(
           padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 5),
           child: Row(
diff --git a/lib/pages/fav/view.dart b/lib/pages/fav/view.dart
index 5a596198a..0e42f905d 100644
--- a/lib/pages/fav/view.dart
+++ b/lib/pages/fav/view.dart
@@ -62,8 +62,8 @@ class _FavPageState extends State<FavPage> with SingleTickerProviderStateMixin {
                         if (data != null) {
                           List<FavFolderInfo>? list =
                               _favController.loadingState.value.isSuccess
-                                  ? _favController.loadingState.value.data
-                                  : null;
+                              ? _favController.loadingState.value.data
+                              : null;
                           if (list?.isNotEmpty == true) {
                             list!.insert(1, data);
                             _favController.loadingState.refresh();
@@ -88,7 +88,8 @@ class _FavPageState extends State<FavPage> with SingleTickerProviderStateMixin {
                           return;
                         }
                         Get.to(
-                            FavFolderSortPage(favController: _favController));
+                          FavFolderSortPage(favController: _favController),
+                        );
                       }
                     },
                     icon: const Icon(Icons.sort),
@@ -136,8 +137,7 @@ class _FavPageState extends State<FavPage> with SingleTickerProviderStateMixin {
                   case FavTabType.video:
                     _favController.scrollController.animToTop();
                   case FavTabType.article:
-                    Get.find<FavArticleController>()
-                        .scrollController
+                    Get.find<FavArticleController>().scrollController
                         .animToTop();
                   case FavTabType.topic:
                     Get.find<FavTopicController>().scrollController.animToTop();
diff --git a/lib/pages/fav_create/view.dart b/lib/pages/fav_create/view.dart
index f178f5eba..dfa169bff 100644
--- a/lib/pages/fav_create/view.dart
+++ b/lib/pages/fav_create/view.dart
@@ -99,20 +99,20 @@ class _CreateFavPageState extends State<CreateFavPage> {
       ),
       body: _mediaId != null
           ? _titleController.text.isNotEmpty
-              ? _buildBody(theme)
-              : _errMsg?.isNotEmpty == true
-                  ? Center(
-                      child: CustomScrollView(
-                        shrinkWrap: true,
-                        slivers: [
-                          HttpError(
-                            errMsg: _errMsg,
-                            onReload: _getFolderInfo,
-                          ),
-                        ],
-                      ),
-                    )
-                  : const Center(child: CircularProgressIndicator())
+                ? _buildBody(theme)
+                : _errMsg?.isNotEmpty == true
+                ? Center(
+                    child: CustomScrollView(
+                      shrinkWrap: true,
+                      slivers: [
+                        HttpError(
+                          errMsg: _errMsg,
+                          onReload: _getFolderInfo,
+                        ),
+                      ],
+                    ),
+                  )
+                : const Center(child: CircularProgressIndicator())
           : _buildBody(theme),
     );
   }
@@ -174,233 +174,241 @@ class _CreateFavPageState extends State<CreateFavPage> {
   final leadingStyle = const TextStyle(fontSize: 14);
 
   Widget _buildBody(ThemeData theme) => SingleChildScrollView(
-        child: Column(
-          children: [
-            if (_attr == null || !FavUtil.isDefaultFav(_attr!)) ...[
-              Builder(
-                builder: (context) {
-                  return ListTile(
-                    tileColor: theme.colorScheme.onInverseSurface,
-                    onTap: () {
-                      EasyThrottle.throttle(
-                          'imagePicker', const Duration(milliseconds: 500), () {
-                        if (_cover?.isNotEmpty == true) {
-                          showDialog(
-                            context: context,
-                            builder: (_) {
-                              return AlertDialog(
-                                clipBehavior: Clip.hardEdge,
-                                contentPadding:
-                                    const EdgeInsets.fromLTRB(0, 12, 0, 12),
-                                content: Column(
-                                  mainAxisSize: MainAxisSize.min,
-                                  children: [
-                                    ListTile(
-                                      dense: true,
-                                      onTap: () {
-                                        Get.back();
-                                        _pickImg(context, theme);
-                                      },
-                                      title: const Text(
-                                        '替换封面',
-                                        style: TextStyle(fontSize: 14),
-                                      ),
+    child: Column(
+      children: [
+        if (_attr == null || !FavUtil.isDefaultFav(_attr!)) ...[
+          Builder(
+            builder: (context) {
+              return ListTile(
+                tileColor: theme.colorScheme.onInverseSurface,
+                onTap: () {
+                  EasyThrottle.throttle(
+                    'imagePicker',
+                    const Duration(milliseconds: 500),
+                    () {
+                      if (_cover?.isNotEmpty == true) {
+                        showDialog(
+                          context: context,
+                          builder: (_) {
+                            return AlertDialog(
+                              clipBehavior: Clip.hardEdge,
+                              contentPadding: const EdgeInsets.fromLTRB(
+                                0,
+                                12,
+                                0,
+                                12,
+                              ),
+                              content: Column(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  ListTile(
+                                    dense: true,
+                                    onTap: () {
+                                      Get.back();
+                                      _pickImg(context, theme);
+                                    },
+                                    title: const Text(
+                                      '替换封面',
+                                      style: TextStyle(fontSize: 14),
                                     ),
-                                    ListTile(
-                                      dense: true,
-                                      onTap: () {
-                                        Get.back();
-                                        _cover = null;
-                                        (context as Element).markNeedsBuild();
-                                      },
-                                      title: const Text(
-                                        '移除封面',
-                                        style: TextStyle(fontSize: 14),
-                                      ),
-                                    ),
-                                  ],
-                                ),
-                              );
-                            },
-                          );
-                        } else {
-                          _pickImg(context, theme);
-                        }
-                      });
-                    },
-                    leading: Text(
-                      '封面',
-                      style: leadingStyle,
-                    ),
-                    trailing: Row(
-                      spacing: 10,
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        if (_cover?.isNotEmpty == true)
-                          Padding(
-                            padding: const EdgeInsets.symmetric(vertical: 5),
-                            child: LayoutBuilder(
-                              builder: (context, constraints) {
-                                return ClipRRect(
-                                  borderRadius: const BorderRadius.all(
-                                      Radius.circular(6)),
-                                  child: CachedNetworkImage(
-                                    imageUrl: ImageUtil.thumbnailUrl(_cover!),
-                                    height: constraints.maxHeight,
-                                    width: constraints.maxHeight * 16 / 9,
-                                    fit: BoxFit.cover,
                                   ),
-                                );
-                              },
-                            ),
-                          ),
-                        Icon(
-                          Icons.keyboard_arrow_right,
-                          color: theme.colorScheme.outline,
-                        ),
-                      ],
-                    ),
+                                  ListTile(
+                                    dense: true,
+                                    onTap: () {
+                                      Get.back();
+                                      _cover = null;
+                                      (context as Element).markNeedsBuild();
+                                    },
+                                    title: const Text(
+                                      '移除封面',
+                                      style: TextStyle(fontSize: 14),
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            );
+                          },
+                        );
+                      } else {
+                        _pickImg(context, theme);
+                      }
+                    },
                   );
                 },
-              ),
-              const SizedBox(height: 16),
-            ],
-            ListTile(
-              tileColor: theme.colorScheme.onInverseSurface,
-              leading: Text.rich(
-                style: const TextStyle(
-                  height: 1,
-                  fontSize: 14,
+                leading: Text(
+                  '封面',
+                  style: leadingStyle,
                 ),
-                TextSpan(
+                trailing: Row(
+                  spacing: 10,
+                  mainAxisSize: MainAxisSize.min,
                   children: [
-                    TextSpan(
-                      text: '*',
-                      style: TextStyle(
-                        fontSize: 14,
-                        height: 1,
-                        color: theme.colorScheme.error,
-                      ),
-                    ),
-                    const TextSpan(
-                      text: '名称',
-                      style: TextStyle(
-                        height: 1,
-                        fontSize: 14,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              title: TextField(
-                autofocus: true,
-                readOnly: _attr != null && FavUtil.isDefaultFav(_attr!),
-                controller: _titleController,
-                style: TextStyle(
-                  fontSize: 14,
-                  color: _attr != null && FavUtil.isDefaultFav(_attr!)
-                      ? theme.colorScheme.outline
-                      : null,
-                ),
-                inputFormatters: [
-                  LengthLimitingTextInputFormatter(20),
-                ],
-                decoration: InputDecoration(
-                  isDense: true,
-                  hintText: '名称',
-                  hintStyle: TextStyle(
-                    fontSize: 14,
-                    color: theme.colorScheme.outline,
-                  ),
-                  border: const OutlineInputBorder(
-                    borderSide: BorderSide.none,
-                    gapPadding: 0,
-                  ),
-                  contentPadding: EdgeInsets.zero,
-                ),
-              ),
-            ),
-            const SizedBox(height: 16),
-            if (_attr == null || !FavUtil.isDefaultFav(_attr!)) ...[
-              ListTile(
-                tileColor: theme.colorScheme.onInverseSurface,
-                title: Row(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text.rich(
-                      TextSpan(
-                        children: [
-                          TextSpan(
-                            text: '简介',
-                            style: TextStyle(
-                              fontSize: 14,
-                              color: theme.colorScheme.onSurfaceVariant,
-                            ),
-                          ),
-                          const TextSpan(
-                            text: '*',
-                            style: TextStyle(color: Colors.transparent),
-                          )
-                        ],
-                      ),
-                    ),
-                    const SizedBox(width: 16),
-                    Expanded(
-                      child: TextField(
-                        minLines: 6,
-                        maxLines: 6,
-                        controller: _introController,
-                        style: const TextStyle(fontSize: 14),
-                        inputFormatters: [
-                          LengthLimitingTextInputFormatter(200),
-                        ],
-                        decoration: InputDecoration(
-                          isDense: true,
-                          hintText: '可填写简介',
-                          hintStyle: TextStyle(
-                            fontSize: 14,
-                            color: theme.colorScheme.outline,
-                          ),
-                          border: const OutlineInputBorder(
-                            borderSide: BorderSide.none,
-                            gapPadding: 0,
-                          ),
-                          contentPadding: EdgeInsets.zero,
+                    if (_cover?.isNotEmpty == true)
+                      Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 5),
+                        child: LayoutBuilder(
+                          builder: (context, constraints) {
+                            return ClipRRect(
+                              borderRadius: const BorderRadius.all(
+                                Radius.circular(6),
+                              ),
+                              child: CachedNetworkImage(
+                                imageUrl: ImageUtil.thumbnailUrl(_cover!),
+                                height: constraints.maxHeight,
+                                width: constraints.maxHeight * 16 / 9,
+                                fit: BoxFit.cover,
+                              ),
+                            );
+                          },
                         ),
                       ),
+                    Icon(
+                      Icons.keyboard_arrow_right,
+                      color: theme.colorScheme.outline,
                     ),
                   ],
                 ),
-              ),
-              const SizedBox(height: 16),
-            ],
-            Builder(
-              builder: (context) {
-                void onTap() {
-                  _isPublic = !_isPublic;
-                  (context as Element).markNeedsBuild();
-                }
-
-                return ListTile(
-                  onTap: onTap,
-                  tileColor: theme.colorScheme.onInverseSurface,
-                  leading: Text(
-                    '公开',
-                    style: leadingStyle,
+              );
+            },
+          ),
+          const SizedBox(height: 16),
+        ],
+        ListTile(
+          tileColor: theme.colorScheme.onInverseSurface,
+          leading: Text.rich(
+            style: const TextStyle(
+              height: 1,
+              fontSize: 14,
+            ),
+            TextSpan(
+              children: [
+                TextSpan(
+                  text: '*',
+                  style: TextStyle(
+                    fontSize: 14,
+                    height: 1,
+                    color: theme.colorScheme.error,
                   ),
-                  trailing: Transform.scale(
-                    alignment: Alignment.centerRight,
-                    scale: 0.8,
-                    child: Switch(
-                      value: _isPublic,
-                      onChanged: (value) => onTap(),
+                ),
+                const TextSpan(
+                  text: '名称',
+                  style: TextStyle(
+                    height: 1,
+                    fontSize: 14,
+                  ),
+                ),
+              ],
+            ),
+          ),
+          title: TextField(
+            autofocus: true,
+            readOnly: _attr != null && FavUtil.isDefaultFav(_attr!),
+            controller: _titleController,
+            style: TextStyle(
+              fontSize: 14,
+              color: _attr != null && FavUtil.isDefaultFav(_attr!)
+                  ? theme.colorScheme.outline
+                  : null,
+            ),
+            inputFormatters: [
+              LengthLimitingTextInputFormatter(20),
+            ],
+            decoration: InputDecoration(
+              isDense: true,
+              hintText: '名称',
+              hintStyle: TextStyle(
+                fontSize: 14,
+                color: theme.colorScheme.outline,
+              ),
+              border: const OutlineInputBorder(
+                borderSide: BorderSide.none,
+                gapPadding: 0,
+              ),
+              contentPadding: EdgeInsets.zero,
+            ),
+          ),
+        ),
+        const SizedBox(height: 16),
+        if (_attr == null || !FavUtil.isDefaultFav(_attr!)) ...[
+          ListTile(
+            tileColor: theme.colorScheme.onInverseSurface,
+            title: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text.rich(
+                  TextSpan(
+                    children: [
+                      TextSpan(
+                        text: '简介',
+                        style: TextStyle(
+                          fontSize: 14,
+                          color: theme.colorScheme.onSurfaceVariant,
+                        ),
+                      ),
+                      const TextSpan(
+                        text: '*',
+                        style: TextStyle(color: Colors.transparent),
+                      ),
+                    ],
+                  ),
+                ),
+                const SizedBox(width: 16),
+                Expanded(
+                  child: TextField(
+                    minLines: 6,
+                    maxLines: 6,
+                    controller: _introController,
+                    style: const TextStyle(fontSize: 14),
+                    inputFormatters: [
+                      LengthLimitingTextInputFormatter(200),
+                    ],
+                    decoration: InputDecoration(
+                      isDense: true,
+                      hintText: '可填写简介',
+                      hintStyle: TextStyle(
+                        fontSize: 14,
+                        color: theme.colorScheme.outline,
+                      ),
+                      border: const OutlineInputBorder(
+                        borderSide: BorderSide.none,
+                        gapPadding: 0,
+                      ),
+                      contentPadding: EdgeInsets.zero,
                     ),
                   ),
-                );
-              },
+                ),
+              ],
             ),
-            const SizedBox(height: 16),
-          ],
+          ),
+          const SizedBox(height: 16),
+        ],
+        Builder(
+          builder: (context) {
+            void onTap() {
+              _isPublic = !_isPublic;
+              (context as Element).markNeedsBuild();
+            }
+
+            return ListTile(
+              onTap: onTap,
+              tileColor: theme.colorScheme.onInverseSurface,
+              leading: Text(
+                '公开',
+                style: leadingStyle,
+              ),
+              trailing: Transform.scale(
+                alignment: Alignment.centerRight,
+                scale: 0.8,
+                child: Switch(
+                  value: _isPublic,
+                  onChanged: (value) => onTap(),
+                ),
+              ),
+            );
+          },
         ),
-      );
+        const SizedBox(height: 16),
+      ],
+    ),
+  );
 }
diff --git a/lib/pages/fav_detail/controller.dart b/lib/pages/fav_detail/controller.dart
index d81f3a572..a43a04f87 100644
--- a/lib/pages/fav_detail/controller.dart
+++ b/lib/pages/fav_detail/controller.dart
@@ -118,8 +118,10 @@ class FavDetailController
                 );
                 if (result['status']) {
                   List<FavDetailItemModel> dataList = loadingState.value.data!;
-                  List<FavDetailItemModel> remainList =
-                      dataList.toSet().difference(list.toSet()).toList();
+                  List<FavDetailItemModel> remainList = dataList
+                      .toSet()
+                      .difference(list.toSet())
+                      .toList();
                   folderInfo
                     ..value.mediaCount -= list.length
                     ..refresh();
@@ -136,7 +138,7 @@ class FavDetailController
                 }
               },
               child: const Text('确认'),
-            )
+            ),
           ],
         );
       },
diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart
index f71571c1c..40d303e91 100644
--- a/lib/pages/fav_detail/view.dart
+++ b/lib/pages/fav_detail/view.dart
@@ -31,8 +31,10 @@ class FavDetailPage extends StatefulWidget {
 }
 
 class _FavDetailPageState extends State<FavDetailPage> {
-  late final FavDetailController _favDetailController =
-      Get.put(FavDetailController(), tag: Utils.makeHeroTag(mediaId));
+  late final FavDetailController _favDetailController = Get.put(
+    FavDetailController(),
+    tag: Utils.makeHeroTag(mediaId),
+  );
   late String mediaId;
 
   @override
@@ -79,8 +81,13 @@ class _FavDetailPageState extends State<FavDetailPage> {
                       padding: EdgeInsets.only(
                         bottom: MediaQuery.paddingOf(context).bottom + 85,
                       ),
-                      sliver: Obx(() => _buildBody(enableMultiSelect, theme,
-                          _favDetailController.loadingState.value)),
+                      sliver: Obx(
+                        () => _buildBody(
+                          enableMultiSelect,
+                          theme,
+                          _favDetailController.loadingState.value,
+                        ),
+                      ),
                     ),
                   ],
                 ),
@@ -127,7 +134,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
                 Text(
                   '共${_favDetailController.folderInfo.value.mediaCount}条视频',
                   style: theme.textTheme.labelMedium,
-                )
+                ),
               ],
             ),
       actions: enableMultiSelect ? _selectActions(theme) : _actions(theme),
@@ -162,7 +169,8 @@ class _FavDetailPageState extends State<FavDetailPage> {
                 iconSize: 22,
                 tooltip: '分享',
                 onPressed: () => Utils.shareText(
-                    'https://www.bilibili.com/medialist/detail/ml${_favDetailController.mediaId}'),
+                  'https://www.bilibili.com/medialist/detail/ml${_favDetailController.mediaId}',
+                ),
                 icon: const Icon(Icons.share),
               );
       }),
@@ -176,10 +184,12 @@ class _FavDetailPageState extends State<FavDetailPage> {
               ..order.value = value
               ..onReload(),
             itemBuilder: (context) => FavOrderType.values
-                .map((e) => PopupMenuItem(
-                      value: e,
-                      child: Text(e.label),
-                    ))
+                .map(
+                  (e) => PopupMenuItem(
+                    value: e,
+                    child: Text(e.label),
+                  ),
+                )
                 .toList(),
           );
         },
@@ -196,14 +206,15 @@ class _FavDetailPageState extends State<FavDetailPage> {
                 child: const Text('排序'),
               ),
               PopupMenuItem(
-                onTap: () => Get.toNamed(
-                  '/createFav',
-                  parameters: {'mediaId': mediaId},
-                )?.then((res) {
-                  if (res is FavFolderInfo) {
-                    _favDetailController.folderInfo.value = res;
-                  }
-                }),
+                onTap: () =>
+                    Get.toNamed(
+                      '/createFav',
+                      parameters: {'mediaId': mediaId},
+                    )?.then((res) {
+                      if (res is FavFolderInfo) {
+                        _favDetailController.folderInfo.value = res;
+                      }
+                    }),
                 child: const Text('编辑信息'),
               ),
             ] else
@@ -241,13 +252,13 @@ class _FavDetailPageState extends State<FavDetailPage> {
                     title: '确定删除该收藏夹?',
                     onConfirm: () =>
                         FavHttp.deleteFolder(mediaIds: [mediaId]).then((res) {
-                      if (res['status']) {
-                        SmartDialog.showToast('删除成功');
-                        Get.back(result: true);
-                      } else {
-                        SmartDialog.showToast(res['msg']);
-                      }
-                    }),
+                          if (res['status']) {
+                            SmartDialog.showToast('删除成功');
+                            Get.back(result: true);
+                          } else {
+                            SmartDialog.showToast(res['msg']);
+                          }
+                        }),
                   ),
                   child: Text(
                     '删除',
@@ -266,63 +277,63 @@ class _FavDetailPageState extends State<FavDetailPage> {
   }
 
   List<Widget> _selectActions(ThemeData theme) => [
-        TextButton(
-          style: TextButton.styleFrom(
-            visualDensity: VisualDensity.compact,
-          ),
-          onPressed: () => _favDetailController.handleSelect(true),
-          child: const Text('全选'),
-        ),
-        TextButton(
-          style: TextButton.styleFrom(
-            visualDensity: VisualDensity.compact,
-          ),
-          onPressed: () =>
-              RequestUtils.onCopyOrMove<FavDetailData, FavDetailItemModel>(
+    TextButton(
+      style: TextButton.styleFrom(
+        visualDensity: VisualDensity.compact,
+      ),
+      onPressed: () => _favDetailController.handleSelect(true),
+      child: const Text('全选'),
+    ),
+    TextButton(
+      style: TextButton.styleFrom(
+        visualDensity: VisualDensity.compact,
+      ),
+      onPressed: () =>
+          RequestUtils.onCopyOrMove<FavDetailData, FavDetailItemModel>(
             context: context,
             isCopy: true,
             ctr: _favDetailController,
             mediaId: _favDetailController.mediaId,
             mid: _favDetailController.accountService.mid,
           ),
-          child: Text(
-            '复制',
-            style: TextStyle(
-              color: theme.colorScheme.onSurfaceVariant,
-            ),
-          ),
+      child: Text(
+        '复制',
+        style: TextStyle(
+          color: theme.colorScheme.onSurfaceVariant,
         ),
-        TextButton(
-          style: TextButton.styleFrom(
-            visualDensity: VisualDensity.compact,
-          ),
-          onPressed: () =>
-              RequestUtils.onCopyOrMove<FavDetailData, FavDetailItemModel>(
+      ),
+    ),
+    TextButton(
+      style: TextButton.styleFrom(
+        visualDensity: VisualDensity.compact,
+      ),
+      onPressed: () =>
+          RequestUtils.onCopyOrMove<FavDetailData, FavDetailItemModel>(
             context: context,
             isCopy: false,
             ctr: _favDetailController,
             mediaId: _favDetailController.mediaId,
             mid: _favDetailController.accountService.mid,
           ),
-          child: Text(
-            '移动',
-            style: TextStyle(
-              color: theme.colorScheme.onSurfaceVariant,
-            ),
-          ),
+      child: Text(
+        '移动',
+        style: TextStyle(
+          color: theme.colorScheme.onSurfaceVariant,
         ),
-        TextButton(
-          style: TextButton.styleFrom(
-            visualDensity: VisualDensity.compact,
-          ),
-          onPressed: () => _favDetailController.onDelChecked(context),
-          child: Text(
-            '删除',
-            style: TextStyle(color: theme.colorScheme.error),
-          ),
-        ),
-        const SizedBox(width: 10),
-      ];
+      ),
+    ),
+    TextButton(
+      style: TextButton.styleFrom(
+        visualDensity: VisualDensity.compact,
+      ),
+      onPressed: () => _favDetailController.onDelChecked(context),
+      child: Text(
+        '删除',
+        style: TextStyle(color: theme.colorScheme.error),
+      ),
+    ),
+    const SizedBox(width: 10),
+  ];
 
   Widget _flexibleSpace(ThemeData theme) {
     final style = TextStyle(
@@ -371,8 +382,9 @@ class _FavDetailPageState extends State<FavDetailPage> {
                             iconSize: 18,
                             tooltip: '${isFav ? '取消' : ''}收藏',
                             onPressed: () => _favDetailController.onFav(isFav),
-                            icon:
-                                isFav ? Icons.favorite : Icons.favorite_border,
+                            icon: isFav
+                                ? Icons.favorite
+                                : Icons.favorite_border,
                             bgColor: isFav
                                 ? null
                                 : theme.colorScheme.onInverseSurface,
@@ -381,7 +393,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
                                 : theme.colorScheme.onSurfaceVariant,
                           );
                         }),
-                      )
+                      ),
                     ],
                   ),
                   if (folderInfo.title.isNotEmpty)
@@ -399,7 +411,8 @@ class _FavDetailPageState extends State<FavDetailPage> {
                           ),
                           GestureDetector(
                             onTap: () => Get.toNamed(
-                                '/member?mid=${folderInfo.upper!.mid}'),
+                              '/member?mid=${folderInfo.upper!.mid}',
+                            ),
                             child: Text(
                               folderInfo.upper!.name!,
                               style: TextStyle(
@@ -436,126 +449,139 @@ class _FavDetailPageState extends State<FavDetailPage> {
     );
   }
 
-  Widget _buildBody(bool enableMultiSelect, ThemeData theme,
-      LoadingState<List<FavDetailItemModel>?> loadingState) {
+  Widget _buildBody(
+    bool enableMultiSelect,
+    ThemeData theme,
+    LoadingState<List<FavDetailItemModel>?> loadingState,
+  ) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: Grid.videoCardHDelegate(context),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) {
-              return const VideoCardHSkeleton();
-            },
-            childCount: 10,
-          ),
+        gridDelegate: Grid.videoCardHDelegate(context),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            return const VideoCardHSkeleton();
+          },
+          childCount: 10,
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  if (index == response.length) {
-                    _favDetailController.onLoadMore();
-                    return Container(
-                      height: 60,
-                      alignment: Alignment.center,
-                      child: Text(
-                        _favDetailController.isEnd ? '没有更多了' : '加载中...',
-                        style: TextStyle(
-                          color: theme.colorScheme.outline,
-                          fontSize: 13,
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    if (index == response.length) {
+                      _favDetailController.onLoadMore();
+                      return Container(
+                        height: 60,
+                        alignment: Alignment.center,
+                        child: Text(
+                          _favDetailController.isEnd ? '没有更多了' : '加载中...',
+                          style: TextStyle(
+                            color: theme.colorScheme.outline,
+                            fontSize: 13,
+                          ),
                         ),
-                      ),
-                    );
-                  }
-                  final isOwner = _favDetailController.isOwner.value ?? false;
-                  FavDetailItemModel item = response[index];
-                  return Stack(
-                    clipBehavior: Clip.none,
-                    children: [
-                      Positioned.fill(
-                        child: FavVideoCardH(
-                          item: item,
-                          onDelFav: isOwner
-                              ? () => _favDetailController.onCancelFav(
+                      );
+                    }
+                    final isOwner = _favDetailController.isOwner.value ?? false;
+                    FavDetailItemModel item = response[index];
+                    return Stack(
+                      clipBehavior: Clip.none,
+                      children: [
+                        Positioned.fill(
+                          child: FavVideoCardH(
+                            item: item,
+                            onDelFav: isOwner
+                                ? () => _favDetailController.onCancelFav(
                                     index,
                                     item.id!,
                                     item.type!,
                                   )
-                              : null,
-                          onViewFav: () {
-                            final folderInfo =
-                                _favDetailController.folderInfo.value;
-                            PageUtils.toVideoPage(
-                              'bvid=${item.bvid}&cid=${item.ugc?.firstCid}',
-                              arguments: {
-                                'videoItem': item,
-                                'heroTag': Utils.makeHeroTag(item.bvid),
-                                'sourceType': 'fav',
-                                'mediaId': folderInfo.id,
-                                'oid': item.id,
-                                'favTitle': folderInfo.title,
-                                'count': folderInfo.mediaCount,
-                                'desc': true,
-                                'isContinuePlaying': index != 0,
-                                'isOwner': isOwner,
-                              },
-                            );
-                          },
-                          onTap: enableMultiSelect
-                              ? () => _favDetailController.onSelect(item)
-                              : null,
-                          onLongPress: isOwner
-                              ? () {
-                                  if (!enableMultiSelect) {
-                                    _favDetailController
-                                        .enableMultiSelect.value = true;
-                                    _favDetailController.onSelect(item);
+                                : null,
+                            onViewFav: () {
+                              final folderInfo =
+                                  _favDetailController.folderInfo.value;
+                              PageUtils.toVideoPage(
+                                'bvid=${item.bvid}&cid=${item.ugc?.firstCid}',
+                                arguments: {
+                                  'videoItem': item,
+                                  'heroTag': Utils.makeHeroTag(item.bvid),
+                                  'sourceType': 'fav',
+                                  'mediaId': folderInfo.id,
+                                  'oid': item.id,
+                                  'favTitle': folderInfo.title,
+                                  'count': folderInfo.mediaCount,
+                                  'desc': true,
+                                  'isContinuePlaying': index != 0,
+                                  'isOwner': isOwner,
+                                },
+                              );
+                            },
+                            onTap: enableMultiSelect
+                                ? () => _favDetailController.onSelect(item)
+                                : null,
+                            onLongPress: isOwner
+                                ? () {
+                                    if (!enableMultiSelect) {
+                                      _favDetailController
+                                              .enableMultiSelect
+                                              .value =
+                                          true;
+                                      _favDetailController.onSelect(item);
+                                    }
                                   }
-                                }
-                              : null,
+                                : null,
+                          ),
                         ),
-                      ),
-                      Positioned(
-                        top: 5,
-                        left: 12,
-                        bottom: 5,
-                        child: IgnorePointer(
-                          child: LayoutBuilder(
-                            builder: (context, constraints) => AnimatedOpacity(
-                              opacity: item.checked == true ? 1 : 0,
-                              duration: const Duration(milliseconds: 200),
-                              child: Container(
-                                alignment: Alignment.center,
-                                height: constraints.maxHeight,
-                                width: constraints.maxHeight *
-                                    StyleString.aspectRatio,
-                                decoration: BoxDecoration(
-                                  borderRadius: StyleString.mdRadius,
-                                  color: Colors.black.withValues(alpha: 0.6),
-                                ),
-                                child: SizedBox(
-                                  width: 34,
-                                  height: 34,
-                                  child: AnimatedScale(
-                                    scale: item.checked == true ? 1 : 0,
-                                    duration: const Duration(milliseconds: 250),
-                                    curve: Curves.easeInOut,
-                                    child: IconButton(
-                                      style: ButtonStyle(
-                                        padding: WidgetStateProperty.all(
-                                            EdgeInsets.zero),
-                                        backgroundColor:
-                                            WidgetStateProperty.resolveWith(
-                                          (states) {
-                                            return theme.colorScheme.surface
-                                                .withValues(alpha: 0.8);
-                                          },
-                                        ),
+                        Positioned(
+                          top: 5,
+                          left: 12,
+                          bottom: 5,
+                          child: IgnorePointer(
+                            child: LayoutBuilder(
+                              builder: (context, constraints) => AnimatedOpacity(
+                                opacity: item.checked == true ? 1 : 0,
+                                duration: const Duration(milliseconds: 200),
+                                child: Container(
+                                  alignment: Alignment.center,
+                                  height: constraints.maxHeight,
+                                  width:
+                                      constraints.maxHeight *
+                                      StyleString.aspectRatio,
+                                  decoration: BoxDecoration(
+                                    borderRadius: StyleString.mdRadius,
+                                    color: Colors.black.withValues(alpha: 0.6),
+                                  ),
+                                  child: SizedBox(
+                                    width: 34,
+                                    height: 34,
+                                    child: AnimatedScale(
+                                      scale: item.checked == true ? 1 : 0,
+                                      duration: const Duration(
+                                        milliseconds: 250,
                                       ),
-                                      onPressed: null,
-                                      icon: Icon(
-                                        Icons.done_all_outlined,
-                                        color: theme.colorScheme.primary,
+                                      curve: Curves.easeInOut,
+                                      child: IconButton(
+                                        style: ButtonStyle(
+                                          padding: WidgetStateProperty.all(
+                                            EdgeInsets.zero,
+                                          ),
+                                          backgroundColor:
+                                              WidgetStateProperty.resolveWith(
+                                                (states) {
+                                                  return theme
+                                                      .colorScheme
+                                                      .surface
+                                                      .withValues(alpha: 0.8);
+                                                },
+                                              ),
+                                        ),
+                                        onPressed: null,
+                                        icon: Icon(
+                                          Icons.done_all_outlined,
+                                          color: theme.colorScheme.primary,
+                                        ),
                                       ),
                                     ),
                                   ),
@@ -564,20 +590,19 @@ class _FavDetailPageState extends State<FavDetailPage> {
                             ),
                           ),
                         ),
-                      ),
-                    ],
-                  );
-                },
-                childCount: response!.length + 1,
+                      ],
+                    );
+                  },
+                  childCount: response!.length + 1,
+                ),
+              )
+            : HttpError(
+                onReload: _favDetailController.onReload,
               ),
-            )
-          : HttpError(
-              onReload: _favDetailController.onReload,
-            ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _favDetailController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _favDetailController.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/fav_detail/widget/fav_video_card.dart b/lib/pages/fav_detail/widget/fav_video_card.dart
index c6c01eed1..7b4578966 100644
--- a/lib/pages/fav_detail/widget/fav_video_card.dart
+++ b/lib/pages/fav_detail/widget/fav_video_card.dart
@@ -40,31 +40,31 @@ class FavVideoCardH extends StatelessWidget {
         onTap: isSort == true
             ? null
             : onTap ??
-                () {
-                  if (!const [0, 16].contains(item.attr)) {
-                    Get.toNamed('/member?mid=${item.upper?.mid}');
-                    return;
-                  }
+                  () {
+                    if (!const [0, 16].contains(item.attr)) {
+                      Get.toNamed('/member?mid=${item.upper?.mid}');
+                      return;
+                    }
 
-                  // pgc
-                  if (item.type == 24) {
-                    PageUtils.viewPgc(
-                      seasonId: item.ogv!.seasonId,
-                      epId: item.id,
-                    );
-                    return;
-                  }
+                    // pgc
+                    if (item.type == 24) {
+                      PageUtils.viewPgc(
+                        seasonId: item.ogv!.seasonId,
+                        epId: item.id,
+                      );
+                      return;
+                    }
 
-                  onViewFav?.call();
-                },
+                    onViewFav?.call();
+                  },
         onLongPress: isSort == true
             ? null
             : onLongPress ??
-                () => imageSaveDialog(
-                      title: item.title,
-                      cover: item.cover,
-                      bvid: item.bvid,
-                    ),
+                  () => imageSaveDialog(
+                    title: item.title,
+                    cover: item.cover,
+                    bvid: item.bvid,
+                  ),
         child: Padding(
           padding: const EdgeInsets.symmetric(
             horizontal: StyleString.safeSpace,
@@ -200,7 +200,7 @@ class FavVideoCardH extends StatelessWidget {
                             onDelFav!();
                           },
                           child: const Text('确定取消'),
-                        )
+                        ),
                       ],
                     );
                   },
diff --git a/lib/pages/fav_folder_sort/view.dart b/lib/pages/fav_folder_sort/view.dart
index ae7256022..a66da86c0 100644
--- a/lib/pages/fav_folder_sort/view.dart
+++ b/lib/pages/fav_folder_sort/view.dart
@@ -20,8 +20,9 @@ class _FavFolderSortPageState extends State<FavFolderSortPage> {
   FavController get _favController => widget.favController;
 
   final GlobalKey _key = GlobalKey();
-  late List<FavFolderInfo> sortList =
-      List<FavFolderInfo>.from(_favController.loadingState.value.data!);
+  late List<FavFolderInfo> sortList = List<FavFolderInfo>.from(
+    _favController.loadingState.value.data!,
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -89,8 +90,9 @@ class _FavFolderSortPageState extends State<FavFolderSortPage> {
           child: FavVideoItem(
             heroTag: key,
             item: item,
-            onLongPress:
-                index == 0 ? () => SmartDialog.showToast('默认收藏夹不支持排序') : null,
+            onLongPress: index == 0
+                ? () => SmartDialog.showToast('默认收藏夹不支持排序')
+                : null,
           ),
         );
       },
diff --git a/lib/pages/fav_panel/view.dart b/lib/pages/fav_panel/view.dart
index 824d91f26..270199192 100644
--- a/lib/pages/fav_panel/view.dart
+++ b/lib/pages/fav_panel/view.dart
@@ -47,52 +47,53 @@ class _FavPanelState extends State<FavPanel> {
     return switch (loadingState) {
       Loading() => loadingWidget,
       Success() => ListView.builder(
-          controller: widget.scrollController,
-          itemCount: list.length,
-          itemBuilder: (context, index) {
-            FavFolderInfo item = list[index];
-            return Material(
-              type: MaterialType.transparency,
-              child: Builder(
-                builder: (context) {
-                  void onTap() {
-                    bool isChecked = item.favState == 1;
-                    item
-                      ..favState = isChecked ? 0 : 1
-                      ..mediaCount =
-                          isChecked ? item.mediaCount - 1 : item.mediaCount + 1;
-                    (context as Element).markNeedsBuild();
-                  }
+        controller: widget.scrollController,
+        itemCount: list.length,
+        itemBuilder: (context, index) {
+          FavFolderInfo item = list[index];
+          return Material(
+            type: MaterialType.transparency,
+            child: Builder(
+              builder: (context) {
+                void onTap() {
+                  bool isChecked = item.favState == 1;
+                  item
+                    ..favState = isChecked ? 0 : 1
+                    ..mediaCount = isChecked
+                        ? item.mediaCount - 1
+                        : item.mediaCount + 1;
+                  (context as Element).markNeedsBuild();
+                }
 
-                  return ListTile(
-                    onTap: onTap,
-                    dense: true,
-                    leading: FavUtil.isPublicFav(item.attr)
-                        ? const Icon(Icons.folder_outlined)
-                        : const Icon(Icons.lock_outline),
-                    minLeadingWidth: 0,
-                    title: Text(item.title),
-                    subtitle: Text(
-                      '${item.mediaCount}个内容 . ${FavUtil.isPublicFavText(item.attr)}',
+                return ListTile(
+                  onTap: onTap,
+                  dense: true,
+                  leading: FavUtil.isPublicFav(item.attr)
+                      ? const Icon(Icons.folder_outlined)
+                      : const Icon(Icons.lock_outline),
+                  minLeadingWidth: 0,
+                  title: Text(item.title),
+                  subtitle: Text(
+                    '${item.mediaCount}个内容 . ${FavUtil.isPublicFavText(item.attr)}',
+                  ),
+                  trailing: Transform.scale(
+                    scale: 0.9,
+                    child: Checkbox(
+                      value: item.favState == 1,
+                      onChanged: (bool? checkValue) => onTap(),
                     ),
-                    trailing: Transform.scale(
-                      scale: 0.9,
-                      child: Checkbox(
-                        value: item.favState == 1,
-                        onChanged: (bool? checkValue) => onTap(),
-                      ),
-                    ),
-                  );
-                },
-              ),
-            );
-          },
-        ),
+                  ),
+                );
+              },
+            ),
+          );
+        },
+      ),
       Error(:var errMsg) => scrollErrorWidget(
-          controller: widget.scrollController,
-          errMsg: errMsg,
-          onReload: _query,
-        ),
+        controller: widget.scrollController,
+        errMsg: errMsg,
+        onReload: _query,
+      ),
     };
   }
 
@@ -124,8 +125,10 @@ class _FavPanelState extends State<FavPanel> {
               ),
               label: const Text('新建收藏夹'),
               style: TextButton.styleFrom(
-                padding:
-                    const EdgeInsets.symmetric(horizontal: 18, vertical: 14),
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 18,
+                  vertical: 14,
+                ),
                 visualDensity: VisualDensity.compact,
               ),
             ),
@@ -150,8 +153,10 @@ class _FavPanelState extends State<FavPanel> {
               TextButton(
                 onPressed: Get.back,
                 style: TextButton.styleFrom(
-                  padding:
-                      const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 20,
+                    vertical: 10,
+                  ),
                   visualDensity: const VisualDensity(
                     horizontal: -1,
                     vertical: -2,
@@ -168,8 +173,10 @@ class _FavPanelState extends State<FavPanel> {
                   widget.ctr.actionFavVideo();
                 },
                 style: FilledButton.styleFrom(
-                  padding:
-                      const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 20,
+                    vertical: 10,
+                  ),
                   visualDensity: const VisualDensity(
                     horizontal: -1,
                     vertical: -2,
diff --git a/lib/pages/fav_search/view.dart b/lib/pages/fav_search/view.dart
index 62561c95f..a06549344 100644
--- a/lib/pages/fav_search/view.dart
+++ b/lib/pages/fav_search/view.dart
@@ -17,8 +17,13 @@ class FavSearchPage extends CommonSearchPage {
   State<FavSearchPage> createState() => _FavSearchPageState();
 }
 
-class _FavSearchPageState extends CommonSearchPageState<FavSearchPage,
-    FavDetailData, FavDetailItemModel> {
+class _FavSearchPageState
+    extends
+        CommonSearchPageState<
+          FavSearchPage,
+          FavDetailData,
+          FavDetailItemModel
+        > {
   @override
   final FavSearchController controller = Get.put(
     FavSearchController(),
@@ -27,26 +32,28 @@ class _FavSearchPageState extends CommonSearchPageState<FavSearchPage,
 
   @override
   List<Widget>? get extraActions => [
-        Obx(
-          () {
-            return PopupMenuButton<FavOrderType>(
-              icon: const Icon(Icons.sort),
-              requestFocus: false,
-              initialValue: controller.order.value,
-              tooltip: '排序方式',
-              onSelected: (value) => controller
-                ..order.value = value
-                ..onReload(),
-              itemBuilder: (context) => FavOrderType.values
-                  .map((e) => PopupMenuItem(
-                        value: e,
-                        child: Text(e.label),
-                      ))
-                  .toList(),
-            );
-          },
-        ),
-      ];
+    Obx(
+      () {
+        return PopupMenuButton<FavOrderType>(
+          icon: const Icon(Icons.sort),
+          requestFocus: false,
+          initialValue: controller.order.value,
+          tooltip: '排序方式',
+          onSelected: (value) => controller
+            ..order.value = value
+            ..onReload(),
+          itemBuilder: (context) => FavOrderType.values
+              .map(
+                (e) => PopupMenuItem(
+                  value: e,
+                  child: Text(e.label),
+                ),
+              )
+              .toList(),
+        );
+      },
+    ),
+  ];
 
   @override
   Widget buildList(List<FavDetailItemModel> list) {
@@ -63,10 +70,10 @@ class _FavSearchPageState extends CommonSearchPageState<FavSearchPage,
             item: item,
             onDelFav: controller.isOwner == true
                 ? () => controller.onCancelFav(
-                      index,
-                      item.id!,
-                      item.type,
-                    )
+                    index,
+                    item.id!,
+                    item.type,
+                  )
                 : null,
             onViewFav: () => PageUtils.toVideoPage(
               'bvid=${item.bvid}&cid=${item.ugc?.firstCid}',
diff --git a/lib/pages/fav_sort/view.dart b/lib/pages/fav_sort/view.dart
index b486aa611..38e309778 100644
--- a/lib/pages/fav_sort/view.dart
+++ b/lib/pages/fav_sort/view.dart
@@ -22,7 +22,8 @@ class _FavSortPageState extends State<FavSortPage> {
 
   final GlobalKey _key = GlobalKey();
   late List<FavDetailItemModel> sortList = List<FavDetailItemModel>.from(
-      _favDetailController.loadingState.value.data!);
+    _favDetailController.loadingState.value.data!,
+  );
   List<String> sort = <String>[];
 
   final ScrollController _scrollController = ScrollController();
@@ -107,10 +108,12 @@ class _FavSortPageState extends State<FavSortPage> {
     }
 
     final oldItem = sortList[oldIndex];
-    final newItem =
-        sortList.getOrNull(oldIndex > newIndex ? newIndex - 1 : newIndex);
+    final newItem = sortList.getOrNull(
+      oldIndex > newIndex ? newIndex - 1 : newIndex,
+    );
     sort.add(
-        '${newItem == null ? '0:0' : '${newItem.id}:${newItem.type}'}:${oldItem.id}:${oldItem.type}');
+      '${newItem == null ? '0:0' : '${newItem.id}:${newItem.type}'}:${oldItem.id}:${oldItem.type}',
+    );
 
     final tabsItem = sortList.removeAt(oldIndex);
     sortList.insert(newIndex, tabsItem);
diff --git a/lib/pages/follow/child/child_view.dart b/lib/pages/follow/child/child_view.dart
index 1d5768235..bfd1811ee 100644
--- a/lib/pages/follow/child/child_view.dart
+++ b/lib/pages/follow/child/child_view.dart
@@ -56,8 +56,8 @@ class _FollowChildPageState extends State<FollowChildPage>
               onPressed: () => _followController
                 ..orderType.value =
                     _followController.orderType.value == FollowOrderType.def
-                        ? FollowOrderType.attention
-                        : FollowOrderType.def
+                    ? FollowOrderType.attention
+                    : FollowOrderType.def
                 ..onReload(),
               icon: const Icon(Icons.format_list_bulleted, size: 20),
               label: Obx(() => Text(_followController.orderType.value.title)),
@@ -70,53 +70,54 @@ class _FollowChildPageState extends State<FollowChildPage>
   }
 
   Widget get _child => refreshIndicator(
-        onRefresh: _followController.onRefresh,
-        child: CustomScrollView(
-          controller: _followController.scrollController,
-          physics: const AlwaysScrollableScrollPhysics(),
-          slivers: [
-            SliverPadding(
-              padding: EdgeInsets.only(
-                  bottom: MediaQuery.paddingOf(context).bottom + 80),
-              sliver:
-                  Obx(() => _buildBody(_followController.loadingState.value)),
-            ),
-          ],
+    onRefresh: _followController.onRefresh,
+    child: CustomScrollView(
+      controller: _followController.scrollController,
+      physics: const AlwaysScrollableScrollPhysics(),
+      slivers: [
+        SliverPadding(
+          padding: EdgeInsets.only(
+            bottom: MediaQuery.paddingOf(context).bottom + 80,
+          ),
+          sliver: Obx(() => _buildBody(_followController.loadingState.value)),
         ),
-      );
+      ],
+    ),
+  );
 
   Widget _buildBody(LoadingState<List<FollowItemModel>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverList.builder(
-          itemCount: 12,
-          itemBuilder: (context, index) {
-            return const MsgFeedTopSkeleton();
-          },
-        ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverList.builder(
-              itemCount: response!.length,
-              itemBuilder: (context, index) {
-                if (index == response.length - 1) {
-                  _followController.onLoadMore();
-                }
-                final item = response[index];
-                return FollowItem(
-                  item: item,
-                  isOwner: widget.controller?.isOwner,
-                  onSelect: widget.onSelect,
-                  callback: (attr) {
-                    item.attribute = attr == 0 ? -1 : 0;
-                    _followController.loadingState.refresh();
-                  },
-                );
-              },
-            )
-          : HttpError(onReload: _followController.onReload),
+        itemCount: 12,
+        itemBuilder: (context, index) {
+          return const MsgFeedTopSkeleton();
+        },
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverList.builder(
+                itemCount: response!.length,
+                itemBuilder: (context, index) {
+                  if (index == response.length - 1) {
+                    _followController.onLoadMore();
+                  }
+                  final item = response[index];
+                  return FollowItem(
+                    item: item,
+                    isOwner: widget.controller?.isOwner,
+                    onSelect: widget.onSelect,
+                    callback: (attr) {
+                      item.attribute = attr == 0 ? -1 : 0;
+                      _followController.loadingState.refresh();
+                    },
+                  );
+                },
+              )
+            : HttpError(onReload: _followController.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _followController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _followController.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/follow/view.dart b/lib/pages/follow/view.dart
index 71a4cdc98..073bffdd3 100644
--- a/lib/pages/follow/view.dart
+++ b/lib/pages/follow/view.dart
@@ -20,8 +20,10 @@ class FollowPage extends StatefulWidget {
 
 class _FollowPageState extends State<FollowPage> {
   final _tag = Utils.generateRandomString(8);
-  late final FollowController _followController =
-      Get.put(FollowController(), tag: _tag);
+  late final FollowController _followController = Get.put(
+    FollowController(),
+    tag: _tag,
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -60,7 +62,7 @@ class _FollowPageState extends State<FollowPage> {
                           Text('黑名单管理'),
                         ],
                       ),
-                    )
+                    ),
                   ],
                 ),
                 const SizedBox(width: 6),
@@ -74,11 +76,11 @@ class _FollowPageState extends State<FollowPage> {
   }
 
   Widget _childPage([MemberTagItemModel? item]) => FollowChildPage(
-        tag: _tag,
-        controller: _followController,
-        mid: _followController.mid,
-        tagid: item?.tagid,
-      );
+    tag: _tag,
+    controller: _followController,
+    mid: _followController.mid,
+    tagid: item?.tagid,
+  );
 
   bool _isCustomTag(int? tagid) {
     return tagid != null && tagid != 0 && tagid != -10 && tagid != -2;
@@ -88,64 +90,66 @@ class _FollowPageState extends State<FollowPage> {
     return switch (loadingState) {
       Loading() => loadingWidget,
       Success() => Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            SafeArea(
-              top: false,
-              bottom: false,
-              child: TabBar(
-                isScrollable: true,
-                tabAlignment: TabAlignment.start,
-                controller: _followController.tabController,
-                tabs: List.generate(_followController.tabs.length, (index) {
-                  return Obx(() {
-                    final item = _followController.tabs[index];
-                    int? count = item.count;
-                    if (_isCustomTag(item.tagid)) {
-                      return GestureDetector(
-                        behavior: HitTestBehavior.translucent,
-                        onLongPress: () {
-                          Feedback.forLongPress(context);
-                          _onHandleTag(index, item);
-                        },
-                        child: Tab(
-                          child: Row(
-                            children: [
-                              Text(
-                                '${item.name}${count != null ? '($count)' : ''} ',
-                              ),
-                              const Icon(Icons.menu, size: 18),
-                            ],
-                          ),
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          SafeArea(
+            top: false,
+            bottom: false,
+            child: TabBar(
+              isScrollable: true,
+              tabAlignment: TabAlignment.start,
+              controller: _followController.tabController,
+              tabs: List.generate(_followController.tabs.length, (index) {
+                return Obx(() {
+                  final item = _followController.tabs[index];
+                  int? count = item.count;
+                  if (_isCustomTag(item.tagid)) {
+                    return GestureDetector(
+                      behavior: HitTestBehavior.translucent,
+                      onLongPress: () {
+                        Feedback.forLongPress(context);
+                        _onHandleTag(index, item);
+                      },
+                      child: Tab(
+                        child: Row(
+                          children: [
+                            Text(
+                              '${item.name}${count != null ? '($count)' : ''} ',
+                            ),
+                            const Icon(Icons.menu, size: 18),
+                          ],
                         ),
-                      );
-                    }
-                    return Tab(
-                        text: '${item.name}${count != null ? '($count)' : ''}');
-                  });
-                }),
-                onTap: (value) {
-                  if (!_followController.tabController!.indexIsChanging) {
-                    final item = _followController.tabs[value];
-                    // if (_isCustomTag(item.tagid)) {
-                    //   _onHandleTag(value, item);
-                    // }
-                    try {
-                      Get.find<FollowChildController>(tag: '$_tag${item.tagid}')
-                          .animateToTop();
-                    } catch (_) {}
+                      ),
+                    );
                   }
-                },
-              ),
+                  return Tab(
+                    text: '${item.name}${count != null ? '($count)' : ''}',
+                  );
+                });
+              }),
+              onTap: (value) {
+                if (!_followController.tabController!.indexIsChanging) {
+                  final item = _followController.tabs[value];
+                  // if (_isCustomTag(item.tagid)) {
+                  //   _onHandleTag(value, item);
+                  // }
+                  try {
+                    Get.find<FollowChildController>(
+                      tag: '$_tag${item.tagid}',
+                    ).animateToTop();
+                  } catch (_) {}
+                }
+              },
             ),
-            Expanded(
-              child: tabBarView(
-                controller: _followController.tabController,
-                children: _followController.tabs.map(_childPage).toList(),
-              ),
+          ),
+          Expanded(
+            child: tabBarView(
+              controller: _followController.tabController,
+              children: _followController.tabs.map(_childPage).toList(),
             ),
-          ],
-        ),
+          ),
+        ],
+      ),
       Error() => _childPage(),
     };
   }
@@ -174,8 +178,9 @@ class _FollowPageState extends State<FollowPage> {
                       inputFormatters: [
                         LengthLimitingTextInputFormatter(16),
                       ],
-                      decoration:
-                          const InputDecoration(border: OutlineInputBorder()),
+                      decoration: const InputDecoration(
+                        border: OutlineInputBorder(),
+                      ),
                     ),
                     onConfirm: () {
                       if (tagName.isNotEmpty) {
diff --git a/lib/pages/follow/widgets/follow_item.dart b/lib/pages/follow/widgets/follow_item.dart
index d90cbc220..1a6702966 100644
--- a/lib/pages/follow/widgets/follow_item.dart
+++ b/lib/pages/follow/widgets/follow_item.dart
@@ -95,8 +95,9 @@ class FollowItem extends StatelessWidget {
                   ),
                   style: FilledButton.styleFrom(
                     padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
-                    foregroundColor:
-                        item.attribute == -1 ? null : theme.colorScheme.outline,
+                    foregroundColor: item.attribute == -1
+                        ? null
+                        : theme.colorScheme.outline,
                     backgroundColor: item.attribute == -1
                         ? null
                         : theme.colorScheme.onInverseSurface,
diff --git a/lib/pages/follow_search/view.dart b/lib/pages/follow_search/view.dart
index 45e9f5f1e..be1b935c2 100644
--- a/lib/pages/follow_search/view.dart
+++ b/lib/pages/follow_search/view.dart
@@ -21,8 +21,9 @@ class FollowSearchPage extends CommonSearchPage {
   State<FollowSearchPage> createState() => _FollowSearchPageState();
 }
 
-class _FollowSearchPageState extends CommonSearchPageState<FollowSearchPage,
-    FollowData, FollowItemModel> {
+class _FollowSearchPageState
+    extends
+        CommonSearchPageState<FollowSearchPage, FollowData, FollowItemModel> {
   @override
   late final FollowSearchController controller = Get.put(
     FollowSearchController(widget.mid ?? Get.arguments['mid']),
diff --git a/lib/pages/group_panel/view.dart b/lib/pages/group_panel/view.dart
index f0a42f154..6ec4e61db 100644
--- a/lib/pages/group_panel/view.dart
+++ b/lib/pages/group_panel/view.dart
@@ -37,12 +37,13 @@ class _GroupPanelState extends State<GroupPanel> {
     MemberHttp.followUpTags().then((res) {
       if (mounted) {
         if (res['status']) {
-          List<MemberTagItemModel> tagsList = (res['data']
-              as List<MemberTagItemModel>)
-            ..removeWhere((item) => item.tagid == 0)
-            ..map((item) {
-              return item.checked = widget.tags?.contains(item.tagid) == true;
-            }).toList();
+          List<MemberTagItemModel> tagsList =
+              (res['data'] as List<MemberTagItemModel>)
+                ..removeWhere((item) => item.tagid == 0)
+                ..map((item) {
+                  return item.checked =
+                      widget.tags?.contains(item.tagid) == true;
+                }).toList();
           showDefaultBtn.value = !tagsList.any((e) => e.checked == true);
           loadingState = Success(tagsList);
         } else {
@@ -61,12 +62,14 @@ class _GroupPanelState extends State<GroupPanel> {
     feedBack();
     // 是否有选中的 有选中的带id，没选使用默认0
     List<MemberTagItemModel> tagsList = loadingState.data;
-    final bool anyHasChecked =
-        tagsList.any((MemberTagItemModel e) => e.checked == true);
+    final bool anyHasChecked = tagsList.any(
+      (MemberTagItemModel e) => e.checked == true,
+    );
     late List<int> tagidList;
     if (anyHasChecked) {
-      final List<MemberTagItemModel> checkedList =
-          tagsList.where((MemberTagItemModel e) => e.checked == true).toList();
+      final List<MemberTagItemModel> checkedList = tagsList
+          .where((MemberTagItemModel e) => e.checked == true)
+          .toList();
       tagidList = checkedList.map<int>((e) => e.tagid!).toList();
     } else {
       tagidList = [0];
@@ -83,47 +86,49 @@ class _GroupPanelState extends State<GroupPanel> {
     return switch (loadingState) {
       Loading() => loadingWidget,
       Success(:var response) => ListView.builder(
-          controller: widget.scrollController,
-          itemCount: response.length,
-          itemBuilder: (context, index) {
-            final item = response[index];
-            return Material(
-              type: MaterialType.transparency,
-              child: Builder(
-                builder: (context) {
-                  void onTap() {
-                    item.checked = !item.checked!;
-                    (context as Element).markNeedsBuild();
-                    showDefaultBtn.value =
-                        !response.any((e) => e.checked == true);
-                  }
-
-                  return ListTile(
-                    onTap: onTap,
-                    dense: true,
-                    leading: const Icon(Icons.group_outlined),
-                    minLeadingWidth: 0,
-                    title: Text(item.name ?? ''),
-                    subtitle:
-                        item.tip?.isNotEmpty == true ? Text(item.tip!) : null,
-                    trailing: Transform.scale(
-                      scale: 0.9,
-                      child: Checkbox(
-                        value: item.checked,
-                        onChanged: (bool? checkValue) => onTap(),
-                      ),
-                    ),
+        controller: widget.scrollController,
+        itemCount: response.length,
+        itemBuilder: (context, index) {
+          final item = response[index];
+          return Material(
+            type: MaterialType.transparency,
+            child: Builder(
+              builder: (context) {
+                void onTap() {
+                  item.checked = !item.checked!;
+                  (context as Element).markNeedsBuild();
+                  showDefaultBtn.value = !response.any(
+                    (e) => e.checked == true,
                   );
-                },
-              ),
-            );
-          },
-        ),
+                }
+
+                return ListTile(
+                  onTap: onTap,
+                  dense: true,
+                  leading: const Icon(Icons.group_outlined),
+                  minLeadingWidth: 0,
+                  title: Text(item.name ?? ''),
+                  subtitle: item.tip?.isNotEmpty == true
+                      ? Text(item.tip!)
+                      : null,
+                  trailing: Transform.scale(
+                    scale: 0.9,
+                    child: Checkbox(
+                      value: item.checked,
+                      onChanged: (bool? checkValue) => onTap(),
+                    ),
+                  ),
+                );
+              },
+            ),
+          );
+        },
+      ),
       Error(:var errMsg) => scrollErrorWidget(
-          controller: widget.scrollController,
-          errMsg: errMsg,
-          onReload: _query,
-        ),
+        controller: widget.scrollController,
+        errMsg: errMsg,
+        onReload: _query,
+      ),
     };
   }
 
@@ -135,9 +140,10 @@ class _GroupPanelState extends State<GroupPanel> {
         AppBar(
           backgroundColor: Colors.transparent,
           leading: IconButton(
-              tooltip: '关闭',
-              onPressed: Get.back,
-              icon: const Icon(Icons.close_outlined)),
+            tooltip: '关闭',
+            onPressed: Get.back,
+            icon: const Icon(Icons.close_outlined),
+          ),
           title: const Text('设置关注分组'),
         ),
         Expanded(child: _buildBody),
diff --git a/lib/pages/history/base_controller.dart b/lib/pages/history/base_controller.dart
index e1824e2da..233b70068 100644
--- a/lib/pages/history/base_controller.dart
+++ b/lib/pages/history/base_controller.dart
@@ -11,7 +11,7 @@ class HistoryBaseController extends GetxController {
   RxBool enableMultiSelect = false.obs;
   RxInt checkedCount = 0.obs;
 
-// 清空观看历史
+  // 清空观看历史
   void onClearHistory(BuildContext context, VoidCallback onSuccess) {
     showDialog(
       context: context,
@@ -71,8 +71,10 @@ class HistoryBaseController extends GetxController {
                 if (res.data['code'] == 0) {
                   SmartDialog.showToast(pauseStatus ? '暂停观看历史' : '恢复观看历史');
                   this.pauseStatus.value = pauseStatus;
-                  GStorage.localCache
-                      .put(LocalCacheKey.historyPause, pauseStatus);
+                  GStorage.localCache.put(
+                    LocalCacheKey.historyPause,
+                    pauseStatus,
+                  );
                 }
                 Get.back();
               },
diff --git a/lib/pages/history/controller.dart b/lib/pages/history/controller.dart
index 9e7992031..ada10aee0 100644
--- a/lib/pages/history/controller.dart
+++ b/lib/pages/history/controller.dart
@@ -44,8 +44,9 @@ class HistoryController
   void onSelect(HistoryItemModel item, [bool disableSelect = true]) {
     List<HistoryItemModel> list = loadingState.value.data!;
     item.checked = !(item.checked ?? false);
-    baseCtr.checkedCount.value =
-        list.where((item) => item.checked == true).length;
+    baseCtr.checkedCount.value = list
+        .where((item) => item.checked == true)
+        .length;
     loadingState.refresh();
     if (baseCtr.checkedCount.value == 0) {
       baseCtr.enableMultiSelect.value = false;
@@ -113,8 +114,9 @@ class HistoryController
   // 删除已看历史记录
   void onDelHistory() {
     if (loadingState.value.isSuccess) {
-      List<HistoryItemModel> list =
-          loadingState.value.data!.where((e) => e.progress == -1).toList();
+      List<HistoryItemModel> list = loadingState.value.data!
+          .where((e) => e.progress == -1)
+          .toList();
       if (list.isNotEmpty) {
         _onDelete(list);
       } else {
@@ -130,8 +132,10 @@ class HistoryController
     }).toList();
     var response = await UserHttp.delHistory(kidList);
     if (response['status']) {
-      List<HistoryItemModel> remainList =
-          loadingState.value.data!.toSet().difference(result.toSet()).toList();
+      List<HistoryItemModel> remainList = loadingState.value.data!
+          .toSet()
+          .difference(result.toSet())
+          .toList();
       if (remainList.isNotEmpty) {
         loadingState.value = Success(remainList);
       } else {
@@ -168,13 +172,15 @@ class HistoryController
               onPressed: () {
                 Get.back();
                 if (loadingState.value.isSuccess) {
-                  _onDelete(loadingState.value.data!
-                      .where((e) => e.checked == true)
-                      .toList());
+                  _onDelete(
+                    loadingState.value.data!
+                        .where((e) => e.checked == true)
+                        .toList(),
+                  );
                 }
               },
               child: const Text('确认'),
-            )
+            ),
           ],
         );
       },
diff --git a/lib/pages/history/view.dart b/lib/pages/history/view.dart
index 3cc0f080d..858f751d7 100644
--- a/lib/pages/history/view.dart
+++ b/lib/pages/history/view.dart
@@ -84,63 +84,75 @@ class _HistoryPageState extends State<HistoryPage>
                                   // 处理菜单项选择的逻辑
                                   switch (type) {
                                     case 'pause':
-                                      _historyController.baseCtr
-                                          .onPauseHistory(context);
+                                      _historyController.baseCtr.onPauseHistory(
+                                        context,
+                                      );
                                       break;
                                     case 'clear':
-                                      _historyController.baseCtr
-                                          .onClearHistory(context, () {
-                                        _historyController.loadingState.value =
-                                            const Success(null);
-                                        if (_historyController.tabController !=
-                                            null) {
-                                          for (final item
-                                              in _historyController.tabs) {
-                                            try {
-                                              Get.find<HistoryController>(
-                                                      tag: item.type)
-                                                  .loadingState
-                                                  .value = const Success(null);
-                                            } catch (_) {}
+                                      _historyController.baseCtr.onClearHistory(
+                                        context,
+                                        () {
+                                          _historyController
+                                              .loadingState
+                                              .value = const Success(
+                                            null,
+                                          );
+                                          if (_historyController
+                                                  .tabController !=
+                                              null) {
+                                            for (final item
+                                                in _historyController.tabs) {
+                                              try {
+                                                Get.find<HistoryController>(
+                                                      tag: item.type,
+                                                    ).loadingState.value =
+                                                    const Success(null);
+                                              } catch (_) {}
+                                            }
                                           }
-                                        }
-                                      });
+                                        },
+                                      );
                                       break;
                                     case 'del':
                                       currCtr().onDelHistory();
                                       break;
                                     case 'multiple':
-                                      _historyController.baseCtr
-                                          .enableMultiSelect.value = true;
+                                      _historyController
+                                              .baseCtr
+                                              .enableMultiSelect
+                                              .value =
+                                          true;
                                       break;
                                   }
                                 },
                                 itemBuilder: (BuildContext context) =>
                                     <PopupMenuEntry<String>>[
-                                  PopupMenuItem<String>(
-                                    value: 'pause',
-                                    child: Obx(
-                                      () => Text(
-                                        !_historyController
-                                                .baseCtr.pauseStatus.value
-                                            ? '暂停观看记录'
-                                            : '恢复观看记录',
+                                      PopupMenuItem<String>(
+                                        value: 'pause',
+                                        child: Obx(
+                                          () => Text(
+                                            !_historyController
+                                                    .baseCtr
+                                                    .pauseStatus
+                                                    .value
+                                                ? '暂停观看记录'
+                                                : '恢复观看记录',
+                                          ),
+                                        ),
                                       ),
-                                    ),
-                                  ),
-                                  const PopupMenuItem<String>(
-                                    value: 'clear',
-                                    child: Text('清空观看记录'),
-                                  ),
-                                  const PopupMenuItem<String>(
-                                    value: 'del',
-                                    child: Text('删除已看记录'),
-                                  ),
-                                  const PopupMenuItem<String>(
-                                    value: 'multiple',
-                                    child: Text('多选删除'),
-                                  ),
-                                ],
+                                      const PopupMenuItem<String>(
+                                        value: 'clear',
+                                        child: Text('清空观看记录'),
+                                      ),
+                                      const PopupMenuItem<String>(
+                                        value: 'del',
+                                        child: Text('删除已看记录'),
+                                      ),
+                                      const PopupMenuItem<String>(
+                                        value: 'multiple',
+                                        child: Text('多选删除'),
+                                      ),
+                                    ],
                               ),
                               const SizedBox(width: 6),
                             ],
@@ -167,8 +179,8 @@ class _HistoryPageState extends State<HistoryPage>
                                 child: Text(
                                   '删除',
                                   style: TextStyle(
-                                      color:
-                                          Theme.of(context).colorScheme.error),
+                                    color: Theme.of(context).colorScheme.error,
+                                  ),
                                 ),
                               ),
                               const SizedBox(width: 6),
@@ -187,13 +199,16 @@ class _HistoryPageState extends State<HistoryPage>
                                   controller: _historyController.tabController,
                                   onTap: (index) {
                                     if (!_historyController
-                                        .tabController!.indexIsChanging) {
+                                        .tabController!
+                                        .indexIsChanging) {
                                       currCtr().scrollController.animToTop();
                                     } else {
                                       if (enableMultiSelect) {
-                                        currCtr(_historyController
-                                                .tabController!.previousIndex)
-                                            .handleSelect();
+                                        currCtr(
+                                          _historyController
+                                              .tabController!
+                                              .previousIndex,
+                                        ).handleSelect();
                                       }
                                     }
                                   },
@@ -213,7 +228,8 @@ class _HistoryPageState extends State<HistoryPage>
                                         _historyController.tabController,
                                     children: [
                                       KeepAliveWrapper(
-                                          builder: (context) => _buildPage),
+                                        builder: (context) => _buildPage,
+                                      ),
                                       ..._historyController.tabs.map(
                                         (item) => HistoryPage(type: item.type),
                                       ),
@@ -236,61 +252,61 @@ class _HistoryPageState extends State<HistoryPage>
   }
 
   Widget get _buildPage => refreshIndicator(
-        onRefresh: _historyController.onRefresh,
-        child: CustomScrollView(
-          physics: const AlwaysScrollableScrollPhysics(),
-          controller: _historyController.scrollController,
-          slivers: [
-            SliverPadding(
-              padding: EdgeInsets.only(
-                top: StyleString.safeSpace - 5,
-                bottom: MediaQuery.paddingOf(context).bottom + 80,
-              ),
-              sliver:
-                  Obx(() => _buildBody(_historyController.loadingState.value)),
-            ),
-          ],
+    onRefresh: _historyController.onRefresh,
+    child: CustomScrollView(
+      physics: const AlwaysScrollableScrollPhysics(),
+      controller: _historyController.scrollController,
+      slivers: [
+        SliverPadding(
+          padding: EdgeInsets.only(
+            top: StyleString.safeSpace - 5,
+            bottom: MediaQuery.paddingOf(context).bottom + 80,
+          ),
+          sliver: Obx(() => _buildBody(_historyController.loadingState.value)),
         ),
-      );
+      ],
+    ),
+  );
 
   Widget _buildBody(LoadingState<List<HistoryItemModel>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: Grid.videoCardHDelegate(context),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) {
-              return const VideoCardHSkeleton();
-            },
-            childCount: 10,
-          ),
+        gridDelegate: Grid.videoCardHDelegate(context),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            return const VideoCardHSkeleton();
+          },
+          childCount: 10,
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  if (index == response.length - 1) {
-                    _historyController.onLoadMore();
-                  }
-                  final item = response[index];
-                  return HistoryItem(
-                    item: item,
-                    ctr: _historyController.baseCtr,
-                    onChoose: () => _historyController.onSelect(item),
-                    onDelete: (kid, business) =>
-                        _historyController.delHistory(item),
-                  );
-                },
-                childCount: response!.length,
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    if (index == response.length - 1) {
+                      _historyController.onLoadMore();
+                    }
+                    final item = response[index];
+                    return HistoryItem(
+                      item: item,
+                      ctr: _historyController.baseCtr,
+                      onChoose: () => _historyController.onSelect(item),
+                      onDelete: (kid, business) =>
+                          _historyController.delHistory(item),
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(
+                onReload: _historyController.onReload,
               ),
-            )
-          : HttpError(
-              onReload: _historyController.onReload,
-            ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _historyController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _historyController.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/history/widgets/item.dart b/lib/pages/history/widgets/item.dart
index e9a6f5f1c..800cb4fb8 100644
--- a/lib/pages/history/widgets/item.dart
+++ b/lib/pages/history/widgets/item.dart
@@ -69,7 +69,8 @@ class HistoryItem extends StatelessWidget {
           } else if (item.history.business == 'pgc') {
             PageUtils.viewPgc(epId: item.history.epid);
           } else {
-            int? cid = item.history.cid ??
+            int? cid =
+                item.history.cid ??
                 await SearchHttp.ab2c(
                   aid: aid,
                   bvid: bvid,
@@ -138,15 +139,17 @@ class HistoryItem extends StatelessWidget {
                                 type: PBadgeType.gray,
                               ),
                             // 右上角
-                            if (HistoryBusinessType.showBadge
-                                    .contains(item.history.business) ||
+                            if (HistoryBusinessType.showBadge.contains(
+                                  item.history.business,
+                                ) ||
                                 item.history.business ==
                                     HistoryBusinessType.live.type)
                               PBadge(
                                 text: item.badge,
                                 top: 6.0,
                                 right: 6.0,
-                                type: item.history.business ==
+                                type:
+                                    item.history.business ==
                                             HistoryBusinessType.live.type &&
                                         item.liveStatus != 1
                                     ? PBadgeType.gray
@@ -181,28 +184,34 @@ class HistoryItem extends StatelessWidget {
                                     height: 34,
                                     child: AnimatedScale(
                                       scale: item.checked == true ? 1 : 0,
-                                      duration:
-                                          const Duration(milliseconds: 250),
+                                      duration: const Duration(
+                                        milliseconds: 250,
+                                      ),
                                       curve: Curves.easeInOut,
                                       child: IconButton(
                                         tooltip: '取消选择',
                                         style: ButtonStyle(
                                           padding: WidgetStateProperty.all(
-                                              EdgeInsets.zero),
+                                            EdgeInsets.zero,
+                                          ),
                                           backgroundColor:
                                               WidgetStateProperty.resolveWith(
-                                            (states) {
-                                              return theme.colorScheme.surface
-                                                  .withValues(alpha: 0.8);
-                                            },
-                                          ),
+                                                (states) {
+                                                  return theme
+                                                      .colorScheme
+                                                      .surface
+                                                      .withValues(alpha: 0.8);
+                                                },
+                                              ),
                                         ),
                                         onPressed: () {
                                           feedBack();
                                           onChoose?.call();
                                         },
-                                        icon: Icon(Icons.done_all_outlined,
-                                            color: theme.colorScheme.primary),
+                                        icon: Icon(
+                                          Icons.done_all_outlined,
+                                          color: theme.colorScheme.primary,
+                                        ),
                                       ),
                                     ),
                                   ),
@@ -236,55 +245,60 @@ class HistoryItem extends StatelessWidget {
                   position: PopupMenuPosition.under,
                   itemBuilder: (BuildContext context) =>
                       <PopupMenuEntry<String>>[
-                    if (item.authorMid != null &&
-                        item.authorName?.isNotEmpty == true)
-                      PopupMenuItem<String>(
-                        onTap: () =>
-                            Get.toNamed('/member?mid=${item.authorMid}'),
-                        height: 35,
-                        child: Row(
-                          children: [
-                            const Icon(MdiIcons.accountCircleOutline, size: 16),
-                            const SizedBox(width: 6),
-                            Text(
-                              '访问：${item.authorName}',
-                              style: const TextStyle(fontSize: 13),
-                            )
-                          ],
+                        if (item.authorMid != null &&
+                            item.authorName?.isNotEmpty == true)
+                          PopupMenuItem<String>(
+                            onTap: () =>
+                                Get.toNamed('/member?mid=${item.authorMid}'),
+                            height: 35,
+                            child: Row(
+                              children: [
+                                const Icon(
+                                  MdiIcons.accountCircleOutline,
+                                  size: 16,
+                                ),
+                                const SizedBox(width: 6),
+                                Text(
+                                  '访问：${item.authorName}',
+                                  style: const TextStyle(fontSize: 13),
+                                ),
+                              ],
+                            ),
+                          ),
+                        if (item.history.business != 'pgc' &&
+                            item.badge != '番剧' &&
+                            item.tagName?.contains('动画') != true &&
+                            item.history.business != 'live' &&
+                            item.history.business?.contains('article') != true)
+                          PopupMenuItem<String>(
+                            onTap: () async {
+                              var res = await UserHttp.toViewLater(
+                                bvid: item.history.bvid,
+                              );
+                              SmartDialog.showToast(res['msg']);
+                            },
+                            height: 35,
+                            child: const Row(
+                              children: [
+                                Icon(Icons.watch_later_outlined, size: 16),
+                                SizedBox(width: 6),
+                                Text('稍后再看', style: TextStyle(fontSize: 13)),
+                              ],
+                            ),
+                          ),
+                        PopupMenuItem<String>(
+                          onTap: () =>
+                              onDelete(item.kid, item.history.business),
+                          height: 35,
+                          child: const Row(
+                            children: [
+                              Icon(Icons.close_outlined, size: 16),
+                              SizedBox(width: 6),
+                              Text('删除记录', style: TextStyle(fontSize: 13)),
+                            ],
+                          ),
                         ),
-                      ),
-                    if (item.history.business != 'pgc' &&
-                        item.badge != '番剧' &&
-                        item.tagName?.contains('动画') != true &&
-                        item.history.business != 'live' &&
-                        item.history.business?.contains('article') != true)
-                      PopupMenuItem<String>(
-                        onTap: () async {
-                          var res = await UserHttp.toViewLater(
-                              bvid: item.history.bvid);
-                          SmartDialog.showToast(res['msg']);
-                        },
-                        height: 35,
-                        child: const Row(
-                          children: [
-                            Icon(Icons.watch_later_outlined, size: 16),
-                            SizedBox(width: 6),
-                            Text('稍后再看', style: TextStyle(fontSize: 13))
-                          ],
-                        ),
-                      ),
-                    PopupMenuItem<String>(
-                      onTap: () => onDelete(item.kid, item.history.business),
-                      height: 35,
-                      child: const Row(
-                        children: [
-                          Icon(Icons.close_outlined, size: 16),
-                          SizedBox(width: 6),
-                          Text('删除记录', style: TextStyle(fontSize: 13))
-                        ],
-                      ),
-                    ),
-                  ],
+                      ],
                 ),
               ),
             ),
diff --git a/lib/pages/history_search/controller.dart b/lib/pages/history_search/controller.dart
index d4e6a1972..0eded1017 100644
--- a/lib/pages/history_search/controller.dart
+++ b/lib/pages/history_search/controller.dart
@@ -9,9 +9,9 @@ class HistorySearchController
     extends CommonSearchController<HistoryData, HistoryItemModel> {
   @override
   Future<LoadingState<HistoryData>> customGetData() => UserHttp.searchHistory(
-        pn: page,
-        keyword: editController.value.text,
-      );
+    pn: page,
+    keyword: editController.value.text,
+  );
 
   @override
   List<HistoryItemModel>? getDataList(HistoryData response) {
diff --git a/lib/pages/history_search/view.dart b/lib/pages/history_search/view.dart
index e82d9186c..bf74a20d8 100644
--- a/lib/pages/history_search/view.dart
+++ b/lib/pages/history_search/view.dart
@@ -15,8 +15,13 @@ class HistorySearchPage extends CommonSearchPage {
   State<HistorySearchPage> createState() => _HistorySearchPageState();
 }
 
-class _HistorySearchPageState extends CommonSearchPageState<HistorySearchPage,
-    HistoryData, HistoryItemModel> {
+class _HistorySearchPageState
+    extends
+        CommonSearchPageState<
+          HistorySearchPage,
+          HistoryData,
+          HistoryItemModel
+        > {
   @override
   final HistorySearchController controller = Get.put(
     HistorySearchController(),
diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart
index c44e9f307..03fec8583 100644
--- a/lib/pages/home/controller.dart
+++ b/lib/pages/home/controller.dart
@@ -60,7 +60,8 @@ class HomeController extends GetxController
 
   void setTabConfig() {
     List<int>? localTabs = GStorage.setting.get(SettingBoxKey.tabBarSort);
-    tabs = localTabs?.map((i) => HomeTabType.values[i]).toList() ??
+    tabs =
+        localTabs?.map((i) => HomeTabType.values[i]).toList() ??
         HomeTabType.values;
 
     tabController = TabController(
diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart
index 725334507..4a58d39a9 100644
--- a/lib/pages/home/view.dart
+++ b/lib/pages/home/view.dart
@@ -47,7 +47,7 @@ class _HomePageState extends State<HomePage>
                 child: TabBar(
                   controller: _homeController.tabController,
                   tabs: [
-                    for (var i in _homeController.tabs) Tab(text: i.label)
+                    for (var i in _homeController.tabs) Tab(text: i.label),
                   ],
                   isScrollable: true,
                   dividerColor: Colors.transparent,
@@ -115,23 +115,27 @@ class _HomePageState extends State<HomePage>
                       Positioned(
                         right: -6,
                         bottom: -6,
-                        child: Obx(() => MineController.anonymity.value
-                            ? IgnorePointer(
-                                child: Container(
-                                  padding: const EdgeInsets.all(2),
-                                  decoration: BoxDecoration(
-                                    color: theme.colorScheme.secondaryContainer,
-                                    shape: BoxShape.circle,
+                        child: Obx(
+                          () => MineController.anonymity.value
+                              ? IgnorePointer(
+                                  child: Container(
+                                    padding: const EdgeInsets.all(2),
+                                    decoration: BoxDecoration(
+                                      color:
+                                          theme.colorScheme.secondaryContainer,
+                                      shape: BoxShape.circle,
+                                    ),
+                                    child: Icon(
+                                      size: 16,
+                                      MdiIcons.incognito,
+                                      color: theme
+                                          .colorScheme
+                                          .onSecondaryContainer,
+                                    ),
                                   ),
-                                  child: Icon(
-                                    size: 16,
-                                    MdiIcons.incognito,
-                                    color:
-                                        theme.colorScheme.onSecondaryContainer,
-                                  ),
-                                ),
-                              )
-                            : const SizedBox.shrink()),
+                                )
+                              : const SizedBox.shrink(),
+                        ),
                       ),
                     ],
                   )
@@ -150,10 +154,10 @@ class _HomePageState extends State<HomePage>
     return StreamBuilder(
       stream: _homeController.hideSearchBar
           ? _mainController.navSearchStreamDebounce
-              ? _homeController.searchBarStream?.stream
-                  .distinct()
-                  .throttle(const Duration(milliseconds: 500))
-              : _homeController.searchBarStream?.stream.distinct()
+                ? _homeController.searchBarStream?.stream.distinct().throttle(
+                    const Duration(milliseconds: 500),
+                  )
+                : _homeController.searchBarStream?.stream.distinct()
           : null,
       initialData: true,
       builder: (BuildContext context, AsyncSnapshot snapshot) {
@@ -181,8 +185,9 @@ class _HomePageState extends State<HomePage>
           color: theme.colorScheme.onSecondaryContainer.withValues(alpha: 0.05),
           child: InkWell(
             borderRadius: const BorderRadius.all(Radius.circular(25)),
-            splashColor:
-                theme.colorScheme.primaryContainer.withValues(alpha: 0.3),
+            splashColor: theme.colorScheme.primaryContainer.withValues(
+              alpha: 0.3,
+            ),
             onTap: () => Get.toNamed(
               '/search',
               parameters: {
@@ -257,12 +262,14 @@ Widget msgBadge(MainController mainController) {
   return GestureDetector(
     onTap: toWhisper,
     child: Badge(
-      isLabelVisible: mainController.msgBadgeMode != DynamicBadgeMode.hidden &&
+      isLabelVisible:
+          mainController.msgBadgeMode != DynamicBadgeMode.hidden &&
           msgUnReadCount.isNotEmpty,
       alignment: mainController.msgBadgeMode == DynamicBadgeMode.number
           ? const Alignment(0, -0.5)
           : const Alignment(0.5, -0.5),
-      label: mainController.msgBadgeMode == DynamicBadgeMode.number &&
+      label:
+          mainController.msgBadgeMode == DynamicBadgeMode.number &&
               msgUnReadCount.isNotEmpty
           ? Text(msgUnReadCount)
           : null,
diff --git a/lib/pages/hot/view.dart b/lib/pages/hot/view.dart
index 95e43f173..954e15936 100644
--- a/lib/pages/hot/view.dart
+++ b/lib/pages/hot/view.dart
@@ -43,7 +43,10 @@ class _HotPageState extends CommonPageState<HotPage, HotController>
         mainAxisSize: MainAxisSize.min,
         children: [
           CachedNetworkImage(
-              width: 35, height: 35, imageUrl: ImageUtil.thumbnailUrl(iconUrl)),
+            width: 35,
+            height: 35,
+            imageUrl: ImageUtil.thumbnailUrl(iconUrl),
+          ),
           const SizedBox(height: 4),
           Text(
             title,
@@ -67,8 +70,11 @@ class _HotPageState extends CommonPageState<HotPage, HotController>
             child: Obx(
               () => controller.showHotRcmd.value
                   ? Padding(
-                      padding:
-                          const EdgeInsets.only(left: 12, top: 12, right: 12),
+                      padding: const EdgeInsets.only(
+                        left: 12,
+                        top: 12,
+                        right: 12,
+                      ),
                       child: Row(
                         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                         children: [
@@ -80,8 +86,9 @@ class _HotPageState extends CommonPageState<HotPage, HotController>
                               try {
                                 HomeController homeController =
                                     Get.find<HomeController>();
-                                int index = homeController.tabs
-                                    .indexOf(HomeTabType.rank);
+                                int index = homeController.tabs.indexOf(
+                                  HomeTabType.rank,
+                                );
                                 if (index != -1) {
                                   homeController.tabController.animateTo(index);
                                 } else {
@@ -107,7 +114,7 @@ class _HotPageState extends CommonPageState<HotPage, HotController>
                               '/webview',
                               parameters: {
                                 'url':
-                                    'https://www.bilibili.com/h5/weekly-recommend'
+                                    'https://www.bilibili.com/h5/weekly-recommend',
                               },
                             ),
                           ),
@@ -119,7 +126,7 @@ class _HotPageState extends CommonPageState<HotPage, HotController>
                               '/webview',
                               parameters: {
                                 'url':
-                                    'https://www.bilibili.com/h5/good-history'
+                                    'https://www.bilibili.com/h5/good-history',
                               },
                             ),
                           ),
@@ -158,31 +165,32 @@ class _HotPageState extends CommonPageState<HotPage, HotController>
   Widget _buildBody(LoadingState<List<HotVideoItemModel>?> loadingState) {
     return switch (loadingState) {
       Loading() => _buildSkeleton(),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  if (index == response.length - 1) {
-                    controller.onLoadMore();
-                  }
-                  return VideoCardH(
-                    videoItem: response[index],
-                    onRemove: () => controller.loadingState
-                      ..value.data!.removeAt(index)
-                      ..refresh(),
-                  );
-                },
-                childCount: response!.length,
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    if (index == response.length - 1) {
+                      controller.onLoadMore();
+                    }
+                    return VideoCardH(
+                      videoItem: response[index],
+                      onRemove: () => controller.loadingState
+                        ..value.data!.removeAt(index)
+                        ..refresh(),
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(
+                onReload: controller.onReload,
               ),
-            )
-          : HttpError(
-              onReload: controller.onReload,
-            ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/later/base_controller.dart b/lib/pages/later/base_controller.dart
index 6f8e8c733..7c45be0fd 100644
--- a/lib/pages/later/base_controller.dart
+++ b/lib/pages/later/base_controller.dart
@@ -5,6 +5,7 @@ class LaterBaseController extends GetxController {
   RxBool enableMultiSelect = false.obs;
   RxInt checkedCount = 0.obs;
 
-  RxMap<LaterViewType, int> counts =
-      {for (final item in LaterViewType.values) item: -1}.obs;
+  RxMap<LaterViewType, int> counts = {
+    for (final item in LaterViewType.values) item: -1,
+  }.obs;
 }
diff --git a/lib/pages/later/child_view.dart b/lib/pages/later/child_view.dart
index 943cd75ec..943b879c5 100644
--- a/lib/pages/later/child_view.dart
+++ b/lib/pages/later/child_view.dart
@@ -60,100 +60,109 @@ class _LaterViewChildPageState extends State<LaterViewChildPage>
     final theme = Theme.of(context);
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: Grid.videoCardHDelegate(context),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) {
-              return const VideoCardHSkeleton();
-            },
-            childCount: 10,
-          ),
+        gridDelegate: Grid.videoCardHDelegate(context),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            return const VideoCardHSkeleton();
+          },
+          childCount: 10,
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  if (index == response.length - 1) {
-                    _laterController.onLoadMore();
-                  }
-                  var videoItem = response[index];
-                  final enableMultiSelect =
-                      _laterController.baseCtr.enableMultiSelect.value;
-                  return Stack(
-                    clipBehavior: Clip.none,
-                    children: [
-                      VideoCardHLater(
-                        videoItem: videoItem,
-                        onViewLater: (cid) {
-                          PageUtils.toVideoPage(
-                            'bvid=${videoItem.bvid}&cid=$cid',
-                            arguments: {
-                              'videoItem': videoItem,
-                              'oid': videoItem.aid,
-                              'heroTag': Utils.makeHeroTag(videoItem.bvid),
-                              'sourceType': 'watchLater',
-                              'count': _laterController
-                                  .baseCtr.counts[LaterViewType.all],
-                              'favTitle': '稍后再看',
-                              'mediaId': _laterController.accountService.mid,
-                              'desc': false,
-                              'isContinuePlaying': index != 0,
-                            },
-                          );
-                        },
-                        onTap: !enableMultiSelect
-                            ? null
-                            : () => _laterController.onSelect(videoItem),
-                        onLongPress: () {
-                          if (!enableMultiSelect) {
-                            _laterController.baseCtr.enableMultiSelect.value =
-                                true;
-                            _laterController.onSelect(videoItem);
-                          }
-                        },
-                      ),
-                      Positioned(
-                        top: 5,
-                        left: 12,
-                        bottom: 5,
-                        child: IgnorePointer(
-                          child: LayoutBuilder(
-                            builder: (context, constraints) => AnimatedOpacity(
-                              opacity: videoItem.checked == true ? 1 : 0,
-                              duration: const Duration(milliseconds: 200),
-                              child: Container(
-                                alignment: Alignment.center,
-                                height: constraints.maxHeight,
-                                width: constraints.maxHeight *
-                                    StyleString.aspectRatio,
-                                decoration: BoxDecoration(
-                                  borderRadius: StyleString.mdRadius,
-                                  color: Colors.black.withValues(alpha: 0.6),
-                                ),
-                                child: SizedBox(
-                                  width: 34,
-                                  height: 34,
-                                  child: AnimatedScale(
-                                    scale: videoItem.checked == true ? 1 : 0,
-                                    duration: const Duration(milliseconds: 250),
-                                    curve: Curves.easeInOut,
-                                    child: IconButton(
-                                      tooltip: '取消选择',
-                                      style: ButtonStyle(
-                                        padding: WidgetStateProperty.all(
-                                            EdgeInsets.zero),
-                                        backgroundColor:
-                                            WidgetStateProperty.resolveWith(
-                                          (states) {
-                                            return theme.colorScheme.surface
-                                                .withValues(alpha: 0.8);
-                                          },
-                                        ),
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    if (index == response.length - 1) {
+                      _laterController.onLoadMore();
+                    }
+                    var videoItem = response[index];
+                    final enableMultiSelect =
+                        _laterController.baseCtr.enableMultiSelect.value;
+                    return Stack(
+                      clipBehavior: Clip.none,
+                      children: [
+                        VideoCardHLater(
+                          videoItem: videoItem,
+                          onViewLater: (cid) {
+                            PageUtils.toVideoPage(
+                              'bvid=${videoItem.bvid}&cid=$cid',
+                              arguments: {
+                                'videoItem': videoItem,
+                                'oid': videoItem.aid,
+                                'heroTag': Utils.makeHeroTag(videoItem.bvid),
+                                'sourceType': 'watchLater',
+                                'count': _laterController
+                                    .baseCtr
+                                    .counts[LaterViewType.all],
+                                'favTitle': '稍后再看',
+                                'mediaId': _laterController.accountService.mid,
+                                'desc': false,
+                                'isContinuePlaying': index != 0,
+                              },
+                            );
+                          },
+                          onTap: !enableMultiSelect
+                              ? null
+                              : () => _laterController.onSelect(videoItem),
+                          onLongPress: () {
+                            if (!enableMultiSelect) {
+                              _laterController.baseCtr.enableMultiSelect.value =
+                                  true;
+                              _laterController.onSelect(videoItem);
+                            }
+                          },
+                        ),
+                        Positioned(
+                          top: 5,
+                          left: 12,
+                          bottom: 5,
+                          child: IgnorePointer(
+                            child: LayoutBuilder(
+                              builder: (context, constraints) => AnimatedOpacity(
+                                opacity: videoItem.checked == true ? 1 : 0,
+                                duration: const Duration(milliseconds: 200),
+                                child: Container(
+                                  alignment: Alignment.center,
+                                  height: constraints.maxHeight,
+                                  width:
+                                      constraints.maxHeight *
+                                      StyleString.aspectRatio,
+                                  decoration: BoxDecoration(
+                                    borderRadius: StyleString.mdRadius,
+                                    color: Colors.black.withValues(alpha: 0.6),
+                                  ),
+                                  child: SizedBox(
+                                    width: 34,
+                                    height: 34,
+                                    child: AnimatedScale(
+                                      scale: videoItem.checked == true ? 1 : 0,
+                                      duration: const Duration(
+                                        milliseconds: 250,
                                       ),
-                                      onPressed: null,
-                                      icon: Icon(
-                                        Icons.done_all_outlined,
-                                        color: theme.colorScheme.primary,
+                                      curve: Curves.easeInOut,
+                                      child: IconButton(
+                                        tooltip: '取消选择',
+                                        style: ButtonStyle(
+                                          padding: WidgetStateProperty.all(
+                                            EdgeInsets.zero,
+                                          ),
+                                          backgroundColor:
+                                              WidgetStateProperty.resolveWith(
+                                                (states) {
+                                                  return theme
+                                                      .colorScheme
+                                                      .surface
+                                                      .withValues(alpha: 0.8);
+                                                },
+                                              ),
+                                        ),
+                                        onPressed: null,
+                                        icon: Icon(
+                                          Icons.done_all_outlined,
+                                          color: theme.colorScheme.primary,
+                                        ),
                                       ),
                                     ),
                                   ),
@@ -162,36 +171,35 @@ class _LaterViewChildPageState extends State<LaterViewChildPage>
                             ),
                           ),
                         ),
-                      ),
-                      Positioned(
-                        right: 12,
-                        bottom: 0,
-                        child: iconButton(
-                          tooltip: '移除',
-                          context: context,
-                          onPressed: () => _laterController.toViewDel(
-                            context,
-                            index,
-                            videoItem.aid,
+                        Positioned(
+                          right: 12,
+                          bottom: 0,
+                          child: iconButton(
+                            tooltip: '移除',
+                            context: context,
+                            onPressed: () => _laterController.toViewDel(
+                              context,
+                              index,
+                              videoItem.aid,
+                            ),
+                            icon: Icons.clear,
+                            iconColor: theme.colorScheme.outline,
+                            bgColor: Colors.transparent,
                           ),
-                          icon: Icons.clear,
-                          iconColor: theme.colorScheme.outline,
-                          bgColor: Colors.transparent,
                         ),
-                      ),
-                    ],
-                  );
-                },
-                childCount: response!.length,
+                      ],
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(
+                onReload: _laterController.onReload,
               ),
-            )
-          : HttpError(
-              onReload: _laterController.onReload,
-            ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _laterController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _laterController.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/later/controller.dart b/lib/pages/later/controller.dart
index d190b159a..106dae052 100644
--- a/lib/pages/later/controller.dart
+++ b/lib/pages/later/controller.dart
@@ -28,17 +28,18 @@ class LaterController extends MultiSelectController<LaterData, LaterItemModel> {
 
   @override
   Future<LoadingState<LaterData>> customGetData() => UserHttp.seeYouLater(
-        page: page,
-        viewed: laterViewType.type,
-        asc: asc.value,
-      );
+    page: page,
+    viewed: laterViewType.type,
+    asc: asc.value,
+  );
 
   @override
   void onSelect(LaterItemModel item, [bool disableSelect = true]) {
     List<LaterItemModel> list = loadingState.value.data!;
     item.checked = !(item.checked ?? false);
-    baseCtr.checkedCount.value =
-        list.where((item) => item.checked == true).length;
+    baseCtr.checkedCount.value = list
+        .where((item) => item.checked == true)
+        .length;
     loadingState.refresh();
     if (baseCtr.checkedCount.value == 0) {
       baseCtr.enableMultiSelect.value = false;
@@ -111,7 +112,7 @@ class LaterController extends MultiSelectController<LaterData, LaterItemModel> {
                 SmartDialog.showToast(res['msg']);
               },
               child: const Text('确认移除'),
-            )
+            ),
           ],
         );
       },
@@ -166,12 +167,14 @@ class LaterController extends MultiSelectController<LaterData, LaterItemModel> {
             TextButton(
               onPressed: () {
                 Get.back();
-                _onDelete(loadingState.value.data!
-                    .where((e) => e.checked == true)
-                    .toList());
+                _onDelete(
+                  loadingState.value.data!
+                      .where((e) => e.checked == true)
+                      .toList(),
+                );
               },
               child: const Text('确认'),
-            )
+            ),
           ],
         );
       },
@@ -183,8 +186,9 @@ class LaterController extends MultiSelectController<LaterData, LaterItemModel> {
     List<int?> aids = result.map((item) => item.aid).toList();
     var res = await UserHttp.toViewDel(aids: aids);
     if (res['status']) {
-      Set<LaterItemModel> remainList =
-          loadingState.value.data!.toSet().difference(result.toSet());
+      Set<LaterItemModel> remainList = loadingState.value.data!
+          .toSet()
+          .difference(result.toSet());
       baseCtr.counts[laterViewType] =
           baseCtr.counts[laterViewType]! - aids.length;
       loadingState.value = Success(remainList.toList());
diff --git a/lib/pages/later/view.dart b/lib/pages/later/view.dart
index 5c1c85545..7cb246531 100644
--- a/lib/pages/later/view.dart
+++ b/lib/pages/later/view.dart
@@ -91,8 +91,8 @@ class _LaterPageState extends State<LaterPage>
                     tabs: LaterViewType.values.map((item) {
                       final count = _baseCtr.counts[item];
                       return Tab(
-                          text:
-                              '${item.title}${count != -1 ? '($count)' : ''}');
+                        text: '${item.title}${count != -1 ? '($count)' : ''}',
+                      );
                     }).toList(),
                     onTap: (_) {
                       if (!_tabController.indexIsChanging) {
@@ -167,8 +167,10 @@ class _LaterPageState extends State<LaterPage>
                       ..onReload();
                   },
                   child: Padding(
-                    padding:
-                        const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 12,
+                      vertical: 6,
+                    ),
                     child: Text.rich(
                       TextSpan(
                         children: [
@@ -208,8 +210,10 @@ class _LaterPageState extends State<LaterPage>
             child: PopupMenuButton(
               tooltip: '清空',
               child: Padding(
-                padding:
-                    const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 12,
+                  vertical: 6,
+                ),
                 child: Text.rich(
                   TextSpan(
                     children: [
diff --git a/lib/pages/later/widgets/video_card_h_later.dart b/lib/pages/later/widgets/video_card_h_later.dart
index a491c2336..4450928fd 100644
--- a/lib/pages/later/widgets/video_card_h_later.dart
+++ b/lib/pages/later/widgets/video_card_h_later.dart
@@ -40,13 +40,15 @@ class VideoCardHLater extends StatelessWidget {
     return Material(
       type: MaterialType.transparency,
       child: InkWell(
-        onLongPress: onLongPress ??
+        onLongPress:
+            onLongPress ??
             () => imageSaveDialog(
-                  title: videoItem.title,
-                  cover: videoItem.pic,
-                  bvid: videoItem.bvid,
-                ),
-        onTap: onTap ??
+              title: videoItem.title,
+              cover: videoItem.pic,
+              bvid: videoItem.bvid,
+            ),
+        onTap:
+            onTap ??
             () async {
               if (type == 'ketang') {
                 SmartDialog.showToast('课堂视频暂不支持播放');
@@ -61,9 +63,12 @@ class VideoCardHLater extends StatelessWidget {
                 return;
               }
               try {
-                final int? cid = videoItem.cid ??
+                final int? cid =
+                    videoItem.cid ??
                     await SearchHttp.ab2c(
-                        aid: videoItem.aid, bvid: videoItem.bvid);
+                      aid: videoItem.aid,
+                      bvid: videoItem.bvid,
+                    );
                 if (cid != null) {
                   onViewLater!(cid);
                 }
@@ -131,11 +136,12 @@ class VideoCardHLater extends StatelessWidget {
                                   ? 1
                                   : progress / videoItem.duration!,
                             ),
-                          )
+                          ),
                         ] else if (videoItem.duration! > 0)
                           PBadge(
-                            text:
-                                DurationUtil.formatDuration(videoItem.duration),
+                            text: DurationUtil.formatDuration(
+                              videoItem.duration,
+                            ),
                             right: 6.0,
                             bottom: 6.0,
                             type: PBadgeType.gray,
@@ -231,7 +237,7 @@ class VideoCardHLater extends StatelessWidget {
                 ),
               ],
             ),
-          ]
+          ],
         ],
       ),
     );
diff --git a/lib/pages/later_search/controller.dart b/lib/pages/later_search/controller.dart
index be8592a17..0160339a7 100644
--- a/lib/pages/later_search/controller.dart
+++ b/lib/pages/later_search/controller.dart
@@ -14,9 +14,9 @@ class LaterSearchController
 
   @override
   Future<LoadingState<LaterData>> customGetData() => UserHttp.seeYouLater(
-        page: page,
-        keyword: editController.value.text,
-      );
+    page: page,
+    keyword: editController.value.text,
+  );
 
   @override
   List<LaterItemModel>? getDataList(LaterData response) {
diff --git a/lib/pages/live/controller.dart b/lib/pages/live/controller.dart
index 2906a7dd4..6ee722aa7 100644
--- a/lib/pages/live/controller.dart
+++ b/lib/pages/live/controller.dart
@@ -79,7 +79,9 @@ class LiveController extends CommonListController {
       );
     }
     return LiveHttp.liveFeedIndex(
-        pn: page, isLogin: accountService.isLogin.value);
+      pn: page,
+      isLogin: accountService.isLogin.value,
+    );
   }
 
   @override
@@ -105,10 +107,10 @@ class LiveController extends CommonListController {
         first: data.followItem,
         second: data.areaItem,
       );
-      areaIndex.value = (data.areaItem?.cardData?.areaEntranceV3?.list
-                  ?.indexWhere((e) =>
-                      e.areaV2Id == areaId &&
-                      e.areaV2ParentId == parentAreaId) ??
+      areaIndex.value =
+          (data.areaItem?.cardData?.areaEntranceV3?.list?.indexWhere(
+                (e) => e.areaV2Id == areaId && e.areaV2ParentId == parentAreaId,
+              ) ??
               -2) +
           1;
     }
diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart
index 27f2a1ff4..e98b0e824 100644
--- a/lib/pages/live/view.dart
+++ b/lib/pages/live/view.dart
@@ -54,10 +54,12 @@ class _LivePageState extends CommonPageState<LivePage, LiveController>
                 top: StyleString.cardSpace,
                 bottom: MediaQuery.paddingOf(context).bottom + 80,
               ),
-              sliver: SliverMainAxisGroup(slivers: [
-                Obx(() => _buildTop(theme, controller.topState.value)),
-                Obx(() => _buildBody(theme, controller.loadingState.value)),
-              ]),
+              sliver: SliverMainAxisGroup(
+                slivers: [
+                  Obx(() => _buildTop(theme, controller.topState.value)),
+                  Obx(() => _buildBody(theme, controller.loadingState.value)),
+                ],
+              ),
             ),
           ],
         ),
@@ -77,11 +79,17 @@ class _LivePageState extends CommonPageState<LivePage, LiveController>
                 Expanded(
                   child: SelfSizedHorizontalList(
                     gapSize: 12,
-                    padding:
-                        const EdgeInsets.only(top: 10, bottom: 10, right: 12),
+                    padding: const EdgeInsets.only(
+                      top: 10,
+                      bottom: 10,
+                      right: 12,
+                    ),
                     childBuilder: (index) {
                       late final item = data
-                          .second!.cardData!.areaEntranceV3!.list![index - 1];
+                          .second!
+                          .cardData!
+                          .areaEntranceV3!
+                          .list![index - 1];
                       return Obx(
                         () {
                           final isCurr = index == controller.areaIndex.value;
@@ -132,91 +140,90 @@ class _LivePageState extends CommonPageState<LivePage, LiveController>
   Widget _buildBody(ThemeData theme, LoadingState<List?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: SliverGridDelegateWithExtentAndRatio(
-            mainAxisSpacing: StyleString.cardSpace,
-            crossAxisSpacing: StyleString.cardSpace,
-            maxCrossAxisExtent: Grid.smallCardWidth,
-            childAspectRatio: StyleString.aspectRatio,
-            mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
-          ),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) {
-              return const VideoCardVSkeleton();
-            },
-            childCount: 10,
-          ),
+        gridDelegate: SliverGridDelegateWithExtentAndRatio(
+          mainAxisSpacing: StyleString.cardSpace,
+          crossAxisSpacing: StyleString.cardSpace,
+          maxCrossAxisExtent: Grid.smallCardWidth,
+          childAspectRatio: StyleString.aspectRatio,
+          mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
         ),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            return const VideoCardVSkeleton();
+          },
+          childCount: 10,
+        ),
+      ),
       Success(:var response) => SliverMainAxisGroup(
-          slivers: [
-            if (controller.newTags?.isNotEmpty == true)
-              SliverToBoxAdapter(
-                child: SelfSizedHorizontalList(
-                  gapSize: 12,
-                  padding: const EdgeInsets.only(bottom: 8),
-                  childBuilder: (index) {
-                    late final item = controller.newTags![index];
-                    return Obx(
-                      () {
-                        final isCurr = index == controller.tagIndex.value;
-                        return SearchText(
-                          fontSize: 13,
-                          padding: const EdgeInsets.symmetric(
-                            horizontal: 8,
-                            vertical: 3,
-                          ),
-                          text: '${item.name}',
-                          bgColor: isCurr
-                              ? theme.colorScheme.secondaryContainer
-                              : Colors.transparent,
-                          textColor: isCurr
-                              ? theme.colorScheme.onSecondaryContainer
-                              : null,
-                          onTap: (value) {
-                            controller.onSelectTag(
-                              index,
-                              item.sortType,
-                            );
-                          },
-                        );
-                      },
-                    );
-                  },
-                  itemCount: controller.newTags!.length,
-                ),
-              ),
-            response?.isNotEmpty == true
-                ? SliverGrid(
-                    gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                      mainAxisSpacing: StyleString.cardSpace,
-                      crossAxisSpacing: StyleString.cardSpace,
-                      maxCrossAxisExtent: Grid.smallCardWidth,
-                      childAspectRatio: StyleString.aspectRatio,
-                      mainAxisExtent:
-                          MediaQuery.textScalerOf(context).scale(90),
-                    ),
-                    delegate: SliverChildBuilderDelegate(
-                      (context, index) {
-                        if (index == response.length - 1) {
-                          controller.onLoadMore();
-                        }
-                        final item = response[index];
-                        if (item is LiveCardList) {
-                          return LiveCardVApp(
-                            item: item.cardData!.smallCardV1!,
+        slivers: [
+          if (controller.newTags?.isNotEmpty == true)
+            SliverToBoxAdapter(
+              child: SelfSizedHorizontalList(
+                gapSize: 12,
+                padding: const EdgeInsets.only(bottom: 8),
+                childBuilder: (index) {
+                  late final item = controller.newTags![index];
+                  return Obx(
+                    () {
+                      final isCurr = index == controller.tagIndex.value;
+                      return SearchText(
+                        fontSize: 13,
+                        padding: const EdgeInsets.symmetric(
+                          horizontal: 8,
+                          vertical: 3,
+                        ),
+                        text: '${item.name}',
+                        bgColor: isCurr
+                            ? theme.colorScheme.secondaryContainer
+                            : Colors.transparent,
+                        textColor: isCurr
+                            ? theme.colorScheme.onSecondaryContainer
+                            : null,
+                        onTap: (value) {
+                          controller.onSelectTag(
+                            index,
+                            item.sortType,
                           );
-                        }
-                        return LiveCardVApp(item: item);
-                      },
-                      childCount: response!.length,
-                    ),
-                  )
-                : HttpError(onReload: controller.onReload),
-          ],
-        ),
+                        },
+                      );
+                    },
+                  );
+                },
+                itemCount: controller.newTags!.length,
+              ),
+            ),
+          response?.isNotEmpty == true
+              ? SliverGrid(
+                  gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                    mainAxisSpacing: StyleString.cardSpace,
+                    crossAxisSpacing: StyleString.cardSpace,
+                    maxCrossAxisExtent: Grid.smallCardWidth,
+                    childAspectRatio: StyleString.aspectRatio,
+                    mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
+                  ),
+                  delegate: SliverChildBuilderDelegate(
+                    (context, index) {
+                      if (index == response.length - 1) {
+                        controller.onLoadMore();
+                      }
+                      final item = response[index];
+                      if (item is LiveCardList) {
+                        return LiveCardVApp(
+                          item: item.cardData!.smallCardV1!,
+                        );
+                      }
+                      return LiveCardVApp(item: item);
+                    },
+                    childCount: response!.length,
+                  ),
+                )
+              : HttpError(onReload: controller.onReload),
+        ],
+      ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: controller.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/live/widgets/live_item_app.dart b/lib/pages/live/widgets/live_item_app.dart
index ef2e9b0e6..7e0e93fd1 100644
--- a/lib/pages/live/widgets/live_item_app.dart
+++ b/lib/pages/live/widgets/live_item_app.dart
@@ -29,33 +29,35 @@ class LiveCardVApp extends StatelessWidget {
           children: [
             AspectRatio(
               aspectRatio: StyleString.aspectRatio,
-              child: LayoutBuilder(builder: (context, boxConstraints) {
-                double maxWidth = boxConstraints.maxWidth;
-                double maxHeight = boxConstraints.maxHeight;
-                return Stack(
-                  clipBehavior: Clip.none,
-                  children: [
-                    NetworkImgLayer(
-                      src: item.cover!,
-                      width: maxWidth,
-                      height: maxHeight,
-                      radius: 0,
-                    ),
-                    Positioned(
-                      left: 0,
-                      right: 0,
-                      bottom: 0,
-                      child: AnimatedOpacity(
-                        opacity: 1,
-                        duration: const Duration(milliseconds: 200),
-                        child: videoStat(context),
+              child: LayoutBuilder(
+                builder: (context, boxConstraints) {
+                  double maxWidth = boxConstraints.maxWidth;
+                  double maxHeight = boxConstraints.maxHeight;
+                  return Stack(
+                    clipBehavior: Clip.none,
+                    children: [
+                      NetworkImgLayer(
+                        src: item.cover!,
+                        width: maxWidth,
+                        height: maxHeight,
+                        radius: 0,
                       ),
-                    ),
-                  ],
-                );
-              }),
+                      Positioned(
+                        left: 0,
+                        right: 0,
+                        bottom: 0,
+                        child: AnimatedOpacity(
+                          opacity: 1,
+                          duration: const Duration(milliseconds: 200),
+                          child: videoStat(context),
+                        ),
+                      ),
+                    ],
+                  );
+                },
+              ),
             ),
-            liveContent(context)
+            liveContent(context),
           ],
         ),
       ),
diff --git a/lib/pages/live_area/controller.dart b/lib/pages/live_area/controller.dart
index 3763047f2..6ba2c150b 100644
--- a/lib/pages/live_area/controller.dart
+++ b/lib/pages/live_area/controller.dart
@@ -39,14 +39,16 @@ class LiveAreaController
       LiveHttp.liveAreaList(isLogin: accountService.isLogin.value);
 
   Future<void> queryFavTags() async {
-    favState.value =
-        await LiveHttp.getLiveFavTag(isLogin: accountService.isLogin.value);
+    favState.value = await LiveHttp.getLiveFavTag(
+      isLogin: accountService.isLogin.value,
+    );
   }
 
   Future<void> setFavTag() async {
     if (favState.value.isSuccess) {
       final res = await LiveHttp.setLiveFavTag(
-          ids: favState.value.data.map((e) => e.id).toList());
+        ids: favState.value.data.map((e) => e.id).toList(),
+      );
       if (res['status']) {
         isEditing.value = !isEditing.value;
         SmartDialog.showToast('设置成功');
diff --git a/lib/pages/live_area/view.dart b/lib/pages/live_area/view.dart
index b87ca0158..fe616f459 100644
--- a/lib/pages/live_area/view.dart
+++ b/lib/pages/live_area/view.dart
@@ -40,7 +40,8 @@ class _LiveAreaPageState extends State<LiveAreaPage> {
                     visualDensity: VisualDensity.compact,
                   ),
                   child: Obx(
-                      () => Text(_controller.isEditing.value ? '完成' : '编辑')),
+                    () => Text(_controller.isEditing.value ? '完成' : '编辑'),
+                  ),
                 ),
                 const SizedBox(width: 16),
               ]
@@ -55,8 +56,9 @@ class _LiveAreaPageState extends State<LiveAreaPage> {
             if (_controller.accountService.isLogin.value)
               Obx(() => _buildFavWidget(theme, _controller.favState.value)),
             Expanded(
-              child:
-                  Obx(() => _buildBody(theme, _controller.loadingState.value)),
+              child: Obx(
+                () => _buildBody(theme, _controller.loadingState.value),
+              ),
             ),
           ],
         ),
@@ -65,22 +67,25 @@ class _LiveAreaPageState extends State<LiveAreaPage> {
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<AreaList>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<AreaList>?> loadingState,
+  ) {
     return switch (loadingState) {
       Loading() => const SizedBox.shrink(),
-      Success(:var response) => response?.isNotEmpty == true
-          ? DefaultTabController(
-              length: response!.length,
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  TabBar(
-                    isScrollable: true,
-                    tabAlignment: TabAlignment.start,
-                    tabs: response.map((e) => Tab(text: e.name)).toList(),
-                  ),
-                  Expanded(
-                    child: tabBarView(
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? DefaultTabController(
+                length: response!.length,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    TabBar(
+                      isScrollable: true,
+                      tabAlignment: TabAlignment.start,
+                      tabs: response.map((e) => Tab(text: e.name)).toList(),
+                    ),
+                    Expanded(
+                      child: tabBarView(
                         children: response
                             .map(
                               (e) => KeepAliveWrapper(
@@ -93,15 +98,15 @@ class _LiveAreaPageState extends State<LiveAreaPage> {
                                       top: 12,
                                       bottom:
                                           MediaQuery.paddingOf(context).bottom +
-                                              80,
+                                          80,
                                     ),
                                     gridDelegate:
                                         const SliverGridDelegateWithMaxCrossAxisExtent(
-                                      maxCrossAxisExtent: 100,
-                                      mainAxisSpacing: 10,
-                                      crossAxisSpacing: 10,
-                                      mainAxisExtent: 80,
-                                    ),
+                                          maxCrossAxisExtent: 100,
+                                          mainAxisSpacing: 10,
+                                          crossAxisSpacing: 10,
+                                          mainAxisExtent: 80,
+                                        ),
                                     itemCount: e.areaList!.length,
                                     itemBuilder: (context, index) {
                                       final item = e.areaList![index];
@@ -123,7 +128,9 @@ class _LiveAreaPageState extends State<LiveAreaPage> {
                                           } else {
                                             // check
                                             if (_controller
-                                                .favState.value.isSuccess) {
+                                                .favState
+                                                .value
+                                                .isSuccess) {
                                               _controller.favInfo[item.id] =
                                                   true;
                                               _controller.favState
@@ -140,21 +147,24 @@ class _LiveAreaPageState extends State<LiveAreaPage> {
                                 },
                               ),
                             )
-                            .toList()),
-                  )
-                ],
-              ),
-            )
-          : scrollErrorWidget(onReload: _controller.onReload),
+                            .toList(),
+                      ),
+                    ),
+                  ],
+                ),
+              )
+            : scrollErrorWidget(onReload: _controller.onReload),
       Error(:var errMsg) => scrollErrorWidget(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
   Widget _buildFavWidget(
-      ThemeData theme, LoadingState<List<AreaItem>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<AreaItem>?> loadingState,
+  ) {
     if (loadingState.isSuccess) {
       final List<AreaItem>? list = loadingState.data;
       return Padding(
@@ -349,7 +359,7 @@ class _LiveAreaPageState extends State<LiveAreaPage> {
             }
             return const SizedBox.shrink();
           }),
-        )
+        ),
       ],
     );
   }
diff --git a/lib/pages/live_area_detail/child/controller.dart b/lib/pages/live_area_detail/child/controller.dart
index e5e860019..457bcea56 100644
--- a/lib/pages/live_area_detail/child/controller.dart
+++ b/lib/pages/live_area_detail/child/controller.dart
@@ -42,8 +42,10 @@ class LiveAreaChildController
   List<CardLiveItem>? getDataList(LiveSecondData response) {
     count = response.count;
     newTags = response.newTags;
-    tagIndex.value =
-        max(0, newTags?.indexWhere((e) => e.sortType == sortType) ?? 0);
+    tagIndex.value = max(
+      0,
+      newTags?.indexWhere((e) => e.sortType == sortType) ?? 0,
+    );
     return response.cardList;
   }
 
diff --git a/lib/pages/live_area_detail/child/view.dart b/lib/pages/live_area_detail/child/view.dart
index 7e45ad02a..15f983cd3 100644
--- a/lib/pages/live_area_detail/child/view.dart
+++ b/lib/pages/live_area_detail/child/view.dart
@@ -50,8 +50,9 @@ class _LiveAreaChildPageState extends State<LiveAreaChildPage>
               top: StyleString.safeSpace,
               bottom: MediaQuery.paddingOf(context).bottom + 80,
             ),
-            sliver:
-                Obx(() => _buildBody(theme, _controller.loadingState.value)),
+            sliver: Obx(
+              () => _buildBody(theme, _controller.loadingState.value),
+            ),
           ),
         ],
       ),
@@ -59,92 +60,93 @@ class _LiveAreaChildPageState extends State<LiveAreaChildPage>
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<CardLiveItem>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<CardLiveItem>?> loadingState,
+  ) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: SliverGridDelegateWithExtentAndRatio(
-            mainAxisSpacing: StyleString.cardSpace,
-            crossAxisSpacing: StyleString.cardSpace,
-            maxCrossAxisExtent: Grid.smallCardWidth,
-            childAspectRatio: StyleString.aspectRatio,
-            mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
-          ),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) {
-              return const VideoCardVSkeleton();
-            },
-            childCount: 10,
-          ),
+        gridDelegate: SliverGridDelegateWithExtentAndRatio(
+          mainAxisSpacing: StyleString.cardSpace,
+          crossAxisSpacing: StyleString.cardSpace,
+          maxCrossAxisExtent: Grid.smallCardWidth,
+          childAspectRatio: StyleString.aspectRatio,
+          mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
         ),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            return const VideoCardVSkeleton();
+          },
+          childCount: 10,
+        ),
+      ),
       Success(:var response) => SliverMainAxisGroup(
-          slivers: [
-            if (_controller.newTags?.isNotEmpty == true)
-              SliverToBoxAdapter(
-                child: Padding(
-                  padding: const EdgeInsets.only(bottom: 12),
-                  child: SelfSizedHorizontalList(
-                    gapSize: 12,
-                    childBuilder: (index) {
-                      late final item = _controller.newTags![index];
-                      return Obx(
-                        () {
-                          final isCurr = index == _controller.tagIndex.value;
-                          return SearchText(
-                            fontSize: 14,
-                            padding: const EdgeInsets.symmetric(
-                              horizontal: 8,
-                              vertical: 3,
-                            ),
-                            text: '${item.name}',
-                            bgColor: isCurr
-                                ? theme.colorScheme.secondaryContainer
-                                : Colors.transparent,
-                            textColor: isCurr
-                                ? theme.colorScheme.onSecondaryContainer
-                                : null,
-                            onTap: (value) {
-                              _controller.onSelectTag(
-                                index,
-                                item.sortType,
-                              );
-                            },
-                          );
-                        },
-                      );
-                    },
-                    itemCount: _controller.newTags!.length,
-                  ),
+        slivers: [
+          if (_controller.newTags?.isNotEmpty == true)
+            SliverToBoxAdapter(
+              child: Padding(
+                padding: const EdgeInsets.only(bottom: 12),
+                child: SelfSizedHorizontalList(
+                  gapSize: 12,
+                  childBuilder: (index) {
+                    late final item = _controller.newTags![index];
+                    return Obx(
+                      () {
+                        final isCurr = index == _controller.tagIndex.value;
+                        return SearchText(
+                          fontSize: 14,
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 8,
+                            vertical: 3,
+                          ),
+                          text: '${item.name}',
+                          bgColor: isCurr
+                              ? theme.colorScheme.secondaryContainer
+                              : Colors.transparent,
+                          textColor: isCurr
+                              ? theme.colorScheme.onSecondaryContainer
+                              : null,
+                          onTap: (value) {
+                            _controller.onSelectTag(
+                              index,
+                              item.sortType,
+                            );
+                          },
+                        );
+                      },
+                    );
+                  },
+                  itemCount: _controller.newTags!.length,
                 ),
               ),
-            response?.isNotEmpty == true
-                ? SliverGrid(
-                    gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                      mainAxisSpacing: StyleString.cardSpace,
-                      crossAxisSpacing: StyleString.cardSpace,
-                      maxCrossAxisExtent: Grid.smallCardWidth,
-                      childAspectRatio: StyleString.aspectRatio,
-                      mainAxisExtent:
-                          MediaQuery.textScalerOf(context).scale(90),
-                    ),
-                    delegate: SliverChildBuilderDelegate(
-                      (context, index) {
-                        if (index == response.length - 1) {
-                          _controller.onLoadMore();
-                        }
-                        return LiveCardVApp(item: response[index]);
-                      },
-                      childCount: response!.length,
-                    ),
-                  )
-                : HttpError(
-                    onReload: _controller.onReload,
+            ),
+          response?.isNotEmpty == true
+              ? SliverGrid(
+                  gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                    mainAxisSpacing: StyleString.cardSpace,
+                    crossAxisSpacing: StyleString.cardSpace,
+                    maxCrossAxisExtent: Grid.smallCardWidth,
+                    childAspectRatio: StyleString.aspectRatio,
+                    mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
                   ),
-          ],
-        ),
+                  delegate: SliverChildBuilderDelegate(
+                    (context, index) {
+                      if (index == response.length - 1) {
+                        _controller.onLoadMore();
+                      }
+                      return LiveCardVApp(item: response[index]);
+                    },
+                    childCount: response!.length,
+                  ),
+                )
+              : HttpError(
+                  onReload: _controller.onReload,
+                ),
+        ],
+      ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/live_area_detail/view.dart b/lib/pages/live_area_detail/view.dart
index 058f32ed2..f65d2ec19 100644
--- a/lib/pages/live_area_detail/view.dart
+++ b/lib/pages/live_area_detail/view.dart
@@ -29,7 +29,8 @@ class LiveAreaDetailPage extends StatefulWidget {
 
 class _LiveAreaDetailPageState extends State<LiveAreaDetailPage> {
   late final _controller = Get.put(
-      LiveAreaDatailController(widget.areaId?.toString(), widget.parentAreaId));
+    LiveAreaDatailController(widget.areaId?.toString(), widget.parentAreaId),
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -54,75 +55,81 @@ class _LiveAreaDetailPageState extends State<LiveAreaDetailPage> {
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<AreaItem>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<AreaItem>?> loadingState,
+  ) {
     return switch (loadingState) {
       Loading() => const SizedBox.shrink(),
-      Success(:var response) => response?.isNotEmpty == true
-          ? DefaultTabController(
-              initialIndex: _controller.initialIndex,
-              length: response!.length,
-              child: Builder(
-                builder: (context) {
-                  return Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Row(
-                        children: [
-                          Expanded(
-                            child: TabBar(
-                              dividerHeight: 0,
-                              dividerColor: Colors.transparent,
-                              isScrollable: true,
-                              tabAlignment: TabAlignment.start,
-                              tabs: response
-                                  .map((e) => Tab(text: e.name ?? ''))
-                                  .toList(),
-                              onTap: (index) {
-                                try {
-                                  if (!DefaultTabController.of(context)
-                                      .indexIsChanging) {
-                                    final item = response[index];
-                                    Get.find<LiveAreaChildController>(
-                                            tag: '${item.id}${item.parentId}')
-                                        .animateToTop();
-                                  }
-                                } catch (_) {}
-                              },
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? DefaultTabController(
+                initialIndex: _controller.initialIndex,
+                length: response!.length,
+                child: Builder(
+                  builder: (context) {
+                    return Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Row(
+                          children: [
+                            Expanded(
+                              child: TabBar(
+                                dividerHeight: 0,
+                                dividerColor: Colors.transparent,
+                                isScrollable: true,
+                                tabAlignment: TabAlignment.start,
+                                tabs: response
+                                    .map((e) => Tab(text: e.name ?? ''))
+                                    .toList(),
+                                onTap: (index) {
+                                  try {
+                                    if (!DefaultTabController.of(
+                                      context,
+                                    ).indexIsChanging) {
+                                      final item = response[index];
+                                      Get.find<LiveAreaChildController>(
+                                        tag: '${item.id}${item.parentId}',
+                                      ).animateToTop();
+                                    }
+                                  } catch (_) {}
+                                },
+                              ),
                             ),
-                          ),
-                          iconButton(
-                            context: context,
-                            icon: Icons.menu,
-                            bgColor: Colors.transparent,
-                            onPressed: () =>
-                                _showTags(context, theme, response),
-                          ),
-                        ],
-                      ),
-                      const Divider(height: 1),
-                      Expanded(
-                        child: tabBarView(
-                          children: response
-                              .map((e) => LiveAreaChildPage(
+                            iconButton(
+                              context: context,
+                              icon: Icons.menu,
+                              bgColor: Colors.transparent,
+                              onPressed: () =>
+                                  _showTags(context, theme, response),
+                            ),
+                          ],
+                        ),
+                        const Divider(height: 1),
+                        Expanded(
+                          child: tabBarView(
+                            children: response
+                                .map(
+                                  (e) => LiveAreaChildPage(
                                     areaId: e.id,
                                     parentAreaId: e.parentId,
-                                  ))
-                              .toList(),
+                                  ),
+                                )
+                                .toList(),
+                          ),
                         ),
-                      ),
-                    ],
-                  );
-                },
+                      ],
+                    );
+                  },
+                ),
+              )
+            : LiveAreaChildPage(
+                areaId: widget.areaId,
+                parentAreaId: widget.parentAreaId,
               ),
-            )
-          : LiveAreaChildPage(
-              areaId: widget.areaId,
-              parentAreaId: widget.parentAreaId,
-            ),
       Error() => LiveAreaChildPage(
-          areaId: widget.areaId,
-          parentAreaId: widget.parentAreaId,
-        ),
+        areaId: widget.areaId,
+        parentAreaId: widget.parentAreaId,
+      ),
     };
   }
 
@@ -194,11 +201,11 @@ class _LiveAreaDetailPageState extends State<LiveAreaDetailPage> {
                     itemCount: list.length,
                     gridDelegate:
                         const SliverGridDelegateWithMaxCrossAxisExtent(
-                      maxCrossAxisExtent: 100,
-                      mainAxisSpacing: 10,
-                      crossAxisSpacing: 10,
-                      mainAxisExtent: 80,
-                    ),
+                          maxCrossAxisExtent: 100,
+                          mainAxisSpacing: 10,
+                          crossAxisSpacing: 10,
+                          mainAxisExtent: 80,
+                        ),
                     itemBuilder: (_, index) {
                       return _tagItem(
                         theme: theme,
diff --git a/lib/pages/live_dm_block/controller.dart b/lib/pages/live_dm_block/controller.dart
index 72cafc2ad..0d47a0ce2 100644
--- a/lib/pages/live_dm_block/controller.dart
+++ b/lib/pages/live_dm_block/controller.dart
@@ -17,8 +17,10 @@ class LiveDmBlockController extends GetxController
     queryData();
   }
 
-  late final TabController tabController =
-      TabController(length: 2, vsync: this);
+  late final TabController tabController = TabController(
+    length: 2,
+    vsync: this,
+  );
 
   int? oldLevel;
   final RxInt level = 0.obs;
@@ -54,8 +56,11 @@ class LiveDmBlockController extends GetxController
     }
   }
 
-  Future<bool> setSilent(LiveDmSilentType type, int level,
-      {VoidCallback? onError}) async {
+  Future<bool> setSilent(
+    LiveDmSilentType type,
+    int level, {
+    VoidCallback? onError,
+  }) async {
     var res = await LiveHttp.liveSetSilent(type: type.name, level: level);
     if (res['status']) {
       switch (type) {
@@ -108,8 +113,11 @@ class LiveDmBlockController extends GetxController
         SmartDialog.showToast(res['msg']);
       }
     } else {
-      var res =
-          await LiveHttp.liveShieldUser(uid: value, roomid: roomId, type: 1);
+      var res = await LiveHttp.liveShieldUser(
+        uid: value,
+        roomid: roomId,
+        type: 1,
+      );
       if (res['status']) {
         shieldUserList.insert(
           0,
@@ -126,8 +134,11 @@ class LiveDmBlockController extends GetxController
 
   Future<void> onRemove(int index, dynamic item) async {
     if (item is ShieldUserList) {
-      var res =
-          await LiveHttp.liveShieldUser(uid: item.uid, roomid: roomId, type: 0);
+      var res = await LiveHttp.liveShieldUser(
+        uid: item.uid,
+        roomid: roomId,
+        type: 0,
+      );
       if (res['status']) {
         shieldUserList.removeAt(index);
       } else {
diff --git a/lib/pages/live_dm_block/view.dart b/lib/pages/live_dm_block/view.dart
index cbafe804e..1ca9e325d 100644
--- a/lib/pages/live_dm_block/view.dart
+++ b/lib/pages/live_dm_block/view.dart
@@ -21,8 +21,10 @@ class LiveDmBlockPage extends StatefulWidget {
 }
 
 class _LiveDmBlockPageState extends State<LiveDmBlockPage> {
-  final _controller =
-      Get.put(LiveDmBlockController(), tag: Utils.generateRandomString(8));
+  final _controller = Get.put(
+    LiveDmBlockController(),
+    tag: Utils.generateRandomString(8),
+  );
   late bool isPortrait;
 
   @override
@@ -32,7 +34,10 @@ class _LiveDmBlockPageState extends State<LiveDmBlockPage> {
 
     Widget tabBar = TabBar(
       controller: _controller.tabController,
-      tabs: const [Tab(text: '关键词'), Tab(text: '用户')],
+      tabs: const [
+        Tab(text: '关键词'),
+        Tab(text: '用户'),
+      ],
     );
 
     Widget view = tabBarView(
@@ -51,7 +56,10 @@ class _LiveDmBlockPageState extends State<LiveDmBlockPage> {
 
     Widget title = Padding(
       padding: EdgeInsets.only(
-          top: isPortrait ? 18 : 0, left: isPortrait ? 0 : 12, bottom: 12),
+        top: isPortrait ? 18 : 0,
+        left: isPortrait ? 0 : 12,
+        bottom: 12,
+      ),
       child: const Text(
         '关键词屏蔽',
         style: TextStyle(fontSize: 17, fontWeight: FontWeight.bold),
@@ -90,8 +98,10 @@ class _LiveDmBlockPageState extends State<LiveDmBlockPage> {
                       return [
                         SliverToBoxAdapter(child: left),
                         SliverOverlapAbsorber(
-                          handle: ExtendedNestedScrollView
-                              .sliverOverlapAbsorberHandleFor(context),
+                          handle:
+                              ExtendedNestedScrollView.sliverOverlapAbsorberHandleFor(
+                                context,
+                              ),
                           sliver: SliverPersistentHeader(
                             pinned: true,
                             delegate: CustomSliverPersistentHeaderDelegate(
@@ -107,9 +117,10 @@ class _LiveDmBlockPageState extends State<LiveDmBlockPage> {
                       builder: (context, _) {
                         return Padding(
                           padding: EdgeInsets.only(
-                            top: ExtendedNestedScrollView
-                                        .sliverOverlapAbsorberHandleFor(context)
-                                    .layoutExtent ??
+                            top:
+                                ExtendedNestedScrollView.sliverOverlapAbsorberHandleFor(
+                                  context,
+                                ).layoutExtent ??
                                 0,
                           ),
                           child: view,
@@ -233,7 +244,7 @@ class _LiveDmBlockPageState extends State<LiveDmBlockPage> {
                   }
                 },
               ),
-              Text('$level 以下')
+              Text('$level 以下'),
             ],
           );
         },
@@ -273,10 +284,16 @@ class _LiveDmBlockPageState extends State<LiveDmBlockPage> {
     ];
   }
 
-  Widget _headerBtn(ThemeData theme, bool isEnable, IconData icon, String name,
-      VoidCallback onTap) {
-    final color =
-        isEnable ? theme.colorScheme.primary : theme.colorScheme.outline;
+  Widget _headerBtn(
+    ThemeData theme,
+    bool isEnable,
+    IconData icon,
+    String name,
+    VoidCallback onTap,
+  ) {
+    final color = isEnable
+        ? theme.colorScheme.primary
+        : theme.colorScheme.outline;
 
     Widget top = Container(
       width: 42,
@@ -285,7 +302,8 @@ class _LiveDmBlockPageState extends State<LiveDmBlockPage> {
       decoration: isEnable
           ? BoxDecoration(
               border: Border.all(color: color),
-              borderRadius: const BorderRadius.all(Radius.circular(4)))
+              borderRadius: const BorderRadius.all(Radius.circular(4)),
+            )
           : null,
       child: Icon(icon, color: color),
     );
@@ -345,8 +363,9 @@ class _LiveDmBlockPageState extends State<LiveDmBlockPage> {
         onChanged: (val) => value = val,
         decoration: isKeyword ? null : const InputDecoration(hintText: 'UID'),
         keyboardType: isKeyword ? null : TextInputType.number,
-        inputFormatters:
-            isKeyword ? null : [FilteringTextInputFormatter.digitsOnly],
+        inputFormatters: isKeyword
+            ? null
+            : [FilteringTextInputFormatter.digitsOnly],
       ),
       onConfirm: () {
         if (value.isNotEmpty) {
diff --git a/lib/pages/live_emote/controller.dart b/lib/pages/live_emote/controller.dart
index 3b9bd6c12..6ebfa52cd 100644
--- a/lib/pages/live_emote/controller.dart
+++ b/lib/pages/live_emote/controller.dart
@@ -20,10 +20,14 @@ class LiveEmotePanelController
 
   @override
   bool customHandleResponse(
-      bool isRefresh, Success<List<LiveEmoteDatum>?> response) {
+    bool isRefresh,
+    Success<List<LiveEmoteDatum>?> response,
+  ) {
     if (response.response?.isNotEmpty == true) {
-      tabController =
-          TabController(length: response.response!.length, vsync: this);
+      tabController = TabController(
+        length: response.response!.length,
+        vsync: this,
+      );
     }
     loadingState.value = response;
     return true;
diff --git a/lib/pages/live_emote/view.dart b/lib/pages/live_emote/view.dart
index 99f0c011b..773edc725 100644
--- a/lib/pages/live_emote/view.dart
+++ b/lib/pages/live_emote/view.dart
@@ -48,138 +48,154 @@ class _LiveEmotePanelState extends State<LiveEmotePanel>
     late final color = Theme.of(context).colorScheme.onInverseSurface;
     return switch (loadingState) {
       Loading() => loadingWidget,
-      Success(:var response) => response?.isNotEmpty == true
-          ? Column(
-              children: [
-                Expanded(
-                  child: tabBarView(
-                    controller: _emotePanelController.tabController,
-                    children: response!.map(
-                      (item) {
-                        if (item.emoticons.isNullOrEmpty) {
-                          return const SizedBox.shrink();
-                        }
-                        double widthFac =
-                            max(1, item.emoticons!.first.width! / 80);
-                        double heightFac =
-                            max(1, item.emoticons!.first.height! / 80);
-                        final width = widthFac * 38;
-                        final height = heightFac * 38;
-                        return GridView.builder(
-                          padding: const EdgeInsets.only(
-                              left: 12, right: 12, bottom: 12),
-                          gridDelegate:
-                              SliverGridDelegateWithMaxCrossAxisExtent(
-                            maxCrossAxisExtent: widthFac * 40,
-                            mainAxisExtent: heightFac * 40,
-                            crossAxisSpacing: 8,
-                            mainAxisSpacing: 8,
-                          ),
-                          itemCount: item.emoticons!.length,
-                          itemBuilder: (context, index) {
-                            final e = item.emoticons![index];
-                            return Material(
-                              type: MaterialType.transparency,
-                              child: InkWell(
-                                borderRadius:
-                                    const BorderRadius.all(Radius.circular(6)),
-                                onTap: () {
-                                  if (item.pkgType == 3) {
-                                    widget.onChoose(e, width, height);
-                                  } else {
-                                    widget.onSendEmoticonUnique(e);
-                                  }
-                                },
-                                child: CustomTooltip(
-                                  indicator: () => CustomPaint(
-                                    size: const Size(14, 8),
-                                    painter: TrianglePainter(color),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? Column(
+                children: [
+                  Expanded(
+                    child: tabBarView(
+                      controller: _emotePanelController.tabController,
+                      children: response!.map(
+                        (item) {
+                          if (item.emoticons.isNullOrEmpty) {
+                            return const SizedBox.shrink();
+                          }
+                          double widthFac = max(
+                            1,
+                            item.emoticons!.first.width! / 80,
+                          );
+                          double heightFac = max(
+                            1,
+                            item.emoticons!.first.height! / 80,
+                          );
+                          final width = widthFac * 38;
+                          final height = heightFac * 38;
+                          return GridView.builder(
+                            padding: const EdgeInsets.only(
+                              left: 12,
+                              right: 12,
+                              bottom: 12,
+                            ),
+                            gridDelegate:
+                                SliverGridDelegateWithMaxCrossAxisExtent(
+                                  maxCrossAxisExtent: widthFac * 40,
+                                  mainAxisExtent: heightFac * 40,
+                                  crossAxisSpacing: 8,
+                                  mainAxisSpacing: 8,
+                                ),
+                            itemCount: item.emoticons!.length,
+                            itemBuilder: (context, index) {
+                              final e = item.emoticons![index];
+                              return Material(
+                                type: MaterialType.transparency,
+                                child: InkWell(
+                                  borderRadius: const BorderRadius.all(
+                                    Radius.circular(6),
                                   ),
-                                  overlayWidget: () => Container(
-                                    padding: const EdgeInsets.all(8),
-                                    decoration: BoxDecoration(
-                                      color: color,
-                                      borderRadius: const BorderRadius.all(
-                                          Radius.circular(8)),
+                                  onTap: () {
+                                    if (item.pkgType == 3) {
+                                      widget.onChoose(e, width, height);
+                                    } else {
+                                      widget.onSendEmoticonUnique(e);
+                                    }
+                                  },
+                                  child: CustomTooltip(
+                                    indicator: () => CustomPaint(
+                                      size: const Size(14, 8),
+                                      painter: TrianglePainter(color),
                                     ),
-                                    child: Column(
-                                      spacing: 4,
-                                      mainAxisSize: MainAxisSize.min,
-                                      children: [
-                                        NetworkImgLayer(
-                                          src: e.url!,
-                                          width: 65,
-                                          height: 65,
-                                          type: ImageType.emote,
-                                          boxFit: BoxFit.contain,
+                                    overlayWidget: () => Container(
+                                      padding: const EdgeInsets.all(8),
+                                      decoration: BoxDecoration(
+                                        color: color,
+                                        borderRadius: const BorderRadius.all(
+                                          Radius.circular(8),
                                         ),
-                                        Text(
-                                          e.emoji!.startsWith('[')
-                                              ? e.emoji!.substring(
-                                                  1, e.emoji!.length - 1)
-                                              : e.emoji!,
-                                          style: const TextStyle(fontSize: 12),
-                                        ),
-                                      ],
+                                      ),
+                                      child: Column(
+                                        spacing: 4,
+                                        mainAxisSize: MainAxisSize.min,
+                                        children: [
+                                          NetworkImgLayer(
+                                            src: e.url!,
+                                            width: 65,
+                                            height: 65,
+                                            type: ImageType.emote,
+                                            boxFit: BoxFit.contain,
+                                          ),
+                                          Text(
+                                            e.emoji!.startsWith('[')
+                                                ? e.emoji!.substring(
+                                                    1,
+                                                    e.emoji!.length - 1,
+                                                  )
+                                                : e.emoji!,
+                                            style: const TextStyle(
+                                              fontSize: 12,
+                                            ),
+                                          ),
+                                        ],
+                                      ),
                                     ),
-                                  ),
-                                  child: Padding(
-                                    padding: const EdgeInsets.all(6),
-                                    child: NetworkImgLayer(
-                                      boxFit: BoxFit.contain,
-                                      src: e.url!,
-                                      width: width,
-                                      height: height,
-                                      type: ImageType.emote,
-                                      quality: item.pkgType == 3 ? null : 80,
+                                    child: Padding(
+                                      padding: const EdgeInsets.all(6),
+                                      child: NetworkImgLayer(
+                                        boxFit: BoxFit.contain,
+                                        src: e.url!,
+                                        width: width,
+                                        height: height,
+                                        type: ImageType.emote,
+                                        quality: item.pkgType == 3 ? null : 80,
+                                      ),
                                     ),
                                   ),
                                 ),
-                              ),
-                            );
-                          },
-                        );
-                      },
-                    ).toList(),
+                              );
+                            },
+                          );
+                        },
+                      ).toList(),
+                    ),
                   ),
-                ),
-                Divider(
-                  height: 1,
-                  color: Theme.of(context).dividerColor.withValues(alpha: 0.1),
-                ),
-                TabBar(
-                  controller: _emotePanelController.tabController,
-                  padding: const EdgeInsets.only(right: 60),
-                  dividerColor: Colors.transparent,
-                  dividerHeight: 0,
-                  isScrollable: true,
-                  tabs: response
-                      .map(
-                        (item) => Padding(
-                          padding: const EdgeInsets.all(8),
-                          child: NetworkImgLayer(
-                            width: 24,
-                            height: 24,
-                            type: ImageType.emote,
-                            src: item.currentCover,
+                  Divider(
+                    height: 1,
+                    color: Theme.of(
+                      context,
+                    ).dividerColor.withValues(alpha: 0.1),
+                  ),
+                  TabBar(
+                    controller: _emotePanelController.tabController,
+                    padding: const EdgeInsets.only(right: 60),
+                    dividerColor: Colors.transparent,
+                    dividerHeight: 0,
+                    isScrollable: true,
+                    tabs: response
+                        .map(
+                          (item) => Padding(
+                            padding: const EdgeInsets.all(8),
+                            child: NetworkImgLayer(
+                              width: 24,
+                              height: 24,
+                              type: ImageType.emote,
+                              src: item.currentCover,
+                            ),
                           ),
-                        ),
-                      )
-                      .toList(),
-                ),
-                SizedBox(height: MediaQuery.paddingOf(context).bottom),
-              ],
-            )
-          : _errorWidget(),
+                        )
+                        .toList(),
+                  ),
+                  SizedBox(height: MediaQuery.paddingOf(context).bottom),
+                ],
+              )
+            : _errorWidget(),
       Error(:var errMsg) => _errorWidget(errMsg),
     };
   }
 
   Widget _errorWidget([String? errMsg]) => Center(
-        child: TextButton.icon(
-          onPressed: _emotePanelController.onReload,
-          icon: const Icon(Icons.refresh),
-          label: Text(errMsg ?? '没有数据'),
-        ),
-      );
+    child: TextButton.icon(
+      onPressed: _emotePanelController.onReload,
+      icon: const Icon(Icons.refresh),
+      label: Text(errMsg ?? '没有数据'),
+    ),
+  );
 }
diff --git a/lib/pages/live_follow/view.dart b/lib/pages/live_follow/view.dart
index e2cb09c6b..afa2554b7 100644
--- a/lib/pages/live_follow/view.dart
+++ b/lib/pages/live_follow/view.dart
@@ -57,46 +57,47 @@ class _LiveFollowPageState extends State<LiveFollowPage> {
   Widget _buildBody(LoadingState<List<LiveFollowItem>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: SliverGridDelegateWithExtentAndRatio(
-            mainAxisSpacing: StyleString.cardSpace,
-            crossAxisSpacing: StyleString.cardSpace,
-            maxCrossAxisExtent: Grid.smallCardWidth,
-            childAspectRatio: StyleString.aspectRatio,
-            mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
-          ),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) {
-              return const VideoCardVSkeleton();
-            },
-            childCount: 10,
-          ),
+        gridDelegate: SliverGridDelegateWithExtentAndRatio(
+          mainAxisSpacing: StyleString.cardSpace,
+          crossAxisSpacing: StyleString.cardSpace,
+          maxCrossAxisExtent: Grid.smallCardWidth,
+          childAspectRatio: StyleString.aspectRatio,
+          mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                mainAxisSpacing: StyleString.cardSpace,
-                crossAxisSpacing: StyleString.cardSpace,
-                maxCrossAxisExtent: Grid.smallCardWidth,
-                childAspectRatio: StyleString.aspectRatio,
-                mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
-              ),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  if (index == response.length - 1) {
-                    _controller.onLoadMore();
-                  }
-                  return LiveCardVFollow(
-                    liveItem: response[index],
-                  );
-                },
-                childCount: response!.length,
-              ),
-            )
-          : HttpError(onReload: _controller.onReload),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            return const VideoCardVSkeleton();
+          },
+          childCount: 10,
+        ),
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                  mainAxisSpacing: StyleString.cardSpace,
+                  crossAxisSpacing: StyleString.cardSpace,
+                  maxCrossAxisExtent: Grid.smallCardWidth,
+                  childAspectRatio: StyleString.aspectRatio,
+                  mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
+                ),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    if (index == response.length - 1) {
+                      _controller.onLoadMore();
+                    }
+                    return LiveCardVFollow(
+                      liveItem: response[index],
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/live_follow/widgets/live_item_follow.dart b/lib/pages/live_follow/widgets/live_item_follow.dart
index decc500bd..51808efb1 100644
--- a/lib/pages/live_follow/widgets/live_item_follow.dart
+++ b/lib/pages/live_follow/widgets/live_item_follow.dart
@@ -28,33 +28,35 @@ class LiveCardVFollow extends StatelessWidget {
           children: [
             AspectRatio(
               aspectRatio: StyleString.aspectRatio,
-              child: LayoutBuilder(builder: (context, boxConstraints) {
-                double maxWidth = boxConstraints.maxWidth;
-                double maxHeight = boxConstraints.maxHeight;
-                return Stack(
-                  clipBehavior: Clip.none,
-                  children: [
-                    NetworkImgLayer(
-                      src: liveItem.roomCover!,
-                      width: maxWidth,
-                      height: maxHeight,
-                      radius: 0,
-                    ),
-                    Positioned(
-                      left: 0,
-                      right: 0,
-                      bottom: 0,
-                      child: AnimatedOpacity(
-                        opacity: 1,
-                        duration: const Duration(milliseconds: 200),
-                        child: videoStat(context),
+              child: LayoutBuilder(
+                builder: (context, boxConstraints) {
+                  double maxWidth = boxConstraints.maxWidth;
+                  double maxHeight = boxConstraints.maxHeight;
+                  return Stack(
+                    clipBehavior: Clip.none,
+                    children: [
+                      NetworkImgLayer(
+                        src: liveItem.roomCover!,
+                        width: maxWidth,
+                        height: maxHeight,
+                        radius: 0,
                       ),
-                    ),
-                  ],
-                );
-              }),
+                      Positioned(
+                        left: 0,
+                        right: 0,
+                        bottom: 0,
+                        child: AnimatedOpacity(
+                          opacity: 1,
+                          duration: const Duration(milliseconds: 200),
+                          child: videoStat(context),
+                        ),
+                      ),
+                    ],
+                  );
+                },
+              ),
             ),
-            liveContent(context)
+            liveContent(context),
           ],
         ),
       ),
diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart
index 0f6e3dbb1..50643a29f 100644
--- a/lib/pages/live_room/controller.dart
+++ b/lib/pages/live_room/controller.dart
@@ -35,8 +35,9 @@ class LiveRoomController extends GetxController {
   double volume = 0.0;
   // 静音状态
   RxBool volumeOff = false.obs;
-  PlPlayerController plPlayerController =
-      PlPlayerController.getInstance(videoType: 'live');
+  PlPlayerController plPlayerController = PlPlayerController.getInstance(
+    videoType: 'live',
+  );
   Rx<RoomInfoH5Data?> roomInfoH5 = Rx<RoomInfoH5Data?>(null);
 
   RxList<dynamic> messages = [].obs;
@@ -75,7 +76,7 @@ class LiveRoomController extends GetxController {
         httpHeaders: {
           'user-agent':
               'Mozilla/5.0 (Macintosh; Intel Mac OS X 13_3_1) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 Safari/605.1.15',
-          'referer': HttpString.baseUrl
+          'referer': HttpString.baseUrl,
         },
       ),
       autoplay: true,
@@ -193,8 +194,10 @@ class LiveRoomController extends GetxController {
         if (v['status']) {
           if ((v['data'] as List?)?.isNotEmpty == true) {
             try {
-              messages.addAll((v['data'] as List)
-                  .map((obj) => {
+              messages.addAll(
+                (v['data'] as List)
+                    .map(
+                      (obj) => {
                         'name': obj['user']['base']['name'],
                         'uid': obj['user']['uid'],
                         'text': obj['text'],
@@ -202,8 +205,10 @@ class LiveRoomController extends GetxController {
                         'uemote': obj['emoticon']['emoticon_unique'] != ""
                             ? obj['emoticon']
                             : null,
-                      })
-                  .toList());
+                      },
+                    )
+                    .toList(),
+              );
               WidgetsBinding.instance.addPostFrameCallback(
                 (_) => scrollToBottom(),
               );
@@ -266,46 +271,48 @@ class LiveRoomController extends GetxController {
     if (info.hostList.isNullOrEmpty) {
       return;
     }
-    msgStream = LiveMessageStream(
-      streamToken: info.token!,
-      roomId: roomId,
-      uid: Accounts.main.mid,
-      servers: info.hostList!
-          .map((host) => 'wss://${host.host}:${host.wssPort}/sub')
-          .toList(),
-    )
-      ..addEventListener((obj) {
-        try {
-          if (obj['cmd'] == 'DANMU_MSG') {
-            // logger.i(' 原始弹幕消息 ======> ${jsonEncode(obj)}');
-            final info = obj['info'];
-            final first = info[0];
-            final content = first[15];
-            final extra = jsonDecode(content['extra']);
-            final user = content['user'];
-            final uid = user['uid'];
-            messages.add({
-              'name': user['base']['name'],
-              'uid': uid,
-              'text': info[1],
-              'emots': extra['emots'],
-              'uemote': first[13],
-            });
-            if (showDanmaku) {
-              controller?.addDanmaku(
-                DanmakuContentItem(
-                  extra['content'],
-                  color: DmUtils.decimalToColor(extra['color']),
-                  type: DmUtils.getPosition(extra['mode']),
-                  selfSend: isLogin && uid == accountService.mid,
-                ),
-              );
-              WidgetsBinding.instance
-                  .addPostFrameCallback((_) => scrollToBottom());
-            }
-          }
-        } catch (_) {}
-      })
-      ..init();
+    msgStream =
+        LiveMessageStream(
+            streamToken: info.token!,
+            roomId: roomId,
+            uid: Accounts.main.mid,
+            servers: info.hostList!
+                .map((host) => 'wss://${host.host}:${host.wssPort}/sub')
+                .toList(),
+          )
+          ..addEventListener((obj) {
+            try {
+              if (obj['cmd'] == 'DANMU_MSG') {
+                // logger.i(' 原始弹幕消息 ======> ${jsonEncode(obj)}');
+                final info = obj['info'];
+                final first = info[0];
+                final content = first[15];
+                final extra = jsonDecode(content['extra']);
+                final user = content['user'];
+                final uid = user['uid'];
+                messages.add({
+                  'name': user['base']['name'],
+                  'uid': uid,
+                  'text': info[1],
+                  'emots': extra['emots'],
+                  'uemote': first[13],
+                });
+                if (showDanmaku) {
+                  controller?.addDanmaku(
+                    DanmakuContentItem(
+                      extra['content'],
+                      color: DmUtils.decimalToColor(extra['color']),
+                      type: DmUtils.getPosition(extra['mode']),
+                      selfSend: isLogin && uid == accountService.mid,
+                    ),
+                  );
+                  WidgetsBinding.instance.addPostFrameCallback(
+                    (_) => scrollToBottom(),
+                  );
+                }
+              }
+            } catch (_) {}
+          })
+          ..init();
   }
 }
diff --git a/lib/pages/live_room/send_danmaku/view.dart b/lib/pages/live_room/send_danmaku/view.dart
index 0dbcac0e6..be46093df 100644
--- a/lib/pages/live_room/send_danmaku/view.dart
+++ b/lib/pages/live_room/send_danmaku/view.dart
@@ -41,7 +41,8 @@ class _ReplyPageState extends CommonRichTextPubPageState<LiveSendDmPanel> {
   @override
   void dispose() {
     Get.delete<LiveEmotePanelController>(
-        tag: liveRoomController.roomId.toString());
+      tag: liveRoomController.roomId.toString(),
+    );
     super.dispose();
   }
 
@@ -75,22 +76,26 @@ class _ReplyPageState extends CommonRichTextPubPageState<LiveSendDmPanel> {
 
   @override
   Widget? get customPanel => LiveEmotePanel(
-        onChoose: onChooseEmote,
-        roomId: liveRoomController.roomId,
-        onSendEmoticonUnique: (emote) {
-          onCustomPublish(
-            message: emote.emoticonUnique!,
-            dmType: 1,
-            emoticonOptions: '[object Object]',
-          );
-        },
+    onChoose: onChooseEmote,
+    roomId: liveRoomController.roomId,
+    onSendEmoticonUnique: (emote) {
+      onCustomPublish(
+        message: emote.emoticonUnique!,
+        dmType: 1,
+        emoticonOptions: '[object Object]',
       );
+    },
+  );
 
   List<Widget> buildInputView(ThemeData theme) {
     return [
       Container(
-        padding:
-            const EdgeInsets.only(top: 12, right: 15, left: 15, bottom: 10),
+        padding: const EdgeInsets.only(
+          top: 12,
+          right: 15,
+          left: 15,
+          bottom: 10,
+        ),
         child: Form(
           autovalidateMode: AutovalidateMode.onUserInteraction,
           child: Listener(
@@ -137,8 +142,10 @@ class _ReplyPageState extends CommonRichTextPubPageState<LiveSendDmPanel> {
               () => FilledButton.tonal(
                 onPressed: enablePublish.value ? onPublish : null,
                 style: FilledButton.styleFrom(
-                  padding:
-                      const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 20,
+                    vertical: 10,
+                  ),
                   visualDensity: VisualDensity.compact,
                 ),
                 child: const Text('发送'),
diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart
index b6a8d2292..3a2683a3a 100644
--- a/lib/pages/live_room/view.dart
+++ b/lib/pages/live_room/view.dart
@@ -96,8 +96,9 @@ class _LiveRoomPageState extends State<LiveRoomPage>
 
   Future<void> _updateFontSize() async {
     if (Platform.isAndroid) {
-      _isPipMode =
-          await const MethodChannel("floating").invokeMethod('inPipAlready');
+      _isPipMode = await const MethodChannel(
+        "floating",
+      ).invokeMethod('inPipAlready');
     }
     if (_liveRoomController.controller != null) {
       _liveRoomController.controller!.updateOption(
@@ -197,9 +198,11 @@ class _LiveRoomPageState extends State<LiveRoomPage>
                       hideTop: plPlayerController.blockTypes.contains(5),
                       hideScroll: plPlayerController.blockTypes.contains(2),
                       hideBottom: plPlayerController.blockTypes.contains(4),
-                      duration: plPlayerController.danmakuDuration /
+                      duration:
+                          plPlayerController.danmakuDuration /
                           plPlayerController.playbackSpeed,
-                      staticDuration: plPlayerController.danmakuStaticDuration /
+                      staticDuration:
+                          plPlayerController.danmakuStaticDuration /
                           plPlayerController.playbackSpeed,
                       strokeWidth: plPlayerController.strokeWidth,
                       lineHeight: plPlayerController.danmakuLineHeight,
@@ -249,7 +252,10 @@ class _LiveRoomPageState extends State<LiveRoomPage>
                   return const SizedBox.shrink();
                 }
                 final appBackground = _liveRoomController
-                    .roomInfoH5.value?.roomInfo?.appBackground;
+                    .roomInfoH5
+                    .value
+                    ?.roomInfo
+                    ?.appBackground;
                 return Positioned.fill(
                   child: Opacity(
                     opacity: 0.6,
@@ -296,55 +302,54 @@ class _LiveRoomPageState extends State<LiveRoomPage>
   }
 
   Widget get _buildPH => Column(
-        children: [
-          _buildAppBar,
-          ..._buildBodyP,
-        ],
-      );
+    children: [
+      _buildAppBar,
+      ..._buildBodyP,
+    ],
+  );
 
   Widget get _buildPP => Stack(
-        clipBehavior: Clip.none,
+    clipBehavior: Clip.none,
+    children: [
+      _buildAppBar,
+      Column(
         children: [
-          _buildAppBar,
-          Column(
-            children: [
-              Expanded(
-                child: Stack(
-                  clipBehavior: Clip.none,
-                  children: [
-                    Obx(
-                      () => Container(
-                        margin: isFullScreen
-                            ? null
-                            : const EdgeInsets.only(top: 56),
-                        color: Colors.black,
-                        child: videoPlayerPanel(
-                          alignment: isFullScreen ? null : Alignment.topCenter,
-                        ),
-                      ),
+          Expanded(
+            child: Stack(
+              clipBehavior: Clip.none,
+              children: [
+                Obx(
+                  () => Container(
+                    margin: isFullScreen
+                        ? null
+                        : const EdgeInsets.only(top: 56),
+                    color: Colors.black,
+                    child: videoPlayerPanel(
+                      alignment: isFullScreen ? null : Alignment.topCenter,
                     ),
-                    Obx(
-                      () => isFullScreen
-                          ? const SizedBox.shrink()
-                          : Positioned(
-                              left: 0,
-                              right: 0,
-                              bottom: 55,
-                              child: SizedBox(
-                                height: 125,
-                                child: _buildChatWidget(true),
-                              ),
-                            ),
-                    ),
-                  ],
+                  ),
                 ),
-              ),
-              Obx(() =>
-                  isFullScreen ? const SizedBox.shrink() : _buildInputWidget),
-            ],
+                Obx(
+                  () => isFullScreen
+                      ? const SizedBox.shrink()
+                      : Positioned(
+                          left: 0,
+                          right: 0,
+                          bottom: 55,
+                          child: SizedBox(
+                            height: 125,
+                            child: _buildChatWidget(true),
+                          ),
+                        ),
+                ),
+              ],
+            ),
           ),
+          Obx(() => isFullScreen ? const SizedBox.shrink() : _buildInputWidget),
         ],
-      );
+      ),
+    ],
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -487,14 +492,15 @@ class _LiveRoomPageState extends State<LiveRoomPage>
   Widget get _buildBodyH {
     double videoWidth =
         clampDouble(context.height / context.width * 1.08, 0.58, 0.75) *
-            context.width;
+        context.width;
     return Expanded(
       child: Row(
         children: [
           Obx(
             () => Container(
-              margin:
-                  EdgeInsets.only(bottom: MediaQuery.paddingOf(context).bottom),
+              margin: EdgeInsets.only(
+                bottom: MediaQuery.paddingOf(context).bottom,
+              ),
               color: isFullScreen ? Colors.black : null,
               width: isFullScreen ? Get.size.width : videoWidth,
               height: isFullScreen ? Get.size.height : Get.size.width * 9 / 16,
@@ -513,93 +519,95 @@ class _LiveRoomPageState extends State<LiveRoomPage>
   }
 
   List<Widget> get _buildBodyP => [
-        Obx(
-          () => Container(
-            color: Colors.black,
-            width: Get.size.width,
-            height: isFullScreen ? Get.size.height : Get.size.width * 9 / 16,
-            child: videoPlayerPanel(),
-          ),
-        ),
-        ..._buildBottomWidget,
-      ];
+    Obx(
+      () => Container(
+        color: Colors.black,
+        width: Get.size.width,
+        height: isFullScreen ? Get.size.height : Get.size.width * 9 / 16,
+        child: videoPlayerPanel(),
+      ),
+    ),
+    ..._buildBottomWidget,
+  ];
 
   final GlobalKey chatKey = GlobalKey();
 
   List<Widget> get _buildBottomWidget => [
-        Expanded(child: _buildChatWidget()),
-        _buildInputWidget,
-      ];
+    Expanded(child: _buildChatWidget()),
+    _buildInputWidget,
+  ];
 
   Widget _buildChatWidget([bool? isPP]) => Padding(
-        padding: const EdgeInsets.symmetric(vertical: 16),
-        child: LiveRoomChat(
-          key: chatKey,
-          isPP: isPP,
-          roomId: _roomId,
-          liveRoomController: _liveRoomController,
-        ),
-      );
+    padding: const EdgeInsets.symmetric(vertical: 16),
+    child: LiveRoomChat(
+      key: chatKey,
+      isPP: isPP,
+      roomId: _roomId,
+      liveRoomController: _liveRoomController,
+    ),
+  );
 
   Widget get _buildInputWidget => Container(
-        padding: EdgeInsets.only(
-          top: 5,
-          left: 10,
-          right: 10,
-          bottom: 15 + MediaQuery.paddingOf(context).bottom,
-        ),
-        decoration: const BoxDecoration(
-          borderRadius: BorderRadius.only(
-            topLeft: Radius.circular(20),
-            topRight: Radius.circular(20),
-          ),
-          border: Border(
-            top: BorderSide(color: Color(0x1AFFFFFF)),
-          ),
-          color: Color(0x1AFFFFFF),
-        ),
-        child: GestureDetector(
-          onTap: onSendDanmaku,
-          behavior: HitTestBehavior.opaque,
-          child: Padding(
-            padding: const EdgeInsets.only(top: 5, bottom: 10),
-            child: Row(
-              children: [
-                Obx(
-                  () {
-                    final enableShowDanmaku =
-                        plPlayerController.enableShowDanmaku.value;
-                    return IconButton(
-                      onPressed: () {
-                        final newVal = !enableShowDanmaku;
-                        plPlayerController.enableShowDanmaku.value = newVal;
-                        GStorage.setting
-                            .put(SettingBoxKey.enableShowDanmaku, newVal);
-                      },
-                      icon: Icon(
-                        enableShowDanmaku
-                            ? Icons.subtitles_outlined
-                            : Icons.subtitles_off_outlined,
-                        color: _color,
-                      ),
+    padding: EdgeInsets.only(
+      top: 5,
+      left: 10,
+      right: 10,
+      bottom: 15 + MediaQuery.paddingOf(context).bottom,
+    ),
+    decoration: const BoxDecoration(
+      borderRadius: BorderRadius.only(
+        topLeft: Radius.circular(20),
+        topRight: Radius.circular(20),
+      ),
+      border: Border(
+        top: BorderSide(color: Color(0x1AFFFFFF)),
+      ),
+      color: Color(0x1AFFFFFF),
+    ),
+    child: GestureDetector(
+      onTap: onSendDanmaku,
+      behavior: HitTestBehavior.opaque,
+      child: Padding(
+        padding: const EdgeInsets.only(top: 5, bottom: 10),
+        child: Row(
+          children: [
+            Obx(
+              () {
+                final enableShowDanmaku =
+                    plPlayerController.enableShowDanmaku.value;
+                return IconButton(
+                  onPressed: () {
+                    final newVal = !enableShowDanmaku;
+                    plPlayerController.enableShowDanmaku.value = newVal;
+                    GStorage.setting.put(
+                      SettingBoxKey.enableShowDanmaku,
+                      newVal,
                     );
                   },
-                ),
-                Expanded(
-                  child: Text(
-                    '发送弹幕',
-                    style: TextStyle(color: _color),
+                  icon: Icon(
+                    enableShowDanmaku
+                        ? Icons.subtitles_outlined
+                        : Icons.subtitles_off_outlined,
+                    color: _color,
                   ),
-                ),
-                IconButton(
-                  onPressed: () => onSendDanmaku(true),
-                  icon: Icon(Icons.emoji_emotions_outlined, color: _color),
-                ),
-              ],
+                );
+              },
             ),
-          ),
+            Expanded(
+              child: Text(
+                '发送弹幕',
+                style: TextStyle(color: _color),
+              ),
+            ),
+            IconButton(
+              onPressed: () => onSendDanmaku(true),
+              icon: Icon(Icons.emoji_emotions_outlined, color: _color),
+            ),
+          ],
         ),
-      );
+      ),
+    ),
+  );
 
   void onSendDanmaku([bool fromEmote = false]) {
     if (!_liveRoomController.accountService.isLogin.value) {
@@ -627,8 +635,10 @@ class _LiveRoomPageState extends State<LiveRoomPage>
       },
       transitionDuration: const Duration(milliseconds: 500),
       transitionBuilder: (context, animation, secondaryAnimation, child) {
-        var tween = Tween(begin: const Offset(0.0, 1.0), end: Offset.zero)
-            .chain(CurveTween(curve: Curves.linear));
+        var tween = Tween(
+          begin: const Offset(0.0, 1.0),
+          end: Offset.zero,
+        ).chain(CurveTween(curve: Curves.linear));
         return SlideTransition(
           position: animation.drive(tween),
           child: child,
diff --git a/lib/pages/live_room/widgets/bottom_control.dart b/lib/pages/live_room/widgets/bottom_control.dart
index 5f740c53a..07a6980a8 100644
--- a/lib/pages/live_room/widgets/bottom_control.dart
+++ b/lib/pages/live_room/widgets/bottom_control.dart
@@ -91,8 +91,10 @@ class BottomControl extends StatelessWidget {
                   onPressed: () {
                     final newVal = !enableShowDanmaku;
                     plPlayerController.enableShowDanmaku.value = newVal;
-                    GStorage.setting
-                        .put(SettingBoxKey.enableShowDanmaku, newVal);
+                    GStorage.setting.put(
+                      SettingBoxKey.enableShowDanmaku,
+                      newVal,
+                    );
                   },
                   icon: Icon(
                     size: 18,
@@ -122,8 +124,10 @@ class BottomControl extends StatelessWidget {
                       onTap: () => plPlayerController.toggleVideoFit(boxFit),
                       child: Text(
                         boxFit.desc,
-                        style:
-                            const TextStyle(color: Colors.white, fontSize: 13),
+                        style: const TextStyle(
+                          color: Colors.white,
+                          fontSize: 13,
+                        ),
                       ),
                     );
                   }).toList();
@@ -156,8 +160,10 @@ class BottomControl extends StatelessWidget {
                       onTap: () => liveRoomCtr.changeQn(e.code),
                       child: Text(
                         e.desc,
-                        style:
-                            const TextStyle(color: Colors.white, fontSize: 13),
+                        style: const TextStyle(
+                          color: Colors.white,
+                          fontSize: 13,
+                        ),
                       ),
                     );
                   }).toList();
@@ -174,7 +180,8 @@ class BottomControl extends StatelessWidget {
               color: Colors.white,
             ),
             onTap: () => plPlayerController.triggerFullScreen(
-                status: !plPlayerController.isFullScreen.value),
+              status: !plPlayerController.isFullScreen.value,
+            ),
           ),
         ],
       ),
diff --git a/lib/pages/live_room/widgets/chat.dart b/lib/pages/live_room/widgets/chat.dart
index 41f561824..520cbbbe4 100644
--- a/lib/pages/live_room/widgets/chat.dart
+++ b/lib/pages/live_room/widgets/chat.dart
@@ -37,8 +37,10 @@ class LiveRoomChat extends StatelessWidget {
                 alignment: Alignment.centerLeft,
                 padding: const EdgeInsets.symmetric(horizontal: 16),
                 child: Container(
-                  padding:
-                      const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 10,
+                    vertical: 5,
+                  ),
                   decoration: BoxDecoration(
                     color: isPP == true
                         ? Colors.black.withValues(alpha: 0.3)
@@ -89,7 +91,7 @@ class LiveRoomChat extends StatelessWidget {
                   ),
                 )
               : const SizedBox.shrink(),
-        )
+        ),
       ],
     );
   }
@@ -99,7 +101,7 @@ class LiveRoomChat extends StatelessWidget {
     dynamic uemote = obj['uemote'];
     List<String> list = [
       if (emots != null) ...emots.keys,
-      if (uemote is Map) uemote['emoticon_unique'].replaceFirst('upower_', '')
+      if (uemote is Map) uemote['emoticon_unique'].replaceFirst('upower_', ''),
     ];
     if (list.isNotEmpty) {
       RegExp regExp = RegExp(list.map(RegExp.escape).join('|'));
@@ -109,16 +111,19 @@ class LiveRoomChat extends StatelessWidget {
         onMatch: (Match match) {
           String key = match[0]!;
           dynamic emote = emots?[key] ?? uemote;
-          spanChildren.add(WidgetSpan(
-            child: ExcludeSemantics(
+          spanChildren.add(
+            WidgetSpan(
+              child: ExcludeSemantics(
                 child: NetworkImgLayer(
-              src: emote['url'],
-              type: ImageType.emote,
-              width: emote['width'].toDouble(),
-              height: emote['height'].toDouble(),
-              semanticsLabel: key,
-            )),
-          ));
+                  src: emote['url'],
+                  type: ImageType.emote,
+                  width: emote['width'].toDouble(),
+                  height: emote['height'].toDouble(),
+                  semanticsLabel: key,
+                ),
+              ),
+            ),
+          );
           return '';
         },
         onNonMatch: (String nonMatchStr) {
diff --git a/lib/pages/live_room/widgets/header_control.dart b/lib/pages/live_room/widgets/header_control.dart
index b4fb49f14..000aa1ec2 100644
--- a/lib/pages/live_room/widgets/header_control.dart
+++ b/lib/pages/live_room/widgets/header_control.dart
@@ -63,14 +63,20 @@ class LiveHeaderControl extends StatelessWidget {
                     title!,
                     maxLines: 1,
                     style: const TextStyle(
-                        fontSize: 15, height: 1, color: Colors.white),
+                      fontSize: 15,
+                      height: 1,
+                      color: Colors.white,
+                    ),
                   ),
                   if (isFullScreen && upName != null)
                     Text(
                       upName!,
                       maxLines: 1,
                       style: const TextStyle(
-                          fontSize: 12, height: 1, color: Colors.white),
+                        fontSize: 12,
+                        height: 1,
+                        color: Colors.white,
+                      ),
                     ),
                 ],
               ),
@@ -139,7 +145,8 @@ class LiveHeaderControl extends StatelessWidget {
                       floating.enable(
                         plPlayerController.direction.value == 'vertical'
                             ? const EnableManual(
-                                aspectRatio: Rational.vertical())
+                                aspectRatio: Rational.vertical(),
+                              )
                             : const EnableManual(),
                       );
                     }
diff --git a/lib/pages/live_search/child/view.dart b/lib/pages/live_search/child/view.dart
index 265dd76fc..eec861a20 100644
--- a/lib/pages/live_search/child/view.dart
+++ b/lib/pages/live_search/child/view.dart
@@ -55,50 +55,52 @@ class _LiveSearchChildPageState extends State<LiveSearchChildPage>
   Widget get _buildLoading {
     return switch (widget.searchType) {
       LiveSearchType.room => SliverGrid(
-          gridDelegate: SliverGridDelegateWithExtentAndRatio(
-            mainAxisSpacing: StyleString.cardSpace,
-            crossAxisSpacing: StyleString.cardSpace,
-            maxCrossAxisExtent: Grid.smallCardWidth,
-            childAspectRatio: StyleString.aspectRatio,
-            mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
-          ),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) {
-              return const VideoCardVSkeleton();
-            },
-            childCount: 10,
-          ),
+        gridDelegate: SliverGridDelegateWithExtentAndRatio(
+          mainAxisSpacing: StyleString.cardSpace,
+          crossAxisSpacing: StyleString.cardSpace,
+          maxCrossAxisExtent: Grid.smallCardWidth,
+          childAspectRatio: StyleString.aspectRatio,
+          mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
         ),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            return const VideoCardVSkeleton();
+          },
+          childCount: 10,
+        ),
+      ),
       LiveSearchType.user => SliverGrid(
-          gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
-            maxCrossAxisExtent: Grid.smallCardWidth * 2,
-            mainAxisExtent: 60,
-          ),
-          delegate: SliverChildBuilderDelegate(
-            (BuildContext context, int index) {
-              return const MsgFeedTopSkeleton();
-            },
-            childCount: 12,
-          ),
+        gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
+          maxCrossAxisExtent: Grid.smallCardWidth * 2,
+          mainAxisExtent: 60,
         ),
+        delegate: SliverChildBuilderDelegate(
+          (BuildContext context, int index) {
+            return const MsgFeedTopSkeleton();
+          },
+          childCount: 12,
+        ),
+      ),
     };
   }
 
   Widget _buildBody(LoadingState<List?> loadingState) {
     return switch (loadingState) {
       Loading() => _buildLoading,
-      Success(:var response) => response?.isNotEmpty == true
-          ? Builder(
-              builder: (context) {
-                return switch (widget.searchType) {
-                  LiveSearchType.room => SliverGrid(
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? Builder(
+                builder: (context) {
+                  return switch (widget.searchType) {
+                    LiveSearchType.room => SliverGrid(
                       gridDelegate: SliverGridDelegateWithExtentAndRatio(
                         mainAxisSpacing: StyleString.cardSpace,
                         crossAxisSpacing: StyleString.cardSpace,
                         maxCrossAxisExtent: Grid.smallCardWidth,
                         childAspectRatio: StyleString.aspectRatio,
-                        mainAxisExtent:
-                            MediaQuery.textScalerOf(context).scale(60),
+                        mainAxisExtent: MediaQuery.textScalerOf(
+                          context,
+                        ).scale(60),
                       ),
                       delegate: SliverChildBuilderDelegate(
                         (context, index) {
@@ -112,7 +114,7 @@ class _LiveSearchChildPageState extends State<LiveSearchChildPage>
                         childCount: response!.length,
                       ),
                     ),
-                  LiveSearchType.user => SliverGrid(
+                    LiveSearchType.user => SliverGrid(
                       gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
                         maxCrossAxisExtent: Grid.smallCardWidth * 2,
                         mainAxisExtent: 60,
@@ -129,16 +131,16 @@ class _LiveSearchChildPageState extends State<LiveSearchChildPage>
                         childCount: response!.length,
                       ),
                     ),
-                };
-              },
-            )
-          : HttpError(
-              onReload: _controller.onReload,
-            ),
+                  };
+                },
+              )
+            : HttpError(
+                onReload: _controller.onReload,
+              ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/live_search/controller.dart b/lib/pages/live_search/controller.dart
index 5dd3d154f..2ca79292d 100644
--- a/lib/pages/live_search/controller.dart
+++ b/lib/pages/live_search/controller.dart
@@ -19,11 +19,13 @@ class LiveSearchController extends GetxController
   final RxList<int> counts = <int>[-1, -1].obs;
 
   late final roomCtr = Get.put(
-      LiveSearchChildController(this, LiveSearchType.room),
-      tag: Utils.generateRandomString(8));
+    LiveSearchChildController(this, LiveSearchType.room),
+    tag: Utils.generateRandomString(8),
+  );
   late final userCtr = Get.put(
-      LiveSearchChildController(this, LiveSearchType.user),
-      tag: Utils.generateRandomString(8));
+    LiveSearchChildController(this, LiveSearchType.user),
+    tag: Utils.generateRandomString(8),
+  );
 
   void onClear() {
     if (editingController.value.text.isNotEmpty) {
diff --git a/lib/pages/live_search/view.dart b/lib/pages/live_search/view.dart
index 1c78187c7..2d54bcba0 100644
--- a/lib/pages/live_search/view.dart
+++ b/lib/pages/live_search/view.dart
@@ -14,8 +14,10 @@ class LiveSearchPage extends StatefulWidget {
 }
 
 class _LiveSearchPageState extends State<LiveSearchPage> {
-  final _controller =
-      Get.put(LiveSearchController(), tag: Utils.generateRandomString(8));
+  final _controller = Get.put(
+    LiveSearchController(),
+    tag: Utils.generateRandomString(8),
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -28,7 +30,7 @@ class _LiveSearchPageState extends State<LiveSearchPage> {
             onPressed: _controller.submit,
             icon: const Icon(Icons.search, size: 22),
           ),
-          const SizedBox(width: 10)
+          const SizedBox(width: 10),
         ],
         title: TextField(
           autofocus: true,
diff --git a/lib/pages/live_search/widgets/live_search_room.dart b/lib/pages/live_search/widgets/live_search_room.dart
index 79a5e8af8..825543786 100644
--- a/lib/pages/live_search/widgets/live_search_room.dart
+++ b/lib/pages/live_search/widgets/live_search_room.dart
@@ -30,31 +30,33 @@ class LiveCardVSearch extends StatelessWidget {
           children: [
             AspectRatio(
               aspectRatio: StyleString.aspectRatio,
-              child: LayoutBuilder(builder: (context, boxConstraints) {
-                double maxWidth = boxConstraints.maxWidth;
-                double maxHeight = boxConstraints.maxHeight;
-                return Stack(
-                  clipBehavior: Clip.none,
-                  children: [
-                    NetworkImgLayer(
-                      src: item.cover!,
-                      width: maxWidth,
-                      height: maxHeight,
-                      radius: 0,
-                    ),
-                    Positioned(
-                      left: 0,
-                      right: 0,
-                      bottom: 0,
-                      child: AnimatedOpacity(
-                        opacity: 1,
-                        duration: const Duration(milliseconds: 200),
-                        child: videoStat(context),
+              child: LayoutBuilder(
+                builder: (context, boxConstraints) {
+                  double maxWidth = boxConstraints.maxWidth;
+                  double maxHeight = boxConstraints.maxHeight;
+                  return Stack(
+                    clipBehavior: Clip.none,
+                    children: [
+                      NetworkImgLayer(
+                        src: item.cover!,
+                        width: maxWidth,
+                        height: maxHeight,
+                        radius: 0,
                       ),
-                    ),
-                  ],
-                );
-              }),
+                      Positioned(
+                        left: 0,
+                        right: 0,
+                        bottom: 0,
+                        child: AnimatedOpacity(
+                          opacity: 1,
+                          duration: const Duration(milliseconds: 200),
+                          child: videoStat(context),
+                        ),
+                      ),
+                    ],
+                  );
+                },
+              ),
             ),
             Padding(
               padding: const EdgeInsets.fromLTRB(5, 8, 5, 4),
diff --git a/lib/pages/live_search/widgets/live_search_user.dart b/lib/pages/live_search/widgets/live_search_user.dart
index 3ad67e258..43c79baef 100644
--- a/lib/pages/live_search/widgets/live_search_user.dart
+++ b/lib/pages/live_search/widgets/live_search_user.dart
@@ -61,7 +61,7 @@ class LiveSearchUserItem extends StatelessWidget {
                   style: style,
                 ),
               ],
-            )
+            ),
           ],
         ),
       ),
diff --git a/lib/pages/login/controller.dart b/lib/pages/login/controller.dart
index 31076835d..8155913d2 100644
--- a/lib/pages/login/controller.dart
+++ b/lib/pages/login/controller.dart
@@ -88,7 +88,9 @@ class LoginPageController extends GetxController
               t.cancel();
               statusQRCode.value = '扫码成功';
               await setAccount(
-                  value['data'], value['data']['cookie_info']['cookies']);
+                value['data'],
+                value['data']['cookie_info']['cookies'],
+              );
               Get.back();
             } else if (value['code'] == 86038) {
               t.cancel();
@@ -122,90 +124,91 @@ class LoginPageController extends GetxController
 
     captcha
       ..addEventHandler(
-          onShow: (Map<String, dynamic> message) {},
-          onClose: (Map<String, dynamic> message) {
-            SmartDialog.showToast('关闭验证');
-          },
-          onResult: (Map<String, dynamic> message) {
-            if (kDebugMode) debugPrint("Captcha result: $message");
-            String code = message["code"];
-            if (code == "1") {
-              // 发送 message["result"] 中的数据向 B 端的业务服务接口进行查询
-              SmartDialog.showToast('验证成功');
-              captchaData
-                ..validate = message['result']['geetest_validate']
-                ..seccode = message['result']['geetest_seccode']
-                ..geetest = GeetestData(
-                  challenge: message['result']['geetest_challenge'],
-                  gt: geeGt,
-                );
-              onSuccess();
+        onShow: (Map<String, dynamic> message) {},
+        onClose: (Map<String, dynamic> message) {
+          SmartDialog.showToast('关闭验证');
+        },
+        onResult: (Map<String, dynamic> message) {
+          if (kDebugMode) debugPrint("Captcha result: $message");
+          String code = message["code"];
+          if (code == "1") {
+            // 发送 message["result"] 中的数据向 B 端的业务服务接口进行查询
+            SmartDialog.showToast('验证成功');
+            captchaData
+              ..validate = message['result']['geetest_validate']
+              ..seccode = message['result']['geetest_seccode']
+              ..geetest = GeetestData(
+                challenge: message['result']['geetest_challenge'],
+                gt: geeGt,
+              );
+            onSuccess();
+          } else {
+            // 终端用户完成验证失败，自动重试 If the verification fails, it will be automatically retried.
+            if (kDebugMode) debugPrint("Captcha result code : $code");
+          }
+        },
+        onError: (Map<String, dynamic> message) {
+          SmartDialog.showToast("Captcha onError: $message");
+          String code = message["code"];
+          // 处理验证中返回的错误 Handling errors returned in verification
+          if (Platform.isAndroid) {
+            // Android 平台
+            if (code == "-2") {
+              // Dart 调用异常 Call exception
+            } else if (code == "-1") {
+              // Gt3RegisterData 参数不合法 Parameter is invalid
+            } else if (code == "201") {
+              // 网络无法访问 Network inaccessible
+            } else if (code == "202") {
+              // Json 解析错误 Analysis error
+            } else if (code == "204") {
+              // WebView 加载超时，请检查是否混淆极验 SDK   Load timed out
+            } else if (code == "204_1") {
+              // WebView 加载前端页面错误，请查看日志 Error loading front-end page, please check the log
+            } else if (code == "204_2") {
+              // WebView 加载 SSLError
+            } else if (code == "206") {
+              // gettype 接口错误或返回为 null   API error or return null
+            } else if (code == "207") {
+              // getphp 接口错误或返回为 null    API error or return null
+            } else if (code == "208") {
+              // ajax 接口错误或返回为 null      API error or return null
             } else {
-              // 终端用户完成验证失败，自动重试 If the verification fails, it will be automatically retried.
-              if (kDebugMode) debugPrint("Captcha result code : $code");
-            }
-          },
-          onError: (Map<String, dynamic> message) {
-            SmartDialog.showToast("Captcha onError: $message");
-            String code = message["code"];
-            // 处理验证中返回的错误 Handling errors returned in verification
-            if (Platform.isAndroid) {
-              // Android 平台
-              if (code == "-2") {
-                // Dart 调用异常 Call exception
-              } else if (code == "-1") {
-                // Gt3RegisterData 参数不合法 Parameter is invalid
-              } else if (code == "201") {
-                // 网络无法访问 Network inaccessible
-              } else if (code == "202") {
-                // Json 解析错误 Analysis error
-              } else if (code == "204") {
-                // WebView 加载超时，请检查是否混淆极验 SDK   Load timed out
-              } else if (code == "204_1") {
-                // WebView 加载前端页面错误，请查看日志 Error loading front-end page, please check the log
-              } else if (code == "204_2") {
-                // WebView 加载 SSLError
-              } else if (code == "206") {
-                // gettype 接口错误或返回为 null   API error or return null
-              } else if (code == "207") {
-                // getphp 接口错误或返回为 null    API error or return null
-              } else if (code == "208") {
-                // ajax 接口错误或返回为 null      API error or return null
-              } else {
-                // 更多错误码参考开发文档  More error codes refer to the development document
-                // https://docs.geetest.com/sensebot/apirefer/errorcode/android
-              }
+              // 更多错误码参考开发文档  More error codes refer to the development document
+              // https://docs.geetest.com/sensebot/apirefer/errorcode/android
             }
+          }
 
-            if (Platform.isIOS) {
-              // iOS 平台
-              if (code == "-1009") {
-                // 网络无法访问 Network inaccessible
-              } else if (code == "-1004") {
-                // 无法查找到 HOST  Unable to find HOST
-              } else if (code == "-1002") {
-                // 非法的 URL  Illegal URL
-              } else if (code == "-1001") {
-                // 网络超时 Network timeout
-              } else if (code == "-999") {
-                // 请求被意外中断, 一般由用户进行取消操作导致 The interrupted request was usually caused by the user cancelling the operation
-              } else if (code == "-21") {
-                // 使用了重复的 challenge   Duplicate challenges are used
-                // 检查获取 challenge 是否进行了缓存  Check if the fetch challenge is cached
-              } else if (code == "-20") {
-                // 尝试过多, 重新引导用户触发验证即可 Try too many times, lead the user to request verification again
-              } else if (code == "-10") {
-                // 预判断时被封禁, 不会再进行图形验证 Banned during pre-judgment, and no more image captcha verification
-              } else if (code == "-2") {
-                // Dart 调用异常 Call exception
-              } else if (code == "-1") {
-                // Gt3RegisterData 参数不合法  Parameter is invalid
-              } else {
-                // 更多错误码参考开发文档 More error codes refer to the development document
-                // https://docs.geetest.com/sensebot/apirefer/errorcode/ios
-              }
+          if (Platform.isIOS) {
+            // iOS 平台
+            if (code == "-1009") {
+              // 网络无法访问 Network inaccessible
+            } else if (code == "-1004") {
+              // 无法查找到 HOST  Unable to find HOST
+            } else if (code == "-1002") {
+              // 非法的 URL  Illegal URL
+            } else if (code == "-1001") {
+              // 网络超时 Network timeout
+            } else if (code == "-999") {
+              // 请求被意外中断, 一般由用户进行取消操作导致 The interrupted request was usually caused by the user cancelling the operation
+            } else if (code == "-21") {
+              // 使用了重复的 challenge   Duplicate challenges are used
+              // 检查获取 challenge 是否进行了缓存  Check if the fetch challenge is cached
+            } else if (code == "-20") {
+              // 尝试过多, 重新引导用户触发验证即可 Try too many times, lead the user to request verification again
+            } else if (code == "-10") {
+              // 预判断时被封禁, 不会再进行图形验证 Banned during pre-judgment, and no more image captcha verification
+            } else if (code == "-2") {
+              // Dart 调用异常 Call exception
+            } else if (code == "-1") {
+              // Gt3RegisterData 参数不合法  Parameter is invalid
+            } else {
+              // 更多错误码参考开发文档 More error codes refer to the development document
+              // https://docs.geetest.com/sensebot/apirefer/errorcode/ios
             }
-          })
+          }
+        },
+      )
       ..startCaptcha(registerData);
   }
 
@@ -218,23 +221,27 @@ class LoginPageController extends GetxController
     try {
       var result = await Request().get(
         "/x/member/web/account",
-        options: Options(headers: {
-          "cookie": cookieTextController.text,
-        }, extra: {
-          'account': AnonymousAccount()
-        }),
+        options: Options(
+          headers: {
+            "cookie": cookieTextController.text,
+          },
+          extra: {'account': AnonymousAccount()},
+        ),
       );
       if (result.data['code'] == 0) {
         try {
           await LoginAccount(
-                  BiliCookieJar.fromJson(Map.fromEntries(
-                      cookieTextController.text.split(';').map((item) {
-                    final list = item.split('=');
-                    return MapEntry(list.first, list.skip(1).join());
-                  }))),
-                  null,
-                  null)
-              .onChange();
+            BiliCookieJar.fromJson(
+              Map.fromEntries(
+                cookieTextController.text.split(';').map((item) {
+                  final list = item.split('=');
+                  return MapEntry(list.first, list.skip(1).join());
+                }),
+              ),
+            ),
+            null,
+            null,
+          ).onChange();
           if (!Accounts.main.isLogin) await switchAccountDialog(Get.context!);
           SmartDialog.showToast('登录成功');
           Get.back();
@@ -288,11 +295,14 @@ class LoginPageController extends GetxController
         String url = data['url']!;
         Uri currentUri = Uri.parse(url);
         var safeCenterRes = await LoginHttp.safeCenterGetInfo(
-            tmpCode: currentUri.queryParameters['tmp_token']!);
+          tmpCode: currentUri.queryParameters['tmp_token']!,
+        );
         //{"code":0,"message":"0","ttl":1,"data":{"account_info":{"hide_tel":"111*****111","hide_mail":"aaa*****aaaa.aaa","bind_mail":true,"bind_tel":true,"tel_verify":true,"mail_verify":true,"unneeded_check":false,"bind_safe_question":false,"mid":1111111},"member_info":{"nickname":"xxxxxxx","face":"https://i0.hdslb.com/bfs/face/xxxxxxx.jpg","realname_status":false},"sns_info":{"bind_google":false,"bind_fb":false,"bind_apple":false,"bind_qq":true,"bind_weibo":true,"bind_wechat":false},"account_safe":{"score":80}}}
         if (!safeCenterRes['status']) {
-          SmartDialog.showToast("获取安全验证信息失败，请尝试其它登录方式\n"
-              "(${safeCenterRes['code']}) ${safeCenterRes['msg']}");
+          SmartDialog.showToast(
+            "获取安全验证信息失败，请尝试其它登录方式\n"
+            "(${safeCenterRes['code']}) ${safeCenterRes['msg']}",
+          );
           return;
         }
         Map<String, String> accountInfo = {
@@ -307,11 +317,17 @@ class LoginPageController extends GetxController
         String captchaKey = '';
         Get.dialog(
           AlertDialog(
-            titlePadding:
-                const EdgeInsets.only(left: 16, top: 18, right: 16, bottom: 12),
+            titlePadding: const EdgeInsets.only(
+              left: 16,
+              top: 18,
+              right: 16,
+              bottom: 12,
+            ),
             contentPadding: const EdgeInsets.symmetric(horizontal: 16),
-            actionsPadding:
-                const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+            actionsPadding: const EdgeInsets.symmetric(
+              horizontal: 16,
+              vertical: 12,
+            ),
             title: const Text(
               "本次登录需要验证您的手机号",
               textAlign: TextAlign.center,
@@ -353,15 +369,19 @@ class LoginPageController extends GetxController
                   var preCaptureRes = await LoginHttp.preCapture();
                   if (!preCaptureRes['status'] ||
                       preCaptureRes['data'] == null) {
-                    SmartDialog.showToast("获取验证码失败，请尝试其它登录方式\n"
-                        "(${preCaptureRes['code']}) ${preCaptureRes['msg']} ${preCaptureRes['data']}");
+                    SmartDialog.showToast(
+                      "获取验证码失败，请尝试其它登录方式\n"
+                      "(${preCaptureRes['code']}) ${preCaptureRes['msg']} ${preCaptureRes['data']}",
+                    );
                   }
                   String? geeGt = preCaptureRes['data']['gee_gt'];
                   String? geeChallenge = preCaptureRes['data']['gee_challenge'];
                   captchaData.token = preCaptureRes['data']['recaptcha_token'];
                   if (!isGeeArgumentValid(geeGt, geeChallenge)) {
-                    SmartDialog.showToast("获取极验参数为空，请尝试其它登录方式\n"
-                        "(${preCaptureRes['code']}) ${preCaptureRes['msg']} ${preCaptureRes['data']}");
+                    SmartDialog.showToast(
+                      "获取极验参数为空，请尝试其它登录方式\n"
+                      "(${preCaptureRes['code']}) ${preCaptureRes['msg']} ${preCaptureRes['data']}",
+                    );
                     return;
                   }
 
@@ -371,16 +391,18 @@ class LoginPageController extends GetxController
                     () async {
                       var safeCenterSendSmsCodeRes =
                           await LoginHttp.safeCenterSmsCode(
-                        tmpCode: currentUri.queryParameters['tmp_token']!,
-                        geeChallenge: geeChallenge,
-                        geeSeccode: captchaData.seccode,
-                        geeValidate: captchaData.validate,
-                        recaptchaToken: captchaData.token,
-                        refererUrl: url,
-                      );
+                            tmpCode: currentUri.queryParameters['tmp_token']!,
+                            geeChallenge: geeChallenge,
+                            geeSeccode: captchaData.seccode,
+                            geeValidate: captchaData.validate,
+                            recaptchaToken: captchaData.token,
+                            refererUrl: url,
+                          );
                       if (!safeCenterSendSmsCodeRes['status']) {
-                        SmartDialog.showToast("发送短信验证码失败，请尝试其它登录方式\n"
-                            "(${safeCenterSendSmsCodeRes['code']}) ${safeCenterSendSmsCodeRes['msg']}");
+                        SmartDialog.showToast(
+                          "发送短信验证码失败，请尝试其它登录方式\n"
+                          "(${safeCenterSendSmsCodeRes['code']}) ${safeCenterSendSmsCodeRes['msg']}",
+                        );
                         return;
                       }
                       SmartDialog.showToast("短信验证码已发送，请查收");
@@ -406,16 +428,18 @@ class LoginPageController extends GetxController
                   }
                   var safeCenterSmsVerifyRes =
                       await LoginHttp.safeCenterSmsVerify(
-                    code: code,
-                    tmpCode: currentUri.queryParameters['tmp_token']!,
-                    requestId: currentUri.queryParameters['request_id']!,
-                    source: currentUri.queryParameters['source']!,
-                    captchaKey: captchaKey,
-                    refererUrl: url,
-                  );
+                        code: code,
+                        tmpCode: currentUri.queryParameters['tmp_token']!,
+                        requestId: currentUri.queryParameters['request_id']!,
+                        source: currentUri.queryParameters['source']!,
+                        captchaKey: captchaKey,
+                        refererUrl: url,
+                      );
                   if (!safeCenterSmsVerifyRes['status']) {
-                    SmartDialog.showToast("验证短信验证码失败，请尝试其它登录方式\n"
-                        "(${safeCenterSmsVerifyRes['code']}) ${safeCenterSmsVerifyRes['msg']}");
+                    SmartDialog.showToast(
+                      "验证短信验证码失败，请尝试其它登录方式\n"
+                      "(${safeCenterSmsVerifyRes['code']}) ${safeCenterSmsVerifyRes['msg']}",
+                    );
                     return;
                   }
                   SmartDialog.showToast("验证成功，正在登录");
@@ -423,20 +447,25 @@ class LoginPageController extends GetxController
                     code: safeCenterSmsVerifyRes['data']['code'],
                   );
                   if (!oauth2AccessTokenRes['status']) {
-                    SmartDialog.showToast("登录失败，请尝试其它登录方式\n"
-                        "(${oauth2AccessTokenRes['code']}) ${oauth2AccessTokenRes['msg']}");
+                    SmartDialog.showToast(
+                      "登录失败，请尝试其它登录方式\n"
+                      "(${oauth2AccessTokenRes['code']}) ${oauth2AccessTokenRes['msg']}",
+                    );
                     return;
                   }
                   var data = oauth2AccessTokenRes['data'];
                   if (data['token_info'] == null ||
                       data['cookie_info'] == null) {
                     SmartDialog.showToast(
-                        '登录异常，接口未返回身份信息，可能是因为账号风控，请尝试其它登录方式。\n${oauth2AccessTokenRes["msg"]}，\n $data');
+                      '登录异常，接口未返回身份信息，可能是因为账号风控，请尝试其它登录方式。\n${oauth2AccessTokenRes["msg"]}，\n $data',
+                    );
                     return;
                   }
                   SmartDialog.showToast('正在保存身份信息');
                   await setAccount(
-                      data['token_info'], data['cookie_info']['cookies']);
+                    data['token_info'],
+                    data['cookie_info']['cookies'],
+                  );
                   Get
                     ..back()
                     ..back();
@@ -451,7 +480,8 @@ class LoginPageController extends GetxController
       }
       if (data['token_info'] == null || data['cookie_info'] == null) {
         SmartDialog.showToast(
-            '登录异常，接口未返回身份信息，可能是因为账号风控，请尝试其它登录方式。\n${res["msg"]}，\n $data');
+          '登录异常，接口未返回身份信息，可能是因为账号风控，请尝试其它登录方式。\n${res["msg"]}，\n $data',
+        );
         return;
       }
       SmartDialog.showToast('正在保存身份信息');
@@ -587,8 +617,9 @@ class LoginPageController extends GetxController
       smsSendTimestamp = DateTime.now().millisecondsSinceEpoch;
       smsSendCooldown.value = 60;
       captchaKey = res['data']['captcha_key'];
-      smsSendCooldownTimer =
-          Timer.periodic(const Duration(seconds: 1), (timer) {
+      smsSendCooldownTimer = Timer.periodic(const Duration(seconds: 1), (
+        timer,
+      ) {
         smsSendCooldown.value = 60 - timer.tick;
         if (smsSendCooldown <= 0) {
           smsSendCooldownTimer?.cancel();
@@ -613,12 +644,15 @@ class LoginPageController extends GetxController
           if (!isGeeArgumentValid(geeGt, geeChallenge)) {
             if (kDebugMode) {
               debugPrint(
-                  '验证信息错误：${res["msg"]}\n返回内容：${res["data"]}，尝试另一个验证码接口');
+                '验证信息错误：${res["msg"]}\n返回内容：${res["data"]}，尝试另一个验证码接口',
+              );
             }
             var preCaptureRes = await LoginHttp.preCapture();
             if (!preCaptureRes['status'] || preCaptureRes['data'] == null) {
-              SmartDialog.showToast("获取验证码失败，请尝试其它登录方式\n"
-                  "(${preCaptureRes['code']}) ${preCaptureRes['msg']} ${preCaptureRes['data']}");
+              SmartDialog.showToast(
+                "获取验证码失败，请尝试其它登录方式\n"
+                "(${preCaptureRes['code']}) ${preCaptureRes['msg']} ${preCaptureRes['data']}",
+              );
               return;
             }
             geeGt = preCaptureRes['data']['gee_gt'];
@@ -649,8 +683,11 @@ class LoginPageController extends GetxController
   }
 
   Future<void> setAccount(Map tokenInfo, List cookieInfo) async {
-    final account = LoginAccount(BiliCookieJar.fromList(cookieInfo),
-        tokenInfo['access_token'], tokenInfo['refresh_token']);
+    final account = LoginAccount(
+      BiliCookieJar.fromList(cookieInfo),
+      tokenInfo['access_token'],
+      tokenInfo['refresh_token'],
+    );
     await Future.wait([account.onChange(), AnonymousAccount().delete()]);
     Accounts.accountMode.updateAll((_, a) => a == account ? account : a);
     if (Accounts.main.isLogin) {
@@ -668,62 +705,63 @@ class LoginPageController extends GetxController
     final selectAccount = Map.of(Accounts.accountMode);
     final options = {
       AnonymousAccount(): '0',
-      ...Accounts.account
-          .toMap()
-          .cast<String, Account>()
-          .map((k, v) => MapEntry(v, k))
+      ...Accounts.account.toMap().cast<String, Account>().map(
+        (k, v) => MapEntry(v, k),
+      ),
     };
     return showDialog(
       context: context,
-      builder: (context) => StatefulBuilder(builder: (context, setState) {
-        return AlertDialog(
-          title: const Text('选择账号mid, 为0时使用匿名'),
-          titlePadding: const EdgeInsets.only(left: 22, top: 16, right: 22),
-          contentPadding: const EdgeInsets.symmetric(vertical: 5),
-          actionsPadding: const EdgeInsets.only(
-            left: 16,
-            right: 16,
-            bottom: 10,
-          ),
-          content: SingleChildScrollView(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: AccountType.values
-                  .map(
-                    (e) => WrapRadioOptionsGroup<Account>(
-                      groupTitle: e.title,
-                      options: options,
-                      selectedValue: selectAccount[e],
-                      onChanged: (v) => setState(() => selectAccount[e] = v!),
-                    ),
-                  )
-                  .toList(),
+      builder: (context) => StatefulBuilder(
+        builder: (context, setState) {
+          return AlertDialog(
+            title: const Text('选择账号mid, 为0时使用匿名'),
+            titlePadding: const EdgeInsets.only(left: 22, top: 16, right: 22),
+            contentPadding: const EdgeInsets.symmetric(vertical: 5),
+            actionsPadding: const EdgeInsets.only(
+              left: 16,
+              right: 16,
+              bottom: 10,
             ),
-          ),
-          actions: [
-            TextButton(
-              onPressed: Get.back,
-              child: Text(
-                '取消',
-                style: TextStyle(
-                  color: Theme.of(context).colorScheme.outline,
-                ),
+            content: SingleChildScrollView(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: AccountType.values
+                    .map(
+                      (e) => WrapRadioOptionsGroup<Account>(
+                        groupTitle: e.title,
+                        options: options,
+                        selectedValue: selectAccount[e],
+                        onChanged: (v) => setState(() => selectAccount[e] = v!),
+                      ),
+                    )
+                    .toList(),
               ),
             ),
-            TextButton(
-              onPressed: () {
-                for (var i in selectAccount.entries) {
-                  if (i.value != Accounts.get(i.key)) {
-                    Accounts.set(i.key, i.value);
+            actions: [
+              TextButton(
+                onPressed: Get.back,
+                child: Text(
+                  '取消',
+                  style: TextStyle(
+                    color: Theme.of(context).colorScheme.outline,
+                  ),
+                ),
+              ),
+              TextButton(
+                onPressed: () {
+                  for (var i in selectAccount.entries) {
+                    if (i.value != Accounts.get(i.key)) {
+                      Accounts.set(i.key, i.value);
+                    }
                   }
-                }
-                Get.back();
-              },
-              child: const Text('确定'),
-            ),
-          ],
-        );
-      }),
+                  Get.back();
+                },
+                child: const Text('确定'),
+              ),
+            ],
+          );
+        },
+      ),
     );
   }
 }
diff --git a/lib/pages/login/view.dart b/lib/pages/login/view.dart
index 0f1116bc5..0046b92d2 100644
--- a/lib/pages/login/view.dart
+++ b/lib/pages/login/view.dart
@@ -35,8 +35,9 @@ class _LoginPageState extends State<LoginPage> {
           () => Text(
             '剩余有效时间: ${_loginPageCtr.qrCodeLeftTime} 秒',
             style: TextStyle(
-                fontFeatures: const [FontFeature.tabularFigures()],
-                color: theme.colorScheme.primaryFixedDim),
+              fontFeatures: const [FontFeature.tabularFigures()],
+              color: theme.colorScheme.primaryFixedDim,
+            ),
           ),
         ),
         const SizedBox(height: 5),
@@ -51,11 +52,13 @@ class _LoginPageState extends State<LoginPage> {
             TextButton.icon(
               onPressed: () async {
                 SmartDialog.showLoading(msg: '正在生成截图');
-                RenderRepaintBoundary boundary = globalKey.currentContext!
-                    .findRenderObject()! as RenderRepaintBoundary;
+                RenderRepaintBoundary boundary =
+                    globalKey.currentContext!.findRenderObject()!
+                        as RenderRepaintBoundary;
                 var image = await boundary.toImage(pixelRatio: 3);
-                ByteData? byteData =
-                    await image.toByteData(format: ImageByteFormat.png);
+                ByteData? byteData = await image.toByteData(
+                  format: ImageByteFormat.png,
+                );
                 Uint8List pngBytes = byteData!.buffer.asUint8List();
                 SmartDialog.dismiss();
                 SmartDialog.showLoading(msg: '正在保存至图库');
@@ -119,8 +122,9 @@ class _LoginPageState extends State<LoginPage> {
         Obx(
           () => GestureDetector(
             onTap: () => Utils.copyText(
-                _loginPageCtr.codeInfo['data']?['url'] ?? '',
-                toastText: '已复制到剪贴板，可粘贴至已登录的app私信处发送，然后点击已发送的链接打开'),
+              _loginPageCtr.codeInfo['data']?['url'] ?? '',
+              toastText: '已复制到剪贴板，可粘贴至已登录的app私信处发送，然后点击已发送的链接打开',
+            ),
             child: Padding(
               padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
               child: Text(
@@ -254,8 +258,12 @@ class _LoginPageState extends State<LoginPage> {
                     return SimpleDialog(
                       clipBehavior: Clip.hardEdge,
                       title: const Text('忘记密码？'),
-                      contentPadding:
-                          const EdgeInsets.fromLTRB(0.0, 2.0, 0.0, 16.0),
+                      contentPadding: const EdgeInsets.fromLTRB(
+                        0.0,
+                        2.0,
+                        0.0,
+                        16.0,
+                      ),
                       children: [
                         const Padding(
                           padding: EdgeInsets.fromLTRB(25, 0, 25, 10),
@@ -272,12 +280,15 @@ class _LoginPageState extends State<LoginPage> {
                           dense: false,
                           onTap: () => Get
                             ..back()
-                            ..toNamed('/webview', parameters: {
-                              'url':
-                                  'https://passport.bilibili.com/h5-app/passport/login/findPassword',
-                              'type': 'url',
-                              'pageTitle': '忘记密码',
-                            }),
+                            ..toNamed(
+                              '/webview',
+                              parameters: {
+                                'url':
+                                    'https://passport.bilibili.com/h5-app/passport/login/findPassword',
+                                'type': 'url',
+                                'pageTitle': '忘记密码',
+                              },
+                            ),
                         ),
                         ListTile(
                           title: const Text(
@@ -290,13 +301,16 @@ class _LoginPageState extends State<LoginPage> {
                           dense: false,
                           onTap: () => Get
                             ..back()
-                            ..toNamed('/webview', parameters: {
-                              'url':
-                                  'https://passport.bilibili.com/pc/passport/findPassword',
-                              'type': 'url',
-                              'pageTitle': '忘记密码',
-                              'uaType': 'pc'
-                            }),
+                            ..toNamed(
+                              '/webview',
+                              parameters: {
+                                'url':
+                                    'https://passport.bilibili.com/pc/passport/findPassword',
+                                'type': 'url',
+                                'pageTitle': '忘记密码',
+                                'uaType': 'pc',
+                              },
+                            ),
                         ),
                       ],
                     );
@@ -352,7 +366,8 @@ class _LoginPageState extends State<LoginPage> {
                   builder: (context) {
                     return PopupMenuButton<Map<String, dynamic>>(
                       padding: EdgeInsets.zero,
-                      tooltip: '选择国际冠码，'
+                      tooltip:
+                          '选择国际冠码，'
                           '当前为${_loginPageCtr.selectedCountryCodeId['cname']}，'
                           '+${_loginPageCtr.selectedCountryCodeId['country_id']}',
                       onSelected: (Map<String, dynamic> type) {},
@@ -360,19 +375,22 @@ class _LoginPageState extends State<LoginPage> {
                       itemBuilder: (_) => _loginPageCtr
                           .internationalDialingPrefix
                           .map((Map<String, dynamic> item) {
-                        return PopupMenuItem<Map<String, dynamic>>(
-                          onTap: () {
-                            _loginPageCtr.selectedCountryCodeId = item;
-                            (context as Element).markNeedsBuild();
-                          },
-                          value: item,
-                          child: Row(children: [
-                            Text(item['cname']),
-                            const Spacer(),
-                            Text("+${item['country_id']}")
-                          ]),
-                        );
-                      }).toList(),
+                            return PopupMenuItem<Map<String, dynamic>>(
+                              onTap: () {
+                                _loginPageCtr.selectedCountryCodeId = item;
+                                (context as Element).markNeedsBuild();
+                              },
+                              value: item,
+                              child: Row(
+                                children: [
+                                  Text(item['cname']),
+                                  const Spacer(),
+                                  Text("+${item['country_id']}"),
+                                ],
+                              ),
+                            );
+                          })
+                          .toList(),
                       child: Row(
                         children: [
                           Icon(
@@ -381,7 +399,8 @@ class _LoginPageState extends State<LoginPage> {
                           ),
                           const SizedBox(width: 12),
                           Text(
-                              "+${_loginPageCtr.selectedCountryCodeId['country_id']}"),
+                            "+${_loginPageCtr.selectedCountryCodeId['country_id']}",
+                          ),
                         ],
                       ),
                     );
@@ -446,9 +465,11 @@ class _LoginPageState extends State<LoginPage> {
                         ? null
                         : _loginPageCtr.sendSmsCode,
                     icon: const Icon(Icons.send),
-                    label: Text(_loginPageCtr.smsSendCooldown > 0
-                        ? '等待${_loginPageCtr.smsSendCooldown}秒'
-                        : '获取验证码'),
+                    label: Text(
+                      _loginPageCtr.smsSendCooldown > 0
+                          ? '等待${_loginPageCtr.smsSendCooldown}秒'
+                          : '获取验证码',
+                    ),
                   ),
                 ),
               ],
@@ -483,93 +504,96 @@ class _LoginPageState extends State<LoginPage> {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    padding = MediaQuery.paddingOf(context).copyWith(top: 0) +
+    padding =
+        MediaQuery.paddingOf(context).copyWith(top: 0) +
         const EdgeInsets.only(bottom: 25);
-    return OrientationBuilder(builder: (context, orientation) {
-      final isLandscape = orientation == Orientation.landscape;
-      return Scaffold(
-        appBar: AppBar(
-          leading: IconButton(
-            tooltip: '关闭',
-            icon: const Icon(Icons.close_outlined),
-            onPressed: Get.back,
-          ),
-          title: Row(
-            children: [
-              const Text('登录'),
-              if (isLandscape)
-                Expanded(
-                  child: Align(
-                    alignment: Alignment.centerRight,
-                    child: TabBar(
-                      isScrollable: true,
-                      dividerHeight: 0,
-                      tabs: const [
-                        Tab(
-                          child: Row(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [Icon(Icons.password), Text(' 密码')],
+    return OrientationBuilder(
+      builder: (context, orientation) {
+        final isLandscape = orientation == Orientation.landscape;
+        return Scaffold(
+          appBar: AppBar(
+            leading: IconButton(
+              tooltip: '关闭',
+              icon: const Icon(Icons.close_outlined),
+              onPressed: Get.back,
+            ),
+            title: Row(
+              children: [
+                const Text('登录'),
+                if (isLandscape)
+                  Expanded(
+                    child: Align(
+                      alignment: Alignment.centerRight,
+                      child: TabBar(
+                        isScrollable: true,
+                        dividerHeight: 0,
+                        tabs: const [
+                          Tab(
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [Icon(Icons.password), Text(' 密码')],
+                            ),
                           ),
-                        ),
-                        Tab(
-                          child: Row(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [Icon(Icons.sms_outlined), Text(' 短信')],
+                          Tab(
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [Icon(Icons.sms_outlined), Text(' 短信')],
+                            ),
                           ),
-                        ),
-                        Tab(
-                          child: Row(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [Icon(Icons.qr_code), Text(' 扫码')],
+                          Tab(
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [Icon(Icons.qr_code), Text(' 扫码')],
+                            ),
                           ),
-                        ),
-                        Tab(
-                          child: Row(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
-                              Icon(Icons.cookie_outlined),
-                              Text(' Cookie')
-                            ],
+                          Tab(
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                Icon(Icons.cookie_outlined),
+                                Text(' Cookie'),
+                              ],
+                            ),
                           ),
-                        ),
-                      ],
-                      controller: _loginPageCtr.tabController,
+                        ],
+                        controller: _loginPageCtr.tabController,
+                      ),
                     ),
                   ),
-                )
-            ],
+              ],
+            ),
+            bottom: !isLandscape
+                ? TabBar(
+                    tabs: const [
+                      Tab(icon: Icon(Icons.password), text: '密码'),
+                      Tab(icon: Icon(Icons.sms_outlined), text: '短信'),
+                      Tab(icon: Icon(Icons.qr_code), text: '扫码'),
+                      Tab(icon: Icon(Icons.cookie_outlined), text: 'Cookie'),
+                    ],
+                    controller: _loginPageCtr.tabController,
+                  )
+                : null,
           ),
-          bottom: !isLandscape
-              ? TabBar(
-                  tabs: const [
-                    Tab(icon: Icon(Icons.password), text: '密码'),
-                    Tab(icon: Icon(Icons.sms_outlined), text: '短信'),
-                    Tab(icon: Icon(Icons.qr_code), text: '扫码'),
-                    Tab(icon: Icon(Icons.cookie_outlined), text: 'Cookie'),
-                  ],
-                  controller: _loginPageCtr.tabController,
-                )
-              : null,
-        ),
-        body: NotificationListener<ScrollStartNotification>(
-          onNotification: (notification) {
-            if (notification.metrics.axis == Axis.horizontal) {
-              FocusScope.of(context).unfocus();
-            }
-            return false;
-          },
-          child: tabBarView(
-            controller: _loginPageCtr.tabController,
-            children: [
-              tabViewOuter(loginByPassword(theme)),
-              tabViewOuter(loginBySmS(theme)),
-              tabViewOuter(loginByQRCode(theme)),
-              tabViewOuter(loginByCookie(theme)),
-            ],
+          body: NotificationListener<ScrollStartNotification>(
+            onNotification: (notification) {
+              if (notification.metrics.axis == Axis.horizontal) {
+                FocusScope.of(context).unfocus();
+              }
+              return false;
+            },
+            child: tabBarView(
+              controller: _loginPageCtr.tabController,
+              children: [
+                tabViewOuter(loginByPassword(theme)),
+                tabViewOuter(loginBySmS(theme)),
+                tabViewOuter(loginByQRCode(theme)),
+                tabViewOuter(loginByCookie(theme)),
+              ],
+            ),
           ),
-        ),
-      );
-    });
+        );
+      },
+    );
   }
 
   Widget tabViewOuter(Widget child) {
diff --git a/lib/pages/login_log/view.dart b/lib/pages/login_log/view.dart
index 9488a13c0..841fe4095 100644
--- a/lib/pages/login_log/view.dart
+++ b/lib/pages/login_log/view.dart
@@ -47,78 +47,81 @@ class _LoginLogPageState extends State<LoginLogPage> {
   Widget _buildBody(LoadingState<List<LoginLogItem>?> loadingState) {
     return switch (loadingState) {
       Loading() => linearLoading,
-      Success(:var response) => response?.isNotEmpty == true
-          ? Builder(
-              builder: (context) {
-                final them = Theme.of(context);
-                final outline = them.colorScheme.outline.withValues(alpha: 0.1);
-                final divider = Divider(
-                  height: 1,
-                  color: outline,
-                );
-                final sliverDivider = SliverToBoxAdapter(
-                  child: divider,
-                );
-                final dividerV = VerticalDivider(
-                  width: 1,
-                  color: outline,
-                );
-                return SliverMainAxisGroup(
-                  slivers: [
-                    sliverDivider,
-                    SliverToBoxAdapter(
-                      child: ColoredBox(
-                        color: them.colorScheme.onInverseSurface,
-                        child: _item(
-                          LoginLogItem(
-                            timeAt: '时间',
-                            ip: '变化',
-                            geo: '地理位置',
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? Builder(
+                builder: (context) {
+                  final them = Theme.of(context);
+                  final outline = them.colorScheme.outline.withValues(
+                    alpha: 0.1,
+                  );
+                  final divider = Divider(
+                    height: 1,
+                    color: outline,
+                  );
+                  final sliverDivider = SliverToBoxAdapter(
+                    child: divider,
+                  );
+                  final dividerV = VerticalDivider(
+                    width: 1,
+                    color: outline,
+                  );
+                  return SliverMainAxisGroup(
+                    slivers: [
+                      sliverDivider,
+                      SliverToBoxAdapter(
+                        child: ColoredBox(
+                          color: them.colorScheme.onInverseSurface,
+                          child: _item(
+                            LoginLogItem(
+                              timeAt: '时间',
+                              ip: '变化',
+                              geo: '地理位置',
+                            ),
+                            dividerV,
+                            isHeader: true,
                           ),
-                          dividerV,
-                          isHeader: true,
                         ),
                       ),
-                    ),
-                    sliverDivider,
-                    SliverList.separated(
-                      itemCount: response!.length,
-                      itemBuilder: (context, index) {
-                        return _item(response[index], dividerV);
-                      },
-                      separatorBuilder: (context, index) => divider,
-                    ),
-                    sliverDivider,
-                  ],
-                );
-              },
-            )
-          : HttpError(onReload: _controller.onReload),
+                      sliverDivider,
+                      SliverList.separated(
+                        itemCount: response!.length,
+                        itemBuilder: (context, index) {
+                          return _item(response[index], dividerV);
+                        },
+                        separatorBuilder: (context, index) => divider,
+                      ),
+                      sliverDivider,
+                    ],
+                  );
+                },
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
   Widget _item(LoginLogItem item, Widget divider, {bool isHeader = false}) {
     Widget text(int flex, String text) => Expanded(
-          flex: flex,
-          child: Padding(
-            padding: isHeader
-                ? const EdgeInsets.symmetric(vertical: 6)
-                : const EdgeInsets.symmetric(vertical: 8),
-            child: Center(
-              child: Text(
-                text,
-                textAlign: TextAlign.center,
-                style: isHeader
-                    ? const TextStyle(fontSize: 13, fontWeight: FontWeight.bold)
-                    : const TextStyle(fontSize: 13),
-              ),
-            ),
+      flex: flex,
+      child: Padding(
+        padding: isHeader
+            ? const EdgeInsets.symmetric(vertical: 6)
+            : const EdgeInsets.symmetric(vertical: 8),
+        child: Center(
+          child: Text(
+            text,
+            textAlign: TextAlign.center,
+            style: isHeader
+                ? const TextStyle(fontSize: 13, fontWeight: FontWeight.bold)
+                : const TextStyle(fontSize: 13),
           ),
-        );
+        ),
+      ),
+    );
     Widget content = Row(
       children: [
         divider,
diff --git a/lib/pages/main/controller.dart b/lib/pages/main/controller.dart
index a627ba00e..64ce2641a 100644
--- a/lib/pages/main/controller.dart
+++ b/lib/pages/main/controller.dart
@@ -152,8 +152,8 @@ class MainController extends GetxController
     final countStr = count == 0
         ? ''
         : count > 99
-            ? '99+'
-            : count.toString();
+        ? '99+'
+        : count.toString();
     if (msgUnReadCount.value == countStr) {
       if (isChangeType) {
         msgUnReadCount.refresh();
@@ -201,12 +201,15 @@ class MainController extends GetxController
     if (navBarSort == null) {
       navigationBars = NavigationBarType.values;
     } else {
-      navigationBars =
-          navBarSort.map((i) => NavigationBarType.values[i]).toList();
+      navigationBars = navBarSort
+          .map((i) => NavigationBarType.values[i])
+          .toList();
     }
     this.navigationBars = navigationBars;
-    selectedIndex.value =
-        max(0, navigationBars.indexWhere((e) => e.index == defaultHomePage));
+    selectedIndex.value = max(
+      0,
+      navigationBars.indexWhere((e) => e.index == defaultHomePage),
+    );
   }
 
   @override
diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart
index 885c7d835..8fd254770 100644
--- a/lib/pages/main/view.dart
+++ b/lib/pages/main/view.dart
@@ -131,14 +131,17 @@ class _MainAppState extends State<MainApp>
     } else {
       int now = DateTime.now().millisecondsSinceEpoch;
       if (now - _lastSelectTime < 500) {
-        EasyThrottle.throttle('topOrRefresh', const Duration(milliseconds: 500),
-            () {
-          if (currentPage is HomePage) {
-            _homeController.onRefresh();
-          } else if (currentPage is DynamicsPage) {
-            _dynamicController.onRefresh();
-          }
-        });
+        EasyThrottle.throttle(
+          'topOrRefresh',
+          const Duration(milliseconds: 500),
+          () {
+            if (currentPage is HomePage) {
+              _homeController.onRefresh();
+            } else if (currentPage is DynamicsPage) {
+              _dynamicController.onRefresh();
+            }
+          },
+        );
       } else {
         if (currentPage is HomePage) {
           _homeController.toTopOrRefresh();
@@ -202,67 +205,75 @@ class _MainAppState extends State<MainApp>
                 if (_mainController.useSideBar || !isPortrait) ...[
                   _mainController.navigationBars.length > 1
                       ? context.isTablet && _mainController.optTabletNav
-                          ? Column(
-                              children: [
-                                const SizedBox(height: 25),
-                                userAndSearchVertical(theme),
-                                const Spacer(flex: 2),
-                                Expanded(
-                                  flex: 5,
-                                  child: SizedBox(
-                                    width: 130,
-                                    child: Obx(
-                                      () => NavigationDrawer(
-                                        backgroundColor: Colors.transparent,
-                                        tilePadding: const EdgeInsets.symmetric(
-                                            vertical: 5, horizontal: 12),
-                                        indicatorShape:
-                                            const RoundedRectangleBorder(
-                                          borderRadius: BorderRadius.all(
-                                            Radius.circular(16),
-                                          ),
-                                        ),
-                                        onDestinationSelected: setIndex,
-                                        selectedIndex:
-                                            _mainController.selectedIndex.value,
-                                        children: _mainController.navigationBars
-                                            .map(
-                                              (e) =>
-                                                  NavigationDrawerDestination(
+                            ? Column(
+                                children: [
+                                  const SizedBox(height: 25),
+                                  userAndSearchVertical(theme),
+                                  const Spacer(flex: 2),
+                                  Expanded(
+                                    flex: 5,
+                                    child: SizedBox(
+                                      width: 130,
+                                      child: Obx(
+                                        () => NavigationDrawer(
+                                          backgroundColor: Colors.transparent,
+                                          tilePadding:
+                                              const EdgeInsets.symmetric(
+                                                vertical: 5,
+                                                horizontal: 12,
+                                              ),
+                                          indicatorShape:
+                                              const RoundedRectangleBorder(
+                                                borderRadius: BorderRadius.all(
+                                                  Radius.circular(16),
+                                                ),
+                                              ),
+                                          onDestinationSelected: setIndex,
+                                          selectedIndex: _mainController
+                                              .selectedIndex
+                                              .value,
+                                          children: _mainController
+                                              .navigationBars
+                                              .map(
+                                                (e) =>
+                                                    NavigationDrawerDestination(
                                                       label: Text(e.label),
                                                       icon: _buildIcon(type: e),
                                                       selectedIcon: _buildIcon(
                                                         type: e,
                                                         selected: true,
-                                                      )),
-                                            )
-                                            .toList(),
+                                                      ),
+                                                    ),
+                                              )
+                                              .toList(),
+                                        ),
                                       ),
                                     ),
                                   ),
-                                ),
-                              ],
-                            )
-                          : Obx(
-                              () => NavigationRail(
-                                groupAlignment: 0.5,
-                                selectedIndex:
-                                    _mainController.selectedIndex.value,
-                                onDestinationSelected: setIndex,
-                                labelType: NavigationRailLabelType.selected,
-                                leading: userAndSearchVertical(theme),
-                                destinations: _mainController.navigationBars
-                                    .map((e) => NavigationRailDestination(
+                                ],
+                              )
+                            : Obx(
+                                () => NavigationRail(
+                                  groupAlignment: 0.5,
+                                  selectedIndex:
+                                      _mainController.selectedIndex.value,
+                                  onDestinationSelected: setIndex,
+                                  labelType: NavigationRailLabelType.selected,
+                                  leading: userAndSearchVertical(theme),
+                                  destinations: _mainController.navigationBars
+                                      .map(
+                                        (e) => NavigationRailDestination(
                                           label: Text(e.label),
                                           icon: _buildIcon(type: e),
                                           selectedIcon: _buildIcon(
                                             type: e,
                                             selected: true,
                                           ),
-                                        ))
-                                    .toList(),
-                              ),
-                            )
+                                        ),
+                                      )
+                                      .toList(),
+                                ),
+                              )
                       : Container(
                           padding: const EdgeInsets.only(top: 10),
                           width: 80,
@@ -277,8 +288,9 @@ class _MainAppState extends State<MainApp>
                 Expanded(
                   child: _mainController.mainTabBarView
                       ? CustomTabBarView(
-                          scrollDirection:
-                              isPortrait ? Axis.horizontal : Axis.vertical,
+                          scrollDirection: isPortrait
+                              ? Axis.horizontal
+                              : Axis.vertical,
                           physics: const NeverScrollableScrollPhysics(),
                           controller: _mainController.controller,
                           children: _mainController.navigationBars
@@ -301,10 +313,10 @@ class _MainAppState extends State<MainApp>
               : StreamBuilder(
                   stream: _mainController.hideTabBar
                       ? _mainController.navSearchStreamDebounce
-                          ? _mainController.bottomBarStream?.stream
-                              .distinct()
-                              .throttle(const Duration(milliseconds: 500))
-                          : _mainController.bottomBarStream?.stream.distinct()
+                            ? _mainController.bottomBarStream?.stream
+                                  .distinct()
+                                  .throttle(const Duration(milliseconds: 500))
+                            : _mainController.bottomBarStream?.stream.distinct()
                       : null,
                   initialData: true,
                   builder: (context, AsyncSnapshot snapshot) {
@@ -314,45 +326,52 @@ class _MainAppState extends State<MainApp>
                       offset: Offset(0, snapshot.data ? 0 : 1),
                       child: _mainController.enableMYBar
                           ? _mainController.navigationBars.length > 1
-                              ? Obx(
-                                  () => NavigationBar(
-                                    onDestinationSelected: setIndex,
-                                    selectedIndex:
-                                        _mainController.selectedIndex.value,
-                                    destinations: _mainController.navigationBars
-                                        .map((e) => NavigationDestination(
-                                            label: e.label,
-                                            icon: _buildIcon(type: e),
-                                            selectedIcon: _buildIcon(
-                                              type: e,
-                                              selected: true,
-                                            )))
-                                        .toList(),
-                                  ),
-                                )
-                              : const SizedBox.shrink()
+                                ? Obx(
+                                    () => NavigationBar(
+                                      onDestinationSelected: setIndex,
+                                      selectedIndex:
+                                          _mainController.selectedIndex.value,
+                                      destinations: _mainController
+                                          .navigationBars
+                                          .map(
+                                            (e) => NavigationDestination(
+                                              label: e.label,
+                                              icon: _buildIcon(type: e),
+                                              selectedIcon: _buildIcon(
+                                                type: e,
+                                                selected: true,
+                                              ),
+                                            ),
+                                          )
+                                          .toList(),
+                                    ),
+                                  )
+                                : const SizedBox.shrink()
                           : _mainController.navigationBars.length > 1
-                              ? Obx(
-                                  () => BottomNavigationBar(
-                                    currentIndex:
-                                        _mainController.selectedIndex.value,
-                                    onTap: setIndex,
-                                    iconSize: 16,
-                                    selectedFontSize: 12,
-                                    unselectedFontSize: 12,
-                                    type: BottomNavigationBarType.fixed,
-                                    items: _mainController.navigationBars
-                                        .map((e) => BottomNavigationBarItem(
-                                            label: e.label,
-                                            icon: _buildIcon(type: e),
-                                            activeIcon: _buildIcon(
-                                              type: e,
-                                              selected: true,
-                                            )))
-                                        .toList(),
-                                  ),
-                                )
-                              : const SizedBox.shrink(),
+                          ? Obx(
+                              () => BottomNavigationBar(
+                                currentIndex:
+                                    _mainController.selectedIndex.value,
+                                onTap: setIndex,
+                                iconSize: 16,
+                                selectedFontSize: 12,
+                                unselectedFontSize: 12,
+                                type: BottomNavigationBarType.fixed,
+                                items: _mainController.navigationBars
+                                    .map(
+                                      (e) => BottomNavigationBarItem(
+                                        label: e.label,
+                                        icon: _buildIcon(type: e),
+                                        activeIcon: _buildIcon(
+                                          type: e,
+                                          selected: true,
+                                        ),
+                                      ),
+                                    )
+                                    .toList(),
+                              ),
+                            )
+                          : const SizedBox.shrink(),
                     );
                   },
                 ),
@@ -374,8 +393,8 @@ class _MainAppState extends State<MainApp>
                 isLabelVisible: dynCount > 0,
                 label:
                     _mainController.dynamicBadgeMode == DynamicBadgeMode.number
-                        ? Text(dynCount.toString())
-                        : null,
+                    ? Text(dynCount.toString())
+                    : null,
                 padding: const EdgeInsets.symmetric(horizontal: 6),
                 child: icon,
               );
@@ -415,23 +434,27 @@ class _MainAppState extends State<MainApp>
                       Positioned(
                         right: -6,
                         bottom: -6,
-                        child: Obx(() => MineController.anonymity.value
-                            ? IgnorePointer(
-                                child: Container(
-                                  padding: const EdgeInsets.all(2),
-                                  decoration: BoxDecoration(
-                                    color: theme.colorScheme.secondaryContainer,
-                                    shape: BoxShape.circle,
+                        child: Obx(
+                          () => MineController.anonymity.value
+                              ? IgnorePointer(
+                                  child: Container(
+                                    padding: const EdgeInsets.all(2),
+                                    decoration: BoxDecoration(
+                                      color:
+                                          theme.colorScheme.secondaryContainer,
+                                      shape: BoxShape.circle,
+                                    ),
+                                    child: Icon(
+                                      size: 16,
+                                      MdiIcons.incognito,
+                                      color: theme
+                                          .colorScheme
+                                          .onSecondaryContainer,
+                                    ),
                                   ),
-                                  child: Icon(
-                                    size: 16,
-                                    MdiIcons.incognito,
-                                    color:
-                                        theme.colorScheme.onSecondaryContainer,
-                                  ),
-                                ),
-                              )
-                            : const SizedBox.shrink()),
+                                )
+                              : const SizedBox.shrink(),
+                        ),
                       ),
                     ],
                   )
diff --git a/lib/pages/match_info/controller.dart b/lib/pages/match_info/controller.dart
index 2f35a4ff1..d48f3867e 100644
--- a/lib/pages/match_info/controller.dart
+++ b/lib/pages/match_info/controller.dart
@@ -38,10 +38,10 @@ class MatchInfoController extends ReplyController<MainListReply> {
 
   @override
   Future<LoadingState<MainListReply>> customGetData() => ReplyGrpc.mainList(
-        type: replyType,
-        oid: cid,
-        mode: mode.value,
-        cursorNext: cursorNext,
-        offset: paginationReply?.nextOffset,
-      );
+    type: replyType,
+    oid: cid,
+    mode: mode.value,
+    cursorNext: cursorNext,
+    offset: paginationReply?.nextOffset,
+  );
 }
diff --git a/lib/pages/match_info/view.dart b/lib/pages/match_info/view.dart
index bb3b63b35..d2dd06a5f 100644
--- a/lib/pages/match_info/view.dart
+++ b/lib/pages/match_info/view.dart
@@ -29,8 +29,10 @@ class MatchInfoPage extends StatefulWidget {
 }
 
 class _MatchInfoPageState extends State<MatchInfoPage> {
-  final _controller =
-      Get.put(MatchInfoController(), tag: Utils.generateRandomString(8));
+  final _controller = Get.put(
+    MatchInfoController(),
+    tag: Utils.generateRandomString(8),
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -48,10 +50,12 @@ class _MatchInfoPageState extends State<MatchInfoPage> {
               Obx(() => _buildInfo(theme, _controller.infoState.value)),
               SliverPadding(
                 padding: EdgeInsets.only(
-                    bottom: MediaQuery.paddingOf(context).bottom + 80),
+                  bottom: MediaQuery.paddingOf(context).bottom + 80,
+                ),
                 sliver: Obx(
-                    () => _buildReply(theme, _controller.loadingState.value)),
-              )
+                  () => _buildReply(theme, _controller.loadingState.value),
+                ),
+              ),
             ],
           ),
         ),
@@ -88,7 +92,7 @@ class _MatchInfoPageState extends State<MatchInfoPage> {
                   src: 'https://i1.hdslb.com${team.logo}',
                   type: ImageType.emote,
                 ),
-                Text(team.title!)
+                Text(team.title!),
               ],
             );
           }
@@ -102,7 +106,8 @@ class _MatchInfoPageState extends State<MatchInfoPage> {
                 children: [
                   Center(
                     child: Text(
-                        '${data.season?.title ?? ''}  ${data.gameStage ?? ''}'),
+                      '${data.season?.title ?? ''}  ${data.gameStage ?? ''}',
+                    ),
                   ),
                   Row(
                     spacing: 20,
@@ -140,30 +145,38 @@ class _MatchInfoPageState extends State<MatchInfoPage> {
                           if (data.contestStatus == 2)
                             FilledButton.tonal(
                               style: FilledButton.styleFrom(
-                                padding:
-                                    const EdgeInsets.symmetric(horizontal: 12),
+                                padding: const EdgeInsets.symmetric(
+                                  horizontal: 12,
+                                ),
                                 shape: const RoundedRectangleBorder(
-                                    borderRadius:
-                                        BorderRadius.all(Radius.circular(6))),
+                                  borderRadius: BorderRadius.all(
+                                    Radius.circular(6),
+                                  ),
+                                ),
                                 visualDensity: VisualDensity.compact,
                                 tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                               ),
                               onPressed: () => Get.toNamed(
-                                  '/liveRoom?roomid=${data.liveRoom}'),
+                                '/liveRoom?roomid=${data.liveRoom}',
+                              ),
                               child: const Text('看直播'),
                             )
                           else if (data.contestStatus == 3)
                             Text(
                               '${DateUtil.dateFormat(data.stime)}${data.contestStatus == 3 ? ' 已结束' : ''}',
-                              style:
-                                  TextStyle(color: theme.colorScheme.outline),
+                              style: TextStyle(
+                                color: theme.colorScheme.outline,
+                              ),
                             )
                           else if (data.contestStatus == 1)
                             Text(
-                              DateUtil.format(data.stime,
-                                  format: DateFormat('yy-MM-dd HH:mm')),
-                              style:
-                                  TextStyle(color: theme.colorScheme.outline),
+                              DateUtil.format(
+                                data.stime,
+                                format: DateFormat('yy-MM-dd HH:mm'),
+                              ),
+                              style: TextStyle(
+                                color: theme.colorScheme.outline,
+                              ),
                             ),
                         ],
                       ),
@@ -175,7 +188,7 @@ class _MatchInfoPageState extends State<MatchInfoPage> {
                           ),
                         ),
                     ],
-                  )
+                  ),
                 ],
               ),
             ),
@@ -189,52 +202,55 @@ class _MatchInfoPageState extends State<MatchInfoPage> {
   }
 
   Widget _buildReply(
-      ThemeData theme, LoadingState<List<ReplyInfo>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<ReplyInfo>?> loadingState,
+  ) {
     return switch (loadingState) {
       Loading() => SliverList.builder(
-          itemBuilder: (context, index) => const VideoReplySkeleton(),
-          itemCount: 8,
-        ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverMainAxisGroup(
-              slivers: [
-                _buildHeader(theme),
-                SliverList.builder(
-                  itemCount: response!.length,
-                  itemBuilder: (context, index) {
-                    if (index == response.length - 1) {
-                      _controller.onLoadMore();
-                    }
-                    return ReplyItemGrpc(
-                      replyItem: response[index],
-                      replyLevel: 1,
-                      replyReply: (replyItem, id) =>
-                          replyReply(context, replyItem, id),
-                      onReply: (replyItem) => _controller.onReply(
-                        context,
-                        replyItem: replyItem,
-                      ),
-                      onDelete: (item, subIndex) =>
-                          _controller.onRemove(index, item, subIndex),
-                      upMid: _controller.upMid,
-                      onCheckReply: (item) =>
-                          _controller.onCheckReply(item, isManual: true),
-                      onToggleTop: (item) => _controller.onToggleTop(
-                        item,
-                        index,
-                        _controller.cid,
-                        _controller.replyType,
-                      ),
-                    );
-                  },
-                )
-              ],
-            )
-          : HttpError(onReload: _controller.onReload),
+        itemBuilder: (context, index) => const VideoReplySkeleton(),
+        itemCount: 8,
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverMainAxisGroup(
+                slivers: [
+                  _buildHeader(theme),
+                  SliverList.builder(
+                    itemCount: response!.length,
+                    itemBuilder: (context, index) {
+                      if (index == response.length - 1) {
+                        _controller.onLoadMore();
+                      }
+                      return ReplyItemGrpc(
+                        replyItem: response[index],
+                        replyLevel: 1,
+                        replyReply: (replyItem, id) =>
+                            replyReply(context, replyItem, id),
+                        onReply: (replyItem) => _controller.onReply(
+                          context,
+                          replyItem: replyItem,
+                        ),
+                        onDelete: (item, subIndex) =>
+                            _controller.onRemove(index, item, subIndex),
+                        upMid: _controller.upMid,
+                        onCheckReply: (item) =>
+                            _controller.onCheckReply(item, isManual: true),
+                        onToggleTop: (item) => _controller.onToggleTop(
+                          item,
+                          index,
+                          _controller.cid,
+                          _controller.replyType,
+                        ),
+                      );
+                    },
+                  ),
+                ],
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
@@ -279,8 +295,11 @@ class _MatchInfoPageState extends State<MatchInfoPage> {
                     duration: const Duration(milliseconds: 400),
                     transitionBuilder:
                         (Widget child, Animation<double> animation) {
-                      return ScaleTransition(scale: animation, child: child);
-                    },
+                          return ScaleTransition(
+                            scale: animation,
+                            child: child,
+                          );
+                        },
                     child: Text(
                       '${count == -1 ? 0 : NumUtil.numFormat(count)}条回复',
                       key: ValueKey<int>(count),
@@ -298,15 +317,17 @@ class _MatchInfoPageState extends State<MatchInfoPage> {
                     size: 16,
                     color: theme.colorScheme.secondary,
                   ),
-                  label: Obx(() => Text(
-                        _controller.sortType.value.label,
-                        style: TextStyle(
-                          fontSize: 13,
-                          color: theme.colorScheme.secondary,
-                        ),
-                      )),
+                  label: Obx(
+                    () => Text(
+                      _controller.sortType.value.label,
+                      style: TextStyle(
+                        fontSize: 13,
+                        color: theme.colorScheme.secondary,
+                      ),
+                    ),
+                  ),
                 ),
-              )
+              ),
             ],
           ),
         ),
diff --git a/lib/pages/media/controller.dart b/lib/pages/media/controller.dart
index 9d5950c22..596d6bbca 100644
--- a/lib/pages/media/controller.dart
+++ b/lib/pages/media/controller.dart
@@ -28,11 +28,11 @@ class MediaController
       icon: Icons.create_outlined,
       title: '创作中心',
       onTap: () => Get.toNamed(
-            '/webview',
-            parameters: {
-              'url': 'https://member.bilibili.com/platform/home',
-            },
-          ),
+        '/webview',
+        parameters: {
+          'url': 'https://member.bilibili.com/platform/home',
+        },
+      ),
     ),
   ];
   RxInt count = (-1).obs;
diff --git a/lib/pages/media/view.dart b/lib/pages/media/view.dart
index 0ad6fe519..c402452d3 100644
--- a/lib/pages/media/view.dart
+++ b/lib/pages/media/view.dart
@@ -82,8 +82,11 @@ class _MediaPageState extends CommonPageState<MediaPage, MediaController>
                     color: primary,
                   ),
                 ),
-                contentPadding:
-                    const EdgeInsets.only(left: 15, top: 2, bottom: 2),
+                contentPadding: const EdgeInsets.only(
+                  left: 15,
+                  top: 2,
+                  bottom: 2,
+                ),
                 minLeadingWidth: 0,
                 title: Text(
                   item.title,
@@ -94,7 +97,7 @@ class _MediaPageState extends CommonPageState<MediaPage, MediaController>
               () => controller.loadingState.value is Loading
                   ? const SizedBox.shrink()
                   : favFolder(theme),
-            )
+            ),
           ],
         ),
       ),
@@ -127,8 +130,9 @@ class _MediaPageState extends CommonPageState<MediaPage, MediaController>
                       TextSpan(
                         text: '我的收藏  ',
                         style: TextStyle(
-                            fontSize: theme.textTheme.titleMedium!.fontSize,
-                            fontWeight: FontWeight.bold),
+                          fontSize: theme.textTheme.titleMedium!.fontSize,
+                          fontWeight: FontWeight.bold,
+                        ),
                       ),
                       if (count != -1)
                         TextSpan(
@@ -171,69 +175,71 @@ class _MediaPageState extends CommonPageState<MediaPage, MediaController>
     return switch (loadingState) {
       Loading() => const SizedBox.shrink(),
       Success(:var response) => Builder(
-          builder: (context) {
-            List<FavFolderInfo>? favFolderList = response.list;
-            if (favFolderList.isNullOrEmpty) {
-              return const SizedBox.shrink();
-            }
-            bool flag = controller.count.value > favFolderList!.length;
-            return ListView.separated(
-              padding: const EdgeInsets.only(left: 20),
-              itemCount: response.list.length + (flag ? 1 : 0),
-              itemBuilder: (context, index) {
-                if (flag && index == favFolderList.length) {
-                  return Padding(
-                    padding: const EdgeInsets.only(right: 14, bottom: 35),
-                    child: Center(
-                      child: IconButton(
-                        tooltip: '查看更多',
-                        style: ButtonStyle(
-                          padding: WidgetStateProperty.all(EdgeInsets.zero),
-                          backgroundColor:
-                              WidgetStateProperty.resolveWith((states) {
-                            return theme.colorScheme.primaryContainer
-                                .withValues(alpha: 0.5);
-                          }),
-                        ),
-                        onPressed: () async {
-                          await Get.toNamed('/fav');
-                          Future.delayed(const Duration(milliseconds: 150), () {
-                            controller.onRefresh();
-                          });
-                        },
-                        icon: Icon(
-                          Icons.arrow_forward_ios,
-                          size: 18,
-                          color: theme.colorScheme.primary,
-                        ),
+        builder: (context) {
+          List<FavFolderInfo>? favFolderList = response.list;
+          if (favFolderList.isNullOrEmpty) {
+            return const SizedBox.shrink();
+          }
+          bool flag = controller.count.value > favFolderList!.length;
+          return ListView.separated(
+            padding: const EdgeInsets.only(left: 20),
+            itemCount: response.list.length + (flag ? 1 : 0),
+            itemBuilder: (context, index) {
+              if (flag && index == favFolderList.length) {
+                return Padding(
+                  padding: const EdgeInsets.only(right: 14, bottom: 35),
+                  child: Center(
+                    child: IconButton(
+                      tooltip: '查看更多',
+                      style: ButtonStyle(
+                        padding: WidgetStateProperty.all(EdgeInsets.zero),
+                        backgroundColor: WidgetStateProperty.resolveWith((
+                          states,
+                        ) {
+                          return theme.colorScheme.primaryContainer.withValues(
+                            alpha: 0.5,
+                          );
+                        }),
+                      ),
+                      onPressed: () async {
+                        await Get.toNamed('/fav');
+                        Future.delayed(const Duration(milliseconds: 150), () {
+                          controller.onRefresh();
+                        });
+                      },
+                      icon: Icon(
+                        Icons.arrow_forward_ios,
+                        size: 18,
+                        color: theme.colorScheme.primary,
                       ),
                     ),
-                  );
-                } else {
-                  return FavFolderItem(
-                    heroTag: Utils.generateRandomString(8),
-                    item: response.list[index],
-                    callback: () => Future.delayed(
-                      const Duration(milliseconds: 150),
-                      controller.onRefresh,
-                    ),
-                  );
-                }
-              },
-              scrollDirection: Axis.horizontal,
-              separatorBuilder: (context, index) => const SizedBox(width: 14),
-            );
-          },
-        ),
+                  ),
+                );
+              } else {
+                return FavFolderItem(
+                  heroTag: Utils.generateRandomString(8),
+                  item: response.list[index],
+                  callback: () => Future.delayed(
+                    const Duration(milliseconds: 150),
+                    controller.onRefresh,
+                  ),
+                );
+              }
+            },
+            scrollDirection: Axis.horizontal,
+            separatorBuilder: (context, index) => const SizedBox(width: 14),
+          );
+        },
+      ),
       Error(:var errMsg) => SizedBox(
-          height: 160,
-          child: Center(
-            child: Text(
-              errMsg ?? '',
-              textAlign: TextAlign.center,
-            ),
+        height: 160,
+        child: Center(
+          child: Text(
+            errMsg ?? '',
+            textAlign: TextAlign.center,
           ),
         ),
+      ),
     };
   }
 }
diff --git a/lib/pages/media/widgets/item.dart b/lib/pages/media/widgets/item.dart
index 449f4b156..5436c23ba 100644
--- a/lib/pages/media/widgets/item.dart
+++ b/lib/pages/media/widgets/item.dart
@@ -45,8 +45,9 @@ class FavFolderItem extends StatelessWidget {
                 borderRadius: const BorderRadius.all(Radius.circular(12)),
                 boxShadow: [
                   BoxShadow(
-                    color: theme.colorScheme.onInverseSurface
-                        .withValues(alpha: 0.4),
+                    color: theme.colorScheme.onInverseSurface.withValues(
+                      alpha: 0.4,
+                    ),
                     offset: const Offset(4, -12),
                     blurRadius: 0.0,
                     spreadRadius: 0.0,
@@ -73,9 +74,10 @@ class FavFolderItem extends StatelessWidget {
             ),
             Text(
               ' 共${item.mediaCount}条视频 · ${FavUtil.isPublicFavText(item.attr)}',
-              style: theme.textTheme.labelSmall!
-                  .copyWith(color: theme.colorScheme.outline),
-            )
+              style: theme.textTheme.labelSmall!.copyWith(
+                color: theme.colorScheme.outline,
+              ),
+            ),
           ],
         ),
       ),
diff --git a/lib/pages/member/controller.dart b/lib/pages/member/controller.dart
index cac35ba30..b77935ed4 100644
--- a/lib/pages/member/controller.dart
+++ b/lib/pages/member/controller.dart
@@ -72,8 +72,8 @@ class MemberController extends CommonDataController<SpaceData, SpaceData?>
     } else {
       relation.value = data.card?.relation?.isFollow == 1
           ? data.relSpecial == 1
-              ? -10
-              : data.card?.relation?.status ?? 2
+                ? -10
+                : data.card?.relation?.status ?? 2
           : 0;
     }
     tab2 = data.tab2;
@@ -147,9 +147,9 @@ class MemberController extends CommonDataController<SpaceData, SpaceData?>
 
   @override
   Future<LoadingState<SpaceData>> customGetData() => MemberHttp.space(
-        mid: mid,
-        fromViewAid: fromViewAid,
-      );
+    mid: mid,
+    fromViewAid: fromViewAid,
+  );
 
   void blockUser(BuildContext context) {
     if (!accountService.isLogin.value) {
@@ -176,7 +176,7 @@ class MemberController extends CommonDataController<SpaceData, SpaceData?>
                 _onBlock();
               },
               child: const Text('确认'),
-            )
+            ),
           ],
         );
       },
diff --git a/lib/pages/member/view.dart b/lib/pages/member/view.dart
index 61dd4929f..5ace617da 100644
--- a/lib/pages/member/view.dart
+++ b/lib/pages/member/view.dart
@@ -68,7 +68,8 @@ class _MemberPageState extends State<MemberPage> {
         forceMaterialTransparency: true,
         title: IgnorePointer(
           child: Obx(
-            () => _userController.showUname.value &&
+            () =>
+                _userController.showUname.value &&
                     _userController.username != null
                 ? Text(_userController.username!)
                 : const SizedBox.shrink(),
@@ -78,7 +79,8 @@ class _MemberPageState extends State<MemberPage> {
           IconButton(
             tooltip: '搜索',
             onPressed: () => Get.toNamed(
-                '/memberSearch?mid=$_mid&uname=${_userController.username}'),
+              '/memberSearch?mid=$_mid&uname=${_userController.username}',
+            ),
             icon: const Icon(Icons.search_outlined),
           ),
           PopupMenuButton(
@@ -93,9 +95,11 @@ class _MemberPageState extends State<MemberPage> {
                     children: [
                       const Icon(Icons.block, size: 19),
                       const SizedBox(width: 10),
-                      Text(_userController.relation.value != 128
-                          ? '加入黑名单'
-                          : '移除黑名单'),
+                      Text(
+                        _userController.relation.value != 128
+                            ? '加入黑名单'
+                            : '移除黑名单',
+                      ),
                     ],
                   ),
                 ),
@@ -119,9 +123,11 @@ class _MemberPageState extends State<MemberPage> {
                   children: [
                     const Icon(Icons.share_outlined, size: 19),
                     const SizedBox(width: 10),
-                    Text(_userController.accountService.mid != _mid
-                        ? '分享UP主'
-                        : '分享我的主页'),
+                    Text(
+                      _userController.accountService.mid != _mid
+                          ? '分享UP主'
+                          : '分享我的主页',
+                    ),
                   ],
                 ),
               ),
@@ -144,7 +150,12 @@ class _MemberPageState extends State<MemberPage> {
               if (_userController.accountService.isLogin.value)
                 if (_userController.mid ==
                     _userController.accountService.mid) ...[
-                  if ((_userController.loadingState.value.dataOrNull?.card?.vip
+                  if ((_userController
+                              .loadingState
+                              .value
+                              .dataOrNull
+                              ?.card
+                              ?.vip
                               ?.status ??
                           0) >
                       0)
@@ -285,39 +296,39 @@ class _MemberPageState extends State<MemberPage> {
   }
 
   Widget _buildTab(ThemeData theme) => Material(
-        color: theme.colorScheme.surface,
-        child: TabBar(
-          controller: _userController.tabController,
-          tabs: _userController.tabs,
-          onTap: _userController.onTapTab,
-        ),
-      );
+    color: theme.colorScheme.surface,
+    child: TabBar(
+      controller: _userController.tabController,
+      tabs: _userController.tabs,
+      onTap: _userController.onTapTab,
+    ),
+  );
 
   Widget get _buildBody => tabBarView(
-        controller: _userController.tabController,
-        children: _userController.tab2!.map((item) {
-          return switch (item.param!) {
-            'home' => MemberHome(heroTag: _heroTag),
-            'dynamic' => MemberDynamicsPage(mid: _mid),
-            'contribute' => Obx(
-                () => MemberContribute(
-                  heroTag: _heroTag,
-                  initialIndex: _userController.contributeInitialIndex.value,
-                  mid: _mid,
-                ),
-              ),
-            'bangumi' => MemberBangumi(
-                heroTag: _heroTag,
-                mid: _mid,
-              ),
-            'favorite' => MemberFavorite(
-                heroTag: _heroTag,
-                mid: _mid,
-              ),
-            _ => Center(child: Text(item.title ?? '')),
-          };
-        }).toList(),
-      );
+    controller: _userController.tabController,
+    children: _userController.tab2!.map((item) {
+      return switch (item.param!) {
+        'home' => MemberHome(heroTag: _heroTag),
+        'dynamic' => MemberDynamicsPage(mid: _mid),
+        'contribute' => Obx(
+          () => MemberContribute(
+            heroTag: _heroTag,
+            initialIndex: _userController.contributeInitialIndex.value,
+            mid: _mid,
+          ),
+        ),
+        'bangumi' => MemberBangumi(
+          heroTag: _heroTag,
+          mid: _mid,
+        ),
+        'favorite' => MemberFavorite(
+          heroTag: _heroTag,
+          mid: _mid,
+        ),
+        _ => Center(child: Text(item.title ?? '')),
+      };
+    }).toList(),
+  );
 
   Widget _buildAppBar({bool isV = true}) {
     return DynamicSliverAppBar(
@@ -337,29 +348,30 @@ class _MemberPageState extends State<MemberPage> {
   Widget _buildUserInfo(LoadingState<SpaceData?> userState, [bool isV = true]) {
     return switch (userState) {
       Loading() => const CircularProgressIndicator(),
-      Success(:var response) => response != null
-          ? Obx(
-              () => UserInfoCard(
-                isV: isV,
-                isOwner:
-                    _userController.mid == _userController.accountService.mid,
-                relation: _userController.relation.value,
-                card: response.card!,
-                images: response.images!,
-                onFollow: () => _userController.onFollow(context),
-                live: _userController.live,
-                silence: _userController.silence,
+      Success(:var response) =>
+        response != null
+            ? Obx(
+                () => UserInfoCard(
+                  isV: isV,
+                  isOwner:
+                      _userController.mid == _userController.accountService.mid,
+                  relation: _userController.relation.value,
+                  card: response.card!,
+                  images: response.images!,
+                  onFollow: () => _userController.onFollow(context),
+                  live: _userController.live,
+                  silence: _userController.silence,
+                ),
+              )
+            : GestureDetector(
+                onTap: _userController.onReload,
+                behavior: HitTestBehavior.opaque,
+                child: const SizedBox(height: 56, width: double.infinity),
               ),
-            )
-          : GestureDetector(
-              onTap: _userController.onReload,
-              behavior: HitTestBehavior.opaque,
-              child: const SizedBox(height: 56, width: double.infinity),
-            ),
       Error(:var errMsg) => scrollErrorWidget(
-          errMsg: errMsg,
-          onReload: _userController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _userController.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/member/widget/user_info_card.dart b/lib/pages/member/widget/user_info_card.dart
index 2b1655f8e..d7469ac2b 100644
--- a/lib/pages/member/widget/user_info_card.dart
+++ b/lib/pages/member/widget/user_info_card.dart
@@ -73,12 +73,13 @@ class UserInfoCard extends StatelessWidget {
 
   Widget _buildHeader(BuildContext context, ThemeData theme) {
     bool darken = theme.brightness == Brightness.dark;
-    String imgUrl = (darken
-            ? images.nightImgurl?.isEmpty == true
-                ? images.imgUrl
-                : images.nightImgurl
-            : images.imgUrl)
-        .http2https;
+    String imgUrl =
+        (darken
+                ? images.nightImgurl?.isEmpty == true
+                      ? images.imgUrl
+                      : images.nightImgurl
+                : images.imgUrl)
+            .http2https;
     return Hero(
       tag: imgUrl,
       child: GestureDetector(
@@ -107,460 +108,476 @@ class UserInfoCard extends StatelessWidget {
   }
 
   List<Widget> _buildLeft(BuildContext context, ThemeData theme) => [
-        Padding(
-          padding: const EdgeInsets.only(left: 20, right: 20, top: 5),
-          child: Wrap(
-            spacing: 8,
-            runSpacing: 8,
-            crossAxisAlignment: WrapCrossAlignment.center,
+    Padding(
+      padding: const EdgeInsets.only(left: 20, right: 20, top: 5),
+      child: Wrap(
+        spacing: 8,
+        runSpacing: 8,
+        crossAxisAlignment: WrapCrossAlignment.center,
+        children: [
+          GestureDetector(
+            onTap: () => Utils.copyText(card.name!),
+            child: Text(
+              card.name!,
+              strutStyle: const StrutStyle(
+                height: 1,
+                leading: 0,
+                fontSize: 17,
+                fontWeight: FontWeight.bold,
+              ),
+              style: TextStyle(
+                height: 1,
+                fontSize: 17,
+                fontWeight: FontWeight.bold,
+                color: (card.vip?.status ?? -1) > 0 && card.vip?.type == 2
+                    ? context.vipColor
+                    : null,
+              ),
+            ),
+          ),
+          Image.asset(
+            'assets/images/lv/lv${card.levelInfo?.identity == 2 ? '6_s' : card.levelInfo?.currentLevel}.png',
+            height: 11,
+            semanticLabel: '等级${card.levelInfo?.currentLevel}',
+          ),
+          if (card.vip?.status == 1)
+            Container(
+              padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
+              decoration: BoxDecoration(
+                borderRadius: StyleString.mdRadius,
+                color: context.vipColor,
+              ),
+              child: Text(
+                card.vip?.label?.text ?? '大会员',
+                strutStyle: const StrutStyle(
+                  height: 1,
+                  fontSize: 10,
+                  fontWeight: FontWeight.bold,
+                ),
+                style: const TextStyle(
+                  height: 1,
+                  fontWeight: FontWeight.bold,
+                  fontSize: 10,
+                  color: Colors.white,
+                ),
+              ),
+            ),
+          if (card.nameplate?.imageSmall?.isNotEmpty == true)
+            CachedNetworkImage(
+              imageUrl: ImageUtil.thumbnailUrl(card.nameplate!.imageSmall!),
+              height: 20,
+              placeholder: (context, url) {
+                return const SizedBox.shrink();
+              },
+            ),
+        ],
+      ),
+    ),
+    if (card.officialVerify?.desc?.isNotEmpty == true)
+      Container(
+        margin: const EdgeInsets.only(left: 20, top: 8, right: 20),
+        padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 2),
+        decoration: BoxDecoration(
+          borderRadius: const BorderRadius.all(Radius.circular(12)),
+          color: theme.colorScheme.onInverseSurface,
+        ),
+        child: Text.rich(
+          TextSpan(
             children: [
-              GestureDetector(
-                onTap: () => Utils.copyText(card.name!),
-                child: Text(
-                  card.name!,
-                  strutStyle: const StrutStyle(
-                    height: 1,
-                    leading: 0,
-                    fontSize: 17,
-                    fontWeight: FontWeight.bold,
-                  ),
-                  style: TextStyle(
-                    height: 1,
-                    fontSize: 17,
-                    fontWeight: FontWeight.bold,
-                    color: (card.vip?.status ?? -1) > 0 && card.vip?.type == 2
-                        ? context.vipColor
-                        : null,
-                  ),
-                ),
-              ),
-              Image.asset(
-                'assets/images/lv/lv${card.levelInfo?.identity == 2 ? '6_s' : card.levelInfo?.currentLevel}.png',
-                height: 11,
-                semanticLabel: '等级${card.levelInfo?.currentLevel}',
-              ),
-              if (card.vip?.status == 1)
-                Container(
-                  padding:
-                      const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
-                  decoration: BoxDecoration(
-                    borderRadius: StyleString.mdRadius,
-                    color: context.vipColor,
-                  ),
-                  child: Text(
-                    card.vip?.label?.text ?? '大会员',
-                    strutStyle: const StrutStyle(
-                      height: 1,
-                      fontSize: 10,
-                      fontWeight: FontWeight.bold,
+              if (card.officialVerify?.icon?.isNotEmpty == true) ...[
+                WidgetSpan(
+                  alignment: PlaceholderAlignment.middle,
+                  child: DecoratedBox(
+                    decoration: BoxDecoration(
+                      shape: BoxShape.circle,
+                      color: theme.colorScheme.surface,
                     ),
-                    style: const TextStyle(
-                      height: 1,
-                      fontWeight: FontWeight.bold,
-                      fontSize: 10,
-                      color: Colors.white,
+                    child: Icon(
+                      Icons.offline_bolt,
+                      color: card.officialVerify?.type == 0
+                          ? const Color(0xFFFFCC00)
+                          : Colors.lightBlueAccent,
+                      size: 18,
                     ),
                   ),
                 ),
-              if (card.nameplate?.imageSmall?.isNotEmpty == true)
-                CachedNetworkImage(
-                  imageUrl: ImageUtil.thumbnailUrl(card.nameplate!.imageSmall!),
-                  height: 20,
-                  placeholder: (context, url) {
-                    return const SizedBox.shrink();
-                  },
+                const TextSpan(
+                  text: ' ',
                 ),
+              ],
+              TextSpan(
+                text: card.officialVerify!.spliceTitle!,
+                style: TextStyle(
+                  fontSize: 12,
+                  fontWeight: FontWeight.bold,
+                  color: theme.colorScheme.onSurface.withValues(alpha: 0.7),
+                ),
+              ),
             ],
           ),
         ),
-        if (card.officialVerify?.desc?.isNotEmpty == true)
-          Container(
-            margin: const EdgeInsets.only(left: 20, top: 8, right: 20),
-            padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 2),
-            decoration: BoxDecoration(
-              borderRadius: const BorderRadius.all(Radius.circular(12)),
-              color: theme.colorScheme.onInverseSurface,
+      ),
+    if (card.sign?.isNotEmpty == true)
+      Padding(
+        padding: const EdgeInsets.only(left: 20, top: 6, right: 20),
+        child: SelectableText(
+          card.sign!.trim().replaceAll(RegExp(r'\n{2,}'), '\n'),
+          style: const TextStyle(fontSize: 14),
+        ),
+      ),
+    Padding(
+      padding: const EdgeInsets.only(left: 20, top: 6, right: 20),
+      child: Wrap(
+        spacing: 8,
+        runSpacing: 8,
+        crossAxisAlignment: WrapCrossAlignment.end,
+        children: [
+          GestureDetector(
+            onTap: () => Utils.copyText(card.mid.toString()),
+            child: Text(
+              'UID: ${card.mid}',
+              style: TextStyle(
+                fontSize: 12,
+                color: theme.colorScheme.outline,
+              ),
             ),
+          ),
+          ...?card.spaceTag?.map(
+            (item) => Text(
+              item.title ?? '',
+              style: TextStyle(
+                fontSize: 12,
+                color: theme.colorScheme.outline,
+              ),
+            ),
+          ),
+        ],
+      ),
+    ),
+    if (silence == 1)
+      Builder(
+        builder: (context) {
+          bool isLight = theme.brightness == Brightness.light;
+          return Container(
+            width: double.infinity,
+            decoration: BoxDecoration(
+              borderRadius: const BorderRadius.all(Radius.circular(6)),
+              color: isLight
+                  ? theme.colorScheme.errorContainer
+                  : theme.colorScheme.error,
+            ),
+            margin: const EdgeInsets.only(left: 20, top: 8, right: 20),
+            padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
             child: Text.rich(
               TextSpan(
                 children: [
-                  if (card.officialVerify?.icon?.isNotEmpty == true) ...[
-                    WidgetSpan(
-                      alignment: PlaceholderAlignment.middle,
-                      child: DecoratedBox(
-                        decoration: BoxDecoration(
-                          shape: BoxShape.circle,
-                          color: theme.colorScheme.surface,
-                        ),
-                        child: Icon(
-                          Icons.offline_bolt,
-                          color: card.officialVerify?.type == 0
-                              ? const Color(0xFFFFCC00)
-                              : Colors.lightBlueAccent,
-                          size: 18,
-                        ),
-                      ),
+                  WidgetSpan(
+                    alignment: PlaceholderAlignment.middle,
+                    child: Icon(
+                      Icons.info,
+                      size: 17,
+                      color: isLight
+                          ? theme.colorScheme.onErrorContainer
+                          : theme.colorScheme.onError,
                     ),
-                    const TextSpan(
-                      text: ' ',
-                    )
-                  ],
+                  ),
                   TextSpan(
-                    text: card.officialVerify!.spliceTitle!,
+                    text: ' 该账号封禁中',
                     style: TextStyle(
-                      fontSize: 12,
-                      fontWeight: FontWeight.bold,
-                      color: theme.colorScheme.onSurface.withValues(alpha: 0.7),
+                      color: isLight
+                          ? theme.colorScheme.onErrorContainer
+                          : theme.colorScheme.onError,
                     ),
-                  )
+                  ),
                 ],
               ),
             ),
-          ),
-        if (card.sign?.isNotEmpty == true)
-          Padding(
-            padding: const EdgeInsets.only(left: 20, top: 6, right: 20),
-            child: SelectableText(
-              card.sign!.trim().replaceAll(RegExp(r'\n{2,}'), '\n'),
-              style: const TextStyle(fontSize: 14),
+          );
+        },
+      ),
+  ];
+
+  Column _buildRight(BuildContext context, ThemeData theme) => Column(
+    mainAxisSize: MainAxisSize.min,
+    children: [
+      Row(
+        children: List.generate(
+          5,
+          (index) => index % 2 == 0
+              ? _countWidget(
+                  theme: theme,
+                  title: ['粉丝', '关注', '获赞'][index ~/ 2],
+                  count: index == 0
+                      ? card.fans
+                      : index == 2
+                      ? card.attention
+                      : card.likes?.likeNum,
+                  onTap: () {
+                    if (index == 0) {
+                      Get.toNamed('/fan?mid=${card.mid}&name=${card.name}');
+                    } else if (index == 2) {
+                      Get.toNamed('/follow?mid=${card.mid}&name=${card.name}');
+                    }
+                  },
+                )
+              : const Expanded(
+                  child: SizedBox(
+                    height: 15,
+                    width: 1,
+                    child: VerticalDivider(),
+                  ),
+                ),
+        ),
+      ),
+      const SizedBox(height: 5),
+      Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          if (!isOwner) ...[
+            IconButton.outlined(
+              onPressed: () {
+                if (Accounts.main.isLogin) {
+                  int mid = int.parse(card.mid!);
+                  Get.toNamed(
+                    '/whisperDetail',
+                    arguments: {
+                      'talkerId': mid,
+                      'name': card.name,
+                      'face': card.face,
+                      'mid': mid,
+                      'isLive': live?.liveStatus == 1,
+                    },
+                  );
+                }
+              },
+              icon: const Icon(Icons.mail_outline, size: 21),
+              style: IconButton.styleFrom(
+                side: BorderSide(
+                  width: 1.0,
+                  color: theme.colorScheme.outline.withValues(alpha: 0.3),
+                ),
+                padding: EdgeInsets.zero,
+                tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                visualDensity: VisualDensity.compact,
+              ),
+            ),
+            const SizedBox(width: 10),
+          ],
+          Expanded(
+            child: FilledButton.tonal(
+              onPressed: onFollow,
+              style: FilledButton.styleFrom(
+                backgroundColor: relation != 0
+                    ? theme.colorScheme.onInverseSurface
+                    : null,
+                visualDensity: const VisualDensity(vertical: -1.8),
+              ),
+              child: Text.rich(
+                style: TextStyle(
+                  color: relation != 0 ? theme.colorScheme.outline : null,
+                ),
+                TextSpan(
+                  children: [
+                    if (relation != 0 && relation != 128) ...[
+                      WidgetSpan(
+                        alignment: PlaceholderAlignment.top,
+                        child: Icon(
+                          Icons.sort,
+                          size: 16,
+                          color: theme.colorScheme.outline,
+                        ),
+                      ),
+                      const TextSpan(text: ' '),
+                    ],
+                    TextSpan(
+                      text: isOwner
+                          ? '编辑资料'
+                          : switch (relation) {
+                              0 => '关注',
+                              1 => '悄悄关注',
+                              2 => '已关注',
+                              // 3 => '回关',
+                              4 || 6 => '已互关',
+                              128 => '移除黑名单',
+                              -10 => '特别关注', // 该状态码并不是官方状态码
+                              _ => relation.toString(),
+                            },
+                    ),
+                  ],
+                ),
+              ),
             ),
           ),
-        Padding(
-          padding: const EdgeInsets.only(left: 20, top: 6, right: 20),
-          child: Wrap(
-            spacing: 8,
-            runSpacing: 8,
-            crossAxisAlignment: WrapCrossAlignment.end,
+        ],
+      ),
+    ],
+  );
+
+  Hero _buildAvatar(BuildContext context) => Hero(
+    tag: card.face ?? '',
+    child: PendantAvatar(
+      avatar: card.face,
+      size: 80,
+      badgeSize: 22,
+      officialType: card.officialVerify?.type,
+      isVip: (card.vip?.status ?? -1) > 0,
+      garbPendantImage: card.pendant!.image!,
+      roomId: live?.liveStatus == 1 ? live!.roomid : null,
+      onTap: () =>
+          context.imageView(imgList: [SourceModel(url: card.face.http2https)]),
+    ),
+  );
+
+  Column _buildV(BuildContext context, ThemeData theme) => Column(
+    mainAxisSize: MainAxisSize.min,
+    crossAxisAlignment: CrossAxisAlignment.start,
+    children: [
+      Stack(
+        clipBehavior: Clip.none,
+        children: [
+          Column(
+            mainAxisSize: MainAxisSize.min,
             children: [
-              GestureDetector(
-                onTap: () => Utils.copyText(card.mid.toString()),
+              _buildHeader(context, theme),
+              SizedBox(
+                width: double.infinity,
+                height: MediaQuery.textScalerOf(context).scale(30) + 60,
+              ),
+            ],
+          ),
+          Positioned(
+            top: 110,
+            left: 20,
+            child: _buildAvatar(context),
+          ),
+          Positioned(
+            left: 160,
+            top: 140,
+            right: 15,
+            bottom: 0,
+            child: _buildRight(context, theme),
+          ),
+        ],
+      ),
+      ..._buildLeft(context, theme),
+      if (card.prInfo?.content?.isNotEmpty == true) buildPrInfo(theme),
+      const SizedBox(height: 5),
+    ],
+  );
+
+  Widget buildPrInfo(ThemeData theme) => Builder(
+    builder: (context) {
+      final isDark = theme.brightness == Brightness.dark;
+      final textColor = isDark
+          ? Color(
+              int.parse(
+                'FF${card.prInfo?.textColorNight.substring(1)}',
+                radix: 16,
+              ),
+            )
+          : Color(
+              int.parse('FF${card.prInfo?.textColor.substring(1)}', radix: 16),
+            );
+      return GestureDetector(
+        onTap: () {
+          if (card.prInfo?.url?.isNotEmpty == true) {
+            PageUtils.handleWebview(card.prInfo!.url!);
+          }
+        },
+        child: Container(
+          margin: const EdgeInsets.only(top: 8),
+          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
+          color: isDark
+              ? Color(
+                  int.parse(
+                    'FF${card.prInfo?.bgColorNight.substring(1)}',
+                    radix: 16,
+                  ),
+                )
+              : Color(
+                  int.parse(
+                    'FF${card.prInfo?.bgColor.substring(1)}',
+                    radix: 16,
+                  ),
+                ),
+          child: Row(
+            children: [
+              if (isDark && card.prInfo?.iconNight?.isNotEmpty == true) ...[
+                CachedNetworkImage(
+                  imageUrl: ImageUtil.thumbnailUrl(card.prInfo!.iconNight!),
+                  height: 20,
+                ),
+                const SizedBox(width: 16),
+              ] else if (card.prInfo?.icon?.isNotEmpty == true) ...[
+                CachedNetworkImage(
+                  imageUrl: ImageUtil.thumbnailUrl(card.prInfo!.icon!),
+                  height: 20,
+                ),
+                const SizedBox(width: 16),
+              ],
+              Expanded(
                 child: Text(
-                  'UID: ${card.mid}',
-                  style: TextStyle(
-                    fontSize: 12,
-                    color: theme.colorScheme.outline,
-                  ),
+                  card.prInfo!.content!,
+                  style: TextStyle(fontSize: 13, color: textColor),
                 ),
               ),
-              ...?card.spaceTag?.map(
-                (item) => Text(
-                  item.title ?? '',
-                  style: TextStyle(
-                    fontSize: 12,
-                    color: theme.colorScheme.outline,
-                  ),
+              if (card.prInfo?.url?.isNotEmpty == true) ...[
+                const SizedBox(width: 10),
+                Icon(
+                  Icons.keyboard_arrow_right,
+                  color: textColor,
                 ),
-              ),
+              ],
             ],
           ),
         ),
-        if (silence == 1)
-          Builder(builder: (context) {
-            bool isLight = theme.brightness == Brightness.light;
-            return Container(
-              width: double.infinity,
-              decoration: BoxDecoration(
-                borderRadius: const BorderRadius.all(Radius.circular(6)),
-                color: isLight
-                    ? theme.colorScheme.errorContainer
-                    : theme.colorScheme.error,
-              ),
-              margin: const EdgeInsets.only(left: 20, top: 8, right: 20),
-              padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-              child: Text.rich(
-                TextSpan(
-                  children: [
-                    WidgetSpan(
-                      alignment: PlaceholderAlignment.middle,
-                      child: Icon(
-                        Icons.info,
-                        size: 17,
-                        color: isLight
-                            ? theme.colorScheme.onErrorContainer
-                            : theme.colorScheme.onError,
-                      ),
-                    ),
-                    TextSpan(
-                      text: ' 该账号封禁中',
-                      style: TextStyle(
-                        color: isLight
-                            ? theme.colorScheme.onErrorContainer
-                            : theme.colorScheme.onError,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            );
-          }),
-      ];
-
-  Column _buildRight(BuildContext context, ThemeData theme) => Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Row(
-            children: List.generate(
-              5,
-              (index) => index % 2 == 0
-                  ? _countWidget(
-                      theme: theme,
-                      title: ['粉丝', '关注', '获赞'][index ~/ 2],
-                      count: index == 0
-                          ? card.fans
-                          : index == 2
-                              ? card.attention
-                              : card.likes?.likeNum,
-                      onTap: () {
-                        if (index == 0) {
-                          Get.toNamed('/fan?mid=${card.mid}&name=${card.name}');
-                        } else if (index == 2) {
-                          Get.toNamed(
-                              '/follow?mid=${card.mid}&name=${card.name}');
-                        }
-                      },
-                    )
-                  : const Expanded(
-                      child: SizedBox(
-                        height: 15,
-                        width: 1,
-                        child: VerticalDivider(),
-                      ),
-                    ),
-            ),
-          ),
-          const SizedBox(height: 5),
-          Row(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              if (!isOwner) ...[
-                IconButton.outlined(
-                  onPressed: () {
-                    if (Accounts.main.isLogin) {
-                      int mid = int.parse(card.mid!);
-                      Get.toNamed(
-                        '/whisperDetail',
-                        arguments: {
-                          'talkerId': mid,
-                          'name': card.name,
-                          'face': card.face,
-                          'mid': mid,
-                          'isLive': live?.liveStatus == 1,
-                        },
-                      );
-                    }
-                  },
-                  icon: const Icon(Icons.mail_outline, size: 21),
-                  style: IconButton.styleFrom(
-                    side: BorderSide(
-                      width: 1.0,
-                      color: theme.colorScheme.outline.withValues(alpha: 0.3),
-                    ),
-                    padding: EdgeInsets.zero,
-                    tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                    visualDensity: VisualDensity.compact,
-                  ),
-                ),
-                const SizedBox(width: 10),
-              ],
-              Expanded(
-                child: FilledButton.tonal(
-                  onPressed: onFollow,
-                  style: FilledButton.styleFrom(
-                    backgroundColor: relation != 0
-                        ? theme.colorScheme.onInverseSurface
-                        : null,
-                    visualDensity: const VisualDensity(vertical: -1.8),
-                  ),
-                  child: Text.rich(
-                    style: TextStyle(
-                      color: relation != 0 ? theme.colorScheme.outline : null,
-                    ),
-                    TextSpan(
-                      children: [
-                        if (relation != 0 && relation != 128) ...[
-                          WidgetSpan(
-                            alignment: PlaceholderAlignment.top,
-                            child: Icon(
-                              Icons.sort,
-                              size: 16,
-                              color: theme.colorScheme.outline,
-                            ),
-                          ),
-                          const TextSpan(text: ' '),
-                        ],
-                        TextSpan(
-                          text: isOwner
-                              ? '编辑资料'
-                              : switch (relation) {
-                                  0 => '关注',
-                                  1 => '悄悄关注',
-                                  2 => '已关注',
-                                  // 3 => '回关',
-                                  4 || 6 => '已互关',
-                                  128 => '移除黑名单',
-                                  -10 => '特别关注', // 该状态码并不是官方状态码
-                                  _ => relation.toString(),
-                                },
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ],
       );
-
-  Hero _buildAvatar(BuildContext context) => Hero(
-      tag: card.face ?? '',
-      child: PendantAvatar(
-        avatar: card.face,
-        size: 80,
-        badgeSize: 22,
-        officialType: card.officialVerify?.type,
-        isVip: (card.vip?.status ?? -1) > 0,
-        garbPendantImage: card.pendant!.image!,
-        roomId: live?.liveStatus == 1 ? live!.roomid : null,
-        onTap: () => context
-            .imageView(imgList: [SourceModel(url: card.face.http2https)]),
-      ));
-
-  Column _buildV(BuildContext context, ThemeData theme) => Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Stack(
-            clipBehavior: Clip.none,
-            children: [
-              Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  _buildHeader(context, theme),
-                  SizedBox(
-                    width: double.infinity,
-                    height: MediaQuery.textScalerOf(context).scale(30) + 60,
-                  )
-                ],
-              ),
-              Positioned(
-                top: 110,
-                left: 20,
-                child: _buildAvatar(context),
-              ),
-              Positioned(
-                left: 160,
-                top: 140,
-                right: 15,
-                bottom: 0,
-                child: _buildRight(context, theme),
-              ),
-            ],
-          ),
-          ..._buildLeft(context, theme),
-          if (card.prInfo?.content?.isNotEmpty == true) buildPrInfo(theme),
-          const SizedBox(height: 5),
-        ],
-      );
-
-  Widget buildPrInfo(ThemeData theme) => Builder(builder: (context) {
-        final isDark = theme.brightness == Brightness.dark;
-        final textColor = isDark
-            ? Color(int.parse('FF${card.prInfo?.textColorNight.substring(1)}',
-                radix: 16))
-            : Color(int.parse('FF${card.prInfo?.textColor.substring(1)}',
-                radix: 16));
-        return GestureDetector(
-          onTap: () {
-            if (card.prInfo?.url?.isNotEmpty == true) {
-              PageUtils.handleWebview(card.prInfo!.url!);
-            }
-          },
-          child: Container(
-            margin: const EdgeInsets.only(top: 8),
-            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
-            color: isDark
-                ? Color(int.parse('FF${card.prInfo?.bgColorNight.substring(1)}',
-                    radix: 16))
-                : Color(int.parse('FF${card.prInfo?.bgColor.substring(1)}',
-                    radix: 16)),
-            child: Row(
-              children: [
-                if (isDark && card.prInfo?.iconNight?.isNotEmpty == true) ...[
-                  CachedNetworkImage(
-                    imageUrl: ImageUtil.thumbnailUrl(card.prInfo!.iconNight!),
-                    height: 20,
-                  ),
-                  const SizedBox(width: 16),
-                ] else if (card.prInfo?.icon?.isNotEmpty == true) ...[
-                  CachedNetworkImage(
-                    imageUrl: ImageUtil.thumbnailUrl(card.prInfo!.icon!),
-                    height: 20,
-                  ),
-                  const SizedBox(width: 16),
-                ],
-                Expanded(
-                  child: Text(
-                    card.prInfo!.content!,
-                    style: TextStyle(fontSize: 13, color: textColor),
-                  ),
-                ),
-                if (card.prInfo?.url?.isNotEmpty == true) ...[
-                  const SizedBox(width: 10),
-                  Icon(
-                    Icons.keyboard_arrow_right,
-                    color: textColor,
-                  ),
-                ],
-              ],
-            ),
-          ),
-        );
-      });
+    },
+  );
 
   Column _buildH(BuildContext context, ThemeData theme) => Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          // _buildHeader(context),
-          SizedBox(
-            height: Get.mediaQuery.padding.top + 56,
-          ),
-          SafeArea(
-            top: false,
-            bottom: false,
-            child: Row(
-              children: [
-                const SizedBox(width: 20),
-                Padding(
-                  padding: EdgeInsets.only(
-                    top: 10,
-                    bottom: card.prInfo?.content?.isNotEmpty == true ? 0 : 10,
-                  ),
-                  child: _buildAvatar(context),
-                ),
-                const SizedBox(width: 10),
-                Expanded(
-                  flex: 5,
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      const SizedBox(height: 10),
-                      ..._buildLeft(context, theme),
-                      const SizedBox(height: 5),
-                    ],
-                  ),
-                ),
-                Expanded(
-                  flex: 3,
-                  child: _buildRight(context, theme),
-                ),
-                const SizedBox(width: 20),
-              ],
+    mainAxisSize: MainAxisSize.min,
+    crossAxisAlignment: CrossAxisAlignment.start,
+    children: [
+      // _buildHeader(context),
+      SizedBox(
+        height: Get.mediaQuery.padding.top + 56,
+      ),
+      SafeArea(
+        top: false,
+        bottom: false,
+        child: Row(
+          children: [
+            const SizedBox(width: 20),
+            Padding(
+              padding: EdgeInsets.only(
+                top: 10,
+                bottom: card.prInfo?.content?.isNotEmpty == true ? 0 : 10,
+              ),
+              child: _buildAvatar(context),
             ),
-          ),
-          if (card.prInfo?.content?.isNotEmpty == true) buildPrInfo(theme),
-        ],
-      );
+            const SizedBox(width: 10),
+            Expanded(
+              flex: 5,
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  const SizedBox(height: 10),
+                  ..._buildLeft(context, theme),
+                  const SizedBox(height: 5),
+                ],
+              ),
+            ),
+            Expanded(
+              flex: 3,
+              child: _buildRight(context, theme),
+            ),
+            const SizedBox(width: 20),
+          ],
+        ),
+      ),
+      if (card.prInfo?.content?.isNotEmpty == true) buildPrInfo(theme),
+    ],
+  );
 }
diff --git a/lib/pages/member_article/view.dart b/lib/pages/member_article/view.dart
index 923833720..fe937c0f0 100644
--- a/lib/pages/member_article/view.dart
+++ b/lib/pages/member_article/view.dart
@@ -42,11 +42,12 @@ class _MemberArticleState extends State<MemberArticle>
         physics: const AlwaysScrollableScrollPhysics(),
         slivers: [
           SliverPadding(
-              padding: EdgeInsets.only(
-                top: 7,
-                bottom: MediaQuery.paddingOf(context).bottom + 80,
-              ),
-              sliver: Obx(() => _buildBody(_controller.loadingState.value)))
+            padding: EdgeInsets.only(
+              top: 7,
+              bottom: MediaQuery.paddingOf(context).bottom + 80,
+            ),
+            sliver: Obx(() => _buildBody(_controller.loadingState.value)),
+          ),
         ],
       ),
     );
@@ -55,36 +56,37 @@ class _MemberArticleState extends State<MemberArticle>
   Widget _buildBody(LoadingState<List<SpaceArticleItem>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: Grid.videoCardHDelegate(context),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) {
-              return const VideoCardHSkeleton();
-            },
-            childCount: 10,
-          ),
+        gridDelegate: Grid.videoCardHDelegate(context),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            return const VideoCardHSkeleton();
+          },
+          childCount: 10,
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  if (index == response.length - 1) {
-                    _controller.onLoadMore();
-                  }
-                  return MemberArticleItem(
-                    item: response[index],
-                  );
-                },
-                childCount: response!.length,
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    if (index == response.length - 1) {
+                      _controller.onLoadMore();
+                    }
+                    return MemberArticleItem(
+                      item: response[index],
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(
+                onReload: _controller.onReload,
               ),
-            )
-          : HttpError(
-              onReload: _controller.onReload,
-            ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/member_article/widget/item.dart b/lib/pages/member_article/widget/item.dart
index 3ce539cb3..64191242f 100644
--- a/lib/pages/member_article/widget/item.dart
+++ b/lib/pages/member_article/widget/item.dart
@@ -42,12 +42,12 @@ class MemberArticleItem extends StatelessWidget {
                   child: LayoutBuilder(
                     builder:
                         (BuildContext context, BoxConstraints boxConstraints) {
-                      return NetworkImgLayer(
-                        src: item.originImageUrls!.first,
-                        width: boxConstraints.maxWidth,
-                        height: boxConstraints.maxHeight,
-                      );
-                    },
+                          return NetworkImgLayer(
+                            src: item.originImageUrls!.first,
+                            width: boxConstraints.maxWidth,
+                            height: boxConstraints.maxHeight,
+                          );
+                        },
                   ),
                 ),
                 const SizedBox(width: 10),
diff --git a/lib/pages/member_audio/controller.dart b/lib/pages/member_audio/controller.dart
index 3e0a0c34d..affdb6602 100644
--- a/lib/pages/member_audio/controller.dart
+++ b/lib/pages/member_audio/controller.dart
@@ -32,7 +32,7 @@ class MemberAudioController
 
   @override
   Future<LoadingState<SpaceAudioData>> customGetData() => MemberHttp.spaceAudio(
-        page: page,
-        mid: mid,
-      );
+    page: page,
+    mid: mid,
+  );
 }
diff --git a/lib/pages/member_audio/view.dart b/lib/pages/member_audio/view.dart
index 7d926bfab..243ff754c 100644
--- a/lib/pages/member_audio/view.dart
+++ b/lib/pages/member_audio/view.dart
@@ -26,8 +26,10 @@ class MemberAudio extends StatefulWidget {
 
 class _MemberAudioState extends State<MemberAudio>
     with AutomaticKeepAliveClientMixin {
-  late final _controller =
-      Get.put(MemberAudioController(widget.mid), tag: widget.heroTag);
+  late final _controller = Get.put(
+    MemberAudioController(widget.mid),
+    tag: widget.heroTag,
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -54,31 +56,32 @@ class _MemberAudioState extends State<MemberAudio>
   Widget _buildBody(LoadingState<List<SpaceAudioItem>?> loadingState) {
     return switch (loadingState) {
       Loading() => linearLoading,
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                mainAxisSpacing: 2,
-                maxCrossAxisExtent: Grid.smallCardWidth * 2,
-                childAspectRatio: StyleString.aspectRatio * 2.6,
-                minHeight: MediaQuery.textScalerOf(context).scale(90),
-              ),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  if (index == response.length - 1) {
-                    _controller.onLoadMore();
-                  }
-                  return MemberAudioItem(
-                    item: response[index],
-                  );
-                },
-                childCount: response!.length,
-              ),
-            )
-          : HttpError(onReload: _controller.onReload),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                  mainAxisSpacing: 2,
+                  maxCrossAxisExtent: Grid.smallCardWidth * 2,
+                  childAspectRatio: StyleString.aspectRatio * 2.6,
+                  minHeight: MediaQuery.textScalerOf(context).scale(90),
+                ),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    if (index == response.length - 1) {
+                      _controller.onLoadMore();
+                    }
+                    return MemberAudioItem(
+                      item: response[index],
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/member_audio/widgets/item.dart b/lib/pages/member_audio/widgets/item.dart
index 4ceb793c8..0ad2ff7ad 100644
--- a/lib/pages/member_audio/widgets/item.dart
+++ b/lib/pages/member_audio/widgets/item.dart
@@ -36,13 +36,13 @@ class MemberAudioItem extends StatelessWidget {
                 child: LayoutBuilder(
                   builder:
                       (BuildContext context, BoxConstraints boxConstraints) {
-                    return NetworkImgLayer(
-                      radius: 4,
-                      src: item.cover,
-                      width: boxConstraints.maxWidth,
-                      height: boxConstraints.maxHeight,
-                    );
-                  },
+                        return NetworkImgLayer(
+                          radius: 4,
+                          src: item.cover,
+                          width: boxConstraints.maxWidth,
+                          height: boxConstraints.maxHeight,
+                        );
+                      },
                 ),
               ),
               const SizedBox(width: 10),
@@ -76,7 +76,7 @@ class MemberAudioItem extends StatelessWidget {
                           value: item.statistic?.comment,
                         ),
                       ],
-                    )
+                    ),
                   ],
                 ),
               ),
diff --git a/lib/pages/member_coin_arc/view.dart b/lib/pages/member_coin_arc/view.dart
index 6be7813ed..10568a73b 100644
--- a/lib/pages/member_coin_arc/view.dart
+++ b/lib/pages/member_coin_arc/view.dart
@@ -39,7 +39,8 @@ class _MemberCoinArcPageState extends State<MemberCoinArcPage> {
     return Scaffold(
       appBar: AppBar(
         title: Text(
-            '${widget.mid == accountService.mid ? '我' : '${widget.name}'}的最近投币'),
+          '${widget.mid == accountService.mid ? '我' : '${widget.name}'}的最近投币',
+        ),
       ),
       body: SafeArea(
         top: false,
@@ -68,40 +69,41 @@ class _MemberCoinArcPageState extends State<MemberCoinArcPage> {
   Widget _buildBody(LoadingState<List<CoinLikeArcItem>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid.builder(
-          gridDelegate: SliverGridDelegateWithExtentAndRatio(
-            mainAxisSpacing: StyleString.cardSpace,
-            crossAxisSpacing: StyleString.cardSpace,
-            maxCrossAxisExtent: Grid.smallCardWidth,
-            childAspectRatio: StyleString.aspectRatio,
-            mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
-          ),
-          itemCount: 16,
-          itemBuilder: (context, index) {
-            return const VideoCardVSkeleton();
-          },
+        gridDelegate: SliverGridDelegateWithExtentAndRatio(
+          mainAxisSpacing: StyleString.cardSpace,
+          crossAxisSpacing: StyleString.cardSpace,
+          maxCrossAxisExtent: Grid.smallCardWidth,
+          childAspectRatio: StyleString.aspectRatio,
+          mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid.builder(
-              gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                mainAxisSpacing: StyleString.cardSpace,
-                crossAxisSpacing: StyleString.cardSpace,
-                maxCrossAxisExtent: Grid.smallCardWidth,
-                childAspectRatio: StyleString.aspectRatio,
-                mainAxisExtent: MediaQuery.textScalerOf(context).scale(75),
-              ),
-              itemCount: response!.length,
-              itemBuilder: (context, index) {
-                if (index == response.length - 1) {
-                  _ctr.onLoadMore();
-                }
-                return MemberCoinLikeItem(item: response[index]);
-              },
-            )
-          : HttpError(onReload: _ctr.onReload),
+        itemCount: 16,
+        itemBuilder: (context, index) {
+          return const VideoCardVSkeleton();
+        },
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid.builder(
+                gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                  mainAxisSpacing: StyleString.cardSpace,
+                  crossAxisSpacing: StyleString.cardSpace,
+                  maxCrossAxisExtent: Grid.smallCardWidth,
+                  childAspectRatio: StyleString.aspectRatio,
+                  mainAxisExtent: MediaQuery.textScalerOf(context).scale(75),
+                ),
+                itemCount: response!.length,
+                itemBuilder: (context, index) {
+                  if (index == response.length - 1) {
+                    _ctr.onLoadMore();
+                  }
+                  return MemberCoinLikeItem(item: response[index]);
+                },
+              )
+            : HttpError(onReload: _ctr.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _ctr.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _ctr.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/member_coin_arc/widgets/item.dart b/lib/pages/member_coin_arc/widgets/item.dart
index 9c8a386ac..047081e66 100644
--- a/lib/pages/member_coin_arc/widgets/item.dart
+++ b/lib/pages/member_coin_arc/widgets/item.dart
@@ -43,7 +43,7 @@ class MemberCoinLikeItem extends StatelessWidget {
                 'bvid=${IdUtils.av2bv(int.parse(item.param!))}&cid=$cid',
                 arguments: {
                   'videoItem': item,
-                  'heroTag': Utils.makeHeroTag(item.param)
+                  'heroTag': Utils.makeHeroTag(item.param),
                 },
               );
             }
@@ -59,40 +59,42 @@ class MemberCoinLikeItem extends StatelessWidget {
           children: [
             AspectRatio(
               aspectRatio: StyleString.aspectRatio,
-              child: LayoutBuilder(builder: (context, boxConstraints) {
-                double maxWidth = boxConstraints.maxWidth;
-                double maxHeight = boxConstraints.maxHeight;
-                return Stack(
-                  clipBehavior: Clip.none,
-                  children: [
-                    NetworkImgLayer(
-                      src: item.cover,
-                      width: maxWidth,
-                      height: maxHeight,
-                      radius: 0,
-                    ),
-                    if (item.isCooperation == true)
-                      const PBadge(
-                        text: '合作',
-                        top: 6,
-                        right: 6,
-                      )
-                    else if (item.isSteins == true)
-                      const PBadge(
-                        text: '互动',
-                        top: 6,
-                        right: 6,
+              child: LayoutBuilder(
+                builder: (context, boxConstraints) {
+                  double maxWidth = boxConstraints.maxWidth;
+                  double maxHeight = boxConstraints.maxHeight;
+                  return Stack(
+                    clipBehavior: Clip.none,
+                    children: [
+                      NetworkImgLayer(
+                        src: item.cover,
+                        width: maxWidth,
+                        height: maxHeight,
+                        radius: 0,
                       ),
-                    if (item.duration != null && item.duration! > 0)
-                      PBadge(
-                        bottom: 6,
-                        right: 6,
-                        type: PBadgeType.gray,
-                        text: DurationUtil.formatDuration(item.duration),
-                      )
-                  ],
-                );
-              }),
+                      if (item.isCooperation == true)
+                        const PBadge(
+                          text: '合作',
+                          top: 6,
+                          right: 6,
+                        )
+                      else if (item.isSteins == true)
+                        const PBadge(
+                          text: '互动',
+                          top: 6,
+                          right: 6,
+                        ),
+                      if (item.duration != null && item.duration! > 0)
+                        PBadge(
+                          bottom: 6,
+                          right: 6,
+                          type: PBadgeType.gray,
+                          text: DurationUtil.formatDuration(item.duration),
+                        ),
+                    ],
+                  );
+                },
+              ),
             ),
             Padding(
               padding: const EdgeInsets.fromLTRB(5, 6, 0, 0),
@@ -129,7 +131,7 @@ class MemberCoinLikeItem extends StatelessWidget {
                           color: Theme.of(context).colorScheme.outline,
                         ),
                       ),
-                      const SizedBox(width: 6)
+                      const SizedBox(width: 6),
                     ],
                   ),
                 ],
diff --git a/lib/pages/member_comic/view.dart b/lib/pages/member_comic/view.dart
index b5303691c..7a3fe9062 100644
--- a/lib/pages/member_comic/view.dart
+++ b/lib/pages/member_comic/view.dart
@@ -25,8 +25,10 @@ class MemberComic extends StatefulWidget {
 
 class _MemberComicState extends State<MemberComic>
     with AutomaticKeepAliveClientMixin {
-  late final _controller =
-      Get.put(MemberComicController(widget.mid), tag: widget.heroTag);
+  late final _controller = Get.put(
+    MemberComicController(widget.mid),
+    tag: widget.heroTag,
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -50,24 +52,25 @@ class _MemberComicState extends State<MemberComic>
   Widget _buildBody(LoadingState<List<SpaceArchiveItem>?> loadingState) {
     return switch (loadingState) {
       Loading() => linearLoading,
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  if (index == response.length - 1) {
-                    _controller.onLoadMore();
-                  }
-                  return MemberComicItem(item: response[index]);
-                },
-                childCount: response!.length,
-              ),
-            )
-          : HttpError(onReload: _controller.onReload),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    if (index == response.length - 1) {
+                      _controller.onLoadMore();
+                    }
+                    return MemberComicItem(item: response[index]);
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/member_comic/widgets/item.dart b/lib/pages/member_comic/widgets/item.dart
index d38c856c5..1655d83da 100644
--- a/lib/pages/member_comic/widgets/item.dart
+++ b/lib/pages/member_comic/widgets/item.dart
@@ -24,7 +24,7 @@ class MemberComicItem extends StatelessWidget {
           Get.toNamed(
             '/webview',
             parameters: {
-              'url': 'https://manga.bilibili.com/detail/mc${item.param}'
+              'url': 'https://manga.bilibili.com/detail/mc${item.param}',
             },
           );
         },
@@ -43,13 +43,13 @@ class MemberComicItem extends StatelessWidget {
                 child: LayoutBuilder(
                   builder:
                       (BuildContext context, BoxConstraints boxConstraints) {
-                    return NetworkImgLayer(
-                      radius: 4,
-                      src: item.cover,
-                      width: boxConstraints.maxWidth,
-                      height: boxConstraints.maxHeight,
-                    );
-                  },
+                        return NetworkImgLayer(
+                          radius: 4,
+                          src: item.cover,
+                          width: boxConstraints.maxWidth,
+                          height: boxConstraints.maxHeight,
+                        );
+                      },
                 ),
               ),
               const SizedBox(width: 10),
diff --git a/lib/pages/member_contribute/controller.dart b/lib/pages/member_contribute/controller.dart
index 2625b182d..d1427f1c0 100644
--- a/lib/pages/member_contribute/controller.dart
+++ b/lib/pages/member_contribute/controller.dart
@@ -23,8 +23,9 @@ class MemberContributeCtr extends GetxController
   @override
   void onInit() {
     super.onInit();
-    SpaceTab2 contribute =
-        _ctr.tab2!.firstWhere((item) => item.param == 'contribute');
+    SpaceTab2 contribute = _ctr.tab2!.firstWhere(
+      (item) => item.param == 'contribute',
+    );
     if (contribute.items?.isNullOrEmpty == false) {
       items = contribute.items;
       if (contribute.items!.length > 1) {
diff --git a/lib/pages/member_contribute/view.dart b/lib/pages/member_contribute/view.dart
index 2320105b7..e3f05fdb2 100644
--- a/lib/pages/member_contribute/view.dart
+++ b/lib/pages/member_contribute/view.dart
@@ -58,16 +58,19 @@ class _MemberContributeState extends State<MemberContribute>
                   controller: _controller.tabController,
                   dividerHeight: 0,
                   indicatorWeight: 0,
-                  indicatorPadding:
-                      const EdgeInsets.symmetric(horizontal: 3, vertical: 8),
+                  indicatorPadding: const EdgeInsets.symmetric(
+                    horizontal: 3,
+                    vertical: 8,
+                  ),
                   indicator: BoxDecoration(
                     color: theme.colorScheme.secondaryContainer,
                     borderRadius: const BorderRadius.all(Radius.circular(20)),
                   ),
                   indicatorSize: TabBarIndicatorSize.tab,
-                  labelStyle: TabBarTheme.of(context)
-                          .labelStyle
-                          ?.copyWith(fontSize: 14) ??
+                  labelStyle:
+                      TabBarTheme.of(
+                        context,
+                      ).labelStyle?.copyWith(fontSize: 14) ??
                       const TextStyle(fontSize: 14),
                   labelColor: theme.colorScheme.onSecondaryContainer,
                   unselectedLabelColor: theme.colorScheme.outline,
@@ -83,61 +86,61 @@ class _MemberContributeState extends State<MemberContribute>
             ],
           )
         : _controller.items?.isNotEmpty == true
-            ? _getPageFromType(_controller.items!.first)
-            : const SizedBox.shrink();
+        ? _getPageFromType(_controller.items!.first)
+        : const SizedBox.shrink();
   }
 
   Widget _getPageFromType(SpaceTab2Item item) {
     return switch (item.param) {
       'video' => MemberVideo(
-          type: ContributeType.video,
-          heroTag: widget.heroTag,
-          mid: widget.mid,
-          title: item.title,
-          isSingle: _controller.tabs == null,
-        ),
+        type: ContributeType.video,
+        heroTag: widget.heroTag,
+        mid: widget.mid,
+        title: item.title,
+        isSingle: _controller.tabs == null,
+      ),
       'charging_video' => MemberVideo(
-          type: ContributeType.charging,
-          heroTag: widget.heroTag,
-          mid: widget.mid,
-          title: item.title,
-        ),
+        type: ContributeType.charging,
+        heroTag: widget.heroTag,
+        mid: widget.mid,
+        title: item.title,
+      ),
       'article' => MemberArticle(
-          heroTag: widget.heroTag,
-          mid: widget.mid,
-        ),
+        heroTag: widget.heroTag,
+        mid: widget.mid,
+      ),
       'opus' => MemberOpus(
-          isSingle: _controller.tabs == null,
-          heroTag: widget.heroTag,
-          mid: widget.mid,
-        ),
+        isSingle: _controller.tabs == null,
+        heroTag: widget.heroTag,
+        mid: widget.mid,
+      ),
       'audio' => MemberAudio(
-          heroTag: widget.heroTag,
-          mid: widget.mid,
-        ),
+        heroTag: widget.heroTag,
+        mid: widget.mid,
+      ),
       'comic' => MemberComic(
-          heroTag: widget.heroTag,
-          mid: widget.mid,
-        ),
+        heroTag: widget.heroTag,
+        mid: widget.mid,
+      ),
       'season_video' => MemberVideo(
-          type: ContributeType.season,
-          heroTag: widget.heroTag,
-          mid: widget.mid,
-          seasonId: item.seasonId,
-          title: item.title,
-        ),
+        type: ContributeType.season,
+        heroTag: widget.heroTag,
+        mid: widget.mid,
+        seasonId: item.seasonId,
+        title: item.title,
+      ),
       'series' => MemberVideo(
-          type: ContributeType.series,
-          heroTag: widget.heroTag,
-          mid: widget.mid,
-          seriesId: item.seriesId,
-          title: item.title,
-        ),
+        type: ContributeType.series,
+        heroTag: widget.heroTag,
+        mid: widget.mid,
+        seriesId: item.seriesId,
+        title: item.title,
+      ),
       'ugcSeason' => SeasonSeriesPage(
-          mid: widget.mid,
-          heroTag: widget.heroTag,
-        ),
-      _ => Center(child: Text(item.title!))
+        mid: widget.mid,
+        heroTag: widget.heroTag,
+      ),
+      _ => Center(child: Text(item.title!)),
     };
   }
 }
diff --git a/lib/pages/member_dynamics/view.dart b/lib/pages/member_dynamics/view.dart
index 2829bf090..303c259a8 100644
--- a/lib/pages/member_dynamics/view.dart
+++ b/lib/pages/member_dynamics/view.dart
@@ -35,8 +35,10 @@ class _MemberDynamicsPageState extends State<MemberDynamicsPage>
     super.initState();
     mid = widget.mid ?? int.parse(Get.parameters['mid']!);
     final String heroTag = Utils.makeHeroTag(mid);
-    _memberDynamicController =
-        Get.put(MemberDynamicsController(mid), tag: heroTag);
+    _memberDynamicController = Get.put(
+      MemberDynamicsController(mid),
+      tag: heroTag,
+    );
   }
 
   @override
@@ -51,74 +53,80 @@ class _MemberDynamicsPageState extends State<MemberDynamicsPage>
   }
 
   Widget get _buildBody => refreshIndicator(
-        onRefresh: _memberDynamicController.onRefresh,
-        child: CustomScrollView(
-          physics: const AlwaysScrollableScrollPhysics(),
-          slivers: [
-            SliverPadding(
-              padding: EdgeInsets.only(
-                bottom: MediaQuery.paddingOf(context).bottom + 80,
-              ),
-              sliver: Obx(() =>
-                  _buildContent(_memberDynamicController.loadingState.value)),
-            ),
-          ],
+    onRefresh: _memberDynamicController.onRefresh,
+    child: CustomScrollView(
+      physics: const AlwaysScrollableScrollPhysics(),
+      slivers: [
+        SliverPadding(
+          padding: EdgeInsets.only(
+            bottom: MediaQuery.paddingOf(context).bottom + 80,
+          ),
+          sliver: Obx(
+            () => _buildContent(_memberDynamicController.loadingState.value),
+          ),
         ),
-      );
+      ],
+    ),
+  );
 
   Widget _buildContent(LoadingState<List<DynamicItemModel>?> loadingState) {
     return switch (loadingState) {
-      Loading() =>
-        DynamicsTabPage.dynSkeleton(GlobalData().dynamicsWaterfallFlow),
-      Success(:var response) => response?.isNotEmpty == true
-          ? GlobalData().dynamicsWaterfallFlow
-              ? SliverWaterfallFlow.extent(
-                  maxCrossAxisExtent: Grid.smallCardWidth * 2,
-                  crossAxisSpacing: StyleString.safeSpace,
-                  lastChildLayoutTypeBuilder: (index) {
-                    if (index == response.length - 1) {
-                      _memberDynamicController.onLoadMore();
-                    }
-                    return index == response.length
-                        ? LastChildLayoutType.foot
-                        : LastChildLayoutType.none;
-                  },
-                  children: response!
-                      .map((item) => DynamicPanel(
-                          item: item,
-                          onRemove: _memberDynamicController.onRemove,
-                          onSetTop: _memberDynamicController.onSetTop))
-                      .toList(),
-                )
-              : SliverCrossAxisGroup(
-                  slivers: [
-                    const SliverFillRemaining(),
-                    SliverConstrainedCrossAxis(
-                      maxExtent: Grid.smallCardWidth * 2,
-                      sliver: SliverList.builder(
-                        itemBuilder: (context, index) {
-                          if (index == response.length - 1) {
-                            _memberDynamicController.onLoadMore();
-                          }
-                          return DynamicPanel(
-                            item: response[index],
-                            onRemove: _memberDynamicController.onRemove,
-                            onSetTop: _memberDynamicController.onSetTop,
-                          );
-                        },
-                        itemCount: response!.length,
-                      ),
-                    ),
-                    const SliverFillRemaining(),
-                  ],
-                )
-          : HttpError(
-              onReload: _memberDynamicController.onReload,
-            ),
+      Loading() => DynamicsTabPage.dynSkeleton(
+        GlobalData().dynamicsWaterfallFlow,
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? GlobalData().dynamicsWaterfallFlow
+                  ? SliverWaterfallFlow.extent(
+                      maxCrossAxisExtent: Grid.smallCardWidth * 2,
+                      crossAxisSpacing: StyleString.safeSpace,
+                      lastChildLayoutTypeBuilder: (index) {
+                        if (index == response.length - 1) {
+                          _memberDynamicController.onLoadMore();
+                        }
+                        return index == response.length
+                            ? LastChildLayoutType.foot
+                            : LastChildLayoutType.none;
+                      },
+                      children: response!
+                          .map(
+                            (item) => DynamicPanel(
+                              item: item,
+                              onRemove: _memberDynamicController.onRemove,
+                              onSetTop: _memberDynamicController.onSetTop,
+                            ),
+                          )
+                          .toList(),
+                    )
+                  : SliverCrossAxisGroup(
+                      slivers: [
+                        const SliverFillRemaining(),
+                        SliverConstrainedCrossAxis(
+                          maxExtent: Grid.smallCardWidth * 2,
+                          sliver: SliverList.builder(
+                            itemBuilder: (context, index) {
+                              if (index == response.length - 1) {
+                                _memberDynamicController.onLoadMore();
+                              }
+                              return DynamicPanel(
+                                item: response[index],
+                                onRemove: _memberDynamicController.onRemove,
+                                onSetTop: _memberDynamicController.onSetTop,
+                              );
+                            },
+                            itemCount: response!.length,
+                          ),
+                        ),
+                        const SliverFillRemaining(),
+                      ],
+                    )
+            : HttpError(
+                onReload: _memberDynamicController.onReload,
+              ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _memberDynamicController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _memberDynamicController.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/member_favorite/controller.dart b/lib/pages/member_favorite/controller.dart
index 21acc4431..50fa32290 100644
--- a/lib/pages/member_favorite/controller.dart
+++ b/lib/pages/member_favorite/controller.dart
@@ -42,15 +42,19 @@ class MemberFavoriteCtr
 
   @override
   bool customHandleResponse(
-      bool isRefresh, Success<List<SpaceFavData>?> response) {
+    bool isRefresh,
+    Success<List<SpaceFavData>?> response,
+  ) {
     try {
       List<SpaceFavData> res = response.response!;
       first.value = res.first;
       second.value = res[1];
 
-      firstEnd.value = (res.first.mediaListResponse?.count ?? -1) <=
+      firstEnd.value =
+          (res.first.mediaListResponse?.count ?? -1) <=
           (res.first.mediaListResponse?.list?.length ?? -1);
-      secondEnd.value = (res[1].mediaListResponse?.count ?? -1) <=
+      secondEnd.value =
+          (res[1].mediaListResponse?.count ?? -1) <=
           (res[1].mediaListResponse?.list?.length ?? -1);
     } catch (e) {
       if (kDebugMode) debugPrint(e.toString());
@@ -60,20 +64,23 @@ class MemberFavoriteCtr
   }
 
   Future<void> userfavFolder() async {
-    var res = await Request().get(Api.userFavFolder, queryParameters: {
-      'pn': page,
-      'ps': 20,
-      'up_mid': mid,
-    });
+    var res = await Request().get(
+      Api.userFavFolder,
+      queryParameters: {
+        'pn': page,
+        'ps': 20,
+        'up_mid': mid,
+      },
+    );
     if (res.data['code'] == 0) {
       page++;
       firstEnd.value = res.data['data']['has_more'] == false;
       if (res.data['data'] != null) {
         List<SpaceFavItemModel> list =
             (res.data['data']['list'] as List<dynamic>?)
-                    ?.map((item) => SpaceFavItemModel.fromJson(item))
-                    .toList() ??
-                <SpaceFavItemModel>[];
+                ?.map((item) => SpaceFavItemModel.fromJson(item))
+                .toList() ??
+            <SpaceFavItemModel>[];
         first
           ..value.mediaListResponse?.list?.addAll(list)
           ..refresh();
@@ -86,21 +93,24 @@ class MemberFavoriteCtr
   }
 
   Future<void> userSubFolder() async {
-    var res = await Request().get(Api.userSubFolder, queryParameters: {
-      'up_mid': mid,
-      'ps': 20,
-      'pn': page1,
-      'platform': 'web',
-    });
+    var res = await Request().get(
+      Api.userSubFolder,
+      queryParameters: {
+        'up_mid': mid,
+        'ps': 20,
+        'pn': page1,
+        'platform': 'web',
+      },
+    );
     if (res.data['code'] == 0) {
       page++;
       secondEnd.value = res.data['data']['has_more'] == false;
       if (res.data['data'] != null) {
         List<SpaceFavItemModel> list =
             (res.data['data']['list'] as List<dynamic>?)
-                    ?.map((item) => SpaceFavItemModel.fromJson(item))
-                    .toList() ??
-                <SpaceFavItemModel>[];
+                ?.map((item) => SpaceFavItemModel.fromJson(item))
+                .toList() ??
+            <SpaceFavItemModel>[];
         second
           ..value.mediaListResponse?.list?.addAll(list)
           ..refresh();
diff --git a/lib/pages/member_favorite/view.dart b/lib/pages/member_favorite/view.dart
index da7ed28a0..f0f7d9555 100644
--- a/lib/pages/member_favorite/view.dart
+++ b/lib/pages/member_favorite/view.dart
@@ -45,9 +45,11 @@ class _MemberFavoriteState extends State<MemberFavorite>
         slivers: [
           SliverPadding(
             padding: EdgeInsets.only(
-                bottom: MediaQuery.paddingOf(context).bottom + 80),
-            sliver:
-                Obx(() => _buildBody(theme, _controller.loadingState.value)),
+              bottom: MediaQuery.paddingOf(context).bottom + 80,
+            ),
+            sliver: Obx(
+              () => _buildBody(theme, _controller.loadingState.value),
+            ),
           ),
         ],
       ),
@@ -57,37 +59,40 @@ class _MemberFavoriteState extends State<MemberFavorite>
   Widget _buildBody(ThemeData theme, LoadingState loadingState) {
     return switch (loadingState) {
       Loading() => SliverPadding(
-          padding: const EdgeInsets.only(top: 7),
-          sliver: SliverGrid(
-            gridDelegate: Grid.videoCardHDelegate(context),
-            delegate: SliverChildBuilderDelegate(
-              (context, index) {
-                return const VideoCardHSkeleton();
-              },
-              childCount: 10,
-            ),
+        padding: const EdgeInsets.only(top: 7),
+        sliver: SliverGrid(
+          gridDelegate: Grid.videoCardHDelegate(context),
+          delegate: SliverChildBuilderDelegate(
+            (context, index) {
+              return const VideoCardHSkeleton();
+            },
+            childCount: 10,
           ),
         ),
-      Success(:var response) => (response as List?)?.isNotEmpty == true
-          ? SliverMainAxisGroup(
-              slivers: [
-                SliverToBoxAdapter(
-                  child: Obx(
-                      () => _buildItem(theme, _controller.first.value, true)),
-                ),
-                SliverToBoxAdapter(
-                  child: Obx(
-                      () => _buildItem(theme, _controller.second.value, false)),
-                ),
-              ],
-            )
-          : HttpError(
-              onReload: _controller.onReload,
-            ),
+      ),
+      Success(:var response) =>
+        (response as List?)?.isNotEmpty == true
+            ? SliverMainAxisGroup(
+                slivers: [
+                  SliverToBoxAdapter(
+                    child: Obx(
+                      () => _buildItem(theme, _controller.first.value, true),
+                    ),
+                  ),
+                  SliverToBoxAdapter(
+                    child: Obx(
+                      () => _buildItem(theme, _controller.second.value, false),
+                    ),
+                  ),
+                ],
+              )
+            : HttpError(
+                onReload: _controller.onReload,
+              ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
@@ -134,7 +139,8 @@ class _MemberFavoriteState extends State<MemberFavorite>
             ),
           ),
           Obx(
-            () => (isFirst
+            () =>
+                (isFirst
                     ? _controller.firstEnd.value
                     : _controller.secondEnd.value)
                 ? const SizedBox.shrink()
diff --git a/lib/pages/member_favorite/widget/item.dart b/lib/pages/member_favorite/widget/item.dart
index 074a56e7c..7513d45eb 100644
--- a/lib/pages/member_favorite/widget/item.dart
+++ b/lib/pages/member_favorite/widget/item.dart
@@ -112,10 +112,10 @@ class MemberFavItem extends StatelessWidget {
                       item.type == 0
                           ? '${item.mediaCount}个内容 · ${FavUtil.isPublicFavText(item.attr)}'
                           : item.type == 11
-                              ? '${item.mediaCount}个内容 · ${item.upper?.name}'
-                              : item.type == 21
-                                  ? '创建者: ${item.upper?.name}\n${item.mediaCount}个视频 · ${NumUtil.numFormat(item.viewCount)}播放'
-                                  : '${item.mediaCount}个内容',
+                          ? '${item.mediaCount}个内容 · ${item.upper?.name}'
+                          : item.type == 21
+                          ? '创建者: ${item.upper?.name}\n${item.mediaCount}个视频 · ${NumUtil.numFormat(item.viewCount)}播放'
+                          : '${item.mediaCount}个内容',
                       style: TextStyle(
                         fontSize: 12,
                         color: theme.colorScheme.outline,
diff --git a/lib/pages/member_home/view.dart b/lib/pages/member_home/view.dart
index 3482482c0..e2fd807e5 100644
--- a/lib/pages/member_home/view.dart
+++ b/lib/pages/member_home/view.dart
@@ -50,229 +50,242 @@ class _MemberHomeState extends State<MemberHome>
     final color = Theme.of(context).colorScheme.outline;
     return switch (loadingState) {
       Loading() => loadingWidget,
-      Success(response: final res) => res != null
-          ? CustomScrollView(
-              slivers: [
-                if (res.archive?.item?.isNotEmpty == true) ...[
-                  _header(
-                    color,
-                    title: '视频',
-                    param: 'contribute',
-                    param1: 'video',
-                    count: res.archive!.count!,
-                  ),
-                  SliverPadding(
-                    padding: const EdgeInsets.symmetric(
-                      horizontal: StyleString.safeSpace,
+      Success(response: final res) =>
+        res != null
+            ? CustomScrollView(
+                slivers: [
+                  if (res.archive?.item?.isNotEmpty == true) ...[
+                    _header(
+                      color,
+                      title: '视频',
+                      param: 'contribute',
+                      param1: 'video',
+                      count: res.archive!.count!,
                     ),
-                    sliver: SliverGrid(
+                    SliverPadding(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: StyleString.safeSpace,
+                      ),
+                      sliver: SliverGrid(
+                        gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                          mainAxisSpacing: StyleString.cardSpace,
+                          crossAxisSpacing: StyleString.cardSpace,
+                          maxCrossAxisExtent: Grid.smallCardWidth,
+                          childAspectRatio: StyleString.aspectRatio,
+                          mainAxisExtent: MediaQuery.textScalerOf(
+                            context,
+                          ).scale(55),
+                        ),
+                        delegate: SliverChildBuilderDelegate(
+                          (context, index) {
+                            return VideoCardVMemberHome(
+                              videoItem: res.archive!.item![index],
+                            );
+                          },
+                          childCount: min(
+                            isVertical ? 4 : 8,
+                            res.archive!.item!.length,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+                  if (res.favourite2?.item?.isNotEmpty == true) ...[
+                    _header(
+                      color,
+                      title: '收藏',
+                      param: 'favorite',
+                      count: res.favourite2!.count!,
+                      visible: isOwner ? setting.favVideo == 1 : null,
+                    ),
+                    SliverToBoxAdapter(
+                      child: SizedBox(
+                        height: 98,
+                        child: MemberFavItem(
+                          item: res.favourite2!.item!.first,
+                        ),
+                      ),
+                    ),
+                  ],
+                  if (res.coinArchive?.item?.isNotEmpty == true) ...[
+                    _header(
+                      color,
+                      title: '最近投币的视频',
+                      param: 'coinArchive',
+                      count: res.coinArchive!.count!,
+                      visible: isOwner ? setting.coinsVideo == 1 : null,
+                    ),
+                    SliverPadding(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: StyleString.safeSpace,
+                      ),
+                      sliver: SliverGrid(
+                        gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                          mainAxisSpacing: StyleString.cardSpace,
+                          crossAxisSpacing: StyleString.cardSpace,
+                          maxCrossAxisExtent: Grid.smallCardWidth,
+                          childAspectRatio: StyleString.aspectRatio,
+                          mainAxisExtent: MediaQuery.textScalerOf(
+                            context,
+                          ).scale(55),
+                        ),
+                        delegate: SliverChildBuilderDelegate(
+                          (context, index) {
+                            return VideoCardVMemberHome(
+                              videoItem: res.coinArchive!.item![index],
+                            );
+                          },
+                          childCount: min(
+                            isVertical ? 2 : 4,
+                            res.coinArchive!.item!.length,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+                  if (res.likeArchive?.item?.isNotEmpty == true) ...[
+                    _header(
+                      color,
+                      title: '最近点赞的视频',
+                      param: 'likeArchive',
+                      count: res.likeArchive!.count!,
+                      visible: isOwner ? setting.likesVideo == 1 : null,
+                    ),
+                    SliverPadding(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: StyleString.safeSpace,
+                      ),
+                      sliver: SliverGrid(
+                        gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                          mainAxisSpacing: StyleString.cardSpace,
+                          crossAxisSpacing: StyleString.cardSpace,
+                          maxCrossAxisExtent: Grid.smallCardWidth,
+                          childAspectRatio: StyleString.aspectRatio,
+                          mainAxisExtent: MediaQuery.textScalerOf(
+                            context,
+                          ).scale(55),
+                        ),
+                        delegate: SliverChildBuilderDelegate(
+                          (context, index) {
+                            return VideoCardVMemberHome(
+                              videoItem: res.likeArchive!.item![index],
+                            );
+                          },
+                          childCount: min(
+                            isVertical ? 2 : 4,
+                            res.likeArchive!.item!.length,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+                  if (res.article?.item?.isNotEmpty == true) ...[
+                    _header(
+                      color,
+                      title: '图文',
+                      param: 'contribute',
+                      param1: 'opus',
+                      count: res.article!.count!,
+                    ),
+                    SliverGrid(
+                      gridDelegate: Grid.videoCardHDelegate(context),
+                      delegate: SliverChildBuilderDelegate(
+                        (context, index) {
+                          return MemberArticleItem(
+                            item: res.article!.item![index],
+                          );
+                        },
+                        childCount: isVertical ? 1 : res.article!.item!.length,
+                      ),
+                    ),
+                  ],
+                  if (res.audios?.item?.isNotEmpty == true) ...[
+                    _header(
+                      color,
+                      title: '音频',
+                      param: 'contribute',
+                      param1: 'audio',
+                      count: res.audios!.count!,
+                    ),
+                    SliverGrid(
                       gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                        mainAxisSpacing: StyleString.cardSpace,
-                        crossAxisSpacing: StyleString.cardSpace,
-                        maxCrossAxisExtent: Grid.smallCardWidth,
-                        childAspectRatio: StyleString.aspectRatio,
-                        mainAxisExtent:
-                            MediaQuery.textScalerOf(context).scale(55),
+                        mainAxisSpacing: 2,
+                        maxCrossAxisExtent: Grid.smallCardWidth * 2,
+                        childAspectRatio: StyleString.aspectRatio * 2.6,
+                        minHeight: MediaQuery.textScalerOf(context).scale(90),
                       ),
                       delegate: SliverChildBuilderDelegate(
                         (context, index) {
-                          return VideoCardVMemberHome(
-                            videoItem: res.archive!.item![index],
+                          return MemberAudioItem(
+                            item: res.audios!.item![index],
                           );
                         },
-                        childCount:
-                            min(isVertical ? 4 : 8, res.archive!.item!.length),
+                        childCount: isVertical ? 1 : min(2, res.audios!.count!),
                       ),
                     ),
-                  ),
-                ],
-                if (res.favourite2?.item?.isNotEmpty == true) ...[
-                  _header(
-                    color,
-                    title: '收藏',
-                    param: 'favorite',
-                    count: res.favourite2!.count!,
-                    visible: isOwner ? setting.favVideo == 1 : null,
-                  ),
+                  ],
+                  if (res.comic?.item?.isNotEmpty == true) ...[
+                    _header(
+                      color,
+                      title: '漫画',
+                      param: 'contribute',
+                      param1: 'comic',
+                      count: res.comic!.count!,
+                    ),
+                    SliverGrid(
+                      gridDelegate: Grid.videoCardHDelegate(context),
+                      delegate: SliverChildBuilderDelegate(
+                        (context, index) {
+                          return MemberComicItem(item: res.comic!.item![index]);
+                        },
+                        childCount: isVertical ? 1 : min(2, res.comic!.count!),
+                      ),
+                    ),
+                  ],
+                  if (res.season?.item?.isNotEmpty == true) ...[
+                    _header(
+                      color,
+                      title: '追番',
+                      param: 'bangumi',
+                      count: res.season!.count!,
+                      visible: isOwner ? setting.bangumi == 1 : null,
+                    ),
+                    SliverPadding(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: StyleString.safeSpace,
+                      ),
+                      sliver: SliverGrid(
+                        gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                          mainAxisSpacing: StyleString.cardSpace,
+                          crossAxisSpacing: StyleString.cardSpace,
+                          maxCrossAxisExtent: Grid.smallCardWidth / 3 * 2,
+                          childAspectRatio: 0.75,
+                          mainAxisExtent: MediaQuery.textScalerOf(
+                            context,
+                          ).scale(52),
+                        ),
+                        delegate: SliverChildBuilderDelegate(
+                          (context, index) {
+                            return PgcCardVMemberPgc(
+                              item: res.season!.item![index],
+                            );
+                          },
+                          childCount: min(
+                            isVertical ? 3 : 6,
+                            res.season!.item!.length,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
                   SliverToBoxAdapter(
                     child: SizedBox(
-                      height: 98,
-                      child: MemberFavItem(
-                        item: res.favourite2!.item!.first,
-                      ),
+                      height: 80 + MediaQuery.paddingOf(context).bottom,
                     ),
                   ),
                 ],
-                if (res.coinArchive?.item?.isNotEmpty == true) ...[
-                  _header(
-                    color,
-                    title: '最近投币的视频',
-                    param: 'coinArchive',
-                    count: res.coinArchive!.count!,
-                    visible: isOwner ? setting.coinsVideo == 1 : null,
-                  ),
-                  SliverPadding(
-                    padding: const EdgeInsets.symmetric(
-                      horizontal: StyleString.safeSpace,
-                    ),
-                    sliver: SliverGrid(
-                      gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                        mainAxisSpacing: StyleString.cardSpace,
-                        crossAxisSpacing: StyleString.cardSpace,
-                        maxCrossAxisExtent: Grid.smallCardWidth,
-                        childAspectRatio: StyleString.aspectRatio,
-                        mainAxisExtent:
-                            MediaQuery.textScalerOf(context).scale(55),
-                      ),
-                      delegate: SliverChildBuilderDelegate(
-                        (context, index) {
-                          return VideoCardVMemberHome(
-                            videoItem: res.coinArchive!.item![index],
-                          );
-                        },
-                        childCount: min(
-                            isVertical ? 2 : 4, res.coinArchive!.item!.length),
-                      ),
-                    ),
-                  ),
-                ],
-                if (res.likeArchive?.item?.isNotEmpty == true) ...[
-                  _header(
-                    color,
-                    title: '最近点赞的视频',
-                    param: 'likeArchive',
-                    count: res.likeArchive!.count!,
-                    visible: isOwner ? setting.likesVideo == 1 : null,
-                  ),
-                  SliverPadding(
-                    padding: const EdgeInsets.symmetric(
-                      horizontal: StyleString.safeSpace,
-                    ),
-                    sliver: SliverGrid(
-                      gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                        mainAxisSpacing: StyleString.cardSpace,
-                        crossAxisSpacing: StyleString.cardSpace,
-                        maxCrossAxisExtent: Grid.smallCardWidth,
-                        childAspectRatio: StyleString.aspectRatio,
-                        mainAxisExtent:
-                            MediaQuery.textScalerOf(context).scale(55),
-                      ),
-                      delegate: SliverChildBuilderDelegate(
-                        (context, index) {
-                          return VideoCardVMemberHome(
-                            videoItem: res.likeArchive!.item![index],
-                          );
-                        },
-                        childCount: min(
-                            isVertical ? 2 : 4, res.likeArchive!.item!.length),
-                      ),
-                    ),
-                  ),
-                ],
-                if (res.article?.item?.isNotEmpty == true) ...[
-                  _header(
-                    color,
-                    title: '图文',
-                    param: 'contribute',
-                    param1: 'opus',
-                    count: res.article!.count!,
-                  ),
-                  SliverGrid(
-                    gridDelegate: Grid.videoCardHDelegate(context),
-                    delegate: SliverChildBuilderDelegate(
-                      (context, index) {
-                        return MemberArticleItem(
-                          item: res.article!.item![index],
-                        );
-                      },
-                      childCount: isVertical ? 1 : res.article!.item!.length,
-                    ),
-                  ),
-                ],
-                if (res.audios?.item?.isNotEmpty == true) ...[
-                  _header(
-                    color,
-                    title: '音频',
-                    param: 'contribute',
-                    param1: 'audio',
-                    count: res.audios!.count!,
-                  ),
-                  SliverGrid(
-                    gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                      mainAxisSpacing: 2,
-                      maxCrossAxisExtent: Grid.smallCardWidth * 2,
-                      childAspectRatio: StyleString.aspectRatio * 2.6,
-                      minHeight: MediaQuery.textScalerOf(context).scale(90),
-                    ),
-                    delegate: SliverChildBuilderDelegate(
-                      (context, index) {
-                        return MemberAudioItem(
-                          item: res.audios!.item![index],
-                        );
-                      },
-                      childCount: isVertical ? 1 : min(2, res.audios!.count!),
-                    ),
-                  )
-                ],
-                if (res.comic?.item?.isNotEmpty == true) ...[
-                  _header(
-                    color,
-                    title: '漫画',
-                    param: 'contribute',
-                    param1: 'comic',
-                    count: res.comic!.count!,
-                  ),
-                  SliverGrid(
-                    gridDelegate: Grid.videoCardHDelegate(context),
-                    delegate: SliverChildBuilderDelegate(
-                      (context, index) {
-                        return MemberComicItem(item: res.comic!.item![index]);
-                      },
-                      childCount: isVertical ? 1 : min(2, res.comic!.count!),
-                    ),
-                  ),
-                ],
-                if (res.season?.item?.isNotEmpty == true) ...[
-                  _header(
-                    color,
-                    title: '追番',
-                    param: 'bangumi',
-                    count: res.season!.count!,
-                    visible: isOwner ? setting.bangumi == 1 : null,
-                  ),
-                  SliverPadding(
-                    padding: const EdgeInsets.symmetric(
-                      horizontal: StyleString.safeSpace,
-                    ),
-                    sliver: SliverGrid(
-                      gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                        mainAxisSpacing: StyleString.cardSpace,
-                        crossAxisSpacing: StyleString.cardSpace,
-                        maxCrossAxisExtent: Grid.smallCardWidth / 3 * 2,
-                        childAspectRatio: 0.75,
-                        mainAxisExtent:
-                            MediaQuery.textScalerOf(context).scale(52),
-                      ),
-                      delegate: SliverChildBuilderDelegate(
-                        (context, index) {
-                          return PgcCardVMemberPgc(
-                            item: res.season!.item![index],
-                          );
-                        },
-                        childCount:
-                            min(isVertical ? 3 : 6, res.season!.item!.length),
-                      ),
-                    ),
-                  ),
-                ],
-                SliverToBoxAdapter(
-                  child: SizedBox(
-                    height: 80 + MediaQuery.paddingOf(context).bottom,
-                  ),
-                ),
-              ],
-            )
-          : scrollErrorWidget(),
+              )
+            : scrollErrorWidget(),
       Error(:var errMsg) => scrollErrorWidget(errMsg: errMsg),
     };
   }
@@ -318,20 +331,27 @@ class _MemberHomeState extends State<MemberHome>
             ),
             GestureDetector(
               onTap: () {
-                int index =
-                    _ctr.tab2!.indexWhere((item) => item.param == param);
+                int index = _ctr.tab2!.indexWhere(
+                  (item) => item.param == param,
+                );
                 if (index != -1) {
-                  if (const ['video', 'opus', 'audio', 'comic']
-                      .contains(param1)) {
+                  if (const [
+                    'video',
+                    'opus',
+                    'audio',
+                    'comic',
+                  ].contains(param1)) {
                     List<SpaceTab2Item> items = _ctr.tab2!
                         .firstWhere((item) => item.param == param)
                         .items!;
-                    int index1 =
-                        items.indexWhere((item) => item.param == param1);
+                    int index1 = items.indexWhere(
+                      (item) => item.param == param1,
+                    );
                     if (index1 != -1) {
                       try {
-                        final contributeCtr =
-                            Get.find<MemberContributeCtr>(tag: widget.heroTag);
+                        final contributeCtr = Get.find<MemberContributeCtr>(
+                          tag: widget.heroTag,
+                        );
                         // contributeCtr.tabController?.animateTo(index1);
                         if (contributeCtr.tabController?.index != index1) {
                           contributeCtr.tabController?.index = index1;
@@ -346,18 +366,22 @@ class _MemberHomeState extends State<MemberHome>
                   _ctr.tabController?.animateTo(index);
                 } else {
                   if (param == 'coinArchive') {
-                    Get.to(MemberCoinArcPage(
-                      mid: _ctr.mid,
-                      name: _ctr.username,
-                    ));
+                    Get.to(
+                      MemberCoinArcPage(
+                        mid: _ctr.mid,
+                        name: _ctr.username,
+                      ),
+                    );
                     return;
                   }
 
                   if (param == 'likeArchive') {
-                    Get.to(MemberLikeArcPage(
-                      mid: _ctr.mid,
-                      name: _ctr.username,
-                    ));
+                    Get.to(
+                      MemberLikeArcPage(
+                        mid: _ctr.mid,
+                        name: _ctr.username,
+                      ),
+                    );
                     return;
                   }
 
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 33413991c..3cc5dca52 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
@@ -128,7 +128,7 @@ class VideoCardVMemberHome extends StatelessWidget {
                 },
               ),
             ),
-            content(context)
+            content(context),
           ],
         ),
       ),
diff --git a/lib/pages/member_like_arc/view.dart b/lib/pages/member_like_arc/view.dart
index 4b64a89ca..898611aea 100644
--- a/lib/pages/member_like_arc/view.dart
+++ b/lib/pages/member_like_arc/view.dart
@@ -39,7 +39,8 @@ class _MemberLikeArcPageState extends State<MemberLikeArcPage> {
     return Scaffold(
       appBar: AppBar(
         title: Text(
-            '${widget.mid == accountService.mid ? '我' : '${widget.name}'}的推荐'),
+          '${widget.mid == accountService.mid ? '我' : '${widget.name}'}的推荐',
+        ),
       ),
       body: SafeArea(
         top: false,
@@ -68,40 +69,41 @@ class _MemberLikeArcPageState extends State<MemberLikeArcPage> {
   Widget _buildBody(LoadingState<List<CoinLikeArcItem>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid.builder(
-          gridDelegate: SliverGridDelegateWithExtentAndRatio(
-            mainAxisSpacing: StyleString.cardSpace,
-            crossAxisSpacing: StyleString.cardSpace,
-            maxCrossAxisExtent: Grid.smallCardWidth,
-            childAspectRatio: StyleString.aspectRatio,
-            mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
-          ),
-          itemCount: 16,
-          itemBuilder: (context, index) {
-            return const VideoCardVSkeleton();
-          },
+        gridDelegate: SliverGridDelegateWithExtentAndRatio(
+          mainAxisSpacing: StyleString.cardSpace,
+          crossAxisSpacing: StyleString.cardSpace,
+          maxCrossAxisExtent: Grid.smallCardWidth,
+          childAspectRatio: StyleString.aspectRatio,
+          mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid.builder(
-              gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                mainAxisSpacing: StyleString.cardSpace,
-                crossAxisSpacing: StyleString.cardSpace,
-                maxCrossAxisExtent: Grid.smallCardWidth,
-                childAspectRatio: StyleString.aspectRatio,
-                mainAxisExtent: MediaQuery.textScalerOf(context).scale(75),
-              ),
-              itemCount: response!.length,
-              itemBuilder: (context, index) {
-                if (index == response.length - 1) {
-                  _ctr.onLoadMore();
-                }
-                return MemberCoinLikeItem(item: response[index]);
-              },
-            )
-          : HttpError(onReload: _ctr.onReload),
+        itemCount: 16,
+        itemBuilder: (context, index) {
+          return const VideoCardVSkeleton();
+        },
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid.builder(
+                gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                  mainAxisSpacing: StyleString.cardSpace,
+                  crossAxisSpacing: StyleString.cardSpace,
+                  maxCrossAxisExtent: Grid.smallCardWidth,
+                  childAspectRatio: StyleString.aspectRatio,
+                  mainAxisExtent: MediaQuery.textScalerOf(context).scale(75),
+                ),
+                itemCount: response!.length,
+                itemBuilder: (context, index) {
+                  if (index == response.length - 1) {
+                    _ctr.onLoadMore();
+                  }
+                  return MemberCoinLikeItem(item: response[index]);
+                },
+              )
+            : HttpError(onReload: _ctr.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _ctr.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _ctr.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/member_opus/controller.dart b/lib/pages/member_opus/controller.dart
index 24d65f8dd..6f82172a0 100644
--- a/lib/pages/member_opus/controller.dart
+++ b/lib/pages/member_opus/controller.dart
@@ -18,15 +18,17 @@ class MemberOpusController
   final int mid;
 
   String offset = '';
-  Rx<SpaceTabFilter> type =
-      const SpaceTabFilter(text: "全部图文", meta: "all", tabName: "图文").obs;
+  Rx<SpaceTabFilter> type = const SpaceTabFilter(
+    text: "全部图文",
+    meta: "all",
+    tabName: "图文",
+  ).obs;
   List<SpaceTabFilter>? filter;
 
   @override
   void onInit() {
     super.onInit();
-    filter = Get.find<MemberController>(tag: heroTag)
-        .tab2
+    filter = Get.find<MemberController>(tag: heroTag).tab2
         ?.firstWhereOrNull((e) => e.param == 'contribute')
         ?.items
         ?.firstWhereOrNull((e) => e.param == 'opus')
@@ -51,9 +53,9 @@ class MemberOpusController
 
   @override
   Future<LoadingState<SpaceOpusData>> customGetData() => MemberHttp.spaceOpus(
-        hostMid: mid,
-        page: page,
-        offset: offset,
-        type: type.value.meta,
-      );
+    hostMid: mid,
+    page: page,
+    offset: offset,
+    type: type.value.meta,
+  );
 }
diff --git a/lib/pages/member_opus/view.dart b/lib/pages/member_opus/view.dart
index e48b7c60d..67233ba3c 100644
--- a/lib/pages/member_opus/view.dart
+++ b/lib/pages/member_opus/view.dart
@@ -85,9 +85,9 @@ class _MemberOpusState extends State<MemberOpus>
                                   ..onReload();
                               },
                               tileColor: e == _controller.type.value
-                                  ? Theme.of(context)
-                                      .colorScheme
-                                      .onInverseSurface
+                                  ? Theme.of(
+                                      context,
+                                    ).colorScheme.onInverseSurface
                                   : null,
                               dense: true,
                               title: Text(
@@ -117,34 +117,36 @@ class _MemberOpusState extends State<MemberOpus>
   Widget _buildBody(LoadingState<List<SpaceOpusItemModel>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverWaterfallFlow.extent(
-          maxCrossAxisExtent: Grid.smallCardWidth,
-          mainAxisSpacing: StyleString.safeSpace,
-          crossAxisSpacing: StyleString.safeSpace,
-          children: List.generate(10, (_) => const SpaceOpusSkeleton()),
-        ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverWaterfallFlow.extent(
-              maxCrossAxisExtent: Grid.smallCardWidth,
-              mainAxisSpacing: StyleString.safeSpace,
-              crossAxisSpacing: StyleString.safeSpace,
-              lastChildLayoutTypeBuilder: (index) {
-                if (index == response.length - 1) {
-                  _controller.onLoadMore();
-                }
-                return index == response.length
-                    ? LastChildLayoutType.foot
-                    : LastChildLayoutType.none;
-              },
-              children:
-                  response!.map((item) => SpaceOpusItem(item: item)).toList(),
-            )
-          : HttpError(
-              onReload: _controller.onReload,
-            ),
+        maxCrossAxisExtent: Grid.smallCardWidth,
+        mainAxisSpacing: StyleString.safeSpace,
+        crossAxisSpacing: StyleString.safeSpace,
+        children: List.generate(10, (_) => const SpaceOpusSkeleton()),
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverWaterfallFlow.extent(
+                maxCrossAxisExtent: Grid.smallCardWidth,
+                mainAxisSpacing: StyleString.safeSpace,
+                crossAxisSpacing: StyleString.safeSpace,
+                lastChildLayoutTypeBuilder: (index) {
+                  if (index == response.length - 1) {
+                    _controller.onLoadMore();
+                  }
+                  return index == response.length
+                      ? LastChildLayoutType.foot
+                      : LastChildLayoutType.none;
+                },
+                children: response!
+                    .map((item) => SpaceOpusItem(item: item))
+                    .toList(),
+              )
+            : HttpError(
+                onReload: _controller.onReload,
+              ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/member_opus/widgets/space_opus_item.dart b/lib/pages/member_opus/widgets/space_opus_item.dart
index 404da39ab..dbf9df32a 100644
--- a/lib/pages/member_opus/widgets/space_opus_item.dart
+++ b/lib/pages/member_opus/widgets/space_opus_item.dart
@@ -68,8 +68,10 @@ class SpaceOpusItem extends StatelessWidget {
               ),
             if (item.content?.isNotEmpty == true)
               Padding(
-                padding:
-                    const EdgeInsets.symmetric(horizontal: 8, vertical: 10),
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 8,
+                  vertical: 10,
+                ),
                 child: Text(
                   item.content!,
                   maxLines: hasPic ? 4 : 6,
diff --git a/lib/pages/member_pgc/view.dart b/lib/pages/member_pgc/view.dart
index a06bfdd1c..f59bd8ef8 100644
--- a/lib/pages/member_pgc/view.dart
+++ b/lib/pages/member_pgc/view.dart
@@ -49,7 +49,8 @@ class _MemberBangumiState extends State<MemberBangumi>
               left: StyleString.safeSpace,
               right: StyleString.safeSpace,
               top: StyleString.safeSpace,
-              bottom: StyleString.safeSpace +
+              bottom:
+                  StyleString.safeSpace +
                   MediaQuery.paddingOf(context).bottom +
                   80,
             ),
@@ -65,32 +66,33 @@ class _MemberBangumiState extends State<MemberBangumi>
   Widget _buildBody(LoadingState<List<SpaceArchiveItem>?> loadingState) {
     return switch (loadingState) {
       Loading() => const SliverToBoxAdapter(),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                mainAxisSpacing: StyleString.cardSpace,
-                crossAxisSpacing: StyleString.cardSpace,
-                maxCrossAxisExtent: Grid.smallCardWidth / 3 * 2,
-                childAspectRatio: 0.75,
-                mainAxisExtent: MediaQuery.textScalerOf(context).scale(52),
-              ),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  if (index == response.length - 1) {
-                    _controller.onLoadMore();
-                  }
-                  return PgcCardVMemberPgc(
-                    item: response[index],
-                  );
-                },
-                childCount: response!.length,
-              ),
-            )
-          : HttpError(onReload: _controller.onReload),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                  mainAxisSpacing: StyleString.cardSpace,
+                  crossAxisSpacing: StyleString.cardSpace,
+                  maxCrossAxisExtent: Grid.smallCardWidth / 3 * 2,
+                  childAspectRatio: 0.75,
+                  mainAxisExtent: MediaQuery.textScalerOf(context).scale(52),
+                ),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    if (index == response.length - 1) {
+                      _controller.onLoadMore();
+                    }
+                    return PgcCardVMemberPgc(
+                      item: response[index],
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/member_pgc/widgets/pgc_card_v_member_pgc.dart b/lib/pages/member_pgc/widgets/pgc_card_v_member_pgc.dart
index ffe42e705..6134f4083 100644
--- a/lib/pages/member_pgc/widgets/pgc_card_v_member_pgc.dart
+++ b/lib/pages/member_pgc/widgets/pgc_card_v_member_pgc.dart
@@ -30,13 +30,15 @@ class PgcCardVMemberPgc extends StatelessWidget {
           children: [
             AspectRatio(
               aspectRatio: 0.75,
-              child: LayoutBuilder(builder: (context, boxConstraints) {
-                return NetworkImgLayer(
-                  src: item.cover,
-                  width: boxConstraints.maxWidth,
-                  height: boxConstraints.maxHeight,
-                );
-              }),
+              child: LayoutBuilder(
+                builder: (context, boxConstraints) {
+                  return NetworkImgLayer(
+                    src: item.cover,
+                    width: boxConstraints.maxWidth,
+                    height: boxConstraints.maxHeight,
+                  );
+                },
+              ),
             ),
             Padding(
               padding: const EdgeInsets.fromLTRB(4, 5, 0, 3),
diff --git a/lib/pages/member_profile/view.dart b/lib/pages/member_profile/view.dart
index 7af0c4489..99bdf4d56 100644
--- a/lib/pages/member_profile/view.dart
+++ b/lib/pages/member_profile/view.dart
@@ -73,40 +73,45 @@ class _EditProfilePageState extends State<EditProfilePage> {
       'statistics': Constants.statistics,
     };
     Request()
-        .get('${HttpString.appBaseUrl}/x/v2/account/myinfo',
-            queryParameters: data)
+        .get(
+          '${HttpString.appBaseUrl}/x/v2/account/myinfo',
+          queryParameters: data,
+        )
         .then((res) {
-      if (mounted) {
-        setState(() {
-          if (res.data['code'] == 0) {
-            AccountMyInfoData data =
-                AccountMyInfoData.fromJson(res.data['data']);
-            _loadingState = Success(data);
-            accountService
-              ..name.value = data.name!
-              ..face.value = data.face!;
-            try {
-              UserInfoData userInfo = GStorage.userInfo.get('userInfoCache')
-                ..uname = data.name
-                ..face = data.face;
-              GStorage.userInfo.put('userInfoCache', userInfo);
-            } catch (_) {}
-            try {
-              Get.find<MineController>().userInfo
-                ..value.uname = data.name
-                ..value.face = data.face
-                ..refresh();
-            } catch (_) {}
-          } else {
-            _loadingState = Error(res.data['message']);
+          if (mounted) {
+            setState(() {
+              if (res.data['code'] == 0) {
+                AccountMyInfoData data = AccountMyInfoData.fromJson(
+                  res.data['data'],
+                );
+                _loadingState = Success(data);
+                accountService
+                  ..name.value = data.name!
+                  ..face.value = data.face!;
+                try {
+                  UserInfoData userInfo = GStorage.userInfo.get('userInfoCache')
+                    ..uname = data.name
+                    ..face = data.face;
+                  GStorage.userInfo.put('userInfoCache', userInfo);
+                } catch (_) {}
+                try {
+                  Get.find<MineController>().userInfo
+                    ..value.uname = data.name
+                    ..value.face = data.face
+                    ..refresh();
+                } catch (_) {}
+              } else {
+                _loadingState = Error(res.data['message']);
+              }
+            });
           }
         });
-      }
-    });
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<AccountMyInfoData> loadingState) {
+    ThemeData theme,
+    LoadingState<AccountMyInfoData> loadingState,
+  ) {
     late final divider = Divider(
       height: 1,
       color: theme.dividerColor.withValues(alpha: 0.1),
@@ -120,114 +125,121 @@ class _EditProfilePageState extends State<EditProfilePage> {
     return switch (loadingState) {
       Loading() => loadingWidget,
       Success(:var response) => ListView(
-          padding: EdgeInsets.only(
-              bottom: MediaQuery.paddingOf(context).bottom + 25),
-          children: [
-            divider1,
-            _item(
-              theme: theme,
-              title: '头像',
-              widget: Padding(
-                padding: const EdgeInsets.symmetric(vertical: 5),
-                child: ClipOval(
-                  child: CachedNetworkImage(
-                    width: 55,
-                    height: 55,
-                    imageUrl: ImageUtil.thumbnailUrl(response.face),
-                  ),
+        padding: EdgeInsets.only(
+          bottom: MediaQuery.paddingOf(context).bottom + 25,
+        ),
+        children: [
+          divider1,
+          _item(
+            theme: theme,
+            title: '头像',
+            widget: Padding(
+              padding: const EdgeInsets.symmetric(vertical: 5),
+              child: ClipOval(
+                child: CachedNetworkImage(
+                  width: 55,
+                  height: 55,
+                  imageUrl: ImageUtil.thumbnailUrl(response.face),
                 ),
               ),
-              onTap: () => EasyThrottle.throttle(
-                  'imagePicker', const Duration(milliseconds: 500), () {
-                _pickImg(theme);
-              }),
             ),
-            divider,
-            _item(
-              theme: theme,
-              title: '昵称',
-              text: response.name,
-              onTap: () {
-                if (response.coins! < 6) {
-                  SmartDialog.showToast('硬币不足');
-                } else {
-                  _editDialog(
-                    type: ProfileType.uname,
-                    title: '昵称',
-                    text: response.name!,
-                  );
-                }
+            onTap: () => EasyThrottle.throttle(
+              'imagePicker',
+              const Duration(milliseconds: 500),
+              () {
+                _pickImg(theme);
               },
             ),
-            divider,
-            _item(
-              theme: theme,
-              title: '性别',
-              text: _sex(response.sex!),
-              onTap: () => showDialog(
-                context: context,
-                builder: (context_) => _sexDialog(response.sex!),
-              ),
+          ),
+          divider,
+          _item(
+            theme: theme,
+            title: '昵称',
+            text: response.name,
+            onTap: () {
+              if (response.coins! < 6) {
+                SmartDialog.showToast('硬币不足');
+              } else {
+                _editDialog(
+                  type: ProfileType.uname,
+                  title: '昵称',
+                  text: response.name!,
+                );
+              }
+            },
+          ),
+          divider,
+          _item(
+            theme: theme,
+            title: '性别',
+            text: _sex(response.sex!),
+            onTap: () => showDialog(
+              context: context,
+              builder: (context_) => _sexDialog(response.sex!),
             ),
-            divider,
-            _item(
-              theme: theme,
-              title: '出生年月',
-              text: response.birthday,
-              onTap: () => showDatePicker(
-                context: context,
-                initialDate: DateTime.parse(response.birthday!),
-                firstDate: DateTime(0001, 1, 1),
-                lastDate: DateTime.now(),
-              ).then((res) {
-                if (res != null) {
-                  _update(
-                    type: ProfileType.birthday,
-                    datum: DateUtil.longFormat.format(res),
-                  );
-                }
-              }),
-            ),
-            divider,
-            _item(
-              theme: theme,
+          ),
+          divider,
+          _item(
+            theme: theme,
+            title: '出生年月',
+            text: response.birthday,
+            onTap: () =>
+                showDatePicker(
+                  context: context,
+                  initialDate: DateTime.parse(response.birthday!),
+                  firstDate: DateTime(0001, 1, 1),
+                  lastDate: DateTime.now(),
+                ).then((res) {
+                  if (res != null) {
+                    _update(
+                      type: ProfileType.birthday,
+                      datum: DateUtil.longFormat.format(res),
+                    );
+                  }
+                }),
+          ),
+          divider,
+          _item(
+            theme: theme,
+            title: '个性签名',
+            text: response.sign,
+            onTap: () => _editDialog(
+              type: ProfileType.sign,
               title: '个性签名',
-              text: response.sign,
-              onTap: () => _editDialog(
-                type: ProfileType.sign,
-                title: '个性签名',
-                text: response.sign ?? '',
-              ),
+              text: response.sign ?? '',
             ),
-            divider1,
-            _item(
-              theme: theme,
-              title: '头像挂件',
-              onTap: () => PageUtils.inAppWebview(
-                  'https://www.bilibili.com/h5/mall/pendant/home'),
+          ),
+          divider1,
+          _item(
+            theme: theme,
+            title: '头像挂件',
+            onTap: () => PageUtils.inAppWebview(
+              'https://www.bilibili.com/h5/mall/pendant/home',
             ),
-            divider1,
-            _item(
-              theme: theme,
-              title: 'UID',
-              needIcon: false,
-              text: response.mid.toString(),
-              onTap: () => Utils.copyText(response.mid.toString()),
+          ),
+          divider1,
+          _item(
+            theme: theme,
+            title: 'UID',
+            needIcon: false,
+            text: response.mid.toString(),
+            onTap: () => Utils.copyText(response.mid.toString()),
+          ),
+          divider1,
+          _item(
+            theme: theme,
+            title: '哔哩哔哩认证',
+            onTap: () => PageUtils.inAppWebview(
+              'https://account.bilibili.com/official/mobile/home',
             ),
-            divider1,
-            _item(
-              theme: theme,
-              title: '哔哩哔哩认证',
-              onTap: () => PageUtils.inAppWebview(
-                  'https://account.bilibili.com/official/mobile/home'),
-            ),
-            divider1,
-          ],
-        ),
+          ),
+          divider1,
+        ],
+      ),
       Error(:var errMsg) => scrollErrorWidget(
-          errMsg: errMsg,
-          onReload: _getInfo,
-        ),
+        errMsg: errMsg,
+        onReload: _getInfo,
+      ),
     };
   }
 
@@ -288,11 +300,13 @@ class _EditProfilePageState extends State<EditProfilePage> {
             maxLines: lines,
             autofocus: true,
             style: const TextStyle(fontSize: 14),
-            textInputAction:
-                type == ProfileType.sign ? TextInputAction.newline : null,
+            textInputAction: type == ProfileType.sign
+                ? TextInputAction.newline
+                : null,
             inputFormatters: [
               LengthLimitingTextInputFormatter(
-                  type == ProfileType.uname ? 16 : 70),
+                type == ProfileType.uname ? 16 : 70,
+              ),
             ],
             decoration: InputDecoration(
               hintText: text,
@@ -359,48 +373,48 @@ class _EditProfilePageState extends State<EditProfilePage> {
     AppSign.appSign(data);
     Request()
         .post(
-      '/x/member/app/${type.name}/update',
-      data: data,
-      options: Options(
-        contentType: Headers.formUrlEncodedContentType,
-      ),
-    )
+          '/x/member/app/${type.name}/update',
+          data: data,
+          options: Options(
+            contentType: Headers.formUrlEncodedContentType,
+          ),
+        )
         .then((res) {
-      if (res.data['code'] == 0) {
-        AccountMyInfoData data = _loadingState.data;
-        if (type == ProfileType.uname) {
-          data
-            ..name = _textController.text
-            ..coins = data.coins! - 6;
-          accountService.name.value = _textController.text;
-          try {
-            UserInfoData userInfo = GStorage.userInfo.get('userInfoCache')
-              ..uname = _textController.text;
-            GStorage.userInfo.put('userInfoCache', userInfo);
-          } catch (_) {}
-          try {
-            Get.find<MineController>().userInfo
-              ..value.uname = _textController.text
-              ..refresh();
-          } catch (_) {}
-        } else if (type == ProfileType.sign) {
-          data.sign = _textController.text;
-        } else if (type == ProfileType.birthday) {
-          data.birthday = datum;
-        } else if (type == ProfileType.sex) {
-          data.sex = datum;
-        }
-        SmartDialog.showToast('修改成功');
-        if (mounted) {
-          setState(() {});
-        }
-        if (type == ProfileType.uname || type == ProfileType.sign) {
-          Get.back();
-        }
-      } else {
-        SmartDialog.showToast(res.data['message']);
-      }
-    });
+          if (res.data['code'] == 0) {
+            AccountMyInfoData data = _loadingState.data;
+            if (type == ProfileType.uname) {
+              data
+                ..name = _textController.text
+                ..coins = data.coins! - 6;
+              accountService.name.value = _textController.text;
+              try {
+                UserInfoData userInfo = GStorage.userInfo.get('userInfoCache')
+                  ..uname = _textController.text;
+                GStorage.userInfo.put('userInfoCache', userInfo);
+              } catch (_) {}
+              try {
+                Get.find<MineController>().userInfo
+                  ..value.uname = _textController.text
+                  ..refresh();
+              } catch (_) {}
+            } else if (type == ProfileType.sign) {
+              data.sign = _textController.text;
+            } else if (type == ProfileType.birthday) {
+              data.birthday = datum;
+            } else if (type == ProfileType.sex) {
+              data.sex = datum;
+            }
+            SmartDialog.showToast('修改成功');
+            if (mounted) {
+              setState(() {});
+            }
+            if (type == ProfileType.uname || type == ProfileType.sign) {
+              Get.back();
+            }
+          } else {
+            SmartDialog.showToast(res.data['message']);
+          }
+        });
   }
 
   String _sex(int sex) {
@@ -446,14 +460,15 @@ class _EditProfilePageState extends State<EditProfilePage> {
                 ),
               ),
             )
-          else ?widget,
+          else
+            ?widget,
           if (needIcon)
             Icon(
               Icons.keyboard_arrow_right,
               color: theme.colorScheme.outline,
             )
           else
-            const SizedBox(width: 24)
+            const SizedBox(width: 24),
         ],
       ),
     );
@@ -466,8 +481,9 @@ class _EditProfilePageState extends State<EditProfilePage> {
         imageQuality: 100,
       );
       if (pickedFile != null && mounted) {
-        String? mimeType =
-            lookupMimeType(pickedFile.path)?.split('/').getOrNull(1);
+        String? mimeType = lookupMimeType(
+          pickedFile.path,
+        )?.split('/').getOrNull(1);
         if (mimeType == 'gif') {
           SmartDialog.showToast('不能选GIF');
           return;
@@ -502,25 +518,26 @@ class _EditProfilePageState extends State<EditProfilePage> {
         if (croppedFile != null) {
           Request()
               .post(
-            '/x/member/web/face/update',
-            queryParameters: {
-              'csrf': Accounts.main.csrf,
-            },
-            data: FormData.fromMap({
-              'dopost': 'save',
-              'DisplayRank': 10000,
-              'face': await MultipartFile.fromFile(croppedFile.path),
-            }),
-          )
+                '/x/member/web/face/update',
+                queryParameters: {
+                  'csrf': Accounts.main.csrf,
+                },
+                data: FormData.fromMap({
+                  'dopost': 'save',
+                  'DisplayRank': 10000,
+                  'face': await MultipartFile.fromFile(croppedFile.path),
+                }),
+              )
               .then((res) {
-            if (res.data['code'] == 0) {
-              SmartDialog.showToast('修改成功');
-              Future.delayed(const Duration(milliseconds: 500))
-                  .whenComplete(_getInfo);
-            } else {
-              SmartDialog.showToast(res.data['message']);
-            }
-          });
+                if (res.data['code'] == 0) {
+                  SmartDialog.showToast('修改成功');
+                  Future.delayed(
+                    const Duration(milliseconds: 500),
+                  ).whenComplete(_getInfo);
+                } else {
+                  SmartDialog.showToast(res.data['message']);
+                }
+              });
         }
       }
     } catch (e) {
diff --git a/lib/pages/member_search/child/controller.dart b/lib/pages/member_search/child/controller.dart
index 51cd9d9bf..9b26c849c 100644
--- a/lib/pages/member_search/child/controller.dart
+++ b/lib/pages/member_search/child/controller.dart
@@ -59,17 +59,17 @@ class MemberSearchChildController extends CommonListController {
   Future<LoadingState> customGetData() {
     return switch (searchType) {
       MemberSearchType.archive => MemberHttp.searchArchive(
-          mid: controller.mid,
-          pn: page,
-          keyword: controller.editingController.text,
-          order: 'pubdate',
-        ),
+        mid: controller.mid,
+        pn: page,
+        keyword: controller.editingController.text,
+        order: 'pubdate',
+      ),
       MemberSearchType.dynamic => MemberHttp.dynSearch(
-          mid: controller.mid,
-          pn: page,
-          offset: offset ?? '',
-          keyword: controller.editingController.text,
-        ),
+        mid: controller.mid,
+        pn: page,
+        offset: offset ?? '',
+        keyword: controller.editingController.text,
+      ),
     };
   }
 }
diff --git a/lib/pages/member_search/child/view.dart b/lib/pages/member_search/child/view.dart
index 2d647e9e8..79f431ecf 100644
--- a/lib/pages/member_search/child/view.dart
+++ b/lib/pages/member_search/child/view.dart
@@ -56,27 +56,29 @@ class _MemberSearchChildPageState extends State<MemberSearchChildPage>
   Widget get _buildLoading {
     return switch (widget.searchType) {
       MemberSearchType.archive => SliverGrid(
-          gridDelegate: Grid.videoCardHDelegate(context),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) {
-              return const VideoCardHSkeleton();
-            },
-            childCount: 10,
-          ),
+        gridDelegate: Grid.videoCardHDelegate(context),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            return const VideoCardHSkeleton();
+          },
+          childCount: 10,
         ),
-      MemberSearchType.dynamic =>
-        DynamicsTabPage.dynSkeleton(GlobalData().dynamicsWaterfallFlow),
+      ),
+      MemberSearchType.dynamic => DynamicsTabPage.dynSkeleton(
+        GlobalData().dynamicsWaterfallFlow,
+      ),
     };
   }
 
   Widget _buildBody(LoadingState<List?> loadingState) {
     return switch (loadingState) {
       Loading() => _buildLoading,
-      Success(:var response) => response?.isNotEmpty == true
-          ? Builder(
-              builder: (context) {
-                return switch (widget.searchType) {
-                  MemberSearchType.archive => SliverGrid(
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? Builder(
+                builder: (context) {
+                  return switch (widget.searchType) {
+                    MemberSearchType.archive => SliverGrid(
                       gridDelegate: Grid.videoCardHDelegate(context),
                       delegate: SliverChildBuilderDelegate(
                         (context, index) {
@@ -90,53 +92,54 @@ class _MemberSearchChildPageState extends State<MemberSearchChildPage>
                         childCount: response!.length,
                       ),
                     ),
-                  MemberSearchType.dynamic => GlobalData().dynamicsWaterfallFlow
-                      ? SliverWaterfallFlow.extent(
-                          maxCrossAxisExtent: Grid.smallCardWidth * 2,
-                          crossAxisSpacing: StyleString.safeSpace,
-                          mainAxisSpacing: StyleString.safeSpace,
-                          lastChildLayoutTypeBuilder: (index) {
-                            if (index == response.length - 1) {
-                              _controller.onLoadMore();
-                            }
-                            return index == response.length
-                                ? LastChildLayoutType.foot
-                                : LastChildLayoutType.none;
-                          },
-                          children: response!
-                              .map((item) => DynamicPanel(item: item))
-                              .toList(),
-                        )
-                      : SliverCrossAxisGroup(
-                          slivers: [
-                            const SliverFillRemaining(),
-                            SliverConstrainedCrossAxis(
-                              maxExtent: Grid.smallCardWidth * 2,
-                              sliver: SliverList.builder(
-                                itemBuilder: (context, index) {
-                                  if (index == response.length - 1) {
-                                    _controller.onLoadMore();
-                                  }
-                                  return DynamicPanel(
-                                    item: response[index],
-                                  );
-                                },
-                                itemCount: response!.length,
-                              ),
+                    MemberSearchType.dynamic =>
+                      GlobalData().dynamicsWaterfallFlow
+                          ? SliverWaterfallFlow.extent(
+                              maxCrossAxisExtent: Grid.smallCardWidth * 2,
+                              crossAxisSpacing: StyleString.safeSpace,
+                              mainAxisSpacing: StyleString.safeSpace,
+                              lastChildLayoutTypeBuilder: (index) {
+                                if (index == response.length - 1) {
+                                  _controller.onLoadMore();
+                                }
+                                return index == response.length
+                                    ? LastChildLayoutType.foot
+                                    : LastChildLayoutType.none;
+                              },
+                              children: response!
+                                  .map((item) => DynamicPanel(item: item))
+                                  .toList(),
+                            )
+                          : SliverCrossAxisGroup(
+                              slivers: [
+                                const SliverFillRemaining(),
+                                SliverConstrainedCrossAxis(
+                                  maxExtent: Grid.smallCardWidth * 2,
+                                  sliver: SliverList.builder(
+                                    itemBuilder: (context, index) {
+                                      if (index == response.length - 1) {
+                                        _controller.onLoadMore();
+                                      }
+                                      return DynamicPanel(
+                                        item: response[index],
+                                      );
+                                    },
+                                    itemCount: response!.length,
+                                  ),
+                                ),
+                                const SliverFillRemaining(),
+                              ],
                             ),
-                            const SliverFillRemaining(),
-                          ],
-                        ),
-                };
-              },
-            )
-          : HttpError(
-              onReload: _controller.onReload,
-            ),
+                  };
+                },
+              )
+            : HttpError(
+                onReload: _controller.onReload,
+              ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/member_search/controller.dart b/lib/pages/member_search/controller.dart
index dd7b37dc9..48c90de8c 100644
--- a/lib/pages/member_search/controller.dart
+++ b/lib/pages/member_search/controller.dart
@@ -18,11 +18,13 @@ class MemberSearchController extends GetxController
   final RxList<int> counts = <int>[-1, -1].obs;
 
   late final arcCtr = Get.put(
-      MemberSearchChildController(this, MemberSearchType.archive),
-      tag: Utils.generateRandomString(8));
+    MemberSearchChildController(this, MemberSearchType.archive),
+    tag: Utils.generateRandomString(8),
+  );
   late final dynCtr = Get.put(
-      MemberSearchChildController(this, MemberSearchType.dynamic),
-      tag: Utils.generateRandomString(8));
+    MemberSearchChildController(this, MemberSearchType.dynamic),
+    tag: Utils.generateRandomString(8),
+  );
 
   void onClear() {
     if (editingController.value.text.isNotEmpty) {
diff --git a/lib/pages/member_search/view.dart b/lib/pages/member_search/view.dart
index 928707224..2313f34be 100644
--- a/lib/pages/member_search/view.dart
+++ b/lib/pages/member_search/view.dart
@@ -14,8 +14,10 @@ class MemberSearchPage extends StatefulWidget {
 }
 
 class _MemberSearchPageState extends State<MemberSearchPage> {
-  final _controller =
-      Get.put(MemberSearchController(), tag: Utils.generateRandomString(8));
+  final _controller = Get.put(
+    MemberSearchController(),
+    tag: Utils.generateRandomString(8),
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -28,7 +30,7 @@ class _MemberSearchPageState extends State<MemberSearchPage> {
             onPressed: _controller.submit,
             icon: const Icon(Icons.search, size: 22),
           ),
-          const SizedBox(width: 10)
+          const SizedBox(width: 10),
         ],
         title: TextField(
           autofocus: true,
diff --git a/lib/pages/member_season_series/view.dart b/lib/pages/member_season_series/view.dart
index 2d71335ec..8098baecc 100644
--- a/lib/pages/member_season_series/view.dart
+++ b/lib/pages/member_season_series/view.dart
@@ -55,61 +55,63 @@ class _SeasonSeriesPageState extends State<SeasonSeriesPage>
   Widget _buildBody(LoadingState<List<SpaceSsModel>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: Grid.videoCardHDelegate(context),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) {
-              return const VideoCardHSkeleton();
-            },
-            childCount: 10,
-          ),
+        gridDelegate: Grid.videoCardHDelegate(context),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            return const VideoCardHSkeleton();
+          },
+          childCount: 10,
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  if (index == response.length - 1) {
-                    _controller.onLoadMore();
-                  }
-                  SpaceSsModel item = response[index];
-                  return SeasonSeriesCard(
-                    item: item,
-                    onTap: () {
-                      bool isSeason = item.meta!.seasonId != null;
-                      dynamic id =
-                          isSeason ? item.meta!.seasonId : item.meta!.seriesId;
-                      Get.to(
-                        Scaffold(
-                          appBar: AppBar(
-                            title: Text(item.meta!.name!),
-                          ),
-                          body: SafeArea(
-                            top: false,
-                            bottom: false,
-                            child: MemberVideo(
-                              type: isSeason
-                                  ? ContributeType.season
-                                  : ContributeType.series,
-                              heroTag: widget.heroTag,
-                              mid: widget.mid,
-                              seasonId: isSeason ? id : null,
-                              seriesId: isSeason ? null : id,
-                              title: item.meta!.name,
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    if (index == response.length - 1) {
+                      _controller.onLoadMore();
+                    }
+                    SpaceSsModel item = response[index];
+                    return SeasonSeriesCard(
+                      item: item,
+                      onTap: () {
+                        bool isSeason = item.meta!.seasonId != null;
+                        dynamic id = isSeason
+                            ? item.meta!.seasonId
+                            : item.meta!.seriesId;
+                        Get.to(
+                          Scaffold(
+                            appBar: AppBar(
+                              title: Text(item.meta!.name!),
+                            ),
+                            body: SafeArea(
+                              top: false,
+                              bottom: false,
+                              child: MemberVideo(
+                                type: isSeason
+                                    ? ContributeType.season
+                                    : ContributeType.series,
+                                heroTag: widget.heroTag,
+                                mid: widget.mid,
+                                seasonId: isSeason ? id : null,
+                                seriesId: isSeason ? null : id,
+                                title: item.meta!.name,
+                              ),
                             ),
                           ),
-                        ),
-                      );
-                    },
-                  );
-                },
-                childCount: response!.length,
-              ),
-            )
-          : HttpError(onReload: _controller.onReload),
+                        );
+                      },
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/member_season_series/widget/season_series_card.dart b/lib/pages/member_season_series/widget/season_series_card.dart
index 9a28bebf1..10389ce47 100644
--- a/lib/pages/member_season_series/widget/season_series_card.dart
+++ b/lib/pages/member_season_series/widget/season_series_card.dart
@@ -36,8 +36,7 @@ class SeasonSeriesCard extends StatelessWidget {
               AspectRatio(
                 aspectRatio: StyleString.aspectRatio,
                 child: LayoutBuilder(
-                  builder:
-                      (BuildContext context, BoxConstraints boxConstraints) {
+                  builder: (BuildContext context, BoxConstraints boxConstraints) {
                     final double maxWidth = boxConstraints.maxWidth;
                     final double maxHeight = boxConstraints.maxHeight;
                     return Stack(
diff --git a/lib/pages/member_upower_rank/controller.dart b/lib/pages/member_upower_rank/controller.dart
index 5697452b5..8e8ce1028 100644
--- a/lib/pages/member_upower_rank/controller.dart
+++ b/lib/pages/member_upower_rank/controller.dart
@@ -35,8 +35,8 @@ class UpowerRankController
 
   @override
   Future<LoadingState<UpowerRankData>> customGetData() => MemberHttp.upowerRank(
-        upMid: upMid,
-        page: page,
-        privilegeType: privilegeType,
-      );
+    upMid: upMid,
+    page: page,
+    privilegeType: privilegeType,
+  );
 }
diff --git a/lib/pages/member_upower_rank/view.dart b/lib/pages/member_upower_rank/view.dart
index 113d90d84..b8b773220 100644
--- a/lib/pages/member_upower_rank/view.dart
+++ b/lib/pages/member_upower_rank/view.dart
@@ -57,8 +57,9 @@ class _UpowerRankPageState extends State<UpowerRankPage>
             padding: EdgeInsets.only(
               bottom: MediaQuery.paddingOf(context).bottom + 80,
             ),
-            sliver:
-                Obx(() => _bilidBody(theme, _controller.loadingState.value)),
+            sliver: Obx(
+              () => _bilidBody(theme, _controller.loadingState.value),
+            ),
           ),
         ],
       ),
@@ -71,7 +72,8 @@ class _UpowerRankPageState extends State<UpowerRankPage>
             return name == null
                 ? const SizedBox.shrink()
                 : Text(
-                    '$name 充电排行榜${_controller.memberTotal == 0 ? '' : '(${_controller.memberTotal})'}');
+                    '$name 充电排行榜${_controller.memberTotal == 0 ? '' : '(${_controller.memberTotal})'}',
+                  );
           }),
         ),
         body: SafeArea(
@@ -94,21 +96,25 @@ class _UpowerRankPageState extends State<UpowerRankPage>
                                     isScrollable: true,
                                     tabAlignment: TabAlignment.start,
                                     tabs: tabs
-                                        .map((e) => Tab(
+                                        .map(
+                                          (e) => Tab(
                                             text:
-                                                '${e.name!}(${e.memberTotal ?? 0})'))
+                                                '${e.name!}(${e.memberTotal ?? 0})',
+                                          ),
+                                        )
                                         .toList(),
                                     onTap: (index) {
-                                      if (!DefaultTabController.of(context)
-                                          .indexIsChanging) {
+                                      if (!DefaultTabController.of(
+                                        context,
+                                      ).indexIsChanging) {
                                         try {
                                           if (index == 0) {
                                             _controller.animateToTop();
                                           } else {
                                             Get.find<UpowerRankController>(
-                                                    tag:
-                                                        '$_tag${tabs[index].privilegeType}')
-                                                .animateToTop();
+                                              tag:
+                                                  '$_tag${tabs[index].privilegeType}',
+                                            ).animateToTop();
                                           }
                                         } catch (_) {}
                                       }
@@ -118,15 +124,17 @@ class _UpowerRankPageState extends State<UpowerRankPage>
                                     child: tabBarView(
                                       children: [
                                         KeepAliveWrapper(
-                                            builder: (context) => child),
+                                          builder: (context) => child,
+                                        ),
                                         ...tabs
                                             .sublist(1)
-                                            .map((e) => UpowerRankPage(
-                                                  upMid: _upMid,
-                                                  tag: _tag,
-                                                  privilegeType:
-                                                      e.privilegeType,
-                                                ))
+                                            .map(
+                                              (e) => UpowerRankPage(
+                                                upMid: _upMid,
+                                                tag: _tag,
+                                                privilegeType: e.privilegeType,
+                                              ),
+                                            ),
                                       ],
                                     ),
                                   ),
@@ -148,17 +156,19 @@ class _UpowerRankPageState extends State<UpowerRankPage>
   }
 
   Widget _bilidBody(
-      ThemeData theme, LoadingState<List<UpowerRankInfo>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<UpowerRankInfo>?> loadingState,
+  ) {
     late final width = MediaQuery.textScalerOf(context).scale(32);
     return switch (loadingState) {
       Loading() => const SliverToBoxAdapter(
-          child: SizedBox(
-            height: 125,
-            child: Center(
-              child: CircularProgressIndicator(),
-            ),
+        child: SizedBox(
+          height: 125,
+          child: Center(
+            child: CircularProgressIndicator(),
           ),
         ),
+      ),
       Success<List<UpowerRankInfo>?>(:var response) =>
         response?.isNotEmpty == true
             ? SliverList.builder(
@@ -229,9 +239,9 @@ class _UpowerRankPageState extends State<UpowerRankPage>
               )
             : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/member_video/controller.dart b/lib/pages/member_video/controller.dart
index b3529110e..73bee60ed 100644
--- a/lib/pages/member_video/controller.dart
+++ b/lib/pages/member_video/controller.dart
@@ -74,7 +74,9 @@ class MemberVideoCtr
 
   @override
   bool customHandleResponse(
-      bool isRefresh, Success<SpaceArchiveData> response) {
+    bool isRefresh,
+    Success<SpaceArchiveData> response,
+  ) {
     SpaceArchiveData data = response.response;
     episodicButton
       ..value = data.episodicButton ?? EpisodicButton()
@@ -116,14 +118,14 @@ class MemberVideoCtr
         mid: mid,
         aid: type == ContributeType.video
             ? isLoadPrevious == true
-                ? firstAid
-                : lastAid
+                  ? firstAid
+                  : lastAid
             : null,
         order: type == ContributeType.video ? order.value : null,
         sort: type == ContributeType.video
             ? isLoadPrevious == true
-                ? 'asc'
-                : null
+                  ? 'asc'
+                  : null
             : sort.value,
         pn: type == ContributeType.charging ? page : null,
         next: next,
@@ -184,7 +186,8 @@ class MemberVideoCtr
             SmartDialog.showToast('已跳过不支持播放的视频');
           }
           bool desc = seasonId != null ? false : true;
-          desc = (seasonId != null || seriesId != null) &&
+          desc =
+              (seasonId != null || seriesId != null) &&
                   (type == ContributeType.video
                       ? order.value == 'click'
                       : sort.value == 'asc')
@@ -202,8 +205,9 @@ class MemberVideoCtr
                   '$username: ${title ?? episodicButton.text ?? '播放全部'}',
               if (seriesId == null) 'count': count.value,
               if (seasonId != null || seriesId != null)
-                'mediaType':
-                    Uri.parse(episodicButton.uri!).queryParameters['page_type'],
+                'mediaType': Uri.parse(
+                  episodicButton.uri!,
+                ).queryParameters['page_type'],
               'desc': desc,
               if (type == ContributeType.video)
                 'sortField': order.value == 'click' ? 2 : 1,
diff --git a/lib/pages/member_video/view.dart b/lib/pages/member_video/view.dart
index 6edc59d51..b8d049f66 100644
--- a/lib/pages/member_video/view.dart
+++ b/lib/pages/member_video/view.dart
@@ -72,7 +72,8 @@ class _MemberVideoState extends State<MemberVideo>
                   bottom: MediaQuery.paddingOf(context).bottom + 80,
                 ),
                 sliver: Obx(
-                    () => _buildBody(theme, _controller.loadingState.value)),
+                  () => _buildBody(theme, _controller.loadingState.value),
+                ),
               ),
             ],
           ),
@@ -105,135 +106,141 @@ class _MemberVideoState extends State<MemberVideo>
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<SpaceArchiveItem>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<SpaceArchiveItem>?> loadingState,
+  ) {
     return switch (loadingState) {
       Loading() => SliverPadding(
-          padding:
-              widget.isSingle ? const EdgeInsets.only(top: 7) : EdgeInsets.zero,
-          sliver: SliverGrid(
-            gridDelegate: Grid.videoCardHDelegate(context),
-            delegate: SliverChildBuilderDelegate(
-              (context, index) {
-                return const VideoCardHSkeleton();
-              },
-              childCount: 10,
-            ),
+        padding: widget.isSingle
+            ? const EdgeInsets.only(top: 7)
+            : EdgeInsets.zero,
+        sliver: SliverGrid(
+          gridDelegate: Grid.videoCardHDelegate(context),
+          delegate: SliverChildBuilderDelegate(
+            (context, index) {
+              return const VideoCardHSkeleton();
+            },
+            childCount: 10,
           ),
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverMainAxisGroup(
-              slivers: [
-                SliverPersistentHeader(
-                  pinned: false,
-                  floating: true,
-                  delegate: CustomSliverPersistentHeaderDelegate(
-                    extent: 40,
-                    bgColor: theme.colorScheme.surface,
-                    child: SizedBox(
-                      height: 40,
-                      child: Row(
-                        children: [
-                          const SizedBox(width: 8),
-                          Padding(
-                            padding: const EdgeInsets.only(left: 6),
-                            child: Obx(
-                              () {
-                                final count = _controller.count.value;
-                                return Text(
-                                  count != -1 ? '共$count视频' : '',
-                                  style: const TextStyle(fontSize: 13),
-                                );
-                              },
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverMainAxisGroup(
+                slivers: [
+                  SliverPersistentHeader(
+                    pinned: false,
+                    floating: true,
+                    delegate: CustomSliverPersistentHeaderDelegate(
+                      extent: 40,
+                      bgColor: theme.colorScheme.surface,
+                      child: SizedBox(
+                        height: 40,
+                        child: Row(
+                          children: [
+                            const SizedBox(width: 8),
+                            Padding(
+                              padding: const EdgeInsets.only(left: 6),
+                              child: Obx(
+                                () {
+                                  final count = _controller.count.value;
+                                  return Text(
+                                    count != -1 ? '共$count视频' : '',
+                                    style: const TextStyle(fontSize: 13),
+                                  );
+                                },
+                              ),
                             ),
-                          ),
-                          Obx(
-                            () {
-                              final episodicButton =
-                                  _controller.episodicButton.value;
-                              return episodicButton.uri?.isNotEmpty == true
-                                  ? Container(
-                                      height: 35,
-                                      padding: EdgeInsets.only(
+                            Obx(
+                              () {
+                                final episodicButton =
+                                    _controller.episodicButton.value;
+                                return episodicButton.uri?.isNotEmpty == true
+                                    ? Container(
+                                        height: 35,
+                                        padding: EdgeInsets.only(
                                           left: _controller.count.value != -1
                                               ? 6
-                                              : 0),
-                                      child: TextButton.icon(
-                                        onPressed: _controller.toViewPlayAll,
-                                        icon: Icon(
-                                          Icons.play_circle_outline_rounded,
-                                          size: 16,
-                                          color: theme.colorScheme.secondary,
+                                              : 0,
                                         ),
-                                        label: Text(
-                                          episodicButton.text ?? '播放全部',
-                                          style: TextStyle(
-                                            fontSize: 13,
+                                        child: TextButton.icon(
+                                          onPressed: _controller.toViewPlayAll,
+                                          icon: Icon(
+                                            Icons.play_circle_outline_rounded,
+                                            size: 16,
                                             color: theme.colorScheme.secondary,
                                           ),
+                                          label: Text(
+                                            episodicButton.text ?? '播放全部',
+                                            style: TextStyle(
+                                              fontSize: 13,
+                                              color:
+                                                  theme.colorScheme.secondary,
+                                            ),
+                                          ),
                                         ),
-                                      ),
-                                    )
-                                  : const SizedBox.shrink();
-                            },
-                          ),
-                          const Spacer(),
-                          SizedBox(
-                            height: 35,
-                            child: TextButton.icon(
-                              onPressed: _controller.queryBySort,
-                              icon: Icon(
-                                Icons.sort,
-                                size: 16,
-                                color: theme.colorScheme.secondary,
-                              ),
-                              label: Obx(
-                                () => Text(
-                                  widget.type == ContributeType.video
-                                      ? _controller.order.value == 'pubdate'
-                                          ? '最新发布'
-                                          : '最多播放'
-                                      : _controller.sort.value == 'desc'
-                                          ? '默认'
-                                          : '倒序',
-                                  style: TextStyle(
-                                    fontSize: 13,
-                                    color: theme.colorScheme.secondary,
+                                      )
+                                    : const SizedBox.shrink();
+                              },
+                            ),
+                            const Spacer(),
+                            SizedBox(
+                              height: 35,
+                              child: TextButton.icon(
+                                onPressed: _controller.queryBySort,
+                                icon: Icon(
+                                  Icons.sort,
+                                  size: 16,
+                                  color: theme.colorScheme.secondary,
+                                ),
+                                label: Obx(
+                                  () => Text(
+                                    widget.type == ContributeType.video
+                                        ? _controller.order.value == 'pubdate'
+                                              ? '最新发布'
+                                              : '最多播放'
+                                        : _controller.sort.value == 'desc'
+                                        ? '默认'
+                                        : '倒序',
+                                    style: TextStyle(
+                                      fontSize: 13,
+                                      color: theme.colorScheme.secondary,
+                                    ),
                                   ),
                                 ),
                               ),
                             ),
-                          ),
-                          const SizedBox(width: 8),
-                        ],
+                            const SizedBox(width: 8),
+                          ],
+                        ),
                       ),
                     ),
                   ),
-                ),
-                SliverGrid(
-                  gridDelegate: Grid.videoCardHDelegate(context),
-                  delegate: SliverChildBuilderDelegate(
-                    (context, index) {
-                      if (widget.type != ContributeType.season &&
-                          index == response.length - 1) {
-                        _controller.onLoadMore();
-                      }
-                      return VideoCardHMemberVideo(
-                        videoItem: response[index],
-                        fromViewAid: _controller.fromViewAid,
-                      );
-                    },
-                    childCount: response!.length,
+                  SliverGrid(
+                    gridDelegate: Grid.videoCardHDelegate(context),
+                    delegate: SliverChildBuilderDelegate(
+                      (context, index) {
+                        if (widget.type != ContributeType.season &&
+                            index == response.length - 1) {
+                          _controller.onLoadMore();
+                        }
+                        return VideoCardHMemberVideo(
+                          videoItem: response[index],
+                          fromViewAid: _controller.fromViewAid,
+                        );
+                      },
+                      childCount: response!.length,
+                    ),
                   ),
-                ),
-              ],
-            )
-          : HttpError(
-              onReload: _controller.onReload,
-            ),
+                ],
+              )
+            : HttpError(
+                onReload: _controller.onReload,
+              ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 }
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 c61b98a7a..89e722ae1 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
@@ -43,7 +43,8 @@ class VideoCardHMemberVideo extends StatelessWidget {
               cover: videoItem.cover,
               bvid: videoItem.bvid,
             ),
-            onTap: onTap ??
+            onTap:
+                onTap ??
                 () async {
                   if (videoItem.isPgc == true &&
                       videoItem.uri?.isNotEmpty == true) {
@@ -78,96 +79,113 @@ class VideoCardHMemberVideo extends StatelessWidget {
                       AspectRatio(
                         aspectRatio: StyleString.aspectRatio,
                         child: LayoutBuilder(
-                          builder: (BuildContext context,
-                              BoxConstraints boxConstraints) {
-                            final double maxWidth = boxConstraints.maxWidth;
-                            final double maxHeight = boxConstraints.maxHeight;
-                            return Stack(
-                              clipBehavior: Clip.none,
-                              children: [
-                                NetworkImgLayer(
-                                  src: videoItem.cover,
-                                  width: maxWidth,
-                                  height: maxHeight,
-                                ),
-                                if (fromViewAid == videoItem.param)
-                                  const Positioned.fill(
-                                    child: DecoratedBox(
-                                      decoration: BoxDecoration(
-                                        borderRadius: StyleString.mdRadius,
-                                        color: Colors.black54,
-                                      ),
-                                      child: Center(
-                                        child: Text(
-                                          '上次观看',
-                                          style: TextStyle(
-                                            color: Colors.white,
-                                            fontSize: 15,
-                                            letterSpacing: 5,
+                          builder:
+                              (
+                                BuildContext context,
+                                BoxConstraints boxConstraints,
+                              ) {
+                                final double maxWidth = boxConstraints.maxWidth;
+                                final double maxHeight =
+                                    boxConstraints.maxHeight;
+                                return Stack(
+                                  clipBehavior: Clip.none,
+                                  children: [
+                                    NetworkImgLayer(
+                                      src: videoItem.cover,
+                                      width: maxWidth,
+                                      height: maxHeight,
+                                    ),
+                                    if (fromViewAid == videoItem.param)
+                                      const Positioned.fill(
+                                        child: DecoratedBox(
+                                          decoration: BoxDecoration(
+                                            borderRadius: StyleString.mdRadius,
+                                            color: Colors.black54,
+                                          ),
+                                          child: Center(
+                                            child: Text(
+                                              '上次观看',
+                                              style: TextStyle(
+                                                color: Colors.white,
+                                                fontSize: 15,
+                                                letterSpacing: 5,
+                                              ),
+                                            ),
                                           ),
                                         ),
                                       ),
-                                    ),
-                                  ),
-                                if (videoItem.badges?.isNotEmpty == true)
-                                  PBadge(
-                                    text: videoItem.badges!
-                                        .map((item) => item.text)
-                                        .join('|'),
-                                    right: 6.0,
-                                    top: 6.0,
-                                    type: videoItem.badges!.first.text == '充电专属'
-                                        ? PBadgeType.error
-                                        : PBadgeType.primary,
-                                  ),
-                                if (videoItem.history != null) ...[
-                                  Builder(builder: (context) {
-                                    try {
-                                      return Positioned(
-                                        left: 0,
-                                        right: 0,
-                                        bottom: 0,
-                                        child: videoProgressIndicator(
-                                          videoItem.history!.progress! /
-                                              videoItem.history!.duration!,
-                                        ),
-                                      );
-                                    } catch (_) {
-                                      return const SizedBox.shrink();
-                                    }
-                                  }),
-                                  Builder(builder: (context) {
-                                    try {
-                                      return PBadge(
-                                        text: videoItem.history!.progress ==
-                                                videoItem.history!.duration
-                                            ? '已看完'
-                                            : '${DurationUtil.formatDuration(videoItem.history!.progress)}/${DurationUtil.formatDuration(videoItem.history!.duration)}',
+                                    if (videoItem.badges?.isNotEmpty == true)
+                                      PBadge(
+                                        text: videoItem.badges!
+                                            .map((item) => item.text)
+                                            .join('|'),
                                         right: 6.0,
-                                        bottom: 6.0,
-                                        type: PBadgeType.gray,
-                                      );
-                                    } catch (_) {
-                                      return PBadge(
+                                        top: 6.0,
+                                        type:
+                                            videoItem.badges!.first.text ==
+                                                '充电专属'
+                                            ? PBadgeType.error
+                                            : PBadgeType.primary,
+                                      ),
+                                    if (videoItem.history != null) ...[
+                                      Builder(
+                                        builder: (context) {
+                                          try {
+                                            return Positioned(
+                                              left: 0,
+                                              right: 0,
+                                              bottom: 0,
+                                              child: videoProgressIndicator(
+                                                videoItem.history!.progress! /
+                                                    videoItem
+                                                        .history!
+                                                        .duration!,
+                                              ),
+                                            );
+                                          } catch (_) {
+                                            return const SizedBox.shrink();
+                                          }
+                                        },
+                                      ),
+                                      Builder(
+                                        builder: (context) {
+                                          try {
+                                            return PBadge(
+                                              text:
+                                                  videoItem.history!.progress ==
+                                                      videoItem
+                                                          .history!
+                                                          .duration
+                                                  ? '已看完'
+                                                  : '${DurationUtil.formatDuration(videoItem.history!.progress)}/${DurationUtil.formatDuration(videoItem.history!.duration)}',
+                                              right: 6.0,
+                                              bottom: 6.0,
+                                              type: PBadgeType.gray,
+                                            );
+                                          } catch (_) {
+                                            return PBadge(
+                                              text: DurationUtil.formatDuration(
+                                                videoItem.duration,
+                                              ),
+                                              right: 6.0,
+                                              bottom: 6.0,
+                                              type: PBadgeType.gray,
+                                            );
+                                          }
+                                        },
+                                      ),
+                                    ] else if (videoItem.duration > 0)
+                                      PBadge(
                                         text: DurationUtil.formatDuration(
-                                            videoItem.duration),
+                                          videoItem.duration,
+                                        ),
                                         right: 6.0,
                                         bottom: 6.0,
                                         type: PBadgeType.gray,
-                                      );
-                                    }
-                                  }),
-                                ] else if (videoItem.duration > 0)
-                                  PBadge(
-                                    text: DurationUtil.formatDuration(
-                                        videoItem.duration),
-                                    right: 6.0,
-                                    bottom: 6.0,
-                                    type: PBadgeType.gray,
-                                  ),
-                              ],
-                            );
-                          },
+                                      ),
+                                  ],
+                                );
+                              },
                         ),
                       ),
                       const SizedBox(width: 10),
@@ -193,7 +211,8 @@ class VideoCardHMemberVideo extends StatelessWidget {
   }
 
   Widget content(BuildContext context, ThemeData theme) {
-    final isCurr = fromViewAid == videoItem.param ||
+    final isCurr =
+        fromViewAid == videoItem.param ||
         (videoItem.bvid != null && videoItem.bvid == bvid);
     return Expanded(
       child: Column(
diff --git a/lib/pages/mine/controller.dart b/lib/pages/mine/controller.dart
index 144dd6433..c4535a382 100644
--- a/lib/pages/mine/controller.dart
+++ b/lib/pages/mine/controller.dart
@@ -23,9 +23,10 @@ class MineController extends GetxController {
   AccountService accountService = Get.find<AccountService>();
 
   Rx<ThemeType> themeType = ThemeType.system.obs;
-  static RxBool anonymity = (Accounts.account.isNotEmpty &&
-          !Accounts.get(AccountType.heartbeat).isLogin)
-      .obs;
+  static RxBool anonymity =
+      (Accounts.account.isNotEmpty &&
+              !Accounts.get(AccountType.heartbeat).isLogin)
+          .obs;
   ThemeType get nextThemeType =>
       ThemeType.values[(themeType.value.index + 1) % ThemeType.values.length];
 
@@ -42,8 +43,10 @@ class MineController extends GetxController {
     if (!accountService.isLogin.value || longPress) {
       Get.toNamed('/loginPage', preventDuplicates: false);
     } else {
-      Get.toNamed('/member?mid=${userInfo.value.mid}',
-          preventDuplicates: false);
+      Get.toNamed(
+        '/member?mid=${userInfo.value.mid}',
+        preventDuplicates: false,
+      );
     }
   }
 
@@ -99,8 +102,9 @@ class MineController extends GetxController {
         alignment: Alignment.bottomCenter,
         builder: (context) {
           final theme = Theme.of(context);
-          final style =
-              TextStyle(color: theme.colorScheme.onSecondaryContainer);
+          final style = TextStyle(
+            color: theme.colorScheme.onSecondaryContainer,
+          );
           return ColoredBox(
             color: theme.colorScheme.secondaryContainer,
             child: Padding(
@@ -118,7 +122,7 @@ class MineController extends GetxController {
                     children: <Widget>[
                       const Icon(MdiIcons.incognito, size: 20),
                       const SizedBox(width: 10),
-                      Text('已进入无痕模式', style: theme.textTheme.titleMedium)
+                      Text('已进入无痕模式', style: theme.textTheme.titleMedium),
                     ],
                   ),
                   const SizedBox(height: 10),
@@ -226,7 +230,9 @@ class MineController extends GetxController {
       SmartDialog.showToast('账号未登录');
       return;
     }
-    Get.toNamed('/memberDynamics?mid=${userInfo.value.mid}',
-        preventDuplicates: false);
+    Get.toNamed(
+      '/memberDynamics?mid=${userInfo.value.mid}',
+      preventDuplicates: false,
+    );
   }
 }
diff --git a/lib/pages/mine/view.dart b/lib/pages/mine/view.dart
index cd421b7eb..ed8938d5e 100644
--- a/lib/pages/mine/view.dart
+++ b/lib/pages/mine/view.dart
@@ -20,65 +20,65 @@ class _MinePageState extends State<MinePage> {
     ..queryUserInfo();
 
   Widget _header(ThemeData theme) => Row(
-        children: [
-          const SizedBox(width: 12),
-          Image.asset(
-            'assets/images/logo/logo.png',
-            width: 35,
-          ),
-          const SizedBox(width: 5),
-          Text(
-            'PiliPlus',
-            style: theme.textTheme.titleMedium,
-          ),
-          const Spacer(),
-          Obx(
-            () {
-              final anonymity = MineController.anonymity.value;
-              return IconButton(
-                iconSize: 40.0,
-                padding: const EdgeInsets.all(8),
-                style: const ButtonStyle(
-                  tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                ),
-                tooltip: "${anonymity ? '退出' : '进入'}无痕模式",
-                onPressed: MineController.onChangeAnonymity,
-                icon: anonymity
-                    ? const Icon(MdiIcons.incognito, size: 24)
-                    : const Icon(MdiIcons.incognitoOff, size: 24),
-              );
-            },
-          ),
-          Obx(
-            () {
-              return IconButton(
-                iconSize: 40.0,
-                padding: const EdgeInsets.all(8),
-                style: const ButtonStyle(
-                  tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                ),
-                tooltip: '切换至${_mineController.nextThemeType.desc}主题',
-                onPressed: _mineController.onChangeTheme,
-                icon: _mineController.themeType.value.icon,
-              );
-            },
-          ),
-          IconButton(
+    children: [
+      const SizedBox(width: 12),
+      Image.asset(
+        'assets/images/logo/logo.png',
+        width: 35,
+      ),
+      const SizedBox(width: 5),
+      Text(
+        'PiliPlus',
+        style: theme.textTheme.titleMedium,
+      ),
+      const Spacer(),
+      Obx(
+        () {
+          final anonymity = MineController.anonymity.value;
+          return IconButton(
             iconSize: 40.0,
             padding: const EdgeInsets.all(8),
             style: const ButtonStyle(
               tapTargetSize: MaterialTapTargetSize.shrinkWrap,
             ),
-            tooltip: '设置',
-            onPressed: () => {
-              Get.back(),
-              Get.toNamed('/setting', preventDuplicates: false),
-            },
-            icon: const Icon(MdiIcons.cogs, size: 24),
-          ),
-          const SizedBox(width: 10),
-        ],
-      );
+            tooltip: "${anonymity ? '退出' : '进入'}无痕模式",
+            onPressed: MineController.onChangeAnonymity,
+            icon: anonymity
+                ? const Icon(MdiIcons.incognito, size: 24)
+                : const Icon(MdiIcons.incognitoOff, size: 24),
+          );
+        },
+      ),
+      Obx(
+        () {
+          return IconButton(
+            iconSize: 40.0,
+            padding: const EdgeInsets.all(8),
+            style: const ButtonStyle(
+              tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+            ),
+            tooltip: '切换至${_mineController.nextThemeType.desc}主题',
+            onPressed: _mineController.onChangeTheme,
+            icon: _mineController.themeType.value.icon,
+          );
+        },
+      ),
+      IconButton(
+        iconSize: 40.0,
+        padding: const EdgeInsets.all(8),
+        style: const ButtonStyle(
+          tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+        ),
+        tooltip: '设置',
+        onPressed: () => {
+          Get.back(),
+          Get.toNamed('/setting', preventDuplicates: false),
+        },
+        icon: const Icon(MdiIcons.cogs, size: 24),
+      ),
+      const SizedBox(width: 10),
+    ],
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -174,7 +174,11 @@ class _MinePageState extends State<MinePage> {
                             ),
                           ),
                           Image.asset(
-                            'assets/images/lv/lv${levelInfo == null ? 0 : userInfo.isSeniorMember == 1 ? '6_s' : levelInfo.currentLevel}.png',
+                            'assets/images/lv/lv${levelInfo == null
+                                ? 0
+                                : userInfo.isSeniorMember == 1
+                                ? '6_s'
+                                : levelInfo.currentLevel}.png',
                             height: 10,
                           ),
                         ],
@@ -242,7 +246,8 @@ class _MinePageState extends State<MinePage> {
                             : 0,
                         backgroundColor: theme.colorScheme.inversePrimary,
                         valueColor: AlwaysStoppedAnimation<Color>(
-                            theme.colorScheme.primary),
+                          theme.colorScheme.primary,
+                        ),
                       ),
                     ],
                   ),
diff --git a/lib/pages/msg_feed_top/at_me/view.dart b/lib/pages/msg_feed_top/at_me/view.dart
index b03e6790e..b3fe342f0 100644
--- a/lib/pages/msg_feed_top/at_me/view.dart
+++ b/lib/pages/msg_feed_top/at_me/view.dart
@@ -35,7 +35,8 @@ class _AtMePageState extends State<AtMePage> {
           IconButton(
             onPressed: () => Get.to(
               const WhisperSettingsPage(
-                  imSettingType: IMSettingType.SETTING_TYPE_OLD_AT_ME),
+                imSettingType: IMSettingType.SETTING_TYPE_OLD_AT_ME,
+              ),
             ),
             icon: Icon(
               size: 20,
@@ -53,9 +54,11 @@ class _AtMePageState extends State<AtMePage> {
           slivers: [
             SliverPadding(
               padding: EdgeInsets.only(
-                  bottom: MediaQuery.paddingOf(context).bottom + 80),
+                bottom: MediaQuery.paddingOf(context).bottom + 80,
+              ),
               sliver: Obx(
-                  () => _buildBody(theme, _atMeController.loadingState.value)),
+                () => _buildBody(theme, _atMeController.loadingState.value),
+              ),
             ),
           ],
         ),
@@ -64,7 +67,9 @@ class _AtMePageState extends State<AtMePage> {
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<MsgAtItem>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<MsgAtItem>?> loadingState,
+  ) {
     late final divider = Divider(
       indent: 72,
       endIndent: 20,
@@ -73,98 +78,102 @@ class _AtMePageState extends State<AtMePage> {
     );
     return switch (loadingState) {
       Loading() => SliverList.builder(
-          itemCount: 12,
-          itemBuilder: (context, index) {
-            return const MsgFeedTopSkeleton();
-          },
-        ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverList.separated(
-              itemCount: response!.length,
-              itemBuilder: (context, int index) {
-                if (index == response.length - 1) {
-                  _atMeController.onLoadMore();
-                }
-                final item = response[index];
-                return ListTile(
-                  onTap: () {
-                    String? nativeUri = item.item?.nativeUri;
-                    if (nativeUri == null ||
-                        nativeUri.isEmpty ||
-                        nativeUri.startsWith('?')) {
-                      return;
-                    }
-                    PiliScheme.routePushFromUrl(nativeUri);
-                  },
-                  onLongPress: () => showConfirmDialog(
-                    context: context,
-                    title: '确定删除该通知?',
-                    onConfirm: () => _atMeController.onRemove(item.id, index),
-                  ),
-                  leading: GestureDetector(
-                    onTap: () => Get.toNamed('/member?mid=${item.user?.mid}'),
-                    child: NetworkImgLayer(
-                      width: 45,
-                      height: 45,
-                      type: ImageType.avatar,
-                      src: item.user?.avatar,
+        itemCount: 12,
+        itemBuilder: (context, index) {
+          return const MsgFeedTopSkeleton();
+        },
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverList.separated(
+                itemCount: response!.length,
+                itemBuilder: (context, int index) {
+                  if (index == response.length - 1) {
+                    _atMeController.onLoadMore();
+                  }
+                  final item = response[index];
+                  return ListTile(
+                    onTap: () {
+                      String? nativeUri = item.item?.nativeUri;
+                      if (nativeUri == null ||
+                          nativeUri.isEmpty ||
+                          nativeUri.startsWith('?')) {
+                        return;
+                      }
+                      PiliScheme.routePushFromUrl(nativeUri);
+                    },
+                    onLongPress: () => showConfirmDialog(
+                      context: context,
+                      title: '确定删除该通知?',
+                      onConfirm: () => _atMeController.onRemove(item.id, index),
                     ),
-                  ),
-                  title: Text.rich(
-                    TextSpan(
+                    leading: GestureDetector(
+                      onTap: () => Get.toNamed('/member?mid=${item.user?.mid}'),
+                      child: NetworkImgLayer(
+                        width: 45,
+                        height: 45,
+                        type: ImageType.avatar,
+                        src: item.user?.avatar,
+                      ),
+                    ),
+                    title: Text.rich(
+                      TextSpan(
+                        children: [
+                          TextSpan(
+                            text: "${item.user?.nickname}",
+                            style: theme.textTheme.titleSmall!.copyWith(
+                              color: theme.colorScheme.primary,
+                            ),
+                          ),
+                          TextSpan(
+                            text: " 在${item.item?.business}中@了我",
+                            style: theme.textTheme.titleSmall!.copyWith(
+                              color: theme.colorScheme.onSurfaceVariant,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    subtitle: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-                        TextSpan(
-                          text: "${item.user?.nickname}",
-                          style: theme.textTheme.titleSmall!.copyWith(
-                            color: theme.colorScheme.primary,
-                          ),
-                        ),
-                        TextSpan(
-                          text: " 在${item.item?.business}中@了我",
-                          style: theme.textTheme.titleSmall!.copyWith(
-                            color: theme.colorScheme.onSurfaceVariant,
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                  subtitle: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      if (item.item?.sourceContent?.isNotEmpty == true) ...[
-                        const SizedBox(height: 4),
-                        Text(item.item!.sourceContent!,
+                        if (item.item?.sourceContent?.isNotEmpty == true) ...[
+                          const SizedBox(height: 4),
+                          Text(
+                            item.item!.sourceContent!,
                             maxLines: 3,
                             overflow: TextOverflow.ellipsis,
-                            style: theme.textTheme.bodyMedium!
-                                .copyWith(color: theme.colorScheme.outline)),
-                      ],
-                      const SizedBox(height: 4),
-                      Text(
-                        DateUtil.dateFormat(item.atTime),
-                        style: theme.textTheme.bodyMedium!.copyWith(
-                          fontSize: 13,
-                          color: theme.colorScheme.outline,
+                            style: theme.textTheme.bodyMedium!.copyWith(
+                              color: theme.colorScheme.outline,
+                            ),
+                          ),
+                        ],
+                        const SizedBox(height: 4),
+                        Text(
+                          DateUtil.dateFormat(item.atTime),
+                          style: theme.textTheme.bodyMedium!.copyWith(
+                            fontSize: 13,
+                            color: theme.colorScheme.outline,
+                          ),
                         ),
-                      ),
-                    ],
-                  ),
-                  trailing: item.item?.image != null && item.item?.image != ""
-                      ? NetworkImgLayer(
-                          width: 45,
-                          height: 45,
-                          src: item.item?.image,
-                        )
-                      : null,
-                );
-              },
-              separatorBuilder: (context, index) => divider,
-            )
-          : HttpError(onReload: _atMeController.onReload),
+                      ],
+                    ),
+                    trailing: item.item?.image != null && item.item?.image != ""
+                        ? NetworkImgLayer(
+                            width: 45,
+                            height: 45,
+                            src: item.item?.image,
+                          )
+                        : null,
+                  );
+                },
+                separatorBuilder: (context, index) => divider,
+              )
+            : HttpError(onReload: _atMeController.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _atMeController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _atMeController.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/msg_feed_top/like_detail/view.dart b/lib/pages/msg_feed_top/like_detail/view.dart
index 42e2202e8..b95e16d26 100644
--- a/lib/pages/msg_feed_top/like_detail/view.dart
+++ b/lib/pages/msg_feed_top/like_detail/view.dart
@@ -21,8 +21,10 @@ class LikeDetailPage extends StatefulWidget {
 }
 
 class _LikeDetailPageState extends State<LikeDetailPage> {
-  final LikeDetailController _controller =
-      Get.put(LikeDetailController(), tag: Utils.generateRandomString(8));
+  final LikeDetailController _controller = Get.put(
+    LikeDetailController(),
+    tag: Utils.generateRandomString(8),
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -36,9 +38,11 @@ class _LikeDetailPageState extends State<LikeDetailPage> {
           slivers: [
             SliverPadding(
               padding: EdgeInsets.only(
-                  bottom: MediaQuery.paddingOf(context).bottom + 80),
-              sliver:
-                  Obx(() => _buildBody(theme, _controller.loadingState.value)),
+                bottom: MediaQuery.paddingOf(context).bottom + 80,
+              ),
+              sliver: Obx(
+                () => _buildBody(theme, _controller.loadingState.value),
+              ),
             ),
           ],
         ),
@@ -47,7 +51,9 @@ class _LikeDetailPageState extends State<LikeDetailPage> {
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<MsgLikeDetailItem>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<MsgLikeDetailItem>?> loadingState,
+  ) {
     late final divider = Divider(
       indent: 72,
       endIndent: 20,
@@ -56,38 +62,38 @@ class _LikeDetailPageState extends State<LikeDetailPage> {
     );
     return switch (loadingState) {
       Loading() => SliverList.builder(
-          itemCount: 12,
-          itemBuilder: (context, index) {
-            return const MsgFeedTopSkeleton();
-          },
-        ),
+        itemCount: 12,
+        itemBuilder: (context, index) {
+          return const MsgFeedTopSkeleton();
+        },
+      ),
       Success(:var response) => SliverMainAxisGroup(
-          slivers: [
-            if (_controller.card != null) ...[
-              _buildCard(_controller.card!),
-              SliverToBoxAdapter(
-                child: Divider(
-                  height: 1,
-                  color: Colors.grey.withValues(alpha: 0.1),
-                ),
+        slivers: [
+          if (_controller.card != null) ...[
+            _buildCard(_controller.card!),
+            SliverToBoxAdapter(
+              child: Divider(
+                height: 1,
+                color: Colors.grey.withValues(alpha: 0.1),
               ),
-            ],
-            SliverList.separated(
-              itemCount: response!.length,
-              itemBuilder: (context, index) {
-                if (index == response.length - 1) {
-                  _controller.onLoadMore();
-                }
-                return _buildItem(theme, response[index]);
-              },
-              separatorBuilder: (context, index) => divider,
             ),
           ],
-        ),
+          SliverList.separated(
+            itemCount: response!.length,
+            itemBuilder: (context, index) {
+              if (index == response.length - 1) {
+                _controller.onLoadMore();
+              }
+              return _buildItem(theme, response[index]);
+            },
+            separatorBuilder: (context, index) => divider,
+          ),
+        ],
+      ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
@@ -118,8 +124,10 @@ class _LikeDetailPageState extends State<LikeDetailPage> {
           children: [
             TextSpan(
               text: "${item.user!.nickname}",
-              style: theme.textTheme.titleSmall!
-                  .copyWith(height: 1.5, color: theme.colorScheme.primary),
+              style: theme.textTheme.titleSmall!.copyWith(
+                height: 1.5,
+                color: theme.colorScheme.primary,
+              ),
             ),
             TextSpan(
               text: " 赞了我",
diff --git a/lib/pages/msg_feed_top/like_me/controller.dart b/lib/pages/msg_feed_top/like_me/controller.dart
index 37f1f7018..6c428dfeb 100644
--- a/lib/pages/msg_feed_top/like_me/controller.dart
+++ b/lib/pages/msg_feed_top/like_me/controller.dart
@@ -7,8 +7,12 @@ import 'package:PiliPlus/pages/common/common_data_controller.dart';
 import 'package:PiliPlus/utils/extension.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 
-class LikeMeController extends CommonDataController<MsgLikeData,
-    Pair<List<MsgLikeItem>, List<MsgLikeItem>>> {
+class LikeMeController
+    extends
+        CommonDataController<
+          MsgLikeData,
+          Pair<List<MsgLikeItem>, List<MsgLikeItem>>
+        > {
   int? cursor;
   int? cursorTime;
 
diff --git a/lib/pages/msg_feed_top/like_me/view.dart b/lib/pages/msg_feed_top/like_me/view.dart
index d67483b77..d1a42798e 100644
--- a/lib/pages/msg_feed_top/like_me/view.dart
+++ b/lib/pages/msg_feed_top/like_me/view.dart
@@ -36,7 +36,8 @@ class _LikeMePageState extends State<LikeMePage> {
           IconButton(
             onPressed: () => Get.to(
               const WhisperSettingsPage(
-                  imSettingType: IMSettingType.SETTING_TYPE_OLD_RECEIVE_LIKE),
+                imSettingType: IMSettingType.SETTING_TYPE_OLD_RECEIVE_LIKE,
+              ),
             ),
             icon: Icon(
               size: 20,
@@ -54,9 +55,11 @@ class _LikeMePageState extends State<LikeMePage> {
           slivers: [
             SliverPadding(
               padding: EdgeInsets.only(
-                  bottom: MediaQuery.paddingOf(context).bottom + 80),
-              sliver: Obx(() =>
-                  _buildBody(theme, _likeMeController.loadingState.value)),
+                bottom: MediaQuery.paddingOf(context).bottom + 80,
+              ),
+              sliver: Obx(
+                () => _buildBody(theme, _likeMeController.loadingState.value),
+              ),
             ),
           ],
         ),
@@ -73,67 +76,67 @@ class _LikeMePageState extends State<LikeMePage> {
     );
     return switch (loadingState) {
       Loading() => SliverList.builder(
-          itemCount: 12,
-          itemBuilder: (context, index) {
-            return const MsgFeedTopSkeleton();
-          },
-        ),
+        itemCount: 12,
+        itemBuilder: (context, index) {
+          return const MsgFeedTopSkeleton();
+        },
+      ),
       Success(:var response) => Builder(
-          builder: (context) {
-            Pair<List<MsgLikeItem>, List<MsgLikeItem>> pair = response;
-            List<MsgLikeItem> latest = pair.first;
-            List<MsgLikeItem> total = pair.second;
-            if (latest.isNotEmpty || total.isNotEmpty) {
-              return SliverMainAxisGroup(
-                slivers: [
-                  if (latest.isNotEmpty) ...[
-                    _buildHeader(theme, '最新'),
-                    SliverList.separated(
-                      itemBuilder: (context, index) {
-                        if (total.isEmpty && index == latest.length - 1) {
-                          _likeMeController.onLoadMore();
-                        }
-                        return _buildItem(
-                          theme,
-                          latest[index],
-                          (id) {
-                            _likeMeController.onRemove(id, index, true);
-                          },
-                        );
-                      },
-                      itemCount: latest.length,
-                      separatorBuilder: (context, index) => divider,
-                    ),
-                  ],
-                  if (total.isNotEmpty) ...[
-                    _buildHeader(theme, '累计'),
-                    SliverList.separated(
-                      itemBuilder: (context, index) {
-                        if (index == total.length - 1) {
-                          _likeMeController.onLoadMore();
-                        }
-                        return _buildItem(
-                          theme,
-                          total[index],
-                          (id) {
-                            _likeMeController.onRemove(id, index, false);
-                          },
-                        );
-                      },
-                      itemCount: total.length,
-                      separatorBuilder: (context, index) => divider,
-                    ),
-                  ],
+        builder: (context) {
+          Pair<List<MsgLikeItem>, List<MsgLikeItem>> pair = response;
+          List<MsgLikeItem> latest = pair.first;
+          List<MsgLikeItem> total = pair.second;
+          if (latest.isNotEmpty || total.isNotEmpty) {
+            return SliverMainAxisGroup(
+              slivers: [
+                if (latest.isNotEmpty) ...[
+                  _buildHeader(theme, '最新'),
+                  SliverList.separated(
+                    itemBuilder: (context, index) {
+                      if (total.isEmpty && index == latest.length - 1) {
+                        _likeMeController.onLoadMore();
+                      }
+                      return _buildItem(
+                        theme,
+                        latest[index],
+                        (id) {
+                          _likeMeController.onRemove(id, index, true);
+                        },
+                      );
+                    },
+                    itemCount: latest.length,
+                    separatorBuilder: (context, index) => divider,
+                  ),
                 ],
-              );
-            }
-            return HttpError(onReload: _likeMeController.onReload);
-          },
-        ),
+                if (total.isNotEmpty) ...[
+                  _buildHeader(theme, '累计'),
+                  SliverList.separated(
+                    itemBuilder: (context, index) {
+                      if (index == total.length - 1) {
+                        _likeMeController.onLoadMore();
+                      }
+                      return _buildItem(
+                        theme,
+                        total[index],
+                        (id) {
+                          _likeMeController.onRemove(id, index, false);
+                        },
+                      );
+                    },
+                    itemCount: total.length,
+                    separatorBuilder: (context, index) => divider,
+                  ),
+                ],
+              ],
+            );
+          }
+          return HttpError(onReload: _likeMeController.onReload);
+        },
+      ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _likeMeController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _likeMeController.onReload,
+      ),
     };
   }
 
@@ -241,19 +244,22 @@ class _LikeMePageState extends State<LikeMePage> {
             child: Stack(
               clipBehavior: Clip.none,
               children: [
-                for (var j = 0;
-                    j < item.users!.length && j < 4;
-                    j++) ...<Widget>[
+                for (
+                  var j = 0;
+                  j < item.users!.length && j < 4;
+                  j++
+                ) ...<Widget>[
                   Positioned(
-                      left: 15 * (j % 2).toDouble(),
-                      top: 15 * (j ~/ 2).toDouble(),
-                      child: NetworkImgLayer(
-                        width: item.users!.length > 1 ? 30 : 45,
-                        height: item.users!.length > 1 ? 30 : 45,
-                        type: ImageType.avatar,
-                        src: item.users![j].avatar,
-                      )),
-                ]
+                    left: 15 * (j % 2).toDouble(),
+                    top: 15 * (j ~/ 2).toDouble(),
+                    child: NetworkImgLayer(
+                      width: item.users!.length > 1 ? 30 : 45,
+                      height: item.users!.length > 1 ? 30 : 45,
+                      type: ImageType.avatar,
+                      src: item.users![j].avatar,
+                    ),
+                  ),
+                ],
               ],
             ),
           ),
@@ -265,14 +271,18 @@ class _LikeMePageState extends State<LikeMePage> {
           children: [
             TextSpan(
               text: "${item.users![0].nickname}",
-              style: theme.textTheme.titleSmall!
-                  .copyWith(height: 1.5, color: theme.colorScheme.primary),
+              style: theme.textTheme.titleSmall!.copyWith(
+                height: 1.5,
+                color: theme.colorScheme.primary,
+              ),
             ),
             if (item.counts! > 1)
               TextSpan(
                 text: ' 等${item.counts}人',
-                style: theme.textTheme.titleSmall!
-                    .copyWith(fontSize: 12, height: 1.5),
+                style: theme.textTheme.titleSmall!.copyWith(
+                  fontSize: 12,
+                  height: 1.5,
+                ),
               ),
             TextSpan(
               text: " 赞了我的${item.item?.business}",
@@ -291,11 +301,15 @@ class _LikeMePageState extends State<LikeMePage> {
         children: [
           if (item.item?.title?.isNotEmpty == true) ...[
             const SizedBox(height: 4),
-            Text(item.item!.title!,
-                maxLines: 3,
-                overflow: TextOverflow.ellipsis,
-                style: theme.textTheme.bodyMedium!
-                    .copyWith(color: theme.colorScheme.outline, height: 1.5)),
+            Text(
+              item.item!.title!,
+              maxLines: 3,
+              overflow: TextOverflow.ellipsis,
+              style: theme.textTheme.bodyMedium!.copyWith(
+                color: theme.colorScheme.outline,
+                height: 1.5,
+              ),
+            ),
           ],
           const SizedBox(height: 4),
           Text(
diff --git a/lib/pages/msg_feed_top/reply_me/view.dart b/lib/pages/msg_feed_top/reply_me/view.dart
index 614e575f6..925d770a8 100644
--- a/lib/pages/msg_feed_top/reply_me/view.dart
+++ b/lib/pages/msg_feed_top/reply_me/view.dart
@@ -35,7 +35,8 @@ class _ReplyMePageState extends State<ReplyMePage> {
           IconButton(
             onPressed: () => Get.to(
               const WhisperSettingsPage(
-                  imSettingType: IMSettingType.SETTING_TYPE_OLD_REPLY_ME),
+                imSettingType: IMSettingType.SETTING_TYPE_OLD_REPLY_ME,
+              ),
             ),
             icon: Icon(
               size: 20,
@@ -53,9 +54,11 @@ class _ReplyMePageState extends State<ReplyMePage> {
           slivers: [
             SliverPadding(
               padding: EdgeInsets.only(
-                  bottom: MediaQuery.paddingOf(context).bottom + 80),
-              sliver: Obx(() =>
-                  _buildBody(theme, _replyMeController.loadingState.value)),
+                bottom: MediaQuery.paddingOf(context).bottom + 80,
+              ),
+              sliver: Obx(
+                () => _buildBody(theme, _replyMeController.loadingState.value),
+              ),
             ),
           ],
         ),
@@ -64,7 +67,9 @@ class _ReplyMePageState extends State<ReplyMePage> {
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<MsgReplyItem>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<MsgReplyItem>?> loadingState,
+  ) {
     late final divider = Divider(
       indent: 72,
       endIndent: 20,
@@ -73,111 +78,125 @@ class _ReplyMePageState extends State<ReplyMePage> {
     );
     return switch (loadingState) {
       Loading() => SliverList.builder(
-          itemCount: 12,
-          itemBuilder: (context, index) {
-            return const MsgFeedTopSkeleton();
-          },
-        ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverList.separated(
-              itemCount: response!.length,
-              itemBuilder: (context, int index) {
-                if (index == response.length - 1) {
-                  _replyMeController.onLoadMore();
-                }
+        itemCount: 12,
+        itemBuilder: (context, index) {
+          return const MsgFeedTopSkeleton();
+        },
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverList.separated(
+                itemCount: response!.length,
+                itemBuilder: (context, int index) {
+                  if (index == response.length - 1) {
+                    _replyMeController.onLoadMore();
+                  }
 
-                MsgReplyItem item = response[index];
-                return ListTile(
-                  onTap: () {
-                    String? nativeUri = item.item?.nativeUri;
-                    if (nativeUri == null ||
-                        nativeUri.isEmpty ||
-                        nativeUri.startsWith('?')) {
-                      return;
-                    }
-                    PiliScheme.routePushFromUrl(
-                      nativeUri,
-                      businessId: item.item?.businessId,
-                      oid: item.item?.subjectId,
-                    );
-                  },
-                  onLongPress: () => showConfirmDialog(
-                    context: context,
-                    title: '确定删除该通知?',
-                    onConfirm: () =>
-                        _replyMeController.onRemove(item.id, index),
-                  ),
-                  leading: GestureDetector(
-                    onTap: () => Get.toNamed('/member?mid=${item.user?.mid}'),
-                    child: NetworkImgLayer(
-                      width: 45,
-                      height: 45,
-                      type: ImageType.avatar,
-                      src: item.user?.avatar,
+                  MsgReplyItem item = response[index];
+                  return ListTile(
+                    onTap: () {
+                      String? nativeUri = item.item?.nativeUri;
+                      if (nativeUri == null ||
+                          nativeUri.isEmpty ||
+                          nativeUri.startsWith('?')) {
+                        return;
+                      }
+                      PiliScheme.routePushFromUrl(
+                        nativeUri,
+                        businessId: item.item?.businessId,
+                        oid: item.item?.subjectId,
+                      );
+                    },
+                    onLongPress: () => showConfirmDialog(
+                      context: context,
+                      title: '确定删除该通知?',
+                      onConfirm: () =>
+                          _replyMeController.onRemove(item.id, index),
                     ),
-                  ),
-                  title: Text.rich(
-                    TextSpan(
-                      children: [
-                        TextSpan(
-                          text: "${item.user?.nickname}",
-                          style: theme.textTheme.titleSmall!
-                              .copyWith(color: theme.colorScheme.primary),
-                        ),
-                        if (item.isMulti == 1)
+                    leading: GestureDetector(
+                      onTap: () => Get.toNamed('/member?mid=${item.user?.mid}'),
+                      child: NetworkImgLayer(
+                        width: 45,
+                        height: 45,
+                        type: ImageType.avatar,
+                        src: item.user?.avatar,
+                      ),
+                    ),
+                    title: Text.rich(
+                      TextSpan(
+                        children: [
                           TextSpan(
-                            text: " 等人",
-                            style: theme.textTheme.titleSmall!
-                                .copyWith(fontSize: 12),
+                            text: "${item.user?.nickname}",
+                            style: theme.textTheme.titleSmall!.copyWith(
+                              color: theme.colorScheme.primary,
+                            ),
+                          ),
+                          if (item.isMulti == 1)
+                            TextSpan(
+                              text: " 等人",
+                              style: theme.textTheme.titleSmall!.copyWith(
+                                fontSize: 12,
+                              ),
+                            ),
+                          TextSpan(
+                            text:
+                                " 对我的${item.item?.business}发布了${item.counts}条评论",
+                            style: theme.textTheme.titleSmall!.copyWith(
+                              color: theme.colorScheme.onSurfaceVariant,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    subtitle: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        const SizedBox(height: 4),
+                        Text(
+                          item.item?.sourceContent ?? "",
+                          style: theme.textTheme.bodyMedium,
+                        ),
+                        const SizedBox(height: 4),
+                        if (item.item?.targetReplyContent != null &&
+                            item.item?.targetReplyContent != "")
+                          Text(
+                            "| ${item.item?.targetReplyContent}",
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: theme.textTheme.labelMedium!.copyWith(
+                              color: theme.colorScheme.outline,
+                              height: 1.5,
+                            ),
+                          ),
+                        if (item.item?.rootReplyContent != null &&
+                            item.item?.rootReplyContent != "")
+                          Text(
+                            " | ${item.item?.rootReplyContent}",
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: theme.textTheme.labelMedium!.copyWith(
+                              color: theme.colorScheme.outline,
+                              height: 1.5,
+                            ),
+                          ),
+                        Text(
+                          DateUtil.dateFormat(item.replyTime),
+                          style: theme.textTheme.bodyMedium!.copyWith(
+                            fontSize: 13,
+                            color: theme.colorScheme.outline,
                           ),
-                        TextSpan(
-                          text:
-                              " 对我的${item.item?.business}发布了${item.counts}条评论",
-                          style: theme.textTheme.titleSmall!.copyWith(
-                              color: theme.colorScheme.onSurfaceVariant),
                         ),
                       ],
                     ),
-                  ),
-                  subtitle: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      const SizedBox(height: 4),
-                      Text(item.item?.sourceContent ?? "",
-                          style: theme.textTheme.bodyMedium),
-                      const SizedBox(height: 4),
-                      if (item.item?.targetReplyContent != null &&
-                          item.item?.targetReplyContent != "")
-                        Text("| ${item.item?.targetReplyContent}",
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
-                            style: theme.textTheme.labelMedium!.copyWith(
-                                color: theme.colorScheme.outline, height: 1.5)),
-                      if (item.item?.rootReplyContent != null &&
-                          item.item?.rootReplyContent != "")
-                        Text(" | ${item.item?.rootReplyContent}",
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
-                            style: theme.textTheme.labelMedium!.copyWith(
-                                color: theme.colorScheme.outline, height: 1.5)),
-                      Text(
-                        DateUtil.dateFormat(item.replyTime),
-                        style: theme.textTheme.bodyMedium!.copyWith(
-                          fontSize: 13,
-                          color: theme.colorScheme.outline,
-                        ),
-                      ),
-                    ],
-                  ),
-                );
-              },
-              separatorBuilder: (context, index) => divider,
-            )
-          : HttpError(onReload: _replyMeController.onReload),
+                  );
+                },
+                separatorBuilder: (context, index) => divider,
+              )
+            : HttpError(onReload: _replyMeController.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _replyMeController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _replyMeController.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/msg_feed_top/sys_msg/view.dart b/lib/pages/msg_feed_top/sys_msg/view.dart
index f35acd163..98675fc44 100644
--- a/lib/pages/msg_feed_top/sys_msg/view.dart
+++ b/lib/pages/msg_feed_top/sys_msg/view.dart
@@ -24,7 +24,8 @@ class SysMsgPage extends StatefulWidget {
 class _SysMsgPageState extends State<SysMsgPage> {
   late final _sysMsgController = Get.put(SysMsgController());
   late final RegExp urlRegExp = RegExp(
-      r'#\{([^}]*)\}\{([^}]*)\}|https?:\/\/[^\s/\$.?#].[^\s]*|www\.[^\s/\$.?#].[^\s]*|【(.*?)】|（(\d+)）');
+    r'#\{([^}]*)\}\{([^}]*)\}|https?:\/\/[^\s/\$.?#].[^\s]*|www\.[^\s/\$.?#].[^\s]*|【(.*?)】|（(\d+)）',
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -40,9 +41,11 @@ class _SysMsgPageState extends State<SysMsgPage> {
           slivers: [
             SliverPadding(
               padding: EdgeInsets.only(
-                  bottom: MediaQuery.paddingOf(context).bottom + 80),
-              sliver: Obx(() =>
-                  _buildBody(theme, _sysMsgController.loadingState.value)),
+                bottom: MediaQuery.paddingOf(context).bottom + 80,
+              ),
+              sliver: Obx(
+                () => _buildBody(theme, _sysMsgController.loadingState.value),
+              ),
             ),
           ],
         ),
@@ -51,7 +54,9 @@ class _SysMsgPageState extends State<SysMsgPage> {
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<MsgSysItem>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<MsgSysItem>?> loadingState,
+  ) {
     late final divider = Divider(
       indent: 72,
       endIndent: 20,
@@ -60,67 +65,70 @@ class _SysMsgPageState extends State<SysMsgPage> {
     );
     return switch (loadingState) {
       Loading() => SliverSafeArea(
-          sliver: SliverList.builder(
-            itemCount: 12,
-            itemBuilder: (context, index) {
-              return const MsgFeedSysMsgSkeleton();
-            },
-          ),
+        sliver: SliverList.builder(
+          itemCount: 12,
+          itemBuilder: (context, index) {
+            return const MsgFeedSysMsgSkeleton();
+          },
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverList.separated(
-              itemCount: response!.length,
-              itemBuilder: (context, int index) {
-                if (index == response.length - 1) {
-                  _sysMsgController.onLoadMore();
-                }
-                final item = response[index];
-                return ListTile(
-                  onLongPress: () => showConfirmDialog(
-                    context: context,
-                    title: '确定删除该通知?',
-                    onConfirm: () => _sysMsgController.onRemove(item.id, index),
-                  ),
-                  title: Text(
-                    "${item.title}",
-                    style: theme.textTheme.titleMedium,
-                  ),
-                  subtitle: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      const SizedBox(height: 4),
-                      Text.rich(
-                        _buildContent(theme, item.content ?? ''),
-                        style: TextStyle(
-                          fontSize: 14,
-                          color: theme.colorScheme.onSurface
-                              .withValues(alpha: 0.85),
-                        ),
-                      ),
-                      const SizedBox(height: 5),
-                      Align(
-                        alignment: Alignment.centerRight,
-                        child: Text(
-                          "${item.timeAt}",
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                          style: theme.textTheme.bodyMedium!.copyWith(
-                            fontSize: 13,
-                            color: theme.colorScheme.outline,
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverList.separated(
+                itemCount: response!.length,
+                itemBuilder: (context, int index) {
+                  if (index == response.length - 1) {
+                    _sysMsgController.onLoadMore();
+                  }
+                  final item = response[index];
+                  return ListTile(
+                    onLongPress: () => showConfirmDialog(
+                      context: context,
+                      title: '确定删除该通知?',
+                      onConfirm: () =>
+                          _sysMsgController.onRemove(item.id, index),
+                    ),
+                    title: Text(
+                      "${item.title}",
+                      style: theme.textTheme.titleMedium,
+                    ),
+                    subtitle: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        const SizedBox(height: 4),
+                        Text.rich(
+                          _buildContent(theme, item.content ?? ''),
+                          style: TextStyle(
+                            fontSize: 14,
+                            color: theme.colorScheme.onSurface.withValues(
+                              alpha: 0.85,
+                            ),
                           ),
                         ),
-                      ),
-                    ],
-                  ),
-                );
-              },
-              separatorBuilder: (context, index) => divider,
-            )
-          : HttpError(onReload: _sysMsgController.onReload),
+                        const SizedBox(height: 5),
+                        Align(
+                          alignment: Alignment.centerRight,
+                          child: Text(
+                            "${item.timeAt}",
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: theme.textTheme.bodyMedium!.copyWith(
+                              fontSize: 13,
+                              color: theme.colorScheme.outline,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  );
+                },
+                separatorBuilder: (context, index) => divider,
+              )
+            : HttpError(onReload: _sysMsgController.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _sysMsgController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _sysMsgController.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/pgc/controller.dart b/lib/pages/pgc/controller.dart
index d06b4719c..050bc61b3 100644
--- a/lib/pages/pgc/controller.dart
+++ b/lib/pages/pgc/controller.dart
@@ -118,9 +118,9 @@ class PgcController
 
   @override
   Future<LoadingState<List<PgcIndexItem>?>> customGetData() => PgcHttp.pgcIndex(
-        page: page,
-        indexType: tabType == HomeTabType.cinema ? 102 : null,
-      );
+    page: page,
+    indexType: tabType == HomeTabType.cinema ? 102 : null,
+  );
 
   @override
   void onClose() {
diff --git a/lib/pages/pgc/view.dart b/lib/pages/pgc/view.dart
index 55e19bbb2..588cc5ee9 100644
--- a/lib/pages/pgc/view.dart
+++ b/lib/pages/pgc/view.dart
@@ -60,10 +60,12 @@ class _PgcPageState extends CommonPageState<PgcPage, PgcController>
           if (controller.showPgcTimeline)
             SliverToBoxAdapter(
               child: SizedBox(
-                height: Grid.smallCardWidth / 2 / 0.75 +
+                height:
+                    Grid.smallCardWidth / 2 / 0.75 +
                     MediaQuery.textScalerOf(context).scale(96),
-                child: Obx(() =>
-                    _buildTimeline(theme, controller.timelineState.value)),
+                child: Obx(
+                  () => _buildTimeline(theme, controller.timelineState.value),
+                ),
               ),
             ),
           ..._buildRcmd(theme),
@@ -73,13 +75,18 @@ class _PgcPageState extends CommonPageState<PgcPage, PgcController>
   }
 
   Widget _buildTimeline(
-          ThemeData theme, LoadingState<List<Result>?> loadingState) =>
-      switch (loadingState) {
-        Loading() => loadingWidget,
-        Success(:var response) => response?.isNotEmpty == true
-            ? Builder(builder: (context) {
-                final initialIndex =
-                    max(0, response!.indexWhere((item) => item.isToday == 1));
+    ThemeData theme,
+    LoadingState<List<Result>?> loadingState,
+  ) => switch (loadingState) {
+    Loading() => loadingWidget,
+    Success(:var response) =>
+      response?.isNotEmpty == true
+          ? Builder(
+              builder: (context) {
+                final initialIndex = max(
+                  0,
+                  response!.indexWhere((item) => item.isToday == 1),
+                );
                 return DefaultTabController(
                   initialIndex: initialIndex,
                   length: response.length,
@@ -98,8 +105,9 @@ class _PgcPageState extends CommonPageState<PgcPage, PgcController>
                               isScrollable: true,
                               tabAlignment: TabAlignment.start,
                               dividerHeight: 0,
-                              overlayColor:
-                                  WidgetStateProperty.all(Colors.transparent),
+                              overlayColor: WidgetStateProperty.all(
+                                Colors.transparent,
+                              ),
                               splashFactory: NoSplash.splashFactory,
                               padding: const EdgeInsets.only(right: 10),
                               indicatorPadding: const EdgeInsets.symmetric(
@@ -108,15 +116,17 @@ class _PgcPageState extends CommonPageState<PgcPage, PgcController>
                               ),
                               indicator: BoxDecoration(
                                 color: theme.colorScheme.secondaryContainer,
-                                borderRadius:
-                                    const BorderRadius.all(Radius.circular(20)),
+                                borderRadius: const BorderRadius.all(
+                                  Radius.circular(20),
+                                ),
                               ),
                               indicatorSize: TabBarIndicatorSize.tab,
                               labelColor:
                                   theme.colorScheme.onSecondaryContainer,
-                              labelStyle: TabBarTheme.of(context)
-                                      .labelStyle
-                                      ?.copyWith(fontSize: 14) ??
+                              labelStyle:
+                                  TabBarTheme.of(
+                                    context,
+                                  ).labelStyle?.copyWith(fontSize: 14) ??
                                   const TextStyle(fontSize: 14),
                               dividerColor: Colors.transparent,
                               tabs: response.map(
@@ -124,14 +134,14 @@ class _PgcPageState extends CommonPageState<PgcPage, PgcController>
                                   return Tab(
                                     text:
                                         '${item.date} ${item.isToday == 1 ? '今天' : '周${const [
-                                            '一',
-                                            '二',
-                                            '三',
-                                            '四',
-                                            '五',
-                                            '六',
-                                            '日',
-                                          ][item.dayOfWeek! - 1]}'}',
+                                                '一',
+                                                '二',
+                                                '三',
+                                                '四',
+                                                '五',
+                                                '六',
+                                                '日',
+                                              ][item.dayOfWeek! - 1]}'}',
                                   );
                                 },
                               ).toList(),
@@ -141,319 +151,327 @@ class _PgcPageState extends CommonPageState<PgcPage, PgcController>
                       ),
                       Expanded(
                         child: TabBarView(
-                            physics: const NeverScrollableScrollPhysics(),
-                            children: response.map((item) {
-                              if (item.episodes.isNullOrEmpty) {
-                                return const SizedBox.shrink();
-                              }
-                              return ListView.builder(
-                                physics: const AlwaysScrollableScrollPhysics(),
-                                scrollDirection: Axis.horizontal,
-                                itemCount: item.episodes!.length,
-                                itemBuilder: (context, index) {
-                                  return Container(
-                                    width: Grid.smallCardWidth / 2,
-                                    margin: EdgeInsets.only(
-                                      left: StyleString.safeSpace,
-                                      right: index == item.episodes!.length - 1
-                                          ? StyleString.safeSpace
-                                          : 0,
-                                    ),
-                                    child: PgcCardVTimeline(
-                                      item: item.episodes![index],
-                                    ),
-                                  );
-                                },
-                              );
-                            }).toList()),
-                      ),
-                    ],
-                  ),
-                );
-              })
-            : const SizedBox.shrink(),
-        Error(:var errMsg) => GestureDetector(
-            behavior: HitTestBehavior.opaque,
-            onTap: controller.queryPgcTimeline,
-            child: Container(
-              padding: const EdgeInsets.symmetric(horizontal: 16),
-              alignment: Alignment.center,
-              child: Text(
-                errMsg ?? '',
-                textAlign: TextAlign.center,
-              ),
-            ),
-          ),
-      };
-
-  List<Widget> _buildRcmd(ThemeData theme) => [
-        _buildRcmdTitle(theme),
-        SliverPadding(
-          padding: EdgeInsets.only(
-            left: StyleString.safeSpace,
-            right: StyleString.safeSpace,
-            bottom: MediaQuery.paddingOf(context).bottom + 80,
-          ),
-          sliver: Obx(
-            () => _buildRcmdBody(controller.loadingState.value),
-          ),
-        ),
-      ];
-
-  Widget _buildRcmdTitle(ThemeData theme) => SliverToBoxAdapter(
-        child: Padding(
-          padding: const EdgeInsets.only(
-            top: 10,
-            bottom: 10,
-            left: 16,
-            right: 10,
-          ),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Text(
-                '推荐',
-                style: theme.textTheme.titleMedium,
-              ),
-              GestureDetector(
-                behavior: HitTestBehavior.opaque,
-                onTap: () {
-                  if (widget.tabType == HomeTabType.bangumi) {
-                    Get.to(const PgcIndexPage());
-                  } else {
-                    List<String> titles = const [
-                      '全部',
-                      '电影',
-                      '电视剧',
-                      '纪录片',
-                      '综艺',
-                    ];
-                    List<int> types = const [102, 2, 5, 3, 7];
-                    Get.to(
-                      Scaffold(
-                        appBar: AppBar(title: const Text('索引')),
-                        body: DefaultTabController(
-                          length: types.length,
-                          child: Builder(
-                            builder: (context) {
-                              return Column(
-                                children: [
-                                  SafeArea(
-                                    top: false,
-                                    bottom: false,
-                                    child: TabBar(
-                                      tabs: titles
-                                          .map((title) => Tab(text: title))
-                                          .toList(),
-                                      onTap: (index) {
-                                        try {
-                                          if (!DefaultTabController.of(context)
-                                              .indexIsChanging) {
-                                            Get.find<PgcIndexController>(
-                                                    tag:
-                                                        types[index].toString())
-                                                .animateToTop();
-                                          }
-                                        } catch (_) {}
-                                      },
-                                    ),
+                          physics: const NeverScrollableScrollPhysics(),
+                          children: response.map((item) {
+                            if (item.episodes.isNullOrEmpty) {
+                              return const SizedBox.shrink();
+                            }
+                            return ListView.builder(
+                              physics: const AlwaysScrollableScrollPhysics(),
+                              scrollDirection: Axis.horizontal,
+                              itemCount: item.episodes!.length,
+                              itemBuilder: (context, index) {
+                                return Container(
+                                  width: Grid.smallCardWidth / 2,
+                                  margin: EdgeInsets.only(
+                                    left: StyleString.safeSpace,
+                                    right: index == item.episodes!.length - 1
+                                        ? StyleString.safeSpace
+                                        : 0,
                                   ),
-                                  Expanded(
-                                    child: tabBarView(
-                                        children: types
-                                            .map((type) =>
-                                                PgcIndexPage(indexType: type))
-                                            .toList()),
-                                  )
-                                ],
-                              );
-                            },
-                          ),
+                                  child: PgcCardVTimeline(
+                                    item: item.episodes![index],
+                                  ),
+                                );
+                              },
+                            );
+                          }).toList(),
                         ),
                       ),
-                    );
-                  }
-                },
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(vertical: 2),
-                  child: Row(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      Text(
-                        '查看更多',
-                        strutStyle: const StrutStyle(leading: 0, height: 1),
-                        style: TextStyle(
-                          height: 1,
-                          color: theme.colorScheme.secondary,
-                        ),
-                      ),
-                      Icon(
-                        Icons.chevron_right,
-                        color: theme.colorScheme.secondary,
-                      ),
                     ],
                   ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      );
-
-  Widget _buildRcmdBody(LoadingState<List<PgcIndexItem>?> loadingState) {
-    return switch (loadingState) {
-      Loading() => const SliverToBoxAdapter(),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                // 行间距
-                mainAxisSpacing: StyleString.cardSpace,
-                // 列间距
-                crossAxisSpacing: StyleString.cardSpace,
-                // 最大宽度
-                maxCrossAxisExtent: Grid.smallCardWidth / 3 * 2,
-                childAspectRatio: 0.75,
-                mainAxisExtent: MediaQuery.textScalerOf(context).scale(50),
-              ),
-              delegate: SliverChildBuilderDelegate(
-                (BuildContext context, int index) {
-                  if (index == response.length - 1) {
-                    controller.onLoadMore();
-                  }
-                  return PgcCardVPgcIndex(item: response[index]);
-                },
-                childCount: response!.length,
-              ),
-            )
-          : HttpError(
-              onReload: controller.onReload,
-            ),
-      Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: controller.onReload,
-        ),
-    };
-  }
-
-  Widget _buildFollow(ThemeData theme) => SliverToBoxAdapter(
-        child: Obx(
-          () => controller.accountService.isLogin.value
-              ? Column(
-                  children: [
-                    _buildFollowTitle(theme),
-                    SizedBox(
-                      height: Grid.smallCardWidth / 2 / 0.75 +
-                          MediaQuery.textScalerOf(context).scale(50),
-                      child: Obx(
-                        () => _buildFollowBody(controller.followState.value),
-                      ),
-                    ),
-                  ],
-                )
-              : const SizedBox.shrink(),
-        ),
-      );
-
-  Widget _buildFollowTitle(ThemeData theme) => Padding(
-        padding: const EdgeInsets.only(left: 16),
-        child: Row(
-          children: [
-            Obx(
-              () => Text(
-                '最近${widget.tabType == HomeTabType.bangumi ? '追番' : '追剧'}${controller.followCount.value == -1 ? '' : ' ${controller.followCount.value}'}',
-                style: theme.textTheme.titleMedium,
-              ),
-            ),
-            const Spacer(),
-            IconButton(
-              tooltip: '刷新',
-              onPressed: () => controller
-                ..followPage = 1
-                ..followEnd = false
-                ..queryPgcFollow(),
-              icon: const Icon(
-                Icons.refresh,
-                size: 20,
-              ),
-            ),
-            Obx(
-              () => controller.accountService.isLogin.value
-                  ? Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 10),
-                      child: GestureDetector(
-                        behavior: HitTestBehavior.opaque,
-                        onTap: () => Get.toNamed(
-                          '/fav',
-                          arguments: widget.tabType == HomeTabType.bangumi
-                              ? FavTabType.bangumi.index
-                              : FavTabType.cinema.index,
-                        ),
-                        child: Padding(
-                          padding: const EdgeInsets.symmetric(vertical: 8),
-                          child: Row(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
-                              Text(
-                                '查看全部',
-                                strutStyle:
-                                    const StrutStyle(leading: 0, height: 1),
-                                style: TextStyle(
-                                  height: 1,
-                                  color: theme.colorScheme.secondary,
-                                ),
-                              ),
-                              Icon(
-                                Icons.chevron_right,
-                                color: theme.colorScheme.secondary,
-                              ),
-                            ],
-                          ),
-                        ),
-                      ),
-                    )
-                  : const SizedBox.shrink(),
-            ),
-          ],
-        ),
-      );
-
-  Widget _buildFollowBody(LoadingState<List<FavPgcItemModel>?> loadingState) {
-    return switch (loadingState) {
-      Loading() => loadingWidget,
-      Success(:var response) => response?.isNotEmpty == true
-          ? ListView.builder(
-              controller: controller.followController,
-              scrollDirection: Axis.horizontal,
-              itemCount: response!.length,
-              itemBuilder: (context, index) {
-                if (index == response.length - 1) {
-                  controller.queryPgcFollow(false);
-                }
-                return Container(
-                  width: Grid.smallCardWidth / 2,
-                  margin: EdgeInsets.only(
-                    left: StyleString.safeSpace,
-                    right: index == response.length - 1
-                        ? StyleString.safeSpace
-                        : 0,
-                  ),
-                  child: PgcCardV(
-                    item: response[index],
-                  ),
                 );
               },
             )
-          : Center(
-              child: Text(
-                  '还没有${widget.tabType == HomeTabType.bangumi ? '追番' : '追剧'}')),
-      Error(:var errMsg) => Container(
-          padding: const EdgeInsets.symmetric(horizontal: 16),
-          alignment: Alignment.center,
-          child: Text(
-            errMsg ?? '',
-            textAlign: TextAlign.center,
+          : const SizedBox.shrink(),
+    Error(:var errMsg) => GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap: controller.queryPgcTimeline,
+      child: Container(
+        padding: const EdgeInsets.symmetric(horizontal: 16),
+        alignment: Alignment.center,
+        child: Text(
+          errMsg ?? '',
+          textAlign: TextAlign.center,
+        ),
+      ),
+    ),
+  };
+
+  List<Widget> _buildRcmd(ThemeData theme) => [
+    _buildRcmdTitle(theme),
+    SliverPadding(
+      padding: EdgeInsets.only(
+        left: StyleString.safeSpace,
+        right: StyleString.safeSpace,
+        bottom: MediaQuery.paddingOf(context).bottom + 80,
+      ),
+      sliver: Obx(
+        () => _buildRcmdBody(controller.loadingState.value),
+      ),
+    ),
+  ];
+
+  Widget _buildRcmdTitle(ThemeData theme) => SliverToBoxAdapter(
+    child: Padding(
+      padding: const EdgeInsets.only(
+        top: 10,
+        bottom: 10,
+        left: 16,
+        right: 10,
+      ),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Text(
+            '推荐',
+            style: theme.textTheme.titleMedium,
+          ),
+          GestureDetector(
+            behavior: HitTestBehavior.opaque,
+            onTap: () {
+              if (widget.tabType == HomeTabType.bangumi) {
+                Get.to(const PgcIndexPage());
+              } else {
+                List<String> titles = const [
+                  '全部',
+                  '电影',
+                  '电视剧',
+                  '纪录片',
+                  '综艺',
+                ];
+                List<int> types = const [102, 2, 5, 3, 7];
+                Get.to(
+                  Scaffold(
+                    appBar: AppBar(title: const Text('索引')),
+                    body: DefaultTabController(
+                      length: types.length,
+                      child: Builder(
+                        builder: (context) {
+                          return Column(
+                            children: [
+                              SafeArea(
+                                top: false,
+                                bottom: false,
+                                child: TabBar(
+                                  tabs: titles
+                                      .map((title) => Tab(text: title))
+                                      .toList(),
+                                  onTap: (index) {
+                                    try {
+                                      if (!DefaultTabController.of(
+                                        context,
+                                      ).indexIsChanging) {
+                                        Get.find<PgcIndexController>(
+                                          tag: types[index].toString(),
+                                        ).animateToTop();
+                                      }
+                                    } catch (_) {}
+                                  },
+                                ),
+                              ),
+                              Expanded(
+                                child: tabBarView(
+                                  children: types
+                                      .map(
+                                        (type) => PgcIndexPage(indexType: type),
+                                      )
+                                      .toList(),
+                                ),
+                              ),
+                            ],
+                          );
+                        },
+                      ),
+                    ),
+                  ),
+                );
+              }
+            },
+            child: Padding(
+              padding: const EdgeInsets.symmetric(vertical: 2),
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Text(
+                    '查看更多',
+                    strutStyle: const StrutStyle(leading: 0, height: 1),
+                    style: TextStyle(
+                      height: 1,
+                      color: theme.colorScheme.secondary,
+                    ),
+                  ),
+                  Icon(
+                    Icons.chevron_right,
+                    color: theme.colorScheme.secondary,
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    ),
+  );
+
+  Widget _buildRcmdBody(LoadingState<List<PgcIndexItem>?> loadingState) {
+    return switch (loadingState) {
+      Loading() => const SliverToBoxAdapter(),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                  // 行间距
+                  mainAxisSpacing: StyleString.cardSpace,
+                  // 列间距
+                  crossAxisSpacing: StyleString.cardSpace,
+                  // 最大宽度
+                  maxCrossAxisExtent: Grid.smallCardWidth / 3 * 2,
+                  childAspectRatio: 0.75,
+                  mainAxisExtent: MediaQuery.textScalerOf(context).scale(50),
+                ),
+                delegate: SliverChildBuilderDelegate(
+                  (BuildContext context, int index) {
+                    if (index == response.length - 1) {
+                      controller.onLoadMore();
+                    }
+                    return PgcCardVPgcIndex(item: response[index]);
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(
+                onReload: controller.onReload,
+              ),
+      Error(:var errMsg) => HttpError(
+        errMsg: errMsg,
+        onReload: controller.onReload,
+      ),
+    };
+  }
+
+  Widget _buildFollow(ThemeData theme) => SliverToBoxAdapter(
+    child: Obx(
+      () => controller.accountService.isLogin.value
+          ? Column(
+              children: [
+                _buildFollowTitle(theme),
+                SizedBox(
+                  height:
+                      Grid.smallCardWidth / 2 / 0.75 +
+                      MediaQuery.textScalerOf(context).scale(50),
+                  child: Obx(
+                    () => _buildFollowBody(controller.followState.value),
+                  ),
+                ),
+              ],
+            )
+          : const SizedBox.shrink(),
+    ),
+  );
+
+  Widget _buildFollowTitle(ThemeData theme) => Padding(
+    padding: const EdgeInsets.only(left: 16),
+    child: Row(
+      children: [
+        Obx(
+          () => Text(
+            '最近${widget.tabType == HomeTabType.bangumi ? '追番' : '追剧'}${controller.followCount.value == -1 ? '' : ' ${controller.followCount.value}'}',
+            style: theme.textTheme.titleMedium,
           ),
         ),
+        const Spacer(),
+        IconButton(
+          tooltip: '刷新',
+          onPressed: () => controller
+            ..followPage = 1
+            ..followEnd = false
+            ..queryPgcFollow(),
+          icon: const Icon(
+            Icons.refresh,
+            size: 20,
+          ),
+        ),
+        Obx(
+          () => controller.accountService.isLogin.value
+              ? Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 10),
+                  child: GestureDetector(
+                    behavior: HitTestBehavior.opaque,
+                    onTap: () => Get.toNamed(
+                      '/fav',
+                      arguments: widget.tabType == HomeTabType.bangumi
+                          ? FavTabType.bangumi.index
+                          : FavTabType.cinema.index,
+                    ),
+                    child: Padding(
+                      padding: const EdgeInsets.symmetric(vertical: 8),
+                      child: Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Text(
+                            '查看全部',
+                            strutStyle: const StrutStyle(leading: 0, height: 1),
+                            style: TextStyle(
+                              height: 1,
+                              color: theme.colorScheme.secondary,
+                            ),
+                          ),
+                          Icon(
+                            Icons.chevron_right,
+                            color: theme.colorScheme.secondary,
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                )
+              : const SizedBox.shrink(),
+        ),
+      ],
+    ),
+  );
+
+  Widget _buildFollowBody(LoadingState<List<FavPgcItemModel>?> loadingState) {
+    return switch (loadingState) {
+      Loading() => loadingWidget,
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? ListView.builder(
+                controller: controller.followController,
+                scrollDirection: Axis.horizontal,
+                itemCount: response!.length,
+                itemBuilder: (context, index) {
+                  if (index == response.length - 1) {
+                    controller.queryPgcFollow(false);
+                  }
+                  return Container(
+                    width: Grid.smallCardWidth / 2,
+                    margin: EdgeInsets.only(
+                      left: StyleString.safeSpace,
+                      right: index == response.length - 1
+                          ? StyleString.safeSpace
+                          : 0,
+                    ),
+                    child: PgcCardV(
+                      item: response[index],
+                    ),
+                  );
+                },
+              )
+            : Center(
+                child: Text(
+                  '还没有${widget.tabType == HomeTabType.bangumi ? '追番' : '追剧'}',
+                ),
+              ),
+      Error(:var errMsg) => Container(
+        padding: const EdgeInsets.symmetric(horizontal: 16),
+        alignment: Alignment.center,
+        child: Text(
+          errMsg ?? '',
+          textAlign: TextAlign.center,
+        ),
+      ),
     };
   }
 }
diff --git a/lib/pages/pgc/widgets/pgc_card_v.dart b/lib/pages/pgc/widgets/pgc_card_v.dart
index d88937adf..99f26c016 100644
--- a/lib/pages/pgc/widgets/pgc_card_v.dart
+++ b/lib/pages/pgc/widgets/pgc_card_v.dart
@@ -32,37 +32,39 @@ class PgcCardV extends StatelessWidget {
           children: [
             AspectRatio(
               aspectRatio: 0.75,
-              child: LayoutBuilder(builder: (context, boxConstraints) {
-                final double maxWidth = boxConstraints.maxWidth;
-                final double maxHeight = boxConstraints.maxHeight;
-                return Stack(
-                  clipBehavior: Clip.none,
-                  children: [
-                    NetworkImgLayer(
-                      src: item.cover,
-                      width: maxWidth,
-                      height: maxHeight,
-                    ),
-                    PBadge(
-                      text: item.badge,
-                      top: 6,
-                      right: 6,
-                      bottom: null,
-                      left: null,
-                    ),
-                    if (item.isFinish == 0 &&
-                        item.renewalTime?.isNotEmpty == true)
+              child: LayoutBuilder(
+                builder: (context, boxConstraints) {
+                  final double maxWidth = boxConstraints.maxWidth;
+                  final double maxHeight = boxConstraints.maxHeight;
+                  return Stack(
+                    clipBehavior: Clip.none,
+                    children: [
+                      NetworkImgLayer(
+                        src: item.cover,
+                        width: maxWidth,
+                        height: maxHeight,
+                      ),
                       PBadge(
-                        text: item.renewalTime,
-                        bottom: 6,
-                        left: 6,
-                        type: PBadgeType.gray,
-                      )
-                  ],
-                );
-              }),
+                        text: item.badge,
+                        top: 6,
+                        right: 6,
+                        bottom: null,
+                        left: null,
+                      ),
+                      if (item.isFinish == 0 &&
+                          item.renewalTime?.isNotEmpty == true)
+                        PBadge(
+                          text: item.renewalTime,
+                          bottom: 6,
+                          left: 6,
+                          type: PBadgeType.gray,
+                        ),
+                    ],
+                  );
+                },
+              ),
             ),
-            content(context)
+            content(context),
           ],
         ),
       ),
diff --git a/lib/pages/pgc/widgets/pgc_card_v_timeline.dart b/lib/pages/pgc/widgets/pgc_card_v_timeline.dart
index 991048e01..91c54866b 100644
--- a/lib/pages/pgc/widgets/pgc_card_v_timeline.dart
+++ b/lib/pages/pgc/widgets/pgc_card_v_timeline.dart
@@ -33,34 +33,36 @@ class PgcCardVTimeline extends StatelessWidget {
           children: [
             AspectRatio(
               aspectRatio: 0.75,
-              child: LayoutBuilder(builder: (context, boxConstraints) {
-                final double maxWidth = boxConstraints.maxWidth;
-                final double maxHeight = boxConstraints.maxHeight;
-                return Stack(
-                  clipBehavior: Clip.none,
-                  children: [
-                    NetworkImgLayer(
-                      src: item.cover,
-                      width: maxWidth,
-                      height: maxHeight,
-                    ),
-                    if (item.follow == 1)
-                      const PBadge(
-                        text: '已追番',
-                        right: 6,
-                        top: 6,
+              child: LayoutBuilder(
+                builder: (context, boxConstraints) {
+                  final double maxWidth = boxConstraints.maxWidth;
+                  final double maxHeight = boxConstraints.maxHeight;
+                  return Stack(
+                    clipBehavior: Clip.none,
+                    children: [
+                      NetworkImgLayer(
+                        src: item.cover,
+                        width: maxWidth,
+                        height: maxHeight,
                       ),
-                    PBadge(
-                      text: '${item.pubTime}',
-                      left: 6,
-                      bottom: 6,
-                      type: PBadgeType.gray,
-                    ),
-                  ],
-                );
-              }),
+                      if (item.follow == 1)
+                        const PBadge(
+                          text: '已追番',
+                          right: 6,
+                          top: 6,
+                        ),
+                      PBadge(
+                        text: '${item.pubTime}',
+                        left: 6,
+                        bottom: 6,
+                        type: PBadgeType.gray,
+                      ),
+                    ],
+                  );
+                },
+              ),
             ),
-            content(context)
+            content(context),
           ],
         ),
       ),
diff --git a/lib/pages/pgc_index/view.dart b/lib/pages/pgc_index/view.dart
index 1f0dbdfde..a7d5bbe42 100644
--- a/lib/pages/pgc_index/view.dart
+++ b/lib/pages/pgc_index/view.dart
@@ -45,11 +45,15 @@ class _PgcIndexPageState extends State<PgcIndexPage>
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<PgcIndexConditionData> loadingState) {
+    ThemeData theme,
+    LoadingState<PgcIndexConditionData> loadingState,
+  ) {
     return switch (loadingState) {
       Loading() => loadingWidget,
-      Success(:var response) => Builder(builder: (context) {
-          int count = (response.order?.isNotEmpty == true ? 1 : 0) +
+      Success(:var response) => Builder(
+        builder: (context) {
+          int count =
+              (response.order?.isNotEmpty == true ? 1 : 0) +
               (response.filter?.length ?? 0);
           if (count == 0) return const SizedBox.shrink();
           return SafeArea(
@@ -81,155 +85,158 @@ class _PgcIndexPageState extends State<PgcIndexPage>
               ],
             ),
           );
-        }),
+        },
+      ),
       Error(:var errMsg) => scrollErrorWidget(
-          errMsg: errMsg,
-          onReload: () => _ctr
-            ..conditionState.value = LoadingState.loading()
-            ..getPgcIndexCondition(),
-        ),
+        errMsg: errMsg,
+        onReload: () => _ctr
+          ..conditionState.value = LoadingState.loading()
+          ..getPgcIndexCondition(),
+      ),
     };
   }
 
   Widget _buildSortWidget(ThemeData theme, count, data) => Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          ...List.generate(
-            count > 5
-                ? _ctr.isExpand.value
-                    ? count
-                    : count ~/ 2
-                : count,
-            (index) {
-              List? item = data.order?.isNotEmpty == true
-                  ? index == 0
-                      ? data.order
-                      : data.filter![index - 1].values
-                  : data.filter![index].values;
-              return item?.isNotEmpty == true
-                  ? Padding(
-                      padding: EdgeInsets.only(
-                        top: index == 0 ? 0 : 10,
-                      ),
-                      child: SelfSizedHorizontalList(
-                        gapSize: 12,
+    mainAxisSize: MainAxisSize.min,
+    crossAxisAlignment: CrossAxisAlignment.start,
+    children: [
+      ...List.generate(
+        count > 5
+            ? _ctr.isExpand.value
+                  ? count
+                  : count ~/ 2
+            : count,
+        (index) {
+          List? item = data.order?.isNotEmpty == true
+              ? index == 0
+                    ? data.order
+                    : data.filter![index - 1].values
+              : data.filter![index].values;
+          return item?.isNotEmpty == true
+              ? Padding(
+                  padding: EdgeInsets.only(
+                    top: index == 0 ? 0 : 10,
+                  ),
+                  child: SelfSizedHorizontalList(
+                    gapSize: 12,
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 12,
+                    ),
+                    childBuilder: (childIndex) => Obx(
+                      () => SearchText(
+                        bgColor:
+                            (item[childIndex] is PgcConditionOrder
+                                    ? _ctr.indexParams['order']
+                                    : _ctr.indexParams[data
+                                          .filter![data.order?.isNotEmpty ==
+                                                  true
+                                              ? index - 1
+                                              : index]
+                                          .field]) ==
+                                (item[childIndex] is PgcConditionOrder
+                                    ? item[childIndex].field
+                                    : item[childIndex].keyword)
+                            ? theme.colorScheme.secondaryContainer
+                            : Colors.transparent,
+                        textColor:
+                            (item[childIndex] is PgcConditionOrder
+                                    ? _ctr.indexParams['order']
+                                    : _ctr.indexParams[data
+                                          .filter![data.order?.isNotEmpty ==
+                                                  true
+                                              ? index - 1
+                                              : index]
+                                          .field]) ==
+                                (item[childIndex] is PgcConditionOrder
+                                    ? item[childIndex].field
+                                    : item[childIndex].keyword)
+                            ? theme.colorScheme.onSecondaryContainer
+                            : theme.colorScheme.onSurfaceVariant,
+                        text: item[childIndex].name,
                         padding: const EdgeInsets.symmetric(
-                          horizontal: 12,
+                          horizontal: 6,
+                          vertical: 3,
                         ),
-                        childBuilder: (childIndex) => Obx(
-                          () => SearchText(
-                            bgColor: (item[childIndex] is PgcConditionOrder
-                                        ? _ctr.indexParams['order']
-                                        : _ctr.indexParams[data
-                                            .filter![
-                                                data.order?.isNotEmpty == true
-                                                    ? index - 1
-                                                    : index]
-                                            .field]) ==
-                                    (item[childIndex] is PgcConditionOrder
-                                        ? item[childIndex].field
-                                        : item[childIndex].keyword)
-                                ? theme.colorScheme.secondaryContainer
-                                : Colors.transparent,
-                            textColor: (item[childIndex] is PgcConditionOrder
-                                        ? _ctr.indexParams['order']
-                                        : _ctr.indexParams[data
-                                            .filter![
-                                                data.order?.isNotEmpty == true
-                                                    ? index - 1
-                                                    : index]
-                                            .field]) ==
-                                    (item[childIndex] is PgcConditionOrder
-                                        ? item[childIndex].field
-                                        : item[childIndex].keyword)
-                                ? theme.colorScheme.onSecondaryContainer
-                                : theme.colorScheme.onSurfaceVariant,
-                            text: item[childIndex].name,
-                            padding: const EdgeInsets.symmetric(
-                              horizontal: 6,
-                              vertical: 3,
-                            ),
-                            onTap: (_) {
-                              String name = item[childIndex]
-                                      is PgcConditionOrder
-                                  ? 'order'
-                                  : data
-                                      .filter![data.order?.isNotEmpty == true
-                                          ? index - 1
-                                          : index]
-                                      .field!;
-                              _ctr.indexParams[name] =
-                                  (item[childIndex] is PgcConditionOrder
-                                      ? item[childIndex].field
-                                      : item[childIndex].keyword);
-                              _ctr.onReload();
-                            },
-                          ),
-                        ),
-                        itemCount: item!.length,
-                      ),
-                    )
-                  : const SizedBox.shrink();
-            },
-          ),
-          if (count > 5) ...[
-            const SizedBox(height: 8),
-            GestureDetector(
-              behavior: HitTestBehavior.opaque,
-              onTap: () => _ctr.isExpand.value = !_ctr.isExpand.value,
-              child: Container(
-                alignment: Alignment.center,
-                child: Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Text(
-                      _ctr.isExpand.value ? '收起' : '展开',
-                      style: TextStyle(
-                        color: theme.colorScheme.outline,
+                        onTap: (_) {
+                          String name = item[childIndex] is PgcConditionOrder
+                              ? 'order'
+                              : data
+                                    .filter![data.order?.isNotEmpty == true
+                                        ? index - 1
+                                        : index]
+                                    .field!;
+                          _ctr.indexParams[name] =
+                              (item[childIndex] is PgcConditionOrder
+                              ? item[childIndex].field
+                              : item[childIndex].keyword);
+                          _ctr.onReload();
+                        },
                       ),
                     ),
-                    Icon(
-                      _ctr.isExpand.value
-                          ? Icons.keyboard_arrow_up
-                          : Icons.keyboard_arrow_down,
-                      color: theme.colorScheme.outline,
-                    ),
-                  ],
+                    itemCount: item!.length,
+                  ),
+                )
+              : const SizedBox.shrink();
+        },
+      ),
+      if (count > 5) ...[
+        const SizedBox(height: 8),
+        GestureDetector(
+          behavior: HitTestBehavior.opaque,
+          onTap: () => _ctr.isExpand.value = !_ctr.isExpand.value,
+          child: Container(
+            alignment: Alignment.center,
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Text(
+                  _ctr.isExpand.value ? '收起' : '展开',
+                  style: TextStyle(
+                    color: theme.colorScheme.outline,
+                  ),
                 ),
-              ),
+                Icon(
+                  _ctr.isExpand.value
+                      ? Icons.keyboard_arrow_up
+                      : Icons.keyboard_arrow_down,
+                  color: theme.colorScheme.outline,
+                ),
+              ],
             ),
-          ],
-        ],
-      );
+          ),
+        ),
+      ],
+    ],
+  );
 
   Widget _buildList(LoadingState<List<PgcIndexItem>?> loadingState) {
     return switch (loadingState) {
       Loading() => linearLoading,
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                mainAxisSpacing: StyleString.cardSpace,
-                crossAxisSpacing: StyleString.cardSpace,
-                maxCrossAxisExtent: Grid.smallCardWidth / 3 * 2,
-                childAspectRatio: 0.75,
-                mainAxisExtent: MediaQuery.textScalerOf(context).scale(50),
-              ),
-              delegate: SliverChildBuilderDelegate(
-                (BuildContext context, int index) {
-                  if (index == response.length - 1) {
-                    _ctr.onLoadMore();
-                  }
-                  return PgcCardVPgcIndex(item: response[index]);
-                },
-                childCount: response!.length,
-              ),
-            )
-          : HttpError(onReload: _ctr.onReload),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                  mainAxisSpacing: StyleString.cardSpace,
+                  crossAxisSpacing: StyleString.cardSpace,
+                  maxCrossAxisExtent: Grid.smallCardWidth / 3 * 2,
+                  childAspectRatio: 0.75,
+                  mainAxisExtent: MediaQuery.textScalerOf(context).scale(50),
+                ),
+                delegate: SliverChildBuilderDelegate(
+                  (BuildContext context, int index) {
+                    if (index == response.length - 1) {
+                      _ctr.onLoadMore();
+                    }
+                    return PgcCardVPgcIndex(item: response[index]);
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(onReload: _ctr.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _ctr.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _ctr.onReload,
+      ),
     };
   }
 }
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 78a813b6e..2b974e028 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
@@ -32,37 +32,39 @@ class PgcCardVPgcIndex extends StatelessWidget {
           children: [
             AspectRatio(
               aspectRatio: 0.75,
-              child: LayoutBuilder(builder: (context, boxConstraints) {
-                final double maxWidth = boxConstraints.maxWidth;
-                final double maxHeight = boxConstraints.maxHeight;
-                return Stack(
-                  clipBehavior: Clip.none,
-                  children: [
-                    NetworkImgLayer(
-                      src: item.cover,
-                      width: maxWidth,
-                      height: maxHeight,
-                    ),
-                    PBadge(
-                      text: item.badge,
-                      top: 6,
-                      right: 6,
-                      bottom: null,
-                      left: null,
-                    ),
-                    PBadge(
-                      text: item.order,
-                      top: null,
-                      right: null,
-                      bottom: 6,
-                      left: 6,
-                      type: PBadgeType.gray,
-                    ),
-                  ],
-                );
-              }),
+              child: LayoutBuilder(
+                builder: (context, boxConstraints) {
+                  final double maxWidth = boxConstraints.maxWidth;
+                  final double maxHeight = boxConstraints.maxHeight;
+                  return Stack(
+                    clipBehavior: Clip.none,
+                    children: [
+                      NetworkImgLayer(
+                        src: item.cover,
+                        width: maxWidth,
+                        height: maxHeight,
+                      ),
+                      PBadge(
+                        text: item.badge,
+                        top: 6,
+                        right: 6,
+                        bottom: null,
+                        left: null,
+                      ),
+                      PBadge(
+                        text: item.order,
+                        top: null,
+                        right: null,
+                        bottom: 6,
+                        left: 6,
+                        type: PBadgeType.gray,
+                      ),
+                    ],
+                  );
+                },
+              ),
             ),
-            conetent(context)
+            conetent(context),
           ],
         ),
       ),
diff --git a/lib/pages/pgc_review/child/controller.dart b/lib/pages/pgc_review/child/controller.dart
index 01f7b607d..b49204c51 100644
--- a/lib/pages/pgc_review/child/controller.dart
+++ b/lib/pages/pgc_review/child/controller.dart
@@ -53,11 +53,11 @@ class PgcReviewController
 
   @override
   Future<LoadingState<PgcReviewData>> customGetData() => PgcHttp.pgcReview(
-        type: type,
-        mediaId: mediaId,
-        next: next,
-        sort: sortType.value.sort,
-      );
+    type: type,
+    mediaId: mediaId,
+    next: next,
+    sort: sortType.value.sort,
+  );
 
   Future<void> onLike(PgcReviewItemModel item, bool isLike, reviewId) async {
     var res = await PgcHttp.pgcReviewLike(
@@ -79,7 +79,10 @@ class PgcReviewController
   }
 
   Future<void> onDislike(
-      PgcReviewItemModel item, bool isDislike, reviewId) async {
+    PgcReviewItemModel item,
+    bool isDislike,
+    reviewId,
+  ) async {
     var res = await PgcHttp.pgcReviewDislike(
       mediaId: mediaId,
       reviewId: reviewId,
diff --git a/lib/pages/pgc_review/child/view.dart b/lib/pages/pgc_review/child/view.dart
index 7bce2c698..8141da46b 100644
--- a/lib/pages/pgc_review/child/view.dart
+++ b/lib/pages/pgc_review/child/view.dart
@@ -45,7 +45,8 @@ class _PgcReviewChildPageState extends State<PgcReviewChildPage>
   @override
   void dispose() {
     Get.delete<PgcReviewController>(
-        tag: '${widget.mediaId}${widget.type.name}');
+      tag: '${widget.mediaId}${widget.type.name}',
+    );
     super.dispose();
   }
 
@@ -62,9 +63,11 @@ class _PgcReviewChildPageState extends State<PgcReviewChildPage>
           _buildHeader(theme),
           SliverPadding(
             padding: EdgeInsets.only(
-                bottom: MediaQuery.paddingOf(context).bottom + 100),
-            sliver:
-                Obx(() => _buildBody(theme, _controller.loadingState.value)),
+              bottom: MediaQuery.paddingOf(context).bottom + 100,
+            ),
+            sliver: Obx(
+              () => _buildBody(theme, _controller.loadingState.value),
+            ),
           ),
         ],
       ),
@@ -72,38 +75,41 @@ class _PgcReviewChildPageState extends State<PgcReviewChildPage>
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<PgcReviewItemModel>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<PgcReviewItemModel>?> loadingState,
+  ) {
     late final divider = Divider(
       height: 1,
       color: theme.colorScheme.outline.withValues(alpha: 0.1),
     );
     return switch (loadingState) {
       Loading() => SliverToBoxAdapter(
-          child: ListView.builder(
-            shrinkWrap: true,
-            physics: const NeverScrollableScrollPhysics(),
-            itemBuilder: (context, index) {
-              return const VideoReplySkeleton();
-            },
-            itemCount: 8,
-          ),
+        child: ListView.builder(
+          shrinkWrap: true,
+          physics: const NeverScrollableScrollPhysics(),
+          itemBuilder: (context, index) {
+            return const VideoReplySkeleton();
+          },
+          itemCount: 8,
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverList.separated(
-              itemBuilder: (context, index) {
-                if (index == response.length - 1) {
-                  _controller.onLoadMore();
-                }
-                return _itemWidget(theme, index, response[index]);
-              },
-              itemCount: response!.length,
-              separatorBuilder: (context, index) => divider,
-            )
-          : HttpError(onReload: _controller.onReload),
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverList.separated(
+                itemBuilder: (context, index) {
+                  if (index == response.length - 1) {
+                    _controller.onLoadMore();
+                  }
+                  return _itemWidget(theme, index, response[index]);
+                },
+                itemCount: response!.length,
+                separatorBuilder: (context, index) => divider,
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
@@ -113,85 +119,85 @@ class _PgcReviewChildPageState extends State<PgcReviewChildPage>
       child: InkWell(
         onTap: isLongReview
             ? () => Get.toNamed(
-                  '/articlePage',
-                  parameters: {
-                    'id': item.articleId!.toString(),
-                    'type': 'read',
-                  },
-                )
+                '/articlePage',
+                parameters: {
+                  'id': item.articleId!.toString(),
+                  'type': 'read',
+                },
+              )
             : null,
         onLongPress: isLongReview
             ? null
             : () => showDialog(
-                  context: context,
-                  builder: (context) => AlertDialog(
-                    clipBehavior: Clip.hardEdge,
-                    contentPadding: const EdgeInsets.symmetric(vertical: 12),
-                    content: Column(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        if (item.author!.mid == Accounts.main.mid) ...[
-                          ListTile(
-                            dense: true,
-                            title: const Text(
-                              '编辑',
-                              style: TextStyle(fontSize: 14),
-                            ),
-                            onTap: () {
-                              Get.back();
-                              showModalBottomSheet(
-                                context: context,
-                                useSafeArea: true,
-                                isScrollControlled: true,
-                                builder: (context) {
-                                  return PgcReviewPostPanel(
-                                    name: widget.name,
-                                    mediaId: widget.mediaId,
-                                    reviewId: item.reviewId,
-                                    content: item.content,
-                                    score: item.score,
-                                  );
-                                },
-                              );
-                            },
-                          ),
-                          ListTile(
-                            dense: true,
-                            title: const Text(
-                              '删除',
-                              style: TextStyle(fontSize: 14),
-                            ),
-                            onTap: () {
-                              Get.back();
-                              showConfirmDialog(
-                                context: context,
-                                title: '删除短评，同时删除评分？',
-                                onConfirm: () =>
-                                    _controller.onDel(index, item.reviewId),
-                              );
-                            },
-                          ),
-                        ],
+                context: context,
+                builder: (context) => AlertDialog(
+                  clipBehavior: Clip.hardEdge,
+                  contentPadding: const EdgeInsets.symmetric(vertical: 12),
+                  content: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      if (item.author!.mid == Accounts.main.mid) ...[
                         ListTile(
                           dense: true,
                           title: const Text(
-                            '举报',
+                            '编辑',
                             style: TextStyle(fontSize: 14),
                           ),
-                          onTap: () => Get
-                            ..back()
-                            ..toNamed(
-                              '/webview',
-                              parameters: {
-                                'url':
-                                    'https://www.bilibili.com/appeal/?reviewId=${item.reviewId}&type=shortComment&mediaId=${widget.mediaId}'
+                          onTap: () {
+                            Get.back();
+                            showModalBottomSheet(
+                              context: context,
+                              useSafeArea: true,
+                              isScrollControlled: true,
+                              builder: (context) {
+                                return PgcReviewPostPanel(
+                                  name: widget.name,
+                                  mediaId: widget.mediaId,
+                                  reviewId: item.reviewId,
+                                  content: item.content,
+                                  score: item.score,
+                                );
                               },
-                            ),
+                            );
+                          },
+                        ),
+                        ListTile(
+                          dense: true,
+                          title: const Text(
+                            '删除',
+                            style: TextStyle(fontSize: 14),
+                          ),
+                          onTap: () {
+                            Get.back();
+                            showConfirmDialog(
+                              context: context,
+                              title: '删除短评，同时删除评分？',
+                              onConfirm: () =>
+                                  _controller.onDel(index, item.reviewId),
+                            );
+                          },
                         ),
                       ],
-                    ),
+                      ListTile(
+                        dense: true,
+                        title: const Text(
+                          '举报',
+                          style: TextStyle(fontSize: 14),
+                        ),
+                        onTap: () => Get
+                          ..back()
+                          ..toNamed(
+                            '/webview',
+                            parameters: {
+                              'url':
+                                  'https://www.bilibili.com/appeal/?reviewId=${item.reviewId}&type=shortComment&mediaId=${widget.mediaId}',
+                            },
+                          ),
+                      ),
+                    ],
                   ),
                 ),
+              ),
         child: Padding(
           padding: const EdgeInsets.all(12),
           child: Column(
@@ -222,7 +228,8 @@ class _PgcReviewChildPageState extends State<PgcReviewChildPage>
                             Text(
                               item.author!.uname!,
                               style: TextStyle(
-                                color: item.author?.vip?.status != null &&
+                                color:
+                                    item.author?.vip?.status != null &&
                                         item.author!.vip!.status > 0 &&
                                         item.author!.vip!.type == 2
                                     ? context.vipColor
@@ -266,9 +273,9 @@ class _PgcReviewChildPageState extends State<PgcReviewChildPage>
                               },
                             ),
                           ],
-                        )
+                        ),
                       ],
-                    )
+                    ),
                   ],
                 ),
               ),
@@ -312,7 +319,10 @@ class _PgcReviewChildPageState extends State<PgcReviewChildPage>
                           child: TextButton(
                             style: style,
                             onPressed: () => _controller.onDislike(
-                                item, isDislike, item.reviewId),
+                              item,
+                              isDislike,
+                              item.reviewId,
+                            ),
                             child: Icon(
                               isDislike
                                   ? FontAwesomeIcons.solidThumbsDown
@@ -329,7 +339,10 @@ class _PgcReviewChildPageState extends State<PgcReviewChildPage>
                           onPressed: isLongReview
                               ? null
                               : () => _controller.onLike(
-                                  item, isLike, item.reviewId),
+                                  item,
+                                  isLike,
+                                  item.reviewId,
+                                ),
                           child: Row(
                             spacing: 4,
                             children: [
@@ -363,53 +376,53 @@ class _PgcReviewChildPageState extends State<PgcReviewChildPage>
   }
 
   Widget _buildHeader(ThemeData theme) => SliverPersistentHeader(
-        pinned: false,
-        floating: true,
-        delegate: CustomSliverPersistentHeaderDelegate(
-          extent: 40,
-          bgColor: theme.colorScheme.surface,
-          child: Container(
-            height: 40,
-            padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Obx(
-                  () {
-                    final count = _controller.count.value;
-                    return count == null
-                        ? const SizedBox.shrink()
-                        : Text(
-                            '${NumUtil.numFormat(count)}条点评',
-                            style: const TextStyle(fontSize: 13),
-                          );
-                  },
+    pinned: false,
+    floating: true,
+    delegate: CustomSliverPersistentHeaderDelegate(
+      extent: 40,
+      bgColor: theme.colorScheme.surface,
+      child: Container(
+        height: 40,
+        padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Obx(
+              () {
+                final count = _controller.count.value;
+                return count == null
+                    ? const SizedBox.shrink()
+                    : Text(
+                        '${NumUtil.numFormat(count)}条点评',
+                        style: const TextStyle(fontSize: 13),
+                      );
+              },
+            ),
+            SizedBox(
+              height: 35,
+              child: TextButton.icon(
+                onPressed: _controller.queryBySort,
+                icon: Icon(
+                  Icons.sort,
+                  size: 16,
+                  color: theme.colorScheme.secondary,
                 ),
-                SizedBox(
-                  height: 35,
-                  child: TextButton.icon(
-                    onPressed: _controller.queryBySort,
-                    icon: Icon(
-                      Icons.sort,
-                      size: 16,
+                label: Obx(
+                  () => Text(
+                    _controller.sortType.value.label,
+                    style: TextStyle(
+                      fontSize: 13,
                       color: theme.colorScheme.secondary,
                     ),
-                    label: Obx(
-                      () => Text(
-                        _controller.sortType.value.label,
-                        style: TextStyle(
-                          fontSize: 13,
-                          color: theme.colorScheme.secondary,
-                        ),
-                      ),
-                    ),
                   ),
-                )
-              ],
+                ),
+              ),
             ),
-          ),
+          ],
         ),
-      );
+      ),
+    ),
+  );
 
   @override
   bool get wantKeepAlive => true;
diff --git a/lib/pages/pgc_review/post/view.dart b/lib/pages/pgc_review/post/view.dart
index ffb1bc3be..f71252e84 100644
--- a/lib/pages/pgc_review/post/view.dart
+++ b/lib/pages/pgc_review/post/view.dart
@@ -189,7 +189,8 @@ class _PgcReviewPostPanelState
             left: 12,
             right: 12,
             top: 6,
-            bottom: MediaQuery.paddingOf(context).bottom +
+            bottom:
+                MediaQuery.paddingOf(context).bottom +
                 MediaQuery.viewInsetsOf(context).bottom +
                 6,
           ),
diff --git a/lib/pages/pgc_review/view.dart b/lib/pages/pgc_review/view.dart
index 3dabeb7c1..dc34a5aa0 100644
--- a/lib/pages/pgc_review/view.dart
+++ b/lib/pages/pgc_review/view.dart
@@ -22,8 +22,10 @@ class PgcReviewPage extends StatefulWidget {
 
 class _PgcReviewPageState extends State<PgcReviewPage>
     with SingleTickerProviderStateMixin, AutomaticKeepAliveClientMixin {
-  late final _tabController =
-      TabController(length: PgcReviewType.values.length, vsync: this);
+  late final _tabController = TabController(
+    length: PgcReviewType.values.length,
+    vsync: this,
+  );
 
   @override
   void dispose() {
@@ -51,8 +53,10 @@ class _PgcReviewPageState extends State<PgcReviewPage>
                 overlayColor: WidgetStateProperty.all(Colors.transparent),
                 splashFactory: NoSplash.splashFactory,
                 padding: const EdgeInsets.only(left: 6),
-                indicatorPadding:
-                    const EdgeInsets.symmetric(horizontal: 3, vertical: 8),
+                indicatorPadding: const EdgeInsets.symmetric(
+                  horizontal: 3,
+                  vertical: 8,
+                ),
                 indicator: BoxDecoration(
                   color: theme.colorScheme.secondaryContainer,
                   borderRadius: const BorderRadius.all(Radius.circular(20)),
@@ -60,9 +64,10 @@ class _PgcReviewPageState extends State<PgcReviewPage>
                 indicatorSize: TabBarIndicatorSize.tab,
                 labelColor: theme.colorScheme.onSecondaryContainer,
                 unselectedLabelColor: theme.colorScheme.outline,
-                labelStyle: TabBarTheme.of(context)
-                        .labelStyle
-                        ?.copyWith(fontSize: 13) ??
+                labelStyle:
+                    TabBarTheme.of(
+                      context,
+                    ).labelStyle?.copyWith(fontSize: 13) ??
                     const TextStyle(fontSize: 13),
                 dividerColor: Colors.transparent,
                 tabs: PgcReviewType.values
@@ -73,9 +78,8 @@ class _PgcReviewPageState extends State<PgcReviewPage>
                     if (!_tabController.indexIsChanging) {
                       final item = PgcReviewType.values[index];
                       Get.find<PgcReviewController>(
-                              tag: '${widget.mediaId}${item.name}')
-                          .scrollController
-                          .animToTop();
+                        tag: '${widget.mediaId}${item.name}',
+                      ).scrollController.animToTop();
                     }
                   } catch (_) {}
                 },
@@ -86,11 +90,13 @@ class _PgcReviewPageState extends State<PgcReviewPage>
                 controller: _tabController,
                 physics: const NeverScrollableScrollPhysics(),
                 children: PgcReviewType.values
-                    .map((e) => PgcReviewChildPage(
-                          type: e,
-                          name: widget.name,
-                          mediaId: widget.mediaId,
-                        ))
+                    .map(
+                      (e) => PgcReviewChildPage(
+                        type: e,
+                        name: widget.name,
+                        mediaId: widget.mediaId,
+                      ),
+                    )
                     .toList(),
               ),
             ),
@@ -141,7 +147,7 @@ class _PgcReviewPageState extends State<PgcReviewPage>
                           '/webview',
                           parameters: {
                             'url':
-                                'https://member.bilibili.com/article-text/mobile?theme=${Get.isDarkMode ? 1 : 0}&media_id=${widget.mediaId}'
+                                'https://member.bilibili.com/article-text/mobile?theme=${Get.isDarkMode ? 1 : 0}&media_id=${widget.mediaId}',
                           },
                         ),
                     ),
diff --git a/lib/pages/rank/view.dart b/lib/pages/rank/view.dart
index 08bdfffa1..53eb59a2a 100644
--- a/lib/pages/rank/view.dart
+++ b/lib/pages/rank/view.dart
@@ -64,8 +64,9 @@ class _RankPageState extends State<RankPage>
                               flex: 1,
                               child: Container(
                                 alignment: Alignment.center,
-                                padding:
-                                    const EdgeInsets.symmetric(vertical: 7),
+                                padding: const EdgeInsets.symmetric(
+                                  vertical: 7,
+                                ),
                                 child: Text(
                                   RankType.values[index].label,
                                   style: TextStyle(
@@ -94,10 +95,12 @@ class _RankPageState extends State<RankPage>
             physics: const NeverScrollableScrollPhysics(),
             controller: _rankController.tabController,
             children: RankType.values
-                .map((item) => ZonePage(
-                      rid: item.rid,
-                      seasonType: item.seasonType,
-                    ))
+                .map(
+                  (item) => ZonePage(
+                    rid: item.rid,
+                    seasonType: item.seasonType,
+                  ),
+                )
                 .toList(),
           ),
         ),
diff --git a/lib/pages/rank/zone/view.dart b/lib/pages/rank/zone/view.dart
index ed6eb9178..1d8f9ed86 100644
--- a/lib/pages/rank/zone/view.dart
+++ b/lib/pages/rank/zone/view.dart
@@ -69,30 +69,31 @@ class _ZonePageState extends CommonPageState<ZonePage, ZoneController>
   Widget _buildBody(LoadingState<List<dynamic>?> loadingState) {
     return switch (loadingState) {
       Loading() => _buildSkeleton(),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  final item = response[index];
-                  if (item is HotVideoItemModel) {
-                    return VideoCardH(
-                      videoItem: item,
-                      onRemove: () => controller.loadingState
-                        ..value.data!.removeAt(index)
-                        ..refresh(),
-                    );
-                  }
-                  return PgcRankItem(item: item);
-                },
-                childCount: response!.length,
-              ),
-            )
-          : HttpError(onReload: controller.onReload),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    final item = response[index];
+                    if (item is HotVideoItemModel) {
+                      return VideoCardH(
+                        videoItem: item,
+                        onRemove: () => controller.loadingState
+                          ..value.data!.removeAt(index)
+                          ..refresh(),
+                      );
+                    }
+                    return PgcRankItem(item: item);
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(onReload: controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/rank/zone/widget/pgc_rank_item.dart b/lib/pages/rank/zone/widget/pgc_rank_item.dart
index d48358557..183b6d9aa 100644
--- a/lib/pages/rank/zone/widget/pgc_rank_item.dart
+++ b/lib/pages/rank/zone/widget/pgc_rank_item.dart
@@ -80,7 +80,7 @@ class PgcRankItem extends StatelessWidget {
                           value: item.stat!.follow,
                         ),
                       ],
-                    )
+                    ),
                   ],
                 ),
               ),
diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart
index 2aebc1edf..b3f6dc9c4 100644
--- a/lib/pages/rcmd/view.dart
+++ b/lib/pages/rcmd/view.dart
@@ -54,82 +54,85 @@ class _RcmdPageState extends CommonPageState<RcmdPage, RcmdController>
   Widget _buildBody(LoadingState<List<dynamic>?> loadingState) {
     return switch (loadingState) {
       Loading() => _buildSkeleton(),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                mainAxisSpacing: StyleString.cardSpace,
-                crossAxisSpacing: StyleString.cardSpace,
-                maxCrossAxisExtent: Grid.smallCardWidth,
-                childAspectRatio: StyleString.aspectRatio,
-                mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
-              ),
-              delegate: SliverChildBuilderDelegate(
-                (BuildContext context, int index) {
-                  if (index == response.length - 1) {
-                    controller.onLoadMore();
-                  }
-                  if (controller.lastRefreshAt != null) {
-                    if (controller.lastRefreshAt == index) {
-                      return GestureDetector(
-                        onTap: () => controller
-                          ..animateToTop()
-                          ..onRefresh(),
-                        child: Card(
-                          child: Container(
-                            alignment: Alignment.center,
-                            padding: const EdgeInsets.symmetric(horizontal: 10),
-                            child: Text(
-                              '上次看到这里\n点击刷新',
-                              textAlign: TextAlign.center,
-                              style: TextStyle(
-                                color: Theme.of(context)
-                                    .colorScheme
-                                    .onSurfaceVariant,
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                  mainAxisSpacing: StyleString.cardSpace,
+                  crossAxisSpacing: StyleString.cardSpace,
+                  maxCrossAxisExtent: Grid.smallCardWidth,
+                  childAspectRatio: StyleString.aspectRatio,
+                  mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
+                ),
+                delegate: SliverChildBuilderDelegate(
+                  (BuildContext context, int index) {
+                    if (index == response.length - 1) {
+                      controller.onLoadMore();
+                    }
+                    if (controller.lastRefreshAt != null) {
+                      if (controller.lastRefreshAt == index) {
+                        return GestureDetector(
+                          onTap: () => controller
+                            ..animateToTop()
+                            ..onRefresh(),
+                          child: Card(
+                            child: Container(
+                              alignment: Alignment.center,
+                              padding: const EdgeInsets.symmetric(
+                                horizontal: 10,
+                              ),
+                              child: Text(
+                                '上次看到这里\n点击刷新',
+                                textAlign: TextAlign.center,
+                                style: TextStyle(
+                                  color: Theme.of(
+                                    context,
+                                  ).colorScheme.onSurfaceVariant,
+                                ),
                               ),
                             ),
                           ),
-                        ),
+                        );
+                      }
+                      int actualIndex = controller.lastRefreshAt == null
+                          ? index
+                          : index > controller.lastRefreshAt!
+                          ? index - 1
+                          : index;
+                      return VideoCardV(
+                        videoItem: response[actualIndex],
+                        onRemove: () {
+                          if (controller.lastRefreshAt != null &&
+                              actualIndex < controller.lastRefreshAt!) {
+                            controller.lastRefreshAt =
+                                controller.lastRefreshAt! - 1;
+                          }
+                          controller.loadingState
+                            ..value.data!.removeAt(actualIndex)
+                            ..refresh();
+                        },
+                      );
+                    } else {
+                      return VideoCardV(
+                        videoItem: response[index],
+                        onRemove: () {
+                          controller.loadingState
+                            ..value.data!.removeAt(index)
+                            ..refresh();
+                        },
                       );
                     }
-                    int actualIndex = controller.lastRefreshAt == null
-                        ? index
-                        : index > controller.lastRefreshAt!
-                            ? index - 1
-                            : index;
-                    return VideoCardV(
-                      videoItem: response[actualIndex],
-                      onRemove: () {
-                        if (controller.lastRefreshAt != null &&
-                            actualIndex < controller.lastRefreshAt!) {
-                          controller.lastRefreshAt =
-                              controller.lastRefreshAt! - 1;
-                        }
-                        controller.loadingState
-                          ..value.data!.removeAt(actualIndex)
-                          ..refresh();
-                      },
-                    );
-                  } else {
-                    return VideoCardV(
-                      videoItem: response[index],
-                      onRemove: () {
-                        controller.loadingState
-                          ..value.data!.removeAt(index)
-                          ..refresh();
-                      },
-                    );
-                  }
-                },
-                childCount: controller.lastRefreshAt != null
-                    ? response!.length + 1
-                    : response!.length,
-              ),
-            )
-          : HttpError(onReload: controller.onReload),
+                  },
+                  childCount: controller.lastRefreshAt != null
+                      ? response!.length + 1
+                      : response!.length,
+                ),
+              )
+            : HttpError(onReload: controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: controller.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/save_panel/view.dart b/lib/pages/save_panel/view.dart
index 0f4f861eb..47ad74fc3 100644
--- a/lib/pages/save_panel/view.dart
+++ b/lib/pages/save_panel/view.dart
@@ -46,8 +46,10 @@ class SavePanel extends StatefulWidget {
       },
       transitionDuration: const Duration(milliseconds: 255),
       transitionBuilder: (context, animation, secondaryAnimation, child) {
-        var tween = Tween<double>(begin: 0, end: 1)
-            .chain(CurveTween(curve: Curves.easeInOut));
+        var tween = Tween<double>(
+          begin: 0,
+          end: 1,
+        ).chain(CurveTween(curve: Curves.easeInOut));
         return FadeTransition(
           opacity: animation.drive(tween),
           child: child,
@@ -119,9 +121,7 @@ class _SavePanelState extends State<SavePanel> {
           viewType = '查看';
           itemType = '评论';
           uri = switch (type) {
-            1 ||
-            11 ||
-            12 =>
+            1 || 11 || 12 =>
               'bilibili://comment/detail/$type/${dynItem.basic!.ridStr}/$rootId/?${anchor}enterUri=$enterUri',
             _ =>
               'bilibili://comment/detail/$type/$oid/$rootId/?${anchor}enterUri=$enterUri',
@@ -135,9 +135,7 @@ class _SavePanelState extends State<SavePanel> {
           late final anchor = hasRoot ? 'anchor=${_item.id}&' : '';
           late final enterUri = 'bilibili://following/detail/$oid';
           uri = switch (type) {
-            1 ||
-            11 ||
-            12 =>
+            1 || 11 || 12 =>
               'bilibili://comment/detail/$type/$oid/$rootId/?${anchor}enterUri=${Get.arguments['enterUri']}',
             _ =>
               'bilibili://comment/detail/$type/$oid/$rootId/?${anchor}enterUri=$enterUri',
@@ -234,8 +232,9 @@ class _SavePanelState extends State<SavePanel> {
     }
     SmartDialog.showLoading();
     try {
-      RenderRepaintBoundary boundary = boundaryKey.currentContext!
-          .findRenderObject() as RenderRepaintBoundary;
+      RenderRepaintBoundary boundary =
+          boundaryKey.currentContext!.findRenderObject()
+              as RenderRepaintBoundary;
       var image = await boundary.toImage(pixelRatio: 3);
       ByteData? byteData = await image.toByteData(format: ImageByteFormat.png);
       Uint8List pngBytes = byteData!.buffer.asUint8List();
@@ -250,7 +249,7 @@ class _SavePanelState extends State<SavePanel> {
               pngBytes,
               name: picName,
               mimeType: 'image/png',
-            )
+            ),
           ],
           sharePositionOrigin: await Utils.isIpad()
               ? Rect.fromLTWH(0, 0, Get.width, Get.height / 2)
@@ -301,8 +300,9 @@ class _SavePanelState extends State<SavePanel> {
                       clipBehavior: Clip.hardEdge,
                       decoration: BoxDecoration(
                         color: theme.colorScheme.surface,
-                        borderRadius:
-                            const BorderRadius.all(Radius.circular(12)),
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(12),
+                        ),
                       ),
                       child: AnimatedSize(
                         curve: Curves.easeInOut,
@@ -334,23 +334,28 @@ class _SavePanelState extends State<SavePanel> {
                               Container(
                                 height: 81,
                                 clipBehavior: Clip.hardEdge,
-                                margin:
-                                    const EdgeInsets.symmetric(horizontal: 12),
+                                margin: const EdgeInsets.symmetric(
+                                  horizontal: 12,
+                                ),
                                 padding: const EdgeInsets.all(8),
                                 decoration: BoxDecoration(
                                   color: theme.colorScheme.onInverseSurface,
                                   borderRadius: const BorderRadius.all(
-                                      Radius.circular(8)),
+                                    Radius.circular(8),
+                                  ),
                                 ),
                                 child: Row(
                                   children: [
                                     NetworkImgLayer(
                                       radius: 6,
                                       src: cover!,
-                                      height: MediaQuery.textScalerOf(context)
-                                          .scale(65),
-                                      width: MediaQuery.textScalerOf(context)
-                                              .scale(65) *
+                                      height: MediaQuery.textScalerOf(
+                                        context,
+                                      ).scale(65),
+                                      width:
+                                          MediaQuery.textScalerOf(
+                                            context,
+                                          ).scale(65) *
                                           16 /
                                           9,
                                       quality: 100,
@@ -369,9 +374,10 @@ class _SavePanelState extends State<SavePanel> {
                                           if (pubdate != null) ...[
                                             const Spacer(),
                                             Text(
-                                              DateUtil.format(pubdate,
-                                                  format:
-                                                      DateUtil.longFormatDs),
+                                              DateUtil.format(
+                                                pubdate,
+                                                format: DateUtil.longFormatDs,
+                                              ),
                                               style: TextStyle(
                                                 color:
                                                     theme.colorScheme.outline,
@@ -419,7 +425,8 @@ class _SavePanelState extends State<SavePanel> {
                                                       '识别二维码，$viewType$itemType',
                                                       textAlign: TextAlign.end,
                                                       style: TextStyle(
-                                                        color: theme.colorScheme
+                                                        color: theme
+                                                            .colorScheme
                                                             .onSurfaceVariant,
                                                       ),
                                                     ),
@@ -427,11 +434,13 @@ class _SavePanelState extends State<SavePanel> {
                                                     Text(
                                                       DateUtil.longFormatDs
                                                           .format(
-                                                              DateTime.now()),
+                                                            DateTime.now(),
+                                                          ),
                                                       textAlign: TextAlign.end,
                                                       style: TextStyle(
                                                         fontSize: 13,
-                                                        color: theme.colorScheme
+                                                        color: theme
+                                                            .colorScheme
                                                             .outline,
                                                       ),
                                                     ),
@@ -441,25 +450,29 @@ class _SavePanelState extends State<SavePanel> {
                                               Container(
                                                 width: 100,
                                                 height: 100,
-                                                padding:
-                                                    const EdgeInsets.all(12),
+                                                padding: const EdgeInsets.all(
+                                                  12,
+                                                ),
                                                 child: Container(
                                                   color: Get.isDarkMode
                                                       ? Colors.white
                                                       : theme
-                                                          .colorScheme.surface,
-                                                  padding:
-                                                      const EdgeInsets.all(3),
+                                                            .colorScheme
+                                                            .surface,
+                                                  padding: const EdgeInsets.all(
+                                                    3,
+                                                  ),
                                                   child: PrettyQrView.data(
                                                     data: uri,
                                                     decoration:
                                                         const PrettyQrDecoration(
-                                                      shape:
-                                                          PrettyQrRoundedSymbol(
-                                                        borderRadius:
-                                                            BorderRadius.zero,
-                                                      ),
-                                                    ),
+                                                          shape:
+                                                              PrettyQrRoundedSymbol(
+                                                                borderRadius:
+                                                                    BorderRadius
+                                                                        .zero,
+                                                              ),
+                                                        ),
                                                   ),
                                                 ),
                                               ),
@@ -472,7 +485,8 @@ class _SavePanelState extends State<SavePanel> {
                                           'assets/images/logo/logo_2.png',
                                           width: 100,
                                           color: theme
-                                              .colorScheme.onSurfaceVariant,
+                                              .colorScheme
+                                              .onSurfaceVariant,
                                         ),
                                       ),
                                     ],
@@ -519,15 +533,16 @@ class _SavePanelState extends State<SavePanel> {
                     ),
                     const SizedBox(width: 40),
                     iconButton(
-                        size: 42,
-                        tooltip: showBottom ? '隐藏' : '显示',
-                        context: context,
-                        icon: showBottom
-                            ? Icons.visibility_off
-                            : Icons.visibility,
-                        onPressed: () => setState(() {
-                              showBottom = !showBottom;
-                            })),
+                      size: 42,
+                      tooltip: showBottom ? '隐藏' : '显示',
+                      context: context,
+                      icon: showBottom
+                          ? Icons.visibility_off
+                          : Icons.visibility,
+                      onPressed: () => setState(() {
+                        showBottom = !showBottom;
+                      }),
+                    ),
                     const SizedBox(width: 40),
                     iconButton(
                       size: 42,
diff --git a/lib/pages/search/controller.dart b/lib/pages/search/controller.dart
index 83234e7bd..b606854c6 100644
--- a/lib/pages/search/controller.dart
+++ b/lib/pages/search/controller.dart
@@ -59,8 +59,9 @@ class SSearchController extends GetxController {
       controller.text = Get.parameters['text']!;
     }
 
-    historyList =
-        List<String>.from(GStorage.historyWord.get('cacheList') ?? []).obs;
+    historyList = List<String>.from(
+      GStorage.historyWord.get('cacheList') ?? [],
+    ).obs;
 
     if (searchSuggestion) {
       _ctr = StreamController<String>();
diff --git a/lib/pages/search/view.dart b/lib/pages/search/view.dart
index d8a7962a3..c9a34f63e 100644
--- a/lib/pages/search/view.dart
+++ b/lib/pages/search/view.dart
@@ -44,7 +44,8 @@ class _SearchPageState extends State<SearchPage> {
                     tooltip: 'UID搜索用户',
                     icon: const Icon(Icons.person_outline, size: 22),
                     onPressed: () => Get.toNamed(
-                        '/member?mid=${_searchController.controller.text}'),
+                      '/member?mid=${_searchController.controller.text}',
+                    ),
                   )
                 : const SizedBox.shrink(),
           ),
@@ -58,7 +59,7 @@ class _SearchPageState extends State<SearchPage> {
             onPressed: () => _searchController.submit(),
             icon: const Icon(Icons.search, size: 22),
           ),
-          const SizedBox(width: 10)
+          const SizedBox(width: 10),
         ],
         title: TextField(
           autofocus: true,
@@ -80,7 +81,7 @@ class _SearchPageState extends State<SearchPage> {
           if (context.orientation == Orientation.portrait) ...[
             if (_searchController.enableHotKey) hotSearch(theme),
             _history(theme),
-            if (_searchController.enableSearchRcmd) hotSearch(theme, false)
+            if (_searchController.enableSearchRcmd) hotSearch(theme, false),
           ] else
             Row(
               crossAxisAlignment: CrossAxisAlignment.start,
@@ -92,7 +93,7 @@ class _SearchPageState extends State<SearchPage> {
                       children: [
                         if (_searchController.enableHotKey) hotSearch(theme),
                         if (_searchController.enableSearchRcmd)
-                          hotSearch(theme, false)
+                          hotSearch(theme, false),
                       ],
                     ),
                   ),
@@ -106,7 +107,8 @@ class _SearchPageState extends State<SearchPage> {
 
   Widget _searchSuggest() {
     return Obx(
-      () => _searchController.searchSuggestList.isNotEmpty &&
+      () =>
+          _searchController.searchSuggestList.isNotEmpty &&
               _searchController.searchSuggestList.first.term != null &&
               _searchController.controller.text != ''
           ? Column(
@@ -127,17 +129,19 @@ class _SearchPageState extends State<SearchPage> {
                         child: Text.rich(
                           TextSpan(
                             children: Em.regTitle(item.textRich)
-                                .map((e) => TextSpan(
-                                      text: e.text,
-                                      style: e.isEm
-                                          ? TextStyle(
-                                              fontWeight: FontWeight.bold,
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .primary,
-                                            )
-                                          : null,
-                                    ))
+                                .map(
+                                  (e) => TextSpan(
+                                    text: e.text,
+                                    style: e.isEm
+                                        ? TextStyle(
+                                            fontWeight: FontWeight.bold,
+                                            color: Theme.of(
+                                              context,
+                                            ).colorScheme.primary,
+                                          )
+                                        : null,
+                                  ),
+                                )
                                 .toList(),
                           ),
                         ),
@@ -154,8 +158,10 @@ class _SearchPageState extends State<SearchPage> {
     final text = Text(
       isHot ? '大家都在搜' : '搜索发现',
       strutStyle: const StrutStyle(leading: 0, height: 1),
-      style: theme.textTheme.titleMedium!
-          .copyWith(height: 1, fontWeight: FontWeight.bold),
+      style: theme.textTheme.titleMedium!.copyWith(
+        height: 1,
+        fontWeight: FontWeight.bold,
+      ),
     );
     final outline = theme.colorScheme.outline;
     final secondary = theme.colorScheme.secondary;
@@ -191,8 +197,10 @@ class _SearchPageState extends State<SearchPage> {
                                 children: [
                                   Text(
                                     '完整榜单',
-                                    strutStyle:
-                                        const StrutStyle(leading: 0, height: 1),
+                                    strutStyle: const StrutStyle(
+                                      leading: 0,
+                                      height: 1,
+                                    ),
                                     style: style,
                                   ),
                                   Icon(
@@ -212,7 +220,8 @@ class _SearchPageState extends State<SearchPage> {
                   child: TextButton.icon(
                     style: const ButtonStyle(
                       padding: WidgetStatePropertyAll(
-                          EdgeInsets.symmetric(horizontal: 10, vertical: 6)),
+                        EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+                      ),
                     ),
                     onPressed: isHot
                         ? _searchController.queryHotSearchList
@@ -235,12 +244,14 @@ class _SearchPageState extends State<SearchPage> {
               ],
             ),
           ),
-          Obx(() => _buildHotKey(
-                isHot
-                    ? _searchController.loadingState.value
-                    : _searchController.recommendData.value,
-                isHot,
-              )),
+          Obx(
+            () => _buildHotKey(
+              isHot
+                  ? _searchController.loadingState.value
+                  : _searchController.recommendData.value,
+              isHot,
+            ),
+          ),
         ],
       ),
     );
@@ -259,8 +270,8 @@ class _SearchPageState extends State<SearchPage> {
             context.orientation == Orientation.landscape
                 ? 25
                 : _searchController.enableHotKey
-                    ? 0
-                    : 6,
+                ? 0
+                : 6,
             6,
             25,
           ),
@@ -274,8 +285,10 @@ class _SearchPageState extends State<SearchPage> {
                     Text(
                       '搜索历史',
                       strutStyle: const StrutStyle(leading: 0, height: 1),
-                      style: theme.textTheme.titleMedium!
-                          .copyWith(height: 1, fontWeight: FontWeight.bold),
+                      style: theme.textTheme.titleMedium!.copyWith(
+                        height: 1,
+                        fontWeight: FontWeight.bold,
+                      ),
                     ),
                     const SizedBox(width: 12),
                     Obx(
@@ -291,14 +304,17 @@ class _SearchPageState extends State<SearchPage> {
                             icon: enable
                                 ? historyIcon(theme)
                                 : historyIcon(theme).disable(),
-                            style:
-                                IconButton.styleFrom(padding: EdgeInsets.zero),
+                            style: IconButton.styleFrom(
+                              padding: EdgeInsets.zero,
+                            ),
                             onPressed: () {
                               enable = !enable;
                               _searchController.recordSearchHistory.value =
                                   enable;
                               GStorage.setting.put(
-                                  SettingBoxKey.recordSearchHistory, enable);
+                                SettingBoxKey.recordSearchHistory,
+                                enable,
+                              );
                             },
                           ),
                         );
@@ -327,7 +343,7 @@ class _SearchPageState extends State<SearchPage> {
                           style: TextStyle(color: secondary),
                         ),
                       ),
-                    )
+                    ),
                   ],
                 ),
               ),
@@ -353,26 +369,29 @@ class _SearchPageState extends State<SearchPage> {
     );
   }
 
-  Icon historyIcon(ThemeData theme) => Icon(Icons.history,
-      color: theme.colorScheme.onSurfaceVariant.withValues(alpha: 0.8));
+  Icon historyIcon(ThemeData theme) => Icon(
+    Icons.history,
+    color: theme.colorScheme.onSurfaceVariant.withValues(alpha: 0.8),
+  );
 
   Widget _buildHotKey(LoadingState<SearchRcmdData> loadingState, bool isHot) {
     return switch (loadingState) {
-      Success(:var response) => response.list?.isNotEmpty == true
-          ? LayoutBuilder(
-              builder: (context, constraints) => HotKeyword(
-                width: constraints.maxWidth,
-                hotSearchList: response.list!,
-                onClick: _searchController.onClickKeyword,
-              ),
-            )
-          : const SizedBox.shrink(),
+      Success(:var response) =>
+        response.list?.isNotEmpty == true
+            ? LayoutBuilder(
+                builder: (context, constraints) => HotKeyword(
+                  width: constraints.maxWidth,
+                  hotSearchList: response.list!,
+                  onClick: _searchController.onClickKeyword,
+                ),
+              )
+            : const SizedBox.shrink(),
       Error(:var errMsg) => errorWidget(
-          errMsg: errMsg,
-          onReload: isHot
-              ? _searchController.queryHotSearchList
-              : _searchController.queryRecommendList,
-        ),
+        errMsg: errMsg,
+        onReload: isHot
+            ? _searchController.queryHotSearchList
+            : _searchController.queryRecommendList,
+      ),
       _ => const SizedBox.shrink(),
     };
   }
diff --git a/lib/pages/search/widgets/hot_keyword.dart b/lib/pages/search/widgets/hot_keyword.dart
index d2b088005..bfa15d4da 100644
--- a/lib/pages/search/widgets/hot_keyword.dart
+++ b/lib/pages/search/widgets/hot_keyword.dart
@@ -65,7 +65,7 @@ class HotKeyword extends StatelessWidget {
                               width: 48,
                               height: 15,
                             ),
-                          )
+                          ),
                       ],
                     ),
                   ),
diff --git a/lib/pages/search/widgets/search_text.dart b/lib/pages/search/widgets/search_text.dart
index d41b197e2..51b57c20b 100644
--- a/lib/pages/search/widgets/search_text.dart
+++ b/lib/pages/search/widgets/search_text.dart
@@ -33,7 +33,8 @@ class SearchText extends StatelessWidget {
         onLongPress: onLongPress != null ? () => onLongPress!(text) : null,
         borderRadius: const BorderRadius.all(Radius.circular(6)),
         child: Padding(
-          padding: padding ??
+          padding:
+              padding ??
               const EdgeInsets.symmetric(horizontal: 11, vertical: 5),
           child: Text(
             text,
diff --git a/lib/pages/search_panel/all/controller.dart b/lib/pages/search_panel/all/controller.dart
index feb63a527..a9c85c7db 100644
--- a/lib/pages/search_panel/all/controller.dart
+++ b/lib/pages/search_panel/all/controller.dart
@@ -40,17 +40,17 @@ class SearchAllController
 
   @override
   Future<LoadingState<SearchAllData>> customGetData() => SearchHttp.searchAll(
-        keyword: keyword,
-        page: page,
-        order: order.value,
-        duration: searchType == SearchType.video ? duration.value : null,
-        tids: tids,
-        orderSort: orderSort,
-        userType: userType,
-        categoryId: categoryId,
-        pubBegin: pubBegin,
-        pubEnd: pubEnd,
-      );
+    keyword: keyword,
+    page: page,
+    order: order.value,
+    duration: searchType == SearchType.video ? duration.value : null,
+    tids: tids,
+    orderSort: orderSort,
+    userType: userType,
+    categoryId: categoryId,
+    pubBegin: pubBegin,
+    pubEnd: pubEnd,
+  );
 
   void onPushDetail(dynamic resultList) {
     try {
diff --git a/lib/pages/search_panel/all/view.dart b/lib/pages/search_panel/all/view.dart
index e8745fbc1..7d213a12a 100644
--- a/lib/pages/search_panel/all/view.dart
+++ b/lib/pages/search_panel/all/view.dart
@@ -52,44 +52,46 @@ class _SearchAllPanelState
           .map(
             (item) => switch (item) {
               SearchVideoItemModel() => SizedBox(
-                  height: 120,
-                  child: VideoCardH(
-                    videoItem: item,
-                  ),
+                height: 120,
+                child: VideoCardH(
+                  videoItem: item,
                 ),
-              List<SearchPgcItemModel>() => item.length == 1
-                  ? SizedBox(
-                      height: 160,
-                      child: SearchPgcItem(item: item.first),
-                    )
-                  : SizedBox(
-                      height: Grid.smallCardWidth / 2 / 0.75 +
-                          MediaQuery.textScalerOf(context).scale(60),
-                      child: ListView.builder(
-                        padding: const EdgeInsets.only(bottom: 7),
-                        physics: const AlwaysScrollableScrollPhysics(),
-                        scrollDirection: Axis.horizontal,
-                        itemCount: item.length,
-                        itemBuilder: (context, index) {
-                          return Container(
-                            width: Grid.smallCardWidth / 2,
-                            margin: EdgeInsets.only(
-                              left: StyleString.safeSpace,
-                              right: index == item.length - 1
-                                  ? StyleString.safeSpace
-                                  : 0,
-                            ),
-                            child: PgcCardVSearch(item: item[index]),
-                          );
-                        },
+              ),
+              List<SearchPgcItemModel>() =>
+                item.length == 1
+                    ? SizedBox(
+                        height: 160,
+                        child: SearchPgcItem(item: item.first),
+                      )
+                    : SizedBox(
+                        height:
+                            Grid.smallCardWidth / 2 / 0.75 +
+                            MediaQuery.textScalerOf(context).scale(60),
+                        child: ListView.builder(
+                          padding: const EdgeInsets.only(bottom: 7),
+                          physics: const AlwaysScrollableScrollPhysics(),
+                          scrollDirection: Axis.horizontal,
+                          itemCount: item.length,
+                          itemBuilder: (context, index) {
+                            return Container(
+                              width: Grid.smallCardWidth / 2,
+                              margin: EdgeInsets.only(
+                                left: StyleString.safeSpace,
+                                right: index == item.length - 1
+                                    ? StyleString.safeSpace
+                                    : 0,
+                              ),
+                              child: PgcCardVSearch(item: item[index]),
+                            );
+                          },
+                        ),
                       ),
-                    ),
               SearchUserItemModel() => Padding(
-                  padding: const EdgeInsets.only(bottom: 5),
-                  child: SearchUserItem(
-                    item: item,
-                  ),
+                padding: const EdgeInsets.only(bottom: 5),
+                child: SearchUserItem(
+                  item: item,
                 ),
+              ),
               _ => const SizedBox.shrink(),
             },
           )
diff --git a/lib/pages/search_panel/all/widgets/pgc_card_v_search.dart b/lib/pages/search_panel/all/widgets/pgc_card_v_search.dart
index 341736ca6..74522720b 100644
--- a/lib/pages/search_panel/all/widgets/pgc_card_v_search.dart
+++ b/lib/pages/search_panel/all/widgets/pgc_card_v_search.dart
@@ -31,25 +31,27 @@ class PgcCardVSearch extends StatelessWidget {
           children: [
             AspectRatio(
               aspectRatio: 0.75,
-              child: LayoutBuilder(builder: (context, boxConstraints) {
-                final double maxWidth = boxConstraints.maxWidth;
-                final double maxHeight = boxConstraints.maxHeight;
-                return Stack(
-                  clipBehavior: Clip.none,
-                  children: [
-                    NetworkImgLayer(
-                      src: item.cover,
-                      width: maxWidth,
-                      height: maxHeight,
-                    ),
-                    PBadge(
-                      text: item.seasonTypeName,
-                      right: 6,
-                      top: 6,
-                    ),
-                  ],
-                );
-              }),
+              child: LayoutBuilder(
+                builder: (context, boxConstraints) {
+                  final double maxWidth = boxConstraints.maxWidth;
+                  final double maxHeight = boxConstraints.maxHeight;
+                  return Stack(
+                    clipBehavior: Clip.none,
+                    children: [
+                      NetworkImgLayer(
+                        src: item.cover,
+                        width: maxWidth,
+                        height: maxHeight,
+                      ),
+                      PBadge(
+                        text: item.seasonTypeName,
+                        right: 6,
+                        top: 6,
+                      ),
+                    ],
+                  );
+                },
+              ),
             ),
             Padding(
               padding: const EdgeInsets.fromLTRB(4, 5, 0, 3),
@@ -62,7 +64,7 @@ class PgcCardVSearch extends StatelessWidget {
                 maxLines: 2,
                 overflow: TextOverflow.ellipsis,
               ),
-            )
+            ),
           ],
         ),
       ),
diff --git a/lib/pages/search_panel/article/controller.dart b/lib/pages/search_panel/article/controller.dart
index 429b3779b..052ea07dd 100644
--- a/lib/pages/search_panel/article/controller.dart
+++ b/lib/pages/search_panel/article/controller.dart
@@ -22,9 +22,10 @@ class SearchArticleController
   }
 
   void jump2Article() {
-    String? cvid = RegExp(r'^cv(id)?(\d+)$', caseSensitive: false)
-        .matchAsPrefix(keyword)
-        ?.group(2);
+    String? cvid = RegExp(
+      r'^cv(id)?(\d+)$',
+      caseSensitive: false,
+    ).matchAsPrefix(keyword)?.group(2);
     if (cvid != null) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         Get.toNamed(
@@ -108,8 +109,8 @@ class SearchArticleController
                               : null,
                           textColor:
                               item['value'] == currentOrderFilterval.value
-                                  ? theme.colorScheme.onSecondaryContainer
-                                  : null,
+                              ? theme.colorScheme.onSecondaryContainer
+                              : null,
                         ),
                       )
                       .toList(),
diff --git a/lib/pages/search_panel/article/view.dart b/lib/pages/search_panel/article/view.dart
index ce3436212..da6d95543 100644
--- a/lib/pages/search_panel/article/view.dart
+++ b/lib/pages/search_panel/article/view.dart
@@ -19,8 +19,13 @@ class SearchArticlePanel extends CommonSearchPanel {
   State<SearchArticlePanel> createState() => _SearchArticlePanelState();
 }
 
-class _SearchArticlePanelState extends CommonSearchPanelState<
-    SearchArticlePanel, SearchArticleData, SearchArticleItemModel> {
+class _SearchArticlePanelState
+    extends
+        CommonSearchPanelState<
+          SearchArticlePanel,
+          SearchArticleData,
+          SearchArticleItemModel
+        > {
   @override
   late final SearchArticleController controller = Get.put(
     SearchArticleController(
diff --git a/lib/pages/search_panel/article/widgets/item.dart b/lib/pages/search_panel/article/widgets/item.dart
index bd18886a8..dbadcfdfc 100644
--- a/lib/pages/search_panel/article/widgets/item.dart
+++ b/lib/pages/search_panel/article/widgets/item.dart
@@ -43,15 +43,17 @@ class SearchArticleItem extends StatelessWidget {
               if (item.imageUrls?.isNotEmpty == true)
                 AspectRatio(
                   aspectRatio: StyleString.aspectRatio,
-                  child: LayoutBuilder(builder: (context, boxConstraints) {
-                    double maxWidth = boxConstraints.maxWidth;
-                    double maxHeight = boxConstraints.maxHeight;
-                    return NetworkImgLayer(
-                      width: maxWidth,
-                      height: maxHeight,
-                      src: item.imageUrls?.firstOrNull,
-                    );
-                  }),
+                  child: LayoutBuilder(
+                    builder: (context, boxConstraints) {
+                      double maxWidth = boxConstraints.maxWidth;
+                      double maxHeight = boxConstraints.maxHeight;
+                      return NetworkImgLayer(
+                        width: maxWidth,
+                        height: maxHeight,
+                        src: item.imageUrls?.firstOrNull,
+                      );
+                    },
+                  ),
                 ),
               const SizedBox(width: 10),
               Expanded(
@@ -62,16 +64,19 @@ class SearchArticleItem extends StatelessWidget {
                     Text.rich(
                       maxLines: 2,
                       TextSpan(
-                          children: item.title
-                              .map((e) => TextSpan(
-                                    text: e.text,
-                                    style: TextStyle(
-                                      color: e.isEm
-                                          ? theme.colorScheme.primary
-                                          : theme.colorScheme.onSurface,
-                                    ),
-                                  ))
-                              .toList()),
+                        children: item.title
+                            .map(
+                              (e) => TextSpan(
+                                text: e.text,
+                                style: TextStyle(
+                                  color: e.isEm
+                                      ? theme.colorScheme.primary
+                                      : theme.colorScheme.onSurface,
+                                ),
+                              ),
+                            )
+                            .toList(),
+                      ),
                     ),
                     const Spacer(),
                     Text(
diff --git a/lib/pages/search_panel/controller.dart b/lib/pages/search_panel/controller.dart
index b8a1bab8d..6e2fe7da8 100644
--- a/lib/pages/search_panel/controller.dart
+++ b/lib/pages/search_panel/controller.dart
@@ -52,18 +52,18 @@ class SearchPanelController<R extends SearchNumData<T>, T>
 
   @override
   Future<LoadingState<R>> customGetData() => SearchHttp.searchByType<R>(
-        searchType: searchType,
-        keyword: keyword,
-        page: page,
-        order: order.value,
-        duration: searchType == SearchType.video ? duration.value : null,
-        tids: tids,
-        orderSort: orderSort,
-        userType: userType,
-        categoryId: categoryId,
-        pubBegin: pubBegin,
-        pubEnd: pubEnd,
-      );
+    searchType: searchType,
+    keyword: keyword,
+    page: page,
+    order: order.value,
+    duration: searchType == SearchType.video ? duration.value : null,
+    tids: tids,
+    orderSort: orderSort,
+    userType: userType,
+    categoryId: categoryId,
+    pubBegin: pubBegin,
+    pubEnd: pubEnd,
+  );
 
   @override
   Future<void> onReload() {
diff --git a/lib/pages/search_panel/live/view.dart b/lib/pages/search_panel/live/view.dart
index 3b12bf886..c9ccbc96c 100644
--- a/lib/pages/search_panel/live/view.dart
+++ b/lib/pages/search_panel/live/view.dart
@@ -19,8 +19,13 @@ class SearchLivePanel extends CommonSearchPanel {
   State<SearchLivePanel> createState() => _SearchLivePanelState();
 }
 
-class _SearchLivePanelState extends CommonSearchPanelState<SearchLivePanel,
-    SearchLiveData, SearchLiveItemModel> {
+class _SearchLivePanelState
+    extends
+        CommonSearchPanelState<
+          SearchLivePanel,
+          SearchLiveData,
+          SearchLiveItemModel
+        > {
   @override
   late final controller = Get.put(
     SearchPanelController<SearchLiveData, SearchLiveItemModel>(
diff --git a/lib/pages/search_panel/live/widgets/item.dart b/lib/pages/search_panel/live/widgets/item.dart
index 7ef260070..6932057e0 100644
--- a/lib/pages/search_panel/live/widgets/item.dart
+++ b/lib/pages/search_panel/live/widgets/item.dart
@@ -25,36 +25,38 @@ class LiveItem extends StatelessWidget {
           children: [
             AspectRatio(
               aspectRatio: StyleString.aspectRatio,
-              child: LayoutBuilder(builder: (context, boxConstraints) {
-                double maxWidth = boxConstraints.maxWidth;
-                double maxHeight = boxConstraints.maxHeight;
-                return Stack(
-                  clipBehavior: Clip.none,
-                  children: [
-                    NetworkImgLayer(
-                      src: liveItem.cover,
-                      width: maxWidth,
-                      height: maxHeight,
-                      radius: 0,
-                    ),
-                    Positioned(
-                      left: 0,
-                      right: 0,
-                      bottom: 0,
-                      child: AnimatedOpacity(
-                        opacity: 1,
-                        duration: const Duration(milliseconds: 200),
-                        child: liveStat(
-                          liveItem.online,
-                          liveItem.cateName,
+              child: LayoutBuilder(
+                builder: (context, boxConstraints) {
+                  double maxWidth = boxConstraints.maxWidth;
+                  double maxHeight = boxConstraints.maxHeight;
+                  return Stack(
+                    clipBehavior: Clip.none,
+                    children: [
+                      NetworkImgLayer(
+                        src: liveItem.cover,
+                        width: maxWidth,
+                        height: maxHeight,
+                        radius: 0,
+                      ),
+                      Positioned(
+                        left: 0,
+                        right: 0,
+                        bottom: 0,
+                        child: AnimatedOpacity(
+                          opacity: 1,
+                          duration: const Duration(milliseconds: 200),
+                          child: liveStat(
+                            liveItem.online,
+                            liveItem.cateName,
+                          ),
                         ),
                       ),
-                    ),
-                  ],
-                );
-              }),
+                    ],
+                  );
+                },
+              ),
             ),
-            liveContent(theme)
+            liveContent(theme),
           ],
         ),
       ),
@@ -62,40 +64,43 @@ class LiveItem extends StatelessWidget {
   }
 
   Widget liveContent(ThemeData theme) => Expanded(
-        child: Padding(
-          padding: const EdgeInsets.fromLTRB(9, 8, 9, 6),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Text.rich(
-                TextSpan(
-                    children: liveItem.title
-                        .map((e) => TextSpan(
-                              text: e.text,
-                              style: TextStyle(
-                                color: e.isEm
-                                    ? theme.colorScheme.primary
-                                    : theme.colorScheme.onSurface,
-                              ),
-                            ))
-                        .toList()),
-              ),
-              SizedBox(
-                width: double.infinity,
-                child: Text(
-                  liveItem.uname!,
-                  maxLines: 1,
-                  style: TextStyle(
-                    fontSize: theme.textTheme.labelMedium!.fontSize,
-                    color: theme.colorScheme.outline,
-                  ),
-                ),
-              ),
-            ],
+    child: Padding(
+      padding: const EdgeInsets.fromLTRB(9, 8, 9, 6),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Text.rich(
+            TextSpan(
+              children: liveItem.title
+                  .map(
+                    (e) => TextSpan(
+                      text: e.text,
+                      style: TextStyle(
+                        color: e.isEm
+                            ? theme.colorScheme.primary
+                            : theme.colorScheme.onSurface,
+                      ),
+                    ),
+                  )
+                  .toList(),
+            ),
           ),
-        ),
-      );
+          SizedBox(
+            width: double.infinity,
+            child: Text(
+              liveItem.uname!,
+              maxLines: 1,
+              style: TextStyle(
+                fontSize: theme.textTheme.labelMedium!.fontSize,
+                color: theme.colorScheme.outline,
+              ),
+            ),
+          ),
+        ],
+      ),
+    ),
+  );
 
   Widget liveStat(int? online, String? cateName) {
     return Container(
@@ -122,7 +127,7 @@ class LiveItem extends StatelessWidget {
           Text(
             '围观:${online.toString()}',
             style: const TextStyle(fontSize: 11, color: Colors.white),
-          )
+          ),
         ],
       ),
     );
diff --git a/lib/pages/search_panel/pgc/view.dart b/lib/pages/search_panel/pgc/view.dart
index 7166202f4..e4e01730f 100644
--- a/lib/pages/search_panel/pgc/view.dart
+++ b/lib/pages/search_panel/pgc/view.dart
@@ -18,8 +18,13 @@ class SearchPgcPanel extends CommonSearchPanel {
   State<SearchPgcPanel> createState() => _SearchPgcPanelState();
 }
 
-class _SearchPgcPanelState extends CommonSearchPanelState<SearchPgcPanel,
-    SearchPgcData, SearchPgcItemModel> {
+class _SearchPgcPanelState
+    extends
+        CommonSearchPanelState<
+          SearchPgcPanel,
+          SearchPgcData,
+          SearchPgcItemModel
+        > {
   @override
   late final controller = Get.put(
     SearchPanelController<SearchPgcData, SearchPgcItemModel>(
diff --git a/lib/pages/search_panel/pgc/widgets/item.dart b/lib/pages/search_panel/pgc/widgets/item.dart
index 78f95d21c..cc7fab003 100644
--- a/lib/pages/search_panel/pgc/widgets/item.dart
+++ b/lib/pages/search_panel/pgc/widgets/item.dart
@@ -49,7 +49,7 @@ class SearchPgcItem extends StatelessWidget {
                     right: 4.0,
                     bottom: null,
                     left: null,
-                  )
+                  ),
                 ],
               ),
               const SizedBox(width: 10),
@@ -60,16 +60,19 @@ class SearchPgcItem extends StatelessWidget {
                     const SizedBox(height: 4),
                     Text.rich(
                       TextSpan(
-                          children: item.title
-                              .map((e) => TextSpan(
-                                    text: e.text,
-                                    style: TextStyle(
-                                      color: e.isEm
-                                          ? theme.colorScheme.primary
-                                          : theme.colorScheme.onSurface,
-                                    ),
-                                  ))
-                              .toList()),
+                        children: item.title
+                            .map(
+                              (e) => TextSpan(
+                                text: e.text,
+                                style: TextStyle(
+                                  color: e.isEm
+                                      ? theme.colorScheme.primary
+                                      : theme.colorScheme.onSurface,
+                                ),
+                              ),
+                            )
+                            .toList(),
+                      ),
                     ),
                     const SizedBox(height: 12),
                     Text('评分:${item.mediaScore?['score']}', style: style),
diff --git a/lib/pages/search_panel/user/controller.dart b/lib/pages/search_panel/user/controller.dart
index d83e894fb..77c3faa64 100644
--- a/lib/pages/search_panel/user/controller.dart
+++ b/lib/pages/search_panel/user/controller.dart
@@ -81,8 +81,8 @@ class SearchUserController
                               : null,
                           textColor:
                               item['value'] == currentOrderFilterval.value
-                                  ? theme.colorScheme.onSecondaryContainer
-                                  : null,
+                              ? theme.colorScheme.onSecondaryContainer
+                              : null,
                         ),
                       )
                       .toList(),
@@ -109,12 +109,12 @@ class SearchUserController
                           },
                           bgColor:
                               item['value'] == currentUserTypeFilterval.value
-                                  ? theme.colorScheme.secondaryContainer
-                                  : null,
+                              ? theme.colorScheme.secondaryContainer
+                              : null,
                           textColor:
                               item['value'] == currentUserTypeFilterval.value
-                                  ? theme.colorScheme.onSecondaryContainer
-                                  : null,
+                              ? theme.colorScheme.onSecondaryContainer
+                              : null,
                         ),
                       )
                       .toList(),
diff --git a/lib/pages/search_panel/user/view.dart b/lib/pages/search_panel/user/view.dart
index e09f72261..df9a2d7ba 100644
--- a/lib/pages/search_panel/user/view.dart
+++ b/lib/pages/search_panel/user/view.dart
@@ -19,8 +19,13 @@ class SearchUserPanel extends CommonSearchPanel {
   State<SearchUserPanel> createState() => _SearchUserPanelState();
 }
 
-class _SearchUserPanelState extends CommonSearchPanelState<SearchUserPanel,
-    SearchUserData, SearchUserItemModel> {
+class _SearchUserPanelState
+    extends
+        CommonSearchPanelState<
+          SearchUserPanel,
+          SearchUserData,
+          SearchUserItemModel
+        > {
   @override
   late final SearchUserController controller = Get.put(
     SearchUserController(
diff --git a/lib/pages/search_panel/user/widgets/item.dart b/lib/pages/search_panel/user/widgets/item.dart
index fc512900f..c9071601e 100644
--- a/lib/pages/search_panel/user/widgets/item.dart
+++ b/lib/pages/search_panel/user/widgets/item.dart
@@ -66,7 +66,7 @@ class SearchUserItem extends StatelessWidget {
                     style: style,
                   ),
               ],
-            )
+            ),
           ],
         ),
       ),
diff --git a/lib/pages/search_panel/video/controller.dart b/lib/pages/search_panel/video/controller.dart
index 5c8462b73..7d7c95d69 100644
--- a/lib/pages/search_panel/video/controller.dart
+++ b/lib/pages/search_panel/video/controller.dart
@@ -87,10 +87,12 @@ class SearchVideoController
 
   // sort
   late final List<Map> filterList = ArchiveFilterType.values
-      .map((type) => {
-            'label': type.desc,
-            'type': type,
-          })
+      .map(
+        (type) => {
+          'label': type.desc,
+          'type': type,
+        },
+      )
       .toList();
   late final Rx<ArchiveFilterType> selectedType =
       ArchiveFilterType.values.first.obs;
@@ -152,8 +154,9 @@ class SearchVideoController
           final theme = Theme.of(context);
           Widget dateWidget([bool isFirst = true]) {
             return SearchText(
-              text: DateUtil.longFormat
-                  .format(isFirst ? pubBeginDate : pubEndDate),
+              text: DateUtil.longFormat.format(
+                isFirst ? pubBeginDate : pubEndDate,
+              ),
               textAlign: TextAlign.center,
               onTap: (text) {
                 showDatePicker(
@@ -172,7 +175,8 @@ class SearchVideoController
                     }
                     currentPubTimeFilter = -1;
                     SmartDialog.dismiss();
-                    pubBegin = DateTime(
+                    pubBegin =
+                        DateTime(
                           pubBeginDate.year,
                           pubBeginDate.month,
                           pubBeginDate.day,
@@ -181,7 +185,8 @@ class SearchVideoController
                           0,
                         ).millisecondsSinceEpoch ~/
                         1000;
-                    pubEnd = DateTime(
+                    pubEnd =
+                        DateTime(
                           pubEndDate.year,
                           pubEndDate.month,
                           pubEndDate.day,
@@ -197,11 +202,13 @@ class SearchVideoController
                   }
                 });
               },
-              bgColor: currentPubTimeFilter == -1 &&
+              bgColor:
+                  currentPubTimeFilter == -1 &&
                       (isFirst ? customPubBeginDate : customPubEndDate)
                   ? theme.colorScheme.secondaryContainer
                   : theme.colorScheme.outline.withValues(alpha: 0.1),
-              textColor: currentPubTimeFilter == -1 &&
+              textColor:
+                  currentPubTimeFilter == -1 &&
                       (isFirst ? customPubBeginDate : customPubEndDate)
                   ? theme.colorScheme.onSecondaryContainer
                   : theme.colorScheme.outline.withValues(alpha: 0.8),
@@ -241,21 +248,23 @@ class SearchVideoController
                                 pubBegin = null;
                                 pubEnd = null;
                               } else {
-                                pubBegin = DateTime(
+                                pubBegin =
+                                    DateTime(
                                       now.year,
                                       now.month,
                                       now.day -
                                           (item['value'] == 0
                                               ? 0
                                               : item['value'] == 1
-                                                  ? 6
-                                                  : 179),
+                                              ? 6
+                                              : 179),
                                       0,
                                       0,
                                       0,
                                     ).millisecondsSinceEpoch ~/
                                     1000;
-                                pubEnd = DateTime(
+                                pubEnd =
+                                    DateTime(
                                       now.year,
                                       now.month,
                                       now.day,
diff --git a/lib/pages/search_panel/video/view.dart b/lib/pages/search_panel/video/view.dart
index ade15761e..04d8b9416 100644
--- a/lib/pages/search_panel/video/view.dart
+++ b/lib/pages/search_panel/video/view.dart
@@ -21,8 +21,13 @@ class SearchVideoPanel extends CommonSearchPanel {
   State<SearchVideoPanel> createState() => _SearchVideoPanelState();
 }
 
-class _SearchVideoPanelState extends CommonSearchPanelState<SearchVideoPanel,
-    SearchVideoData, SearchVideoItemModel> {
+class _SearchVideoPanelState
+    extends
+        CommonSearchPanelState<
+          SearchVideoPanel,
+          SearchVideoData,
+          SearchVideoItemModel
+        > {
   @override
   late final SearchVideoController controller = Get.put(
     SearchVideoController(
@@ -59,19 +64,21 @@ class _SearchVideoPanelState extends CommonSearchPanelState<SearchVideoPanel,
                             bgColor: Colors.transparent,
                             textColor:
                                 controller.selectedType.value == i['type']
-                                    ? theme.colorScheme.primary
-                                    : theme.colorScheme.outline,
+                                ? theme.colorScheme.primary
+                                : theme.colorScheme.outline,
                             onTap: (value) async {
                               controller.selectedType.value = i['type'];
-                              controller.order.value =
-                                  i['type'].toString().split('.').last;
+                              controller.order.value = i['type']
+                                  .toString()
+                                  .split('.')
+                                  .last;
                               SmartDialog.showLoading(msg: 'loading');
                               await controller.onReload();
                               SmartDialog.dismiss();
                             },
                           ),
                         ),
-                      ]
+                      ],
                     ],
                   ),
                 ),
diff --git a/lib/pages/search_panel/view.dart b/lib/pages/search_panel/view.dart
index 73965382f..c75077299 100644
--- a/lib/pages/search_panel/view.dart
+++ b/lib/pages/search_panel/view.dart
@@ -27,9 +27,12 @@ abstract class CommonSearchPanel extends StatefulWidget {
 }
 
 abstract class CommonSearchPanelState<
-    S extends CommonSearchPanel,
-    R extends SearchNumData<T>,
-    T> extends State<S> with AutomaticKeepAliveClientMixin {
+  S extends CommonSearchPanel,
+  R extends SearchNumData<T>,
+  T
+>
+    extends State<S>
+    with AutomaticKeepAliveClientMixin {
   SearchPanelController<R, T> get controller;
 
   @override
@@ -56,24 +59,23 @@ abstract class CommonSearchPanelState<
     return SliverGrid(
       gridDelegate: switch (widget.searchType) {
         SearchType.media_bangumi ||
-        SearchType.media_ft =>
-          SliverGridDelegateWithExtentAndRatio(
-            mainAxisSpacing: 2,
-            maxCrossAxisExtent: Grid.smallCardWidth * 2,
-            childAspectRatio: StyleString.aspectRatio * 1.5,
-            minHeight: MediaQuery.textScalerOf(context).scale(155),
-          ),
+        SearchType.media_ft => SliverGridDelegateWithExtentAndRatio(
+          mainAxisSpacing: 2,
+          maxCrossAxisExtent: Grid.smallCardWidth * 2,
+          childAspectRatio: StyleString.aspectRatio * 1.5,
+          minHeight: MediaQuery.textScalerOf(context).scale(155),
+        ),
         SearchType.live_room => SliverGridDelegateWithExtentAndRatio(
-            mainAxisSpacing: StyleString.cardSpace,
-            crossAxisSpacing: StyleString.cardSpace,
-            maxCrossAxisExtent: Grid.smallCardWidth,
-            childAspectRatio: StyleString.aspectRatio,
-            mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
-          ),
+          mainAxisSpacing: StyleString.cardSpace,
+          crossAxisSpacing: StyleString.cardSpace,
+          maxCrossAxisExtent: Grid.smallCardWidth,
+          childAspectRatio: StyleString.aspectRatio,
+          mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
+        ),
         SearchType.bili_user => SliverGridDelegateWithMaxCrossAxisExtent(
-            maxCrossAxisExtent: Grid.smallCardWidth * 2,
-            mainAxisExtent: 66,
-          ),
+          maxCrossAxisExtent: Grid.smallCardWidth * 2,
+          mainAxisExtent: 66,
+        ),
         _ => Grid.videoCardHDelegate(context),
       },
       delegate: SliverChildBuilderDelegate(
@@ -96,28 +98,31 @@ abstract class CommonSearchPanelState<
 
   Widget _buildBody(ThemeData theme, LoadingState<List<T>?> loadingState) {
     return switch (loadingState) {
-      Loading() => widget.searchType == SearchType.live_room
-          ? SliverPadding(
-              padding: const EdgeInsets.only(
-                left: StyleString.cardSpace,
-                right: StyleString.cardSpace,
+      Loading() =>
+        widget.searchType == SearchType.live_room
+            ? SliverPadding(
+                padding: const EdgeInsets.only(
+                  left: StyleString.cardSpace,
+                  right: StyleString.cardSpace,
+                ),
+                sliver: _builLoading,
+              )
+            : _builLoading,
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverPadding(
+                padding: EdgeInsets.only(
+                  bottom: MediaQuery.paddingOf(context).bottom + 80,
+                ),
+                sliver: buildList(theme, response!),
+              )
+            : HttpError(
+                onReload: controller.onReload,
               ),
-              sliver: _builLoading,
-            )
-          : _builLoading,
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverPadding(
-              padding: EdgeInsets.only(
-                  bottom: MediaQuery.paddingOf(context).bottom + 80),
-              sliver: buildList(theme, response!),
-            )
-          : HttpError(
-              onReload: controller.onReload,
-            ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: controller.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/search_result/view.dart b/lib/pages/search_result/view.dart
index 99847cfb1..f2fe2c2c1 100644
--- a/lib/pages/search_result/view.dart
+++ b/lib/pages/search_result/view.dart
@@ -41,8 +41,9 @@ class _SearchResultPageState extends State<SearchResultPage>
 
     if (_isFromSearch == true) {
       try {
-        sSearchController =
-            Get.find<SSearchController>(tag: Get.parameters['tag']);
+        sSearchController = Get.find<SSearchController>(
+          tag: Get.parameters['tag'],
+        );
       } catch (_) {}
       _tabController.addListener(listener);
     }
@@ -111,25 +112,29 @@ class _SearchResultPageState extends State<SearchResultPage>
                         () {
                           int count = _searchResultController.count[item.index];
                           return Tab(
-                              text:
-                                  '${item.label}${count != -1 ? ' ${count > 99 ? '99+' : count}' : ''}');
+                            text:
+                                '${item.label}${count != -1 ? ' ${count > 99 ? '99+' : count}' : ''}',
+                          );
                         },
                       ),
                     )
                     .toList(),
                 isScrollable: true,
                 indicatorWeight: 0,
-                indicatorPadding:
-                    const EdgeInsets.symmetric(horizontal: 3, vertical: 8),
+                indicatorPadding: const EdgeInsets.symmetric(
+                  horizontal: 3,
+                  vertical: 8,
+                ),
                 indicator: BoxDecoration(
                   color: theme.colorScheme.secondaryContainer,
                   borderRadius: const BorderRadius.all(Radius.circular(20)),
                 ),
                 indicatorSize: TabBarIndicatorSize.tab,
                 labelColor: theme.colorScheme.onSecondaryContainer,
-                labelStyle: TabBarTheme.of(context)
-                        .labelStyle
-                        ?.copyWith(fontSize: 13) ??
+                labelStyle:
+                    TabBarTheme.of(
+                      context,
+                    ).labelStyle?.copyWith(fontSize: 13) ??
                     const TextStyle(fontSize: 13),
                 dividerColor: Colors.transparent,
                 dividerHeight: 0,
@@ -158,32 +163,31 @@ class _SearchResultPageState extends State<SearchResultPage>
                         //     keyword: _searchResultController.keyword,
                         //   ),
                         SearchType.video => SearchVideoPanel(
-                            tag: _tag,
-                            searchType: item,
-                            keyword: _searchResultController.keyword,
-                          ),
+                          tag: _tag,
+                          searchType: item,
+                          keyword: _searchResultController.keyword,
+                        ),
                         SearchType.media_bangumi ||
-                        SearchType.media_ft =>
-                          SearchPgcPanel(
-                            tag: _tag,
-                            searchType: item,
-                            keyword: _searchResultController.keyword,
-                          ),
+                        SearchType.media_ft => SearchPgcPanel(
+                          tag: _tag,
+                          searchType: item,
+                          keyword: _searchResultController.keyword,
+                        ),
                         SearchType.live_room => SearchLivePanel(
-                            tag: _tag,
-                            searchType: item,
-                            keyword: _searchResultController.keyword,
-                          ),
+                          tag: _tag,
+                          searchType: item,
+                          keyword: _searchResultController.keyword,
+                        ),
                         SearchType.bili_user => SearchUserPanel(
-                            tag: _tag,
-                            searchType: item,
-                            keyword: _searchResultController.keyword,
-                          ),
+                          tag: _tag,
+                          searchType: item,
+                          keyword: _searchResultController.keyword,
+                        ),
                         SearchType.article => SearchArticlePanel(
-                            tag: _tag,
-                            searchType: item,
-                            keyword: _searchResultController.keyword,
-                          ),
+                          tag: _tag,
+                          searchType: item,
+                          keyword: _searchResultController.keyword,
+                        ),
                       },
                     )
                     .toList(),
diff --git a/lib/pages/search_trending/view.dart b/lib/pages/search_trending/view.dart
index 97aceb8cf..ad4a4c719 100644
--- a/lib/pages/search_trending/view.dart
+++ b/lib/pages/search_trending/view.dart
@@ -54,96 +54,105 @@ class _SearchTrendingPageState extends State<SearchTrendingPage> {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    return LayoutBuilder(builder: (context, constraints) {
-      final maxWidth = constraints.maxWidth;
-      final width = constraints.maxWidth > constraints.maxHeight
-          ? min(640.0, maxWidth * 0.6)
-          : maxWidth;
-      final height = width * 528 / 1125;
-      _offset = height - 56 - Get.mediaQuery.padding.top;
-      listener();
-      final removePadding = maxWidth > width;
-      return Scaffold(
-        extendBody: true,
-        extendBodyBehindAppBar: true,
-        appBar: PreferredSize(
-          preferredSize: const Size.fromHeight(56),
-          child: Obx(
-            () {
-              final scrollRatio = _scrollRatio.value;
-              final flag = removePadding || scrollRatio >= 0.5;
-              return AppBar(
-                title: Opacity(
-                  opacity: scrollRatio,
-                  child: Text(
-                    'bilibili热搜',
-                    style: TextStyle(
-                      color: flag ? null : Colors.white,
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final maxWidth = constraints.maxWidth;
+        final width = constraints.maxWidth > constraints.maxHeight
+            ? min(640.0, maxWidth * 0.6)
+            : maxWidth;
+        final height = width * 528 / 1125;
+        _offset = height - 56 - Get.mediaQuery.padding.top;
+        listener();
+        final removePadding = maxWidth > width;
+        return Scaffold(
+          extendBody: true,
+          extendBodyBehindAppBar: true,
+          appBar: PreferredSize(
+            preferredSize: const Size.fromHeight(56),
+            child: Obx(
+              () {
+                final scrollRatio = _scrollRatio.value;
+                final flag = removePadding || scrollRatio >= 0.5;
+                return AppBar(
+                  title: Opacity(
+                    opacity: scrollRatio,
+                    child: Text(
+                      'bilibili热搜',
+                      style: TextStyle(
+                        color: flag ? null : Colors.white,
+                      ),
                     ),
                   ),
-                ),
-                backgroundColor:
-                    theme.colorScheme.surface.withValues(alpha: scrollRatio),
-                foregroundColor: flag ? null : Colors.white,
-                systemOverlayStyle: flag
-                    ? null
-                    : const SystemUiOverlayStyle(
-                        statusBarBrightness: Brightness.dark,
-                        statusBarIconBrightness: Brightness.light,
-                      ),
-                bottom: scrollRatio == 1
-                    ? PreferredSize(
-                        preferredSize: const Size.fromHeight(1),
-                        child: Divider(
-                          height: 1,
-                          color:
-                              theme.colorScheme.outline.withValues(alpha: 0.1),
+                  backgroundColor: theme.colorScheme.surface.withValues(
+                    alpha: scrollRatio,
+                  ),
+                  foregroundColor: flag ? null : Colors.white,
+                  systemOverlayStyle: flag
+                      ? null
+                      : const SystemUiOverlayStyle(
+                          statusBarBrightness: Brightness.dark,
+                          statusBarIconBrightness: Brightness.light,
                         ),
-                      )
-                    : null,
-              );
-            },
+                  bottom: scrollRatio == 1
+                      ? PreferredSize(
+                          preferredSize: const Size.fromHeight(1),
+                          child: Divider(
+                            height: 1,
+                            color: theme.colorScheme.outline.withValues(
+                              alpha: 0.1,
+                            ),
+                          ),
+                        )
+                      : null,
+                );
+              },
+            ),
           ),
-        ),
-        body: Center(
-          child: SizedBox(
-            width: width,
-            child: MediaQuery.removePadding(
-              context: context,
-              removeLeft: removePadding,
-              removeRight: removePadding,
-              child: refreshIndicator(
-                onRefresh: _controller.onRefresh,
-                child: CustomScrollView(
-                  controller: _controller.scrollController,
-                  physics: const AlwaysScrollableScrollPhysics(),
-                  slivers: [
-                    SliverToBoxAdapter(
-                      child: Image.asset(
-                        width: width,
-                        height: height,
-                        'assets/images/trending_banner.png',
-                        filterQuality: FilterQuality.low,
+          body: Center(
+            child: SizedBox(
+              width: width,
+              child: MediaQuery.removePadding(
+                context: context,
+                removeLeft: removePadding,
+                removeRight: removePadding,
+                child: refreshIndicator(
+                  onRefresh: _controller.onRefresh,
+                  child: CustomScrollView(
+                    controller: _controller.scrollController,
+                    physics: const AlwaysScrollableScrollPhysics(),
+                    slivers: [
+                      SliverToBoxAdapter(
+                        child: Image.asset(
+                          width: width,
+                          height: height,
+                          'assets/images/trending_banner.png',
+                          filterQuality: FilterQuality.low,
+                        ),
                       ),
-                    ),
-                    SliverPadding(
-                      padding: EdgeInsets.only(
-                          bottom: MediaQuery.paddingOf(context).bottom + 100),
-                      sliver: Obx(() =>
-                          _buildBody(theme, _controller.loadingState.value)),
-                    ),
-                  ],
+                      SliverPadding(
+                        padding: EdgeInsets.only(
+                          bottom: MediaQuery.paddingOf(context).bottom + 100,
+                        ),
+                        sliver: Obx(
+                          () =>
+                              _buildBody(theme, _controller.loadingState.value),
+                        ),
+                      ),
+                    ],
+                  ),
                 ),
               ),
             ),
           ),
-        ),
-      );
-    });
+        );
+      },
+    );
   }
 
-  Widget _buildBody(ThemeData theme,
-      LoadingState<List<SearchTrendingItemModel>?> loadingState) {
+  Widget _buildBody(
+    ThemeData theme,
+    LoadingState<List<SearchTrendingItemModel>?> loadingState,
+  ) {
     late final divider = Divider(
       height: 1,
       indent: 48,
@@ -151,77 +160,78 @@ class _SearchTrendingPageState extends State<SearchTrendingPage> {
     );
     return switch (loadingState) {
       Loading() => linearLoading,
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverList.separated(
-              itemCount: response!.length,
-              itemBuilder: (context, index) {
-                final item = response[index];
-                return ListTile(
-                  dense: true,
-                  onTap: () => Get.toNamed(
-                    '/searchResult',
-                    parameters: {
-                      'keyword': item.keyword!,
-                    },
-                  ),
-                  leading: index < _controller.topCount
-                      ? const Icon(
-                          size: 17,
-                          Icons.vertical_align_top_outlined,
-                          color: Color(0xFFd1403e),
-                        )
-                      : Text(
-                          '${index + 1 - _controller.topCount}',
-                          style: TextStyle(
-                            fontWeight: FontWeight.bold,
-                            color: switch (index - _controller.topCount) {
-                              0 => const Color(0xFFfdad13),
-                              1 => const Color(0xFF8aace1),
-                              2 => const Color(0xFFdfa777),
-                              _ => theme.colorScheme.outline,
-                            },
-                            fontSize: 17,
-                            fontStyle: FontStyle.italic,
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverList.separated(
+                itemCount: response!.length,
+                itemBuilder: (context, index) {
+                  final item = response[index];
+                  return ListTile(
+                    dense: true,
+                    onTap: () => Get.toNamed(
+                      '/searchResult',
+                      parameters: {
+                        'keyword': item.keyword!,
+                      },
+                    ),
+                    leading: index < _controller.topCount
+                        ? const Icon(
+                            size: 17,
+                            Icons.vertical_align_top_outlined,
+                            color: Color(0xFFd1403e),
+                          )
+                        : Text(
+                            '${index + 1 - _controller.topCount}',
+                            style: TextStyle(
+                              fontWeight: FontWeight.bold,
+                              color: switch (index - _controller.topCount) {
+                                0 => const Color(0xFFfdad13),
+                                1 => const Color(0xFF8aace1),
+                                2 => const Color(0xFFdfa777),
+                                _ => theme.colorScheme.outline,
+                              },
+                              fontSize: 17,
+                              fontStyle: FontStyle.italic,
+                            ),
+                          ),
+                    title: Row(
+                      children: [
+                        Flexible(
+                          child: Text(
+                            item.keyword!,
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            strutStyle: const StrutStyle(height: 1, leading: 0),
+                            style: const TextStyle(height: 1, fontSize: 15),
                           ),
                         ),
-                  title: Row(
-                    children: [
-                      Flexible(
-                        child: Text(
-                          item.keyword!,
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                          strutStyle: const StrutStyle(height: 1, leading: 0),
-                          style: const TextStyle(height: 1, fontSize: 15),
-                        ),
-                      ),
-                      if (item.icon?.isNotEmpty == true) ...[
-                        const SizedBox(width: 4),
-                        CachedNetworkImage(
-                          imageUrl: ImageUtil.thumbnailUrl(item.icon!),
-                          height: 16,
-                        ),
-                      ] else if (item.showLiveIcon == true) ...[
-                        const SizedBox(width: 4),
-                        Image.asset(
-                          'assets/images/live/live.gif',
-                          width: 51,
-                          height: 16,
-                        ),
+                        if (item.icon?.isNotEmpty == true) ...[
+                          const SizedBox(width: 4),
+                          CachedNetworkImage(
+                            imageUrl: ImageUtil.thumbnailUrl(item.icon!),
+                            height: 16,
+                          ),
+                        ] else if (item.showLiveIcon == true) ...[
+                          const SizedBox(width: 4),
+                          Image.asset(
+                            'assets/images/live/live.gif',
+                            width: 51,
+                            height: 16,
+                          ),
+                        ],
                       ],
-                    ],
-                  ),
-                );
-              },
-              separatorBuilder: (context, index) => divider,
-            )
-          : HttpError(
-              onReload: _controller.onReload,
-            ),
+                    ),
+                  );
+                },
+                separatorBuilder: (context, index) => divider,
+              )
+            : HttpError(
+                onReload: _controller.onReload,
+              ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/setting/extra_setting.dart b/lib/pages/setting/extra_setting.dart
index 358979ca5..e19ee0d96 100644
--- a/lib/pages/setting/extra_setting.dart
+++ b/lib/pages/setting/extra_setting.dart
@@ -17,8 +17,9 @@ class _ExtraSettingState extends State<ExtraSetting> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar:
-          widget.showAppBar == false ? null : AppBar(title: const Text('其它设置')),
+      appBar: widget.showAppBar == false
+          ? null
+          : AppBar(title: const Text('其它设置')),
       body: ListView(
         padding: EdgeInsets.only(
           bottom: MediaQuery.paddingOf(context).bottom + 80,
diff --git a/lib/pages/setting/models/extra_settings.dart b/lib/pages/setting/models/extra_settings.dart
index c04d7d6dc..1002614c6 100644
--- a/lib/pages/setting/models/extra_settings.dart
+++ b/lib/pages/setting/models/extra_settings.dart
@@ -34,1025 +34,456 @@ import 'package:get/get.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
 List<SettingsModel> get extraSettings => [
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '空降助手',
-        subtitle: '点击配置',
-        setKey: SettingBoxKey.enableSponsorBlock,
-        defaultVal: false,
-        onTap: () => Get.toNamed('/sponsorBlock'),
-        leading: const Stack(
-          clipBehavior: Clip.none,
-          alignment: Alignment.center,
-          children: [
-            Icon(Icons.shield_outlined),
-            Icon(Icons.play_arrow_rounded, size: 15),
-          ],
-        ),
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '检查未读动态',
-        subtitle: '点击设置检查周期(min)',
-        leading: const Icon(Icons.notifications_none),
-        setKey: SettingBoxKey.checkDynamic,
-        defaultVal: true,
-        onChanged: (value) {
-          Get.find<MainController>().checkDynamic = value;
-        },
-        onTap: () {
-          int dynamicPeriod = Pref.dynamicPeriod;
-          showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return AlertDialog(
-                title: const Text('检查周期'),
-                content: TextFormField(
-                  autofocus: true,
-                  initialValue: dynamicPeriod.toString(),
-                  keyboardType: TextInputType.number,
-                  onChanged: (value) {
-                    dynamicPeriod = int.tryParse(value) ?? 5;
-                  },
-                  inputFormatters: [FilteringTextInputFormatter.digitsOnly],
-                  decoration: const InputDecoration(suffixText: 'min'),
-                ),
-                actions: [
-                  TextButton(
-                    onPressed: Get.back,
-                    child: Text(
-                      '取消',
-                      style: TextStyle(
-                        color: Theme.of(context).colorScheme.outline,
-                      ),
-                    ),
-                  ),
-                  TextButton(
-                    onPressed: () {
-                      Get.back();
-                      GStorage.setting
-                          .put(SettingBoxKey.dynamicPeriod, dynamicPeriod);
-                      Get.find<MainController>().dynamicPeriod = dynamicPeriod;
-                    },
-                    child: const Text('确定'),
-                  )
-                ],
-              );
-            },
-          );
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '显示视频分段信息',
-        leading: Transform.rotate(
-          angle: pi / 2,
-          child: const Icon(MdiIcons.viewHeadline),
-        ),
-        setKey: SettingBoxKey.showViewPoints,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '视频页显示相关视频',
-        leading: const Icon(MdiIcons.motionPlayOutline),
-        setKey: SettingBoxKey.showRelatedVideo,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '显示视频评论',
-        leading: const Icon(MdiIcons.commentTextOutline),
-        setKey: SettingBoxKey.showVideoReply,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '显示番剧评论',
-        leading: const Icon(MdiIcons.commentTextOutline),
-        setKey: SettingBoxKey.showBangumiReply,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '默认展开视频简介',
-        leading: const Icon(Icons.expand_more),
-        setKey: SettingBoxKey.alwaysExapndIntroPanel,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '横屏自动展开视频简介',
-        leading: const Icon(Icons.expand_more),
-        setKey: SettingBoxKey.exapndIntroPanelH,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '横屏分P/合集列表显示在Tab栏',
-        leading: const Icon(Icons.format_list_numbered_rtl_sharp),
-        setKey: SettingBoxKey.horizontalSeasonPanel,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '横屏播放页在侧栏打开UP主页',
-        leading: const Icon(Icons.account_circle_outlined),
-        setKey: SettingBoxKey.horizontalMemberPage,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '评论折叠行数',
-        subtitle: '0行为不折叠',
-        leading: const Icon(Icons.compress),
-        setKey: SettingBoxKey.replyLengthLimit,
-        getTrailing: () => Text(
-          '${ReplyItemGrpc.replyLengthLimit}行',
-          style: Get.theme.textTheme.titleSmall,
-        ),
-        onTap: (setState) {
-          String replyLengthLimit = ReplyItemGrpc.replyLengthLimit.toString();
-          showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return AlertDialog(
-                title: const Text('评论折叠行数'),
-                content: TextFormField(
-                  autofocus: true,
-                  initialValue: replyLengthLimit,
-                  keyboardType: TextInputType.number,
-                  onChanged: (value) {
-                    replyLengthLimit = value;
-                  },
-                  inputFormatters: [FilteringTextInputFormatter.digitsOnly],
-                  decoration: const InputDecoration(suffixText: '行'),
-                ),
-                actions: [
-                  TextButton(
-                    onPressed: Get.back,
-                    child: Text(
-                      '取消',
-                      style: TextStyle(
-                        color: Theme.of(context).colorScheme.outline,
-                      ),
-                    ),
-                  ),
-                  TextButton(
-                    onPressed: () async {
-                      Get.back();
-                      int length = int.tryParse(replyLengthLimit) ?? 6;
-                      ReplyItemGrpc.replyLengthLimit =
-                          length == 0 ? null : length;
-                      await GStorage.setting.put(
-                        SettingBoxKey.replyLengthLimit,
-                        length,
-                      );
-                      setState();
-                    },
-                    child: const Text('确定'),
-                  )
-                ],
-              );
-            },
-          );
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '弹幕行高',
-        subtitle: '默认1.6',
-        setKey: SettingBoxKey.danmakuLineHeight,
-        leading: const Icon(Icons.subtitles_outlined),
-        getTrailing: () => Text(
-          Pref.danmakuLineHeight.toString(),
-          style: Get.theme.textTheme.titleSmall,
-        ),
-        onTap: (setState) {
-          String danmakuLineHeight = Pref.danmakuLineHeight.toString();
-          showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return AlertDialog(
-                title: const Text('弹幕行高'),
-                content: TextFormField(
-                  autofocus: true,
-                  initialValue: danmakuLineHeight,
-                  keyboardType:
-                      const TextInputType.numberWithOptions(decimal: true),
-                  onChanged: (value) {
-                    danmakuLineHeight = value;
-                  },
-                  inputFormatters: [
-                    FilteringTextInputFormatter.allow(RegExp(r'[\d\.]+')),
-                  ],
-                ),
-                actions: [
-                  TextButton(
-                    onPressed: Get.back,
-                    child: Text(
-                      '取消',
-                      style: TextStyle(
-                        color: Theme.of(context).colorScheme.outline,
-                      ),
-                    ),
-                  ),
-                  TextButton(
-                    onPressed: () async {
-                      Get.back();
-                      await GStorage.setting.put(
-                        SettingBoxKey.danmakuLineHeight,
-                        max(
-                          1.0,
-                          double.tryParse(danmakuLineHeight)?.toPrecision(1) ??
-                              1.6,
-                        ),
-                      );
-                      setState();
-                    },
-                    child: const Text('确定'),
-                  )
-                ],
-              );
-            },
-          );
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '显示视频警告/争议信息',
-        leading: const Icon(Icons.warning_amber_rounded),
-        setKey: SettingBoxKey.showArgueMsg,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '分P/合集：倒序播放从首集开始播放',
-        subtitle: '开启则自动切换为倒序首集，否则保持当前集',
-        leading: const Icon(MdiIcons.sort),
-        setKey: SettingBoxKey.reverseFromFirst,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '禁用 SSL 证书验证',
-        subtitle: '谨慎开启，禁用容易受到中间人攻击',
-        leading: const Icon(Icons.security),
-        needReboot: true,
-        setKey: SettingBoxKey.badCertificateCallback,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '显示继续播放分P提示',
-        leading: const Icon(Icons.local_parking),
-        setKey: SettingBoxKey.continuePlayingPart,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '横屏在侧栏打开图片预览',
-        leading: const Icon(Icons.photo_outlined),
-        setKey: SettingBoxKey.horizontalPreview,
-        defaultVal: false,
-      ),
-      getBanwordModel(
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '空降助手',
+    subtitle: '点击配置',
+    setKey: SettingBoxKey.enableSponsorBlock,
+    defaultVal: false,
+    onTap: () => Get.toNamed('/sponsorBlock'),
+    leading: const Stack(
+      clipBehavior: Clip.none,
+      alignment: Alignment.center,
+      children: [
+        Icon(Icons.shield_outlined),
+        Icon(Icons.play_arrow_rounded, size: 15),
+      ],
+    ),
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '检查未读动态',
+    subtitle: '点击设置检查周期(min)',
+    leading: const Icon(Icons.notifications_none),
+    setKey: SettingBoxKey.checkDynamic,
+    defaultVal: true,
+    onChanged: (value) {
+      Get.find<MainController>().checkDynamic = value;
+    },
+    onTap: () {
+      int dynamicPeriod = Pref.dynamicPeriod;
+      showDialog(
         context: Get.context!,
-        title: '评论关键词过滤',
-        key: SettingBoxKey.banWordForReply,
-        onChanged: (value) {
-          ReplyGrpc.replyRegExp = value;
-          ReplyGrpc.enableFilter = value.pattern.isNotEmpty;
+        builder: (context) {
+          return AlertDialog(
+            title: const Text('检查周期'),
+            content: TextFormField(
+              autofocus: true,
+              initialValue: dynamicPeriod.toString(),
+              keyboardType: TextInputType.number,
+              onChanged: (value) {
+                dynamicPeriod = int.tryParse(value) ?? 5;
+              },
+              inputFormatters: [FilteringTextInputFormatter.digitsOnly],
+              decoration: const InputDecoration(suffixText: 'min'),
+            ),
+            actions: [
+              TextButton(
+                onPressed: Get.back,
+                child: Text(
+                  '取消',
+                  style: TextStyle(
+                    color: Theme.of(context).colorScheme.outline,
+                  ),
+                ),
+              ),
+              TextButton(
+                onPressed: () {
+                  Get.back();
+                  GStorage.setting.put(
+                    SettingBoxKey.dynamicPeriod,
+                    dynamicPeriod,
+                  );
+                  Get.find<MainController>().dynamicPeriod = dynamicPeriod;
+                },
+                child: const Text('确定'),
+              ),
+            ],
+          );
         },
-      ),
-      getBanwordModel(
+      );
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '显示视频分段信息',
+    leading: Transform.rotate(
+      angle: pi / 2,
+      child: const Icon(MdiIcons.viewHeadline),
+    ),
+    setKey: SettingBoxKey.showViewPoints,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '视频页显示相关视频',
+    leading: const Icon(MdiIcons.motionPlayOutline),
+    setKey: SettingBoxKey.showRelatedVideo,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '显示视频评论',
+    leading: const Icon(MdiIcons.commentTextOutline),
+    setKey: SettingBoxKey.showVideoReply,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '显示番剧评论',
+    leading: const Icon(MdiIcons.commentTextOutline),
+    setKey: SettingBoxKey.showBangumiReply,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '默认展开视频简介',
+    leading: const Icon(Icons.expand_more),
+    setKey: SettingBoxKey.alwaysExapndIntroPanel,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '横屏自动展开视频简介',
+    leading: const Icon(Icons.expand_more),
+    setKey: SettingBoxKey.exapndIntroPanelH,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '横屏分P/合集列表显示在Tab栏',
+    leading: const Icon(Icons.format_list_numbered_rtl_sharp),
+    setKey: SettingBoxKey.horizontalSeasonPanel,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '横屏播放页在侧栏打开UP主页',
+    leading: const Icon(Icons.account_circle_outlined),
+    setKey: SettingBoxKey.horizontalMemberPage,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '评论折叠行数',
+    subtitle: '0行为不折叠',
+    leading: const Icon(Icons.compress),
+    setKey: SettingBoxKey.replyLengthLimit,
+    getTrailing: () => Text(
+      '${ReplyItemGrpc.replyLengthLimit}行',
+      style: Get.theme.textTheme.titleSmall,
+    ),
+    onTap: (setState) {
+      String replyLengthLimit = ReplyItemGrpc.replyLengthLimit.toString();
+      showDialog(
         context: Get.context!,
-        title: '动态关键词过滤',
-        key: SettingBoxKey.banWordForDyn,
-        onChanged: (value) {
-          DynamicsDataModel.banWordForDyn = value;
-          DynamicsDataModel.enableFilter = value.pattern.isNotEmpty;
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '使用外部浏览器打开链接',
-        leading: const Icon(Icons.open_in_browser),
-        setKey: SettingBoxKey.openInBrowser,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '刷新滑动距离',
-        leading: const Icon(Icons.refresh),
-        setKey: SettingBoxKey.refreshDragPercentage,
-        getSubtitle: () => '当前滑动距离: ${Pref.refreshDragPercentage}x',
-        onTap: (setState) async {
-          double? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SlideDialog(
-                title: '刷新滑动距离',
-                min: 0.1,
-                max: 0.5,
-                divisions: 8,
-                precise: 2,
-                value: Pref.refreshDragPercentage,
-                suffix: 'x',
-              );
-            },
+        builder: (context) {
+          return AlertDialog(
+            title: const Text('评论折叠行数'),
+            content: TextFormField(
+              autofocus: true,
+              initialValue: replyLengthLimit,
+              keyboardType: TextInputType.number,
+              onChanged: (value) {
+                replyLengthLimit = value;
+              },
+              inputFormatters: [FilteringTextInputFormatter.digitsOnly],
+              decoration: const InputDecoration(suffixText: '行'),
+            ),
+            actions: [
+              TextButton(
+                onPressed: Get.back,
+                child: Text(
+                  '取消',
+                  style: TextStyle(
+                    color: Theme.of(context).colorScheme.outline,
+                  ),
+                ),
+              ),
+              TextButton(
+                onPressed: () async {
+                  Get.back();
+                  int length = int.tryParse(replyLengthLimit) ?? 6;
+                  ReplyItemGrpc.replyLengthLimit = length == 0 ? null : length;
+                  await GStorage.setting.put(
+                    SettingBoxKey.replyLengthLimit,
+                    length,
+                  );
+                  setState();
+                },
+                child: const Text('确定'),
+              ),
+            ],
           );
-          if (result != null) {
-            kDragContainerExtentPercentage = result;
-            await GStorage.setting
-                .put(SettingBoxKey.refreshDragPercentage, result);
-            Get.forceAppUpdate();
-            setState();
-          }
         },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '刷新指示器高度',
-        leading: const Icon(Icons.height),
-        setKey: SettingBoxKey.refreshDisplacement,
-        getSubtitle: () => '当前指示器高度: ${Pref.refreshDisplacement}',
-        onTap: (setState) async {
-          double? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SlideDialog(
-                title: '刷新指示器高度',
-                min: 10.0,
-                max: 100.0,
-                divisions: 9,
-                value: Pref.refreshDisplacement,
-              );
-            },
+      );
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '弹幕行高',
+    subtitle: '默认1.6',
+    setKey: SettingBoxKey.danmakuLineHeight,
+    leading: const Icon(Icons.subtitles_outlined),
+    getTrailing: () => Text(
+      Pref.danmakuLineHeight.toString(),
+      style: Get.theme.textTheme.titleSmall,
+    ),
+    onTap: (setState) {
+      String danmakuLineHeight = Pref.danmakuLineHeight.toString();
+      showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return AlertDialog(
+            title: const Text('弹幕行高'),
+            content: TextFormField(
+              autofocus: true,
+              initialValue: danmakuLineHeight,
+              keyboardType: const TextInputType.numberWithOptions(
+                decimal: true,
+              ),
+              onChanged: (value) {
+                danmakuLineHeight = value;
+              },
+              inputFormatters: [
+                FilteringTextInputFormatter.allow(RegExp(r'[\d\.]+')),
+              ],
+            ),
+            actions: [
+              TextButton(
+                onPressed: Get.back,
+                child: Text(
+                  '取消',
+                  style: TextStyle(
+                    color: Theme.of(context).colorScheme.outline,
+                  ),
+                ),
+              ),
+              TextButton(
+                onPressed: () async {
+                  Get.back();
+                  await GStorage.setting.put(
+                    SettingBoxKey.danmakuLineHeight,
+                    max(
+                      1.0,
+                      double.tryParse(danmakuLineHeight)?.toPrecision(1) ?? 1.6,
+                    ),
+                  );
+                  setState();
+                },
+                child: const Text('确定'),
+              ),
+            ],
           );
-          if (result != null) {
-            displacement = result;
-            await GStorage.setting
-                .put(SettingBoxKey.refreshDisplacement, result);
-            Get.forceAppUpdate();
-            setState();
-          }
         },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '显示会员彩色弹幕',
-        leading: const Icon(MdiIcons.gradientHorizontal),
-        setKey: SettingBoxKey.showVipDanmaku,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '显示高级弹幕',
-        leading: const Icon(MdiIcons.paletteAdvanced),
-        setKey: SettingBoxKey.showSpecialDanmaku,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '合并弹幕',
-        subtitle: '合并一段时间内获取到的相同弹幕',
-        leading: const Icon(Icons.merge),
-        setKey: SettingBoxKey.mergeDanmaku,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '显示热门推荐',
-        subtitle: '热门页面显示每周必看等推荐内容入口',
-        leading: const Icon(Icons.local_fire_department_outlined),
-        setKey: SettingBoxKey.showHotRcmd,
-        defaultVal: false,
-        onChanged: (value) {
-          try {
-            Get.find<HotController>().showHotRcmd.value = value;
-          } catch (_) {}
+      );
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '显示视频警告/争议信息',
+    leading: const Icon(Icons.warning_amber_rounded),
+    setKey: SettingBoxKey.showArgueMsg,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '分P/合集：倒序播放从首集开始播放',
+    subtitle: '开启则自动切换为倒序首集，否则保持当前集',
+    leading: const Icon(MdiIcons.sort),
+    setKey: SettingBoxKey.reverseFromFirst,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '禁用 SSL 证书验证',
+    subtitle: '谨慎开启，禁用容易受到中间人攻击',
+    leading: const Icon(Icons.security),
+    needReboot: true,
+    setKey: SettingBoxKey.badCertificateCallback,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '显示继续播放分P提示',
+    leading: const Icon(Icons.local_parking),
+    setKey: SettingBoxKey.continuePlayingPart,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '横屏在侧栏打开图片预览',
+    leading: const Icon(Icons.photo_outlined),
+    setKey: SettingBoxKey.horizontalPreview,
+    defaultVal: false,
+  ),
+  getBanwordModel(
+    context: Get.context!,
+    title: '评论关键词过滤',
+    key: SettingBoxKey.banWordForReply,
+    onChanged: (value) {
+      ReplyGrpc.replyRegExp = value;
+      ReplyGrpc.enableFilter = value.pattern.isNotEmpty;
+    },
+  ),
+  getBanwordModel(
+    context: Get.context!,
+    title: '动态关键词过滤',
+    key: SettingBoxKey.banWordForDyn,
+    onChanged: (value) {
+      DynamicsDataModel.banWordForDyn = value;
+      DynamicsDataModel.enableFilter = value.pattern.isNotEmpty;
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '使用外部浏览器打开链接',
+    leading: const Icon(Icons.open_in_browser),
+    setKey: SettingBoxKey.openInBrowser,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '刷新滑动距离',
+    leading: const Icon(Icons.refresh),
+    setKey: SettingBoxKey.refreshDragPercentage,
+    getSubtitle: () => '当前滑动距离: ${Pref.refreshDragPercentage}x',
+    onTap: (setState) async {
+      double? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SlideDialog(
+            title: '刷新滑动距离',
+            min: 0.1,
+            max: 0.5,
+            divisions: 8,
+            precise: 2,
+            value: Pref.refreshDragPercentage,
+            suffix: 'x',
+          );
         },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '音量均衡',
-        setKey: SettingBoxKey.audioNormalization,
-        leading: const Icon(Icons.multitrack_audio),
-        getSubtitle: () {
+      );
+      if (result != null) {
+        kDragContainerExtentPercentage = result;
+        await GStorage.setting.put(SettingBoxKey.refreshDragPercentage, result);
+        Get.forceAppUpdate();
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '刷新指示器高度',
+    leading: const Icon(Icons.height),
+    setKey: SettingBoxKey.refreshDisplacement,
+    getSubtitle: () => '当前指示器高度: ${Pref.refreshDisplacement}',
+    onTap: (setState) async {
+      double? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SlideDialog(
+            title: '刷新指示器高度',
+            min: 10.0,
+            max: 100.0,
+            divisions: 9,
+            value: Pref.refreshDisplacement,
+          );
+        },
+      );
+      if (result != null) {
+        displacement = result;
+        await GStorage.setting.put(SettingBoxKey.refreshDisplacement, result);
+        Get.forceAppUpdate();
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '显示会员彩色弹幕',
+    leading: const Icon(MdiIcons.gradientHorizontal),
+    setKey: SettingBoxKey.showVipDanmaku,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '显示高级弹幕',
+    leading: const Icon(MdiIcons.paletteAdvanced),
+    setKey: SettingBoxKey.showSpecialDanmaku,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '合并弹幕',
+    subtitle: '合并一段时间内获取到的相同弹幕',
+    leading: const Icon(Icons.merge),
+    setKey: SettingBoxKey.mergeDanmaku,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '显示热门推荐',
+    subtitle: '热门页面显示每周必看等推荐内容入口',
+    leading: const Icon(Icons.local_fire_department_outlined),
+    setKey: SettingBoxKey.showHotRcmd,
+    defaultVal: false,
+    onChanged: (value) {
+      try {
+        Get.find<HotController>().showHotRcmd.value = value;
+      } catch (_) {}
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '音量均衡',
+    setKey: SettingBoxKey.audioNormalization,
+    leading: const Icon(Icons.multitrack_audio),
+    getSubtitle: () {
+      String audioNormalization = Pref.audioNormalization;
+      audioNormalization = switch (audioNormalization) {
+        '0' => AudioNormalization.disable.title,
+        '1' => AudioNormalization.dynaudnorm.title,
+        '2' => AudioNormalization.loudnorm.title,
+        _ => audioNormalization,
+      };
+      return '当前:「$audioNormalization」';
+    },
+    onTap: (setState) async {
+      String? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
           String audioNormalization = Pref.audioNormalization;
-          audioNormalization = switch (audioNormalization) {
-            '0' => AudioNormalization.disable.title,
-            '1' => AudioNormalization.dynaudnorm.title,
-            '2' => AudioNormalization.loudnorm.title,
-            _ => audioNormalization,
-          };
-          return '当前:「$audioNormalization」';
-        },
-        onTap: (setState) async {
-          String? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              String audioNormalization = Pref.audioNormalization;
-              Set<String> values = {'0', '1', '2', audioNormalization, '3'};
-              return SelectDialog<String>(
-                  title: '音量均衡',
-                  value: audioNormalization,
-                  values: values
-                      .map((e) => (
-                            e,
-                            switch (e) {
-                              '0' => AudioNormalization.disable.title,
-                              '1' => AudioNormalization.dynaudnorm.title,
-                              '2' => AudioNormalization.loudnorm.title,
-                              '3' => AudioNormalization.custom.title,
-                              _ => e,
-                            }
-                          ))
-                      .toList());
-            },
-          );
-          if (result != null) {
-            if (result == '3') {
-              String param = '';
-              showDialog(
-                  context: Get.context!,
-                  builder: (context) {
-                    return AlertDialog(
-                      title: const Text('自定义参数'),
-                      content: TextField(
-                        autofocus: true,
-                        onChanged: (value) => param = value,
-                      ),
-                      actions: [
-                        TextButton(
-                          onPressed: Get.back,
-                          child: Text(
-                            '取消',
-                            style: TextStyle(
-                              color: Theme.of(context).colorScheme.outline,
-                            ),
-                          ),
-                        ),
-                        TextButton(
-                          onPressed: () async {
-                            Get.back();
-                            await GStorage.setting
-                                .put(SettingBoxKey.audioNormalization, param);
-                            setState();
-                          },
-                          child: const Text('确定'),
-                        ),
-                      ],
-                    );
-                  });
-            } else {
-              await GStorage.setting
-                  .put(SettingBoxKey.audioNormalization, result);
-              setState();
-            }
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '超分辨率',
-        leading: const Icon(Icons.stay_current_landscape_outlined),
-        getSubtitle: () =>
-            '当前:「${SuperResolutionType.values[Pref.superResolutionType].title}」\n默认设置对番剧生效, 其他视频默认关闭\n超分辨率需要启用硬件解码, 若启用硬件解码后仍然不生效, 尝试切换硬件解码器为 auto-copy',
-        onTap: (setState) async {
-          SuperResolutionType? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<SuperResolutionType>(
-                  title: '超分辨率',
-                  value: SuperResolutionType.values[Pref.superResolutionType],
-                  values: SuperResolutionType.values.map((e) {
-                    return (e, e.title);
-                  }).toList());
-            },
-          );
-          if (result != null) {
-            await GStorage.setting
-                .put(SettingBoxKey.superResolutionType, result.index);
-            setState();
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '提前初始化播放器',
-        subtitle: '相对减少手动播放加载时间',
-        leading: const Icon(Icons.play_circle_outlined),
-        setKey: SettingBoxKey.preInitPlayer,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '首页切换页面动画',
-        leading: const Icon(Icons.home_outlined),
-        setKey: SettingBoxKey.mainTabBarView,
-        defaultVal: false,
-        needReboot: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '搜索建议',
-        leading: const Icon(Icons.search),
-        setKey: SettingBoxKey.searchSuggestion,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '记录搜索历史',
-        leading: const Icon(Icons.history),
-        setKey: SettingBoxKey.recordSearchHistory,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '展示头像/评论/动态装饰',
-        leading: const Icon(MdiIcons.stickerCircleOutline),
-        setKey: SettingBoxKey.showDynDecorate,
-        defaultVal: true,
-        onChanged: (value) => PendantAvatar.showDynDecorate = value,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '预览 Live Photo',
-        subtitle: '开启则以视频形式预览 Live Photo，否则预览静态图片',
-        leading: const Icon(Icons.image_outlined),
-        setKey: SettingBoxKey.enableLivePhoto,
-        defaultVal: true,
-        onChanged: (value) {
-          ImageModel.enableLivePhoto = value;
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '滑动跳转预览视频缩略图',
-        leading: const Icon(Icons.preview_outlined),
-        setKey: SettingBoxKey.showSeekPreview,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '显示高能进度条',
-        subtitle: '高能进度条反应了在时域上，单位时间内弹幕发送量的变化趋势',
-        leading: const Icon(Icons.show_chart),
-        setKey: SettingBoxKey.showDmChart,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '发评反诈',
-        subtitle: '发送评论后检查评论是否可见',
-        leading: const Stack(
-          clipBehavior: Clip.none,
-          alignment: Alignment.center,
-          children: [
-            Icon(Icons.shield_outlined),
-            Icon(Icons.reply, size: 14),
-          ],
-        ),
-        setKey: SettingBoxKey.enableCommAntifraud,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '使用「哔哩发评反诈」检查评论',
-        subtitle: '仅对Android生效',
-        leading: const Icon(
-          FontAwesomeIcons.b,
-          size: 22,
-        ),
-        setKey: SettingBoxKey.biliSendCommAntifraud,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '发布/转发动态反诈',
-        subtitle: '发布/转发动态后检查动态是否可见',
-        leading: const Stack(
-          clipBehavior: Clip.none,
-          alignment: Alignment.center,
-          children: [
-            Icon(Icons.shield_outlined),
-            Icon(Icons.motion_photos_on, size: 12),
-          ],
-        ),
-        setKey: SettingBoxKey.enableCreateDynAntifraud,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '屏蔽带货动态',
-        leading: const Stack(
-          clipBehavior: Clip.none,
-          alignment: Alignment.center,
-          children: [
-            Icon(Icons.shopping_bag_outlined, size: 14),
-            Icon(Icons.not_interested),
-          ],
-        ),
-        setKey: SettingBoxKey.antiGoodsDyn,
-        defaultVal: false,
-        onChanged: (value) {
-          DynamicsDataModel.antiGoodsDyn = value;
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '屏蔽带货评论',
-        leading: const Stack(
-          clipBehavior: Clip.none,
-          alignment: Alignment.center,
-          children: [
-            Icon(Icons.shopping_bag_outlined, size: 14),
-            Icon(Icons.not_interested),
-          ],
-        ),
-        setKey: SettingBoxKey.antiGoodsReply,
-        defaultVal: false,
-        onChanged: (value) {
-          ReplyGrpc.antiGoodsReply = value;
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '侧滑关闭二级评论页面',
-        leading: Transform.rotate(
-          angle: pi * 1.5,
-          child: const Icon(Icons.touch_app),
-        ),
-        setKey: SettingBoxKey.slideDismissReplyPage,
-        defaultVal: Platform.isIOS,
-        onChanged: (value) {
-          CommonSlidePageState.slideDismissReplyPage = value;
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '全屏展示点赞/投币/收藏等操作按钮',
-        leading: const Icon(MdiIcons.dotsHorizontalCircleOutline),
-        setKey: SettingBoxKey.showFSActionItem,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '启用双指缩小视频',
-        leading: const Icon(Icons.pinch),
-        setKey: SettingBoxKey.enableShrinkVideoSize,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '动态/专栏详情页展示底部操作栏',
-        leading: const Icon(Icons.more_horiz),
-        setKey: SettingBoxKey.showDynActionBar,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '启用拖拽字幕调整底部边距',
-        leading: const Icon(MdiIcons.dragVariant),
-        setKey: SettingBoxKey.enableDragSubtitle,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '展示追番时间表',
-        leading: const Icon(MdiIcons.chartTimelineVariantShimmer),
-        setKey: SettingBoxKey.showPgcTimeline,
-        defaultVal: true,
-        needReboot: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        setKey: SettingBoxKey.feedBackEnable,
-        onChanged: (value) {
-          enableFeedback = value;
-          feedBack();
-        },
-        leading: const Icon(Icons.vibration_outlined),
-        title: '震动反馈',
-        subtitle: '请确定手机设置中已开启震动反馈',
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '大家都在搜',
-        subtitle: '是否展示「大家都在搜」',
-        leading: const Icon(Icons.data_thresholding_outlined),
-        setKey: SettingBoxKey.enableHotKey,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '搜索发现',
-        subtitle: '是否展示「搜索发现」',
-        leading: const Icon(Icons.search_outlined),
-        setKey: SettingBoxKey.enableSearchRcmd,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '搜索默认词',
-        subtitle: '是否展示搜索框默认词',
-        leading: const Icon(Icons.whatshot_outlined),
-        setKey: SettingBoxKey.enableSearchWord,
-        defaultVal: true,
-        onChanged: (val) {
-          Get.find<HomeController>().defaultSearch.value = '';
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '快速收藏',
-        subtitle: '点按收藏至默认，长按选择文件夹',
-        leading: const Icon(Icons.bookmark_add_outlined),
-        setKey: SettingBoxKey.enableQuickFav,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '评论区搜索关键词',
-        subtitle: '展示评论区搜索关键词',
-        leading: const Icon(Icons.search_outlined),
-        setKey: SettingBoxKey.enableWordRe,
-        defaultVal: false,
-        onChanged: (value) {
-          ReplyItemGrpc.enableWordRe = value;
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '启用AI总结',
-        subtitle: '视频详情页开启AI总结',
-        leading: const Icon(Icons.engineering_outlined),
-        setKey: SettingBoxKey.enableAi,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '消息页禁用"收到的赞"功能',
-        subtitle: '禁止打开入口，降低网络社交依赖',
-        leading: const Icon(Icons.beach_access_outlined),
-        setKey: SettingBoxKey.disableLikeMsg,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '默认展示评论区',
-        subtitle: '在视频详情页默认切换至评论区页（仅Tab型布局）',
-        leading: const Icon(Icons.mode_comment_outlined),
-        setKey: SettingBoxKey.defaultShowComment,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '启用HTTP/2',
-        leading: const Icon(Icons.swap_horizontal_circle_outlined),
-        setKey: SettingBoxKey.enableHttp2,
-        defaultVal: false,
-        needReboot: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '连接重试次数',
-        subtitle: '为0时禁用',
-        leading: const Icon(Icons.repeat),
-        onTap: (setState) async {
-          final result = await showDialog<double>(
-            context: Get.context!,
-            builder: (context) {
-              return SlideDialog(
-                title: '连接重试次数',
-                min: 0,
-                max: 8,
-                divisions: 8,
-                precise: 0,
-                value: Pref.retryCount.toDouble(),
-              );
-            },
-          );
-          if (result != null) {
-            await GStorage.setting
-                .put(SettingBoxKey.retryCount, result.toInt());
-            setState();
-            SmartDialog.showToast('重启生效');
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '连接重试间隔',
-        subtitle: '实际间隔 = 间隔 * 第x次重试',
-        leading: const Icon(Icons.more_time_outlined),
-        onTap: (setState) async {
-          final result = await showDialog<double>(
-            context: Get.context!,
-            builder: (context) {
-              return SlideDialog(
-                title: '连接重试间隔',
-                min: 0,
-                max: 1000,
-                divisions: 10,
-                precise: 0,
-                value: Pref.retryDelay.toDouble(),
-                suffix: 'ms',
-              );
-            },
-          );
-          if (result != null) {
-            await GStorage.setting
-                .put(SettingBoxKey.retryDelay, result.toInt());
-            setState();
-            SmartDialog.showToast('重启生效');
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '评论展示',
-        setKey: SettingBoxKey.replySortType,
-        leading: const Icon(Icons.whatshot_outlined),
-        getSubtitle: () =>
-            '当前优先展示「${ReplySortType.values[Pref.replySortType].title}」',
-        onTap: (setState) async {
-          int? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<int>(
-                title: '评论展示',
-                value: Pref.replySortType,
-                values: ReplySortType.values.map((e) {
-                  return (e.index, e.title);
-                }).toList(),
-              );
-            },
-          );
-          if (result != null) {
-            await GStorage.setting.put(SettingBoxKey.replySortType, result);
-            setState();
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '动态展示',
-        setKey: SettingBoxKey.defaultDynamicType,
-        leading: const Icon(Icons.dynamic_feed_outlined),
-        getSubtitle: () =>
-            '当前优先展示「${DynamicsTabType.values[Pref.defaultDynamicType].label}」',
-        onTap: (setState) async {
-          int? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<int>(
-                  title: '动态展示',
-                  value: Pref.defaultDynamicType,
-                  values: DynamicsTabType.values.sublist(0, 4).map((e) {
-                    return (e.index, e.label);
-                  }).toList());
-            },
-          );
-          if (result != null) {
-            await GStorage.setting
-                .put(SettingBoxKey.defaultDynamicType, result);
-            setState();
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '用户页默认展示TAB',
-        setKey: SettingBoxKey.memberTab,
-        leading: const Icon(Icons.tab),
-        getSubtitle: () => '当前优先展示「${Pref.memberTab.title}」',
-        onTap: (setState) async {
-          MemberTabType? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<MemberTabType>(
-                  title: '用户页默认展示TAB',
-                  value: Pref.memberTab,
-                  values: MemberTabType.values.map((e) {
-                    return (e, e.title);
-                  }).toList());
-            },
-          );
-          if (result != null) {
-            await GStorage.setting.put(SettingBoxKey.memberTab, result.index);
-            setState();
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        onTap: () {
-          String systemProxyHost = Pref.systemProxyHost;
-          String systemProxyPort = Pref.systemProxyPort;
-
-          showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return AlertDialog(
-                title: const Text('设置代理'),
-                content: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    const SizedBox(height: 6),
-                    TextField(
-                      decoration: InputDecoration(
-                        isDense: true,
-                        labelText: systemProxyHost != ''
-                            ? systemProxyHost
-                            : '请输入Host，使用 . 分割',
-                        border: const OutlineInputBorder(
-                          borderRadius: BorderRadius.all(Radius.circular(6)),
-                        ),
-                        hintText: systemProxyHost,
-                      ),
-                      onChanged: (e) {
-                        systemProxyHost = e;
-                      },
-                    ),
-                    const SizedBox(height: 10),
-                    TextField(
-                      keyboardType: TextInputType.number,
-                      decoration: InputDecoration(
-                        isDense: true,
-                        labelText:
-                            systemProxyPort != '' ? systemProxyPort : '请输入Port',
-                        border: const OutlineInputBorder(
-                          borderRadius: BorderRadius.all(Radius.circular(6)),
-                        ),
-                        hintText: systemProxyPort,
-                      ),
-                      onChanged: (e) {
-                        systemProxyPort = e;
-                      },
-                    ),
-                  ],
-                ),
-                actions: [
-                  TextButton(
-                    onPressed: Get.back,
-                    child: Text(
-                      '取消',
-                      style: TextStyle(
-                          color: Theme.of(context).colorScheme.outline),
-                    ),
-                  ),
-                  TextButton(
-                    onPressed: () {
-                      Get.back();
-                      GStorage.setting
-                          .put(SettingBoxKey.systemProxyHost, systemProxyHost);
-                      GStorage.setting
-                          .put(SettingBoxKey.systemProxyPort, systemProxyPort);
+          Set<String> values = {'0', '1', '2', audioNormalization, '3'};
+          return SelectDialog<String>(
+            title: '音量均衡',
+            value: audioNormalization,
+            values: values
+                .map(
+                  (e) => (
+                    e,
+                    switch (e) {
+                      '0' => AudioNormalization.disable.title,
+                      '1' => AudioNormalization.dynaudnorm.title,
+                      '2' => AudioNormalization.loudnorm.title,
+                      '3' => AudioNormalization.custom.title,
+                      _ => e,
                     },
-                    child: const Text('确认'),
-                  )
-                ],
-              );
-            },
+                  ),
+                )
+                .toList(),
           );
         },
-        leading: const Icon(Icons.airplane_ticket_outlined),
-        title: '设置代理',
-        subtitle: '设置代理 host:port',
-        setKey: SettingBoxKey.enableSystemProxy,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '自动清除缓存',
-        subtitle: '每次启动时清除缓存',
-        leading: const Icon(Icons.auto_delete_outlined),
-        setKey: SettingBoxKey.autoClearCache,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '最大缓存大小',
-        getSubtitle: () {
-          final num = Pref.maxCacheSize;
-          return '当前最大缓存大小: 「${num == 0 ? '无限' : CacheManage.formatSize(Pref.maxCacheSize)}」';
-        },
-        onTap: (setState) {
+      );
+      if (result != null) {
+        if (result == '3') {
+          String param = '';
           showDialog(
             context: Get.context!,
             builder: (context) {
-              String valueStr = '';
               return AlertDialog(
-                title: const Text('最大缓存大小'),
+                title: const Text('自定义参数'),
                 content: TextField(
                   autofocus: true,
-                  onChanged: (value) => valueStr = value,
-                  keyboardType: TextInputType.number,
-                  inputFormatters: [
-                    FilteringTextInputFormatter.allow(RegExp(r'[\d\.]+')),
-                  ],
-                  decoration: const InputDecoration(suffixText: 'MB'),
+                  onChanged: (value) => param = value,
                 ),
                 actions: [
                   TextButton(
@@ -1060,15 +491,17 @@ List<SettingsModel> get extraSettings => [
                     child: Text(
                       '取消',
                       style: TextStyle(
-                          color: Theme.of(context).colorScheme.outline),
+                        color: Theme.of(context).colorScheme.outline,
+                      ),
                     ),
                   ),
                   TextButton(
                     onPressed: () async {
                       Get.back();
-                      num value = num.tryParse(valueStr) ?? 0;
-                      await GStorage.setting
-                          .put(SettingBoxKey.maxCacheSize, value * 1024 * 1024);
+                      await GStorage.setting.put(
+                        SettingBoxKey.audioNormalization,
+                        param,
+                      );
                       setState();
                     },
                     child: const Text('确定'),
@@ -1077,20 +510,602 @@ List<SettingsModel> get extraSettings => [
               );
             },
           );
+        } else {
+          await GStorage.setting.put(SettingBoxKey.audioNormalization, result);
+          setState();
+        }
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '超分辨率',
+    leading: const Icon(Icons.stay_current_landscape_outlined),
+    getSubtitle: () =>
+        '当前:「${SuperResolutionType.values[Pref.superResolutionType].title}」\n默认设置对番剧生效, 其他视频默认关闭\n超分辨率需要启用硬件解码, 若启用硬件解码后仍然不生效, 尝试切换硬件解码器为 auto-copy',
+    onTap: (setState) async {
+      SuperResolutionType? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<SuperResolutionType>(
+            title: '超分辨率',
+            value: SuperResolutionType.values[Pref.superResolutionType],
+            values: SuperResolutionType.values.map((e) {
+              return (e, e.title);
+            }).toList(),
+          );
         },
-        leading: const Icon(Icons.delete_outlined),
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '检查更新',
-        subtitle: '每次启动时检查是否需要更新',
-        leading: const Icon(Icons.system_update_alt_outlined),
-        setKey: SettingBoxKey.autoUpdate,
-        defaultVal: true,
-        onChanged: (val) {
-          if (val) {
-            Update.checkUpdate(false);
-          }
+      );
+      if (result != null) {
+        await GStorage.setting.put(
+          SettingBoxKey.superResolutionType,
+          result.index,
+        );
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '提前初始化播放器',
+    subtitle: '相对减少手动播放加载时间',
+    leading: const Icon(Icons.play_circle_outlined),
+    setKey: SettingBoxKey.preInitPlayer,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '首页切换页面动画',
+    leading: const Icon(Icons.home_outlined),
+    setKey: SettingBoxKey.mainTabBarView,
+    defaultVal: false,
+    needReboot: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '搜索建议',
+    leading: const Icon(Icons.search),
+    setKey: SettingBoxKey.searchSuggestion,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '记录搜索历史',
+    leading: const Icon(Icons.history),
+    setKey: SettingBoxKey.recordSearchHistory,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '展示头像/评论/动态装饰',
+    leading: const Icon(MdiIcons.stickerCircleOutline),
+    setKey: SettingBoxKey.showDynDecorate,
+    defaultVal: true,
+    onChanged: (value) => PendantAvatar.showDynDecorate = value,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '预览 Live Photo',
+    subtitle: '开启则以视频形式预览 Live Photo，否则预览静态图片',
+    leading: const Icon(Icons.image_outlined),
+    setKey: SettingBoxKey.enableLivePhoto,
+    defaultVal: true,
+    onChanged: (value) {
+      ImageModel.enableLivePhoto = value;
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '滑动跳转预览视频缩略图',
+    leading: const Icon(Icons.preview_outlined),
+    setKey: SettingBoxKey.showSeekPreview,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '显示高能进度条',
+    subtitle: '高能进度条反应了在时域上，单位时间内弹幕发送量的变化趋势',
+    leading: const Icon(Icons.show_chart),
+    setKey: SettingBoxKey.showDmChart,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '发评反诈',
+    subtitle: '发送评论后检查评论是否可见',
+    leading: const Stack(
+      clipBehavior: Clip.none,
+      alignment: Alignment.center,
+      children: [
+        Icon(Icons.shield_outlined),
+        Icon(Icons.reply, size: 14),
+      ],
+    ),
+    setKey: SettingBoxKey.enableCommAntifraud,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '使用「哔哩发评反诈」检查评论',
+    subtitle: '仅对Android生效',
+    leading: const Icon(
+      FontAwesomeIcons.b,
+      size: 22,
+    ),
+    setKey: SettingBoxKey.biliSendCommAntifraud,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '发布/转发动态反诈',
+    subtitle: '发布/转发动态后检查动态是否可见',
+    leading: const Stack(
+      clipBehavior: Clip.none,
+      alignment: Alignment.center,
+      children: [
+        Icon(Icons.shield_outlined),
+        Icon(Icons.motion_photos_on, size: 12),
+      ],
+    ),
+    setKey: SettingBoxKey.enableCreateDynAntifraud,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '屏蔽带货动态',
+    leading: const Stack(
+      clipBehavior: Clip.none,
+      alignment: Alignment.center,
+      children: [
+        Icon(Icons.shopping_bag_outlined, size: 14),
+        Icon(Icons.not_interested),
+      ],
+    ),
+    setKey: SettingBoxKey.antiGoodsDyn,
+    defaultVal: false,
+    onChanged: (value) {
+      DynamicsDataModel.antiGoodsDyn = value;
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '屏蔽带货评论',
+    leading: const Stack(
+      clipBehavior: Clip.none,
+      alignment: Alignment.center,
+      children: [
+        Icon(Icons.shopping_bag_outlined, size: 14),
+        Icon(Icons.not_interested),
+      ],
+    ),
+    setKey: SettingBoxKey.antiGoodsReply,
+    defaultVal: false,
+    onChanged: (value) {
+      ReplyGrpc.antiGoodsReply = value;
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '侧滑关闭二级评论页面',
+    leading: Transform.rotate(
+      angle: pi * 1.5,
+      child: const Icon(Icons.touch_app),
+    ),
+    setKey: SettingBoxKey.slideDismissReplyPage,
+    defaultVal: Platform.isIOS,
+    onChanged: (value) {
+      CommonSlidePageState.slideDismissReplyPage = value;
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '全屏展示点赞/投币/收藏等操作按钮',
+    leading: const Icon(MdiIcons.dotsHorizontalCircleOutline),
+    setKey: SettingBoxKey.showFSActionItem,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '启用双指缩小视频',
+    leading: const Icon(Icons.pinch),
+    setKey: SettingBoxKey.enableShrinkVideoSize,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '动态/专栏详情页展示底部操作栏',
+    leading: const Icon(Icons.more_horiz),
+    setKey: SettingBoxKey.showDynActionBar,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '启用拖拽字幕调整底部边距',
+    leading: const Icon(MdiIcons.dragVariant),
+    setKey: SettingBoxKey.enableDragSubtitle,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '展示追番时间表',
+    leading: const Icon(MdiIcons.chartTimelineVariantShimmer),
+    setKey: SettingBoxKey.showPgcTimeline,
+    defaultVal: true,
+    needReboot: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    setKey: SettingBoxKey.feedBackEnable,
+    onChanged: (value) {
+      enableFeedback = value;
+      feedBack();
+    },
+    leading: const Icon(Icons.vibration_outlined),
+    title: '震动反馈',
+    subtitle: '请确定手机设置中已开启震动反馈',
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '大家都在搜',
+    subtitle: '是否展示「大家都在搜」',
+    leading: const Icon(Icons.data_thresholding_outlined),
+    setKey: SettingBoxKey.enableHotKey,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '搜索发现',
+    subtitle: '是否展示「搜索发现」',
+    leading: const Icon(Icons.search_outlined),
+    setKey: SettingBoxKey.enableSearchRcmd,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '搜索默认词',
+    subtitle: '是否展示搜索框默认词',
+    leading: const Icon(Icons.whatshot_outlined),
+    setKey: SettingBoxKey.enableSearchWord,
+    defaultVal: true,
+    onChanged: (val) {
+      Get.find<HomeController>().defaultSearch.value = '';
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '快速收藏',
+    subtitle: '点按收藏至默认，长按选择文件夹',
+    leading: const Icon(Icons.bookmark_add_outlined),
+    setKey: SettingBoxKey.enableQuickFav,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '评论区搜索关键词',
+    subtitle: '展示评论区搜索关键词',
+    leading: const Icon(Icons.search_outlined),
+    setKey: SettingBoxKey.enableWordRe,
+    defaultVal: false,
+    onChanged: (value) {
+      ReplyItemGrpc.enableWordRe = value;
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '启用AI总结',
+    subtitle: '视频详情页开启AI总结',
+    leading: const Icon(Icons.engineering_outlined),
+    setKey: SettingBoxKey.enableAi,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '消息页禁用"收到的赞"功能',
+    subtitle: '禁止打开入口，降低网络社交依赖',
+    leading: const Icon(Icons.beach_access_outlined),
+    setKey: SettingBoxKey.disableLikeMsg,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '默认展示评论区',
+    subtitle: '在视频详情页默认切换至评论区页（仅Tab型布局）',
+    leading: const Icon(Icons.mode_comment_outlined),
+    setKey: SettingBoxKey.defaultShowComment,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '启用HTTP/2',
+    leading: const Icon(Icons.swap_horizontal_circle_outlined),
+    setKey: SettingBoxKey.enableHttp2,
+    defaultVal: false,
+    needReboot: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '连接重试次数',
+    subtitle: '为0时禁用',
+    leading: const Icon(Icons.repeat),
+    onTap: (setState) async {
+      final result = await showDialog<double>(
+        context: Get.context!,
+        builder: (context) {
+          return SlideDialog(
+            title: '连接重试次数',
+            min: 0,
+            max: 8,
+            divisions: 8,
+            precise: 0,
+            value: Pref.retryCount.toDouble(),
+          );
         },
-      ),
-    ];
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.retryCount, result.toInt());
+        setState();
+        SmartDialog.showToast('重启生效');
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '连接重试间隔',
+    subtitle: '实际间隔 = 间隔 * 第x次重试',
+    leading: const Icon(Icons.more_time_outlined),
+    onTap: (setState) async {
+      final result = await showDialog<double>(
+        context: Get.context!,
+        builder: (context) {
+          return SlideDialog(
+            title: '连接重试间隔',
+            min: 0,
+            max: 1000,
+            divisions: 10,
+            precise: 0,
+            value: Pref.retryDelay.toDouble(),
+            suffix: 'ms',
+          );
+        },
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.retryDelay, result.toInt());
+        setState();
+        SmartDialog.showToast('重启生效');
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '评论展示',
+    setKey: SettingBoxKey.replySortType,
+    leading: const Icon(Icons.whatshot_outlined),
+    getSubtitle: () =>
+        '当前优先展示「${ReplySortType.values[Pref.replySortType].title}」',
+    onTap: (setState) async {
+      int? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<int>(
+            title: '评论展示',
+            value: Pref.replySortType,
+            values: ReplySortType.values.map((e) {
+              return (e.index, e.title);
+            }).toList(),
+          );
+        },
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.replySortType, result);
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '动态展示',
+    setKey: SettingBoxKey.defaultDynamicType,
+    leading: const Icon(Icons.dynamic_feed_outlined),
+    getSubtitle: () =>
+        '当前优先展示「${DynamicsTabType.values[Pref.defaultDynamicType].label}」',
+    onTap: (setState) async {
+      int? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<int>(
+            title: '动态展示',
+            value: Pref.defaultDynamicType,
+            values: DynamicsTabType.values.sublist(0, 4).map((e) {
+              return (e.index, e.label);
+            }).toList(),
+          );
+        },
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.defaultDynamicType, result);
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '用户页默认展示TAB',
+    setKey: SettingBoxKey.memberTab,
+    leading: const Icon(Icons.tab),
+    getSubtitle: () => '当前优先展示「${Pref.memberTab.title}」',
+    onTap: (setState) async {
+      MemberTabType? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<MemberTabType>(
+            title: '用户页默认展示TAB',
+            value: Pref.memberTab,
+            values: MemberTabType.values.map((e) {
+              return (e, e.title);
+            }).toList(),
+          );
+        },
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.memberTab, result.index);
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    onTap: () {
+      String systemProxyHost = Pref.systemProxyHost;
+      String systemProxyPort = Pref.systemProxyPort;
+
+      showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return AlertDialog(
+            title: const Text('设置代理'),
+            content: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                const SizedBox(height: 6),
+                TextField(
+                  decoration: InputDecoration(
+                    isDense: true,
+                    labelText: systemProxyHost != ''
+                        ? systemProxyHost
+                        : '请输入Host，使用 . 分割',
+                    border: const OutlineInputBorder(
+                      borderRadius: BorderRadius.all(Radius.circular(6)),
+                    ),
+                    hintText: systemProxyHost,
+                  ),
+                  onChanged: (e) {
+                    systemProxyHost = e;
+                  },
+                ),
+                const SizedBox(height: 10),
+                TextField(
+                  keyboardType: TextInputType.number,
+                  decoration: InputDecoration(
+                    isDense: true,
+                    labelText: systemProxyPort != ''
+                        ? systemProxyPort
+                        : '请输入Port',
+                    border: const OutlineInputBorder(
+                      borderRadius: BorderRadius.all(Radius.circular(6)),
+                    ),
+                    hintText: systemProxyPort,
+                  ),
+                  onChanged: (e) {
+                    systemProxyPort = e;
+                  },
+                ),
+              ],
+            ),
+            actions: [
+              TextButton(
+                onPressed: Get.back,
+                child: Text(
+                  '取消',
+                  style: TextStyle(
+                    color: Theme.of(context).colorScheme.outline,
+                  ),
+                ),
+              ),
+              TextButton(
+                onPressed: () {
+                  Get.back();
+                  GStorage.setting.put(
+                    SettingBoxKey.systemProxyHost,
+                    systemProxyHost,
+                  );
+                  GStorage.setting.put(
+                    SettingBoxKey.systemProxyPort,
+                    systemProxyPort,
+                  );
+                },
+                child: const Text('确认'),
+              ),
+            ],
+          );
+        },
+      );
+    },
+    leading: const Icon(Icons.airplane_ticket_outlined),
+    title: '设置代理',
+    subtitle: '设置代理 host:port',
+    setKey: SettingBoxKey.enableSystemProxy,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '自动清除缓存',
+    subtitle: '每次启动时清除缓存',
+    leading: const Icon(Icons.auto_delete_outlined),
+    setKey: SettingBoxKey.autoClearCache,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '最大缓存大小',
+    getSubtitle: () {
+      final num = Pref.maxCacheSize;
+      return '当前最大缓存大小: 「${num == 0 ? '无限' : CacheManage.formatSize(Pref.maxCacheSize)}」';
+    },
+    onTap: (setState) {
+      showDialog(
+        context: Get.context!,
+        builder: (context) {
+          String valueStr = '';
+          return AlertDialog(
+            title: const Text('最大缓存大小'),
+            content: TextField(
+              autofocus: true,
+              onChanged: (value) => valueStr = value,
+              keyboardType: TextInputType.number,
+              inputFormatters: [
+                FilteringTextInputFormatter.allow(RegExp(r'[\d\.]+')),
+              ],
+              decoration: const InputDecoration(suffixText: 'MB'),
+            ),
+            actions: [
+              TextButton(
+                onPressed: Get.back,
+                child: Text(
+                  '取消',
+                  style: TextStyle(
+                    color: Theme.of(context).colorScheme.outline,
+                  ),
+                ),
+              ),
+              TextButton(
+                onPressed: () async {
+                  Get.back();
+                  num value = num.tryParse(valueStr) ?? 0;
+                  await GStorage.setting.put(
+                    SettingBoxKey.maxCacheSize,
+                    value * 1024 * 1024,
+                  );
+                  setState();
+                },
+                child: const Text('确定'),
+              ),
+            ],
+          );
+        },
+      );
+    },
+    leading: const Icon(Icons.delete_outlined),
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '检查更新',
+    subtitle: '每次启动时检查是否需要更新',
+    leading: const Icon(Icons.system_update_alt_outlined),
+    setKey: SettingBoxKey.autoUpdate,
+    defaultVal: true,
+    onChanged: (val) {
+      if (val) {
+        Update.checkUpdate(false);
+      }
+    },
+  ),
+];
diff --git a/lib/pages/setting/models/model.dart b/lib/pages/setting/models/model.dart
index 6a2e1e42e..e2d12dd6c 100644
--- a/lib/pages/setting/models/model.dart
+++ b/lib/pages/setting/models/model.dart
@@ -10,34 +10,34 @@ import 'package:get/get.dart';
 
 extension SettingsModelExt on SettingsModel {
   Widget get widget => switch (settingsType) {
-        SettingsType.normal => NormalItem(
-            title: title,
-            getTitle: getTitle,
-            subtitle: subtitle,
-            getSubtitle: getSubtitle,
-            setKey: setKey,
-            defaultVal: defaultVal,
-            onChanged: onChanged,
-            needReboot: needReboot,
-            leading: leading,
-            getTrailing: getTrailing,
-            onTap: onTap,
-            contentPadding: contentPadding,
-            titleStyle: titleStyle,
-          ),
-        SettingsType.sw1tch => SetSwitchItem(
-            title: title,
-            subtitle: subtitle,
-            setKey: setKey,
-            defaultVal: defaultVal,
-            onChanged: onChanged,
-            needReboot: needReboot,
-            leading: leading,
-            onTap: onTap,
-            contentPadding: contentPadding,
-            titleStyle: titleStyle,
-          ),
-      };
+    SettingsType.normal => NormalItem(
+      title: title,
+      getTitle: getTitle,
+      subtitle: subtitle,
+      getSubtitle: getSubtitle,
+      setKey: setKey,
+      defaultVal: defaultVal,
+      onChanged: onChanged,
+      needReboot: needReboot,
+      leading: leading,
+      getTrailing: getTrailing,
+      onTap: onTap,
+      contentPadding: contentPadding,
+      titleStyle: titleStyle,
+    ),
+    SettingsType.sw1tch => SetSwitchItem(
+      title: title,
+      subtitle: subtitle,
+      setKey: setKey,
+      defaultVal: defaultVal,
+      onChanged: onChanged,
+      needReboot: needReboot,
+      leading: leading,
+      onTap: onTap,
+      contentPadding: contentPadding,
+      titleStyle: titleStyle,
+    ),
+  };
 }
 
 class SettingsModel {
@@ -104,7 +104,7 @@ SettingsModel getBanwordModel({
                   minLines: 1,
                   maxLines: 4,
                   onChanged: (value) => banWord = value,
-                )
+                ),
               ],
             ),
             actions: [
@@ -112,8 +112,9 @@ SettingsModel getBanwordModel({
                 onPressed: Get.back,
                 child: Text(
                   '取消',
-                  style:
-                      TextStyle(color: Theme.of(context).colorScheme.outline),
+                  style: TextStyle(
+                    color: Theme.of(context).colorScheme.outline,
+                  ),
                 ),
               ),
               TextButton(
@@ -154,22 +155,26 @@ SettingsModel getVideoFilterSelectModel({
     subtitle: subtitle,
     getSubtitle: subtitle == null
         ? () => isFilter
-            ? '过滤掉$title小于「$value${suffix ?? ""}」的视频'
-            : '当前$title:「$value${suffix ?? ""}」'
+              ? '过滤掉$title小于「$value${suffix ?? ""}」的视频'
+              : '当前$title:「$value${suffix ?? ""}」'
         : null,
     onTap: (setState) async {
       var result = await showDialog<int>(
         context: context,
         builder: (context) {
           return SelectDialog<int>(
-              title: '选择$title${isFilter ? '（0即不过滤）' : ''}',
-              value: value,
-              values: (values
-                    ..addIf(!values.contains(value), value)
-                    ..sort())
-                  .map((e) => (e, suffix == null ? e.toString() : '$e $suffix'))
-                  .toList()
-                ..add((-1, '自定义')));
+            title: '选择$title${isFilter ? '（0即不过滤）' : ''}',
+            value: value,
+            values:
+                (values
+                      ..addIf(!values.contains(value), value)
+                      ..sort())
+                    .map(
+                      (e) => (e, suffix == null ? e.toString() : '$e $suffix'),
+                    )
+                    .toList()
+                  ..add((-1, '自定义')),
+          );
         },
       );
       if (result != null) {
@@ -193,7 +198,8 @@ SettingsModel getVideoFilterSelectModel({
                     child: Text(
                       '取消',
                       style: TextStyle(
-                          color: Theme.of(context).colorScheme.outline),
+                        color: Theme.of(context).colorScheme.outline,
+                      ),
                     ),
                   ),
                   TextButton(
diff --git a/lib/pages/setting/models/play_settings.dart b/lib/pages/setting/models/play_settings.dart
index 739e19d25..f0f78cbb6 100644
--- a/lib/pages/setting/models/play_settings.dart
+++ b/lib/pages/setting/models/play_settings.dart
@@ -19,247 +19,249 @@ import 'package:get/get.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
 List<SettingsModel> get playSettings => [
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '弹幕开关',
-        subtitle: '是否展示弹幕',
-        leading: const Icon(CustomIcon.dm_settings),
-        setKey: SettingBoxKey.enableShowDanmaku,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) => Get.toNamed('/playSpeedSet'),
-        leading: const Icon(Icons.speed_outlined),
-        title: '倍速设置',
-        subtitle: '设置视频播放速度',
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '自动播放',
-        subtitle: '进入详情页自动播放',
-        leading: const Icon(Icons.motion_photos_auto_outlined),
-        setKey: SettingBoxKey.autoPlayEnable,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '双击快退/快进',
-        subtitle: '左侧双击快退/右侧双击快进，关闭则双击均为暂停/播放',
-        leading: const Icon(Icons.touch_app_outlined),
-        setKey: SettingBoxKey.enableQuickDouble,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '左右侧滑动调节亮度/音量',
-        leading: const Icon(MdiIcons.tuneVerticalVariant),
-        setKey: SettingBoxKey.enableSlideVolumeBrightness,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '中间滑动进入/退出全屏',
-        leading: const Icon(MdiIcons.panVertical),
-        setKey: SettingBoxKey.enableSlideFS,
-        defaultVal: true,
-      ),
-      getVideoFilterSelectModel(
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '弹幕开关',
+    subtitle: '是否展示弹幕',
+    leading: const Icon(CustomIcon.dm_settings),
+    setKey: SettingBoxKey.enableShowDanmaku,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) => Get.toNamed('/playSpeedSet'),
+    leading: const Icon(Icons.speed_outlined),
+    title: '倍速设置',
+    subtitle: '设置视频播放速度',
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '自动播放',
+    subtitle: '进入详情页自动播放',
+    leading: const Icon(Icons.motion_photos_auto_outlined),
+    setKey: SettingBoxKey.autoPlayEnable,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '双击快退/快进',
+    subtitle: '左侧双击快退/右侧双击快进，关闭则双击均为暂停/播放',
+    leading: const Icon(Icons.touch_app_outlined),
+    setKey: SettingBoxKey.enableQuickDouble,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '左右侧滑动调节亮度/音量',
+    leading: const Icon(MdiIcons.tuneVerticalVariant),
+    setKey: SettingBoxKey.enableSlideVolumeBrightness,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '中间滑动进入/退出全屏',
+    leading: const Icon(MdiIcons.panVertical),
+    setKey: SettingBoxKey.enableSlideFS,
+    defaultVal: true,
+  ),
+  getVideoFilterSelectModel(
+    context: Get.context!,
+    title: '双击快进/快退时长',
+    suffix: 's',
+    key: SettingBoxKey.fastForBackwardDuration,
+    values: [5, 10, 15],
+    defaultValue: 10,
+    isFilter: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '滑动快进/快退使用相对时长',
+    leading: const Icon(Icons.swap_horiz_outlined),
+    setKey: SettingBoxKey.useRelativeSlide,
+    defaultVal: false,
+  ),
+  getVideoFilterSelectModel(
+    context: Get.context!,
+    title: '滑动快进/快退时长',
+    subtitle: '从播放器一端滑到另一端的快进/快退时长',
+    suffix: Pref.useRelativeSlide ? '%' : 's',
+    key: SettingBoxKey.sliderDuration,
+    values: [25, 50, 90, 100],
+    defaultValue: 90,
+    isFilter: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '自动启用字幕',
+    leading: const Icon(Icons.closed_caption_outlined),
+    getSubtitle: () =>
+        '当前选择偏好：${SubtitlePrefTypeExt.fromCode(Pref.subtitlePreference)!.description}',
+    onTap: (setState) async {
+      String? result = await showDialog(
         context: Get.context!,
-        title: '双击快进/快退时长',
-        suffix: 's',
-        key: SettingBoxKey.fastForBackwardDuration,
-        values: [5, 10, 15],
-        defaultValue: 10,
-        isFilter: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '滑动快进/快退使用相对时长',
-        leading: const Icon(Icons.swap_horiz_outlined),
-        setKey: SettingBoxKey.useRelativeSlide,
-        defaultVal: false,
-      ),
-      getVideoFilterSelectModel(
+        builder: (context) {
+          return SelectDialog<String>(
+            title: '字幕选择偏好',
+            value: Pref.subtitlePreference,
+            values: SubtitlePrefType.values
+                .map((e) => (e.code, e.description))
+                .toList(),
+          );
+        },
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.subtitlePreference, result);
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '竖屏扩大展示',
+    subtitle: '小屏竖屏视频宽高比由16:9扩大至1:1（不支持收起）；横屏适配时，扩大至9:16',
+    leading: const Icon(Icons.expand_outlined),
+    setKey: SettingBoxKey.enableVerticalExpand,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '自动全屏',
+    subtitle: '视频开始播放时进入全屏',
+    leading: const Icon(Icons.fullscreen_outlined),
+    setKey: SettingBoxKey.enableAutoEnter,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '自动退出全屏',
+    subtitle: '视频结束播放时退出全屏',
+    leading: const Icon(Icons.fullscreen_exit_outlined),
+    setKey: SettingBoxKey.enableAutoExit,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '延长播放控件显示时间',
+    subtitle: '开启后延长至30秒，便于屏幕阅读器滑动切换控件焦点',
+    leading: const Icon(Icons.timer_outlined),
+    setKey: SettingBoxKey.enableLongShowControl,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '全向旋转',
+    subtitle: '小屏可受重力转为临时全屏，若系统锁定旋转仍触发请关闭，关闭会影响横屏适配',
+    leading: const Icon(Icons.screen_rotation_alt_outlined),
+    setKey: SettingBoxKey.allowRotateScreen,
+    defaultVal: true,
+    onChanged: (value) => allowRotateScreen = value,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '后台播放',
+    subtitle: '进入后台时继续播放',
+    leading: const Icon(Icons.motion_photos_pause_outlined),
+    setKey: SettingBoxKey.continuePlayInBackground,
+    defaultVal: false,
+  ),
+  if (Platform.isAndroid)
+    SettingsModel(
+      settingsType: SettingsType.sw1tch,
+      title: '后台画中画',
+      subtitle: '进入后台时以小窗形式（PiP）播放',
+      leading: const Icon(Icons.picture_in_picture_outlined),
+      setKey: SettingBoxKey.autoPiP,
+      defaultVal: false,
+      onChanged: (val) {
+        if (val && !videoPlayerServiceHandler.enableBackgroundPlay) {
+          SmartDialog.showToast('建议开启后台音频服务');
+        }
+      },
+    ),
+  if (Platform.isAndroid)
+    SettingsModel(
+      settingsType: SettingsType.sw1tch,
+      title: '画中画不加载弹幕',
+      subtitle: '当弹幕开关开启时，小窗屏蔽弹幕以获得较好的体验',
+      leading: const Icon(Icons.subtitles_off_outlined),
+      setKey: SettingBoxKey.pipNoDanmaku,
+      defaultVal: false,
+    ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '全屏手势反向',
+    subtitle: '默认播放器中部向上滑动进入全屏，向下退出\n开启后向下全屏，向上退出',
+    leading: const Icon(Icons.swap_vert_outlined),
+    setKey: SettingBoxKey.fullScreenGestureReverse,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '观看人数',
+    subtitle: '展示同时在看人数',
+    leading: const Icon(Icons.people_outlined),
+    setKey: SettingBoxKey.enableOnlineTotal,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '默认全屏方向',
+    leading: const Icon(Icons.open_with_outlined),
+    getSubtitle: () =>
+        '当前全屏方向：${FullScreenMode.values[Pref.fullScreenMode].desc}',
+    onTap: (setState) async {
+      int? result = await showDialog(
         context: Get.context!,
-        title: '滑动快进/快退时长',
-        subtitle: '从播放器一端滑到另一端的快进/快退时长',
-        suffix: Pref.useRelativeSlide ? '%' : 's',
-        key: SettingBoxKey.sliderDuration,
-        values: [25, 50, 90, 100],
-        defaultValue: 90,
-        isFilter: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '自动启用字幕',
-        leading: const Icon(Icons.closed_caption_outlined),
-        getSubtitle: () =>
-            '当前选择偏好：${SubtitlePrefTypeExt.fromCode(Pref.subtitlePreference)!.description}',
-        onTap: (setState) async {
-          String? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<String>(
-                title: '字幕选择偏好',
-                value: Pref.subtitlePreference,
-                values: SubtitlePrefType.values
-                    .map((e) => (e.code, e.description))
-                    .toList(),
-              );
-            },
+        builder: (context) {
+          return SelectDialog<int>(
+            title: '默认全屏方向',
+            value: Pref.fullScreenMode,
+            values: FullScreenMode.values.map((e) {
+              return (e.index, e.desc);
+            }).toList(),
           );
-          if (result != null) {
-            await GStorage.setting
-                .put(SettingBoxKey.subtitlePreference, result);
-            setState();
-          }
         },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '竖屏扩大展示',
-        subtitle: '小屏竖屏视频宽高比由16:9扩大至1:1（不支持收起）；横屏适配时，扩大至9:16',
-        leading: const Icon(Icons.expand_outlined),
-        setKey: SettingBoxKey.enableVerticalExpand,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '自动全屏',
-        subtitle: '视频开始播放时进入全屏',
-        leading: const Icon(Icons.fullscreen_outlined),
-        setKey: SettingBoxKey.enableAutoEnter,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '自动退出全屏',
-        subtitle: '视频结束播放时退出全屏',
-        leading: const Icon(Icons.fullscreen_exit_outlined),
-        setKey: SettingBoxKey.enableAutoExit,
-        defaultVal: true,
-      ),
-      SettingsModel(
-          settingsType: SettingsType.sw1tch,
-          title: '延长播放控件显示时间',
-          subtitle: '开启后延长至30秒，便于屏幕阅读器滑动切换控件焦点',
-          leading: const Icon(Icons.timer_outlined),
-          setKey: SettingBoxKey.enableLongShowControl,
-          defaultVal: false),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '全向旋转',
-        subtitle: '小屏可受重力转为临时全屏，若系统锁定旋转仍触发请关闭，关闭会影响横屏适配',
-        leading: const Icon(Icons.screen_rotation_alt_outlined),
-        setKey: SettingBoxKey.allowRotateScreen,
-        defaultVal: true,
-        onChanged: (value) => allowRotateScreen = value,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '后台播放',
-        subtitle: '进入后台时继续播放',
-        leading: const Icon(Icons.motion_photos_pause_outlined),
-        setKey: SettingBoxKey.continuePlayInBackground,
-        defaultVal: false,
-      ),
-      if (Platform.isAndroid)
-        SettingsModel(
-            settingsType: SettingsType.sw1tch,
-            title: '后台画中画',
-            subtitle: '进入后台时以小窗形式（PiP）播放',
-            leading: const Icon(Icons.picture_in_picture_outlined),
-            setKey: SettingBoxKey.autoPiP,
-            defaultVal: false,
-            onChanged: (val) {
-              if (val && !videoPlayerServiceHandler.enableBackgroundPlay) {
-                SmartDialog.showToast('建议开启后台音频服务');
-              }
-            }),
-      if (Platform.isAndroid)
-        SettingsModel(
-          settingsType: SettingsType.sw1tch,
-          title: '画中画不加载弹幕',
-          subtitle: '当弹幕开关开启时，小窗屏蔽弹幕以获得较好的体验',
-          leading: const Icon(Icons.subtitles_off_outlined),
-          setKey: SettingBoxKey.pipNoDanmaku,
-          defaultVal: false,
-        ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '全屏手势反向',
-        subtitle: '默认播放器中部向上滑动进入全屏，向下退出\n开启后向下全屏，向上退出',
-        leading: const Icon(Icons.swap_vert_outlined),
-        setKey: SettingBoxKey.fullScreenGestureReverse,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '观看人数',
-        subtitle: '展示同时在看人数',
-        leading: const Icon(Icons.people_outlined),
-        setKey: SettingBoxKey.enableOnlineTotal,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '默认全屏方向',
-        leading: const Icon(Icons.open_with_outlined),
-        getSubtitle: () =>
-            '当前全屏方向：${FullScreenMode.values[Pref.fullScreenMode].desc}',
-        onTap: (setState) async {
-          int? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<int>(
-                  title: '默认全屏方向',
-                  value: Pref.fullScreenMode,
-                  values: FullScreenMode.values.map((e) {
-                    return (e.index, e.desc);
-                  }).toList());
-            },
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.fullScreenMode, result);
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '底部进度条展示',
+    leading: const Icon(Icons.border_bottom_outlined),
+    getSubtitle: () =>
+        '当前展示方式：${BtmProgressBehavior.values[Pref.btmProgressBehavior].desc}',
+    onTap: (setState) async {
+      int? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<int>(
+            title: '底部进度条展示',
+            value: Pref.btmProgressBehavior,
+            values: BtmProgressBehavior.values.map((e) {
+              return (e.index, e.desc);
+            }).toList(),
           );
-          if (result != null) {
-            await GStorage.setting.put(SettingBoxKey.fullScreenMode, result);
-            setState();
-          }
         },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '底部进度条展示',
-        leading: const Icon(Icons.border_bottom_outlined),
-        getSubtitle: () =>
-            '当前展示方式：${BtmProgressBehavior.values[Pref.btmProgressBehavior].desc}',
-        onTap: (setState) async {
-          int? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<int>(
-                  title: '底部进度条展示',
-                  value: Pref.btmProgressBehavior,
-                  values: BtmProgressBehavior.values.map((e) {
-                    return (e.index, e.desc);
-                  }).toList());
-            },
-          );
-          if (result != null) {
-            await GStorage.setting
-                .put(SettingBoxKey.btmProgressBehavior, result);
-            setState();
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '后台音频服务',
-        subtitle: '避免画中画没有播放暂停功能',
-        leading: const Icon(Icons.volume_up_outlined),
-        setKey: SettingBoxKey.enableBackgroundPlay,
-        defaultVal: true,
-        onChanged: (value) {
-          videoPlayerServiceHandler.enableBackgroundPlay = value;
-        },
-      ),
-    ];
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.btmProgressBehavior, result);
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '后台音频服务',
+    subtitle: '避免画中画没有播放暂停功能',
+    leading: const Icon(Icons.volume_up_outlined),
+    setKey: SettingBoxKey.enableBackgroundPlay,
+    defaultVal: true,
+    onChanged: (value) {
+      videoPlayerServiceHandler.enableBackgroundPlay = value;
+    },
+  ),
+];
diff --git a/lib/pages/setting/models/privacy_settings.dart b/lib/pages/setting/models/privacy_settings.dart
index feabef118..efab85103 100644
--- a/lib/pages/setting/models/privacy_settings.dart
+++ b/lib/pages/setting/models/privacy_settings.dart
@@ -9,57 +9,56 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 
 List<SettingsModel> get privacySettings => [
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) {
-          if (!Accounts.main.isLogin) {
-            SmartDialog.showToast('登录后查看');
-            return;
-          }
-          Get.toNamed('/blackListPage');
-        },
-        title: '黑名单管理',
-        subtitle: '已拉黑用户',
-        leading: const Icon(Icons.block),
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) {
-          MineController.onChangeAnonymity();
-          setState();
-        },
-        leading: const Icon(Icons.privacy_tip_outlined),
-        getTitle: () => MineController.anonymity.value ? '退出无痕模式' : '进入无痕模式',
-        getSubtitle: () => MineController.anonymity.value
-            ? '已进入无痕模式，搜索、观看视频/直播不携带Cookie与CSRF，其余操作不受影响'
-            : '未开启无痕模式，将使用账户信息提供完整服务',
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) {
-          showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return AlertDialog(
-                title: const Text('查看详情'),
-                content: SingleChildScrollView(
-                  child: Text(
-                    AccountManager.apiTypeSet[AccountType.heartbeat]!
-                        .join('\n'),
-                  ),
-                ),
-                actions: [
-                  TextButton(
-                    onPressed: Get.back,
-                    child: const Text('确认'),
-                  )
-                ],
-              );
-            },
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) {
+      if (!Accounts.main.isLogin) {
+        SmartDialog.showToast('登录后查看');
+        return;
+      }
+      Get.toNamed('/blackListPage');
+    },
+    title: '黑名单管理',
+    subtitle: '已拉黑用户',
+    leading: const Icon(Icons.block),
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) {
+      MineController.onChangeAnonymity();
+      setState();
+    },
+    leading: const Icon(Icons.privacy_tip_outlined),
+    getTitle: () => MineController.anonymity.value ? '退出无痕模式' : '进入无痕模式',
+    getSubtitle: () => MineController.anonymity.value
+        ? '已进入无痕模式，搜索、观看视频/直播不携带Cookie与CSRF，其余操作不受影响'
+        : '未开启无痕模式，将使用账户信息提供完整服务',
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) {
+      showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return AlertDialog(
+            title: const Text('查看详情'),
+            content: SingleChildScrollView(
+              child: Text(
+                AccountManager.apiTypeSet[AccountType.heartbeat]!.join('\n'),
+              ),
+            ),
+            actions: [
+              TextButton(
+                onPressed: Get.back,
+                child: const Text('确认'),
+              ),
+            ],
           );
         },
-        leading: const Icon(Icons.flag_outlined),
-        title: '了解无痕模式',
-        subtitle: '查看无痕模式作用的API列表',
-      ),
-    ];
+      );
+    },
+    leading: const Icon(Icons.flag_outlined),
+    title: '了解无痕模式',
+    subtitle: '查看无痕模式作用的API列表',
+  ),
+];
diff --git a/lib/pages/setting/models/recommend_settings.dart b/lib/pages/setting/models/recommend_settings.dart
index 056f09350..b26b08184 100644
--- a/lib/pages/setting/models/recommend_settings.dart
+++ b/lib/pages/setting/models/recommend_settings.dart
@@ -9,118 +9,117 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
 List<SettingsModel> get recommendSettings => [
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '首页使用app端推荐',
-        subtitle: '若web端推荐不太符合预期，可尝试切换至app端推荐',
-        leading: const Icon(Icons.model_training_outlined),
-        setKey: SettingBoxKey.appRcmd,
-        defaultVal: true,
-        needReboot: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '推荐动态',
-        subtitle: '是否在推荐内容中展示动态(仅app端)',
-        leading: const Icon(Icons.motion_photos_on_outlined),
-        setKey: SettingBoxKey.enableRcmdDynamic,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '保留首页推荐刷新',
-        subtitle: '下拉刷新时保留上次内容',
-        leading: const Icon(Icons.refresh),
-        setKey: SettingBoxKey.enableSaveLastData,
-        defaultVal: false,
-        onChanged: (value) {
-          try {
-            Get.find<RcmdController>().enableSaveLastData = value;
-          } catch (e) {
-            if (kDebugMode) debugPrint('$e');
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '显示上次看到位置提示',
-        subtitle: '保留上次推荐时，在上次刷新位置显示提示',
-        leading: const Icon(Icons.tips_and_updates_outlined),
-        setKey: SettingBoxKey.savedRcmdTip,
-        defaultVal: true,
-        onChanged: (value) {
-          try {
-            RcmdController ctr = Get.find<RcmdController>()
-              ..savedRcmdTip = value;
-            if (!value) {
-              ctr.lastRefreshAt = null;
-            }
-          } catch (e) {
-            if (kDebugMode) debugPrint('$e');
-          }
-        },
-      ),
-      getVideoFilterSelectModel(
-        context: Get.context!,
-        title: '点赞率',
-        suffix: '%',
-        key: SettingBoxKey.minLikeRatioForRecommend,
-        values: [0, 1, 2, 3, 4],
-        onChanged: (value) => RecommendFilter.minLikeRatioForRecommend = value,
-      ),
-      getBanwordModel(
-        context: Get.context!,
-        title: '标题关键词过滤',
-        key: SettingBoxKey.banWordForRecommend,
-        onChanged: (value) {
-          RecommendFilter.rcmdRegExp = value;
-          RecommendFilter.enableFilter = value.pattern.isNotEmpty;
-        },
-      ),
-      getBanwordModel(
-        context: Get.context!,
-        title: 'App推荐/热门/排行榜: 视频分区关键词过滤',
-        key: SettingBoxKey.banWordForZone,
-        onChanged: (value) {
-          VideoHttp.zoneRegExp = value;
-          VideoHttp.enableFilter = value.pattern.isNotEmpty;
-        },
-      ),
-      getVideoFilterSelectModel(
-        context: Get.context!,
-        title: '视频时长',
-        suffix: 's',
-        key: SettingBoxKey.minDurationForRcmd,
-        values: [0, 30, 60, 90, 120],
-        onChanged: (value) => RecommendFilter.minDurationForRcmd = value,
-      ),
-      getVideoFilterSelectModel(
-        context: Get.context!,
-        title: '播放量',
-        key: SettingBoxKey.minPlayForRcmd,
-        values: [0, 50, 100, 500, 1000],
-        onChanged: (value) => RecommendFilter.minPlayForRcmd = value,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '已关注UP豁免推荐过滤',
-        subtitle: '推荐中已关注用户发布的内容不会被过滤',
-        leading: const Icon(Icons.favorite_border_outlined),
-        setKey: SettingBoxKey.exemptFilterForFollowed,
-        defaultVal: true,
-        onChanged: (value) {
-          RecommendFilter.exemptFilterForFollowed = value;
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '过滤器也应用于相关视频',
-        subtitle: '视频详情页的相关视频也进行过滤¹',
-        leading: const Icon(Icons.explore_outlined),
-        setKey: SettingBoxKey.applyFilterToRelatedVideos,
-        defaultVal: true,
-        onChanged: (value) {
-          RecommendFilter.applyFilterToRelatedVideos = value;
-        },
-      ),
-    ];
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '首页使用app端推荐',
+    subtitle: '若web端推荐不太符合预期，可尝试切换至app端推荐',
+    leading: const Icon(Icons.model_training_outlined),
+    setKey: SettingBoxKey.appRcmd,
+    defaultVal: true,
+    needReboot: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '推荐动态',
+    subtitle: '是否在推荐内容中展示动态(仅app端)',
+    leading: const Icon(Icons.motion_photos_on_outlined),
+    setKey: SettingBoxKey.enableRcmdDynamic,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '保留首页推荐刷新',
+    subtitle: '下拉刷新时保留上次内容',
+    leading: const Icon(Icons.refresh),
+    setKey: SettingBoxKey.enableSaveLastData,
+    defaultVal: false,
+    onChanged: (value) {
+      try {
+        Get.find<RcmdController>().enableSaveLastData = value;
+      } catch (e) {
+        if (kDebugMode) debugPrint('$e');
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '显示上次看到位置提示',
+    subtitle: '保留上次推荐时，在上次刷新位置显示提示',
+    leading: const Icon(Icons.tips_and_updates_outlined),
+    setKey: SettingBoxKey.savedRcmdTip,
+    defaultVal: true,
+    onChanged: (value) {
+      try {
+        RcmdController ctr = Get.find<RcmdController>()..savedRcmdTip = value;
+        if (!value) {
+          ctr.lastRefreshAt = null;
+        }
+      } catch (e) {
+        if (kDebugMode) debugPrint('$e');
+      }
+    },
+  ),
+  getVideoFilterSelectModel(
+    context: Get.context!,
+    title: '点赞率',
+    suffix: '%',
+    key: SettingBoxKey.minLikeRatioForRecommend,
+    values: [0, 1, 2, 3, 4],
+    onChanged: (value) => RecommendFilter.minLikeRatioForRecommend = value,
+  ),
+  getBanwordModel(
+    context: Get.context!,
+    title: '标题关键词过滤',
+    key: SettingBoxKey.banWordForRecommend,
+    onChanged: (value) {
+      RecommendFilter.rcmdRegExp = value;
+      RecommendFilter.enableFilter = value.pattern.isNotEmpty;
+    },
+  ),
+  getBanwordModel(
+    context: Get.context!,
+    title: 'App推荐/热门/排行榜: 视频分区关键词过滤',
+    key: SettingBoxKey.banWordForZone,
+    onChanged: (value) {
+      VideoHttp.zoneRegExp = value;
+      VideoHttp.enableFilter = value.pattern.isNotEmpty;
+    },
+  ),
+  getVideoFilterSelectModel(
+    context: Get.context!,
+    title: '视频时长',
+    suffix: 's',
+    key: SettingBoxKey.minDurationForRcmd,
+    values: [0, 30, 60, 90, 120],
+    onChanged: (value) => RecommendFilter.minDurationForRcmd = value,
+  ),
+  getVideoFilterSelectModel(
+    context: Get.context!,
+    title: '播放量',
+    key: SettingBoxKey.minPlayForRcmd,
+    values: [0, 50, 100, 500, 1000],
+    onChanged: (value) => RecommendFilter.minPlayForRcmd = value,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '已关注UP豁免推荐过滤',
+    subtitle: '推荐中已关注用户发布的内容不会被过滤',
+    leading: const Icon(Icons.favorite_border_outlined),
+    setKey: SettingBoxKey.exemptFilterForFollowed,
+    defaultVal: true,
+    onChanged: (value) {
+      RecommendFilter.exemptFilterForFollowed = value;
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '过滤器也应用于相关视频',
+    subtitle: '视频详情页的相关视频也进行过滤¹',
+    leading: const Icon(Icons.explore_outlined),
+    setKey: SettingBoxKey.applyFilterToRelatedVideos,
+    defaultVal: true,
+    onChanged: (value) {
+      RecommendFilter.applyFilterToRelatedVideos = value;
+    },
+  ),
+];
diff --git a/lib/pages/setting/models/style_settings.dart b/lib/pages/setting/models/style_settings.dart
index 17505e1e1..19faf4633 100644
--- a/lib/pages/setting/models/style_settings.dart
+++ b/lib/pages/setting/models/style_settings.dart
@@ -31,616 +31,619 @@ import 'package:get/get.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
 List<SettingsModel> get styleSettings => [
-      SettingsModel(
-          settingsType: SettingsType.sw1tch,
-          title: '横屏适配',
-          subtitle: '启用横屏布局与逻辑，平板、折叠屏等可开启；建议全屏方向设为【不改变当前方向】',
-          leading: const Icon(Icons.phonelink_outlined),
-          setKey: SettingBoxKey.horizontalScreen,
-          defaultVal: Pref.horizontalScreen,
-          onChanged: (value) {
-            if (value) {
-              autoScreen();
-            } else {
-              AutoOrientation.portraitUpMode();
-            }
-          }),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '改用侧边栏',
-        subtitle: '开启后底栏与顶栏被替换，且相关设置失效',
-        leading: const Icon(Icons.chrome_reader_mode_outlined),
-        setKey: SettingBoxKey.useSideBar,
-        defaultVal: false,
-        needReboot: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: 'App字体字重',
-        subtitle: '点击设置',
-        setKey: SettingBoxKey.appFontWeight,
-        defaultVal: false,
-        onTap: () {
-          showDialog<double>(
-            context: Get.context!,
-            builder: (context) {
-              return SlideDialog(
-                title: 'App字体字重',
-                value: Pref.appFontWeight.toDouble() + 1,
-                min: 1,
-                max: FontWeight.values.length.toDouble(),
-                divisions: FontWeight.values.length - 1,
-              );
-            },
-          ).then((res) async {
-            if (res != null) {
-              await GStorage.setting
-                  .put(SettingBoxKey.appFontWeight, res.toInt() - 1);
-              Get.forceAppUpdate();
-            }
-          });
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '横屏适配',
+    subtitle: '启用横屏布局与逻辑，平板、折叠屏等可开启；建议全屏方向设为【不改变当前方向】',
+    leading: const Icon(Icons.phonelink_outlined),
+    setKey: SettingBoxKey.horizontalScreen,
+    defaultVal: Pref.horizontalScreen,
+    onChanged: (value) {
+      if (value) {
+        autoScreen();
+      } else {
+        AutoOrientation.portraitUpMode();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '改用侧边栏',
+    subtitle: '开启后底栏与顶栏被替换，且相关设置失效',
+    leading: const Icon(Icons.chrome_reader_mode_outlined),
+    setKey: SettingBoxKey.useSideBar,
+    defaultVal: false,
+    needReboot: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: 'App字体字重',
+    subtitle: '点击设置',
+    setKey: SettingBoxKey.appFontWeight,
+    defaultVal: false,
+    onTap: () {
+      showDialog<double>(
+        context: Get.context!,
+        builder: (context) {
+          return SlideDialog(
+            title: 'App字体字重',
+            value: Pref.appFontWeight.toDouble() + 1,
+            min: 1,
+            max: FontWeight.values.length.toDouble(),
+            divisions: FontWeight.values.length - 1,
+          );
         },
-        leading: const Icon(Icons.text_fields),
-        onChanged: (value) {
+      ).then((res) async {
+        if (res != null) {
+          await GStorage.setting.put(
+            SettingBoxKey.appFontWeight,
+            res.toInt() - 1,
+          );
           Get.forceAppUpdate();
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '页面过渡动画',
-        leading: const Icon(Icons.animation),
-        getSubtitle: () => '当前：${CustomGetPage.pageTransition.name}',
-        onTap: (setState) async {
-          Transition? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<Transition>(
-                title: '页面过渡动画',
-                value: CustomGetPage.pageTransition,
-                values: Transition.values.map((e) {
-                  return (e, e.name);
-                }).toList(),
-              );
-            },
-          );
-          if (result != null) {
-            CustomGetPage.pageTransition = result;
-            await GStorage.setting
-                .put(SettingBoxKey.pageTransition, result.index);
-            SmartDialog.showToast('重启生效');
-            setState();
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '优化平板导航栏',
-        leading: const Icon(MdiIcons.soundbar),
-        setKey: SettingBoxKey.optTabletNav,
-        defaultVal: true,
-        needReboot: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: 'MD3样式底栏',
-        subtitle: 'Material You设计规范底栏，关闭可变窄',
-        leading: const Icon(Icons.design_services_outlined),
-        setKey: SettingBoxKey.enableMYBar,
-        defaultVal: true,
-        needReboot: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) async {
-          double? result = await showDialog(
-              context: Get.context!,
-              builder: (context) {
-                return SlideDialog(
-                  title: '列表最大列宽度（默认240dp）',
-                  value: Pref.smallCardWidth,
-                  min: 150.0,
-                  max: 500.0,
-                  divisions: 35,
-                  suffix: 'dp',
-                );
-              });
-          if (result != null) {
-            await GStorage.setting.put(SettingBoxKey.smallCardWidth, result);
-            SmartDialog.showToast('重启生效');
-            setState();
-          }
-        },
-        leading: const Icon(Icons.calendar_view_week_outlined),
-        title: '列表宽度（dp）限制',
-        getSubtitle: () =>
-            '当前:${Pref.smallCardWidth.toInt()}dp，屏幕宽度:${Get.mediaQuery.size.width.toPrecision(2)}dp。宽度越小列数越多。',
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '视频播放页使用深色主题',
-        leading: const Icon(Icons.dark_mode_outlined),
-        setKey: SettingBoxKey.darkVideoPage,
-        defaultVal: false,
-        onChanged: (value) {
-          if (value && MyApp.darkThemeData == null) {
-            Get.forceAppUpdate();
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '播放页移除安全边距',
-        subtitle: '隐藏状态栏、撑满屏幕，但播放控件仍处于安全域内',
-        leading: const Icon(Icons.fit_screen_outlined),
-        setKey: SettingBoxKey.videoPlayerRemoveSafeArea,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '动态页启用瀑布流',
-        subtitle: '关闭会显示为单列',
-        leading: const Icon(Icons.view_array_outlined),
-        setKey: SettingBoxKey.dynamicsWaterfallFlow,
-        defaultVal: true,
-        needReboot: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '动态页UP主显示位置',
-        leading: const Icon(Icons.person_outlined),
-        getSubtitle: () => '当前：${Pref.upPanelPosition.label}',
-        onTap: (setState) async {
-          UpPanelPosition? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<UpPanelPosition>(
-                title: '动态页UP主显示位置',
-                value: Pref.upPanelPosition,
-                values: UpPanelPosition.values.map((e) {
-                  return (e, e.label);
-                }).toList(),
-              );
-            },
-          );
-          if (result != null) {
-            await GStorage.setting
-                .put(SettingBoxKey.upPanelPosition, result.index);
-            SmartDialog.showToast('重启生效');
-            setState();
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '动态页显示所有已关注UP主',
-        leading: const Icon(Icons.people_alt_outlined),
-        setKey: SettingBoxKey.dynamicsShowAllFollowedUp,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '动态页展开正在直播UP列表',
-        leading: const Icon(Icons.live_tv),
-        setKey: SettingBoxKey.expandDynLivePanel,
-        defaultVal: false,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) async {
-          DynamicBadgeMode? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<DynamicBadgeMode>(
-                title: '动态未读标记',
-                value: Pref.dynamicBadgeType,
-                values: DynamicBadgeMode.values.map((e) {
-                  return (e, e.desc);
-                }).toList(),
-              );
-            },
-          );
-          if (result != null) {
-            MainController mainController = Get.put(MainController())
-              ..dynamicBadgeMode = DynamicBadgeMode.values[result.index];
-            if (mainController.dynamicBadgeMode != DynamicBadgeMode.hidden) {
-              mainController.getUnreadDynamic();
-            }
-            await GStorage.setting
-                .put(SettingBoxKey.dynamicBadgeMode, result.index);
-            SmartDialog.showToast('设置成功');
-            setState();
-          }
-        },
-        title: '动态未读标记',
-        leading: const Icon(Icons.motion_photos_on_outlined),
-        getSubtitle: () => '当前标记样式：${Pref.dynamicBadgeType.desc}',
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) async {
-          DynamicBadgeMode? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<DynamicBadgeMode>(
-                title: '消息未读标记',
-                value: Pref.msgBadgeMode,
-                values: DynamicBadgeMode.values.map((e) {
-                  return (e, e.desc);
-                }).toList(),
-              );
-            },
-          );
-          if (result != null) {
-            MainController mainController = Get.put(MainController())
-              ..msgBadgeMode = DynamicBadgeMode.values[result.index];
-            if (mainController.msgBadgeMode != DynamicBadgeMode.hidden) {
-              mainController.queryUnreadMsg(true);
-            } else {
-              mainController.msgUnReadCount.value = '';
-            }
-            await GStorage.setting
-                .put(SettingBoxKey.msgBadgeMode, result.index);
-            SmartDialog.showToast('设置成功');
-            setState();
-          }
-        },
-        title: '消息未读标记',
-        leading: const Icon(MdiIcons.bellBadgeOutline),
-        getSubtitle: () => '当前标记样式：${Pref.msgBadgeMode.desc}',
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) async {
-          final result = await showDialog<Set<MsgUnReadType>>(
-            context: Get.context!,
-            builder: (context) {
-              return MultiSelectDialog<MsgUnReadType>(
-                title: '消息未读类型',
-                initValues: Pref.msgUnReadTypeV2,
-                values: {for (var i in MsgUnReadType.values) i: i.title},
-              );
-            },
-          );
-          if (result != null) {
-            MainController mainController = Get.put(MainController())
-              ..msgUnReadTypes = result;
-            if (mainController.msgBadgeMode != DynamicBadgeMode.hidden) {
-              mainController.queryUnreadMsg();
-            }
-            await GStorage.setting.put(SettingBoxKey.msgUnReadTypeV2,
-                result.map((item) => item.index).toList()..sort());
-            SmartDialog.showToast('设置成功');
-            setState();
-          }
-        },
-        title: '消息未读类型',
-        leading: const Icon(MdiIcons.bellCogOutline),
-        getSubtitle: () =>
-            '当前消息类型：${Pref.msgUnReadTypeV2.map((item) => item.title).join('、')}',
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '首页顶栏收起',
-        subtitle: '首页列表滑动时，收起顶栏',
-        leading: const Icon(Icons.vertical_align_top_outlined),
-        setKey: SettingBoxKey.hideSearchBar,
-        defaultVal: true,
-        needReboot: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '首页底栏收起',
-        subtitle: '首页列表滑动时，收起底栏',
-        leading: const Icon(Icons.vertical_align_bottom_outlined),
-        setKey: SettingBoxKey.hideTabBar,
-        defaultVal: true,
-        needReboot: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '降低收起/展开顶/底栏频率',
-        leading: const Icon(Icons.vertical_distribute),
-        setKey: SettingBoxKey.navSearchStreamDebounce,
-        defaultVal: false,
-        onChanged: (value) {
-          try {
-            Get.find<MainController>().navSearchStreamDebounce = value;
-            Get.forceAppUpdate();
-          } catch (_) {}
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) {
-          _showQualityDialog(
-            context: Get.context!,
-            title: '图片质量',
-            initValue: Pref.picQuality,
-            callback: (picQuality) async {
-              GlobalData().imgQuality = picQuality;
-              await GStorage.setting
-                  .put(SettingBoxKey.defaultPicQa, picQuality);
-              setState();
-            },
+        }
+      });
+    },
+    leading: const Icon(Icons.text_fields),
+    onChanged: (value) {
+      Get.forceAppUpdate();
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '页面过渡动画',
+    leading: const Icon(Icons.animation),
+    getSubtitle: () => '当前：${CustomGetPage.pageTransition.name}',
+    onTap: (setState) async {
+      Transition? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<Transition>(
+            title: '页面过渡动画',
+            value: CustomGetPage.pageTransition,
+            values: Transition.values.map((e) {
+              return (e, e.name);
+            }).toList(),
           );
         },
+      );
+      if (result != null) {
+        CustomGetPage.pageTransition = result;
+        await GStorage.setting.put(SettingBoxKey.pageTransition, result.index);
+        SmartDialog.showToast('重启生效');
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '优化平板导航栏',
+    leading: const Icon(MdiIcons.soundbar),
+    setKey: SettingBoxKey.optTabletNav,
+    defaultVal: true,
+    needReboot: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: 'MD3样式底栏',
+    subtitle: 'Material You设计规范底栏，关闭可变窄',
+    leading: const Icon(Icons.design_services_outlined),
+    setKey: SettingBoxKey.enableMYBar,
+    defaultVal: true,
+    needReboot: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) async {
+      double? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SlideDialog(
+            title: '列表最大列宽度（默认240dp）',
+            value: Pref.smallCardWidth,
+            min: 150.0,
+            max: 500.0,
+            divisions: 35,
+            suffix: 'dp',
+          );
+        },
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.smallCardWidth, result);
+        SmartDialog.showToast('重启生效');
+        setState();
+      }
+    },
+    leading: const Icon(Icons.calendar_view_week_outlined),
+    title: '列表宽度（dp）限制',
+    getSubtitle: () =>
+        '当前:${Pref.smallCardWidth.toInt()}dp，屏幕宽度:${Get.mediaQuery.size.width.toPrecision(2)}dp。宽度越小列数越多。',
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '视频播放页使用深色主题',
+    leading: const Icon(Icons.dark_mode_outlined),
+    setKey: SettingBoxKey.darkVideoPage,
+    defaultVal: false,
+    onChanged: (value) {
+      if (value && MyApp.darkThemeData == null) {
+        Get.forceAppUpdate();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '播放页移除安全边距',
+    subtitle: '隐藏状态栏、撑满屏幕，但播放控件仍处于安全域内',
+    leading: const Icon(Icons.fit_screen_outlined),
+    setKey: SettingBoxKey.videoPlayerRemoveSafeArea,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '动态页启用瀑布流',
+    subtitle: '关闭会显示为单列',
+    leading: const Icon(Icons.view_array_outlined),
+    setKey: SettingBoxKey.dynamicsWaterfallFlow,
+    defaultVal: true,
+    needReboot: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '动态页UP主显示位置',
+    leading: const Icon(Icons.person_outlined),
+    getSubtitle: () => '当前：${Pref.upPanelPosition.label}',
+    onTap: (setState) async {
+      UpPanelPosition? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<UpPanelPosition>(
+            title: '动态页UP主显示位置',
+            value: Pref.upPanelPosition,
+            values: UpPanelPosition.values.map((e) {
+              return (e, e.label);
+            }).toList(),
+          );
+        },
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.upPanelPosition, result.index);
+        SmartDialog.showToast('重启生效');
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '动态页显示所有已关注UP主',
+    leading: const Icon(Icons.people_alt_outlined),
+    setKey: SettingBoxKey.dynamicsShowAllFollowedUp,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '动态页展开正在直播UP列表',
+    leading: const Icon(Icons.live_tv),
+    setKey: SettingBoxKey.expandDynLivePanel,
+    defaultVal: false,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) async {
+      DynamicBadgeMode? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<DynamicBadgeMode>(
+            title: '动态未读标记',
+            value: Pref.dynamicBadgeType,
+            values: DynamicBadgeMode.values.map((e) {
+              return (e, e.desc);
+            }).toList(),
+          );
+        },
+      );
+      if (result != null) {
+        MainController mainController = Get.put(MainController())
+          ..dynamicBadgeMode = DynamicBadgeMode.values[result.index];
+        if (mainController.dynamicBadgeMode != DynamicBadgeMode.hidden) {
+          mainController.getUnreadDynamic();
+        }
+        await GStorage.setting.put(
+          SettingBoxKey.dynamicBadgeMode,
+          result.index,
+        );
+        SmartDialog.showToast('设置成功');
+        setState();
+      }
+    },
+    title: '动态未读标记',
+    leading: const Icon(Icons.motion_photos_on_outlined),
+    getSubtitle: () => '当前标记样式：${Pref.dynamicBadgeType.desc}',
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) async {
+      DynamicBadgeMode? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<DynamicBadgeMode>(
+            title: '消息未读标记',
+            value: Pref.msgBadgeMode,
+            values: DynamicBadgeMode.values.map((e) {
+              return (e, e.desc);
+            }).toList(),
+          );
+        },
+      );
+      if (result != null) {
+        MainController mainController = Get.put(MainController())
+          ..msgBadgeMode = DynamicBadgeMode.values[result.index];
+        if (mainController.msgBadgeMode != DynamicBadgeMode.hidden) {
+          mainController.queryUnreadMsg(true);
+        } else {
+          mainController.msgUnReadCount.value = '';
+        }
+        await GStorage.setting.put(SettingBoxKey.msgBadgeMode, result.index);
+        SmartDialog.showToast('设置成功');
+        setState();
+      }
+    },
+    title: '消息未读标记',
+    leading: const Icon(MdiIcons.bellBadgeOutline),
+    getSubtitle: () => '当前标记样式：${Pref.msgBadgeMode.desc}',
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) async {
+      final result = await showDialog<Set<MsgUnReadType>>(
+        context: Get.context!,
+        builder: (context) {
+          return MultiSelectDialog<MsgUnReadType>(
+            title: '消息未读类型',
+            initValues: Pref.msgUnReadTypeV2,
+            values: {for (var i in MsgUnReadType.values) i: i.title},
+          );
+        },
+      );
+      if (result != null) {
+        MainController mainController = Get.put(MainController())
+          ..msgUnReadTypes = result;
+        if (mainController.msgBadgeMode != DynamicBadgeMode.hidden) {
+          mainController.queryUnreadMsg();
+        }
+        await GStorage.setting.put(
+          SettingBoxKey.msgUnReadTypeV2,
+          result.map((item) => item.index).toList()..sort(),
+        );
+        SmartDialog.showToast('设置成功');
+        setState();
+      }
+    },
+    title: '消息未读类型',
+    leading: const Icon(MdiIcons.bellCogOutline),
+    getSubtitle: () =>
+        '当前消息类型：${Pref.msgUnReadTypeV2.map((item) => item.title).join('、')}',
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '首页顶栏收起',
+    subtitle: '首页列表滑动时，收起顶栏',
+    leading: const Icon(Icons.vertical_align_top_outlined),
+    setKey: SettingBoxKey.hideSearchBar,
+    defaultVal: true,
+    needReboot: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '首页底栏收起',
+    subtitle: '首页列表滑动时，收起底栏',
+    leading: const Icon(Icons.vertical_align_bottom_outlined),
+    setKey: SettingBoxKey.hideTabBar,
+    defaultVal: true,
+    needReboot: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '降低收起/展开顶/底栏频率',
+    leading: const Icon(Icons.vertical_distribute),
+    setKey: SettingBoxKey.navSearchStreamDebounce,
+    defaultVal: false,
+    onChanged: (value) {
+      try {
+        Get.find<MainController>().navSearchStreamDebounce = value;
+        Get.forceAppUpdate();
+      } catch (_) {}
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) {
+      _showQualityDialog(
+        context: Get.context!,
         title: '图片质量',
-        subtitle: '选择合适的图片清晰度，上限100%',
-        leading: const Icon(Icons.image_outlined),
-        getTrailing: () => Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 8.0),
-          child: Text(
-            '${Pref.picQuality}%',
-            style: Get.theme.textTheme.titleSmall,
-          ),
-        ),
-      ),
-      // preview quality
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) {
-          _showQualityDialog(
-            context: Get.context!,
-            title: '查看大图质量',
-            initValue: Pref.previewQ,
-            callback: (picQuality) async {
-              await GStorage.setting
-                  .put(SettingBoxKey.previewQuality, picQuality);
-              setState();
-            },
-          );
+        initValue: Pref.picQuality,
+        callback: (picQuality) async {
+          GlobalData().imgQuality = picQuality;
+          await GStorage.setting.put(SettingBoxKey.defaultPicQa, picQuality);
+          setState();
         },
+      );
+    },
+    title: '图片质量',
+    subtitle: '选择合适的图片清晰度，上限100%',
+    leading: const Icon(Icons.image_outlined),
+    getTrailing: () => Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 8.0),
+      child: Text(
+        '${Pref.picQuality}%',
+        style: Get.theme.textTheme.titleSmall,
+      ),
+    ),
+  ),
+  // preview quality
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) {
+      _showQualityDialog(
+        context: Get.context!,
         title: '查看大图质量',
-        subtitle: '选择合适的图片清晰度，上限100%',
-        leading: const Icon(Icons.image_outlined),
-        getTrailing: () => Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 8.0),
-          child: Text(
-            '${Pref.previewQ}%',
-            style: Get.theme.textTheme.titleSmall,
-          ),
-        ),
+        initValue: Pref.previewQ,
+        callback: (picQuality) async {
+          await GStorage.setting.put(SettingBoxKey.previewQuality, picQuality);
+          setState();
+        },
+      );
+    },
+    title: '查看大图质量',
+    subtitle: '选择合适的图片清晰度，上限100%',
+    leading: const Icon(Icons.image_outlined),
+    getTrailing: () => Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 8.0),
+      child: Text(
+        '${Pref.previewQ}%',
+        style: Get.theme.textTheme.titleSmall,
       ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) async {
-          double? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SlideDialog(
-                title: 'Toast不透明度',
-                value: CustomToast.toastOpacity,
-                min: 0.0,
-                max: 1.0,
-                divisions: 10,
-              );
-            },
+    ),
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) async {
+      double? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SlideDialog(
+            title: 'Toast不透明度',
+            value: CustomToast.toastOpacity,
+            min: 0.0,
+            max: 1.0,
+            divisions: 10,
           );
-          if (result != null) {
-            CustomToast.toastOpacity = result;
-            await GStorage.setting.put(SettingBoxKey.defaultToastOp, result);
-            SmartDialog.showToast('设置成功');
-            setState();
-          }
         },
-        leading: const Icon(Icons.opacity_outlined),
-        title: '气泡提示不透明度',
-        subtitle: '自定义气泡提示(Toast)不透明度',
-        getTrailing: () => Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 8.0),
-          child: Text(
-            CustomToast.toastOpacity.toStringAsFixed(1),
-            style: Get.theme.textTheme.titleSmall,
-          ),
-        ),
+      );
+      if (result != null) {
+        CustomToast.toastOpacity = result;
+        await GStorage.setting.put(SettingBoxKey.defaultToastOp, result);
+        SmartDialog.showToast('设置成功');
+        setState();
+      }
+    },
+    leading: const Icon(Icons.opacity_outlined),
+    title: '气泡提示不透明度',
+    subtitle: '自定义气泡提示(Toast)不透明度',
+    getTrailing: () => Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 8.0),
+      child: Text(
+        CustomToast.toastOpacity.toStringAsFixed(1),
+        style: Get.theme.textTheme.titleSmall,
       ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) async {
-          ThemeType? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<ThemeType>(
-                  title: '主题模式',
-                  value: Pref.themeType,
-                  values: ThemeType.values.map(
-                    (e) {
-                      return (e, e.desc);
-                    },
-                  ).toList());
-            },
+    ),
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) async {
+      ThemeType? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<ThemeType>(
+            title: '主题模式',
+            value: Pref.themeType,
+            values: ThemeType.values.map(
+              (e) {
+                return (e, e.desc);
+              },
+            ).toList(),
           );
-          if (result != null) {
-            try {
-              Get.find<MineController>().themeType.value = result;
-            } catch (_) {}
-            GStorage.setting.put(SettingBoxKey.themeMode, result.index);
-            Get.put(ColorSelectController()).themeType.value = result;
-            Get.changeThemeMode(result.toThemeMode);
-            setState();
-          }
         },
-        leading: const Icon(Icons.flashlight_on_outlined),
-        title: '主题模式',
-        getSubtitle: () => '当前模式：${Pref.themeType.desc}',
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        leading: const Icon(Icons.invert_colors),
-        title: '纯黑主题',
-        setKey: SettingBoxKey.isPureBlackTheme,
-        defaultVal: false,
-        onChanged: (value) {
-          if (Get.theme.brightness == Brightness.dark || Pref.darkVideoPage) {
-            Get.forceAppUpdate();
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) => Get.toNamed('/colorSetting'),
-        leading: const Icon(Icons.color_lens_outlined),
-        title: '应用主题',
-        getSubtitle: () =>
-            '当前主题：${Get.put(ColorSelectController()).type.value == 0 ? '动态取色' : '指定颜色'}',
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) async {
-          int? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<int>(
-                title: '首页启动页',
-                value: Pref.defaultHomePage,
-                values: NavigationBarType.values.map((e) {
-                  return (e.index, e.label);
-                }).toList(),
-              );
-            },
+      );
+      if (result != null) {
+        try {
+          Get.find<MineController>().themeType.value = result;
+        } catch (_) {}
+        GStorage.setting.put(SettingBoxKey.themeMode, result.index);
+        Get.put(ColorSelectController()).themeType.value = result;
+        Get.changeThemeMode(result.toThemeMode);
+        setState();
+      }
+    },
+    leading: const Icon(Icons.flashlight_on_outlined),
+    title: '主题模式',
+    getSubtitle: () => '当前模式：${Pref.themeType.desc}',
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    leading: const Icon(Icons.invert_colors),
+    title: '纯黑主题',
+    setKey: SettingBoxKey.isPureBlackTheme,
+    defaultVal: false,
+    onChanged: (value) {
+      if (Get.theme.brightness == Brightness.dark || Pref.darkVideoPage) {
+        Get.forceAppUpdate();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) => Get.toNamed('/colorSetting'),
+    leading: const Icon(Icons.color_lens_outlined),
+    title: '应用主题',
+    getSubtitle: () =>
+        '当前主题：${Get.put(ColorSelectController()).type.value == 0 ? '动态取色' : '指定颜色'}',
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) async {
+      int? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<int>(
+            title: '首页启动页',
+            value: Pref.defaultHomePage,
+            values: NavigationBarType.values.map((e) {
+              return (e.index, e.label);
+            }).toList(),
           );
-          if (result != null) {
-            await GStorage.setting.put(SettingBoxKey.defaultHomePage, result);
-            SmartDialog.showToast('设置成功，重启生效');
-            setState();
-          }
         },
-        leading: const Icon(Icons.home_outlined),
-        title: '默认启动页',
-        getSubtitle: () =>
-            '当前启动页：${NavigationBarType.values.firstWhere((e) => e.index == Pref.defaultHomePage).label}',
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '滑动动画弹簧参数',
-        leading: const Icon(Icons.chrome_reader_mode_outlined),
-        onTap: (setState) {
-          List<String> springDescription = CustomSpringDescription
-              .springDescription
-              .map((i) => i.toString())
-              .toList();
-          showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return AlertDialog(
-                title: const Text('弹簧参数'),
-                content: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: List.generate(
-                    3,
-                    (index) => TextFormField(
-                      autofocus: index == 0,
-                      initialValue: springDescription[index],
-                      keyboardType:
-                          const TextInputType.numberWithOptions(decimal: true),
-                      onChanged: (value) {
-                        springDescription[index] = value;
-                      },
-                      inputFormatters: [
-                        FilteringTextInputFormatter.allow(RegExp(r'[\d\.]+'))
-                      ],
-                      decoration: InputDecoration(
-                        labelText: const [
-                          'mass',
-                          'stiffness',
-                          'damping'
-                        ][index],
-                      ),
-                    ),
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.defaultHomePage, result);
+        SmartDialog.showToast('设置成功，重启生效');
+        setState();
+      }
+    },
+    leading: const Icon(Icons.home_outlined),
+    title: '默认启动页',
+    getSubtitle: () =>
+        '当前启动页：${NavigationBarType.values.firstWhere((e) => e.index == Pref.defaultHomePage).label}',
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '滑动动画弹簧参数',
+    leading: const Icon(Icons.chrome_reader_mode_outlined),
+    onTap: (setState) {
+      List<String> springDescription = CustomSpringDescription.springDescription
+          .map((i) => i.toString())
+          .toList();
+      showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return AlertDialog(
+            title: const Text('弹簧参数'),
+            content: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: List.generate(
+                3,
+                (index) => TextFormField(
+                  autofocus: index == 0,
+                  initialValue: springDescription[index],
+                  keyboardType: const TextInputType.numberWithOptions(
+                    decimal: true,
+                  ),
+                  onChanged: (value) {
+                    springDescription[index] = value;
+                  },
+                  inputFormatters: [
+                    FilteringTextInputFormatter.allow(RegExp(r'[\d\.]+')),
+                  ],
+                  decoration: InputDecoration(
+                    labelText: const ['mass', 'stiffness', 'damping'][index],
                   ),
                 ),
-                actions: [
-                  TextButton(
-                    onPressed: Get.back,
-                    child: Text(
-                      '取消',
-                      style: TextStyle(
-                        color: Theme.of(context).colorScheme.outline,
-                      ),
-                    ),
+              ),
+            ),
+            actions: [
+              TextButton(
+                onPressed: Get.back,
+                child: Text(
+                  '取消',
+                  style: TextStyle(
+                    color: Theme.of(context).colorScheme.outline,
                   ),
-                  TextButton(
-                    onPressed: () async {
-                      Get.back();
-                      await GStorage.setting.put(
-                        SettingBoxKey.springDescription,
-                        List<double>.generate(
-                          3,
-                          (i) =>
-                              double.tryParse(springDescription[i]) ??
-                              CustomSpringDescription.springDescription[i],
-                        ),
-                      );
-                      SmartDialog.showToast('设置成功，重启生效');
-                      setState();
-                    },
-                    child: const Text('确定'),
-                  )
-                ],
-              );
-            },
+                ),
+              ),
+              TextButton(
+                onPressed: () async {
+                  Get.back();
+                  await GStorage.setting.put(
+                    SettingBoxKey.springDescription,
+                    List<double>.generate(
+                      3,
+                      (i) =>
+                          double.tryParse(springDescription[i]) ??
+                          CustomSpringDescription.springDescription[i],
+                    ),
+                  );
+                  SmartDialog.showToast('设置成功，重启生效');
+                  setState();
+                },
+                child: const Text('确定'),
+              ),
+            ],
           );
         },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) async {
-          var result = await Get.toNamed('/fontSizeSetting');
-          if (result != null) {
-            Get.put(ColorSelectController()).currentTextScale.value = result;
-          }
-        },
-        title: '字体大小',
-        leading: const Icon(Icons.format_size_outlined),
-        getSubtitle: () =>
-            Get.put(ColorSelectController()).currentTextScale.value == 1.0
-                ? '默认'
-                : Get.put(ColorSelectController())
-                    .currentTextScale
-                    .value
-                    .toString(),
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) => Get.toNamed('/barSetting', arguments: {
-          'key': SettingBoxKey.tabBarSort,
-          'defaultBars': HomeTabType.values,
-          'title': '首页标签页'
-        }),
-        title: '首页标签页',
-        subtitle: '删除或调换首页标签页',
-        leading: const Icon(Icons.toc_outlined),
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        onTap: (setState) => Get.toNamed('/barSetting', arguments: {
-          'key': SettingBoxKey.navBarSort,
-          'defaultBars': NavigationBarType.values,
-          'title': 'Navbar'
-        }),
-        title: 'Navbar编辑',
-        subtitle: '删除或调换Navbar',
-        leading: const Icon(Icons.toc_outlined),
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '返回时直接退出',
-        subtitle: '开启后在主页任意tab按返回键都直接退出，关闭则先回到Navbar的第一个tab',
-        leading: const Icon(Icons.exit_to_app_outlined),
-        setKey: SettingBoxKey.directExitOnBack,
-        defaultVal: false,
-        onChanged: (value) {
-          Get.find<MainController>().directExitOnBack = value;
-        },
-      ),
-      if (Platform.isAndroid)
-        SettingsModel(
-          settingsType: SettingsType.normal,
-          onTap: (setState) => Get.toNamed('/displayModeSetting'),
-          title: '屏幕帧率',
-          leading: const Icon(Icons.autofps_select_outlined),
-        ),
-    ];
+      );
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) async {
+      var result = await Get.toNamed('/fontSizeSetting');
+      if (result != null) {
+        Get.put(ColorSelectController()).currentTextScale.value = result;
+      }
+    },
+    title: '字体大小',
+    leading: const Icon(Icons.format_size_outlined),
+    getSubtitle: () =>
+        Get.put(ColorSelectController()).currentTextScale.value == 1.0
+        ? '默认'
+        : Get.put(ColorSelectController()).currentTextScale.value.toString(),
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) => Get.toNamed(
+      '/barSetting',
+      arguments: {
+        'key': SettingBoxKey.tabBarSort,
+        'defaultBars': HomeTabType.values,
+        'title': '首页标签页',
+      },
+    ),
+    title: '首页标签页',
+    subtitle: '删除或调换首页标签页',
+    leading: const Icon(Icons.toc_outlined),
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    onTap: (setState) => Get.toNamed(
+      '/barSetting',
+      arguments: {
+        'key': SettingBoxKey.navBarSort,
+        'defaultBars': NavigationBarType.values,
+        'title': 'Navbar',
+      },
+    ),
+    title: 'Navbar编辑',
+    subtitle: '删除或调换Navbar',
+    leading: const Icon(Icons.toc_outlined),
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '返回时直接退出',
+    subtitle: '开启后在主页任意tab按返回键都直接退出，关闭则先回到Navbar的第一个tab',
+    leading: const Icon(Icons.exit_to_app_outlined),
+    setKey: SettingBoxKey.directExitOnBack,
+    defaultVal: false,
+    onChanged: (value) {
+      Get.find<MainController>().directExitOnBack = value;
+    },
+  ),
+  if (Platform.isAndroid)
+    SettingsModel(
+      settingsType: SettingsType.normal,
+      onTap: (setState) => Get.toNamed('/displayModeSetting'),
+      title: '屏幕帧率',
+      leading: const Icon(Icons.autofps_select_outlined),
+    ),
+];
 
 void _showQualityDialog({
   required BuildContext context,
@@ -651,13 +654,14 @@ void _showQualityDialog({
   showDialog<double>(
     context: context,
     builder: (context) => SlideDialog(
-        value: initValue.toDouble(),
-        title: title,
-        min: 10,
-        max: 100,
-        divisions: 9,
-        suffix: '%',
-        precise: 0),
+      value: initValue.toDouble(),
+      title: title,
+      min: 10,
+      max: 100,
+      divisions: 9,
+      suffix: '%',
+      precise: 0,
+    ),
   ).then((result) {
     if (result != null) {
       SmartDialog.showToast('设置成功');
diff --git a/lib/pages/setting/models/video_settings.dart b/lib/pages/setting/models/video_settings.dart
index a9bd7c799..d441e8148 100644
--- a/lib/pages/setting/models/video_settings.dart
+++ b/lib/pages/setting/models/video_settings.dart
@@ -18,360 +18,367 @@ import 'package:get/get.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
 List<SettingsModel> get videoSettings => [
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '开启硬解',
-        subtitle: '以较低功耗播放视频，若异常卡死请关闭',
-        leading: const Icon(Icons.flash_on_outlined),
-        setKey: SettingBoxKey.enableHA,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '免登录1080P',
-        subtitle: '免登录查看1080P视频',
-        leading: const Icon(Icons.hd_outlined),
-        setKey: SettingBoxKey.p1080,
-        defaultVal: true,
-        onChanged: (value) {
-          VideoHttp.p1080 = value;
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: 'B站定向流量支持',
-        subtitle: '若套餐含B站定向流量，则会自动使用。可查阅运营商的流量记录确认。',
-        leading: const Icon(Icons.perm_data_setting_outlined),
-        getTrailing: () => Transform.scale(
-          alignment: Alignment.centerRight,
-          scale: 0.8,
-          child: Switch(
-            thumbIcon: WidgetStateProperty.resolveWith<Icon?>(
-                (Set<WidgetState> states) {
-              if (states.isNotEmpty && states.first == WidgetState.selected) {
-                return const Icon(Icons.lock_outline_rounded);
-              }
-              return null;
-            }),
-            value: true,
-            onChanged: (_) {},
-          ),
-        ),
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: 'CDN 设置',
-        leading: const Icon(MdiIcons.cloudPlusOutline),
-        getSubtitle: () =>
-            '当前使用：${CDNService.fromCode(VideoUtils.cdnService).desc}，部分 CDN 可能失效，如无法播放请尝试切换',
-        onTap: (setState) async {
-          String? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return const CdnSelectDialog();
-            },
-          );
-          if (result != null) {
-            VideoUtils.cdnService = result;
-            await GStorage.setting.put(SettingBoxKey.CDNService, result);
-            setState();
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '开启硬解',
+    subtitle: '以较低功耗播放视频，若异常卡死请关闭',
+    leading: const Icon(Icons.flash_on_outlined),
+    setKey: SettingBoxKey.enableHA,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '免登录1080P',
+    subtitle: '免登录查看1080P视频',
+    leading: const Icon(Icons.hd_outlined),
+    setKey: SettingBoxKey.p1080,
+    defaultVal: true,
+    onChanged: (value) {
+      VideoHttp.p1080 = value;
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: 'B站定向流量支持',
+    subtitle: '若套餐含B站定向流量，则会自动使用。可查阅运营商的流量记录确认。',
+    leading: const Icon(Icons.perm_data_setting_outlined),
+    getTrailing: () => Transform.scale(
+      alignment: Alignment.centerRight,
+      scale: 0.8,
+      child: Switch(
+        thumbIcon: WidgetStateProperty.resolveWith<Icon?>((
+          Set<WidgetState> states,
+        ) {
+          if (states.isNotEmpty && states.first == WidgetState.selected) {
+            return const Icon(Icons.lock_outline_rounded);
           }
+          return null;
+        }),
+        value: true,
+        onChanged: (_) {},
+      ),
+    ),
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: 'CDN 设置',
+    leading: const Icon(MdiIcons.cloudPlusOutline),
+    getSubtitle: () =>
+        '当前使用：${CDNService.fromCode(VideoUtils.cdnService).desc}，部分 CDN 可能失效，如无法播放请尝试切换',
+    onTap: (setState) async {
+      String? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return const CdnSelectDialog();
         },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: 'CDN 测速',
-        leading: const Icon(Icons.speed),
-        subtitle: '测速通过模拟加载视频实现，注意流量消耗，结果仅供参考',
-        setKey: SettingBoxKey.cdnSpeedTest,
-        defaultVal: true,
-      ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '音频不跟随 CDN 设置',
-        subtitle: '直接采用备用 URL，可解决部分视频无声',
-        leading: const Icon(MdiIcons.musicNotePlus),
-        setKey: SettingBoxKey.disableAudioCDN,
-        defaultVal: true,
-        onChanged: (value) {
-          VideoUtils.disableAudioCDN = value;
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '默认画质',
-        leading: const Icon(Icons.video_settings_outlined),
-        getSubtitle: () =>
-            '当前画质：${VideoQuality.fromCode(Pref.defaultVideoQa).desc}',
-        onTap: (setState) async {
-          int? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<int>(
-                title: '默认画质',
-                value: Pref.defaultVideoQa,
-                values: VideoQuality.values.reversed
-                    .map((e) => (e.code, e.desc))
-                    .toList(),
-              );
-            },
+      );
+      if (result != null) {
+        VideoUtils.cdnService = result;
+        await GStorage.setting.put(SettingBoxKey.CDNService, result);
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: 'CDN 测速',
+    leading: const Icon(Icons.speed),
+    subtitle: '测速通过模拟加载视频实现，注意流量消耗，结果仅供参考',
+    setKey: SettingBoxKey.cdnSpeedTest,
+    defaultVal: true,
+  ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '音频不跟随 CDN 设置',
+    subtitle: '直接采用备用 URL，可解决部分视频无声',
+    leading: const Icon(MdiIcons.musicNotePlus),
+    setKey: SettingBoxKey.disableAudioCDN,
+    defaultVal: true,
+    onChanged: (value) {
+      VideoUtils.disableAudioCDN = value;
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '默认画质',
+    leading: const Icon(Icons.video_settings_outlined),
+    getSubtitle: () =>
+        '当前画质：${VideoQuality.fromCode(Pref.defaultVideoQa).desc}',
+    onTap: (setState) async {
+      int? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<int>(
+            title: '默认画质',
+            value: Pref.defaultVideoQa,
+            values: VideoQuality.values.reversed
+                .map((e) => (e.code, e.desc))
+                .toList(),
           );
-          if (result != null) {
-            await GStorage.setting.put(SettingBoxKey.defaultVideoQa, result);
-            setState();
-          }
         },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '蜂窝网络画质',
-        leading: const Icon(Icons.video_settings_outlined),
-        getSubtitle: () =>
-            '当前画质：${VideoQuality.fromCode(Pref.defaultVideoQaCellular).desc}',
-        onTap: (setState) async {
-          int? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<int>(
-                title: '蜂窝网络画质',
-                value: Pref.defaultVideoQaCellular,
-                values: VideoQuality.values.reversed.map((e) {
-                  return (e.code, e.desc);
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.defaultVideoQa, result);
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '蜂窝网络画质',
+    leading: const Icon(Icons.video_settings_outlined),
+    getSubtitle: () =>
+        '当前画质：${VideoQuality.fromCode(Pref.defaultVideoQaCellular).desc}',
+    onTap: (setState) async {
+      int? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<int>(
+            title: '蜂窝网络画质',
+            value: Pref.defaultVideoQaCellular,
+            values: VideoQuality.values.reversed.map((e) {
+              return (e.code, e.desc);
+            }).toList(),
+          );
+        },
+      );
+      if (result != null) {
+        await GStorage.setting.put(
+          SettingBoxKey.defaultVideoQaCellular,
+          result,
+        );
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '默认音质',
+    leading: const Icon(Icons.music_video_outlined),
+    getSubtitle: () =>
+        '当前音质：${AudioQuality.fromCode(Pref.defaultAudioQa).desc}',
+    onTap: (setState) async {
+      int? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<int>(
+            title: '默认音质',
+            value: Pref.defaultAudioQa,
+            values: AudioQuality.values.reversed
+                .map((e) => (e.code, e.desc))
+                .toList(),
+          );
+        },
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.defaultAudioQa, result);
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '蜂窝网络音质',
+    leading: const Icon(Icons.music_video_outlined),
+    getSubtitle: () =>
+        '当前音质：${AudioQuality.fromCode(Pref.defaultAudioQaCellular).desc}',
+    onTap: (setState) async {
+      int? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<int>(
+            title: '蜂窝网络音质',
+            value: Pref.defaultAudioQaCellular,
+            values: AudioQuality.values.reversed.map((e) {
+              return (e.code, e.desc);
+            }).toList(),
+          );
+        },
+      );
+      if (result != null) {
+        await GStorage.setting.put(
+          SettingBoxKey.defaultAudioQaCellular,
+          result,
+        );
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '直播默认画质',
+    leading: const Icon(Icons.video_settings_outlined),
+    getSubtitle: () =>
+        '当前画质：${LiveQualityExt.fromCode(Pref.liveQuality)!.description}',
+    onTap: (setState) async {
+      int? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<int>(
+            title: '直播默认画质',
+            value: Pref.liveQuality,
+            values: LiveQuality.values
+                .map((e) => (e.code, e.description))
+                .toList(),
+          );
+        },
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.liveQuality, result);
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '蜂窝网络直播默认画质',
+    leading: const Icon(Icons.video_settings_outlined),
+    getSubtitle: () =>
+        '当前画质：${LiveQualityExt.fromCode(Pref.liveQualityCellular)!.description}',
+    onTap: (setState) async {
+      int? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<int>(
+            title: '直播默认画质',
+            value: Pref.liveQualityCellular,
+            values: LiveQuality.values.map((e) {
+              return (e.code, e.description);
+            }).toList(),
+          );
+        },
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.liveQualityCellular, result);
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '首选解码格式',
+    leading: const Icon(Icons.movie_creation_outlined),
+    getSubtitle: () =>
+        '首选解码格式：${VideoDecodeFormatTypeExt.fromCode(Pref.defaultDecode)!.description}，请根据设备支持情况与需求调整',
+    onTap: (setState) async {
+      String? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<String>(
+            title: '默认解码格式',
+            value: Pref.defaultDecode,
+            values: VideoDecodeFormatType.values
+                .map((e) => (e.code, e.description))
+                .toList(),
+          );
+        },
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.defaultDecode, result);
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '次选解码格式',
+    getSubtitle: () =>
+        '非杜比视频次选：${VideoDecodeFormatTypeExt.fromCode(Pref.secondDecode)!.description}，仍无则选择首个提供的解码格式',
+    leading: const Icon(Icons.swap_horizontal_circle_outlined),
+    onTap: (setState) async {
+      String? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<String>(
+            title: '次选解码格式',
+            value: Pref.secondDecode,
+            values: VideoDecodeFormatType.values.map((e) {
+              return (e.code, e.description);
+            }).toList(),
+          );
+        },
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.secondDecode, result);
+        setState();
+      }
+    },
+  ),
+  if (Platform.isAndroid)
+    SettingsModel(
+      settingsType: SettingsType.sw1tch,
+      title: '优先使用 OpenSL ES 输出音频',
+      leading: const Icon(Icons.speaker_outlined),
+      subtitle: '关闭则优先使用AudioTrack输出音频（此项即mpv的--ao），若遇系统音效丢失、无声、音画不同步等问题请尝试关闭。',
+      setKey: SettingBoxKey.useOpenSLES,
+      defaultVal: true,
+    ),
+  SettingsModel(
+    settingsType: SettingsType.sw1tch,
+    title: '扩大缓冲区',
+    leading: const Icon(Icons.storage_outlined),
+    subtitle: '默认缓冲区为视频4MB/直播16MB，开启后为32MB/64MB，加载时间变长',
+    setKey: SettingBoxKey.expandBuffer,
+    defaultVal: false,
+  ),
+  //video-sync
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '视频同步',
+    leading: const Icon(Icons.view_timeline_outlined),
+    getSubtitle: () => '当前：${Pref.videoSync}（此项即mpv的--video-sync）',
+    onTap: (setState) async {
+      String? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<String>(
+            title: '视频同步',
+            value: Pref.videoSync,
+            values:
+                [
+                  'audio',
+                  'display-resample',
+                  'display-resample-vdrop',
+                  'display-resample-desync',
+                  'display-tempo',
+                  'display-vdrop',
+                  'display-adrop',
+                  'display-desync',
+                  'desync',
+                ].map((e) {
+                  return (e, e);
                 }).toList(),
-              );
-            },
           );
-          if (result != null) {
-            await GStorage.setting
-                .put(SettingBoxKey.defaultVideoQaCellular, result);
-            setState();
-          }
         },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '默认音质',
-        leading: const Icon(Icons.music_video_outlined),
-        getSubtitle: () =>
-            '当前音质：${AudioQuality.fromCode(Pref.defaultAudioQa).desc}',
-        onTap: (setState) async {
-          int? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<int>(
-                title: '默认音质',
-                value: Pref.defaultAudioQa,
-                values: AudioQuality.values.reversed
-                    .map((e) => (e.code, e.desc))
-                    .toList(),
-              );
-            },
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.videoSync, result);
+        setState();
+      }
+    },
+  ),
+  SettingsModel(
+    settingsType: SettingsType.normal,
+    title: '硬解模式',
+    leading: const Icon(Icons.memory_outlined),
+    getSubtitle: () => '当前：${Pref.hardwareDecoding}（此项即mpv的--hwdec）',
+    onTap: (setState) async {
+      String? result = await showDialog(
+        context: Get.context!,
+        builder: (context) {
+          return SelectDialog<String>(
+            title: '硬解模式',
+            value: Pref.hardwareDecoding,
+            values: ['auto', 'auto-copy', 'auto-safe', 'no', 'yes'].map((e) {
+              return (e, e);
+            }).toList(),
           );
-          if (result != null) {
-            await GStorage.setting.put(SettingBoxKey.defaultAudioQa, result);
-            setState();
-          }
         },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '蜂窝网络音质',
-        leading: const Icon(Icons.music_video_outlined),
-        getSubtitle: () =>
-            '当前音质：${AudioQuality.fromCode(Pref.defaultAudioQaCellular).desc}',
-        onTap: (setState) async {
-          int? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<int>(
-                title: '蜂窝网络音质',
-                value: Pref.defaultAudioQaCellular,
-                values: AudioQuality.values.reversed.map((e) {
-                  return (e.code, e.desc);
-                }).toList(),
-              );
-            },
-          );
-          if (result != null) {
-            await GStorage.setting
-                .put(SettingBoxKey.defaultAudioQaCellular, result);
-            setState();
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '直播默认画质',
-        leading: const Icon(Icons.video_settings_outlined),
-        getSubtitle: () =>
-            '当前画质：${LiveQualityExt.fromCode(Pref.liveQuality)!.description}',
-        onTap: (setState) async {
-          int? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<int>(
-                title: '直播默认画质',
-                value: Pref.liveQuality,
-                values: LiveQuality.values
-                    .map((e) => (e.code, e.description))
-                    .toList(),
-              );
-            },
-          );
-          if (result != null) {
-            await GStorage.setting.put(SettingBoxKey.liveQuality, result);
-            setState();
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '蜂窝网络直播默认画质',
-        leading: const Icon(Icons.video_settings_outlined),
-        getSubtitle: () =>
-            '当前画质：${LiveQualityExt.fromCode(Pref.liveQualityCellular)!.description}',
-        onTap: (setState) async {
-          int? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<int>(
-                title: '直播默认画质',
-                value: Pref.liveQualityCellular,
-                values: LiveQuality.values.map((e) {
-                  return (e.code, e.description);
-                }).toList(),
-              );
-            },
-          );
-          if (result != null) {
-            await GStorage.setting
-                .put(SettingBoxKey.liveQualityCellular, result);
-            setState();
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '首选解码格式',
-        leading: const Icon(Icons.movie_creation_outlined),
-        getSubtitle: () =>
-            '首选解码格式：${VideoDecodeFormatTypeExt.fromCode(Pref.defaultDecode)!.description}，请根据设备支持情况与需求调整',
-        onTap: (setState) async {
-          String? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<String>(
-                  title: '默认解码格式',
-                  value: Pref.defaultDecode,
-                  values: VideoDecodeFormatType.values
-                      .map((e) => (e.code, e.description))
-                      .toList());
-            },
-          );
-          if (result != null) {
-            await GStorage.setting.put(SettingBoxKey.defaultDecode, result);
-            setState();
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '次选解码格式',
-        getSubtitle: () =>
-            '非杜比视频次选：${VideoDecodeFormatTypeExt.fromCode(Pref.secondDecode)!.description}，仍无则选择首个提供的解码格式',
-        leading: const Icon(Icons.swap_horizontal_circle_outlined),
-        onTap: (setState) async {
-          String? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<String>(
-                  title: '次选解码格式',
-                  value: Pref.secondDecode,
-                  values: VideoDecodeFormatType.values.map((e) {
-                    return (e.code, e.description);
-                  }).toList());
-            },
-          );
-          if (result != null) {
-            await GStorage.setting.put(SettingBoxKey.secondDecode, result);
-            setState();
-          }
-        },
-      ),
-      if (Platform.isAndroid)
-        SettingsModel(
-          settingsType: SettingsType.sw1tch,
-          title: '优先使用 OpenSL ES 输出音频',
-          leading: const Icon(Icons.speaker_outlined),
-          subtitle:
-              '关闭则优先使用AudioTrack输出音频（此项即mpv的--ao），若遇系统音效丢失、无声、音画不同步等问题请尝试关闭。',
-          setKey: SettingBoxKey.useOpenSLES,
-          defaultVal: true,
-        ),
-      SettingsModel(
-        settingsType: SettingsType.sw1tch,
-        title: '扩大缓冲区',
-        leading: const Icon(Icons.storage_outlined),
-        subtitle: '默认缓冲区为视频4MB/直播16MB，开启后为32MB/64MB，加载时间变长',
-        setKey: SettingBoxKey.expandBuffer,
-        defaultVal: false,
-      ),
-      //video-sync
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '视频同步',
-        leading: const Icon(Icons.view_timeline_outlined),
-        getSubtitle: () => '当前：${Pref.videoSync}（此项即mpv的--video-sync）',
-        onTap: (setState) async {
-          String? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<String>(
-                  title: '视频同步',
-                  value: Pref.videoSync,
-                  values: [
-                    'audio',
-                    'display-resample',
-                    'display-resample-vdrop',
-                    'display-resample-desync',
-                    'display-tempo',
-                    'display-vdrop',
-                    'display-adrop',
-                    'display-desync',
-                    'desync'
-                  ].map((e) {
-                    return (e, e);
-                  }).toList());
-            },
-          );
-          if (result != null) {
-            await GStorage.setting.put(SettingBoxKey.videoSync, result);
-            setState();
-          }
-        },
-      ),
-      SettingsModel(
-        settingsType: SettingsType.normal,
-        title: '硬解模式',
-        leading: const Icon(Icons.memory_outlined),
-        getSubtitle: () => '当前：${Pref.hardwareDecoding}（此项即mpv的--hwdec）',
-        onTap: (setState) async {
-          String? result = await showDialog(
-            context: Get.context!,
-            builder: (context) {
-              return SelectDialog<String>(
-                  title: '硬解模式',
-                  value: Pref.hardwareDecoding,
-                  values:
-                      ['auto', 'auto-copy', 'auto-safe', 'no', 'yes'].map((e) {
-                    return (e, e);
-                  }).toList());
-            },
-          );
-          if (result != null) {
-            await GStorage.setting.put(SettingBoxKey.hardwareDecoding, result);
-            setState();
-          }
-        },
-      ),
-    ];
+      );
+      if (result != null) {
+        await GStorage.setting.put(SettingBoxKey.hardwareDecoding, result);
+        setState();
+      }
+    },
+  ),
+];
diff --git a/lib/pages/setting/pages/bar_set.dart b/lib/pages/setting/pages/bar_set.dart
index 18a641e56..b57ad34a1 100644
--- a/lib/pages/setting/pages/bar_set.dart
+++ b/lib/pages/setting/pages/bar_set.dart
@@ -62,7 +62,7 @@ class _BarSetPageState extends State<BarSetPage> {
         title: Text('$title编辑'),
         actions: [
           TextButton(onPressed: saveEdit, child: const Text('保存')),
-          const SizedBox(width: 12)
+          const SizedBox(width: 12),
         ],
       ),
       body: ReorderableListView(
@@ -70,23 +70,27 @@ class _BarSetPageState extends State<BarSetPage> {
         footer: SizedBox(
           height: MediaQuery.paddingOf(context).bottom + 30,
           child: const Align(
-              alignment: Alignment.centerRight, child: Text('*长按拖动排序        ')),
+            alignment: Alignment.centerRight,
+            child: Text('*长按拖动排序        '),
+          ),
         ),
         children: defaultBars
-            .map((i) => CheckboxListTile(
-                  key: Key(i.label),
-                  value: barIndex.containsKey(i.index),
-                  onChanged: (bool? value) {
-                    if (value!) {
-                      barIndex[i.index] = -1;
-                    } else {
-                      barIndex.remove(i.index);
-                    }
-                    setState(() {});
-                  },
-                  title: Text(i.label),
-                  secondary: const Icon(Icons.drag_indicator_rounded),
-                ))
+            .map(
+              (i) => CheckboxListTile(
+                key: Key(i.label),
+                value: barIndex.containsKey(i.index),
+                onChanged: (bool? value) {
+                  if (value!) {
+                    barIndex[i.index] = -1;
+                  } else {
+                    barIndex.remove(i.index);
+                  }
+                  setState(() {});
+                },
+                title: Text(i.label),
+                secondary: const Icon(Icons.drag_indicator_rounded),
+              ),
+            )
             .toList(),
       ),
     );
diff --git a/lib/pages/setting/pages/color_select.dart b/lib/pages/setting/pages/color_select.dart
index b08c353bc..d249bade4 100644
--- a/lib/pages/setting/pages/color_select.dart
+++ b/lib/pages/setting/pages/color_select.dart
@@ -50,8 +50,9 @@ class _ColorSelectPageState extends State<ColorSelectPage> {
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     TextStyle titleStyle = theme.textTheme.titleMedium!;
-    TextStyle subTitleStyle =
-        theme.textTheme.labelMedium!.copyWith(color: theme.colorScheme.outline);
+    TextStyle subTitleStyle = theme.textTheme.labelMedium!.copyWith(
+      color: theme.colorScheme.outline,
+    );
     return Scaffold(
       appBar: AppBar(title: const Text('选择应用主题')),
       body: SafeArea(
@@ -64,10 +65,10 @@ class _ColorSelectPageState extends State<ColorSelectPage> {
                   context: context,
                   builder: (context) {
                     return SelectDialog<ThemeType>(
-                        title: '主题模式',
-                        value: ctr.themeType.value,
-                        values:
-                            ThemeType.values.map((e) => (e, e.desc)).toList());
+                      title: '主题模式',
+                      value: ctr.themeType.value,
+                      values: ThemeType.values.map((e) => (e, e.desc)).toList(),
+                    );
                   },
                 );
                 if (result != null) {
@@ -85,8 +86,12 @@ class _ColorSelectPageState extends State<ColorSelectPage> {
                 child: const Icon(Icons.flashlight_on_outlined),
               ),
               title: Text('主题模式', style: titleStyle),
-              subtitle: Obx(() => Text('当前模式：${ctr.themeType.value.desc}',
-                  style: subTitleStyle)),
+              subtitle: Obx(
+                () => Text(
+                  '当前模式：${ctr.themeType.value.desc}',
+                  style: subTitleStyle,
+                ),
+              ),
             ),
             Obx(
               () => ListTile(
@@ -100,15 +105,19 @@ class _ColorSelectPageState extends State<ColorSelectPage> {
                       initialValue: _dynamicSchemeVariant,
                       onSelected: (item) {
                         _dynamicSchemeVariant = item;
-                        GStorage.setting
-                            .put(SettingBoxKey.schemeVariant, item.index);
+                        GStorage.setting.put(
+                          SettingBoxKey.schemeVariant,
+                          item.index,
+                        );
                         Get.forceAppUpdate();
                       },
                       itemBuilder: (context) => FlexSchemeVariant.values
-                          .map((item) => PopupMenuItem<FlexSchemeVariant>(
-                                value: item,
-                                child: Text(item.variantName),
-                              ))
+                          .map(
+                            (item) => PopupMenuItem<FlexSchemeVariant>(
+                              value: item,
+                              child: Text(item.variantName),
+                            ),
+                          )
                           .toList(),
                       child: Row(
                         mainAxisSize: MainAxisSize.min,
@@ -119,8 +128,9 @@ class _ColorSelectPageState extends State<ColorSelectPage> {
                               height: 1,
                               fontSize: 13,
                               color: ctr.type.value == 0
-                                  ? theme.colorScheme.outline
-                                      .withValues(alpha: 0.8)
+                                  ? theme.colorScheme.outline.withValues(
+                                      alpha: 0.8,
+                                    )
                                   : theme.colorScheme.secondary,
                             ),
                             strutStyle: const StrutStyle(leading: 0, height: 1),
@@ -129,10 +139,11 @@ class _ColorSelectPageState extends State<ColorSelectPage> {
                             size: 20,
                             Icons.keyboard_arrow_right,
                             color: ctr.type.value == 0
-                                ? theme.colorScheme.outline
-                                    .withValues(alpha: 0.8)
+                                ? theme.colorScheme.outline.withValues(
+                                    alpha: 0.8,
+                                  )
                                 : theme.colorScheme.secondary,
-                          )
+                          ),
                         ],
                       ),
                     ),
diff --git a/lib/pages/setting/pages/display_mode.dart b/lib/pages/setting/pages/display_mode.dart
index e9294d6b0..ad1e47dc3 100644
--- a/lib/pages/setting/pages/display_mode.dart
+++ b/lib/pages/setting/pages/display_mode.dart
@@ -86,10 +86,13 @@ class _SetDisplayModeState extends State<SetDisplayMode> {
                         : Text('$mode${mode == active ? '  [系统]' : ''}'),
                     groupValue: preferred,
                     onChanged: (DisplayMode? newMode) {
-                      FlutterDisplayMode.setPreferredMode(newMode!)
-                          .whenComplete(() =>
-                              Future.delayed(const Duration(milliseconds: 100))
-                                  .whenComplete(fetchAll));
+                      FlutterDisplayMode.setPreferredMode(
+                        newMode!,
+                      ).whenComplete(
+                        () => Future.delayed(
+                          const Duration(milliseconds: 100),
+                        ).whenComplete(fetchAll),
+                      );
                     },
                   );
                 },
diff --git a/lib/pages/setting/pages/font_size_select.dart b/lib/pages/setting/pages/font_size_select.dart
index 7cbbaa274..78a2f6a5e 100644
--- a/lib/pages/setting/pages/font_size_select.dart
+++ b/lib/pages/setting/pages/font_size_select.dart
@@ -31,13 +31,14 @@ class _FontSizeSelectPageState extends State<FontSizeSelectPage> {
       appBar: AppBar(
         actions: [
           TextButton(
-              onPressed: () {
-                currentSize = 1.0;
-                setFontSize();
-              },
-              child: const Text('重置')),
+            onPressed: () {
+              currentSize = 1.0;
+              setFontSize();
+            },
+            child: const Text('重置'),
+          ),
           TextButton(onPressed: setFontSize, child: const Text('确定')),
-          const SizedBox(width: 12)
+          const SizedBox(width: 12),
         ],
       ),
       body: SafeArea(
@@ -56,9 +57,10 @@ class _FontSizeSelectPageState extends State<FontSizeSelectPage> {
               padding: const EdgeInsets.all(20),
               decoration: BoxDecoration(
                 border: Border(
-                    top: BorderSide(
-                        color:
-                            theme.colorScheme.primary.withValues(alpha: 0.3))),
+                  top: BorderSide(
+                    color: theme.colorScheme.primary.withValues(alpha: 0.3),
+                  ),
+                ),
                 color: theme.colorScheme.surface,
               ),
               child: Row(
@@ -84,7 +86,7 @@ class _FontSizeSelectPageState extends State<FontSizeSelectPage> {
                   ),
                 ],
               ),
-            )
+            ),
           ],
         ),
       ),
diff --git a/lib/pages/setting/pages/logs.dart b/lib/pages/setting/pages/logs.dart
index 209fbe1ff..1d4de6bb5 100644
--- a/lib/pages/setting/pages/logs.dart
+++ b/lib/pages/setting/pages/logs.dart
@@ -54,8 +54,9 @@ class _LogsPageState extends State<LogsPage> {
     List contentList = fileContent.split(splitToken).map((item) {
       return item
           .replaceAll(
-              '============================== CATCHER 2 LOG ==============================',
-              'PiliPlus错误日志\n********************')
+            '============================== CATCHER 2 LOG ==============================',
+            'PiliPlus错误日志\n********************',
+          )
           .replaceAll('DEVICE INFO', '设备信息')
           .replaceAll('APP INFO', '应用信息')
           .replaceAll('ERROR', '错误信息')
@@ -129,7 +130,8 @@ class _LogsPageState extends State<LogsPage> {
                   break;
                 case 'feedback':
                   PageUtils.launchURL(
-                      'https://github.com/bggRGjQaUbCoE/PiliPlus/issues');
+                    'https://github.com/bggRGjQaUbCoE/PiliPlus/issues',
+                  );
                   break;
                 case 'clear':
                   clearLogsHandle();
@@ -185,10 +187,9 @@ class _LogsPageState extends State<LogsPage> {
                             Text(
                               log['date'].toString(),
                               style: TextStyle(
-                                fontSize: Theme.of(context)
-                                    .textTheme
-                                    .titleMedium!
-                                    .fontSize,
+                                fontSize: Theme.of(
+                                  context,
+                                ).textTheme.titleMedium!.fontSize,
                               ),
                             ),
                             TextButton.icon(
@@ -197,8 +198,10 @@ class _LogsPageState extends State<LogsPage> {
                                 visualDensity: VisualDensity.compact,
                               ),
                               onPressed: () {
-                                Utils.copyText('```\n${log['body']}\n```',
-                                    needToast: false);
+                                Utils.copyText(
+                                  '```\n${log['body']}\n```',
+                                  needToast: false,
+                                );
                                 if (context.mounted) {
                                   ScaffoldMessenger.of(context).showSnackBar(
                                     SnackBar(
@@ -211,7 +214,7 @@ class _LogsPageState extends State<LogsPage> {
                               },
                               icon: const Icon(Icons.copy_outlined, size: 16),
                               label: const Text('复制'),
-                            )
+                            ),
                           ],
                         ),
                         Card(
diff --git a/lib/pages/setting/pages/play_speed_set.dart b/lib/pages/setting/pages/play_speed_set.dart
index bfa353cc4..427a4c4db 100644
--- a/lib/pages/setting/pages/play_speed_set.dart
+++ b/lib/pages/setting/pages/play_speed_set.dart
@@ -65,8 +65,9 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
               const SizedBox(height: 12),
               TextField(
                 autofocus: true,
-                keyboardType:
-                    const TextInputType.numberWithOptions(decimal: true),
+                keyboardType: const TextInputType.numberWithOptions(
+                  decimal: true,
+                ),
                 decoration: const InputDecoration(
                   labelText: '自定义倍速',
                   border: OutlineInputBorder(
@@ -106,7 +107,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
                 }
               },
               child: const Text('确认'),
-            )
+            ),
           ],
         );
       },
@@ -130,8 +131,9 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
             const SizedBox(height: 10),
             ...sheetMenu.map(
               (item) => ListTile(
-                enabled:
-                    enableAutoLongPressSpeed && item.id == 2 ? false : true,
+                enabled: enableAutoLongPressSpeed && item.id == 2
+                    ? false
+                    : true,
                 onTap: () {
                   Get.back();
                   menuAction(index, item.id);
@@ -202,8 +204,12 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
         child: ListView(
           children: [
             Padding(
-              padding:
-                  const EdgeInsets.only(left: 14, right: 14, top: 6, bottom: 0),
+              padding: const EdgeInsets.only(
+                left: 14,
+                right: 14,
+                top: 6,
+                bottom: 0,
+              ),
               child: Text(
                 '点击下方按钮设置默认（长按）倍速',
                 style: TextStyle(color: theme.colorScheme.outline),
diff --git a/lib/pages/setting/privacy_setting.dart b/lib/pages/setting/privacy_setting.dart
index e9faf1095..8f4490b7f 100644
--- a/lib/pages/setting/privacy_setting.dart
+++ b/lib/pages/setting/privacy_setting.dart
@@ -17,8 +17,9 @@ class _PrivacySettingState extends State<PrivacySetting> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar:
-          widget.showAppBar == false ? null : AppBar(title: const Text('隐私设置')),
+      appBar: widget.showAppBar == false
+          ? null
+          : AppBar(title: const Text('隐私设置')),
       body: ListView(
         padding: EdgeInsets.only(
           bottom: MediaQuery.paddingOf(context).bottom + 80,
diff --git a/lib/pages/setting/recommend_setting.dart b/lib/pages/setting/recommend_setting.dart
index c7ed2505f..479b8b9ca 100644
--- a/lib/pages/setting/recommend_setting.dart
+++ b/lib/pages/setting/recommend_setting.dart
@@ -45,7 +45,8 @@ class _RecommendSettingState extends State<RecommendSetting> {
               '* 设定较严苛的条件可导致推荐项数锐减或多次请求，请酌情选择。\n'
               '* 后续可能会增加更多过滤条件，敬请期待。',
               style: theme.textTheme.labelSmall!.copyWith(
-                  color: theme.colorScheme.outline.withValues(alpha: 0.7)),
+                color: theme.colorScheme.outline.withValues(alpha: 0.7),
+              ),
             ),
           ),
         ],
diff --git a/lib/pages/setting/slide_color_picker.dart b/lib/pages/setting/slide_color_picker.dart
index 5a73fe951..0dd75882f 100644
--- a/lib/pages/setting/slide_color_picker.dart
+++ b/lib/pages/setting/slide_color_picker.dart
@@ -40,11 +40,12 @@ class _SlideColorPickerState extends State<SlideColorPicker> {
     super.dispose();
   }
 
-  String get _convert => Color.fromARGB(255, _r, _g, _b)
-      .value
-      .toRadixString(16)
-      .substring(2)
-      .toUpperCase();
+  String get _convert => Color.fromARGB(
+    255,
+    _r,
+    _g,
+    _b,
+  ).value.toRadixString(16).substring(2).toUpperCase();
 
   Widget _slider({
     required String title,
@@ -113,8 +114,9 @@ class _SlideColorPickerState extends State<SlideColorPicker> {
               onChanged: (value) {
                 _textController.text = value.toUpperCase();
                 if (value.length == 6) {
-                  Color color =
-                      Color(int.tryParse('FF$value', radix: 16) ?? 0xFF000000);
+                  Color color = Color(
+                    int.tryParse('FF$value', radix: 16) ?? 0xFF000000,
+                  );
                   setState(() {
                     _r = color.red;
                     _g = color.green;
@@ -185,7 +187,7 @@ class _SlideColorPickerState extends State<SlideColorPicker> {
               ),
               const SizedBox(width: 16),
             ],
-          )
+          ),
         ],
       ),
     );
diff --git a/lib/pages/setting/style_setting.dart b/lib/pages/setting/style_setting.dart
index c81f3e73c..a8077ff0b 100644
--- a/lib/pages/setting/style_setting.dart
+++ b/lib/pages/setting/style_setting.dart
@@ -17,8 +17,9 @@ class _StyleSettingState extends State<StyleSetting> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar:
-          widget.showAppBar == false ? null : AppBar(title: const Text('外观设置')),
+      appBar: widget.showAppBar == false
+          ? null
+          : AppBar(title: const Text('外观设置')),
       body: ListView(
         padding: EdgeInsets.only(
           bottom: MediaQuery.paddingOf(context).bottom + 80,
diff --git a/lib/pages/setting/view.dart b/lib/pages/setting/view.dart
index d964d6085..ecac7fe68 100644
--- a/lib/pages/setting/view.dart
+++ b/lib/pages/setting/view.dart
@@ -136,21 +136,24 @@ class _SettingPageState extends State<SettingPage> {
                     removeLeft: true,
                     removeTop: true,
                     child: switch (_type) {
-                      'privacySetting' =>
-                        const PrivacySetting(showAppBar: false),
-                      'recommendSetting' =>
-                        const RecommendSetting(showAppBar: false),
+                      'privacySetting' => const PrivacySetting(
+                        showAppBar: false,
+                      ),
+                      'recommendSetting' => const RecommendSetting(
+                        showAppBar: false,
+                      ),
                       'videoSetting' => const VideoSetting(showAppBar: false),
                       'playSetting' => const PlaySetting(showAppBar: false),
                       'styleSetting' => const StyleSetting(showAppBar: false),
                       'extraSetting' => const ExtraSetting(showAppBar: false),
-                      'webdavSetting' =>
-                        const WebDavSettingPage(showAppBar: false),
+                      'webdavSetting' => const WebDavSettingPage(
+                        showAppBar: false,
+                      ),
                       'about' => const AboutPage(showAppBar: false),
                       _ => const SizedBox.shrink(),
                     },
                   ),
-                )
+                ),
               ],
             ),
     );
@@ -175,12 +178,15 @@ class _SettingPageState extends State<SettingPage> {
 
   Widget _buildList(ThemeData theme) {
     TextStyle titleStyle = theme.textTheme.titleMedium!;
-    TextStyle subTitleStyle =
-        theme.textTheme.labelMedium!.copyWith(color: theme.colorScheme.outline);
+    TextStyle subTitleStyle = theme.textTheme.labelMedium!.copyWith(
+      color: theme.colorScheme.outline,
+    );
     return ListView(
       children: [
         _buildSearchItem(theme),
-        ..._items.sublist(0, _items.length - 1).map(
+        ..._items
+            .sublist(0, _items.length - 1)
+            .map(
               (item) => ListTile(
                 tileColor: _getTileColor(theme, item.name),
                 onTap: () => _toPage(item.name),
@@ -234,84 +240,86 @@ class _SettingPageState extends State<SettingPage> {
     }
 
     showDialog(
-        context: context,
-        builder: (context) {
-          final theme = Theme.of(context);
-          return AlertDialog(
-            title: const Text('提示'),
-            content: Text(
-                "确认要退出以下账号登录吗\n\n${result!.map((i) => i.mid.toString()).join('\n')}"),
-            actions: [
-              TextButton(
-                onPressed: Get.back,
-                child: Text(
-                  '点错了',
-                  style: TextStyle(
-                    color: theme.colorScheme.outline,
-                  ),
-                ),
-              ),
-              TextButton(
-                onPressed: () {
-                  Get.back();
-                  logout();
-                },
-                child: Text(
-                  '仅登出',
-                  style: TextStyle(color: theme.colorScheme.error),
-                ),
-              ),
-              TextButton(
-                onPressed: () async {
-                  SmartDialog.showLoading();
-                  final res = await LoginHttp.logout(Accounts.main);
-                  if (res['status']) {
-                    SmartDialog.dismiss();
-                    logout();
-                    Get.back();
-                  } else {
-                    SmartDialog.dismiss();
-                    SmartDialog.showToast(res['msg'].toString());
-                  }
-                },
-                child: const Text('确认'),
-              )
-            ],
-          );
-        });
-  }
-
-  Widget _buildSearchItem(ThemeData theme) => Padding(
-        padding: EdgeInsets.only(
-          left: 16 + MediaQuery.paddingOf(context).left,
-          right: 16,
-          bottom: 8,
-        ),
-        child: Material(
-          type: MaterialType.transparency,
-          child: InkWell(
-            onTap: () => Get.toNamed('/settingsSearch'),
-            borderRadius: const BorderRadius.all(Radius.circular(50)),
-            child: Ink(
-              padding: const EdgeInsets.symmetric(vertical: 6),
-              decoration: BoxDecoration(
-                borderRadius: const BorderRadius.all(Radius.circular(50)),
-                color: theme.colorScheme.onInverseSurface,
-              ),
-              child: Center(
-                child: Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Icon(
-                      size: MediaQuery.textScalerOf(context).scale(18),
-                      Icons.search,
-                    ),
-                    const Text(' 搜索'),
-                  ],
+      context: context,
+      builder: (context) {
+        final theme = Theme.of(context);
+        return AlertDialog(
+          title: const Text('提示'),
+          content: Text(
+            "确认要退出以下账号登录吗\n\n${result!.map((i) => i.mid.toString()).join('\n')}",
+          ),
+          actions: [
+            TextButton(
+              onPressed: Get.back,
+              child: Text(
+                '点错了',
+                style: TextStyle(
+                  color: theme.colorScheme.outline,
                 ),
               ),
             ),
+            TextButton(
+              onPressed: () {
+                Get.back();
+                logout();
+              },
+              child: Text(
+                '仅登出',
+                style: TextStyle(color: theme.colorScheme.error),
+              ),
+            ),
+            TextButton(
+              onPressed: () async {
+                SmartDialog.showLoading();
+                final res = await LoginHttp.logout(Accounts.main);
+                if (res['status']) {
+                  SmartDialog.dismiss();
+                  logout();
+                  Get.back();
+                } else {
+                  SmartDialog.dismiss();
+                  SmartDialog.showToast(res['msg'].toString());
+                }
+              },
+              child: const Text('确认'),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget _buildSearchItem(ThemeData theme) => Padding(
+    padding: EdgeInsets.only(
+      left: 16 + MediaQuery.paddingOf(context).left,
+      right: 16,
+      bottom: 8,
+    ),
+    child: Material(
+      type: MaterialType.transparency,
+      child: InkWell(
+        onTap: () => Get.toNamed('/settingsSearch'),
+        borderRadius: const BorderRadius.all(Radius.circular(50)),
+        child: Ink(
+          padding: const EdgeInsets.symmetric(vertical: 6),
+          decoration: BoxDecoration(
+            borderRadius: const BorderRadius.all(Radius.circular(50)),
+            color: theme.colorScheme.onInverseSurface,
+          ),
+          child: Center(
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Icon(
+                  size: MediaQuery.textScalerOf(context).scale(18),
+                  Icons.search,
+                ),
+                const Text(' 搜索'),
+              ],
+            ),
           ),
         ),
-      );
+      ),
+    ),
+  );
 }
diff --git a/lib/pages/setting/widgets/multi_select_dialog.dart b/lib/pages/setting/widgets/multi_select_dialog.dart
index 62b12f920..482a85d50 100644
--- a/lib/pages/setting/widgets/multi_select_dialog.dart
+++ b/lib/pages/setting/widgets/multi_select_dialog.dart
@@ -6,11 +6,12 @@ class MultiSelectDialog<T> extends StatefulWidget {
   final String title;
   final Map<T, String> values;
 
-  const MultiSelectDialog(
-      {super.key,
-      required this.initValues,
-      required this.values,
-      required this.title});
+  const MultiSelectDialog({
+    super.key,
+    required this.initValues,
+    required this.values,
+    required this.title,
+  });
 
   @override
   State<MultiSelectDialog<T>> createState() => _MultiSelectDialogState<T>();
@@ -32,31 +33,33 @@ class _MultiSelectDialogState<T> extends State<MultiSelectDialog<T>> {
       clipBehavior: Clip.hardEdge,
       title: Text(widget.title),
       contentPadding: const EdgeInsets.only(top: 12),
-      content: StatefulBuilder(builder: (context, StateSetter setState) {
-        return SingleChildScrollView(
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: widget.values.entries.map((i) {
-              bool isChecked = _tempValues.contains(i.key);
-              return CheckboxListTile(
-                dense: true,
-                value: isChecked,
-                controlAffinity: ListTileControlAffinity.leading,
-                title: Text(
-                  i.value,
-                  style: theme.textTheme.titleMedium!,
-                ),
-                onChanged: (value) {
-                  isChecked
-                      ? _tempValues.remove(i.key)
-                      : _tempValues.add(i.key);
-                  setState(() {});
-                },
-              );
-            }).toList(),
-          ),
-        );
-      }),
+      content: StatefulBuilder(
+        builder: (context, StateSetter setState) {
+          return SingleChildScrollView(
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: widget.values.entries.map((i) {
+                bool isChecked = _tempValues.contains(i.key);
+                return CheckboxListTile(
+                  dense: true,
+                  value: isChecked,
+                  controlAffinity: ListTileControlAffinity.leading,
+                  title: Text(
+                    i.value,
+                    style: theme.textTheme.titleMedium!,
+                  ),
+                  onChanged: (value) {
+                    isChecked
+                        ? _tempValues.remove(i.key)
+                        : _tempValues.add(i.key);
+                    setState(() {});
+                  },
+                );
+              }).toList(),
+            ),
+          );
+        },
+      ),
       actionsPadding: const EdgeInsets.only(left: 16, right: 16, bottom: 12),
       actions: [
         TextButton(
diff --git a/lib/pages/setting/widgets/normal_item.dart b/lib/pages/setting/widgets/normal_item.dart
index 7b8285543..07731c088 100644
--- a/lib/pages/setting/widgets/normal_item.dart
+++ b/lib/pages/setting/widgets/normal_item.dart
@@ -44,14 +44,17 @@ class _NormalItemState extends State<NormalItem> {
       onTap: () => widget.onTap?.call(() {
         setState(() {});
       }),
-      title: Text(widget.title ?? widget.getTitle?.call(),
-          style: widget.titleStyle ?? Theme.of(context).textTheme.titleMedium!),
+      title: Text(
+        widget.title ?? widget.getTitle?.call(),
+        style: widget.titleStyle ?? Theme.of(context).textTheme.titleMedium!,
+      ),
       subtitle: widget.subtitle != null || widget.getSubtitle != null
-          ? Text(widget.subtitle ?? widget.getSubtitle?.call(),
-              style: Theme.of(context)
-                  .textTheme
-                  .labelMedium!
-                  .copyWith(color: Theme.of(context).colorScheme.outline))
+          ? Text(
+              widget.subtitle ?? widget.getSubtitle?.call(),
+              style: Theme.of(context).textTheme.labelMedium!.copyWith(
+                color: Theme.of(context).colorScheme.outline,
+              ),
+            )
           : null,
       leading: widget.leading,
       trailing: widget.getTrailing?.call(),
diff --git a/lib/pages/setting/widgets/select_dialog.dart b/lib/pages/setting/widgets/select_dialog.dart
index ffb52afaf..fb74c8a62 100644
--- a/lib/pages/setting/widgets/select_dialog.dart
+++ b/lib/pages/setting/widgets/select_dialog.dart
@@ -78,7 +78,9 @@ class _CdnSelectDialogState extends State<CdnSelectDialog> {
     _cdnSpeedTest = Pref.cdnSpeedTest;
     if (_cdnSpeedTest) {
       _cdnResList = List.generate(
-          CDNService.values.length, (_) => ValueNotifier<String?>(null));
+        CDNService.values.length,
+        (_) => ValueNotifier<String?>(null),
+      );
       _cancelToken = CancelToken();
       _startSpeedTest();
     }
@@ -97,8 +99,10 @@ class _CdnSelectDialogState extends State<CdnSelectDialog> {
   }
 
   Future<VideoItem> _getSampleUrl() async {
-    final result =
-        await VideoHttp.videoUrl(cid: 196018899, bvid: 'BV1fK4y1t7hj');
+    final result = await VideoHttp.videoUrl(
+      cid: 196018899,
+      bvid: 'BV1fK4y1t7hj',
+    );
     if (!result['status']) throw Exception('无法获取视频流');
     return result['data'].dash.video.first;
   }
diff --git a/lib/pages/setting/widgets/slide_dialog.dart b/lib/pages/setting/widgets/slide_dialog.dart
index 06d7f7880..8407df0d2 100644
--- a/lib/pages/setting/widgets/slide_dialog.dart
+++ b/lib/pages/setting/widgets/slide_dialog.dart
@@ -38,8 +38,12 @@ class _SlideDialogState extends State<SlideDialog> {
   Widget build(BuildContext context) {
     return AlertDialog(
       title: Text(widget.title),
-      contentPadding:
-          const EdgeInsets.only(top: 20, left: 8, right: 8, bottom: 8),
+      contentPadding: const EdgeInsets.only(
+        top: 20,
+        left: 8,
+        right: 8,
+        bottom: 8,
+      ),
       content: SizedBox(
         height: 40,
         child: Slider(
@@ -67,7 +71,7 @@ class _SlideDialogState extends State<SlideDialog> {
         TextButton(
           onPressed: () => Navigator.pop(context, _tempValue),
           child: const Text('确定'),
-        )
+        ),
       ],
     );
   }
diff --git a/lib/pages/setting/widgets/switch_item.dart b/lib/pages/setting/widgets/switch_item.dart
index 898074d77..4d383dc18 100644
--- a/lib/pages/setting/widgets/switch_item.dart
+++ b/lib/pages/setting/widgets/switch_item.dart
@@ -42,8 +42,10 @@ class _SetSwitchItemState extends State<SetSwitchItem> {
     if (widget.setKey == SettingBoxKey.appFontWeight) {
       val = Pref.appFontWeight != -1;
     } else {
-      val = GStorage.setting
-          .get(widget.setKey, defaultValue: widget.defaultVal ?? false);
+      val = GStorage.setting.get(
+        widget.setKey,
+        defaultValue: widget.defaultVal ?? false,
+      );
     }
   }
 
@@ -82,8 +84,10 @@ class _SetSwitchItemState extends State<SetSwitchItem> {
             TextButton(
               onPressed: () async {
                 Get.back();
-                await GStorage.setting
-                    .put(SettingBoxKey.badCertificateCallback, true);
+                await GStorage.setting.put(
+                  SettingBoxKey.badCertificateCallback,
+                  true,
+                );
                 val = true;
                 SmartDialog.showToast('重启生效');
                 setState(() {});
@@ -114,13 +118,16 @@ class _SetSwitchItemState extends State<SetSwitchItem> {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    TextStyle titleStyle = widget.titleStyle ??
+    TextStyle titleStyle =
+        widget.titleStyle ??
         theme.textTheme.titleMedium!.copyWith(
-          color:
-              widget.onTap != null && !val ? theme.colorScheme.outline : null,
+          color: widget.onTap != null && !val
+              ? theme.colorScheme.outline
+              : null,
         );
-    TextStyle subTitleStyle =
-        theme.textTheme.labelMedium!.copyWith(color: theme.colorScheme.outline);
+    TextStyle subTitleStyle = theme.textTheme.labelMedium!.copyWith(
+      color: theme.colorScheme.outline,
+    );
     return ListTile(
       contentPadding: widget.contentPadding,
       enabled: widget.onTap != null ? val : true,
@@ -136,8 +143,9 @@ class _SetSwitchItemState extends State<SetSwitchItem> {
         alignment: Alignment.centerRight,
         scale: 0.8,
         child: Switch(
-          thumbIcon:
-              WidgetStateProperty.resolveWith<Icon?>((Set<WidgetState> states) {
+          thumbIcon: WidgetStateProperty.resolveWith<Icon?>((
+            Set<WidgetState> states,
+          ) {
             if (states.isNotEmpty && states.first == WidgetState.selected) {
               return const Icon(Icons.done);
             }
diff --git a/lib/pages/settings_search/view.dart b/lib/pages/settings_search/view.dart
index fa36e48d5..415df0007 100644
--- a/lib/pages/settings_search/view.dart
+++ b/lib/pages/settings_search/view.dart
@@ -42,19 +42,21 @@ class _SettingsSearchPageState extends State<SettingsSearchPage> {
     _sub = _ctr.stream
         .debounce(const Duration(milliseconds: 200), trailing: true)
         .listen((value) {
-      if (value.isEmpty) {
-        _list.clear();
-      } else {
-        value = value.toLowerCase();
-        _list.value = _settings
-            .where((item) =>
-                (item.title ?? item.getTitle?.call())
-                    ?.toLowerCase()
-                    .contains(value) ||
-                item.subtitle?.toLowerCase().contains(value) == true)
-            .toList();
-      }
-    });
+          if (value.isEmpty) {
+            _list.clear();
+          } else {
+            value = value.toLowerCase();
+            _list.value = _settings
+                .where(
+                  (item) =>
+                      (item.title ?? item.getTitle?.call())
+                          ?.toLowerCase()
+                          .contains(value) ||
+                      item.subtitle?.toLowerCase().contains(value) == true,
+                )
+                .toList();
+          }
+        });
   }
 
   @override
diff --git a/lib/pages/share/view.dart b/lib/pages/share/view.dart
index ead688242..db06d7161 100644
--- a/lib/pages/share/view.dart
+++ b/lib/pages/share/view.dart
@@ -82,7 +82,8 @@ class _SharePanelState extends State<SharePanel> {
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     return Padding(
-      padding: const EdgeInsets.all(12) +
+      padding:
+          const EdgeInsets.all(12) +
           MediaQuery.paddingOf(context) +
           MediaQuery.viewInsetsOf(context),
       child: Column(
@@ -150,8 +151,9 @@ class _SharePanelState extends State<SharePanel> {
                                 width: 50,
                                 height: 50,
                                 decoration: BoxDecoration(
-                                  color: theme.colorScheme.primary
-                                      .withValues(alpha: 0.3),
+                                  color: theme.colorScheme.primary.withValues(
+                                    alpha: 0.3,
+                                  ),
                                   shape: BoxShape.circle,
                                   border: Border.all(
                                     width: 1.5,
@@ -235,8 +237,10 @@ class _SharePanelState extends State<SharePanel> {
                     ),
                     filled: true,
                     isDense: true,
-                    contentPadding:
-                        const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                    contentPadding: const EdgeInsets.symmetric(
+                      horizontal: 16,
+                      vertical: 8,
+                    ),
                     fillColor: theme.colorScheme.onInverseSurface,
                   ),
                   inputFormatters: [LengthLimitingTextInputFormatter(100)],
@@ -257,8 +261,10 @@ class _SharePanelState extends State<SharePanel> {
                 },
                 style: FilledButton.styleFrom(
                   tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                  visualDensity:
-                      const VisualDensity(horizontal: -2, vertical: -1),
+                  visualDensity: const VisualDensity(
+                    horizontal: -2,
+                    vertical: -1,
+                  ),
                 ),
                 child: const Text('发送'),
               ),
diff --git a/lib/pages/space_setting/controller.dart b/lib/pages/space_setting/controller.dart
index ee0885a64..841550fed 100644
--- a/lib/pages/space_setting/controller.dart
+++ b/lib/pages/space_setting/controller.dart
@@ -17,7 +17,9 @@ class SpaceSettingController
 
   @override
   bool customHandleResponse(
-      bool isRefresh, Success<SpaceSettingData> response) {
+    bool isRefresh,
+    Success<SpaceSettingData> response,
+  ) {
     loadingState.value = Success(response.response.privacy);
     return true;
   }
diff --git a/lib/pages/space_setting/view.dart b/lib/pages/space_setting/view.dart
index b74d9ef48..cbf966b47 100644
--- a/lib/pages/space_setting/view.dart
+++ b/lib/pages/space_setting/view.dart
@@ -37,63 +37,64 @@ class _SpaceSettingPageState extends State<SpaceSettingPage> {
   Widget _buildBody(ThemeData theme, LoadingState<Privacy?> loadingState) {
     return switch (loadingState) {
       Loading() => const SizedBox.shrink(),
-      Success<Privacy?>(:var response) => response == null
-          ? scrollErrorWidget(onReload: _controller.onReload)
-          : Builder(
-              builder: (context) {
-                final padding = MediaQuery.paddingOf(context);
-                final divider = Divider(
-                  height: 1,
-                  indent: max(16, padding.left),
-                  color: theme.colorScheme.outline.withValues(alpha: 0.1),
-                );
-                final dividerL = SliverToBoxAdapter(
-                  child: Divider(
-                    height: 12,
-                    thickness: 12,
+      Success<Privacy?>(:var response) =>
+        response == null
+            ? scrollErrorWidget(onReload: _controller.onReload)
+            : Builder(
+                builder: (context) {
+                  final padding = MediaQuery.paddingOf(context);
+                  final divider = Divider(
+                    height: 1,
+                    indent: max(16, padding.left),
                     color: theme.colorScheme.outline.withValues(alpha: 0.1),
-                  ),
-                );
-                return CustomScrollView(
-                  slivers: [
-                    dividerL,
-                    SliverList.separated(
-                      itemCount: response.list1.length,
-                      itemBuilder: (context, index) {
-                        return _item(response.list1[index]);
-                      },
-                      separatorBuilder: (context, index) => divider,
+                  );
+                  final dividerL = SliverToBoxAdapter(
+                    child: Divider(
+                      height: 12,
+                      thickness: 12,
+                      color: theme.colorScheme.outline.withValues(alpha: 0.1),
                     ),
-                    dividerL,
-                    SliverList.separated(
-                      itemCount: response.list2.length,
-                      itemBuilder: (context, index) {
-                        return _item(response.list2[index]);
-                      },
-                      separatorBuilder: (context, index) => divider,
-                    ),
-                    dividerL,
-                    SliverList.separated(
-                      itemCount: response.list3.length,
-                      itemBuilder: (context, index) {
-                        return _item(response.list3[index]);
-                      },
-                      separatorBuilder: (context, index) => divider,
-                    ),
-                    dividerL,
-                    SliverToBoxAdapter(
-                      child: SizedBox(
-                        height: padding.bottom + 80,
+                  );
+                  return CustomScrollView(
+                    slivers: [
+                      dividerL,
+                      SliverList.separated(
+                        itemCount: response.list1.length,
+                        itemBuilder: (context, index) {
+                          return _item(response.list1[index]);
+                        },
+                        separatorBuilder: (context, index) => divider,
                       ),
-                    ),
-                  ],
-                );
-              },
-            ),
+                      dividerL,
+                      SliverList.separated(
+                        itemCount: response.list2.length,
+                        itemBuilder: (context, index) {
+                          return _item(response.list2[index]);
+                        },
+                        separatorBuilder: (context, index) => divider,
+                      ),
+                      dividerL,
+                      SliverList.separated(
+                        itemCount: response.list3.length,
+                        itemBuilder: (context, index) {
+                          return _item(response.list3[index]);
+                        },
+                        separatorBuilder: (context, index) => divider,
+                      ),
+                      dividerL,
+                      SliverToBoxAdapter(
+                        child: SizedBox(
+                          height: padding.bottom + 80,
+                        ),
+                      ),
+                    ],
+                  );
+                },
+              ),
       Error(:var errMsg) => scrollErrorWidget(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
@@ -106,11 +107,11 @@ class _SpaceSettingPageState extends State<SpaceSettingPage> {
           value ??= !item.boolVal;
           item.value = item.isReverse
               ? value
-                  ? 0
-                  : 1
+                    ? 0
+                    : 1
               : value
-                  ? 1
-                  : 0;
+              ? 1
+              : 0;
           (context as Element).markNeedsBuild();
         }
 
@@ -125,8 +126,9 @@ class _SpaceSettingPageState extends State<SpaceSettingPage> {
             alignment: Alignment.centerRight,
             scale: 0.8,
             child: Switch(
-              thumbIcon: WidgetStateProperty.resolveWith<Icon?>(
-                  (Set<WidgetState> states) {
+              thumbIcon: WidgetStateProperty.resolveWith<Icon?>((
+                Set<WidgetState> states,
+              ) {
                 if (states.isNotEmpty && states.first == WidgetState.selected) {
                   return const Icon(Icons.done);
                 }
diff --git a/lib/pages/sponsor_block/view.dart b/lib/pages/sponsor_block/view.dart
index 2557498ad..10f64086f 100644
--- a/lib/pages/sponsor_block/view.dart
+++ b/lib/pages/sponsor_block/view.dart
@@ -53,323 +53,337 @@ class _SponsorBlockPageState extends State<SponsorBlockPage> {
 
   void _checkServerStatus() {
     Request().get('$_blockServer/api/status/uptime').then((res) {
-      _serverStatus.value = res.statusCode == 200 &&
+      _serverStatus.value =
+          res.statusCode == 200 &&
           res.data is String &&
           Utils.isStringNumeric(res.data);
     });
   }
 
   Widget _blockLimitItem(
-          ThemeData theme, TextStyle titleStyle, TextStyle subTitleStyle) =>
-      Builder(
-        builder: (context) {
-          return ListTile(
-            dense: true,
-            onTap: () {
-              _textController.text = _blockLimit.toString();
-              showDialog(
-                context: context,
-                builder: (_) {
-                  return AlertDialog(
-                    title: Text('最短片段时长', style: titleStyle),
-                    content: TextFormField(
-                      keyboardType:
-                          const TextInputType.numberWithOptions(decimal: true),
-                      controller: _textController,
-                      autofocus: true,
-                      decoration: const InputDecoration(suffixText: 's'),
-                      inputFormatters: [
-                        FilteringTextInputFormatter.allow(RegExp(r'[\d\.]+')),
-                      ],
-                    ),
-                    actions: [
-                      TextButton(
-                        onPressed: Get.back,
-                        child: Text(
-                          '取消',
-                          style: TextStyle(
-                            color: theme.colorScheme.outline,
-                          ),
-                        ),
+    ThemeData theme,
+    TextStyle titleStyle,
+    TextStyle subTitleStyle,
+  ) => Builder(
+    builder: (context) {
+      return ListTile(
+        dense: true,
+        onTap: () {
+          _textController.text = _blockLimit.toString();
+          showDialog(
+            context: context,
+            builder: (_) {
+              return AlertDialog(
+                title: Text('最短片段时长', style: titleStyle),
+                content: TextFormField(
+                  keyboardType: const TextInputType.numberWithOptions(
+                    decimal: true,
+                  ),
+                  controller: _textController,
+                  autofocus: true,
+                  decoration: const InputDecoration(suffixText: 's'),
+                  inputFormatters: [
+                    FilteringTextInputFormatter.allow(RegExp(r'[\d\.]+')),
+                  ],
+                ),
+                actions: [
+                  TextButton(
+                    onPressed: Get.back,
+                    child: Text(
+                      '取消',
+                      style: TextStyle(
+                        color: theme.colorScheme.outline,
                       ),
-                      TextButton(
-                        onPressed: () {
-                          Get.back();
-                          _blockLimit = max(0.0,
-                              double.tryParse(_textController.text) ?? 0.0);
-                          setting.put(SettingBoxKey.blockLimit, _blockLimit);
-                          (context as Element).markNeedsBuild();
-                        },
-                        child: const Text('确定'),
-                      )
-                    ],
-                  );
-                },
+                    ),
+                  ),
+                  TextButton(
+                    onPressed: () {
+                      Get.back();
+                      _blockLimit = max(
+                        0.0,
+                        double.tryParse(_textController.text) ?? 0.0,
+                      );
+                      setting.put(SettingBoxKey.blockLimit, _blockLimit);
+                      (context as Element).markNeedsBuild();
+                    },
+                    child: const Text('确定'),
+                  ),
+                ],
               );
             },
-            title: Text('最短片段时长', style: titleStyle),
-            subtitle: Text(
-              '忽略短于此时长的片段',
-              style: subTitleStyle,
-            ),
-            trailing: Text(
-              '${_blockLimit}s',
-              style: const TextStyle(fontSize: 13),
-            ),
           );
         },
+        title: Text('最短片段时长', style: titleStyle),
+        subtitle: Text(
+          '忽略短于此时长的片段',
+          style: subTitleStyle,
+        ),
+        trailing: Text(
+          '${_blockLimit}s',
+          style: const TextStyle(fontSize: 13),
+        ),
       );
+    },
+  );
 
   Widget _aboudItem(TextStyle titleStyle, TextStyle subTitleStyle) => ListTile(
-        dense: true,
-        title: Text('关于空降助手', style: titleStyle),
-        subtitle: Text(_url, style: subTitleStyle),
-        onTap: () => PageUtils.launchURL(_url),
-      );
+    dense: true,
+    title: Text('关于空降助手', style: titleStyle),
+    subtitle: Text(_url, style: subTitleStyle),
+    onTap: () => PageUtils.launchURL(_url),
+  );
 
   Widget _userIdItem(
-          ThemeData theme, TextStyle titleStyle, TextStyle subTitleStyle) =>
-      Builder(
-        builder: (context) {
-          return ListTile(
-            dense: true,
-            title: Text('用户ID', style: titleStyle),
-            subtitle: Text(_userId, style: subTitleStyle),
-            onTap: () {
-              final key = GlobalKey<FormState>();
-              _textController.text = _userId;
-              showDialog(
-                context: context,
-                builder: (_) {
-                  return AlertDialog(
-                    title: Text('用户ID', style: titleStyle),
-                    content: Form(
-                      key: key,
-                      child: TextFormField(
-                        minLines: 1,
-                        maxLines: 4,
-                        autofocus: true,
-                        controller: _textController,
-                        inputFormatters: [
-                          FilteringTextInputFormatter.allow(
-                              RegExp(r'[a-zA-Z\d]+')),
-                        ],
-                        validator: (value) {
-                          if ((value?.length ?? -1) < 30) {
-                            return '用户ID要求至少为30个字符长度的纯字符串';
-                          }
-                          return null;
-                        },
+    ThemeData theme,
+    TextStyle titleStyle,
+    TextStyle subTitleStyle,
+  ) => Builder(
+    builder: (context) {
+      return ListTile(
+        dense: true,
+        title: Text('用户ID', style: titleStyle),
+        subtitle: Text(_userId, style: subTitleStyle),
+        onTap: () {
+          final key = GlobalKey<FormState>();
+          _textController.text = _userId;
+          showDialog(
+            context: context,
+            builder: (_) {
+              return AlertDialog(
+                title: Text('用户ID', style: titleStyle),
+                content: Form(
+                  key: key,
+                  child: TextFormField(
+                    minLines: 1,
+                    maxLines: 4,
+                    autofocus: true,
+                    controller: _textController,
+                    inputFormatters: [
+                      FilteringTextInputFormatter.allow(RegExp(r'[a-zA-Z\d]+')),
+                    ],
+                    validator: (value) {
+                      if ((value?.length ?? -1) < 30) {
+                        return '用户ID要求至少为30个字符长度的纯字符串';
+                      }
+                      return null;
+                    },
+                  ),
+                ),
+                actions: [
+                  TextButton(
+                    onPressed: () {
+                      Get.back();
+                      _userId = const Uuid().v4().replaceAll('-', '');
+                      setting.put(SettingBoxKey.blockUserID, _userId);
+                      (context as Element).markNeedsBuild();
+                    },
+                    child: const Text('随机'),
+                  ),
+                  TextButton(
+                    onPressed: Get.back,
+                    child: Text(
+                      '取消',
+                      style: TextStyle(
+                        color: theme.colorScheme.outline,
                       ),
                     ),
-                    actions: [
-                      TextButton(
-                        onPressed: () {
-                          Get.back();
-                          _userId = const Uuid().v4().replaceAll('-', '');
-                          setting.put(SettingBoxKey.blockUserID, _userId);
-                          (context as Element).markNeedsBuild();
-                        },
-                        child: const Text('随机'),
-                      ),
-                      TextButton(
-                        onPressed: Get.back,
-                        child: Text(
-                          '取消',
-                          style: TextStyle(
-                            color: theme.colorScheme.outline,
-                          ),
-                        ),
-                      ),
-                      TextButton(
-                        onPressed: () {
-                          if (key.currentState?.validate() == true) {
-                            Get.back();
-                            _userId = _textController.text;
-                            setting.put(SettingBoxKey.blockUserID, _userId);
-                            (context as Element).markNeedsBuild();
-                          }
-                        },
-                        child: const Text('确定'),
-                      )
-                    ],
-                  );
-                },
+                  ),
+                  TextButton(
+                    onPressed: () {
+                      if (key.currentState?.validate() == true) {
+                        Get.back();
+                        _userId = _textController.text;
+                        setting.put(SettingBoxKey.blockUserID, _userId);
+                        (context as Element).markNeedsBuild();
+                      }
+                    },
+                    child: const Text('确定'),
+                  ),
+                ],
               );
             },
           );
         },
       );
+    },
+  );
 
   Widget _blockToastItem(TextStyle titleStyle) => Builder(
-        builder: (context) {
-          void update() {
-            _blockToast = !_blockToast;
-            setting.put(SettingBoxKey.blockToast, _blockToast);
-            (context as Element).markNeedsBuild();
-          }
+    builder: (context) {
+      void update() {
+        _blockToast = !_blockToast;
+        setting.put(SettingBoxKey.blockToast, _blockToast);
+        (context as Element).markNeedsBuild();
+      }
 
-          return ListTile(
-            dense: true,
-            onTap: update,
-            title: Text(
-              '显示跳过Toast',
-              style: titleStyle,
-            ),
-            trailing: Transform.scale(
-              alignment: Alignment.centerRight,
-              scale: 0.8,
-              child: Switch(
-                thumbIcon: WidgetStateProperty.resolveWith<Icon?>((states) {
-                  if (states.isNotEmpty &&
-                      states.first == WidgetState.selected) {
-                    return const Icon(Icons.done);
-                  }
-                  return null;
-                }),
-                value: _blockToast,
-                onChanged: (val) => update(),
-              ),
-            ),
-          );
-        },
+      return ListTile(
+        dense: true,
+        onTap: update,
+        title: Text(
+          '显示跳过Toast',
+          style: titleStyle,
+        ),
+        trailing: Transform.scale(
+          alignment: Alignment.centerRight,
+          scale: 0.8,
+          child: Switch(
+            thumbIcon: WidgetStateProperty.resolveWith<Icon?>((states) {
+              if (states.isNotEmpty && states.first == WidgetState.selected) {
+                return const Icon(Icons.done);
+              }
+              return null;
+            }),
+            value: _blockToast,
+            onChanged: (val) => update(),
+          ),
+        ),
       );
+    },
+  );
 
-  Widget _blockTrackItem(TextStyle titleStyle, TextStyle subTitleStyle) =>
-      Builder(
-        builder: (context) {
-          void update() {
-            _blockTrack = !_blockTrack;
-            setting.put(SettingBoxKey.blockTrack, _blockTrack);
-            (context as Element).markNeedsBuild();
-          }
+  Widget _blockTrackItem(
+    TextStyle titleStyle,
+    TextStyle subTitleStyle,
+  ) => Builder(
+    builder: (context) {
+      void update() {
+        _blockTrack = !_blockTrack;
+        setting.put(SettingBoxKey.blockTrack, _blockTrack);
+        (context as Element).markNeedsBuild();
+      }
 
-          return ListTile(
-              dense: true,
-              onTap: update,
-              title: Text(
-                '跳过次数统计跟踪',
-                style: titleStyle,
-              ),
-              subtitle: Text(
-                // from origin extension
-                '此功能追踪您跳过了哪些片段，让用户知道他们提交的片段帮助了多少人。同时点赞会作为依据，确保垃圾信息不会污染数据库。在您每次跳过片段时，我们都会向服务器发送一条消息。希望大家开启此项设置，以便得到更准确的统计数据。:)',
-                style: subTitleStyle,
-              ),
-              trailing: Transform.scale(
-                alignment: Alignment.centerRight,
-                scale: 0.8,
-                child: Switch(
-                  thumbIcon: WidgetStateProperty.resolveWith<Icon?>((states) {
-                    if (states.isNotEmpty &&
-                        states.first == WidgetState.selected) {
-                      return const Icon(Icons.done);
-                    }
-                    return null;
-                  }),
-                  value: _blockTrack,
-                  onChanged: (val) => update(),
-                ),
-              ));
-        },
+      return ListTile(
+        dense: true,
+        onTap: update,
+        title: Text(
+          '跳过次数统计跟踪',
+          style: titleStyle,
+        ),
+        subtitle: Text(
+          // from origin extension
+          '此功能追踪您跳过了哪些片段，让用户知道他们提交的片段帮助了多少人。同时点赞会作为依据，确保垃圾信息不会污染数据库。在您每次跳过片段时，我们都会向服务器发送一条消息。希望大家开启此项设置，以便得到更准确的统计数据。:)',
+          style: subTitleStyle,
+        ),
+        trailing: Transform.scale(
+          alignment: Alignment.centerRight,
+          scale: 0.8,
+          child: Switch(
+            thumbIcon: WidgetStateProperty.resolveWith<Icon?>((states) {
+              if (states.isNotEmpty && states.first == WidgetState.selected) {
+                return const Icon(Icons.done);
+              }
+              return null;
+            }),
+            value: _blockTrack,
+            onChanged: (val) => update(),
+          ),
+        ),
       );
+    },
+  );
 
   Widget _blockServerItem(
-          ThemeData theme, TextStyle titleStyle, TextStyle subTitleStyle) =>
-      Builder(
-        builder: (context) {
-          return ListTile(
-            dense: true,
-            onTap: () {
-              _textController.text = _blockServer;
-              showDialog(
-                context: context,
-                builder: (_) {
-                  return AlertDialog(
-                    title: Text('服务器地址', style: titleStyle),
-                    content: TextFormField(
-                      keyboardType: TextInputType.url,
-                      controller: _textController,
-                      autofocus: true,
+    ThemeData theme,
+    TextStyle titleStyle,
+    TextStyle subTitleStyle,
+  ) => Builder(
+    builder: (context) {
+      return ListTile(
+        dense: true,
+        onTap: () {
+          _textController.text = _blockServer;
+          showDialog(
+            context: context,
+            builder: (_) {
+              return AlertDialog(
+                title: Text('服务器地址', style: titleStyle),
+                content: TextFormField(
+                  keyboardType: TextInputType.url,
+                  controller: _textController,
+                  autofocus: true,
+                ),
+                actions: [
+                  TextButton(
+                    onPressed: () {
+                      Get.back();
+                      _blockServer = HttpString.sponsorBlockBaseUrl;
+                      setting.put(SettingBoxKey.blockServer, _blockServer);
+                      Request.accountManager.blockServer = _blockServer;
+                      (context as Element).markNeedsBuild();
+                    },
+                    child: const Text('重置'),
+                  ),
+                  TextButton(
+                    onPressed: Get.back,
+                    child: Text(
+                      '取消',
+                      style: TextStyle(
+                        color: theme.colorScheme.outline,
+                      ),
                     ),
-                    actions: [
-                      TextButton(
-                        onPressed: () {
-                          Get.back();
-                          _blockServer = HttpString.sponsorBlockBaseUrl;
-                          setting.put(SettingBoxKey.blockServer, _blockServer);
-                          Request.accountManager.blockServer = _blockServer;
-                          (context as Element).markNeedsBuild();
-                        },
-                        child: const Text('重置'),
-                      ),
-                      TextButton(
-                        onPressed: Get.back,
-                        child: Text(
-                          '取消',
-                          style: TextStyle(
-                            color: theme.colorScheme.outline,
-                          ),
-                        ),
-                      ),
-                      TextButton(
-                        onPressed: () {
-                          Get.back();
-                          _blockServer = _textController.text;
-                          setting.put(SettingBoxKey.blockServer, _blockServer);
-                          Request.accountManager.blockServer = _blockServer;
-                          (context as Element).markNeedsBuild();
-                        },
-                        child: const Text('确定'),
-                      )
-                    ],
-                  );
-                },
+                  ),
+                  TextButton(
+                    onPressed: () {
+                      Get.back();
+                      _blockServer = _textController.text;
+                      setting.put(SettingBoxKey.blockServer, _blockServer);
+                      Request.accountManager.blockServer = _blockServer;
+                      (context as Element).markNeedsBuild();
+                    },
+                    child: const Text('确定'),
+                  ),
+                ],
               );
             },
-            title: Text(
-              '服务器地址',
-              style: titleStyle,
-            ),
-            subtitle: Text(
-              _blockServer,
-              style: subTitleStyle,
-            ),
           );
         },
+        title: Text(
+          '服务器地址',
+          style: titleStyle,
+        ),
+        subtitle: Text(
+          _blockServer,
+          style: subTitleStyle,
+        ),
       );
+    },
+  );
 
   Widget _serverStatusItem(ThemeData theme, TextStyle titleStyle) => Obx(
-        () {
-          String status;
-          Color? color;
-          switch (_serverStatus.value) {
-            case null:
-              status = '——';
-            case true:
-              status = '正常';
-              color = theme.colorScheme.primary;
-            case false:
-              status = '错误';
-              color = theme.colorScheme.error;
-          }
-          return ListTile(
-            dense: true,
-            onTap: () {
-              _serverStatus.value = null;
-              _checkServerStatus();
-            },
-            title: Text('服务器状态', style: titleStyle),
-            trailing: Text(
-              status,
-              style: TextStyle(fontSize: 13, color: color),
-            ),
-          );
+    () {
+      String status;
+      Color? color;
+      switch (_serverStatus.value) {
+        case null:
+          status = '——';
+        case true:
+          status = '正常';
+          color = theme.colorScheme.primary;
+        case false:
+          status = '错误';
+          color = theme.colorScheme.error;
+      }
+      return ListTile(
+        dense: true,
+        onTap: () {
+          _serverStatus.value = null;
+          _checkServerStatus();
         },
+        title: Text('服务器状态', style: titleStyle),
+        trailing: Text(
+          status,
+          style: TextStyle(fontSize: 13, color: color),
+        ),
       );
+    },
+  );
 
-  void onSelectColor(BuildContext context, int index, Color color,
-      Pair<SegmentType, SkipType> item) {
+  void onSelectColor(
+    BuildContext context,
+    int index,
+    Color color,
+    Pair<SegmentType, SkipType> item,
+  ) {
     showDialog(
       context: context,
       builder: (_) => AlertDialog(
@@ -406,10 +420,11 @@ class _SponsorBlockPageState extends State<SponsorBlockPage> {
           callback: (Color? color) {
             _blockColor[index] = color ?? item.first.color;
             setting.put(
-                SettingBoxKey.blockColor,
-                _blockColor
-                    .map((item) => item.value.toRadixString(16).substring(2))
-                    .toList());
+              SettingBoxKey.blockColor,
+              _blockColor
+                  .map((item) => item.value.toRadixString(16).substring(2))
+                  .toList(),
+            );
             (context as Element).markNeedsBuild();
           },
         ),
@@ -450,7 +465,8 @@ class _SponsorBlockPageState extends State<SponsorBlockPage> {
           SliverToBoxAdapter(child: _serverStatusItem(theme, titleStyle)),
           dividerL,
           SliverToBoxAdapter(
-              child: _blockLimitItem(theme, titleStyle, subTitleStyle)),
+            child: _blockLimitItem(theme, titleStyle, subTitleStyle),
+          ),
           sliverDivider,
           SliverToBoxAdapter(child: _blockToastItem(titleStyle)),
           sliverDivider,
@@ -464,24 +480,30 @@ class _SponsorBlockPageState extends State<SponsorBlockPage> {
           ),
           dividerL,
           SliverToBoxAdapter(
-              child: _userIdItem(theme, titleStyle, subTitleStyle)),
+            child: _userIdItem(theme, titleStyle, subTitleStyle),
+          ),
           sliverDivider,
           SliverToBoxAdapter(
-              child: _blockServerItem(theme, titleStyle, subTitleStyle)),
+            child: _blockServerItem(theme, titleStyle, subTitleStyle),
+          ),
           dividerL,
           SliverToBoxAdapter(child: _aboudItem(titleStyle, subTitleStyle)),
           dividerL,
           SliverToBoxAdapter(
-              child: SizedBox(
-            height: 55 + MediaQuery.paddingOf(context).bottom,
-          )),
+            child: SizedBox(
+              height: 55 + MediaQuery.paddingOf(context).bottom,
+            ),
+          ),
         ],
       ),
     );
   }
 
   Widget _buildItem(
-      ThemeData theme, int index, Pair<SegmentType, SkipType> item) {
+    ThemeData theme,
+    int index,
+    Pair<SegmentType, SkipType> item,
+  ) {
     return Builder(
       builder: (context) {
         Color color = _blockColor[index];
@@ -522,8 +544,10 @@ class _SponsorBlockPageState extends State<SponsorBlockPage> {
                     onSelected: (e) {
                       final updateItem = isDisable || e == SkipType.disable;
                       item.second = e;
-                      setting.put(SettingBoxKey.blockSettings,
-                          _blockSettings.map((e) => e.second.index).toList());
+                      setting.put(
+                        SettingBoxKey.blockSettings,
+                        _blockSettings.map((e) => e.second.index).toList(),
+                      );
                       if (updateItem) {
                         (context as Element).markNeedsBuild();
                       } else {
@@ -531,10 +555,12 @@ class _SponsorBlockPageState extends State<SponsorBlockPage> {
                       }
                     },
                     itemBuilder: (context) => SkipType.values
-                        .map((item) => PopupMenuItem<SkipType>(
-                              value: item,
-                              child: Text(item.title),
-                            ))
+                        .map(
+                          (item) => PopupMenuItem<SkipType>(
+                            value: item,
+                            child: Text(item.title),
+                          ),
+                        )
                         .toList(),
                     child: Padding(
                       padding: const EdgeInsets.symmetric(vertical: 8),
@@ -547,8 +573,9 @@ class _SponsorBlockPageState extends State<SponsorBlockPage> {
                               height: 1,
                               fontSize: 14,
                               color: isDisable
-                                  ? theme.colorScheme.outline
-                                      .withValues(alpha: 0.7)
+                                  ? theme.colorScheme.outline.withValues(
+                                      alpha: 0.7,
+                                    )
                                   : theme.colorScheme.secondary,
                             ),
                             strutStyle: const StrutStyle(height: 1, leading: 0),
@@ -557,8 +584,9 @@ class _SponsorBlockPageState extends State<SponsorBlockPage> {
                             MdiIcons.unfoldMoreHorizontal,
                             size: MediaQuery.textScalerOf(context).scale(14),
                             color: isDisable
-                                ? theme.colorScheme.outline
-                                    .withValues(alpha: 0.7)
+                                ? theme.colorScheme.outline.withValues(
+                                    alpha: 0.7,
+                                  )
                                 : theme.colorScheme.secondary,
                           ),
                         ],
diff --git a/lib/pages/subscription/controller.dart b/lib/pages/subscription/controller.dart
index e90fb3ff4..6d08b6033 100644
--- a/lib/pages/subscription/controller.dart
+++ b/lib/pages/subscription/controller.dart
@@ -45,7 +45,9 @@ class SubController extends CommonListController<SubData, SubItemModel> {
           TextButton(
             onPressed: () async {
               var res = await FavHttp.cancelSub(
-                  id: subFolderItem.id!, type: subFolderItem.type!);
+                id: subFolderItem.id!,
+                type: subFolderItem.type!,
+              );
               if (res['status']) {
                 loadingState
                   ..value.data!.remove(subFolderItem)
@@ -73,8 +75,8 @@ class SubController extends CommonListController<SubData, SubItemModel> {
 
   @override
   Future<LoadingState<SubData>> customGetData() => UserHttp.userSubFolder(
-        pn: page,
-        ps: 20,
-        mid: accountService.mid,
-      );
+    pn: page,
+    ps: 20,
+    mid: accountService.mid,
+  );
 }
diff --git a/lib/pages/subscription/view.dart b/lib/pages/subscription/view.dart
index 07ba3ceb4..4e152ce24 100644
--- a/lib/pages/subscription/view.dart
+++ b/lib/pages/subscription/view.dart
@@ -47,36 +47,37 @@ class _SubPageState extends State<SubPage> {
   Widget _buildBody(LoadingState<List<SubItemModel>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: Grid.videoCardHDelegate(context),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) => const VideoCardHSkeleton(),
-            childCount: 10,
-          ),
+        gridDelegate: Grid.videoCardHDelegate(context),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) => const VideoCardHSkeleton(),
+          childCount: 10,
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                childCount: response!.length,
-                (BuildContext context, int index) {
-                  if (index == response.length - 1) {
-                    _subController.onLoadMore();
-                  }
-                  final item = response[index];
-                  return SubItem(
-                    item: item,
-                    cancelSub: () => _subController.cancelSub(item),
-                  );
-                },
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  childCount: response!.length,
+                  (BuildContext context, int index) {
+                    if (index == response.length - 1) {
+                      _subController.onLoadMore();
+                    }
+                    final item = response[index];
+                    return SubItem(
+                      item: item,
+                      cancelSub: () => _subController.cancelSub(item),
+                    );
+                  },
+                ),
+              )
+            : HttpError(
+                onReload: _subController.onReload,
               ),
-            )
-          : HttpError(
-              onReload: _subController.onReload,
-            ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _subController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _subController.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/subscription/widgets/item.dart b/lib/pages/subscription/widgets/item.dart
index b966e3043..41cbcfeb0 100644
--- a/lib/pages/subscription/widgets/item.dart
+++ b/lib/pages/subscription/widgets/item.dart
@@ -82,7 +82,7 @@ class SubItem extends StatelessWidget {
                           right: 6,
                           top: 6,
                           text: type,
-                        )
+                        ),
                       ],
                     );
                   },
diff --git a/lib/pages/subscription_detail/view.dart b/lib/pages/subscription_detail/view.dart
index 1a8d90cc0..7d852e57d 100644
--- a/lib/pages/subscription_detail/view.dart
+++ b/lib/pages/subscription_detail/view.dart
@@ -45,7 +45,8 @@ class _SubDetailPageState extends State<SubDetailPage> {
                   bottom: MediaQuery.paddingOf(context).bottom + 80,
                 ),
                 sliver: Obx(
-                    () => _buildBody(_subDetailController.loadingState.value)),
+                  () => _buildBody(_subDetailController.loadingState.value),
+                ),
               ),
             ],
           ),
@@ -57,34 +58,35 @@ class _SubDetailPageState extends State<SubDetailPage> {
   Widget _buildBody(LoadingState<List<SubDetailItemModel>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: Grid.videoCardHDelegate(context),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) => const VideoCardHSkeleton(),
-            childCount: 10,
-          ),
+        gridDelegate: Grid.videoCardHDelegate(context),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) => const VideoCardHSkeleton(),
+          childCount: 10,
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                childCount: response!.length,
-                (context, index) {
-                  if (index == response.length - 1) {
-                    _subDetailController.onLoadMore();
-                  }
-                  return SubVideoCardH(
-                    videoItem: response[index],
-                  );
-                },
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  childCount: response!.length,
+                  (context, index) {
+                    if (index == response.length - 1) {
+                      _subDetailController.onLoadMore();
+                    }
+                    return SubVideoCardH(
+                      videoItem: response[index],
+                    );
+                  },
+                ),
+              )
+            : HttpError(
+                onReload: _subDetailController.onReload,
               ),
-            )
-          : HttpError(
-              onReload: _subDetailController.onReload,
-            ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _subDetailController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _subDetailController.onReload,
+      ),
     };
   }
 
@@ -155,7 +157,8 @@ class _SubDetailPageState extends State<SubDetailPage> {
                     GestureDetector(
                       onTap: () {
                         Get.toNamed(
-                            '/member?mid=${_subDetailController.subInfo.upper!.mid}');
+                          '/member?mid=${_subDetailController.subInfo.upper!.mid}',
+                        );
                       },
                       child: Text(
                         _subDetailController.subInfo.upper!.name!,
diff --git a/lib/pages/video/ai_conclusion/view.dart b/lib/pages/video/ai_conclusion/view.dart
index 5af73570a..ca50023c3 100644
--- a/lib/pages/video/ai_conclusion/view.dart
+++ b/lib/pages/video/ai_conclusion/view.dart
@@ -116,7 +116,8 @@ class _AiDetailState extends CommonCollapseSlidePageState<AiConclusionPanel> {
                                 children: [
                                   TextSpan(
                                     text: DurationUtil.formatDuration(
-                                        item.timestamp),
+                                      item.timestamp,
+                                    ),
                                     style: TextStyle(
                                       color: theme.colorScheme.primary,
                                     ),
@@ -124,10 +125,10 @@ class _AiDetailState extends CommonCollapseSlidePageState<AiConclusionPanel> {
                                       ..onTap = () {
                                         try {
                                           Get.find<VideoDetailController>(
-                                                  tag: Get.arguments['heroTag'])
-                                              .plPlayerController
-                                              .seekTo(Duration(
-                                                  seconds: item.timestamp!));
+                                            tag: Get.arguments['heroTag'],
+                                          ).plPlayerController.seekTo(
+                                            Duration(seconds: item.timestamp!),
+                                          );
                                         } catch (_) {}
                                       },
                                   ),
diff --git a/lib/pages/video/controller.dart b/lib/pages/video/controller.dart
index 692505528..ce3b3fdfa 100644
--- a/lib/pages/video/controller.dart
+++ b/lib/pages/video/controller.dart
@@ -151,8 +151,8 @@ class VideoDetailController extends GetxController
   void setVideoHeight() {
     String direction = firstVideo.width != null && firstVideo.height != null
         ? firstVideo.width! > firstVideo.height!
-            ? 'horizontal'
-            : 'vertical'
+              ? 'horizontal'
+              : 'vertical'
         : 'horizontal';
     if (!scrollCtr.hasClients) {
       videoHeight = direction == 'vertical' ? maxVideoHeight : minVideoHeight;
@@ -161,19 +161,22 @@ class VideoDetailController extends GetxController
     }
     if (this.direction.value != direction) {
       this.direction.value = direction;
-      double videoHeight =
-          direction == 'vertical' ? maxVideoHeight : minVideoHeight;
+      double videoHeight = direction == 'vertical'
+          ? maxVideoHeight
+          : minVideoHeight;
       if (this.videoHeight != videoHeight) {
         if (videoHeight > this.videoHeight) {
           // current minVideoHeight
           isExpanding = true;
           animationController.forward(
-              from: (minVideoHeight - scrollCtr.offset) / maxVideoHeight);
+            from: (minVideoHeight - scrollCtr.offset) / maxVideoHeight,
+          );
           this.videoHeight = maxVideoHeight;
         } else {
           // current maxVideoHeight
-          final currentHeight =
-              (maxVideoHeight - scrollCtr.offset).toPrecision(2);
+          final currentHeight = (maxVideoHeight - scrollCtr.offset).toPrecision(
+            2,
+          );
           double minVideoHeightPrecise = minVideoHeight.toPrecision(2);
           if (currentHeight == minVideoHeightPrecise) {
             isExpanding = true;
@@ -188,7 +191,8 @@ class VideoDetailController extends GetxController
             // collapse
             isCollapsing = true;
             animationController.forward(
-                from: scrollCtr.offset / (maxVideoHeight - minVideoHeight));
+              from: scrollCtr.offset / (maxVideoHeight - minVideoHeight),
+            );
             this.videoHeight = minVideoHeight;
           }
         }
@@ -231,7 +235,7 @@ class VideoDetailController extends GetxController
     imageStatus = false;
   }
 
-// 页面来源 稍后再看 收藏夹
+  // 页面来源 稍后再看 收藏夹
   String sourceType = 'normal';
   late bool _mediaDesc = false;
   late final RxList<MediaListItemModel> mediaList = <MediaListItemModel>[].obs;
@@ -239,11 +243,11 @@ class VideoDetailController extends GetxController
   bool get isPlayAll =>
       const ['watchLater', 'fav', 'archive', 'playlist'].contains(sourceType);
   int get _mediaType => switch (sourceType) {
-        'archive' => 1,
-        'watchLater' => 2,
-        'fav' || 'playlist' => 3,
-        _ => -1,
-      };
+    'archive' => 1,
+    'watchLater' => 2,
+    'fav' || 'playlist' => 3,
+    _ => -1,
+  };
 
   late dynamic epId = Get.parameters['epId'];
   late dynamic seasonId = Get.parameters['seasonId'];
@@ -282,7 +286,10 @@ class VideoDetailController extends GetxController
 
     bool defaultShowComment = Pref.defaultShowComment;
     tabCtr = TabController(
-        length: 2, vsync: this, initialIndex: defaultShowComment ? 1 : 0);
+      length: 2,
+      vsync: this,
+      initialIndex: defaultShowComment ? 1 : 0,
+    );
     autoPlay.value = Pref.autoPlayEnable;
     if (autoPlay.value) isShowCover.value = false;
     danmakuCid.value = cid.value;
@@ -310,25 +317,25 @@ class VideoDetailController extends GetxController
       oid: isReverse
           ? null
           : mediaList.isEmpty
-              ? Get.arguments['isContinuePlaying'] == true
-                  ? Get.arguments['oid']
-                  : null
-              : isLoadPrevious
-                  ? mediaList.first.aid
-                  : mediaList.last.aid,
+          ? Get.arguments['isContinuePlaying'] == true
+                ? Get.arguments['oid']
+                : null
+          : isLoadPrevious
+          ? mediaList.first.aid
+          : mediaList.last.aid,
       otype: isReverse
           ? null
           : mediaList.isEmpty
-              ? null
-              : isLoadPrevious
-                  ? mediaList.first.type
-                  : mediaList.last.type,
+          ? null
+          : isLoadPrevious
+          ? mediaList.first.type
+          : mediaList.last.type,
       desc: _mediaDesc,
       sortField: Get.arguments['sortField'] ?? 1,
       withCurrent:
           mediaList.isEmpty && Get.arguments['isContinuePlaying'] == true
-              ? true
-              : false,
+          ? true
+          : false,
     );
     if (res['status']) {
       MediaListData data = res['data'];
@@ -338,8 +345,9 @@ class VideoDetailController extends GetxController
           try {
             for (var item in mediaList) {
               if (item.cid != null) {
-                Get.find<VideoIntroController>(tag: heroTag)
-                    .changeSeasonOrbangu(
+                Get.find<VideoIntroController>(
+                  tag: heroTag,
+                ).changeSeasonOrbangu(
                   null,
                   item.bvid,
                   item.cid,
@@ -365,51 +373,53 @@ class VideoDetailController extends GetxController
   void showMediaListPanel(BuildContext context) {
     if (mediaList.isNotEmpty) {
       Widget panel() => MediaListPanel(
-            mediaList: mediaList,
-            changeMediaList: (bvid, cid, aid, cover) {
-              try {
-                Get.find<VideoIntroController>(tag: heroTag)
-                    .changeSeasonOrbangu(null, bvid, cid, aid, cover);
-              } catch (_) {}
-            },
-            panelTitle: watchLaterTitle,
-            getBvId: () => bvid,
-            count: Get.arguments['count'],
-            loadMoreMedia: getMediaList,
-            desc: _mediaDesc,
-            onReverse: () {
-              _mediaDesc = !_mediaDesc;
-              getMediaList(isReverse: true);
-            },
-            loadPrevious: Get.arguments['isContinuePlaying'] == true
-                ? () => getMediaList(isLoadPrevious: true)
-                : null,
-            onDelete: sourceType == 'watchLater' ||
-                    (sourceType == 'fav' && Get.arguments?['isOwner'] == true)
-                ? (item, index) async {
-                    if (sourceType == 'watchLater') {
-                      var res = await UserHttp.toViewDel(
-                        aids: [item.aid],
-                      );
-                      if (res['status']) {
-                        mediaList.removeAt(index);
-                      }
-                      SmartDialog.showToast(res['msg']);
-                    } else {
-                      var res = await FavHttp.delFav(
-                        ids: ['${item.aid}:${item.type}'],
-                        delIds: '${Get.arguments?['mediaId']}',
-                      );
-                      if (res['status']) {
-                        mediaList.removeAt(index);
-                        SmartDialog.showToast('取消收藏');
-                      } else {
-                        SmartDialog.showToast(res['msg']);
-                      }
-                    }
+        mediaList: mediaList,
+        changeMediaList: (bvid, cid, aid, cover) {
+          try {
+            Get.find<VideoIntroController>(
+              tag: heroTag,
+            ).changeSeasonOrbangu(null, bvid, cid, aid, cover);
+          } catch (_) {}
+        },
+        panelTitle: watchLaterTitle,
+        getBvId: () => bvid,
+        count: Get.arguments['count'],
+        loadMoreMedia: getMediaList,
+        desc: _mediaDesc,
+        onReverse: () {
+          _mediaDesc = !_mediaDesc;
+          getMediaList(isReverse: true);
+        },
+        loadPrevious: Get.arguments['isContinuePlaying'] == true
+            ? () => getMediaList(isLoadPrevious: true)
+            : null,
+        onDelete:
+            sourceType == 'watchLater' ||
+                (sourceType == 'fav' && Get.arguments?['isOwner'] == true)
+            ? (item, index) async {
+                if (sourceType == 'watchLater') {
+                  var res = await UserHttp.toViewDel(
+                    aids: [item.aid],
+                  );
+                  if (res['status']) {
+                    mediaList.removeAt(index);
                   }
-                : null,
-          );
+                  SmartDialog.showToast(res['msg']);
+                } else {
+                  var res = await FavHttp.delFav(
+                    ids: ['${item.aid}:${item.type}'],
+                    delIds: '${Get.arguments?['mediaId']}',
+                  );
+                  if (res['status']) {
+                    mediaList.removeAt(index);
+                    SmartDialog.showToast('取消收藏');
+                  } else {
+                    SmartDialog.showToast(res['msg']);
+                  }
+                }
+              }
+            : null,
+      );
       if (plPlayerController.isFullScreen.value || showVideoSheet) {
         PageUtils.showVideoBottomSheet(
           context,
@@ -451,16 +461,18 @@ class VideoDetailController extends GetxController
   late final List listData = [];
 
   void _vote(String uuid, int type) {
-    Request().post(
-      '$blockServer/api/voteOnSponsorTime',
-      queryParameters: {
-        'UUID': uuid,
-        'userID': Pref.blockUserID,
-        'type': type,
-      },
-    ).then((res) {
-      SmartDialog.showToast(res.statusCode == 200 ? '投票成功' : '投票失败');
-    });
+    Request()
+        .post(
+          '$blockServer/api/voteOnSponsorTime',
+          queryParameters: {
+            'UUID': uuid,
+            'userID': Pref.blockUserID,
+            'type': type,
+          },
+        )
+        .then((res) {
+          SmartDialog.showToast(res.statusCode == 200 ? '投票成功' : '投票失败');
+        });
   }
 
   void _showCategoryDialog(BuildContext context, SegmentModel segment) {
@@ -473,45 +485,50 @@ class VideoDetailController extends GetxController
           child: Column(
             mainAxisSize: MainAxisSize.min,
             children: SegmentType.values
-                .map((item) => ListTile(
-                      dense: true,
-                      onTap: () {
-                        Get.back();
-                        Request().post(
-                          '$blockServer/api/voteOnSponsorTime',
-                          queryParameters: {
-                            'UUID': segment.UUID,
-                            'userID': Pref.blockUserID,
-                            'category': item.name,
-                          },
-                        ).then((res) {
-                          SmartDialog.showToast(
-                              '类别更改${res.statusCode == 200 ? '成功' : '失败'}');
-                        });
-                      },
-                      title: Text.rich(
-                        TextSpan(
-                          children: [
-                            WidgetSpan(
-                              alignment: PlaceholderAlignment.middle,
-                              child: Container(
-                                height: 10,
-                                width: 10,
-                                decoration: BoxDecoration(
-                                  shape: BoxShape.circle,
-                                  color: _getColor(item),
-                                ),
+                .map(
+                  (item) => ListTile(
+                    dense: true,
+                    onTap: () {
+                      Get.back();
+                      Request()
+                          .post(
+                            '$blockServer/api/voteOnSponsorTime',
+                            queryParameters: {
+                              'UUID': segment.UUID,
+                              'userID': Pref.blockUserID,
+                              'category': item.name,
+                            },
+                          )
+                          .then((res) {
+                            SmartDialog.showToast(
+                              '类别更改${res.statusCode == 200 ? '成功' : '失败'}',
+                            );
+                          });
+                    },
+                    title: Text.rich(
+                      TextSpan(
+                        children: [
+                          WidgetSpan(
+                            alignment: PlaceholderAlignment.middle,
+                            child: Container(
+                              height: 10,
+                              width: 10,
+                              decoration: BoxDecoration(
+                                shape: BoxShape.circle,
+                                color: _getColor(item),
                               ),
-                              style: const TextStyle(fontSize: 14, height: 1),
                             ),
-                            TextSpan(
-                              text: ' ${item.title}',
-                              style: const TextStyle(fontSize: 14, height: 1),
-                            ),
-                          ],
-                        ),
+                            style: const TextStyle(fontSize: 14, height: 1),
+                          ),
+                          TextSpan(
+                            text: ' ${item.title}',
+                            style: const TextStyle(fontSize: 14, height: 1),
+                          ),
+                        ],
                       ),
-                    ))
+                    ),
+                  ),
+                )
                 .toList(),
           ),
         ),
@@ -644,10 +661,9 @@ class VideoDetailController extends GetxController
                                     ? Icons.my_location
                                     : MdiIcons.debugStepOver,
                                 size: 18,
-                                color: Theme.of(context)
-                                    .colorScheme
-                                    .onSurface
-                                    .withValues(alpha: 0.7),
+                                color: Theme.of(
+                                  context,
+                                ).colorScheme.onSurface.withValues(alpha: 0.7),
                               ),
                             ),
                           )
@@ -697,71 +713,89 @@ class VideoDetailController extends GetxController
       try {
         final duration = list.first.videoDuration ?? data.timeLength!;
         // segmentList
-        segmentList.addAll(list
-            .where((item) =>
-                plPlayerController.enableList.contains(item.category) &&
-                item.segment[1] >= item.segment[0])
-            .map(
-          (item) {
-            final segmentType = SegmentType.values.byName(item.category);
-            if (item.segment[0] == 0 && item.segment[1] == 0) {
-              videoLabel.value +=
-                  '${videoLabel.value.isNotEmpty ? '/' : ''}${segmentType.title}';
-            }
-            var skipType =
-                plPlayerController.blockSettings[segmentType.index].second;
-            if (skipType != SkipType.showOnly) {
-              if (item.segment[1] == item.segment[0] ||
-                  item.segment[1] - item.segment[0] <
-                      plPlayerController.blockLimit) {
-                skipType = SkipType.showOnly;
-              }
-            }
+        segmentList.addAll(
+          list
+              .where(
+                (item) =>
+                    plPlayerController.enableList.contains(item.category) &&
+                    item.segment[1] >= item.segment[0],
+              )
+              .map(
+                (item) {
+                  final segmentType = SegmentType.values.byName(item.category);
+                  if (item.segment[0] == 0 && item.segment[1] == 0) {
+                    videoLabel.value +=
+                        '${videoLabel.value.isNotEmpty ? '/' : ''}${segmentType.title}';
+                  }
+                  var skipType = plPlayerController
+                      .blockSettings[segmentType.index]
+                      .second;
+                  if (skipType != SkipType.showOnly) {
+                    if (item.segment[1] == item.segment[0] ||
+                        item.segment[1] - item.segment[0] <
+                            plPlayerController.blockLimit) {
+                      skipType = SkipType.showOnly;
+                    }
+                  }
 
-            final segmentModel = SegmentModel(
-              UUID: item.uuid,
-              segmentType: segmentType,
-              segment: Pair(
-                first: item.segment[0],
-                second: item.segment[1],
-              ),
-              skipType: skipType,
-            );
+                  final segmentModel = SegmentModel(
+                    UUID: item.uuid,
+                    segmentType: segmentType,
+                    segment: Pair(
+                      first: item.segment[0],
+                      second: item.segment[1],
+                    ),
+                    skipType: skipType,
+                  );
 
-            if (positionSubscription == null &&
-                !isShowCover.value &&
-                plPlayerController.videoPlayerController != null) {
-              final currPost = plPlayerController.position.value.inMilliseconds;
-              if (currPost >= segmentModel.segment.first &&
-                  currPost < segmentModel.segment.second) {
-                _lastPos = currPost;
-                if (segmentModel.skipType == SkipType.alwaysSkip) {
-                  plPlayerController.videoPlayerController!.stream.buffer.first
-                      .whenComplete(() {
-                    onSkip(segmentModel);
-                  });
-                } else if (segmentModel.skipType == SkipType.skipOnce) {
-                  segmentModel.hasSkipped = true;
-                  plPlayerController.videoPlayerController!.stream.buffer.first
-                      .whenComplete(() {
-                    onSkip(segmentModel);
-                  });
-                } else if (segmentModel.skipType == SkipType.skipManually) {
-                  onAddItem(segmentModel);
-                }
-              }
-            }
+                  if (positionSubscription == null &&
+                      !isShowCover.value &&
+                      plPlayerController.videoPlayerController != null) {
+                    final currPost =
+                        plPlayerController.position.value.inMilliseconds;
+                    if (currPost >= segmentModel.segment.first &&
+                        currPost < segmentModel.segment.second) {
+                      _lastPos = currPost;
+                      if (segmentModel.skipType == SkipType.alwaysSkip) {
+                        plPlayerController
+                            .videoPlayerController!
+                            .stream
+                            .buffer
+                            .first
+                            .whenComplete(() {
+                              onSkip(segmentModel);
+                            });
+                      } else if (segmentModel.skipType == SkipType.skipOnce) {
+                        segmentModel.hasSkipped = true;
+                        plPlayerController
+                            .videoPlayerController!
+                            .stream
+                            .buffer
+                            .first
+                            .whenComplete(() {
+                              onSkip(segmentModel);
+                            });
+                      } else if (segmentModel.skipType ==
+                          SkipType.skipManually) {
+                        onAddItem(segmentModel);
+                      }
+                    }
+                  }
 
-            return segmentModel;
-          },
-        ).toList());
+                  return segmentModel;
+                },
+              )
+              .toList(),
+        );
 
         // _segmentProgressList
-        (segmentProgressList ??= <Segment>[]).addAll(segmentList.map((e) {
-          double start = (e.segment.first / duration).clamp(0.0, 1.0);
-          double end = (e.segment.second / duration).clamp(0.0, 1.0);
-          return Segment(start, end, _getColor(e.segmentType));
-        }).toList());
+        (segmentProgressList ??= <Segment>[]).addAll(
+          segmentList.map((e) {
+            double start = (e.segment.first / duration).clamp(0.0, 1.0);
+            double end = (e.segment.second / duration).clamp(0.0, 1.0);
+            return Segment(start, end, _getColor(e.segmentType));
+          }).toList(),
+        );
 
         if (positionSubscription == null &&
             (!isShowCover.value || plPlayerController.preInitPlayer)) {
@@ -778,36 +812,38 @@ class VideoDetailController extends GetxController
     if (segmentList.isNotEmpty) {
       positionSubscription?.cancel();
       positionSubscription = plPlayerController
-          .videoPlayerController?.stream.position
+          .videoPlayerController
+          ?.stream
+          .position
           .listen((position) {
-        if (isShowCover.value) {
-          return;
-        }
-        int currentPos = position.inSeconds;
-        if (currentPos != _lastPos) {
-          _lastPos = currentPos;
-          final msPos = currentPos * 1000;
-          for (SegmentModel item in segmentList) {
-            // if (kDebugMode) {
-            //   debugPrint(
-            //       '${position.inSeconds},,${item.segment.first},,${item.segment.second},,${item.skipType.name},,${item.hasSkipped}');
-            // }
-            if (msPos <= item.segment.first &&
-                item.segment.first <= msPos + 1000) {
-              if (item.skipType == SkipType.alwaysSkip) {
-                onSkip(item);
-              } else if (item.skipType == SkipType.skipOnce &&
-                  !item.hasSkipped) {
-                item.hasSkipped = true;
-                onSkip(item);
-              } else if (item.skipType == SkipType.skipManually) {
-                onAddItem(item);
-              }
-              break;
+            if (isShowCover.value) {
+              return;
             }
-          }
-        }
-      });
+            int currentPos = position.inSeconds;
+            if (currentPos != _lastPos) {
+              _lastPos = currentPos;
+              final msPos = currentPos * 1000;
+              for (SegmentModel item in segmentList) {
+                // if (kDebugMode) {
+                //   debugPrint(
+                //       '${position.inSeconds},,${item.segment.first},,${item.segment.second},,${item.skipType.name},,${item.hasSkipped}');
+                // }
+                if (msPos <= item.segment.first &&
+                    item.segment.first <= msPos + 1000) {
+                  if (item.skipType == SkipType.alwaysSkip) {
+                    onSkip(item);
+                  } else if (item.skipType == SkipType.skipOnce &&
+                      !item.hasSkipped) {
+                    item.hasSkipped = true;
+                    onSkip(item);
+                  } else if (item.skipType == SkipType.skipManually) {
+                    onAddItem(item);
+                  }
+                  break;
+                }
+              }
+            }
+          });
     }
   }
 
@@ -823,20 +859,23 @@ class VideoDetailController extends GetxController
   }
 
   void onRemoveItem(int index, item) {
-    EasyThrottle.throttle('onRemoveItem', const Duration(milliseconds: 500),
-        () {
-      try {
-        listData.removeAt(index);
-        if (listData.isEmpty) {
-          skipTimer?.cancel();
-          skipTimer = null;
-        }
-        listKey.currentState?.removeItem(
-          index,
-          (context, animation) => buildItem(item, animation),
-        );
-      } catch (_) {}
-    });
+    EasyThrottle.throttle(
+      'onRemoveItem',
+      const Duration(milliseconds: 500),
+      () {
+        try {
+          listData.removeAt(index);
+          if (listData.isEmpty) {
+            skipTimer?.cancel();
+            skipTimer = null;
+          }
+          listKey.currentState?.removeItem(
+            index,
+            (context, animation) => buildItem(item, animation),
+          );
+        } catch (_) {}
+      },
+    );
   }
 
   Widget buildItem(dynamic item, Animation<double> animation) {
@@ -857,8 +896,9 @@ class VideoDetailController extends GetxController
               }
             },
             child: SearchText(
-              bgColor:
-                  theme.colorScheme.secondaryContainer.withValues(alpha: 0.8),
+              bgColor: theme.colorScheme.secondaryContainer.withValues(
+                alpha: 0.8,
+              ),
               textColor: theme.colorScheme.onSecondaryContainer,
               padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
               fontSize: 14,
@@ -900,8 +940,9 @@ class VideoDetailController extends GetxController
   Future<void> onSkip(SegmentModel item, [bool isSkip = true]) async {
     try {
       plPlayerController.danmakuController?.clear();
-      await plPlayerController.videoPlayerController
-          ?.seek(Duration(milliseconds: item.segment.second));
+      await plPlayerController.videoPlayerController?.seek(
+        Duration(milliseconds: item.segment.second),
+      );
       if (isSkip) {
         if (Pref.blockToast) {
           _showBlockToast('已跳过${item.segmentType.shortTitle}片段');
@@ -963,8 +1004,10 @@ class VideoDetailController extends GetxController
           const end = Offset.zero;
           const curve = Curves.linear;
 
-          var tween =
-              Tween(begin: begin, end: end).chain(CurveTween(curve: curve));
+          var tween = Tween(
+            begin: begin,
+            end: end,
+          ).chain(CurveTween(curve: curve));
 
           return SlideTransition(
             position: animation.drive(tween),
@@ -987,8 +1030,9 @@ class VideoDetailController extends GetxController
     plPlayerController.buffered.value = Duration.zero;
 
     /// 根据currentVideoQa和currentDecodeFormats 重新设置videoUrl
-    List<VideoItem> videoList =
-        data.dash!.video!.where((i) => i.id == currentVideoQa.code).toList();
+    List<VideoItem> videoList = data.dash!.video!
+        .where((i) => i.id == currentVideoQa.code)
+        .toList();
 
     final List supportDecodeFormats = videoList.map((e) => e.codecs!).toList();
     VideoDecodeFormatType defaultDecodeFormats =
@@ -1013,12 +1057,14 @@ class VideoDetailController extends GetxController
       if (flag == 1) {
         //currentDecodeFormats
         firstVideo = videoList.firstWhere(
-            (i) => i.codecs!.startsWith(currentDecodeFormats.code),
-            orElse: () => videoList.first);
+          (i) => i.codecs!.startsWith(currentDecodeFormats.code),
+          orElse: () => videoList.first,
+        );
       } else {
         if (currentVideoQa == VideoQuality.dolbyVision) {
-          currentDecodeFormats =
-              VideoDecodeFormatTypeExt.fromString(videoList.first.codecs!)!;
+          currentDecodeFormats = VideoDecodeFormatTypeExt.fromString(
+            videoList.first.codecs!,
+          )!;
           firstVideo = videoList.first;
         } else if (flag == 2) {
           //defaultDecodeFormats
@@ -1035,8 +1081,9 @@ class VideoDetailController extends GetxController
             orElse: () => videoList.first,
           );
         } else if (flag == 0) {
-          currentDecodeFormats =
-              VideoDecodeFormatTypeExt.fromString(supportDecodeFormats.first)!;
+          currentDecodeFormats = VideoDecodeFormatTypeExt.fromString(
+            supportDecodeFormats.first,
+          )!;
           firstVideo = videoList.first;
         }
       }
@@ -1070,13 +1117,14 @@ class VideoDetailController extends GetxController
         videoSource: plPlayerController.onlyPlayAudio.value
             ? audio ?? audioUrl
             : video ?? videoUrl,
-        audioSource:
-            plPlayerController.onlyPlayAudio.value ? '' : audio ?? audioUrl,
+        audioSource: plPlayerController.onlyPlayAudio.value
+            ? ''
+            : audio ?? audioUrl,
         type: DataSourceType.network,
         httpHeaders: {
           'user-agent':
               'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36',
-          'referer': HttpString.baseUrl
+          'referer': HttpString.baseUrl,
         },
       ),
       segmentList: segmentProgressList,
@@ -1084,7 +1132,8 @@ class VideoDetailController extends GetxController
       showVP: showVP,
       dmTrend: dmTrend,
       seekTo: seekToTime ?? defaultST ?? playedTime,
-      duration: duration ??
+      duration:
+          duration ??
           (data.timeLength == null
               ? null
               : Duration(milliseconds: data.timeLength!)),
@@ -1168,10 +1217,11 @@ class VideoDetailController extends GetxController
         }
         // 实际为FLV/MP4格式，但已被淘汰，这里仅做兜底处理
         firstVideo = VideoItem(
-            id: data.quality!,
-            baseUrl: videoUrl,
-            codecs: 'avc1',
-            quality: VideoQuality.fromCode(data.quality!));
+          id: data.quality!,
+          baseUrl: videoUrl,
+          codecs: 'avc1',
+          quality: VideoQuality.fromCode(data.quality!),
+        );
         setVideoHeight();
         currentDecodeFormats = VideoDecodeFormatTypeExt.fromString('avc1')!;
         currentVideoQa = VideoQuality.fromCode(data.quality!);
@@ -1203,23 +1253,29 @@ class VideoDetailController extends GetxController
       int resVideoQa = currentHighVideoQa;
       if (plPlayerController.cacheVideoQa! <= currentHighVideoQa) {
         // 如果预设的画质低于当前最高
-        final List<int> numbers =
-            data.acceptQuality!.where((e) => e <= currentHighVideoQa).toList();
-        resVideoQa =
-            Utils.findClosestNumber(plPlayerController.cacheVideoQa!, numbers);
+        final List<int> numbers = data.acceptQuality!
+            .where((e) => e <= currentHighVideoQa)
+            .toList();
+        resVideoQa = Utils.findClosestNumber(
+          plPlayerController.cacheVideoQa!,
+          numbers,
+        );
       }
       currentVideoQa = VideoQuality.fromCode(resVideoQa);
 
       /// 取出符合当前画质的videoList
-      final List<VideoItem> videosList =
-          allVideosList.where((e) => e.quality.code == resVideoQa).toList();
+      final List<VideoItem> videosList = allVideosList
+          .where((e) => e.quality.code == resVideoQa)
+          .toList();
 
       /// 优先顺序 设置中指定解码格式 -> 当前可选的首个解码格式
       final List<FormatItem> supportFormats = data.supportFormats!;
       // 根据画质选编码格式
       final List supportDecodeFormats = supportFormats
-          .firstWhere((e) => e.quality == resVideoQa,
-              orElse: () => supportFormats.first)
+          .firstWhere(
+            (e) => e.quality == resVideoQa,
+            orElse: () => supportFormats.first,
+          )
           .codecs!;
       // 默认从设置中取AV1
       currentDecodeFormats = VideoDecodeFormatTypeExt.fromString(cacheDecode)!;
@@ -1238,14 +1294,16 @@ class VideoDetailController extends GetxController
       if (flag == 2) {
         currentDecodeFormats = secondDecodeFormats;
       } else if (flag == 0) {
-        currentDecodeFormats =
-            VideoDecodeFormatTypeExt.fromString(supportDecodeFormats.first)!;
+        currentDecodeFormats = VideoDecodeFormatTypeExt.fromString(
+          supportDecodeFormats.first,
+        )!;
       }
 
       /// 取出符合当前解码格式的videoItem
       firstVideo = videosList.firstWhere(
-          (e) => e.codecs!.startsWith(currentDecodeFormats.code),
-          orElse: () => videosList.first);
+        (e) => e.codecs!.startsWith(currentDecodeFormats.code),
+        orElse: () => videosList.first,
+      );
       setVideoHeight();
 
       videoUrl = VideoUtils.getCdnUrl(firstVideo);
@@ -1266,14 +1324,18 @@ class VideoDetailController extends GetxController
 
       if (audiosList.isNotEmpty) {
         final List<int> numbers = audiosList.map((map) => map.id!).toList();
-        int closestNumber =
-            Utils.findClosestNumber(plPlayerController.cacheAudioQa, numbers);
+        int closestNumber = Utils.findClosestNumber(
+          plPlayerController.cacheAudioQa,
+          numbers,
+        );
         if (!numbers.contains(plPlayerController.cacheAudioQa) &&
             numbers.any((e) => e > plPlayerController.cacheAudioQa)) {
           closestNumber = 30280;
         }
-        firstAudio = audiosList.firstWhere((e) => e.id == closestNumber,
-            orElse: () => audiosList.first);
+        firstAudio = audiosList.firstWhere(
+          (e) => e.id == closestNumber,
+          orElse: () => audiosList.first,
+        );
         audioUrl = VideoUtils.getCdnUrl(firstAudio);
         if (firstAudio.id != null) {
           currentAudioQa = AudioQuality.fromCode(firstAudio.id!);
@@ -1373,8 +1435,9 @@ class VideoDetailController extends GetxController
   // 设定字幕轨道
   Future<void> setSubtitle(int index) async {
     if (index <= 0) {
-      plPlayerController.videoPlayerController
-          ?.setSubtitleTrack(SubtitleTrack.no());
+      plPlayerController.videoPlayerController?.setSubtitleTrack(
+        SubtitleTrack.no(),
+      );
       vttSubtitlesIndex.value = index;
       return;
     }
@@ -1394,8 +1457,9 @@ class VideoDetailController extends GetxController
     if (subtitle != null) {
       setSub(subtitle);
     } else {
-      var result =
-          await VideoHttp.vttSubtitles(subtitles[index - 1].subtitleUrl!);
+      var result = await VideoHttp.vttSubtitles(
+        subtitles[index - 1].subtitleUrl!,
+      );
       if (result != null) {
         _vttSubtitles[index - 1] = result;
         setSub(result);
@@ -1471,8 +1535,10 @@ class VideoDetailController extends GetxController
       if (playInfo.viewPoints?.isNotEmpty == true && Pref.showViewPoints) {
         try {
           viewPointList = playInfo.viewPoints!.map((item) {
-            double start =
-                (item.to! / (data.timeLength! / 1000)).clamp(0.0, 1.0);
+            double start = (item.to! / (data.timeLength! / 1000)).clamp(
+              0.0,
+              1.0,
+            );
             return Segment(
               start,
               start,
@@ -1529,8 +1595,8 @@ class VideoDetailController extends GetxController
         plPlayerController.makeHeartBeat(
           data.timeLength != null
               ? (data.timeLength! - playedTime!.inMilliseconds).abs() <= 1000
-                  ? -1
-                  : playedTime!.inSeconds
+                    ? -1
+                    : playedTime!.inSeconds
               : playedTime!.inSeconds,
           type: 'status',
           isManual: true,
@@ -1621,8 +1687,9 @@ class VideoDetailController extends GetxController
   void showNoteList(BuildContext context) {
     String? title;
     try {
-      title =
-          Get.find<VideoIntroController>(tag: heroTag).videoDetail.value.title;
+      title = Get.find<VideoIntroController>(
+        tag: heroTag,
+      ).videoDetail.value.title;
     } catch (_) {}
     if (plPlayerController.isFullScreen.value || showVideoSheet) {
       PageUtils.showVideoBottomSheet(
diff --git a/lib/pages/video/introduction/pgc/controller.dart b/lib/pages/video/introduction/pgc/controller.dart
index 41c67e99f..e7fc1d1f7 100644
--- a/lib/pages/video/introduction/pgc/controller.dart
+++ b/lib/pages/video/introduction/pgc/controller.dart
@@ -35,8 +35,8 @@ class PgcIntroController extends CommonIntroController {
 
   late dynamic type =
       Get.parameters['type'] == '1' || Get.parameters['type'] == '4'
-          ? '追番'
-          : '追剧';
+      ? '追番'
+      : '追剧';
 
   final PgcInfoModel pgcItem = Get.arguments['pgcItem'];
 
@@ -190,65 +190,66 @@ class PgcIntroController extends CommonIntroController {
   // 分享视频
   void actionShareVideo(BuildContext context) {
     showDialog(
-        context: context,
-        builder: (_) {
-          String videoUrl = '${HttpString.baseUrl}/bangumi/play/ep$epId';
-          return AlertDialog(
-            clipBehavior: Clip.hardEdge,
-            contentPadding: const EdgeInsets.symmetric(vertical: 12),
-            content: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                ListTile(
-                  dense: true,
-                  title: const Text(
-                    '复制链接',
-                    style: TextStyle(fontSize: 14),
-                  ),
-                  onTap: () {
-                    Get.back();
-                    Utils.copyText(videoUrl);
-                  },
+      context: context,
+      builder: (_) {
+        String videoUrl = '${HttpString.baseUrl}/bangumi/play/ep$epId';
+        return AlertDialog(
+          clipBehavior: Clip.hardEdge,
+          contentPadding: const EdgeInsets.symmetric(vertical: 12),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              ListTile(
+                dense: true,
+                title: const Text(
+                  '复制链接',
+                  style: TextStyle(fontSize: 14),
                 ),
-                ListTile(
-                  dense: true,
-                  title: const Text(
-                    '其它app打开',
-                    style: TextStyle(fontSize: 14),
-                  ),
-                  onTap: () {
-                    Get.back();
-                    PageUtils.launchURL(videoUrl);
-                  },
+                onTap: () {
+                  Get.back();
+                  Utils.copyText(videoUrl);
+                },
+              ),
+              ListTile(
+                dense: true,
+                title: const Text(
+                  '其它app打开',
+                  style: TextStyle(fontSize: 14),
                 ),
-                ListTile(
-                  dense: true,
-                  title: const Text(
-                    '分享视频',
-                    style: TextStyle(fontSize: 14),
-                  ),
-                  onTap: () {
-                    Get.back();
-                    Utils.shareText(videoUrl);
-                  },
+                onTap: () {
+                  Get.back();
+                  PageUtils.launchURL(videoUrl);
+                },
+              ),
+              ListTile(
+                dense: true,
+                title: const Text(
+                  '分享视频',
+                  style: TextStyle(fontSize: 14),
                 ),
-                ListTile(
-                  dense: true,
-                  title: const Text(
-                    '分享至动态',
-                    style: TextStyle(fontSize: 14),
-                  ),
-                  onTap: () {
-                    Get.back();
-                    EpisodeItem? item = pgcItem.episodes
-                        ?.firstWhereOrNull((item) => item.epId == epId);
-                    showModalBottomSheet(
-                      context: context,
-                      isScrollControlled: true,
-                      useSafeArea: true,
-                      builder: (context) => RepostPanel(
-                        rid: epId,
-                        /**
+                onTap: () {
+                  Get.back();
+                  Utils.shareText(videoUrl);
+                },
+              ),
+              ListTile(
+                dense: true,
+                title: const Text(
+                  '分享至动态',
+                  style: TextStyle(fontSize: 14),
+                ),
+                onTap: () {
+                  Get.back();
+                  EpisodeItem? item = pgcItem.episodes?.firstWhereOrNull(
+                    (item) => item.epId == epId,
+                  );
+                  showModalBottomSheet(
+                    context: context,
+                    isScrollControlled: true,
+                    useSafeArea: true,
+                    builder: (context) => RepostPanel(
+                      rid: epId,
+                      /**
                          *  1：番剧 // 4097
                             2：电影 // 4098
                             3：纪录片 // 4101
@@ -257,64 +258,66 @@ class PgcIntroController extends CommonIntroController {
                             6：漫画
                             7：综艺 // 4099
                          */
-                        dynType: switch (Get.parameters['type']) {
-                          '1' => 4097,
-                          '2' => 4098,
-                          '3' => 4101,
-                          '4' => 4100,
-                          '5' || '7' => 4099,
-                          _ => -1,
-                        },
-                        pic: pgcItem.cover,
-                        title:
-                            '${pgcItem.title}${item != null ? '\n${item.showTitle}' : ''}',
-                        uname: '',
-                      ),
+                      dynType: switch (Get.parameters['type']) {
+                        '1' => 4097,
+                        '2' => 4098,
+                        '3' => 4101,
+                        '4' => 4100,
+                        '5' || '7' => 4099,
+                        _ => -1,
+                      },
+                      pic: pgcItem.cover,
+                      title:
+                          '${pgcItem.title}${item != null ? '\n${item.showTitle}' : ''}',
+                      uname: '',
+                    ),
+                  );
+                },
+              ),
+              ListTile(
+                dense: true,
+                title: const Text(
+                  '分享至消息',
+                  style: TextStyle(fontSize: 14),
+                ),
+                onTap: () {
+                  Get.back();
+                  try {
+                    EpisodeItem item = pgcItem.episodes!.firstWhere(
+                      (item) => item.epId == epId,
                     );
-                  },
-                ),
-                ListTile(
-                  dense: true,
-                  title: const Text(
-                    '分享至消息',
-                    style: TextStyle(fontSize: 14),
-                  ),
-                  onTap: () {
-                    Get.back();
-                    try {
-                      EpisodeItem item = pgcItem.episodes!
-                          .firstWhere((item) => item.epId == epId);
-                      final title = '${item.title!} ${item.showTitle}';
-                      PageUtils.pmShare(
-                        context,
-                        content: {
-                          "id": epId!.toString(),
-                          "title": title,
-                          "url": item.shareUrl,
-                          "headline": title,
-                          "source": 16,
-                          "thumb": item.cover,
-                          "source_desc": switch (pgcItem.type) {
-                            1 => '番剧',
-                            2 => '电影',
-                            3 => '纪录片',
-                            4 => '国创',
-                            5 => '电视剧',
-                            6 => '漫画',
-                            7 => '综艺',
-                            _ => null,
-                          }
+                    final title = '${item.title!} ${item.showTitle}';
+                    PageUtils.pmShare(
+                      context,
+                      content: {
+                        "id": epId!.toString(),
+                        "title": title,
+                        "url": item.shareUrl,
+                        "headline": title,
+                        "source": 16,
+                        "thumb": item.cover,
+                        "source_desc": switch (pgcItem.type) {
+                          1 => '番剧',
+                          2 => '电影',
+                          3 => '纪录片',
+                          4 => '国创',
+                          5 => '电视剧',
+                          6 => '漫画',
+                          7 => '综艺',
+                          _ => null,
                         },
-                      );
-                    } catch (e) {
-                      SmartDialog.showToast(e.toString());
-                    }
-                  },
-                ),
-              ],
-            ),
-          );
-        });
+                      },
+                    );
+                  } catch (e) {
+                    SmartDialog.showToast(e.toString());
+                  }
+                },
+              ),
+            ],
+          ),
+        );
+      },
+    );
   }
 
   // 修改分P或番剧分集
@@ -409,10 +412,12 @@ class PgcIntroController extends CommonIntroController {
 
   bool prevPlay() {
     List episodes = pgcItem.episodes!;
-    VideoDetailController videoDetailCtr =
-        Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
-    int currentIndex =
-        episodes.indexWhere((e) => e.cid == videoDetailCtr.cid.value);
+    VideoDetailController videoDetailCtr = Get.find<VideoDetailController>(
+      tag: Get.arguments['heroTag'],
+    );
+    int currentIndex = episodes.indexWhere(
+      (e) => e.cid == videoDetailCtr.cid.value,
+    );
     int prevIndex = currentIndex - 1;
     PlayRepeat playRepeat = videoDetailCtr.plPlayerController.playRepeat;
     if (prevIndex < 0) {
@@ -435,12 +440,14 @@ class PgcIntroController extends CommonIntroController {
   bool nextPlay() {
     try {
       List episodes = pgcItem.episodes!;
-      VideoDetailController videoDetailCtr =
-          Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
+      VideoDetailController videoDetailCtr = Get.find<VideoDetailController>(
+        tag: Get.arguments['heroTag'],
+      );
       PlayRepeat playRepeat = videoDetailCtr.plPlayerController.playRepeat;
 
-      int currentIndex =
-          episodes.indexWhere((e) => e.cid == videoDetailCtr.cid.value);
+      int currentIndex = episodes.indexWhere(
+        (e) => e.cid == videoDetailCtr.cid.value,
+      );
       int nextIndex = currentIndex + 1;
       // 列表循环
       if (nextIndex >= episodes.length) {
diff --git a/lib/pages/video/introduction/pgc/view.dart b/lib/pages/video/introduction/pgc/view.dart
index c68b5a290..98e7f7b86 100644
--- a/lib/pages/video/introduction/pgc/view.dart
+++ b/lib/pages/video/introduction/pgc/view.dart
@@ -96,7 +96,7 @@ class _PgcIntroPageState extends State<PgcIntroPage>
                           imgList: [
                             SourceModel(
                               url: item.cover!,
-                            )
+                            ),
                           ],
                           onDismissed: videoDetailCtr.onDismissed,
                         );
@@ -124,7 +124,9 @@ class _PgcIntroPageState extends State<PgcIntroPage>
                 Expanded(
                   child: GestureDetector(
                     onTap: () => widget.showIntroDetail(
-                        item, pgcIntroController.videoTags.value),
+                      item,
+                      pgcIntroController.videoTags.value,
+                    ),
                     behavior: HitTestBehavior.opaque,
                     child: SizedBox(
                       height: isLandscape ? 115 : 115 / 0.75,
@@ -182,7 +184,8 @@ class _PgcIntroPageState extends State<PgcIntroPage>
                                                   } else {
                                                     pgcIntroController
                                                         .pgcUpdate(
-                                                            followStatus);
+                                                          followStatus,
+                                                        );
                                                   }
                                                 },
                                               );
@@ -214,7 +217,7 @@ class _PgcIntroPageState extends State<PgcIntroPage>
                               if (isLandscape) ...[
                                 areasAndPubTime(theme, item),
                                 newEpDesc(theme, item),
-                              ]
+                              ],
                             ],
                           ),
                           SizedBox(height: isLandscape ? 2 : 6),
@@ -251,7 +254,7 @@ class _PgcIntroPageState extends State<PgcIntroPage>
                 changeFuc: pgcIntroController.changeSeasonOrbangu,
                 showEpisodes: widget.showEpisodes,
                 newEp: item.newEp,
-              )
+              ),
             ],
           ],
         ),
@@ -259,8 +262,11 @@ class _PgcIntroPageState extends State<PgcIntroPage>
     );
   }
 
-  Widget actionGrid(ThemeData theme, PgcInfoModel item,
-      PgcIntroController pgcIntroController) {
+  Widget actionGrid(
+    ThemeData theme,
+    PgcInfoModel item,
+    PgcIntroController pgcIntroController,
+  ) {
     return SizedBox(
       height: 48,
       child: Row(
@@ -275,7 +281,8 @@ class _PgcIntroPageState extends State<PgcIntroPage>
               semanticsLabel: '点赞',
               text: NumUtil.numFormat(item.stat!.likes),
               needAnim: true,
-              hasTriple: pgcIntroController.hasLike.value &&
+              hasTriple:
+                  pgcIntroController.hasLike.value &&
                   pgcIntroController.hasCoin &&
                   pgcIntroController.hasFav.value,
               callBack: (start) {
@@ -308,8 +315,10 @@ class _PgcIntroPageState extends State<PgcIntroPage>
               icon: const Icon(FontAwesomeIcons.star),
               selectIcon: const Icon(FontAwesomeIcons.solidStar),
               onTap: () => pgcIntroController.showFavBottomSheet(context),
-              onLongPress: () => pgcIntroController.showFavBottomSheet(context,
-                  type: 'longPress'),
+              onLongPress: () => pgcIntroController.showFavBottomSheet(
+                context,
+                type: 'longPress',
+              ),
               selectStatus: pgcIntroController.hasFav.value,
               semanticsLabel: '收藏',
               text: NumUtil.numFormat(item.stat!.favorite),
diff --git a/lib/pages/video/introduction/pgc/widgets/intro_detail.dart b/lib/pages/video/introduction/pgc/widgets/intro_detail.dart
index b6d4bbc55..9dffb9ce8 100644
--- a/lib/pages/video/introduction/pgc/widgets/intro_detail.dart
+++ b/lib/pages/video/introduction/pgc/widgets/intro_detail.dart
@@ -55,7 +55,10 @@ class _IntroDetailState extends CommonCollapseSlidePageState<PgcIntroPanel> {
               isScrollable: true,
               tabAlignment: TabAlignment.start,
               dividerColor: Colors.transparent,
-              tabs: const [Tab(text: '详情'), Tab(text: '点评')],
+              tabs: const [
+                Tab(text: '详情'),
+                Tab(text: '点评'),
+              ],
               onTap: (index) {
                 if (!_tabController.indexIsChanging) {
                   if (index == 0) {
@@ -176,7 +179,7 @@ class _IntroDetailState extends CommonCollapseSlidePageState<PgcIntroPanel> {
                   ),
                 )
                 .toList(),
-          )
+          ),
         ],
       ],
     );
diff --git a/lib/pages/video/introduction/pgc/widgets/pgc_panel.dart b/lib/pages/video/introduction/pgc/widgets/pgc_panel.dart
index fbdc33c6a..3dada8c4b 100644
--- a/lib/pages/video/introduction/pgc/widgets/pgc_panel.dart
+++ b/lib/pages/video/introduction/pgc/widgets/pgc_panel.dart
@@ -72,8 +72,10 @@ class _PgcPanelState extends State<PgcPanel> {
   void scrollToIndex() {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       listViewScrollCtr.animateTo(
-        (currentIndex * 150.0).clamp(listViewScrollCtr.position.minScrollExtent,
-            listViewScrollCtr.position.maxScrollExtent),
+        (currentIndex * 150.0).clamp(
+          listViewScrollCtr.position.minScrollExtent,
+          listViewScrollCtr.position.maxScrollExtent,
+        ),
         duration: const Duration(milliseconds: 500),
         curve: Curves.easeInOut,
       );
@@ -162,7 +164,9 @@ class _PgcPanelState extends State<PgcPanel> {
                     },
                     child: Padding(
                       padding: const EdgeInsets.symmetric(
-                          vertical: 8, horizontal: 10),
+                        vertical: 8,
+                        horizontal: 10,
+                      ),
                       child: Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: <Widget>[
@@ -175,21 +179,24 @@ class _PgcPanelState extends State<PgcPanel> {
                                   height: 12,
                                   semanticLabel: "正在播放：",
                                 ),
-                                const SizedBox(width: 6)
+                                const SizedBox(width: 6),
                               ],
                               Expanded(
-                                  child: Text(
-                                item.title ?? '第${index + 1}话',
-                                maxLines: (item.longTitle != null &&
-                                        item.longTitle != '')
-                                    ? 1
-                                    : 2,
-                                style: TextStyle(
+                                child: Text(
+                                  item.title ?? '第${index + 1}话',
+                                  maxLines:
+                                      (item.longTitle != null &&
+                                          item.longTitle != '')
+                                      ? 1
+                                      : 2,
+                                  style: TextStyle(
                                     fontSize: 13,
                                     color: index == currentIndex
                                         ? theme.colorScheme.primary
-                                        : theme.colorScheme.onSurface),
-                              )),
+                                        : theme.colorScheme.onSurface,
+                                  ),
+                                ),
+                              ),
                               const SizedBox(width: 2),
                               if (item.badge != null) ...[
                                 const Spacer(),
@@ -207,7 +214,7 @@ class _PgcPanelState extends State<PgcPanel> {
                                       color: theme.colorScheme.primary,
                                     ),
                                   ),
-                              ]
+                              ],
                             ],
                           ),
                           if (item.longTitle != null &&
@@ -217,13 +224,14 @@ class _PgcPanelState extends State<PgcPanel> {
                               item.longTitle!,
                               maxLines: 1,
                               style: TextStyle(
-                                  fontSize: 13,
-                                  color: index == currentIndex
-                                      ? theme.colorScheme.primary
-                                      : theme.colorScheme.onSurface),
+                                fontSize: 13,
+                                color: index == currentIndex
+                                    ? theme.colorScheme.primary
+                                    : theme.colorScheme.onSurface,
+                              ),
                               overflow: TextOverflow.ellipsis,
-                            )
-                          ]
+                            ),
+                          ],
                         ],
                       ),
                     ),
diff --git a/lib/pages/video/introduction/ugc/controller.dart b/lib/pages/video/introduction/ugc/controller.dart
index 12fa49ad6..f352a102b 100644
--- a/lib/pages/video/introduction/ugc/controller.dart
+++ b/lib/pages/video/introduction/ugc/controller.dart
@@ -81,8 +81,9 @@ class VideoIntroController extends CommonIntroController with ReloadMixin {
   void onInit() {
     super.onInit();
     bool alwaysExapndIntroPanel = Pref.alwaysExapndIntroPanel;
-    expandableCtr =
-        ExpandableController(initialExpanded: alwaysExapndIntroPanel);
+    expandableCtr = ExpandableController(
+      initialExpanded: alwaysExapndIntroPanel,
+    );
     if (!alwaysExapndIntroPanel && Pref.exapndIntroPanelH) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         if (Get.context!.orientation == Orientation.landscape &&
@@ -103,8 +104,10 @@ class VideoIntroController extends CommonIntroController with ReloadMixin {
         if (videoItem.title case String e) {
           videoDetail.value.title = e;
         } else if (videoItem.title case List list) {
-          videoDetail.value.title =
-              list.fold<String>('', (prev, val) => prev + val['text']);
+          videoDetail.value.title = list.fold<String>(
+            '',
+            (prev, val) => prev + val['text'],
+          );
         }
       }
     } catch (_) {}
@@ -132,8 +135,9 @@ class VideoIntroController extends CommonIntroController with ReloadMixin {
       }
       videoDetail.value = data;
       try {
-        final videoDetailController =
-            Get.find<VideoDetailController>(tag: heroTag);
+        final videoDetailController = Get.find<VideoDetailController>(
+          tag: heroTag,
+        );
         if (videoDetailController.cover.value.isEmpty ||
             (videoDetailController.videoUrl.isNullOrEmpty &&
                 !videoDetailController.isQuerying)) {
@@ -141,8 +145,9 @@ class VideoIntroController extends CommonIntroController with ReloadMixin {
         }
         if (videoDetailController.showReply) {
           try {
-            final videoReplyController =
-                Get.find<VideoReplyController>(tag: heroTag);
+            final videoReplyController = Get.find<VideoReplyController>(
+              tag: heroTag,
+            );
             videoReplyController.count.value = data.stat?.reply ?? 0;
           } catch (_) {}
         }
@@ -166,17 +171,19 @@ class VideoIntroController extends CommonIntroController with ReloadMixin {
   // 获取up主粉丝数
   Future<void> queryUserStat(List<Staff>? staff) async {
     if (staff?.isNotEmpty == true) {
-      Request().get(
-        Api.relations,
-        queryParameters: {'fids': staff!.map((item) => item.mid).join(',')},
-      ).then((res) {
-        if (res.data['code'] == 0) {
-          staffRelations.addAll({
-            'status': true,
-            if (res.data['data'] != null) ...res.data['data'],
+      Request()
+          .get(
+            Api.relations,
+            queryParameters: {'fids': staff!.map((item) => item.mid).join(',')},
+          )
+          .then((res) {
+            if (res.data['code'] == 0) {
+              staffRelations.addAll({
+                'status': true,
+                if (res.data['data'] != null) ...res.data['data'],
+              });
+            }
           });
-        }
-      });
     } else {
       final mid = videoDetail.value.owner?.mid;
       if (mid == null) {
@@ -258,8 +265,10 @@ class VideoIntroController extends CommonIntroController with ReloadMixin {
       SmartDialog.showToast('账号未登录');
       return;
     }
-    var result =
-        await VideoHttp.dislikeVideo(bvid: bvid, type: !hasDislike.value);
+    var result = await VideoHttp.dislikeVideo(
+      bvid: bvid,
+      type: !hasDislike.value,
+    );
     if (result['status']) {
       if (!hasDislike.value) {
         SmartDialog.showToast('点踩成功');
@@ -401,103 +410,106 @@ class VideoIntroController extends CommonIntroController with ReloadMixin {
   // 分享视频
   void actionShareVideo(BuildContext context) {
     showDialog(
-        context: context,
-        builder: (_) {
-          final videoDetail = this.videoDetail.value;
-          String videoUrl = '${HttpString.baseUrl}/video/$bvid';
-          return AlertDialog(
-            clipBehavior: Clip.hardEdge,
-            contentPadding: const EdgeInsets.symmetric(vertical: 12),
-            content: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                ListTile(
-                  dense: true,
-                  title: const Text(
-                    '复制链接',
-                    style: TextStyle(fontSize: 14),
-                  ),
-                  onTap: () {
-                    Get.back();
-                    Utils.copyText(videoUrl);
-                  },
+      context: context,
+      builder: (_) {
+        final videoDetail = this.videoDetail.value;
+        String videoUrl = '${HttpString.baseUrl}/video/$bvid';
+        return AlertDialog(
+          clipBehavior: Clip.hardEdge,
+          contentPadding: const EdgeInsets.symmetric(vertical: 12),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              ListTile(
+                dense: true,
+                title: const Text(
+                  '复制链接',
+                  style: TextStyle(fontSize: 14),
                 ),
-                ListTile(
-                  dense: true,
-                  title: const Text(
-                    '其它app打开',
-                    style: TextStyle(fontSize: 14),
-                  ),
-                  onTap: () {
-                    Get.back();
-                    PageUtils.launchURL(videoUrl);
-                  },
+                onTap: () {
+                  Get.back();
+                  Utils.copyText(videoUrl);
+                },
+              ),
+              ListTile(
+                dense: true,
+                title: const Text(
+                  '其它app打开',
+                  style: TextStyle(fontSize: 14),
                 ),
-                ListTile(
-                  dense: true,
-                  title: const Text(
-                    '分享视频',
-                    style: TextStyle(fontSize: 14),
-                  ),
-                  onTap: () {
-                    Get.back();
-                    Utils.shareText('${videoDetail.title} '
-                        'UP主: ${videoDetail.owner!.name!}'
-                        ' - $videoUrl');
-                  },
+                onTap: () {
+                  Get.back();
+                  PageUtils.launchURL(videoUrl);
+                },
+              ),
+              ListTile(
+                dense: true,
+                title: const Text(
+                  '分享视频',
+                  style: TextStyle(fontSize: 14),
                 ),
-                ListTile(
-                  dense: true,
-                  title: const Text(
-                    '分享至动态',
-                    style: TextStyle(fontSize: 14),
-                  ),
-                  onTap: () {
-                    Get.back();
-                    showModalBottomSheet(
-                      context: context,
-                      isScrollControlled: true,
-                      useSafeArea: true,
-                      builder: (context) => RepostPanel(
-                        rid: videoDetail.aid,
-                        dynType: 8,
-                        pic: videoDetail.pic,
-                        title: videoDetail.title,
-                        uname: videoDetail.owner?.name,
-                      ),
+                onTap: () {
+                  Get.back();
+                  Utils.shareText(
+                    '${videoDetail.title} '
+                    'UP主: ${videoDetail.owner!.name!}'
+                    ' - $videoUrl',
+                  );
+                },
+              ),
+              ListTile(
+                dense: true,
+                title: const Text(
+                  '分享至动态',
+                  style: TextStyle(fontSize: 14),
+                ),
+                onTap: () {
+                  Get.back();
+                  showModalBottomSheet(
+                    context: context,
+                    isScrollControlled: true,
+                    useSafeArea: true,
+                    builder: (context) => RepostPanel(
+                      rid: videoDetail.aid,
+                      dynType: 8,
+                      pic: videoDetail.pic,
+                      title: videoDetail.title,
+                      uname: videoDetail.owner?.name,
+                    ),
+                  );
+                },
+              ),
+              ListTile(
+                dense: true,
+                title: const Text(
+                  '分享至消息',
+                  style: TextStyle(fontSize: 14),
+                ),
+                onTap: () {
+                  Get.back();
+                  try {
+                    PageUtils.pmShare(
+                      context,
+                      content: {
+                        "id": videoDetail.aid!.toString(),
+                        "title": videoDetail.title!,
+                        "headline": videoDetail.title!,
+                        "source": 5,
+                        "thumb": videoDetail.pic!,
+                        "author": videoDetail.owner!.name!,
+                        "author_id": videoDetail.owner!.mid!.toString(),
+                      },
                     );
-                  },
-                ),
-                ListTile(
-                  dense: true,
-                  title: const Text(
-                    '分享至消息',
-                    style: TextStyle(fontSize: 14),
-                  ),
-                  onTap: () {
-                    Get.back();
-                    try {
-                      PageUtils.pmShare(
-                        context,
-                        content: {
-                          "id": videoDetail.aid!.toString(),
-                          "title": videoDetail.title!,
-                          "headline": videoDetail.title!,
-                          "source": 5,
-                          "thumb": videoDetail.pic!,
-                          "author": videoDetail.owner!.name!,
-                          "author_id": videoDetail.owner!.mid!.toString(),
-                        },
-                      );
-                    } catch (e) {
-                      SmartDialog.showToast(e.toString());
-                    }
-                  },
-                ),
-              ],
-            ),
-          );
-        });
+                  } catch (e) {
+                    SmartDialog.showToast(e.toString());
+                  }
+                },
+              ),
+            ],
+          ),
+        );
+      },
+    );
   }
 
   @override
@@ -695,13 +707,15 @@ class VideoIntroController extends CommonIntroController with ReloadMixin {
       }
     }
 
-    final int currentIndex = episodes.indexWhere((e) =>
-        e.cid ==
-        (skipPages
-            ? videoDetail.isPageReversed == true
-                ? videoDetail.pages!.last.cid
-                : videoDetail.pages!.first.cid
-            : lastPlayCid.value));
+    final int currentIndex = episodes.indexWhere(
+      (e) =>
+          e.cid ==
+          (skipPages
+              ? videoDetail.isPageReversed == true
+                    ? videoDetail.pages!.last.cid
+                    : videoDetail.pages!.first.cid
+              : lastPlayCid.value),
+    );
     int prevIndex = currentIndex - 1;
     final PlayRepeat playRepeat = videoDetailCtr.plPlayerController.playRepeat;
 
@@ -759,13 +773,15 @@ class VideoIntroController extends CommonIntroController with ReloadMixin {
         return false;
       }
 
-      final int currentIndex = episodes.indexWhere((e) =>
-          e.cid ==
-          (skipPages
-              ? videoDetail.isPageReversed == true
-                  ? videoDetail.pages!.last.cid
-                  : videoDetail.pages!.first.cid
-              : videoDetailCtr.cid.value));
+      final int currentIndex = episodes.indexWhere(
+        (e) =>
+            e.cid ==
+            (skipPages
+                ? videoDetail.isPageReversed == true
+                      ? videoDetail.pages!.last.cid
+                      : videoDetail.pages!.first.cid
+                : videoDetailCtr.cid.value),
+      );
 
       int nextIndex = currentIndex + 1;
 
diff --git a/lib/pages/video/introduction/ugc/view.dart b/lib/pages/video/introduction/ugc/view.dart
index c591c33e2..48b7d7056 100644
--- a/lib/pages/video/introduction/ugc/view.dart
+++ b/lib/pages/video/introduction/ugc/view.dart
@@ -83,7 +83,8 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
     );
     return SliverLayoutBuilder(
       builder: (context, constraints) {
-        bool isHorizontal = context.orientation == Orientation.landscape &&
+        bool isHorizontal =
+            context.orientation == Orientation.landscape &&
             constraints.crossAxisExtent >
                 constraints.viewportMainAxisExtent * 1.25;
         return SliverPadding(
@@ -145,7 +146,8 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
                                 child: SingleChildScrollView(
                                   scrollDirection: Axis.horizontal,
                                   physics: ReloadScrollPhysics(
-                                      controller: introController),
+                                    controller: introController,
+                                  ),
                                   child: Row(
                                     spacing: 25,
                                     children: videoDetail.staff!
@@ -157,9 +159,14 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
                             if (isHorizontal) ...[
                               const SizedBox(width: 10),
                               Expanded(
-                                  child: actionGrid(context, isLoading,
-                                      videoDetail, introController)),
-                            ]
+                                child: actionGrid(
+                                  context,
+                                  isLoading,
+                                  videoDetail,
+                                  introController,
+                                ),
+                              ),
+                            ],
                           ],
                         ),
                       ),
@@ -181,8 +188,11 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
                               Feedback.forLongPress(context);
                               Utils.copyText(videoDetail.title ?? '');
                             },
-                            child: _buildVideoTitle(theme, videoDetail,
-                                isExpand: true),
+                            child: _buildVideoTitle(
+                              theme,
+                              videoDetail,
+                              isExpand: true,
+                            ),
                           ),
                           theme: expandTheme,
                         ),
@@ -211,7 +221,7 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
                               const WidgetSpan(child: SizedBox(width: 2)),
                               TextSpan(
                                 text: '${videoDetail.argueInfo!.argueMsg}',
-                              )
+                              ),
                             ],
                           ),
                           style: TextStyle(
@@ -258,7 +268,7 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
                                 return const SizedBox.shrink();
                               }
                               return _buildTags(videoTags!);
-                            })
+                            }),
                           ],
                         ),
                         theme: expandTheme,
@@ -285,14 +295,19 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
                       if (!isHorizontal) ...[
                         const SizedBox(height: 8),
                         actionGrid(
-                            context, isLoading, videoDetail, introController),
+                          context,
+                          isLoading,
+                          videoDetail,
+                          introController,
+                        ),
                       ],
                       // 合集
                       if (!isLoading &&
                           videoDetail.ugcSeason != null &&
                           (context.orientation != Orientation.landscape ||
                               (context.orientation == Orientation.landscape &&
-                                  !videoDetailCtr.plPlayerController
+                                  !videoDetailCtr
+                                      .plPlayerController
                                       .horizontalSeasonPanel)))
                         SeasonPanel(
                           heroTag: widget.heroTag,
@@ -305,7 +320,8 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
                           videoDetail.pages!.length > 1 &&
                           (context.orientation != Orientation.landscape ||
                               (context.orientation == Orientation.landscape &&
-                                  !videoDetailCtr.plPlayerController
+                                  !videoDetailCtr
+                                      .plPlayerController
                                       .horizontalSeasonPanel))) ...[
                         PagesPanel(
                           heroTag: widget.heroTag,
@@ -356,8 +372,11 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
     );
   }
 
-  Widget _buildVideoTitle(ThemeData theme, VideoDetailData videoDetail,
-      {bool isExpand = false}) {
+  Widget _buildVideoTitle(
+    ThemeData theme,
+    VideoDetailData videoDetail, {
+    bool isExpand = false,
+  }) {
     late final isDark = theme.brightness == Brightness.dark;
     Widget child() {
       final videoLabel = videoDetailCtr.videoLabel.value;
@@ -480,7 +499,7 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
               4 || 6 => '已互关',
               128 => '已拉黑',
               -10 => '特别关注',
-              _ => ' 关注 '
+              _ => ' 关注 ',
             },
             style: const TextStyle(fontSize: 13),
           ),
@@ -512,7 +531,8 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
                   ? NumUtil.numFormat(videoDetail.stat!.like!)
                   : null,
               needAnim: true,
-              hasTriple: videoIntroController.hasLike.value &&
+              hasTriple:
+                  videoIntroController.hasLike.value &&
                   videoIntroController.hasCoin &&
                   videoIntroController.hasFav.value,
               callBack: (start) {
@@ -557,8 +577,10 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
               icon: const Icon(FontAwesomeIcons.star),
               selectIcon: const Icon(FontAwesomeIcons.solidStar),
               onTap: () => videoIntroController.showFavBottomSheet(context),
-              onLongPress: () => videoIntroController
-                  .showFavBottomSheet(context, type: 'longPress'),
+              onLongPress: () => videoIntroController.showFavBottomSheet(
+                context,
+                type: 'longPress',
+              ),
               selectStatus: videoIntroController.hasFav.value,
               semanticsLabel: '收藏',
               text: !isLoading
@@ -582,8 +604,9 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
             onTap: () => videoIntroController.actionShareVideo(context),
             selectStatus: false,
             semanticsLabel: '分享',
-            text:
-                !isLoading ? NumUtil.numFormat(videoDetail.stat!.share!) : null,
+            text: !isLoading
+                ? NumUtil.numFormat(videoDetail.stat!.share!)
+                : null,
           ),
         ],
       ),
@@ -726,38 +749,40 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
               Positioned(
                 top: 0,
                 right: -6,
-                child: Obx(() => introController.staffRelations['status'] ==
-                            true &&
-                        introController.staffRelations['${item.mid}'] == null
-                    ? Material(
-                        type: MaterialType.transparency,
-                        shape: const CircleBorder(),
-                        child: InkWell(
-                          customBorder: const CircleBorder(),
-                          onTap: () => RequestUtils.actionRelationMod(
-                            context: context,
-                            mid: item.mid,
-                            isFollow: false,
-                            callback: (val) {
-                              introController.staffRelations['${item.mid}'] =
-                                  true;
-                            },
-                          ),
-                          child: Ink(
-                            padding: const EdgeInsets.all(2),
-                            decoration: BoxDecoration(
-                              color: theme.colorScheme.secondaryContainer,
-                              shape: BoxShape.circle,
+                child: Obx(
+                  () =>
+                      introController.staffRelations['status'] == true &&
+                          introController.staffRelations['${item.mid}'] == null
+                      ? Material(
+                          type: MaterialType.transparency,
+                          shape: const CircleBorder(),
+                          child: InkWell(
+                            customBorder: const CircleBorder(),
+                            onTap: () => RequestUtils.actionRelationMod(
+                              context: context,
+                              mid: item.mid,
+                              isFollow: false,
+                              callback: (val) {
+                                introController.staffRelations['${item.mid}'] =
+                                    true;
+                              },
                             ),
-                            child: Icon(
-                              MdiIcons.plus,
-                              size: 16,
-                              color: theme.colorScheme.onSecondaryContainer,
+                            child: Ink(
+                              padding: const EdgeInsets.all(2),
+                              decoration: BoxDecoration(
+                                color: theme.colorScheme.secondaryContainer,
+                                shape: BoxShape.circle,
+                              ),
+                              child: Icon(
+                                MdiIcons.plus,
+                                size: 16,
+                                color: theme.colorScheme.onSecondaryContainer,
+                              ),
                             ),
                           ),
-                        ),
-                      )
-                    : const SizedBox.shrink()),
+                        )
+                      : const SizedBox.shrink(),
+                ),
               ),
             ],
           ),
@@ -791,124 +816,126 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
     );
   }
 
-  Widget _buildAvatar(ThemeData theme, VoidCallback onPushMember) =>
-      GestureDetector(
-        onTap: onPushMember,
-        behavior: HitTestBehavior.opaque,
-        child: Obx(
-          () {
-            final userStat = introController.userStat.value;
-            final isVip = (userStat.card?.vip?.status ?? 0) > 0;
-            return Row(
-              mainAxisSize: MainAxisSize.min,
+  Widget _buildAvatar(
+    ThemeData theme,
+    VoidCallback onPushMember,
+  ) => GestureDetector(
+    onTap: onPushMember,
+    behavior: HitTestBehavior.opaque,
+    child: Obx(
+      () {
+        final userStat = introController.userStat.value;
+        final isVip = (userStat.card?.vip?.status ?? 0) > 0;
+        return Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            PendantAvatar(
+              avatar: userStat.card?.face,
+              size: 35,
+              badgeSize: 14,
+              isVip: isVip,
+              officialType: userStat.card?.officialVerify?.type,
+            ),
+            const SizedBox(width: 10),
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                PendantAvatar(
-                  avatar: userStat.card?.face,
-                  size: 35,
-                  badgeSize: 14,
-                  isVip: isVip,
-                  officialType: userStat.card?.officialVerify?.type,
+                Text(
+                  userStat.card?.name ?? "",
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: TextStyle(
+                    fontSize: 13,
+                    color: isVip && userStat.card?.vip?.type == 2
+                        ? context.vipColor
+                        : null,
+                  ),
                 ),
-                const SizedBox(width: 10),
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      userStat.card?.name ?? "",
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                      style: TextStyle(
-                        fontSize: 13,
-                        color: isVip && userStat.card?.vip?.type == 2
-                            ? context.vipColor
-                            : null,
-                      ),
-                    ),
-                    const SizedBox(height: 0),
-                    Text(
-                      '${NumUtil.numFormat(userStat.follower)}粉丝    ${'${NumUtil.numFormat(userStat.archiveCount)}视频'}',
-                      style: TextStyle(
-                        fontSize: 12,
-                        color: theme.colorScheme.outline,
-                      ),
-                    ),
-                  ],
+                const SizedBox(height: 0),
+                Text(
+                  '${NumUtil.numFormat(userStat.follower)}粉丝    ${'${NumUtil.numFormat(userStat.archiveCount)}视频'}',
+                  style: TextStyle(
+                    fontSize: 12,
+                    color: theme.colorScheme.outline,
+                  ),
                 ),
               ],
-            );
-          },
-        ),
-      );
+            ),
+          ],
+        );
+      },
+    ),
+  );
 
   Widget _buildInfo(ThemeData theme, VideoDetailData videoDetail) => Row(
-        spacing: 10,
-        children: [
-          StatWidget(
-            type: StatType.play,
-            value: videoDetail.stat?.view,
-            color: theme.colorScheme.outline,
-          ),
-          StatWidget(
-            type: StatType.danmaku,
-            value: videoDetail.stat?.danmaku,
-            color: theme.colorScheme.outline,
-          ),
-          Text(
-            DateUtil.format(videoDetail.pubdate),
+    spacing: 10,
+    children: [
+      StatWidget(
+        type: StatType.play,
+        value: videoDetail.stat?.view,
+        color: theme.colorScheme.outline,
+      ),
+      StatWidget(
+        type: StatType.danmaku,
+        value: videoDetail.stat?.danmaku,
+        color: theme.colorScheme.outline,
+      ),
+      Text(
+        DateUtil.format(videoDetail.pubdate),
+        style: TextStyle(
+          fontSize: 12,
+          color: theme.colorScheme.outline,
+        ),
+      ),
+      if (MineController.anonymity.value)
+        Icon(
+          MdiIcons.incognito,
+          size: 15,
+          color: theme.colorScheme.outline,
+          semanticLabel: '无痕',
+        ),
+      if (introController.isShowOnlineTotal)
+        Obx(
+          () => Text(
+            '${introController.total.value}人在看',
             style: TextStyle(
               fontSize: 12,
               color: theme.colorScheme.outline,
             ),
           ),
-          if (MineController.anonymity.value)
-            Icon(
-              MdiIcons.incognito,
-              size: 15,
-              color: theme.colorScheme.outline,
-              semanticLabel: '无痕',
-            ),
-          if (introController.isShowOnlineTotal)
-            Obx(
-              () => Text(
-                '${introController.total.value}人在看',
-                style: TextStyle(
-                  fontSize: 12,
-                  color: theme.colorScheme.outline,
-                ),
-              ),
-            ),
-        ],
-      );
+        ),
+    ],
+  );
 
   Widget get _aiBtn => Positioned(
-        right: 10,
-        top: 0,
-        bottom: 0,
-        child: Center(
-          child: Semantics(
-            label: 'AI总结',
-            child: GestureDetector(
-              onTap: () async {
-                if (introController.aiConclusionResult == null) {
-                  await introController.aiConclusion();
-                }
-                if (introController.aiConclusionResult == null) {
-                  return;
-                }
-                if (introController.aiConclusionResult!.summary?.isNotEmpty ==
-                        true ||
-                    introController.aiConclusionResult!.outline?.isNotEmpty ==
-                        true) {
-                  widget.showAiBottomSheet();
-                } else {
-                  SmartDialog.showToast("当前视频不支持AI视频总结");
-                }
-              },
-              child: Image.asset('assets/images/ai.png', height: 22),
-            ),
-          ),
+    right: 10,
+    top: 0,
+    bottom: 0,
+    child: Center(
+      child: Semantics(
+        label: 'AI总结',
+        child: GestureDetector(
+          onTap: () async {
+            if (introController.aiConclusionResult == null) {
+              await introController.aiConclusion();
+            }
+            if (introController.aiConclusionResult == null) {
+              return;
+            }
+            if (introController.aiConclusionResult!.summary?.isNotEmpty ==
+                    true ||
+                introController.aiConclusionResult!.outline?.isNotEmpty ==
+                    true) {
+              widget.showAiBottomSheet();
+            } else {
+              SmartDialog.showToast("当前视频不支持AI视频总结");
+            }
+          },
+          child: Image.asset('assets/images/ai.png', height: 22),
         ),
-      );
+      ),
+    ),
+  );
 
   Widget _buildTags(List<VideoTagItem> tags) {
     return GestureDetector(
diff --git a/lib/pages/video/introduction/ugc/widgets/menu_row.dart b/lib/pages/video/introduction/ugc/widgets/menu_row.dart
index 0e687f583..ad392a936 100644
--- a/lib/pages/video/introduction/ugc/widgets/menu_row.dart
+++ b/lib/pages/video/introduction/ugc/widgets/menu_row.dart
@@ -60,10 +60,11 @@ class ActionRowLineItem extends StatelessWidget {
                 child: Text(
                   text!,
                   style: TextStyle(
-                      fontSize: 13,
-                      color: selectStatus
-                          ? theme.colorScheme.onSecondaryContainer
-                          : theme.colorScheme.outline),
+                    fontSize: 13,
+                    color: selectStatus
+                        ? theme.colorScheme.onSecondaryContainer
+                        : theme.colorScheme.outline,
+                  ),
                 ),
               ),
             ],
diff --git a/lib/pages/video/introduction/ugc/widgets/page.dart b/lib/pages/video/introduction/ugc/widgets/page.dart
index 088cd40e6..b3c225e4b 100644
--- a/lib/pages/video/introduction/ugc/widgets/page.dart
+++ b/lib/pages/video/introduction/ugc/widgets/page.dart
@@ -44,8 +44,9 @@ class _PagesPanelState extends State<PagesPanel> {
   @override
   void initState() {
     super.initState();
-    _videoDetailController =
-        Get.find<VideoDetailController>(tag: widget.heroTag);
+    _videoDetailController = Get.find<VideoDetailController>(
+      tag: widget.heroTag,
+    );
     if (widget.list == null) {
       cid = widget.videoIntroController.lastPlayCid.value;
       pageIndex = pages.indexWhere((Part e) => e.cid == cid);
@@ -68,8 +69,9 @@ class _PagesPanelState extends State<PagesPanel> {
     }
     const double itemWidth = 150;
     final double targetOffset = (pageIndex * itemWidth - itemWidth / 2).clamp(
-        _scrollController.position.minScrollExtent,
-        _scrollController.position.maxScrollExtent);
+      _scrollController.position.minScrollExtent,
+      _scrollController.position.maxScrollExtent,
+    );
     _scrollController.animateTo(
       targetOffset,
       duration: const Duration(milliseconds: 300),
@@ -162,7 +164,10 @@ class _PagesPanelState extends State<PagesPanel> {
                         widget.cover,
                       );
                       if (widget.list != null &&
-                          widget.videoIntroController.videoDetail.value
+                          widget
+                                  .videoIntroController
+                                  .videoDetail
+                                  .value
                                   .ugcSeason !=
                               null) {
                         _videoDetailController.seasonCid = pages.first.cid;
@@ -179,7 +184,7 @@ class _PagesPanelState extends State<PagesPanel> {
                               height: 12,
                               semanticLabel: "正在播放：",
                             ),
-                            const SizedBox(width: 6)
+                            const SizedBox(width: 6),
                           ],
                           Expanded(
                             child: Text(
@@ -202,7 +207,7 @@ class _PagesPanelState extends State<PagesPanel> {
               );
             },
           ),
-        )
+        ),
       ],
     );
   }
diff --git a/lib/pages/video/introduction/ugc/widgets/season.dart b/lib/pages/video/introduction/ugc/widgets/season.dart
index 1b5893af2..c031944d9 100644
--- a/lib/pages/video/introduction/ugc/widgets/season.dart
+++ b/lib/pages/video/introduction/ugc/widgets/season.dart
@@ -40,19 +40,20 @@ class _SeasonPanelState extends State<SeasonPanel> {
   @override
   void initState() {
     super.initState();
-    _videoDetailController =
-        Get.find<VideoDetailController>(tag: widget.heroTag);
+    _videoDetailController = Get.find<VideoDetailController>(
+      tag: widget.heroTag,
+    );
 
     _videoDetailController.seasonCid =
         videoIntroController.lastPlayCid.value != 0
-            ? (videoDetail.pages?.isNotEmpty == true
-                ? videoDetail.isPageReversed
+        ? (videoDetail.pages?.isNotEmpty == true
+              ? videoDetail.isPageReversed
                     ? videoDetail.pages!.last.cid
                     : videoDetail.pages!.first.cid
-                : videoIntroController.lastPlayCid.value)
-            : videoDetail.isPageReversed
-                ? videoDetail.pages!.last.cid
-                : videoDetail.pages!.first.cid;
+              : videoIntroController.lastPlayCid.value)
+        : videoDetail.isPageReversed
+        ? videoDetail.pages!.last.cid
+        : videoDetail.pages!.first.cid;
 
     /// 根据 cid 找到对应集，找到对应 episodes
     /// 有多个episodes时，只显示其中一个
@@ -63,7 +64,8 @@ class _SeasonPanelState extends State<SeasonPanel> {
 
     /// 取对应 season_id 的 episodes
     currentIndex.value = episodes.indexWhere(
-        (EpisodeItem e) => e.cid == _videoDetailController.seasonCid);
+      (EpisodeItem e) => e.cid == _videoDetailController.seasonCid,
+    );
     _listener = _videoDetailController.cid.listen((int cid) {
       if (_videoDetailController.seasonCid != cid) {
         bool isPart =
@@ -74,7 +76,8 @@ class _SeasonPanelState extends State<SeasonPanel> {
       }
       _findEpisode();
       currentIndex.value = episodes.indexWhere(
-          (EpisodeItem e) => e.cid == _videoDetailController.seasonCid);
+        (EpisodeItem e) => e.cid == _videoDetailController.seasonCid,
+      );
     });
   }
 
@@ -104,13 +107,13 @@ class _SeasonPanelState extends State<SeasonPanel> {
           onTap: widget.onTap == false
               ? null
               : () => widget.showEpisodes(
-                    _videoDetailController.seasonIndex.value,
-                    videoDetail.ugcSeason,
-                    null,
-                    _videoDetailController.bvid,
-                    null,
-                    _videoDetailController.seasonCid,
-                  ),
+                  _videoDetailController.seasonIndex.value,
+                  videoDetail.ugcSeason,
+                  null,
+                  _videoDetailController.bvid,
+                  null,
+                  _videoDetailController.seasonCid,
+                ),
           child: Padding(
             padding: const EdgeInsets.fromLTRB(8, 12, 8, 12),
             child: Row(
@@ -143,7 +146,7 @@ class _SeasonPanelState extends State<SeasonPanel> {
                   Icons.arrow_forward_ios_outlined,
                   size: 13,
                   semanticLabel: '查看',
-                )
+                ),
               ],
             ),
           ),
diff --git a/lib/pages/video/medialist/view.dart b/lib/pages/video/medialist/view.dart
index 2b2c04b04..7edba5c79 100644
--- a/lib/pages/video/medialist/view.dart
+++ b/lib/pages/video/medialist/view.dart
@@ -63,8 +63,9 @@ class _MediaListPanelState
   void init() {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (mounted) {
-        int index = widget.mediaList
-            .indexWhere((item) => item.bvid == widget.getBvId());
+        int index = widget.mediaList.indexWhere(
+          (item) => item.bvid == widget.getBvId(),
+        );
         if (index > 0) {
           WidgetsBinding.instance.addPostFrameCallback((_) {
             try {
@@ -97,8 +98,9 @@ class _MediaListPanelState
                   final desc = this.desc.value;
                   return mediumButton(
                     tooltip: desc ? '顺序播放' : '倒序播放',
-                    icon:
-                        desc ? MdiIcons.sortAscending : MdiIcons.sortDescending,
+                    icon: desc
+                        ? MdiIcons.sortAscending
+                        : MdiIcons.sortDescending,
                     onPressed: () {
                       widget.onReverse();
                       this.desc.value = !desc;
@@ -137,189 +139,187 @@ class _MediaListPanelState
   }
 
   Widget _buildList(ThemeData theme) => Obx(
-        () {
-          final showDelBtn =
-              widget.onDelete != null && widget.mediaList.length > 1;
-          return ScrollablePositionedList.separated(
-            itemScrollController: _scrollController,
-            physics: const AlwaysScrollableScrollPhysics(),
-            itemCount: widget.mediaList.length,
-            padding: EdgeInsets.only(
-              top: 7,
-              bottom: MediaQuery.paddingOf(context).bottom + 80,
-            ),
-            itemBuilder: ((context, index) {
-              var item = widget.mediaList[index];
-              if (index == widget.mediaList.length - 1 &&
-                  (widget.count == null ||
-                      widget.mediaList.length < widget.count!)) {
-                widget.loadMoreMedia();
-              }
-              final isCurr = item.bvid == widget.getBvId();
-              return SizedBox(
-                height: 98,
-                child: Material(
-                  type: MaterialType.transparency,
-                  child: InkWell(
-                    onTap: () async {
-                      if (item.type != 2) {
-                        SmartDialog.showToast('不支持播放该类型视频');
-                        return;
-                      }
-                      Get.back();
-                      String bvid = item.bvid!;
-                      int? aid = item.aid;
-                      String cover = item.cover ?? '';
-                      final int? cid = item.cid ??
-                          await SearchHttp.ab2c(aid: aid, bvid: bvid);
-                      if (cid != null) {
-                        widget.changeMediaList?.call(bvid, cid, aid, cover);
-                      }
-                    },
-                    onLongPress: () => imageSaveDialog(
-                      title: item.title,
-                      cover: item.cover,
-                      aid: item.aid,
-                      bvid: item.bvid,
-                    ),
-                    child: Stack(
-                      clipBehavior: Clip.none,
-                      children: [
-                        Padding(
-                          padding: const EdgeInsets.symmetric(
-                            horizontal: 12,
-                            vertical: 5,
-                          ),
-                          child: Row(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              AspectRatio(
-                                aspectRatio: StyleString.aspectRatio,
-                                child: LayoutBuilder(
-                                  builder: (context, boxConstraints) {
-                                    return Stack(
-                                      clipBehavior: Clip.none,
-                                      children: [
-                                        NetworkImgLayer(
-                                          src: item.cover,
-                                          width: boxConstraints.maxWidth,
-                                          height: boxConstraints.maxHeight,
-                                        ),
-                                        if (item.badge?.text?.isNotEmpty ==
-                                            true)
-                                          PBadge(
-                                            text: item.badge?.text,
-                                            right: 6.0,
-                                            top: 6.0,
-                                            type: switch (item.badge?.text) {
-                                              '充电专属' => PBadgeType.error,
-                                              _ => PBadgeType.primary,
-                                            },
-                                          ),
-                                        PBadge(
-                                          text: DurationUtil.formatDuration(
-                                              item.duration),
-                                          right: 6.0,
-                                          bottom: 6.0,
-                                          type: PBadgeType.gray,
-                                        ),
-                                      ],
-                                    );
-                                  },
-                                ),
-                              ),
-                              const SizedBox(width: 10),
-                              Expanded(
-                                child: Column(
-                                  crossAxisAlignment: CrossAxisAlignment.start,
+    () {
+      final showDelBtn = widget.onDelete != null && widget.mediaList.length > 1;
+      return ScrollablePositionedList.separated(
+        itemScrollController: _scrollController,
+        physics: const AlwaysScrollableScrollPhysics(),
+        itemCount: widget.mediaList.length,
+        padding: EdgeInsets.only(
+          top: 7,
+          bottom: MediaQuery.paddingOf(context).bottom + 80,
+        ),
+        itemBuilder: ((context, index) {
+          var item = widget.mediaList[index];
+          if (index == widget.mediaList.length - 1 &&
+              (widget.count == null ||
+                  widget.mediaList.length < widget.count!)) {
+            widget.loadMoreMedia();
+          }
+          final isCurr = item.bvid == widget.getBvId();
+          return SizedBox(
+            height: 98,
+            child: Material(
+              type: MaterialType.transparency,
+              child: InkWell(
+                onTap: () async {
+                  if (item.type != 2) {
+                    SmartDialog.showToast('不支持播放该类型视频');
+                    return;
+                  }
+                  Get.back();
+                  String bvid = item.bvid!;
+                  int? aid = item.aid;
+                  String cover = item.cover ?? '';
+                  final int? cid =
+                      item.cid ?? await SearchHttp.ab2c(aid: aid, bvid: bvid);
+                  if (cid != null) {
+                    widget.changeMediaList?.call(bvid, cid, aid, cover);
+                  }
+                },
+                onLongPress: () => imageSaveDialog(
+                  title: item.title,
+                  cover: item.cover,
+                  aid: item.aid,
+                  bvid: item.bvid,
+                ),
+                child: Stack(
+                  clipBehavior: Clip.none,
+                  children: [
+                    Padding(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 12,
+                        vertical: 5,
+                      ),
+                      child: Row(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          AspectRatio(
+                            aspectRatio: StyleString.aspectRatio,
+                            child: LayoutBuilder(
+                              builder: (context, boxConstraints) {
+                                return Stack(
+                                  clipBehavior: Clip.none,
                                   children: [
-                                    Text(
-                                      item.title!,
-                                      maxLines: 2,
-                                      overflow: TextOverflow.ellipsis,
-                                      style: TextStyle(
-                                        fontWeight:
-                                            isCurr ? FontWeight.bold : null,
-                                        color: isCurr
-                                            ? theme.colorScheme.primary
-                                            : null,
-                                      ),
+                                    NetworkImgLayer(
+                                      src: item.cover,
+                                      width: boxConstraints.maxWidth,
+                                      height: boxConstraints.maxHeight,
                                     ),
-                                    if (item.type == 24 &&
-                                        item.intro?.isNotEmpty == true) ...[
-                                      const SizedBox(height: 3),
-                                      Text(
-                                        item.intro!,
-                                        maxLines: 2,
-                                        overflow: TextOverflow.ellipsis,
-                                        style: TextStyle(
-                                          fontSize: 13,
-                                          color: theme.colorScheme.outline,
-                                        ),
+                                    if (item.badge?.text?.isNotEmpty == true)
+                                      PBadge(
+                                        text: item.badge?.text,
+                                        right: 6.0,
+                                        top: 6.0,
+                                        type: switch (item.badge?.text) {
+                                          '充电专属' => PBadgeType.error,
+                                          _ => PBadgeType.primary,
+                                        },
                                       ),
-                                    ],
-                                    const Spacer(),
-                                    Text(
-                                      item.upper!.name!,
-                                      maxLines: 1,
-                                      overflow: TextOverflow.ellipsis,
-                                      style: TextStyle(
-                                        fontSize: 12,
-                                        color: theme.colorScheme.outline,
+                                    PBadge(
+                                      text: DurationUtil.formatDuration(
+                                        item.duration,
                                       ),
+                                      right: 6.0,
+                                      bottom: 6.0,
+                                      type: PBadgeType.gray,
                                     ),
-                                    if (item.type == 2) ...[
-                                      const SizedBox(height: 3),
-                                      Row(
-                                        spacing: 8,
-                                        children: [
-                                          StatWidget(
-                                            type: StatType.play,
-                                            value: item.cntInfo!.play,
-                                          ),
-                                          StatWidget(
-                                            type: StatType.danmaku,
-                                            value: item.cntInfo!.danmaku,
-                                          ),
-                                        ],
-                                      ),
-                                    ],
                                   ],
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                        if (showDelBtn && !isCurr)
-                          Positioned(
-                            right: 12,
-                            bottom: -6,
-                            child: InkWell(
-                              customBorder: const CircleBorder(),
-                              onTap: () => showConfirmDialog(
-                                context: context,
-                                title: '确定移除该视频？',
-                                onConfirm: () => widget.onDelete!(item, index),
-                              ),
-                              onLongPress: () => widget.onDelete!(item, index),
-                              child: Padding(
-                                padding: const EdgeInsets.all(9),
-                                child: Icon(
-                                  Icons.clear,
-                                  size: 18,
-                                  color: theme.colorScheme.outline,
-                                ),
-                              ),
+                                );
+                              },
                             ),
                           ),
-                      ],
+                          const SizedBox(width: 10),
+                          Expanded(
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Text(
+                                  item.title!,
+                                  maxLines: 2,
+                                  overflow: TextOverflow.ellipsis,
+                                  style: TextStyle(
+                                    fontWeight: isCurr ? FontWeight.bold : null,
+                                    color: isCurr
+                                        ? theme.colorScheme.primary
+                                        : null,
+                                  ),
+                                ),
+                                if (item.type == 24 &&
+                                    item.intro?.isNotEmpty == true) ...[
+                                  const SizedBox(height: 3),
+                                  Text(
+                                    item.intro!,
+                                    maxLines: 2,
+                                    overflow: TextOverflow.ellipsis,
+                                    style: TextStyle(
+                                      fontSize: 13,
+                                      color: theme.colorScheme.outline,
+                                    ),
+                                  ),
+                                ],
+                                const Spacer(),
+                                Text(
+                                  item.upper!.name!,
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis,
+                                  style: TextStyle(
+                                    fontSize: 12,
+                                    color: theme.colorScheme.outline,
+                                  ),
+                                ),
+                                if (item.type == 2) ...[
+                                  const SizedBox(height: 3),
+                                  Row(
+                                    spacing: 8,
+                                    children: [
+                                      StatWidget(
+                                        type: StatType.play,
+                                        value: item.cntInfo!.play,
+                                      ),
+                                      StatWidget(
+                                        type: StatType.danmaku,
+                                        value: item.cntInfo!.danmaku,
+                                      ),
+                                    ],
+                                  ),
+                                ],
+                              ],
+                            ),
+                          ),
+                        ],
+                      ),
                     ),
-                  ),
+                    if (showDelBtn && !isCurr)
+                      Positioned(
+                        right: 12,
+                        bottom: -6,
+                        child: InkWell(
+                          customBorder: const CircleBorder(),
+                          onTap: () => showConfirmDialog(
+                            context: context,
+                            title: '确定移除该视频？',
+                            onConfirm: () => widget.onDelete!(item, index),
+                          ),
+                          onLongPress: () => widget.onDelete!(item, index),
+                          child: Padding(
+                            padding: const EdgeInsets.all(9),
+                            child: Icon(
+                              Icons.clear,
+                              size: 18,
+                              color: theme.colorScheme.outline,
+                            ),
+                          ),
+                        ),
+                      ),
+                  ],
                 ),
-              );
-            }),
-            separatorBuilder: (context, index) => const SizedBox(height: 2),
+              ),
+            ),
           );
-        },
+        }),
+        separatorBuilder: (context, index) => const SizedBox(height: 2),
       );
+    },
+  );
 }
diff --git a/lib/pages/video/member/controller.dart b/lib/pages/video/member/controller.dart
index dcecaeac4..7c1d1a5f6 100644
--- a/lib/pages/video/member/controller.dart
+++ b/lib/pages/video/member/controller.dart
@@ -93,8 +93,8 @@ class HorizontalMemberPageController
         aid: page == 1
             ? currAid
             : isLoadPrevious
-                ? firstAid
-                : lastAid,
+            ? firstAid
+            : lastAid,
         order: order.value,
         sort: page != 1 && isLoadPrevious ? 'asc' : null,
         pn: null,
diff --git a/lib/pages/video/member/view.dart b/lib/pages/video/member/view.dart
index 623f2dae4..2ee38e584 100644
--- a/lib/pages/video/member/view.dart
+++ b/lib/pages/video/member/view.dart
@@ -71,47 +71,48 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
     return switch (userState) {
       Loading() => loadingWidget,
       Success(:var response) => Column(
-          children: [
-            const SizedBox(height: 4),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                iconButton(
-                  context: context,
-                  onPressed: Get.back,
-                  tooltip: '关闭',
-                  icon: Icons.clear,
-                  size: 32,
-                ),
-                const SizedBox(width: 16),
-              ],
-            ),
-            _buildUserInfo(theme, response),
-            Expanded(
-              child: refreshIndicator(
-                onRefresh: _controller.onRefresh,
-                child: CustomScrollView(
-                  controller: _controller.scrollController,
-                  physics: const AlwaysScrollableScrollPhysics(),
-                  slivers: [
-                    _buildSliverHeader(theme),
-                    Obx(() =>
-                        _buildVideoList(theme, _controller.loadingState.value)),
-                  ],
-                ),
+        children: [
+          const SizedBox(height: 4),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.end,
+            children: [
+              iconButton(
+                context: context,
+                onPressed: Get.back,
+                tooltip: '关闭',
+                icon: Icons.clear,
+                size: 32,
+              ),
+              const SizedBox(width: 16),
+            ],
+          ),
+          _buildUserInfo(theme, response),
+          Expanded(
+            child: refreshIndicator(
+              onRefresh: _controller.onRefresh,
+              child: CustomScrollView(
+                controller: _controller.scrollController,
+                physics: const AlwaysScrollableScrollPhysics(),
+                slivers: [
+                  _buildSliverHeader(theme),
+                  Obx(
+                    () =>
+                        _buildVideoList(theme, _controller.loadingState.value),
+                  ),
+                ],
               ),
             ),
-          ],
-        ),
+          ),
+        ],
+      ),
       Error(:var errMsg) => scrollErrorWidget(
-          controller: _controller.scrollController,
-          errMsg: errMsg,
-          onReload: () {
-            _controller.userState.value =
-                LoadingState<MemberInfoModel>.loading();
-            _controller.getUserInfo();
-          },
-        ),
+        controller: _controller.scrollController,
+        errMsg: errMsg,
+        onReload: () {
+          _controller.userState.value = LoadingState<MemberInfoModel>.loading();
+          _controller.getUserInfo();
+        },
+      ),
     };
   }
 
@@ -141,8 +142,8 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
                 height: 35,
                 child: TextButton.icon(
                   onPressed: () => _controller
-                    ..lastAid =
-                        widget.videoDetailController.oid.value.toString()
+                    ..lastAid = widget.videoDetailController.oid.value
+                        .toString()
                     ..queryBySort(),
                   icon: Icon(
                     Icons.sort,
@@ -159,7 +160,7 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
                     ),
                   ),
                 ),
-              )
+              ),
             ],
           ),
         ),
@@ -168,58 +169,61 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
   }
 
   Widget _buildVideoList(
-      ThemeData theme, LoadingState<List<SpaceArchiveItem>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<SpaceArchiveItem>?> loadingState,
+  ) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: Grid.videoCardHDelegate(context),
-          delegate: SliverChildBuilderDelegate(
-            childCount: 10,
-            (context, index) {
-              return const VideoCardHSkeleton();
-            },
-          ),
+        gridDelegate: Grid.videoCardHDelegate(context),
+        delegate: SliverChildBuilderDelegate(
+          childCount: 10,
+          (context, index) {
+            return const VideoCardHSkeleton();
+          },
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverPadding(
-              padding: EdgeInsets.only(
-                bottom: MediaQuery.paddingOf(context).bottom + 80,
-              ),
-              sliver: SliverGrid(
-                gridDelegate: Grid.videoCardHDelegate(context),
-                delegate: SliverChildBuilderDelegate(
-                  (context, index) {
-                    if (index == response.length - 1 && _controller.hasNext) {
-                      _controller.onLoadMore();
-                    }
-                    final SpaceArchiveItem videoItem = response[index];
-                    return VideoCardHMemberVideo(
-                      videoItem: videoItem,
-                      bvid: _bvid,
-                      onTap: () {
-                        final status =
-                            widget.videoIntroController.changeSeasonOrbangu(
-                          null,
-                          videoItem.bvid,
-                          videoItem.cid,
-                          IdUtils.bv2av(videoItem.bvid!),
-                          videoItem.cover,
-                        );
-                        if (status) {
-                          _bvid = videoItem.bvid;
-                          setState(() {});
-                        }
-                      },
-                    );
-                  },
-                  childCount: response!.length,
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverPadding(
+                padding: EdgeInsets.only(
+                  bottom: MediaQuery.paddingOf(context).bottom + 80,
                 ),
-              ),
-            )
-          : HttpError(onReload: _controller.onReload),
+                sliver: SliverGrid(
+                  gridDelegate: Grid.videoCardHDelegate(context),
+                  delegate: SliverChildBuilderDelegate(
+                    (context, index) {
+                      if (index == response.length - 1 && _controller.hasNext) {
+                        _controller.onLoadMore();
+                      }
+                      final SpaceArchiveItem videoItem = response[index];
+                      return VideoCardHMemberVideo(
+                        videoItem: videoItem,
+                        bvid: _bvid,
+                        onTap: () {
+                          final status = widget.videoIntroController
+                              .changeSeasonOrbangu(
+                                null,
+                                videoItem.bvid,
+                                videoItem.cid,
+                                IdUtils.bv2av(videoItem.bvid!),
+                                videoItem.cover,
+                              );
+                          if (status) {
+                            _bvid = videoItem.bvid;
+                            setState(() {});
+                          }
+                        },
+                      );
+                    },
+                    childCount: response!.length,
+                  ),
+                ),
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
@@ -236,139 +240,140 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
   }
 
   Column _buildInfo(ThemeData theme, MemberInfoModel memberInfoModel) => Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
+    mainAxisSize: MainAxisSize.min,
+    crossAxisAlignment: CrossAxisAlignment.start,
+    children: [
+      Row(
         children: [
-          Row(
-            children: [
-              GestureDetector(
-                onTap: () => Utils.copyText(memberInfoModel.name ?? ''),
-                child: Text(
-                  memberInfoModel.name ?? '',
-                  style: TextStyle(
-                    fontSize: 16,
-                    fontWeight: FontWeight.bold,
-                    color: (memberInfoModel.vip?.status ?? -1) > 0 &&
-                            memberInfoModel.vip?.type == 2
-                        ? context.vipColor
-                        : null,
-                  ),
-                ),
+          GestureDetector(
+            onTap: () => Utils.copyText(memberInfoModel.name ?? ''),
+            child: Text(
+              memberInfoModel.name ?? '',
+              style: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.bold,
+                color:
+                    (memberInfoModel.vip?.status ?? -1) > 0 &&
+                        memberInfoModel.vip?.type == 2
+                    ? context.vipColor
+                    : null,
               ),
-              const SizedBox(width: 8),
-              Image.asset(
-                'assets/images/lv/lv${memberInfoModel.isSeniorMember == 1 ? '6_s' : memberInfoModel.level}.png',
-                height: 11,
-              ),
-            ],
-          ),
-          const SizedBox(height: 2),
-          Obx(
-            () => Row(
-              children: List.generate(5, (index) {
-                if (index % 2 == 0) {
-                  return _buildChildInfo(
-                    theme: theme,
-                    title: const ['粉丝', '关注', '获赞'][index ~/ 2],
-                    num: index == 0
-                        ? _controller.userStat['follower'] != null
-                            ? NumUtil.numFormat(
-                                _controller.userStat['follower'])
-                            : ''
-                        : index == 2
-                            ? _controller.userStat['following'] ?? ''
-                            : _controller.userStat['likes'] != null
-                                ? NumUtil.numFormat(
-                                    _controller.userStat['likes'])
-                                : '',
-                    onTap: () {
-                      if (index == 0) {
-                        Get.toNamed(
-                            '/fan?mid=${widget.mid}&name=${memberInfoModel.name}');
-                      } else if (index == 2) {
-                        Get.toNamed(
-                            '/follow?mid=${widget.mid}&name=${memberInfoModel.name}');
-                      }
-                    },
-                  );
-                } else {
-                  return SizedBox(
-                    height: 10,
-                    width: 20,
-                    child: VerticalDivider(
-                      width: 1,
-                      color: theme.colorScheme.outline,
-                    ),
-                  );
-                }
-              }),
             ),
           ),
-          const SizedBox(height: 2),
-          Row(
-            children: [
-              Expanded(
-                child: FilledButton.tonal(
-                  style: FilledButton.styleFrom(
-                    backgroundColor: memberInfoModel.isFollowed == true
-                        ? theme.colorScheme.onInverseSurface
-                        : null,
-                    foregroundColor: memberInfoModel.isFollowed == true
-                        ? theme.colorScheme.outline
-                        : null,
-                    padding: EdgeInsets.zero,
-                    visualDensity: const VisualDensity(vertical: -2),
-                  ),
-                  onPressed: () {
-                    if (widget.mid == accountService.mid) {
-                      Get.toNamed('/editProfile');
-                    } else {
-                      if (!accountService.isLogin.value) {
-                        SmartDialog.showToast('账号未登录');
-                        return;
-                      }
-                      RequestUtils.actionRelationMod(
-                        context: context,
-                        mid: widget.mid,
-                        isFollow: memberInfoModel.isFollowed ?? false,
-                        callback: (attribute) {
-                          _controller
-                            ..userState.value.data.isFollowed = attribute != 0
-                            ..userState.refresh();
-                        },
-                      );
-                    }
-                  },
-                  child: Text(
-                    widget.mid == accountService.mid
-                        ? '编辑资料'
-                        : memberInfoModel.isFollowed == true
-                            ? '已关注'
-                            : '关注',
-                    maxLines: 1,
-                    style: const TextStyle(fontSize: 14),
-                  ),
-                ),
-              ),
-              const SizedBox(width: 8),
-              Expanded(
-                child: OutlinedButton(
-                  style: OutlinedButton.styleFrom(
-                    padding: EdgeInsets.zero,
-                    visualDensity: const VisualDensity(vertical: -2),
-                  ),
-                  onPressed: () => Get.toNamed('/member?mid=${widget.mid}'),
-                  child: const Text(
-                    '查看主页',
-                    maxLines: 1,
-                    style: TextStyle(fontSize: 14),
-                  ),
-                ),
-              ),
-            ],
+          const SizedBox(width: 8),
+          Image.asset(
+            'assets/images/lv/lv${memberInfoModel.isSeniorMember == 1 ? '6_s' : memberInfoModel.level}.png',
+            height: 11,
           ),
         ],
-      );
+      ),
+      const SizedBox(height: 2),
+      Obx(
+        () => Row(
+          children: List.generate(5, (index) {
+            if (index % 2 == 0) {
+              return _buildChildInfo(
+                theme: theme,
+                title: const ['粉丝', '关注', '获赞'][index ~/ 2],
+                num: index == 0
+                    ? _controller.userStat['follower'] != null
+                          ? NumUtil.numFormat(_controller.userStat['follower'])
+                          : ''
+                    : index == 2
+                    ? _controller.userStat['following'] ?? ''
+                    : _controller.userStat['likes'] != null
+                    ? NumUtil.numFormat(_controller.userStat['likes'])
+                    : '',
+                onTap: () {
+                  if (index == 0) {
+                    Get.toNamed(
+                      '/fan?mid=${widget.mid}&name=${memberInfoModel.name}',
+                    );
+                  } else if (index == 2) {
+                    Get.toNamed(
+                      '/follow?mid=${widget.mid}&name=${memberInfoModel.name}',
+                    );
+                  }
+                },
+              );
+            } else {
+              return SizedBox(
+                height: 10,
+                width: 20,
+                child: VerticalDivider(
+                  width: 1,
+                  color: theme.colorScheme.outline,
+                ),
+              );
+            }
+          }),
+        ),
+      ),
+      const SizedBox(height: 2),
+      Row(
+        children: [
+          Expanded(
+            child: FilledButton.tonal(
+              style: FilledButton.styleFrom(
+                backgroundColor: memberInfoModel.isFollowed == true
+                    ? theme.colorScheme.onInverseSurface
+                    : null,
+                foregroundColor: memberInfoModel.isFollowed == true
+                    ? theme.colorScheme.outline
+                    : null,
+                padding: EdgeInsets.zero,
+                visualDensity: const VisualDensity(vertical: -2),
+              ),
+              onPressed: () {
+                if (widget.mid == accountService.mid) {
+                  Get.toNamed('/editProfile');
+                } else {
+                  if (!accountService.isLogin.value) {
+                    SmartDialog.showToast('账号未登录');
+                    return;
+                  }
+                  RequestUtils.actionRelationMod(
+                    context: context,
+                    mid: widget.mid,
+                    isFollow: memberInfoModel.isFollowed ?? false,
+                    callback: (attribute) {
+                      _controller
+                        ..userState.value.data.isFollowed = attribute != 0
+                        ..userState.refresh();
+                    },
+                  );
+                }
+              },
+              child: Text(
+                widget.mid == accountService.mid
+                    ? '编辑资料'
+                    : memberInfoModel.isFollowed == true
+                    ? '已关注'
+                    : '关注',
+                maxLines: 1,
+                style: const TextStyle(fontSize: 14),
+              ),
+            ),
+          ),
+          const SizedBox(width: 8),
+          Expanded(
+            child: OutlinedButton(
+              style: OutlinedButton.styleFrom(
+                padding: EdgeInsets.zero,
+                visualDensity: const VisualDensity(vertical: -2),
+              ),
+              onPressed: () => Get.toNamed('/member?mid=${widget.mid}'),
+              child: const Text(
+                '查看主页',
+                maxLines: 1,
+                style: TextStyle(fontSize: 14),
+              ),
+            ),
+          ),
+        ],
+      ),
+    ],
+  );
 
   Widget _buildChildInfo({
     required ThemeData theme,
@@ -389,18 +394,18 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
   }
 
   Widget _buildAvatar(String face) => GestureDetector(
-        onTap: () {
-          widget.videoDetailController.onViewImage();
-          context.imageView(
-            imgList: [SourceModel(url: face)],
-            onDismissed: widget.videoDetailController.onDismissed,
-          );
-        },
-        child: NetworkImgLayer(
-          src: face,
-          type: ImageType.avatar,
-          width: 70,
-          height: 70,
-        ),
+    onTap: () {
+      widget.videoDetailController.onViewImage();
+      context.imageView(
+        imgList: [SourceModel(url: face)],
+        onDismissed: widget.videoDetailController.onDismissed,
       );
+    },
+    child: NetworkImgLayer(
+      src: face,
+      type: ImageType.avatar,
+      width: 70,
+      height: 70,
+    ),
+  );
 }
diff --git a/lib/pages/video/note/view.dart b/lib/pages/video/note/view.dart
index 6d1ce0b7b..3fe92e464 100644
--- a/lib/pages/video/note/view.dart
+++ b/lib/pages/video/note/view.dart
@@ -87,7 +87,7 @@ class _NoteListPageState extends CommonSlidePageState<NoteListPage> {
               ],
             ),
           ),
-          Expanded(child: enableSlide ? slideList(theme) : buildList(theme))
+          Expanded(child: enableSlide ? slideList(theme) : buildList(theme)),
         ],
       ),
     );
@@ -107,7 +107,8 @@ class _NoteListPageState extends CommonSlidePageState<NoteListPage> {
                 SliverPadding(
                   padding: const EdgeInsets.only(bottom: 80),
                   sliver: Obx(
-                      () => _buildBody(theme, _controller.loadingState.value)),
+                    () => _buildBody(theme, _controller.loadingState.value),
+                  ),
                 ),
               ],
             ),
@@ -160,38 +161,41 @@ class _NoteListPageState extends CommonSlidePageState<NoteListPage> {
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<VideoNoteItemModel>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<VideoNoteItemModel>?> loadingState,
+  ) {
     late final divider = Divider(
       height: 1,
       color: theme.colorScheme.outline.withValues(alpha: 0.1),
     );
     return switch (loadingState) {
       Loading() => SliverToBoxAdapter(
-          child: ListView.builder(
-            shrinkWrap: true,
-            physics: const NeverScrollableScrollPhysics(),
-            itemBuilder: (context, index) {
-              return const VideoReplySkeleton();
-            },
-            itemCount: 8,
-          ),
+        child: ListView.builder(
+          shrinkWrap: true,
+          physics: const NeverScrollableScrollPhysics(),
+          itemBuilder: (context, index) {
+            return const VideoReplySkeleton();
+          },
+          itemCount: 8,
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverList.separated(
-              itemBuilder: (context, index) {
-                if (index == response.length - 1) {
-                  _controller.onLoadMore();
-                }
-                return _itemWidget(theme, response[index]);
-              },
-              itemCount: response!.length,
-              separatorBuilder: (context, index) => divider,
-            )
-          : HttpError(onReload: _controller.onReload),
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverList.separated(
+                itemBuilder: (context, index) {
+                  if (index == response.length - 1) {
+                    _controller.onLoadMore();
+                  }
+                  return _itemWidget(theme, response[index]);
+                },
+                itemCount: response!.length,
+                separatorBuilder: (context, index) => divider,
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
@@ -234,7 +238,8 @@ class _NoteListPageState extends CommonSlidePageState<NoteListPage> {
                           Text(
                             item.author!.name!,
                             style: TextStyle(
-                              color: item.author?.vipInfo?.status != null &&
+                              color:
+                                  item.author?.vipInfo?.status != null &&
                                       item.author!.vipInfo!.status > 0 &&
                                       item.author!.vipInfo!.type == 2
                                   ? context.vipColor
diff --git a/lib/pages/video/pay_coins/view.dart b/lib/pages/video/pay_coins/view.dart
index 0f69fff06..c1c1fb5ff 100644
--- a/lib/pages/video/pay_coins/view.dart
+++ b/lib/pages/video/pay_coins/view.dart
@@ -44,8 +44,10 @@ class PayCoinsPage extends StatefulWidget {
           const end = 1.0;
           const curve = Curves.linear;
 
-          var tween = Tween<double>(begin: begin, end: end)
-              .chain(CurveTween(curve: curve));
+          var tween = Tween<double>(
+            begin: begin,
+            end: end,
+          ).chain(CurveTween(curve: curve));
 
           return FadeTransition(
             opacity: animation.drive(tween),
@@ -162,8 +164,10 @@ class _PayCoinsPageState extends State<PayCoinsPage>
       vsync: this,
       duration: const Duration(milliseconds: 100),
     );
-    _coinFadeAnim =
-        Tween<double>(begin: 1, end: 0).animate(_coinFadeController);
+    _coinFadeAnim = Tween<double>(
+      begin: 1,
+      end: 0,
+    ).animate(_coinFadeController);
     _boxAnimController = AnimationController(
       vsync: this,
       duration: const Duration(milliseconds: 50),
@@ -204,239 +208,238 @@ class _PayCoinsPageState extends State<PayCoinsPage>
 
   @override
   Widget build(BuildContext context) {
-    return LayoutBuilder(builder: (context, constraints) {
-      bool isV = constraints.maxHeight > constraints.maxWidth;
-      return isV
-          ? _buildBody(isV)
-          : Row(
-              children: [
-                const Spacer(),
-                Expanded(flex: 3, child: _buildBody(isV)),
-                const Spacer(),
-              ],
-            );
-    });
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        bool isV = constraints.maxHeight > constraints.maxWidth;
+        return isV
+            ? _buildBody(isV)
+            : Row(
+                children: [
+                  const Spacer(),
+                  Expanded(flex: 3, child: _buildBody(isV)),
+                  const Spacer(),
+                ],
+              );
+      },
+    );
   }
 
   Widget _buildBody(bool isV) => Stack(
-        key: _key,
-        clipBehavior: Clip.none,
-        alignment: Alignment.center,
-        children: [
-          Visibility(
-            visible: _showThunder,
-            maintainSize: true,
-            maintainAnimation: true,
-            maintainState: true,
-            child: Image.asset(_images[_showThunder ? _imageIndex : 0]),
-          ),
-          Align(
-            alignment: Alignment.bottomCenter,
-            child: GestureDetector(
-              behavior: HitTestBehavior.opaque,
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
+    key: _key,
+    clipBehavior: Clip.none,
+    alignment: Alignment.center,
+    children: [
+      Visibility(
+        visible: _showThunder,
+        maintainSize: true,
+        maintainAnimation: true,
+        maintainState: true,
+        child: Image.asset(_images[_showThunder ? _imageIndex : 0]),
+      ),
+      Align(
+        alignment: Alignment.bottomCenter,
+        child: GestureDetector(
+          behavior: HitTestBehavior.opaque,
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
                 children: [
-                  Row(
-                    children: [
-                      Visibility(
-                        visible: !_isPaying && widget.copyright == 1,
-                        maintainSize: true,
-                        maintainAnimation: true,
-                        maintainState: true,
-                        child: GestureDetector(
-                          onTap: _index == 0 ? null : () => _onScroll(0),
-                          child: Padding(
-                            padding: const EdgeInsets.only(left: 12),
-                            child: Image.asset(
-                              width: 16,
-                              height: 28,
-                              _index == 0
-                                  ? 'assets/images/paycoins/ic_left_disable.png'
-                                  : 'assets/images/paycoins/ic_left.png',
-                            ),
-                          ),
+                  Visibility(
+                    visible: !_isPaying && widget.copyright == 1,
+                    maintainSize: true,
+                    maintainAnimation: true,
+                    maintainState: true,
+                    child: GestureDetector(
+                      onTap: _index == 0 ? null : () => _onScroll(0),
+                      child: Padding(
+                        padding: const EdgeInsets.only(left: 12),
+                        child: Image.asset(
+                          width: 16,
+                          height: 28,
+                          _index == 0
+                              ? 'assets/images/paycoins/ic_left_disable.png'
+                              : 'assets/images/paycoins/ic_left.png',
                         ),
                       ),
-                      Expanded(
-                        child: SizedBox(
-                          height: 100,
-                          child: PageView.builder(
-                            key: const PageStorageKey('PageView'),
-                            physics: const ClampingScrollPhysics(),
-                            itemCount: widget.copyright == 1 ? 2 : 1,
-                            controller: _controller,
-                            onPageChanged: (index) => setState(_scale),
-                            itemBuilder: (context, index) {
-                              return ListenableBuilder(
-                                listenable: _controller,
-                                builder: (context, child) {
-                                  double factor = index == 0 ? 1 : 0;
-                                  if (_controller
-                                      .position.hasContentDimensions) {
-                                    factor =
-                                        1 - (_controller.page! - index).abs();
-                                  }
-                                  return Visibility(
-                                    visible: !_isPaying || _index == index,
-                                    child: Center(
-                                      child: SizedBox(
-                                        height: 70 + (factor * 30),
-                                        width: 70 + (factor * 30),
-                                        child: ColorFiltered(
-                                          colorFilter: ColorFilter.mode(
-                                            _getColorFilter(index),
-                                            BlendMode.srcATop,
+                    ),
+                  ),
+                  Expanded(
+                    child: SizedBox(
+                      height: 100,
+                      child: PageView.builder(
+                        key: const PageStorageKey('PageView'),
+                        physics: const ClampingScrollPhysics(),
+                        itemCount: widget.copyright == 1 ? 2 : 1,
+                        controller: _controller,
+                        onPageChanged: (index) => setState(_scale),
+                        itemBuilder: (context, index) {
+                          return ListenableBuilder(
+                            listenable: _controller,
+                            builder: (context, child) {
+                              double factor = index == 0 ? 1 : 0;
+                              if (_controller.position.hasContentDimensions) {
+                                factor = 1 - (_controller.page! - index).abs();
+                              }
+                              return Visibility(
+                                visible: !_isPaying || _index == index,
+                                child: Center(
+                                  child: SizedBox(
+                                    height: 70 + (factor * 30),
+                                    width: 70 + (factor * 30),
+                                    child: ColorFiltered(
+                                      colorFilter: ColorFilter.mode(
+                                        _getColorFilter(index),
+                                        BlendMode.srcATop,
+                                      ),
+                                      child: Stack(
+                                        clipBehavior: Clip.none,
+                                        alignment: Alignment.center,
+                                        children: [
+                                          SlideTransition(
+                                            position: _boxAnim,
+                                            child: Image.asset(
+                                              'assets/images/paycoins/ic_pay_coins_box.png',
+                                            ),
                                           ),
-                                          child: Stack(
-                                            clipBehavior: Clip.none,
-                                            alignment: Alignment.center,
-                                            children: [
-                                              SlideTransition(
-                                                position: _boxAnim,
-                                                child: Image.asset(
-                                                  'assets/images/paycoins/ic_pay_coins_box.png',
-                                                ),
+                                          SlideTransition(
+                                            position: _coinSlideAnim,
+                                            child: FadeTransition(
+                                              opacity: _coinFadeAnim,
+                                              child: Image.asset(
+                                                height: 35 + (factor * 15),
+                                                width: 35 + (factor * 15),
+                                                index == 0
+                                                    ? 'assets/images/paycoins/ic_coins_one.png'
+                                                    : 'assets/images/paycoins/ic_coins_two.png',
                                               ),
-                                              SlideTransition(
-                                                position: _coinSlideAnim,
-                                                child: FadeTransition(
-                                                  opacity: _coinFadeAnim,
-                                                  child: Image.asset(
-                                                    height: 35 + (factor * 15),
-                                                    width: 35 + (factor * 15),
-                                                    index == 0
-                                                        ? 'assets/images/paycoins/ic_coins_one.png'
-                                                        : 'assets/images/paycoins/ic_coins_two.png',
-                                                  ),
-                                                ),
-                                              ),
-                                            ],
+                                            ),
                                           ),
-                                        ),
+                                        ],
                                       ),
                                     ),
-                                  );
-                                },
+                                  ),
+                                ),
                               );
                             },
-                          ),
-                        ),
-                      ),
-                      Visibility(
-                        visible: !_isPaying && widget.copyright == 1,
-                        maintainSize: true,
-                        maintainAnimation: true,
-                        maintainState: true,
-                        child: GestureDetector(
-                          onTap: _index == 1 ? null : () => _onScroll(1),
-                          child: Padding(
-                            padding: const EdgeInsets.only(right: 12),
-                            child: Image.asset(
-                              width: 16,
-                              height: 28,
-                              _index == 1
-                                  ? 'assets/images/paycoins/ic_right_disable.png'
-                                  : 'assets/images/paycoins/ic_right.png',
-                            ),
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                  SizedBox(height: isV ? 25 : 10),
-                  GestureDetector(
-                    behavior: HitTestBehavior.opaque,
-                    onPanUpdate: _handlePanUpdate,
-                    child: SizedBox(
-                      width: double.infinity,
-                      height: 155,
-                      child: Center(
-                        child: GestureDetector(
-                          onTap: _canPay ? _onPayCoin : null,
-                          onPanUpdate:
-                              _canPay ? (e) => _handlePanUpdate(e, true) : null,
-                          child: ScaleTransition(
-                            scale: _scale22Anim,
-                            child: SlideTransition(
-                              position: _slide22Anim,
-                              child: SizedBox(
-                                width: 110,
-                                height: 155,
-                                child: Image.asset(_getImage),
-                              ),
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-                  ),
-                  if (_coins != null || widget.hasCoin) ...[
-                    const SizedBox(height: 10),
-                    Center(
-                      child: Text(
-                        '${_coins != null ? '硬币余额：${_coins!.toDouble().toPrecision(1)}' : ''}${widget.hasCoin ? '${_coins != null ? '，' : ''}已投1枚硬币' : ''}',
-                        style:
-                            const TextStyle(color: Colors.white, fontSize: 13),
-                      ),
-                    ),
-                  ],
-                  const SizedBox(height: 10),
-                  Stack(
-                    clipBehavior: Clip.none,
-                    alignment: Alignment.centerLeft,
-                    children: [
-                      GestureDetector(
-                        onTap: () {
-                          final newVal = !_coinWithLike.value;
-                          _coinWithLike.value = newVal;
-                          GStorage.setting
-                              .put(SettingBoxKey.coinWithLike, newVal);
+                          );
                         },
-                        child: Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            const SizedBox(width: 12),
-                            Obx(
-                              () => Icon(
-                                _coinWithLike.value
-                                    ? Icons.check_box_outlined
-                                    : Icons.check_box_outline_blank,
-                                size: 20,
-                                color: Colors.white,
-                              ),
-                            ),
-                            const Text(
-                              ' 同时点赞',
-                              style: TextStyle(color: Colors.white),
-                            ),
-                          ],
-                        ),
                       ),
-                      Center(
-                        child: GestureDetector(
-                          onTap: Get.back,
-                          child: SizedBox(
-                            width: 30,
-                            height: 30,
-                            child: Image.asset(
-                              'assets/images/paycoins/ic_panel_close.png',
-                            ),
-                          ),
-                        ),
-                      ),
-                    ],
+                    ),
+                  ),
+                  Visibility(
+                    visible: !_isPaying && widget.copyright == 1,
+                    maintainSize: true,
+                    maintainAnimation: true,
+                    maintainState: true,
+                    child: GestureDetector(
+                      onTap: _index == 1 ? null : () => _onScroll(1),
+                      child: Padding(
+                        padding: const EdgeInsets.only(right: 12),
+                        child: Image.asset(
+                          width: 16,
+                          height: 28,
+                          _index == 1
+                              ? 'assets/images/paycoins/ic_right_disable.png'
+                              : 'assets/images/paycoins/ic_right.png',
+                        ),
+                      ),
+                    ),
                   ),
-                  SizedBox(
-                      height: (isV ? 50 : 10) +
-                          MediaQuery.paddingOf(context).bottom),
                 ],
               ),
-            ),
+              SizedBox(height: isV ? 25 : 10),
+              GestureDetector(
+                behavior: HitTestBehavior.opaque,
+                onPanUpdate: _handlePanUpdate,
+                child: SizedBox(
+                  width: double.infinity,
+                  height: 155,
+                  child: Center(
+                    child: GestureDetector(
+                      onTap: _canPay ? _onPayCoin : null,
+                      onPanUpdate: _canPay
+                          ? (e) => _handlePanUpdate(e, true)
+                          : null,
+                      child: ScaleTransition(
+                        scale: _scale22Anim,
+                        child: SlideTransition(
+                          position: _slide22Anim,
+                          child: SizedBox(
+                            width: 110,
+                            height: 155,
+                            child: Image.asset(_getImage),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+              if (_coins != null || widget.hasCoin) ...[
+                const SizedBox(height: 10),
+                Center(
+                  child: Text(
+                    '${_coins != null ? '硬币余额：${_coins!.toDouble().toPrecision(1)}' : ''}${widget.hasCoin ? '${_coins != null ? '，' : ''}已投1枚硬币' : ''}',
+                    style: const TextStyle(color: Colors.white, fontSize: 13),
+                  ),
+                ),
+              ],
+              const SizedBox(height: 10),
+              Stack(
+                clipBehavior: Clip.none,
+                alignment: Alignment.centerLeft,
+                children: [
+                  GestureDetector(
+                    onTap: () {
+                      final newVal = !_coinWithLike.value;
+                      _coinWithLike.value = newVal;
+                      GStorage.setting.put(SettingBoxKey.coinWithLike, newVal);
+                    },
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        const SizedBox(width: 12),
+                        Obx(
+                          () => Icon(
+                            _coinWithLike.value
+                                ? Icons.check_box_outlined
+                                : Icons.check_box_outline_blank,
+                            size: 20,
+                            color: Colors.white,
+                          ),
+                        ),
+                        const Text(
+                          ' 同时点赞',
+                          style: TextStyle(color: Colors.white),
+                        ),
+                      ],
+                    ),
+                  ),
+                  Center(
+                    child: GestureDetector(
+                      onTap: Get.back,
+                      child: SizedBox(
+                        width: 30,
+                        height: 30,
+                        child: Image.asset(
+                          'assets/images/paycoins/ic_panel_close.png',
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+              SizedBox(
+                height: (isV ? 50 : 10) + MediaQuery.paddingOf(context).bottom,
+              ),
+            ],
           ),
-        ],
-      );
+        ),
+      ),
+    ],
+  );
 
   void _handlePanUpdate(DragUpdateDetails e, [bool needV = false]) {
     if (needV && e.delta.dy.abs() > max(2, e.delta.dx.abs())) {
diff --git a/lib/pages/video/post_panel/view.dart b/lib/pages/video/post_panel/view.dart
index 6c454ffbe..c247f8894 100644
--- a/lib/pages/video/post_panel/view.dart
+++ b/lib/pages/video/post_panel/view.dart
@@ -103,7 +103,8 @@ class _PostPanelState extends CommonCollapseSlidePageState<PostPanel> {
                 controller: ScrollController(),
                 physics: const AlwaysScrollableScrollPhysics(),
                 padding: EdgeInsets.only(
-                    bottom: 88 + MediaQuery.paddingOf(context).bottom),
+                  bottom: 88 + MediaQuery.paddingOf(context).bottom,
+                ),
                 child: Column(
                   children: List.generate(
                     list!.length,
@@ -144,7 +145,7 @@ class _PostPanelState extends CommonCollapseSlidePageState<PostPanel> {
                   ),
                   child: const Icon(Icons.check),
                 ),
-              )
+              ),
             ],
           )
         : errorWidget();
@@ -173,7 +174,8 @@ class _PostPanelState extends CommonCollapseSlidePageState<PostPanel> {
     required bool isFirst,
   }) {
     String value = DurationUtil.formatDuration(
-        isFirst ? item.segment.first : item.segment.second);
+      isFirst ? item.segment.first : item.segment.second,
+    );
     return [
       Text(
         '${isFirst ? '开始' : '结束'}: $value',
@@ -248,8 +250,11 @@ class _PostPanelState extends CommonCollapseSlidePageState<PostPanel> {
           ).then((res) {
             if (res != null) {
               try {
-                List<num> split =
-                    res.split(':').reversed.map((e) => num.parse(e)).toList();
+                List<num> split = res
+                    .split(':')
+                    .reversed
+                    .map((e) => num.parse(e))
+                    .toList();
                 double duration = 0;
                 for (int i = 0; i < split.length; i++) {
                   duration += split[i] * pow(60, i);
@@ -275,63 +280,64 @@ class _PostPanelState extends CommonCollapseSlidePageState<PostPanel> {
   void _onPost() {
     Request()
         .post(
-      '${widget.videoDetailController.blockServer}/api/skipSegments',
-      data: {
-        'videoID': videoDetailController.bvid,
-        'cid': videoDetailController.cid.value.toString(),
-        'userID': Pref.blockUserID.toString(),
-        'userAgent': Constants.userAgent,
-        'videoDuration': videoDuration,
-        'segments': list!
-            .map(
-              (item) => {
-                'segment': [
-                  item.segment.first,
-                  item.segment.second,
-                ],
-                'category': item.category.name,
-                'actionType': item.actionType.name,
-              },
-            )
-            .toList(),
-      },
-      options: Options(
-        followRedirects: true, // Defaults to true.
-        validateStatus: (int? status) {
-          return (status! >= 200 && status < 300) ||
-              const [400, 403, 429, 409] // reduce extra toast
-                  .contains(status);
-        },
-      ),
-    )
+          '${widget.videoDetailController.blockServer}/api/skipSegments',
+          data: {
+            'videoID': videoDetailController.bvid,
+            'cid': videoDetailController.cid.value.toString(),
+            'userID': Pref.blockUserID.toString(),
+            'userAgent': Constants.userAgent,
+            'videoDuration': videoDuration,
+            'segments': list!
+                .map(
+                  (item) => {
+                    'segment': [
+                      item.segment.first,
+                      item.segment.second,
+                    ],
+                    'category': item.category.name,
+                    'actionType': item.actionType.name,
+                  },
+                )
+                .toList(),
+          },
+          options: Options(
+            followRedirects: true, // Defaults to true.
+            validateStatus: (int? status) {
+              return (status! >= 200 && status < 300) ||
+                  const [400, 403, 429, 409] // reduce extra toast
+                      .contains(status);
+            },
+          ),
+        )
         .then(
-      (res) {
-        if (res.statusCode == 200) {
-          Get.back();
-          SmartDialog.showToast('提交成功');
-          list?.clear();
-          if (res.data case List list) {
-            videoDetailController.handleSBData(
-                list.map((e) => SegmentItemModel.fromJson(e)).toList());
-          }
-          plPlayerController.segmentList.value =
-              videoDetailController.segmentProgressList ?? <Segment>[];
-          if (videoDetailController.positionSubscription == null) {
-            videoDetailController.initSkip();
-          }
-        } else {
-          SmartDialog.showToast(
-            '提交失败: ${switch (res.statusCode) {
-              400 => '参数错误',
-              403 => '被自动审核机制拒绝',
-              429 => '重复提交太快',
-              409 => '重复提交',
-              _ => res.statusCode.toString()
-            }}',
-          );
-        }
-      },
-    );
+          (res) {
+            if (res.statusCode == 200) {
+              Get.back();
+              SmartDialog.showToast('提交成功');
+              list?.clear();
+              if (res.data case List list) {
+                videoDetailController.handleSBData(
+                  list.map((e) => SegmentItemModel.fromJson(e)).toList(),
+                );
+              }
+              plPlayerController.segmentList.value =
+                  videoDetailController.segmentProgressList ?? <Segment>[];
+              if (videoDetailController.positionSubscription == null) {
+                videoDetailController.initSkip();
+              }
+            } else {
+              SmartDialog.showToast(
+                '提交失败: ${switch (res.statusCode) {
+                  400 => '参数错误',
+                  403 => '被自动审核机制拒绝',
+                  429 => '重复提交太快',
+                  409 => '重复提交',
+                  _ => res.statusCode.toString(),
+                }}',
+              );
+            }
+          },
+        );
   }
 
   Widget _buildItem(ThemeData theme, int index, PostSegmentModel item) {
@@ -427,10 +433,12 @@ class _PostPanelState extends CommonCollapseSlidePageState<PostPanel> {
                               (context as Element).markNeedsBuild();
                             },
                             itemBuilder: (context) => SegmentType.values
-                                .map((e) => PopupMenuItem<SegmentType>(
-                                      value: e,
-                                      child: Text(e.title),
-                                    ))
+                                .map(
+                                  (e) => PopupMenuItem<SegmentType>(
+                                    value: e,
+                                    child: Text(e.title),
+                                  ),
+                                )
                                 .toList(),
                             child: Row(
                               mainAxisSize: MainAxisSize.min,
@@ -449,8 +457,9 @@ class _PostPanelState extends CommonCollapseSlidePageState<PostPanel> {
                                 ),
                                 Icon(
                                   MdiIcons.unfoldMoreHorizontal,
-                                  size: MediaQuery.textScalerOf(context)
-                                      .scale(14),
+                                  size: MediaQuery.textScalerOf(
+                                    context,
+                                  ).scale(14),
                                   color: theme.colorScheme.secondary,
                                 ),
                               ],
@@ -478,8 +487,8 @@ class _PostPanelState extends CommonCollapseSlidePageState<PostPanel> {
                             itemBuilder: (context) => ActionType.values
                                 .map(
                                   (e) => PopupMenuItem<ActionType>(
-                                    enabled:
-                                        item.category.toActionType.contains(e),
+                                    enabled: item.category.toActionType
+                                        .contains(e),
                                     value: e,
                                     child: Text(e.title),
                                   ),
@@ -502,8 +511,9 @@ class _PostPanelState extends CommonCollapseSlidePageState<PostPanel> {
                                 ),
                                 Icon(
                                   MdiIcons.unfoldMoreHorizontal,
-                                  size: MediaQuery.textScalerOf(context)
-                                      .scale(14),
+                                  size: MediaQuery.textScalerOf(
+                                    context,
+                                  ).scale(14),
                                   color: theme.colorScheme.secondary,
                                 ),
                               ],
@@ -548,7 +558,10 @@ class _PostPanelState extends CommonCollapseSlidePageState<PostPanel> {
                     await widget.plPlayerController.videoPlayerController!.seek(
                       Duration(milliseconds: start),
                     );
-                    if (!widget.plPlayerController.videoPlayerController!.state
+                    if (!widget
+                        .plPlayerController
+                        .videoPlayerController!
+                        .state
                         .playing) {
                       await widget.plPlayerController.videoPlayerController!
                           .play();
diff --git a/lib/pages/video/related/view.dart b/lib/pages/video/related/view.dart
index fa5c5b0a0..2e421f1db 100644
--- a/lib/pages/video/related/view.dart
+++ b/lib/pages/video/related/view.dart
@@ -18,8 +18,10 @@ class RelatedVideoPanel extends StatefulWidget {
 
 class _RelatedVideoPanelState extends State<RelatedVideoPanel>
     with AutomaticKeepAliveClientMixin {
-  late final RelatedController _relatedController =
-      Get.put(RelatedController(), tag: widget.heroTag);
+  late final RelatedController _relatedController = Get.put(
+    RelatedController(),
+    tag: widget.heroTag,
+  );
 
   @override
   bool get wantKeepAlive => true;
@@ -28,8 +30,10 @@ class _RelatedVideoPanelState extends State<RelatedVideoPanel>
   Widget build(BuildContext context) {
     super.build(context);
     return SliverPadding(
-      padding:
-          const EdgeInsets.only(top: StyleString.safeSpace - 5, bottom: 80),
+      padding: const EdgeInsets.only(
+        top: StyleString.safeSpace - 5,
+        bottom: 80,
+      ),
       sliver: Obx(() => _buildBody(_relatedController.loadingState.value)),
     );
   }
@@ -37,34 +41,35 @@ class _RelatedVideoPanelState extends State<RelatedVideoPanel>
   Widget _buildBody(LoadingState<List<HotVideoItemModel>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: Grid.videoCardHDelegate(context),
-          delegate: SliverChildBuilderDelegate(
-            (context, index) {
-              return const VideoCardHSkeleton();
-            },
-            childCount: 5,
-          ),
+        gridDelegate: Grid.videoCardHDelegate(context),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            return const VideoCardHSkeleton();
+          },
+          childCount: 5,
         ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  return VideoCardH(
-                    videoItem: response[index],
-                    onRemove: () => _relatedController.loadingState
-                      ..value.data!.removeAt(index)
-                      ..refresh(),
-                  );
-                },
-                childCount: response!.length,
-              ),
-            )
-          : const SliverToBoxAdapter(),
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    return VideoCardH(
+                      videoItem: response[index],
+                      onRemove: () => _relatedController.loadingState
+                        ..value.data!.removeAt(index)
+                        ..refresh(),
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : const SliverToBoxAdapter(),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _relatedController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _relatedController.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/video/reply/controller.dart b/lib/pages/video/reply/controller.dart
index ab2158f18..e7a3f27c9 100644
--- a/lib/pages/video/reply/controller.dart
+++ b/lib/pages/video/reply/controller.dart
@@ -18,16 +18,20 @@ class VideoReplyController extends ReplyController<MainListReply>
 
   bool _isFabVisible = true;
   late final AnimationController fabAnimationCtr = AnimationController(
-      vsync: this, duration: const Duration(milliseconds: 100))
-    ..forward();
+    vsync: this,
+    duration: const Duration(milliseconds: 100),
+  )..forward();
 
-  late final anim = Tween<Offset>(
-    begin: const Offset(0, 2),
-    end: Offset.zero,
-  ).animate(CurvedAnimation(
-    parent: fabAnimationCtr,
-    curve: Curves.easeInOut,
-  ));
+  late final anim =
+      Tween<Offset>(
+        begin: const Offset(0, 2),
+        end: Offset.zero,
+      ).animate(
+        CurvedAnimation(
+          parent: fabAnimationCtr,
+          curve: Curves.easeInOut,
+        ),
+      );
 
   void showFab() {
     if (!_isFabVisible) {
@@ -50,11 +54,11 @@ class VideoReplyController extends ReplyController<MainListReply>
 
   @override
   Future<LoadingState<MainListReply>> customGetData() => ReplyGrpc.mainList(
-        oid: aid,
-        mode: mode.value,
-        cursorNext: cursorNext,
-        offset: paginationReply?.nextOffset,
-      );
+    oid: aid,
+    mode: mode.value,
+    cursorNext: cursorNext,
+    offset: paginationReply?.nextOffset,
+  );
 
   @override
   void onClose() {
diff --git a/lib/pages/video/reply/view.dart b/lib/pages/video/reply/view.dart
index de988ddbb..77875ff8b 100644
--- a/lib/pages/video/reply/view.dart
+++ b/lib/pages/video/reply/view.dart
@@ -151,14 +151,16 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                               ),
                             ),
                           ),
-                        )
+                        ),
                       ],
                     ),
                   ),
                 ),
               ),
-              Obx(() =>
-                  _buildBody(theme, _videoReplyController.loadingState.value)),
+              Obx(
+                () =>
+                    _buildBody(theme, _videoReplyController.loadingState.value),
+              ),
             ],
           ),
           Positioned(
@@ -189,66 +191,67 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
   Widget _buildBody(ThemeData theme, LoadingState loadingState) {
     return switch (loadingState) {
       Loading() => SliverList.builder(
-          itemBuilder: (BuildContext context, index) {
-            return const VideoReplySkeleton();
-          },
-          itemCount: 5,
-        ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverList.builder(
-              itemBuilder: (context, index) {
-                double bottom = MediaQuery.paddingOf(context).bottom;
-                if (index == response.length) {
-                  _videoReplyController.onLoadMore();
-                  return Container(
-                    alignment: Alignment.center,
-                    padding: EdgeInsets.only(bottom: bottom),
-                    height: bottom + 100,
-                    child: Text(
-                      _videoReplyController.isEnd ? '没有更多了' : '加载中...',
-                      style: TextStyle(
-                        fontSize: 12,
-                        color: theme.colorScheme.outline,
+        itemBuilder: (BuildContext context, index) {
+          return const VideoReplySkeleton();
+        },
+        itemCount: 5,
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverList.builder(
+                itemBuilder: (context, index) {
+                  double bottom = MediaQuery.paddingOf(context).bottom;
+                  if (index == response.length) {
+                    _videoReplyController.onLoadMore();
+                    return Container(
+                      alignment: Alignment.center,
+                      padding: EdgeInsets.only(bottom: bottom),
+                      height: bottom + 100,
+                      child: Text(
+                        _videoReplyController.isEnd ? '没有更多了' : '加载中...',
+                        style: TextStyle(
+                          fontSize: 12,
+                          color: theme.colorScheme.outline,
+                        ),
                       ),
-                    ),
-                  );
-                } else {
-                  return ReplyItemGrpc(
-                    replyItem: response[index],
-                    replyLevel: widget.replyLevel,
-                    replyReply: widget.replyReply,
-                    onReply: (replyItem) => _videoReplyController.onReply(
-                      context,
-                      replyItem: replyItem,
-                    ),
-                    onDelete: (item, subIndex) =>
-                        _videoReplyController.onRemove(index, item, subIndex),
-                    upMid: _videoReplyController.upMid,
-                    getTag: () => heroTag,
-                    onViewImage: widget.onViewImage,
-                    onDismissed: widget.onDismissed,
-                    callback: widget.callback,
-                    onCheckReply: (item) => _videoReplyController
-                        .onCheckReply(item, isManual: true),
-                    onToggleTop: (item) => _videoReplyController.onToggleTop(
-                      item,
-                      index,
-                      _videoReplyController.aid,
-                      1,
-                    ),
-                  );
-                }
-              },
-              itemCount: response.length + 1,
-            )
-          : HttpError(
-              errMsg: '还没有评论',
-              onReload: _videoReplyController.onReload,
-            ),
+                    );
+                  } else {
+                    return ReplyItemGrpc(
+                      replyItem: response[index],
+                      replyLevel: widget.replyLevel,
+                      replyReply: widget.replyReply,
+                      onReply: (replyItem) => _videoReplyController.onReply(
+                        context,
+                        replyItem: replyItem,
+                      ),
+                      onDelete: (item, subIndex) =>
+                          _videoReplyController.onRemove(index, item, subIndex),
+                      upMid: _videoReplyController.upMid,
+                      getTag: () => heroTag,
+                      onViewImage: widget.onViewImage,
+                      onDismissed: widget.onDismissed,
+                      callback: widget.callback,
+                      onCheckReply: (item) => _videoReplyController
+                          .onCheckReply(item, isManual: true),
+                      onToggleTop: (item) => _videoReplyController.onToggleTop(
+                        item,
+                        index,
+                        _videoReplyController.aid,
+                        1,
+                      ),
+                    );
+                  }
+                },
+                itemCount: response.length + 1,
+              )
+            : HttpError(
+                errMsg: '还没有评论',
+                onReload: _videoReplyController.onReload,
+              ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _videoReplyController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _videoReplyController.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/video/reply/widgets/reply_item_grpc.dart b/lib/pages/video/reply/widgets/reply_item_grpc.dart
index 208b13b90..d200eb610 100644
--- a/lib/pages/video/reply/widgets/reply_item_grpc.dart
+++ b/lib/pages/video/reply/widgets/reply_item_grpc.dart
@@ -109,9 +109,9 @@ class ReplyItemGrpc extends StatelessWidget {
   }
 
   Widget _buildAuthorPanel(BuildContext context, ThemeData theme) => Padding(
-        padding: const EdgeInsets.fromLTRB(12, 14, 8, 5),
-        child: content(context, theme),
-      );
+    padding: const EdgeInsets.fromLTRB(12, 14, 8, 5),
+    child: content(context, theme),
+  );
 
   Widget _buildContent(BuildContext context, ThemeData theme) {
     return Column(
@@ -165,21 +165,21 @@ class ReplyItemGrpc extends StatelessWidget {
             endIndent: 15,
             height: 0.3,
             color: theme.colorScheme.outline.withValues(alpha: 0.08),
-          )
+          ),
       ],
     );
   }
 
   Widget _buildAvatar() => PendantAvatar(
-        avatar: replyItem.member.face,
-        size: 34,
-        badgeSize: 14,
-        isVip: replyItem.member.vipStatus > 0,
-        officialType: replyItem.member.officialVerifyType.toInt(),
-        garbPendantImage: replyItem.member.hasGarbPendantImage()
-            ? replyItem.member.garbPendantImage
-            : null,
-      );
+    avatar: replyItem.member.face,
+    size: 34,
+    badgeSize: 14,
+    isVip: replyItem.member.vipStatus > 0,
+    officialType: replyItem.member.officialVerifyType.toInt(),
+    garbPendantImage: replyItem.member.hasGarbPendantImage()
+        ? replyItem.member.garbPendantImage
+        : null,
+  );
 
   Widget content(BuildContext context, ThemeData theme) {
     final padding = EdgeInsets.only(
@@ -213,7 +213,8 @@ class ReplyItemGrpc extends StatelessWidget {
                       Text(
                         replyItem.member.name,
                         style: TextStyle(
-                          color: (replyItem.member.vipStatus > 0 &&
+                          color:
+                              (replyItem.member.vipStatus > 0 &&
                                   replyItem.member.vipType == 2)
                               ? context.vipColor
                               : theme.colorScheme.outline,
@@ -238,8 +239,10 @@ class ReplyItemGrpc extends StatelessWidget {
                     children: <Widget>[
                       Text(
                         replyLevel == 0
-                            ? DateUtil.format(replyItem.ctime.toInt(),
-                                format: DateUtil.longFormatDs)
+                            ? DateUtil.format(
+                                replyItem.ctime.toInt(),
+                                format: DateUtil.longFormatDs,
+                              )
                             : DateUtil.dateFormat(replyItem.ctime.toInt()),
                         style: TextStyle(
                           fontSize: theme.textTheme.labelSmall!.fontSize,
@@ -250,11 +253,12 @@ class ReplyItemGrpc extends StatelessWidget {
                         Text(
                           ' • ${replyItem.replyControl.location}',
                           style: TextStyle(
-                              fontSize: theme.textTheme.labelSmall!.fontSize,
-                              color: theme.colorScheme.outline),
+                            fontSize: theme.textTheme.labelSmall!.fontSize,
+                            color: theme.colorScheme.outline,
+                          ),
                         ),
                     ],
-                  )
+                  ),
                 ],
               ),
             ],
@@ -297,11 +301,13 @@ class ReplyItemGrpc extends StatelessWidget {
               builder: (context, constraints) => imageView(
                 constraints.maxWidth,
                 replyItem.content.pictures
-                    .map((item) => ImageModel(
-                          width: item.imgWidth,
-                          height: item.imgHeight,
-                          url: item.imgSrc,
-                        ))
+                    .map(
+                      (item) => ImageModel(
+                        width: item.imgWidth,
+                        height: item.imgHeight,
+                        url: item.imgSrc,
+                      ),
+                    )
                     .toList(),
                 onViewImage: onViewImage,
                 onDismissed: onDismissed,
@@ -326,7 +332,10 @@ class ReplyItemGrpc extends StatelessWidget {
   }
 
   Widget buttonAction(
-      BuildContext context, ThemeData theme, ReplyControl replyControl) {
+    BuildContext context,
+    ThemeData theme,
+    ReplyControl replyControl,
+  ) {
     final ButtonStyle style = TextButton.styleFrom(
       padding: EdgeInsets.zero,
       tapTargetSize: MaterialTapTargetSize.shrinkWrap,
@@ -343,21 +352,23 @@ class ReplyItemGrpc extends StatelessWidget {
               feedBack();
               onReply?.call(replyItem);
             },
-            child: Row(children: [
-              Icon(
-                Icons.reply,
-                size: 18,
-                color: theme.colorScheme.outline.withValues(alpha: 0.8),
-              ),
-              const SizedBox(width: 3),
-              Text(
-                '回复',
-                style: TextStyle(
-                  fontSize: theme.textTheme.labelMedium!.fontSize,
-                  color: theme.colorScheme.outline,
+            child: Row(
+              children: [
+                Icon(
+                  Icons.reply,
+                  size: 18,
+                  color: theme.colorScheme.outline.withValues(alpha: 0.8),
                 ),
-              ),
-            ]),
+                const SizedBox(width: 3),
+                Text(
+                  '回复',
+                  style: TextStyle(
+                    fontSize: theme.textTheme.labelMedium!.fontSize,
+                    color: theme.colorScheme.outline,
+                  ),
+                ),
+              ],
+            ),
           ),
         ),
         const SizedBox(width: 2),
@@ -386,8 +397,9 @@ class ReplyItemGrpc extends StatelessWidget {
           Text(
             '热评',
             style: TextStyle(
-                color: theme.colorScheme.secondary,
-                fontSize: theme.textTheme.labelMedium!.fontSize),
+              color: theme.colorScheme.secondary,
+              fontSize: theme.textTheme.labelMedium!.fontSize,
+            ),
           ),
         if (replyLevel == 2 && needDivider && replyItem.id != replyItem.dialog)
           SizedBox(
@@ -407,13 +419,16 @@ class ReplyItemGrpc extends StatelessWidget {
           ),
         const Spacer(),
         ZanButtonGrpc(replyItem: replyItem),
-        const SizedBox(width: 5)
+        const SizedBox(width: 5),
       ],
     );
   }
 
   Widget replyItemRow(
-      BuildContext context, ThemeData theme, List<ReplyInfo> replies) {
+    BuildContext context,
+    ThemeData theme,
+    List<ReplyInfo> replies,
+  ) {
     final extraRow = replies.length < replyItem.count.toInt();
     late final length = replies.length + (extraRow ? 1 : 0);
     return Padding(
@@ -468,10 +483,12 @@ class ReplyItemGrpc extends StatelessWidget {
                     padding: padding,
                     child: Text.rich(
                       style: TextStyle(
-                          fontSize: theme.textTheme.bodyMedium!.fontSize,
-                          color: theme.colorScheme.onSurface
-                              .withValues(alpha: 0.85),
-                          height: 1.6),
+                        fontSize: theme.textTheme.bodyMedium!.fontSize,
+                        color: theme.colorScheme.onSurface.withValues(
+                          alpha: 0.85,
+                        ),
+                        height: 1.6,
+                      ),
                       overflow: TextOverflow.ellipsis,
                       maxLines: 2,
                       TextSpan(
@@ -507,8 +524,8 @@ class ReplyItemGrpc extends StatelessWidget {
                             text: childReply.root == childReply.parent
                                 ? ': '
                                 : childReply.mid == upMid
-                                    ? ''
-                                    : ' ',
+                                ? ''
+                                : ' ',
                           ),
                           buildContent(context, theme, childReply),
                         ],
@@ -535,8 +552,9 @@ class ReplyItemGrpc extends StatelessWidget {
                           TextSpan(
                             text: 'UP主等人 ',
                             style: TextStyle(
-                              color: theme.colorScheme.onSurface
-                                  .withValues(alpha: 0.85),
+                              color: theme.colorScheme.onSurface.withValues(
+                                alpha: 0.85,
+                              ),
                             ),
                           ),
                         TextSpan(
@@ -544,12 +562,12 @@ class ReplyItemGrpc extends StatelessWidget {
                           style: TextStyle(
                             color: theme.colorScheme.primary,
                           ),
-                        )
+                        ),
                       ],
                     ),
                   ),
                 ),
-              )
+              ),
           ],
         ),
       ),
@@ -572,8 +590,8 @@ class ReplyItemGrpc extends StatelessWidget {
             color: theme.colorScheme.primary,
           ),
           recognizer: TapGestureRecognizer()
-            ..onTap =
-                () => PageUtils.handleWebview(content.richText.note.clickUrl),
+            ..onTap = () =>
+                PageUtils.handleWebview(content.richText.note.clickUrl),
         ),
       );
     }
@@ -628,8 +646,10 @@ class ReplyItemGrpc extends StatelessWidget {
           recognizer: TapGestureRecognizer()
             ..onTap = () {
               if (url.appUrlSchema.isEmpty) {
-                if (RegExp(r'^(av|bv)', caseSensitive: false)
-                    .hasMatch(matchStr)) {
+                if (RegExp(
+                  r'^(av|bv)',
+                  caseSensitive: false,
+                ).hasMatch(matchStr)) {
                   UrlUtils.matchUrlPush(matchStr, '');
                 } else {
                   RegExpMatch? match = RegExp(
@@ -709,8 +729,8 @@ class ReplyItemGrpc extends StatelessWidget {
               text: '投票: ${content.vote.title}',
               style: TextStyle(color: theme.colorScheme.primary),
               recognizer: TapGestureRecognizer()
-                ..onTap =
-                    () => showVoteDialog(context, content.vote.id.toInt()),
+                ..onTap = () =>
+                    showVoteDialog(context, content.vote.id.toInt()),
             ),
           );
         } else if (_timeRegExp.hasMatch(matchStr)) {
@@ -718,7 +738,8 @@ class ReplyItemGrpc extends StatelessWidget {
           bool isValid = false;
           try {
             final ctr = Get.find<VideoDetailController>(
-                tag: getTag?.call() ?? Get.arguments['heroTag']);
+              tag: getTag?.call() ?? Get.arguments['heroTag'],
+            );
             int duration = ctr.data.timeLength!;
             List<int> split = matchStr
                 .split(':')
@@ -736,26 +757,27 @@ class ReplyItemGrpc extends StatelessWidget {
           spanChildren.add(
             TextSpan(
               text: isValid ? ' $matchStr ' : matchStr,
-              style:
-                  isValid ? TextStyle(color: theme.colorScheme.primary) : null,
+              style: isValid
+                  ? TextStyle(color: theme.colorScheme.primary)
+                  : null,
               recognizer: isValid
                   ? (TapGestureRecognizer()
-                    ..onTap = () {
-                      // 跳转到指定位置
-                      try {
-                        SmartDialog.showToast('跳转至：$matchStr');
-                        Get.find<VideoDetailController>(
-                                tag: Get.arguments['heroTag'])
-                            .plPlayerController
-                            .seekTo(
-                                Duration(
-                                    seconds:
-                                        DurationUtil.parseDuration(matchStr)),
-                                type: 'slider');
-                      } catch (e) {
-                        SmartDialog.showToast('跳转失败: $e');
-                      }
-                    })
+                      ..onTap = () {
+                        // 跳转到指定位置
+                        try {
+                          SmartDialog.showToast('跳转至：$matchStr');
+                          Get.find<VideoDetailController>(
+                            tag: Get.arguments['heroTag'],
+                          ).plPlayerController.seekTo(
+                            Duration(
+                              seconds: DurationUtil.parseDuration(matchStr),
+                            ),
+                            type: 'slider',
+                          );
+                        } catch (e) {
+                          SmartDialog.showToast('跳转失败: $e');
+                        }
+                      })
                   : null,
             ),
           );
@@ -801,8 +823,9 @@ class ReplyItemGrpc extends StatelessWidget {
     );
 
     if (urlKeys.isNotEmpty) {
-      List<String> unmatchedItems =
-          urlKeys.where((url) => !matchedUrls.contains(url)).toList();
+      List<String> unmatchedItems = urlKeys
+          .where((url) => !matchedUrls.contains(url))
+          .toList();
       if (unmatchedItems.isNotEmpty) {
         for (var patternStr in unmatchedItems) {
           addUrl(patternStr, content.urls[patternStr]!);
@@ -936,10 +959,11 @@ class ReplyItemGrpc extends StatelessWidget {
                         'rpid': item.id,
                         'scene': 'main',
                         'type': 1,
-                        if (reasonType == 0) 'content': reasonDesc!
+                        if (reasonType == 0) 'content': reasonDesc!,
                       },
                       options: Options(
-                          contentType: Headers.formUrlEncodedContentType),
+                        contentType: Headers.formUrlEncodedContentType,
+                      ),
                     );
                     if (res.data['code'] == 0) {
                       onDelete();
@@ -983,7 +1007,9 @@ class ReplyItemGrpc extends StatelessWidget {
                   return Dialog(
                     child: Padding(
                       padding: const EdgeInsets.symmetric(
-                          horizontal: 20, vertical: 16),
+                        horizontal: 20,
+                        vertical: 16,
+                      ),
                       child: SelectableText(message),
                     ),
                   );
diff --git a/lib/pages/video/reply/widgets/zan_grpc.dart b/lib/pages/video/reply/widgets/zan_grpc.dart
index d48dfd05c..83e37571a 100644
--- a/lib/pages/video/reply/widgets/zan_grpc.dart
+++ b/lib/pages/video/reply/widgets/zan_grpc.dart
@@ -143,8 +143,8 @@ class _ZanButtonGrpcState extends State<ZanButtonGrpc> {
                   duration: const Duration(milliseconds: 400),
                   transitionBuilder:
                       (Widget child, Animation<double> animation) {
-                    return ScaleTransition(scale: animation, child: child);
-                  },
+                        return ScaleTransition(scale: animation, child: child);
+                      },
                   child: Text(
                     NumUtil.numFormat(widget.replyItem.like.toInt()),
                     style: TextStyle(
diff --git a/lib/pages/video/reply_new/view.dart b/lib/pages/video/reply_new/view.dart
index 9c82d7e60..89b7b10d7 100644
--- a/lib/pages/video/reply_new/view.dart
+++ b/lib/pages/video/reply_new/view.dart
@@ -135,8 +135,12 @@ class _ReplyPageState extends CommonRichTextPubPageState<ReplyPage> {
   List<Widget> buildInputView() {
     return [
       Padding(
-        padding:
-            const EdgeInsets.only(top: 12, right: 15, left: 15, bottom: 10),
+        padding: const EdgeInsets.only(
+          top: 12,
+          right: 15,
+          left: 15,
+          bottom: 10,
+        ),
         child: Form(
           autovalidateMode: AutovalidateMode.onUserInteraction,
           child: Listener(
@@ -234,8 +238,10 @@ class _ReplyPageState extends CommonRichTextPubPageState<ReplyPage> {
                 onPressed: enablePublish.value ? onPublish : null,
                 style: FilledButton.styleFrom(
                   tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                  padding:
-                      const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 20,
+                    vertical: 10,
+                  ),
                   visualDensity: VisualDensity.compact,
                 ),
                 child: const Text('发送'),
@@ -243,7 +249,7 @@ class _ReplyPageState extends CommonRichTextPubPageState<ReplyPage> {
             ),
           ],
         ),
-      )
+      ),
     ];
   }
 
@@ -305,7 +311,8 @@ class _ReplyPageState extends CommonRichTextPubPageState<ReplyPage> {
             onTap: () async {
               controller.keepChatPanel();
               ({String title, String url})? res = await Get.to(
-                  ReplySearchPage(type: widget.replyType, oid: widget.oid));
+                ReplySearchPage(type: widget.replyType, oid: widget.oid),
+              );
               if (res != null) {
                 onInsertText(
                   '${res.title} ',
@@ -336,8 +343,9 @@ class _ReplyPageState extends CommonRichTextPubPageState<ReplyPage> {
             item(
               onTap: () {
                 try {
-                  final plPlayerController =
-                      Get.find<VideoDetailController>(tag: heroTag);
+                  final plPlayerController = Get.find<VideoDetailController>(
+                    tag: heroTag,
+                  );
                   onInsertText(
                     ' ${DurationUtil.formatDuration((plPlayerController.playedTime ?? Duration.zero).inSeconds)} ',
                     RichTextType.common,
@@ -357,15 +365,18 @@ class _ReplyPageState extends CommonRichTextPubPageState<ReplyPage> {
                     return;
                   }
                   try {
-                    final plPlayerController =
-                        Get.find<VideoDetailController>(tag: heroTag);
+                    final plPlayerController = Get.find<VideoDetailController>(
+                      tag: heroTag,
+                    );
                     final res = await plPlayerController
-                        .plPlayerController.videoPlayerController
+                        .plPlayerController
+                        .videoPlayerController
                         ?.screenshot(format: 'image/png');
                     if (res != null) {
                       final tempDir = await getTemporaryDirectory();
                       File file = File(
-                          '${tempDir.path}/${Utils.generateRandomString(8)}.png');
+                        '${tempDir.path}/${Utils.generateRandomString(8)}.png',
+                      );
                       await file.writeAsBytes(res);
                       pathList.add(file.path);
                     } else {
@@ -375,8 +386,11 @@ class _ReplyPageState extends CommonRichTextPubPageState<ReplyPage> {
                     debugPrint(e.toString());
                   }
                 },
-                icon: Icon(Icons.enhance_photo_translate_outlined,
-                    size: 28, color: color),
+                icon: Icon(
+                  Icons.enhance_photo_translate_outlined,
+                  size: 28,
+                  color: color,
+                ),
                 title: '视频截图',
               ),
           ],
diff --git a/lib/pages/video/reply_reply/controller.dart b/lib/pages/video/reply_reply/controller.dart
index 0200d98c6..a7eae0d16 100644
--- a/lib/pages/video/reply_reply/controller.dart
+++ b/lib/pages/video/reply_reply/controller.dart
@@ -147,54 +147,56 @@ class VideoReplyReplyController extends ReplyController
 
     Navigator.of(context)
         .push(
-      GetDialogRoute(
-        pageBuilder: (buildContext, animation, secondaryAnimation) {
-          return ReplyPage(
-            oid: oid,
-            root: root,
-            parent: root,
-            replyType: this.replyType,
-            replyItem: replyItem,
-            items: savedReplies[key],
-            onSave: (reply) {
-              if (reply.isEmpty) {
-                savedReplies.remove(key);
-              } else {
-                savedReplies[key] = reply.toList();
-              }
+          GetDialogRoute(
+            pageBuilder: (buildContext, animation, secondaryAnimation) {
+              return ReplyPage(
+                oid: oid,
+                root: root,
+                parent: root,
+                replyType: this.replyType,
+                replyItem: replyItem,
+                items: savedReplies[key],
+                onSave: (reply) {
+                  if (reply.isEmpty) {
+                    savedReplies.remove(key);
+                  } else {
+                    savedReplies[key] = reply.toList();
+                  }
+                },
+              );
             },
-          );
-        },
-        transitionDuration: const Duration(milliseconds: 500),
-        transitionBuilder: (context, animation, secondaryAnimation, child) {
-          const begin = Offset(0.0, 1.0);
-          const end = Offset.zero;
-          const curve = Curves.linear;
+            transitionDuration: const Duration(milliseconds: 500),
+            transitionBuilder: (context, animation, secondaryAnimation, child) {
+              const begin = Offset(0.0, 1.0);
+              const end = Offset.zero;
+              const curve = Curves.linear;
 
-          var tween =
-              Tween(begin: begin, end: end).chain(CurveTween(curve: curve));
+              var tween = Tween(
+                begin: begin,
+                end: end,
+              ).chain(CurveTween(curve: curve));
 
-          return SlideTransition(
-            position: animation.drive(tween),
-            child: child,
-          );
-        },
-      ),
-    )
+              return SlideTransition(
+                position: animation.drive(tween),
+                child: child,
+              );
+            },
+          ),
+        )
         .then((res) {
-      if (res != null) {
-        savedReplies.remove(key);
-        ReplyInfo replyInfo = RequestUtils.replyCast(res);
+          if (res != null) {
+            savedReplies.remove(key);
+            ReplyInfo replyInfo = RequestUtils.replyCast(res);
 
-        count.value += 1;
-        loadingState
-          ..value.dataOrNull?.insert(index! + 1, replyInfo)
-          ..refresh();
-        if (enableCommAntifraud) {
-          onCheckReply(replyInfo, isManual: false);
-        }
-      }
-    });
+            count.value += 1;
+            loadingState
+              ..value.dataOrNull?.insert(index! + 1, replyInfo)
+              ..refresh();
+            if (enableCommAntifraud) {
+              onCheckReply(replyInfo, isManual: false);
+            }
+          }
+        });
   }
 
   @override
diff --git a/lib/pages/video/reply_reply/view.dart b/lib/pages/video/reply_reply/view.dart
index 42a4f4b0f..cf1823d63 100644
--- a/lib/pages/video/reply_reply/view.dart
+++ b/lib/pages/video/reply_reply/view.dart
@@ -52,8 +52,9 @@ class _VideoReplyReplyPanelState
   late final itemPositionsListener = ItemPositionsListener.create();
   late final _key = GlobalKey<ScaffoldState>();
   late final _listKey = GlobalKey();
-  late final _tag =
-      Utils.makeHeroTag('${widget.rpid}${widget.dialog}${widget.isDialogue}');
+  late final _tag = Utils.makeHeroTag(
+    '${widget.rpid}${widget.dialog}${widget.isDialogue}',
+  );
 
   ReplyInfo? get firstFloor => widget.firstFloor ?? _controller.firstFloor;
 
@@ -96,11 +97,14 @@ class _VideoReplyReplyPanelState
             if (positions.isNotEmpty) {
               min = positions
                   .where(
-                      (ItemPosition position) => position.itemTrailingEdge > 0)
-                  .reduce((ItemPosition min, ItemPosition position) =>
-                      position.itemTrailingEdge < min.itemTrailingEdge
-                          ? position
-                          : min)
+                    (ItemPosition position) => position.itemTrailingEdge > 0,
+                  )
+                  .reduce(
+                    (ItemPosition min, ItemPosition position) =>
+                        position.itemTrailingEdge < min.itemTrailingEdge
+                        ? position
+                        : min,
+                  )
                   .index;
             }
             return min >= 2 ? _sortWidget(theme) : const SizedBox.shrink();
@@ -168,15 +172,21 @@ class _VideoReplyReplyPanelState
                 itemBuilder: (context, index) {
                   if (widget.isDialogue) {
                     return _buildBody(
-                        theme, _controller.loadingState.value, index);
+                      theme,
+                      _controller.loadingState.value,
+                      index,
+                    );
                   } else if (firstFloor != null) {
                     if (index == 0) {
                       return ReplyItemGrpc(
                         replyItem: firstFloor!,
                         replyLevel: 2,
                         needDivider: false,
-                        onReply: (replyItem) => _controller.onReply(context,
-                            replyItem: replyItem, index: -1),
+                        onReply: (replyItem) => _controller.onReply(
+                          context,
+                          replyItem: replyItem,
+                          index: -1,
+                        ),
                         upMid: _controller.upMid,
                         onViewImage: widget.onViewImage,
                         onDismissed: widget.onDismissed,
@@ -223,56 +233,54 @@ class _VideoReplyReplyPanelState
   }
 
   Widget _sortWidget(ThemeData theme) => Container(
-        height: 40,
-        padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
-        decoration: BoxDecoration(
+    height: 40,
+    padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
+    decoration: BoxDecoration(
+      color: theme.colorScheme.surface,
+      boxShadow: [
+        BoxShadow(
           color: theme.colorScheme.surface,
-          boxShadow: [
-            BoxShadow(
-              color: theme.colorScheme.surface,
-              offset: const Offset(0, -2),
-            ),
-          ],
+          offset: const Offset(0, -2),
         ),
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Obx(
-              () {
-                final count = _controller.count.value;
-                return count != -1
-                    ? Text(
-                        '相关回复共${NumUtil.numFormat(count)}条',
-                        style: const TextStyle(fontSize: 13),
-                      )
-                    : const SizedBox.shrink();
-              },
+      ],
+    ),
+    child: Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        Obx(
+          () {
+            final count = _controller.count.value;
+            return count != -1
+                ? Text(
+                    '相关回复共${NumUtil.numFormat(count)}条',
+                    style: const TextStyle(fontSize: 13),
+                  )
+                : const SizedBox.shrink();
+          },
+        ),
+        SizedBox(
+          height: 35,
+          child: TextButton.icon(
+            onPressed: () => _controller.queryBySort(),
+            icon: Icon(
+              Icons.sort,
+              size: 16,
+              color: theme.colorScheme.secondary,
             ),
-            SizedBox(
-              height: 35,
-              child: TextButton.icon(
-                onPressed: () => _controller.queryBySort(),
-                icon: Icon(
-                  Icons.sort,
-                  size: 16,
+            label: Obx(
+              () => Text(
+                _controller.mode.value == Mode.MAIN_LIST_HOT ? '按热度' : '按时间',
+                style: TextStyle(
+                  fontSize: 13,
                   color: theme.colorScheme.secondary,
                 ),
-                label: Obx(
-                  () => Text(
-                    _controller.mode.value == Mode.MAIN_LIST_HOT
-                        ? '按热度'
-                        : '按时间',
-                    style: TextStyle(
-                      fontSize: 13,
-                      color: theme.colorScheme.secondary,
-                    ),
-                  ),
-                ),
               ),
-            )
-          ],
+            ),
+          ),
         ),
-      );
+      ],
+    ),
+  );
 
   Function(List<String>, int)? get _getImageCallback => _horizontalPreview
       ? (imgList, index) {
@@ -305,60 +313,65 @@ class _VideoReplyReplyPanelState
       : null;
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<ReplyInfo>?> loadingState, int index) {
+    ThemeData theme,
+    LoadingState<List<ReplyInfo>?> loadingState,
+    int index,
+  ) {
     return switch (loadingState) {
       Loading() => IgnorePointer(
-          child: ListView.builder(
-            shrinkWrap: true,
-            physics: const NeverScrollableScrollPhysics(),
-            itemBuilder: (context, index) {
-              return const VideoReplySkeleton();
-            },
-            itemCount: 8,
-          ),
-        ),
-      Success(:var response) => Builder(
-          builder: (context) {
-            if (index == response!.length) {
-              _controller.onLoadMore();
-              return Container(
-                alignment: Alignment.center,
-                margin: EdgeInsets.only(
-                    bottom: MediaQuery.paddingOf(context).bottom),
-                height: 125,
-                child: Text(
-                  _controller.isEnd ? '没有更多了' : '加载中...',
-                  style: TextStyle(
-                    fontSize: 12,
-                    color: theme.colorScheme.outline,
-                  ),
-                ),
-              );
-            } else {
-              if (_controller.index != null && _controller.index == index) {
-                colorAnimation ??= ColorTween(
-                  begin: theme.colorScheme.onInverseSurface,
-                  end: theme.colorScheme.surface,
-                ).animate(_controller.controller!);
-                return AnimatedBuilder(
-                  animation: colorAnimation!,
-                  builder: (context, child) {
-                    return ColoredBox(
-                      color: colorAnimation!.value ??
-                          theme.colorScheme.onInverseSurface,
-                      child: _replyItem(response[index], index),
-                    );
-                  },
-                );
-              }
-              return _replyItem(response[index], index);
-            }
+        child: ListView.builder(
+          shrinkWrap: true,
+          physics: const NeverScrollableScrollPhysics(),
+          itemBuilder: (context, index) {
+            return const VideoReplySkeleton();
           },
+          itemCount: 8,
         ),
+      ),
+      Success(:var response) => Builder(
+        builder: (context) {
+          if (index == response!.length) {
+            _controller.onLoadMore();
+            return Container(
+              alignment: Alignment.center,
+              margin: EdgeInsets.only(
+                bottom: MediaQuery.paddingOf(context).bottom,
+              ),
+              height: 125,
+              child: Text(
+                _controller.isEnd ? '没有更多了' : '加载中...',
+                style: TextStyle(
+                  fontSize: 12,
+                  color: theme.colorScheme.outline,
+                ),
+              ),
+            );
+          } else {
+            if (_controller.index != null && _controller.index == index) {
+              colorAnimation ??= ColorTween(
+                begin: theme.colorScheme.onInverseSurface,
+                end: theme.colorScheme.surface,
+              ).animate(_controller.controller!);
+              return AnimatedBuilder(
+                animation: colorAnimation!,
+                builder: (context, child) {
+                  return ColoredBox(
+                    color:
+                        colorAnimation!.value ??
+                        theme.colorScheme.onInverseSurface,
+                    child: _replyItem(response[index], index),
+                  );
+                },
+              );
+            }
+            return _replyItem(response[index], index);
+          }
+        },
+      ),
       Error(:var errMsg) => errorWidget(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/video/reply_search_item/child/view.dart b/lib/pages/video/reply_search_item/child/view.dart
index dcfd00595..87cc6cecc 100644
--- a/lib/pages/video/reply_search_item/child/view.dart
+++ b/lib/pages/video/reply_search_item/child/view.dart
@@ -65,27 +65,28 @@ class _ReplySearchChildPageState extends State<ReplySearchChildPage>
   Widget _buildBody(LoadingState<List<SearchItem>?> loadingState) {
     return switch (loadingState) {
       Loading() => _buildLoading,
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverGrid(
-              gridDelegate: Grid.videoCardHDelegate(context),
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  if (index == response.length - 1) {
-                    _controller.onLoadMore();
-                  }
-                  return ReplySearchItem(
-                    item: response[index],
-                    type: widget.searchType,
-                  );
-                },
-                childCount: response!.length,
-              ),
-            )
-          : HttpError(onReload: _controller.onReload),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverGrid(
+                gridDelegate: Grid.videoCardHDelegate(context),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) {
+                    if (index == response.length - 1) {
+                      _controller.onLoadMore();
+                    }
+                    return ReplySearchItem(
+                      item: response[index],
+                      type: widget.searchType,
+                    );
+                  },
+                  childCount: response!.length,
+                ),
+              )
+            : HttpError(onReload: _controller.onReload),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/video/reply_search_item/controller.dart b/lib/pages/video/reply_search_item/controller.dart
index 802f5d9fb..96e537de6 100644
--- a/lib/pages/video/reply_search_item/controller.dart
+++ b/lib/pages/video/reply_search_item/controller.dart
@@ -16,11 +16,13 @@ class ReplySearchController extends GetxController
   final focusNode = FocusNode();
 
   late final videoCtr = Get.put(
-      ReplySearchChildController(this, ReplySearchType.video),
-      tag: Utils.generateRandomString(8));
+    ReplySearchChildController(this, ReplySearchType.video),
+    tag: Utils.generateRandomString(8),
+  );
   late final articleCtr = Get.put(
-      ReplySearchChildController(this, ReplySearchType.article),
-      tag: Utils.generateRandomString(8));
+    ReplySearchChildController(this, ReplySearchType.article),
+    tag: Utils.generateRandomString(8),
+  );
 
   void onClear() {
     if (editingController.value.text.isNotEmpty) {
diff --git a/lib/pages/video/reply_search_item/view.dart b/lib/pages/video/reply_search_item/view.dart
index 0643328f1..4aa648857 100644
--- a/lib/pages/video/reply_search_item/view.dart
+++ b/lib/pages/video/reply_search_item/view.dart
@@ -22,8 +22,9 @@ class ReplySearchPage extends StatefulWidget {
 
 class _ReplySearchPageState extends State<ReplySearchPage> {
   late final _controller = Get.put(
-      ReplySearchController(widget.type, widget.oid),
-      tag: Utils.generateRandomString(8));
+    ReplySearchController(widget.type, widget.oid),
+    tag: Utils.generateRandomString(8),
+  );
 
   @override
   Widget build(BuildContext context) {
@@ -35,7 +36,7 @@ class _ReplySearchPageState extends State<ReplySearchPage> {
             onPressed: _controller.submit,
             icon: const Icon(Icons.search, size: 22),
           ),
-          const SizedBox(width: 10)
+          const SizedBox(width: 10),
         ],
         title: TextField(
           autofocus: true,
diff --git a/lib/pages/video/send_danmaku/view.dart b/lib/pages/video/send_danmaku/view.dart
index 45a0a7582..1dd7d28ed 100644
--- a/lib/pages/video/send_danmaku/view.dart
+++ b/lib/pages/video/send_danmaku/view.dart
@@ -80,59 +80,60 @@ class _SendDanmakuPanelState extends CommonTextPubPageState<SendDanmakuPanel> {
 
   @override
   void dispose() {
-    widget.onSaveDmConfig?.call(
-        (mode: _mode.value, fontsize: _fontsize.value, color: _color.value));
+    widget.onSaveDmConfig?.call((
+      mode: _mode.value,
+      fontsize: _fontsize.value,
+      color: _color.value,
+    ));
     super.dispose();
   }
 
   Expanded get _buildColorPanel => Expanded(
-        child: Obx(
-          () => LayoutBuilder(
-            key: ValueKey(_color.value),
-            builder: (context, constraints) {
-              final int crossAxisCount = (constraints.maxWidth / 40).toInt();
-              final bool isCustomColor = !_colorList.contains(_color.value);
-              final int length =
-                  _colorList.length + (isCustomColor ? 1 : 0) + 1;
-              return GridView.builder(
-                shrinkWrap: true,
-                physics: const NeverScrollableScrollPhysics(),
-                padding: EdgeInsets.zero,
-                gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                  crossAxisCount: crossAxisCount,
-                  crossAxisSpacing: 4,
-                  mainAxisSpacing: 4,
-                ),
-                itemCount: length,
-                itemBuilder: (context, index) {
-                  if (index == length - 1) {
-                    return GestureDetector(
-                      onTap: _showColorPicker,
-                      child: Container(
-                        decoration: BoxDecoration(
-                          color: themeData.colorScheme.secondaryContainer,
-                          borderRadius:
-                              const BorderRadius.all(Radius.circular(8)),
-                        ),
-                        alignment: Alignment.center,
-                        margin: const EdgeInsets.all(2),
-                        child: Icon(
-                          size: 22,
-                          Icons.edit,
-                          color: themeData.colorScheme.onSecondaryContainer,
-                        ),
-                      ),
-                    );
-                  } else if (index == length - 2 && isCustomColor) {
-                    return _buildColorItem(_color.value);
-                  }
-                  return _buildColorItem(_colorList[index]);
-                },
-              );
+    child: Obx(
+      () => LayoutBuilder(
+        key: ValueKey(_color.value),
+        builder: (context, constraints) {
+          final int crossAxisCount = (constraints.maxWidth / 40).toInt();
+          final bool isCustomColor = !_colorList.contains(_color.value);
+          final int length = _colorList.length + (isCustomColor ? 1 : 0) + 1;
+          return GridView.builder(
+            shrinkWrap: true,
+            physics: const NeverScrollableScrollPhysics(),
+            padding: EdgeInsets.zero,
+            gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+              crossAxisCount: crossAxisCount,
+              crossAxisSpacing: 4,
+              mainAxisSpacing: 4,
+            ),
+            itemCount: length,
+            itemBuilder: (context, index) {
+              if (index == length - 1) {
+                return GestureDetector(
+                  onTap: _showColorPicker,
+                  child: Container(
+                    decoration: BoxDecoration(
+                      color: themeData.colorScheme.secondaryContainer,
+                      borderRadius: const BorderRadius.all(Radius.circular(8)),
+                    ),
+                    alignment: Alignment.center,
+                    margin: const EdgeInsets.all(2),
+                    child: Icon(
+                      size: 22,
+                      Icons.edit,
+                      color: themeData.colorScheme.onSecondaryContainer,
+                    ),
+                  ),
+                );
+              } else if (index == length - 2 && isCustomColor) {
+                return _buildColorItem(_color.value);
+              }
+              return _buildColorItem(_colorList[index]);
             },
-          ),
-        ),
-      );
+          );
+        },
+      ),
+    ),
+  );
 
   @override
   void didChangeDependencies() {
@@ -174,54 +175,54 @@ class _SendDanmakuPanelState extends CommonTextPubPageState<SendDanmakuPanel> {
 
   @override
   Widget? get customPanel => Container(
-        padding: const EdgeInsets.symmetric(horizontal: 16),
-        decoration: BoxDecoration(
-          border: Border(
-            top: BorderSide(
-              color: themeData.colorScheme.outline.withValues(alpha: 0.1),
-            ),
-          ),
+    padding: const EdgeInsets.symmetric(horizontal: 16),
+    decoration: BoxDecoration(
+      border: Border(
+        top: BorderSide(
+          color: themeData.colorScheme.outline.withValues(alpha: 0.1),
         ),
-        child: SingleChildScrollView(
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
+      ),
+    ),
+    child: SingleChildScrollView(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const SizedBox(height: 12),
+          Row(
             children: [
-              const SizedBox(height: 12),
-              Row(
-                children: [
-                  const Text('弹幕字号', style: TextStyle(fontSize: 15)),
-                  const SizedBox(width: 16),
-                  _buildFontSizeItem(18, '小'),
-                  const SizedBox(width: 5),
-                  _buildFontSizeItem(25, '标准'),
-                ],
-              ),
-              const SizedBox(height: 12),
-              Row(
-                children: [
-                  const Text('弹幕样式', style: TextStyle(fontSize: 15)),
-                  const SizedBox(width: 16),
-                  _buildPositionItem(1, '滚动'),
-                  const SizedBox(width: 5),
-                  _buildPositionItem(5, '顶部'),
-                  const SizedBox(width: 5),
-                  _buildPositionItem(4, '底部'),
-                ],
-              ),
-              const SizedBox(height: 12),
-              Row(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  const Text('弹幕颜色', style: TextStyle(fontSize: 15)),
-                  const SizedBox(width: 16),
-                  _buildColorPanel,
-                ],
-              ),
-              SizedBox(height: 12 + MediaQuery.paddingOf(context).bottom),
+              const Text('弹幕字号', style: TextStyle(fontSize: 15)),
+              const SizedBox(width: 16),
+              _buildFontSizeItem(18, '小'),
+              const SizedBox(width: 5),
+              _buildFontSizeItem(25, '标准'),
             ],
           ),
-        ),
-      );
+          const SizedBox(height: 12),
+          Row(
+            children: [
+              const Text('弹幕样式', style: TextStyle(fontSize: 15)),
+              const SizedBox(width: 16),
+              _buildPositionItem(1, '滚动'),
+              const SizedBox(width: 5),
+              _buildPositionItem(5, '顶部'),
+              const SizedBox(width: 5),
+              _buildPositionItem(4, '底部'),
+            ],
+          ),
+          const SizedBox(height: 12),
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              const Text('弹幕颜色', style: TextStyle(fontSize: 15)),
+              const SizedBox(width: 16),
+              _buildColorPanel,
+            ],
+          ),
+          SizedBox(height: 12 + MediaQuery.paddingOf(context).bottom),
+        ],
+      ),
+    ),
+  );
 
   Widget _buildColorItem(Color color) {
     return GestureDetector(
@@ -339,9 +340,11 @@ class _SendDanmakuPanelState extends CommonTextPubPageState<SendDanmakuPanel> {
               context: context,
               tooltip: '弹幕样式',
               onPressed: () {
-                updatePanelType(panelType.value == PanelType.keyboard
-                    ? PanelType.emoji
-                    : PanelType.keyboard);
+                updatePanelType(
+                  panelType.value == PanelType.keyboard
+                      ? PanelType.emoji
+                      : PanelType.keyboard,
+                );
               },
               bgColor: Colors.transparent,
               iconSize: 24,
@@ -419,7 +422,7 @@ class _SendDanmakuPanelState extends CommonTextPubPageState<SendDanmakuPanel> {
               onPressed: enablePublish.value ? onPublish : null,
               icon: Icons.send,
             ),
-          )
+          ),
         ],
       ),
     );
diff --git a/lib/pages/video/view.dart b/lib/pages/video/view.dart
index 983e5be2a..1a29ee56d 100644
--- a/lib/pages/video/view.dart
+++ b/lib/pages/video/view.dart
@@ -152,8 +152,9 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
 
     videoDetailController.animationController.addListener(animListener);
 
-    _listenerFS =
-        videoDetailController.plPlayerController.isFullScreen.listen((value) {
+    _listenerFS = videoDetailController.plPlayerController.isFullScreen.listen((
+      value,
+    ) {
       refreshPage();
     });
 
@@ -201,9 +202,11 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
               !videoDetailController.animationController.isAnimating) {
             videoDetailController.isExpanding = true;
             videoDetailController.animationController.forward(
-                from: 1 -
-                    videoDetailController.scrollCtr.offset /
-                        videoDetailController.videoHeight);
+              from:
+                  1 -
+                  videoDetailController.scrollCtr.offset /
+                      videoDetailController.videoHeight,
+            );
           } else {
             refreshPage();
           }
@@ -217,8 +220,13 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
 
     if (status == PlayerStatus.completed) {
       try {
-        if (videoDetailController.steinEdgeInfo?.edges?.questions?.firstOrNull
-                ?.choices?.isNotEmpty ==
+        if (videoDetailController
+                .steinEdgeInfo
+                ?.edges
+                ?.questions
+                ?.firstOrNull
+                ?.choices
+                ?.isNotEmpty ==
             true) {
           videoDetailController.showSteinEdgeInfo.value = true;
           return;
@@ -306,7 +314,8 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
 
     try {
       Get.delete<HorizontalMemberPageController>(
-          tag: videoDetailController.heroTag);
+        tag: videoDetailController.heroTag,
+      );
       videoDetailController.animationController.removeListener(animListener);
       if (videoDetailController.showReply) {
         videoDetailController.scrollKey.currentState?.innerController
@@ -392,11 +401,13 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
     videoIntroController.startTimer();
     if (mounted) {
       if (videoDetailController.brightness != null) {
-        plPlayerController
-            ?.setCurrBrightness(videoDetailController.brightness!);
+        plPlayerController?.setCurrBrightness(
+          videoDetailController.brightness!,
+        );
         if (videoDetailController.brightness != -1.0) {
           ScreenBrightness().setApplicationScreenBrightness(
-              videoDetailController.brightness!);
+            videoDetailController.brightness!,
+          );
         } else {
           ScreenBrightness().resetApplicationScreenBrightness();
         }
@@ -427,8 +438,10 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    VideoDetailPageV.routeObserver
-        .subscribe(this, ModalRoute.of(context)! as PageRoute);
+    VideoDetailPageV.routeObserver.subscribe(
+      this,
+      ModalRoute.of(context)! as PageRoute,
+    );
     themeData = videoDetailController.plPlayerController.darkVideoPage
         ? MyApp.darkThemeData ?? Theme.of(context)
         : Theme.of(context);
@@ -445,18 +458,20 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
   void cal() {
     if (videoDetailController.isExpanding) {
       animHeight = clampDouble(
-          videoDetailController.videoHeight *
-              videoDetailController.animationController.value,
-          kToolbarHeight,
-          videoDetailController.videoHeight);
+        videoDetailController.videoHeight *
+            videoDetailController.animationController.value,
+        kToolbarHeight,
+        videoDetailController.videoHeight,
+      );
     } else if (videoDetailController.isCollapsing) {
       animHeight = clampDouble(
-          videoDetailController.maxVideoHeight -
-              (videoDetailController.maxVideoHeight -
-                      videoDetailController.minVideoHeight) *
-                  videoDetailController.animationController.value,
-          videoDetailController.minVideoHeight,
-          videoDetailController.maxVideoHeight);
+        videoDetailController.maxVideoHeight -
+            (videoDetailController.maxVideoHeight -
+                    videoDetailController.minVideoHeight) *
+                videoDetailController.animationController.value,
+        videoDetailController.minVideoHeight,
+        videoDetailController.maxVideoHeight,
+      );
     }
   }
 
@@ -507,7 +522,8 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                 child: Obx(
                   () {
                     final scrollRatio = videoDetailController.scrollRatio.value;
-                    bool shouldShow = scrollRatio != 0 &&
+                    bool shouldShow =
+                        scrollRatio != 0 &&
                         videoDetailController.scrollCtr.offset != 0 &&
                         isPortrait;
                     return Stack(
@@ -518,12 +534,13 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                           toolbarHeight: 0,
                           systemOverlayStyle: Platform.isAndroid
                               ? shouldShow
-                                  ? null
-                                  : SystemUiOverlayStyle(
-                                      statusBarIconBrightness: Brightness.light,
-                                      systemNavigationBarIconBrightness:
-                                          themeData.brightness.reverse,
-                                    )
+                                    ? null
+                                    : SystemUiOverlayStyle(
+                                        statusBarIconBrightness:
+                                            Brightness.light,
+                                        systemNavigationBarIconBrightness:
+                                            themeData.brightness.reverse,
+                                      )
                               : null,
                         ),
                         if (shouldShow)
@@ -553,17 +570,18 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
           controller: videoDetailController.scrollCtr,
           onlyOneScrollInBody: true,
           pinnedHeaderSliverHeightBuilder: () {
-            double pinnedHeight = isFullScreen ||
+            double pinnedHeight =
+                isFullScreen ||
                     MediaQuery.orientationOf(context) == Orientation.landscape
                 ? MediaQuery.sizeOf(context).height
                 : videoDetailController.isExpanding ||
-                        videoDetailController.isCollapsing
-                    ? animHeight
-                    : videoDetailController.isCollapsing ||
-                            plPlayerController?.playerStatus.status.value ==
-                                PlayerStatus.playing
-                        ? videoDetailController.minVideoHeight
-                        : kToolbarHeight;
+                      videoDetailController.isCollapsing
+                ? animHeight
+                : videoDetailController.isCollapsing ||
+                      plPlayerController?.playerStatus.status.value ==
+                          PlayerStatus.playing
+                ? videoDetailController.minVideoHeight
+                : kToolbarHeight;
             if (videoDetailController.isExpanding &&
                 videoDetailController.animationController.value == 1) {
               videoDetailController.isExpanding = false;
@@ -591,9 +609,9 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                 expandedHeight: isFullScreen || !isPortrait
                     ? height
                     : videoDetailController.isExpanding ||
-                            videoDetailController.isCollapsing
-                        ? animHeight
-                        : videoDetailController.videoHeight,
+                          videoDetailController.isCollapsing
+                    ? animHeight
+                    : videoDetailController.videoHeight,
                 flexibleSpace: Stack(
                   clipBehavior: Clip.none,
                   children: [
@@ -618,22 +636,24 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                         return SizedBox(
                           height: !isPortrait || isFullScreen
                               ? height -
-                                  (!isPortrait || removeSafeArea
-                                      ? 0
-                                      : MediaQuery.paddingOf(this.context).top)
+                                    (!isPortrait || removeSafeArea
+                                        ? 0
+                                        : MediaQuery.paddingOf(
+                                            this.context,
+                                          ).top)
                               : videoDetailController.isExpanding ||
-                                      videoDetailController.isCollapsing
-                                  ? animHeight
-                                  : videoDetailController.videoHeight,
+                                    videoDetailController.isCollapsing
+                              ? animHeight
+                              : videoDetailController.videoHeight,
                           width: width,
                           child: videoPlayer(
                             width,
                             !isPortrait || isFullScreen
                                 ? height
                                 : videoDetailController.isExpanding ||
-                                        videoDetailController.isCollapsing
-                                    ? animHeight
-                                    : videoDetailController.videoHeight,
+                                      videoDetailController.isCollapsing
+                                ? animHeight
+                                : videoDetailController.videoHeight,
                           ),
                         );
                       },
@@ -641,125 +661,134 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                     Obx(
                       () {
                         Widget toolbar() => Opacity(
-                              opacity: videoDetailController.scrollRatio.value,
-                              child: Container(
-                                color: themeData.colorScheme.surface,
-                                alignment: Alignment.topCenter,
-                                child: SizedBox(
-                                  height: kToolbarHeight,
-                                  child: Stack(
-                                    clipBehavior: Clip.none,
-                                    children: [
-                                      Align(
-                                        alignment: Alignment.centerLeft,
-                                        child: Row(
-                                          mainAxisSize: MainAxisSize.min,
-                                          children: [
-                                            SizedBox(
-                                              width: 42,
-                                              height: 34,
-                                              child: IconButton(
-                                                tooltip: '返回',
-                                                icon: Icon(
-                                                  FontAwesomeIcons.arrowLeft,
-                                                  size: 15,
-                                                  color: themeData
-                                                      .colorScheme.onSurface,
-                                                ),
-                                                onPressed: Get.back,
-                                              ),
+                          opacity: videoDetailController.scrollRatio.value,
+                          child: Container(
+                            color: themeData.colorScheme.surface,
+                            alignment: Alignment.topCenter,
+                            child: SizedBox(
+                              height: kToolbarHeight,
+                              child: Stack(
+                                clipBehavior: Clip.none,
+                                children: [
+                                  Align(
+                                    alignment: Alignment.centerLeft,
+                                    child: Row(
+                                      mainAxisSize: MainAxisSize.min,
+                                      children: [
+                                        SizedBox(
+                                          width: 42,
+                                          height: 34,
+                                          child: IconButton(
+                                            tooltip: '返回',
+                                            icon: Icon(
+                                              FontAwesomeIcons.arrowLeft,
+                                              size: 15,
+                                              color: themeData
+                                                  .colorScheme
+                                                  .onSurface,
                                             ),
-                                            SizedBox(
-                                              width: 42,
-                                              height: 34,
-                                              child: IconButton(
-                                                tooltip: '返回主页',
-                                                icon: Icon(
-                                                  FontAwesomeIcons.house,
-                                                  size: 15,
-                                                  color: themeData
-                                                      .colorScheme.onSurface,
-                                                ),
-                                                onPressed: () {
-                                                  videoDetailController
+                                            onPressed: Get.back,
+                                          ),
+                                        ),
+                                        SizedBox(
+                                          width: 42,
+                                          height: 34,
+                                          child: IconButton(
+                                            tooltip: '返回主页',
+                                            icon: Icon(
+                                              FontAwesomeIcons.house,
+                                              size: 15,
+                                              color: themeData
+                                                  .colorScheme
+                                                  .onSurface,
+                                            ),
+                                            onPressed: () {
+                                              videoDetailController
                                                       .plPlayerController
-                                                      .backToHome = true;
-                                                  Get.until(
-                                                      (route) => route.isFirst);
-                                                },
-                                              ),
-                                            ),
-                                          ],
+                                                      .backToHome =
+                                                  true;
+                                              Get.until(
+                                                (route) => route.isFirst,
+                                              );
+                                            },
+                                          ),
                                         ),
-                                      ),
-                                      Center(
-                                        child: Row(
-                                          mainAxisSize: MainAxisSize.min,
-                                          children: [
-                                            Icon(
-                                              Icons.play_arrow_rounded,
-                                              color:
-                                                  themeData.colorScheme.primary,
-                                            ),
-                                            Text(
-                                              '${videoDetailController.playedTime == null ? '立即' : plPlayerController!.playerStatus.status.value == PlayerStatus.completed ? '重新' : '继续'}播放',
-                                              style: TextStyle(
-                                                color: themeData
-                                                    .colorScheme.primary,
-                                              ),
-                                            ),
-                                          ],
+                                      ],
+                                    ),
+                                  ),
+                                  Center(
+                                    child: Row(
+                                      mainAxisSize: MainAxisSize.min,
+                                      children: [
+                                        Icon(
+                                          Icons.play_arrow_rounded,
+                                          color: themeData.colorScheme.primary,
                                         ),
-                                      ),
-                                      Align(
-                                        alignment: Alignment.centerRight,
-                                        child: videoDetailController
-                                                    .playedTime ==
-                                                null
-                                            ? PopupMenuButton<String>(
-                                                icon: Icon(
-                                                  size: 22,
-                                                  Icons.more_vert,
-                                                  color: themeData
-                                                      .colorScheme.onSurface,
-                                                ),
-                                                onSelected:
-                                                    (String type) async {
-                                                  switch (type) {
-                                                    case 'later':
-                                                      await videoIntroController
-                                                          .viewLater();
-                                                      break;
-                                                    case 'report':
-                                                      if (!Accounts
-                                                          .main.isLogin) {
-                                                        SmartDialog.showToast(
-                                                            '账号未登录');
-                                                      } else {
-                                                        PageUtils.reportVideo(
-                                                            videoDetailController
-                                                                .oid.value);
-                                                      }
-                                                      break;
-                                                    case 'note':
+                                        Text(
+                                          '${videoDetailController.playedTime == null
+                                              ? '立即'
+                                              : plPlayerController!.playerStatus.status.value == PlayerStatus.completed
+                                              ? '重新'
+                                              : '继续'}播放',
+                                          style: TextStyle(
+                                            color:
+                                                themeData.colorScheme.primary,
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+                                  Align(
+                                    alignment: Alignment.centerRight,
+                                    child:
+                                        videoDetailController.playedTime == null
+                                        ? PopupMenuButton<String>(
+                                            icon: Icon(
+                                              size: 22,
+                                              Icons.more_vert,
+                                              color: themeData
+                                                  .colorScheme
+                                                  .onSurface,
+                                            ),
+                                            onSelected: (String type) async {
+                                              switch (type) {
+                                                case 'later':
+                                                  await videoIntroController
+                                                      .viewLater();
+                                                  break;
+                                                case 'report':
+                                                  if (!Accounts.main.isLogin) {
+                                                    SmartDialog.showToast(
+                                                      '账号未登录',
+                                                    );
+                                                  } else {
+                                                    PageUtils.reportVideo(
                                                       videoDetailController
-                                                          .showNoteList(
-                                                              context);
-                                                      break;
-                                                    case 'savePic':
-                                                      ImageUtil.downloadImg(
-                                                        context,
-                                                        [
-                                                          videoDetailController
-                                                              .cover.value
-                                                        ],
-                                                      );
-                                                      break;
+                                                          .oid
+                                                          .value,
+                                                    );
                                                   }
-                                                },
-                                                itemBuilder: (BuildContext
-                                                        context) =>
-                                                    <PopupMenuEntry<String>>[
+                                                  break;
+                                                case 'note':
+                                                  videoDetailController
+                                                      .showNoteList(context);
+                                                  break;
+                                                case 'savePic':
+                                                  ImageUtil.downloadImg(
+                                                    context,
+                                                    [
+                                                      videoDetailController
+                                                          .cover
+                                                          .value,
+                                                    ],
+                                                  );
+                                                  break;
+                                              }
+                                            },
+                                            itemBuilder:
+                                                (
+                                                  BuildContext context,
+                                                ) => <PopupMenuEntry<String>>[
                                                   const PopupMenuItem<String>(
                                                     value: 'later',
                                                     child: Text('稍后再看'),
@@ -772,7 +801,9 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                                                       child: Text('查看笔记'),
                                                     ),
                                                   if (videoDetailController
-                                                      .cover.value.isNotEmpty)
+                                                      .cover
+                                                      .value
+                                                      .isNotEmpty)
                                                     const PopupMenuItem<String>(
                                                       value: 'savePic',
                                                       child: Text('保存封面'),
@@ -782,36 +813,38 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                                                     child: Text('举报'),
                                                   ),
                                                 ],
-                                              )
-                                            : SizedBox(
-                                                width: 42,
-                                                height: 34,
-                                                child: IconButton(
-                                                  tooltip: "更多设置",
-                                                  style: ButtonStyle(
-                                                    padding:
-                                                        WidgetStateProperty.all(
-                                                            EdgeInsets.zero),
-                                                  ),
-                                                  onPressed: () =>
-                                                      videoDetailController
-                                                          .headerCtrKey
-                                                          .currentState
-                                                          ?.showSettingSheet(),
-                                                  icon: Icon(
-                                                    Icons.more_vert_outlined,
-                                                    size: 19,
-                                                    color: themeData
-                                                        .colorScheme.onSurface,
-                                                  ),
-                                                ),
+                                          )
+                                        : SizedBox(
+                                            width: 42,
+                                            height: 34,
+                                            child: IconButton(
+                                              tooltip: "更多设置",
+                                              style: ButtonStyle(
+                                                padding:
+                                                    WidgetStateProperty.all(
+                                                      EdgeInsets.zero,
+                                                    ),
                                               ),
-                                      ),
-                                    ],
+                                              onPressed: () =>
+                                                  videoDetailController
+                                                      .headerCtrKey
+                                                      .currentState
+                                                      ?.showSettingSheet(),
+                                              icon: Icon(
+                                                Icons.more_vert_outlined,
+                                                size: 19,
+                                                color: themeData
+                                                    .colorScheme
+                                                    .onSurface,
+                                              ),
+                                            ),
+                                          ),
                                   ),
-                                ),
+                                ],
                               ),
-                            );
+                            ),
+                          ),
+                        );
                         return videoDetailController.scrollRatio.value == 0 ||
                                 videoDetailController.scrollCtr.offset == 0 ||
                                 !isPortrait
@@ -832,7 +865,8 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                                             null) {
                                       if (kDebugMode) {
                                         debugPrint(
-                                            'handlePlay: videoUrl/audioUrl not initialized');
+                                          'handlePlay: videoUrl/audioUrl not initialized',
+                                        );
                                       }
                                       videoDetailController.queryVideoUrl();
                                       return;
@@ -901,244 +935,225 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
   }
 
   Widget get childWhenDisabledAlmostSquareInner => Obx(
-        () {
-          final size = MediaQuery.sizeOf(context);
-          final double width = size.width;
-          final double height = size.height;
-          final padding = MediaQuery.paddingOf(context);
-          if (enableVerticalExpand &&
-              videoDetailController.direction.value == 'vertical') {
-            final double videoHeight =
-                height - (removeSafeArea ? 0 : padding.vertical);
-            final double videoWidth = videoHeight * 9 / 16;
-            return Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                SizedBox(
-                  height: videoHeight,
-                  width: isFullScreen ? width : videoWidth,
-                  child: videoPlayer(videoWidth, videoHeight),
-                ),
-                Expanded(
-                  child: Scaffold(
-                    key: videoDetailController.childKey,
-                    resizeToAvoidBottomInset: false,
-                    backgroundColor: Colors.transparent,
-                    body: Column(
-                      children: [
-                        buildTabbar(showReply: videoDetailController.showReply),
-                        Expanded(
-                          child: videoTabBarView(
-                            controller: videoDetailController.tabCtr,
-                            children: [
-                              videoIntro(),
-                              if (videoDetailController.showReply)
-                                videoReplyPanel(),
-                              if (_shouldShowSeasonPanel) seasonPanel,
-                            ],
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-              ],
-            );
-          }
-          final double videoHeight = height / 2.5;
-          return Column(
-            children: [
-              SizedBox(
-                width: width,
-                height: isFullScreen
-                    ? height - (removeSafeArea ? 0 : padding.vertical)
-                    : videoHeight,
-                child: videoPlayer(width, videoHeight),
-              ),
-              Expanded(
-                child: Scaffold(
-                  key: videoDetailController.childKey,
-                  resizeToAvoidBottomInset: false,
-                  backgroundColor: Colors.transparent,
-                  body: Column(
-                    children: [
-                      buildTabbar(
-                        needIndicator: false,
-                        showReply: videoDetailController.showReply,
+    () {
+      final size = MediaQuery.sizeOf(context);
+      final double width = size.width;
+      final double height = size.height;
+      final padding = MediaQuery.paddingOf(context);
+      if (enableVerticalExpand &&
+          videoDetailController.direction.value == 'vertical') {
+        final double videoHeight =
+            height - (removeSafeArea ? 0 : padding.vertical);
+        final double videoWidth = videoHeight * 9 / 16;
+        return Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            SizedBox(
+              height: videoHeight,
+              width: isFullScreen ? width : videoWidth,
+              child: videoPlayer(videoWidth, videoHeight),
+            ),
+            Expanded(
+              child: Scaffold(
+                key: videoDetailController.childKey,
+                resizeToAvoidBottomInset: false,
+                backgroundColor: Colors.transparent,
+                body: Column(
+                  children: [
+                    buildTabbar(showReply: videoDetailController.showReply),
+                    Expanded(
+                      child: videoTabBarView(
+                        controller: videoDetailController.tabCtr,
+                        children: [
+                          videoIntro(),
+                          if (videoDetailController.showReply)
+                            videoReplyPanel(),
+                          if (_shouldShowSeasonPanel) seasonPanel,
+                        ],
                       ),
-                      Expanded(
-                        child: Row(
-                          children: [
-                            Expanded(child: videoIntro()),
-                            if (videoDetailController.showReply)
-                              Expanded(child: videoReplyPanel()),
-                            if (_shouldShowSeasonPanel)
-                              Expanded(child: seasonPanel),
-                          ],
-                        ),
-                      )
-                    ],
-                  ),
+                    ),
+                  ],
                 ),
               ),
-            ],
-          );
-        },
-      );
-
-  Widget get childWhenDisabledLandscapeInner => Obx(
-        () {
-          final size = MediaQuery.sizeOf(context);
-          final double width = size.width;
-          final double height = size.height;
-          final padding = MediaQuery.paddingOf(context);
-          if (enableVerticalExpand &&
-              videoDetailController.direction.value == 'vertical') {
-            final double videoHeight =
-                height - (removeSafeArea ? 0 : padding.top);
-            final double videoWidth = videoHeight * 9 / 16;
-            return Row(
-              children: [
-                Expanded(
-                    child:
-                        isFullScreen ? const SizedBox.shrink() : videoIntro()),
-                SizedBox(
-                  height: videoHeight,
-                  width: isFullScreen ? width : videoWidth,
-                  child: videoPlayer(videoWidth, videoHeight),
-                ),
-                Expanded(
-                  child: Scaffold(
-                    key: videoDetailController.childKey,
-                    resizeToAvoidBottomInset: false,
-                    backgroundColor: Colors.transparent,
-                    body: Column(
-                      children: [
-                        buildTabbar(
-                          showIntro: false,
-                          showReply: videoDetailController.showReply,
-                        ),
-                        Expanded(
-                          child: videoTabBarView(
-                            controller: videoDetailController.tabCtr,
-                            children: [
-                              if (videoDetailController.showReply)
-                                videoReplyPanel(),
-                              if (_shouldShowSeasonPanel) seasonPanel,
-                            ],
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-              ],
-            );
-          }
-          double videoWidth =
-              clampDouble(height / width * 1.08, 0.5, 0.7) * width;
-          if (width >= 560) {
-            videoWidth = min(videoWidth, width - 280);
-          }
-          final double videoHeight = videoWidth * 9 / 16;
-          return Row(
-            children: [
-              Column(
+            ),
+          ],
+        );
+      }
+      final double videoHeight = height / 2.5;
+      return Column(
+        children: [
+          SizedBox(
+            width: width,
+            height: isFullScreen
+                ? height - (removeSafeArea ? 0 : padding.vertical)
+                : videoHeight,
+            child: videoPlayer(width, videoHeight),
+          ),
+          Expanded(
+            child: Scaffold(
+              key: videoDetailController.childKey,
+              resizeToAvoidBottomInset: false,
+              backgroundColor: Colors.transparent,
+              body: Column(
                 children: [
-                  SizedBox(
-                    width: isFullScreen ? width : videoWidth,
-                    height: isFullScreen ? height : videoHeight,
-                    child: videoPlayer(videoWidth, videoHeight),
+                  buildTabbar(
+                    needIndicator: false,
+                    showReply: videoDetailController.showReply,
                   ),
-                  Offstage(
-                    offstage: isFullScreen,
-                    child: SizedBox(
-                      width: videoWidth,
-                      height: height -
-                          videoHeight -
-                          (removeSafeArea ? 0 : padding.top),
-                      child: videoIntro(false, false),
+                  Expanded(
+                    child: Row(
+                      children: [
+                        Expanded(child: videoIntro()),
+                        if (videoDetailController.showReply)
+                          Expanded(child: videoReplyPanel()),
+                        if (_shouldShowSeasonPanel)
+                          Expanded(child: seasonPanel),
+                      ],
                     ),
                   ),
                 ],
               ),
-              Offstage(
-                offstage: isFullScreen,
-                child: SizedBox(
-                  width: width -
-                      videoWidth -
-                      (removeSafeArea ? 0 : padding.horizontal),
-                  height: height - (removeSafeArea ? 0 : padding.top),
-                  child: Scaffold(
-                    key: videoDetailController.childKey,
-                    resizeToAvoidBottomInset: false,
-                    backgroundColor: Colors.transparent,
-                    body: Column(
-                      children: [
-                        buildTabbar(
-                          introText: '相关视频',
-                          showIntro: videoDetailController.videoType ==
-                                  SearchType.video &&
-                              videoDetailController
-                                  .plPlayerController.showRelatedVideo,
-                          showReply: videoDetailController.showReply,
-                        ),
-                        Expanded(
-                          child: videoTabBarView(
-                            controller: videoDetailController.tabCtr,
-                            children: [
-                              if (videoDetailController.videoType ==
-                                      SearchType.video &&
-                                  videoDetailController
-                                      .plPlayerController.showRelatedVideo)
-                                CustomScrollView(
-                                  controller: _introController,
-                                  slivers: [
-                                    RelatedVideoPanel(
-                                        key: relatedVideoPanelKey,
-                                        heroTag: heroTag),
-                                  ],
-                                ),
-                              if (videoDetailController.showReply)
-                                videoReplyPanel(),
-                              if (_shouldShowSeasonPanel) seasonPanel,
-                            ],
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-              )
-            ],
-          );
-        },
-      );
-
-  Widget get childWhenDisabledLandscape => Stack(
-        clipBehavior: Clip.none,
-        children: [
-          Scaffold(
-            resizeToAvoidBottomInset: false,
-            key: videoDetailController.scaffoldKey,
-            appBar: (removeSafeArea || isFullScreen)
-                ? null
-                : AppBar(
-                    backgroundColor: Colors.black,
-                    toolbarHeight: 0,
-                  ),
-            body: SafeArea(
-              left: !removeSafeArea && !isFullScreen,
-              right: !removeSafeArea && !isFullScreen,
-              top: !removeSafeArea && !isFullScreen,
-              bottom: false,
-              child: childWhenDisabledLandscapeInner,
             ),
           ),
         ],
       );
+    },
+  );
 
-  Widget get childWhenDisabledAlmostSquare => Scaffold(
+  Widget get childWhenDisabledLandscapeInner => Obx(
+    () {
+      final size = MediaQuery.sizeOf(context);
+      final double width = size.width;
+      final double height = size.height;
+      final padding = MediaQuery.paddingOf(context);
+      if (enableVerticalExpand &&
+          videoDetailController.direction.value == 'vertical') {
+        final double videoHeight = height - (removeSafeArea ? 0 : padding.top);
+        final double videoWidth = videoHeight * 9 / 16;
+        return Row(
+          children: [
+            Expanded(
+              child: isFullScreen ? const SizedBox.shrink() : videoIntro(),
+            ),
+            SizedBox(
+              height: videoHeight,
+              width: isFullScreen ? width : videoWidth,
+              child: videoPlayer(videoWidth, videoHeight),
+            ),
+            Expanded(
+              child: Scaffold(
+                key: videoDetailController.childKey,
+                resizeToAvoidBottomInset: false,
+                backgroundColor: Colors.transparent,
+                body: Column(
+                  children: [
+                    buildTabbar(
+                      showIntro: false,
+                      showReply: videoDetailController.showReply,
+                    ),
+                    Expanded(
+                      child: videoTabBarView(
+                        controller: videoDetailController.tabCtr,
+                        children: [
+                          if (videoDetailController.showReply)
+                            videoReplyPanel(),
+                          if (_shouldShowSeasonPanel) seasonPanel,
+                        ],
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ],
+        );
+      }
+      double videoWidth = clampDouble(height / width * 1.08, 0.5, 0.7) * width;
+      if (width >= 560) {
+        videoWidth = min(videoWidth, width - 280);
+      }
+      final double videoHeight = videoWidth * 9 / 16;
+      return Row(
+        children: [
+          Column(
+            children: [
+              SizedBox(
+                width: isFullScreen ? width : videoWidth,
+                height: isFullScreen ? height : videoHeight,
+                child: videoPlayer(videoWidth, videoHeight),
+              ),
+              Offstage(
+                offstage: isFullScreen,
+                child: SizedBox(
+                  width: videoWidth,
+                  height:
+                      height - videoHeight - (removeSafeArea ? 0 : padding.top),
+                  child: videoIntro(false, false),
+                ),
+              ),
+            ],
+          ),
+          Offstage(
+            offstage: isFullScreen,
+            child: SizedBox(
+              width:
+                  width -
+                  videoWidth -
+                  (removeSafeArea ? 0 : padding.horizontal),
+              height: height - (removeSafeArea ? 0 : padding.top),
+              child: Scaffold(
+                key: videoDetailController.childKey,
+                resizeToAvoidBottomInset: false,
+                backgroundColor: Colors.transparent,
+                body: Column(
+                  children: [
+                    buildTabbar(
+                      introText: '相关视频',
+                      showIntro:
+                          videoDetailController.videoType == SearchType.video &&
+                          videoDetailController
+                              .plPlayerController
+                              .showRelatedVideo,
+                      showReply: videoDetailController.showReply,
+                    ),
+                    Expanded(
+                      child: videoTabBarView(
+                        controller: videoDetailController.tabCtr,
+                        children: [
+                          if (videoDetailController.videoType ==
+                                  SearchType.video &&
+                              videoDetailController
+                                  .plPlayerController
+                                  .showRelatedVideo)
+                            CustomScrollView(
+                              controller: _introController,
+                              slivers: [
+                                RelatedVideoPanel(
+                                  key: relatedVideoPanelKey,
+                                  heroTag: heroTag,
+                                ),
+                              ],
+                            ),
+                          if (videoDetailController.showReply)
+                            videoReplyPanel(),
+                          if (_shouldShowSeasonPanel) seasonPanel,
+                        ],
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        ],
+      );
+    },
+  );
+
+  Widget get childWhenDisabledLandscape => Stack(
+    clipBehavior: Clip.none,
+    children: [
+      Scaffold(
         resizeToAvoidBottomInset: false,
         key: videoDetailController.scaffoldKey,
         appBar: (removeSafeArea || isFullScreen)
@@ -1152,114 +1167,94 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
           right: !removeSafeArea && !isFullScreen,
           top: !removeSafeArea && !isFullScreen,
           bottom: false,
-          child: childWhenDisabledAlmostSquareInner,
+          child: childWhenDisabledLandscapeInner,
         ),
-      );
+      ),
+    ],
+  );
+
+  Widget get childWhenDisabledAlmostSquare => Scaffold(
+    resizeToAvoidBottomInset: false,
+    key: videoDetailController.scaffoldKey,
+    appBar: (removeSafeArea || isFullScreen)
+        ? null
+        : AppBar(
+            backgroundColor: Colors.black,
+            toolbarHeight: 0,
+          ),
+    body: SafeArea(
+      left: !removeSafeArea && !isFullScreen,
+      right: !removeSafeArea && !isFullScreen,
+      top: !removeSafeArea && !isFullScreen,
+      bottom: false,
+      child: childWhenDisabledAlmostSquareInner,
+    ),
+  );
 
   Widget get childWhenEnabled => Obx(
-        () => !videoDetailController.autoPlay.value
-            ? const SizedBox.shrink()
-            : PLVideoPlayer(
-                key: Key(heroTag),
-                plPlayerController: plPlayerController!,
-                videoDetailController: videoDetailController,
-                videoIntroController:
-                    videoDetailController.videoType == SearchType.video
-                        ? videoIntroController
-                        : null,
-                pgcIntroController:
-                    videoDetailController.videoType == SearchType.media_bangumi
-                        ? pgcIntroController
-                        : null,
-                headerControl: HeaderControl(
-                  controller: plPlayerController!,
-                  videoDetailCtr: videoDetailController,
-                  heroTag: heroTag,
-                ),
-                danmuWidget: pipNoDanmaku
-                    ? null
-                    : Obx(
-                        () => PlDanmaku(
-                          key: Key(videoDetailController.danmakuCid.value
-                              .toString()),
-                          isPipMode: true,
-                          cid: videoDetailController.danmakuCid.value,
-                          playerController: plPlayerController!,
-                        ),
+    () => !videoDetailController.autoPlay.value
+        ? const SizedBox.shrink()
+        : PLVideoPlayer(
+            key: Key(heroTag),
+            plPlayerController: plPlayerController!,
+            videoDetailController: videoDetailController,
+            videoIntroController:
+                videoDetailController.videoType == SearchType.video
+                ? videoIntroController
+                : null,
+            pgcIntroController:
+                videoDetailController.videoType == SearchType.media_bangumi
+                ? pgcIntroController
+                : null,
+            headerControl: HeaderControl(
+              controller: plPlayerController!,
+              videoDetailCtr: videoDetailController,
+              heroTag: heroTag,
+            ),
+            danmuWidget: pipNoDanmaku
+                ? null
+                : Obx(
+                    () => PlDanmaku(
+                      key: Key(
+                        videoDetailController.danmakuCid.value.toString(),
                       ),
-                showEpisodes: showEpisodes,
-                showViewPoints: showViewPoints,
-              ),
-      );
+                      isPipMode: true,
+                      cid: videoDetailController.danmakuCid.value,
+                      playerController: plPlayerController!,
+                    ),
+                  ),
+            showEpisodes: showEpisodes,
+            showViewPoints: showViewPoints,
+          ),
+  );
 
   Widget get manualPlayerWidget => Obx(
-        () => Visibility(
-          visible: videoDetailController.isShowCover.value,
-          child: Stack(
-            clipBehavior: Clip.none,
-            children: [
-              Positioned(
-                top: 0,
-                left: 0,
-                right: 0,
-                child: AppBar(
-                  primary: false,
-                  elevation: 0,
-                  scrolledUnderElevation: 0,
-                  foregroundColor: Colors.white,
-                  backgroundColor: Colors.transparent,
-                  automaticallyImplyLeading: false,
-                  title: Row(
-                    children: [
-                      SizedBox(
-                        width: 42,
-                        height: 34,
-                        child: IconButton(
-                          tooltip: '返回',
-                          icon: const Icon(
-                            FontAwesomeIcons.arrowLeft,
-                            size: 15,
-                            color: Colors.white,
-                            shadows: [
-                              Shadow(
-                                blurRadius: 1.5,
-                                color: Colors.black,
-                              ),
-                            ],
-                          ),
-                          onPressed: Get.back,
-                        ),
-                      ),
-                      SizedBox(
-                        width: 42,
-                        height: 34,
-                        child: IconButton(
-                          tooltip: '返回主页',
-                          icon: const Icon(
-                            FontAwesomeIcons.house,
-                            size: 15,
-                            color: Colors.white,
-                            shadows: [
-                              Shadow(
-                                blurRadius: 1.5,
-                                color: Colors.black,
-                              ),
-                            ],
-                          ),
-                          onPressed: () {
-                            videoDetailController
-                                .plPlayerController.backToHome = true;
-                            Get.until((route) => route.isFirst);
-                          },
-                        ),
-                      ),
-                    ],
-                  ),
-                  actions: [
-                    PopupMenuButton<String>(
+    () => Visibility(
+      visible: videoDetailController.isShowCover.value,
+      child: Stack(
+        clipBehavior: Clip.none,
+        children: [
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            child: AppBar(
+              primary: false,
+              elevation: 0,
+              scrolledUnderElevation: 0,
+              foregroundColor: Colors.white,
+              backgroundColor: Colors.transparent,
+              automaticallyImplyLeading: false,
+              title: Row(
+                children: [
+                  SizedBox(
+                    width: 42,
+                    height: 34,
+                    child: IconButton(
+                      tooltip: '返回',
                       icon: const Icon(
-                        size: 22,
-                        Icons.more_vert,
+                        FontAwesomeIcons.arrowLeft,
+                        size: 15,
                         color: Colors.white,
                         shadows: [
                           Shadow(
@@ -1268,32 +1263,74 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                           ),
                         ],
                       ),
-                      onSelected: (String type) async {
-                        switch (type) {
-                          case 'later':
-                            await videoIntroController.viewLater();
-                            break;
-                          case 'report':
-                            if (!Accounts.main.isLogin) {
-                              SmartDialog.showToast('账号未登录');
-                            } else {
-                              PageUtils.reportVideo(
-                                  videoDetailController.oid.value);
-                            }
-                            break;
-                          case 'note':
-                            videoDetailController.showNoteList(context);
-                            break;
-                          case 'savePic':
-                            ImageUtil.downloadImg(
-                              context,
-                              [videoDetailController.cover.value],
-                            );
-                            break;
-                        }
+                      onPressed: Get.back,
+                    ),
+                  ),
+                  SizedBox(
+                    width: 42,
+                    height: 34,
+                    child: IconButton(
+                      tooltip: '返回主页',
+                      icon: const Icon(
+                        FontAwesomeIcons.house,
+                        size: 15,
+                        color: Colors.white,
+                        shadows: [
+                          Shadow(
+                            blurRadius: 1.5,
+                            color: Colors.black,
+                          ),
+                        ],
+                      ),
+                      onPressed: () {
+                        videoDetailController.plPlayerController.backToHome =
+                            true;
+                        Get.until((route) => route.isFirst);
                       },
-                      itemBuilder: (BuildContext context) =>
-                          <PopupMenuEntry<String>>[
+                    ),
+                  ),
+                ],
+              ),
+              actions: [
+                PopupMenuButton<String>(
+                  icon: const Icon(
+                    size: 22,
+                    Icons.more_vert,
+                    color: Colors.white,
+                    shadows: [
+                      Shadow(
+                        blurRadius: 1.5,
+                        color: Colors.black,
+                      ),
+                    ],
+                  ),
+                  onSelected: (String type) async {
+                    switch (type) {
+                      case 'later':
+                        await videoIntroController.viewLater();
+                        break;
+                      case 'report':
+                        if (!Accounts.main.isLogin) {
+                          SmartDialog.showToast('账号未登录');
+                        } else {
+                          PageUtils.reportVideo(
+                            videoDetailController.oid.value,
+                          );
+                        }
+                        break;
+                      case 'note':
+                        videoDetailController.showNoteList(context);
+                        break;
+                      case 'savePic':
+                        ImageUtil.downloadImg(
+                          context,
+                          [videoDetailController.cover.value],
+                        );
+                        break;
+                    }
+                  },
+                  itemBuilder: (BuildContext context) =>
+                      <PopupMenuEntry<String>>[
                         const PopupMenuItem<String>(
                           value: 'later',
                           child: Text('稍后再看'),
@@ -1313,65 +1350,64 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                           child: Text('举报'),
                         ),
                       ],
-                    ),
-                  ],
                 ),
-              ),
-              Positioned(
-                right: 12,
-                bottom: 10,
-                child: IconButton(
-                  tooltip: '播放',
-                  onPressed: handlePlay,
-                  icon: Image.asset(
-                    'assets/images/play.png',
-                    width: 60,
-                    height: 60,
-                  ),
-                ),
-              ),
-            ],
+              ],
+            ),
           ),
-        ),
-      );
+          Positioned(
+            right: 12,
+            bottom: 10,
+            child: IconButton(
+              tooltip: '播放',
+              onPressed: handlePlay,
+              icon: Image.asset(
+                'assets/images/play.png',
+                width: 60,
+                height: 60,
+              ),
+            ),
+          ),
+        ],
+      ),
+    ),
+  );
 
   Widget get plPlayer => Obx(
-        key: videoPlayerKey,
-        () => videoDetailController.videoState.value is! Success
-            ? const SizedBox.shrink()
-            : !videoDetailController.autoPlay.value ||
-                    plPlayerController?.videoController == null
-                ? const SizedBox.shrink()
-                : PLVideoPlayer(
-                    key: Key(heroTag),
-                    plPlayerController: plPlayerController!,
-                    videoDetailController: videoDetailController,
-                    videoIntroController:
-                        videoDetailController.videoType == SearchType.video
-                            ? videoIntroController
-                            : null,
-                    pgcIntroController: videoDetailController.videoType ==
-                            SearchType.media_bangumi
-                        ? pgcIntroController
-                        : null,
-                    headerControl: HeaderControl(
-                      key: videoDetailController.headerCtrKey,
-                      controller: videoDetailController.plPlayerController,
-                      videoDetailCtr: videoDetailController,
-                      heroTag: heroTag,
-                    ),
-                    danmuWidget: Obx(
-                      () => PlDanmaku(
-                        key: Key(
-                            videoDetailController.danmakuCid.value.toString()),
-                        cid: videoDetailController.danmakuCid.value,
-                        playerController: plPlayerController!,
-                      ),
-                    ),
-                    showEpisodes: showEpisodes,
-                    showViewPoints: showViewPoints,
-                  ),
-      );
+    key: videoPlayerKey,
+    () => videoDetailController.videoState.value is! Success
+        ? const SizedBox.shrink()
+        : !videoDetailController.autoPlay.value ||
+              plPlayerController?.videoController == null
+        ? const SizedBox.shrink()
+        : PLVideoPlayer(
+            key: Key(heroTag),
+            plPlayerController: plPlayerController!,
+            videoDetailController: videoDetailController,
+            videoIntroController:
+                videoDetailController.videoType == SearchType.video
+                ? videoIntroController
+                : null,
+            pgcIntroController:
+                videoDetailController.videoType == SearchType.media_bangumi
+                ? pgcIntroController
+                : null,
+            headerControl: HeaderControl(
+              key: videoDetailController.headerCtrKey,
+              controller: videoDetailController.plPlayerController,
+              videoDetailCtr: videoDetailController,
+              heroTag: heroTag,
+            ),
+            danmuWidget: Obx(
+              () => PlDanmaku(
+                key: Key(videoDetailController.danmakuCid.value.toString()),
+                cid: videoDetailController.danmakuCid.value,
+                playerController: plPlayerController!,
+              ),
+            ),
+            showEpisodes: showEpisodes,
+            showViewPoints: showViewPoints,
+          ),
+  );
 
   Widget autoChoose(Widget childWhenDisabled) {
     if (Platform.isAndroid) {
@@ -1432,50 +1468,51 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
     }
 
     Widget tabbar() => TabBar(
-          labelColor: !needIndicator || tabs.length == 1
-              ? themeData.colorScheme.onSurface
-              : null,
-          indicator:
-              !needIndicator || tabs.length == 1 ? const BoxDecoration() : null,
-          padding: EdgeInsets.zero,
-          controller: videoDetailController.tabCtr,
-          labelStyle:
-              TabBarTheme.of(context).labelStyle?.copyWith(fontSize: 13) ??
-                  const TextStyle(fontSize: 13),
-          labelPadding: const EdgeInsets.symmetric(horizontal: 10.0),
-          dividerColor: Colors.transparent,
-          dividerHeight: 0,
-          onTap: (value) {
-            void animToTop() {
-              if (onTap != null) {
-                onTap();
-                return;
-              }
-              String text = tabs[value];
-              if (text == '简介' || text == '相关视频') {
-                _introController.animToTop();
-              } else if (text.startsWith('评论')) {
-                _videoReplyController.animateToTop();
-              }
-            }
+      labelColor: !needIndicator || tabs.length == 1
+          ? themeData.colorScheme.onSurface
+          : null,
+      indicator: !needIndicator || tabs.length == 1
+          ? const BoxDecoration()
+          : null,
+      padding: EdgeInsets.zero,
+      controller: videoDetailController.tabCtr,
+      labelStyle:
+          TabBarTheme.of(context).labelStyle?.copyWith(fontSize: 13) ??
+          const TextStyle(fontSize: 13),
+      labelPadding: const EdgeInsets.symmetric(horizontal: 10.0),
+      dividerColor: Colors.transparent,
+      dividerHeight: 0,
+      onTap: (value) {
+        void animToTop() {
+          if (onTap != null) {
+            onTap();
+            return;
+          }
+          String text = tabs[value];
+          if (text == '简介' || text == '相关视频') {
+            _introController.animToTop();
+          } else if (text.startsWith('评论')) {
+            _videoReplyController.animateToTop();
+          }
+        }
 
-            if (!needIndicator || tabs.length == 1) {
-              animToTop();
-            } else if (!videoDetailController.tabCtr.indexIsChanging) {
-              animToTop();
-            }
-          },
-          tabs: tabs.map((text) {
-            if (text == '评论') {
-              return Tab(
-                text:
-                    '评论${_videoReplyController.count.value == -1 ? '' : ' ${NumUtil.numFormat(_videoReplyController.count.value)}'}',
-              );
-            } else {
-              return Tab(text: text);
-            }
-          }).toList(),
-        );
+        if (!needIndicator || tabs.length == 1) {
+          animToTop();
+        } else if (!videoDetailController.tabCtr.indexIsChanging) {
+          animToTop();
+        }
+      },
+      tabs: tabs.map((text) {
+        if (text == '评论') {
+          return Tab(
+            text:
+                '评论${_videoReplyController.count.value == -1 ? '' : ' ${NumUtil.numFormat(_videoReplyController.count.value)}'}',
+          );
+        } else {
+          return Tab(text: text);
+        }
+      }).toList(),
+    );
 
     return Container(
       width: double.infinity,
@@ -1525,14 +1562,21 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                     child: Obx(
                       () {
                         final enableShowDanmaku = videoDetailController
-                            .plPlayerController.enableShowDanmaku.value;
+                            .plPlayerController
+                            .enableShowDanmaku
+                            .value;
                         return IconButton(
                           onPressed: () {
                             final newVal = !enableShowDanmaku;
-                            videoDetailController.plPlayerController
-                                .enableShowDanmaku.value = newVal;
-                            GStorage.setting
-                                .put(SettingBoxKey.enableShowDanmaku, newVal);
+                            videoDetailController
+                                    .plPlayerController
+                                    .enableShowDanmaku
+                                    .value =
+                                newVal;
+                            GStorage.setting.put(
+                              SettingBoxKey.enableShowDanmaku,
+                              newVal,
+                            );
                           },
                           icon: Icon(
                             size: 22,
@@ -1559,7 +1603,8 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
 
   Widget videoPlayer(double videoWidth, double videoHeight) {
     return PopScope(
-      canPop: !isFullScreen &&
+      canPop:
+          !isFullScreen &&
           (videoDetailController.horizontalScreen ||
               MediaQuery.orientationOf(context) == Orientation.portrait),
       onPopInvokedWithResult: _onPopInvokedWithResult,
@@ -1653,7 +1698,6 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
           //     child: Text('index'),
           //   ),
           // ),
-
           Obx(
             () {
               if (videoDetailController.showSteinEdgeInfo.value) {
@@ -1672,38 +1716,48 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                         spacing: 25,
                         runSpacing: 10,
                         children: videoDetailController
-                            .steinEdgeInfo!.edges!.questions!.first.choices!
+                            .steinEdgeInfo!
+                            .edges!
+                            .questions!
+                            .first
+                            .choices!
                             .map((item) {
-                          return FilledButton.tonal(
-                            style: FilledButton.styleFrom(
-                              shape: const RoundedRectangleBorder(
-                                borderRadius:
-                                    BorderRadius.all(Radius.circular(6)),
-                              ),
-                              backgroundColor: themeData
-                                  .colorScheme.secondaryContainer
-                                  .withValues(alpha: 0.8),
-                              padding: const EdgeInsets.symmetric(
-                                horizontal: 15,
-                                vertical: 10,
-                              ),
-                              visualDensity: VisualDensity.compact,
-                              tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                            ),
-                            onPressed: () {
-                              videoIntroController.changeSeasonOrbangu(
-                                null,
-                                videoDetailController.bvid,
-                                item.cid,
-                                IdUtils.bv2av(videoDetailController.bvid),
-                                null,
-                                true,
+                              return FilledButton.tonal(
+                                style: FilledButton.styleFrom(
+                                  shape: const RoundedRectangleBorder(
+                                    borderRadius: BorderRadius.all(
+                                      Radius.circular(6),
+                                    ),
+                                  ),
+                                  backgroundColor: themeData
+                                      .colorScheme
+                                      .secondaryContainer
+                                      .withValues(alpha: 0.8),
+                                  padding: const EdgeInsets.symmetric(
+                                    horizontal: 15,
+                                    vertical: 10,
+                                  ),
+                                  visualDensity: VisualDensity.compact,
+                                  tapTargetSize:
+                                      MaterialTapTargetSize.shrinkWrap,
+                                ),
+                                onPressed: () {
+                                  videoIntroController.changeSeasonOrbangu(
+                                    null,
+                                    videoDetailController.bvid,
+                                    item.cid,
+                                    IdUtils.bv2av(videoDetailController.bvid),
+                                    null,
+                                    true,
+                                  );
+                                  videoDetailController.getSteinEdgeInfo(
+                                    item.id,
+                                  );
+                                },
+                                child: Text(item.option!),
                               );
-                              videoDetailController.getSteinEdgeInfo(item.id);
-                            },
-                            child: Text(item.option!),
-                          );
-                        }).toList(),
+                            })
+                            .toList(),
                       ),
                     ),
                   );
@@ -1723,66 +1777,63 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
   Widget videoIntro([bool needRelated = true, bool needCtr = true]) {
     final bottom = MediaQuery.paddingOf(context).bottom;
     Widget introPanel() => CustomScrollView(
-          key: const PageStorageKey<String>('简介'),
-          controller: needCtr ? _introController : null,
-          physics: !needCtr
-              ? const AlwaysScrollableScrollPhysics(
-                  parent: ClampingScrollPhysics())
-              : null,
-          slivers: [
-            if (videoDetailController.videoType == SearchType.video) ...[
-              VideoIntroPanel(
-                key: ugcPanelKey,
-                heroTag: heroTag,
-                showAiBottomSheet: showAiBottomSheet,
-                showEpisodes: showEpisodes,
-                onShowMemberPage: onShowMemberPage,
-              ),
-              if (needRelated &&
-                  videoDetailController
-                      .plPlayerController.showRelatedVideo) ...[
-                SliverToBoxAdapter(
-                  child: Padding(
-                    padding: const EdgeInsets.only(top: StyleString.safeSpace),
-                    child: Divider(
-                      height: 1,
-                      indent: 12,
-                      endIndent: 12,
-                      color:
-                          themeData.colorScheme.outline.withValues(alpha: 0.08),
-                    ),
-                  ),
-                ),
-                RelatedVideoPanel(key: relatedVideoPanelKey, heroTag: heroTag),
-              ] else
-                SliverToBoxAdapter(
-                  child: SizedBox(
-                    height: bottom + StyleString.safeSpace,
-                  ),
-                ),
-            ] else if (videoDetailController.videoType ==
-                SearchType.media_bangumi)
-              Obx(
-                () => PgcIntroPage(
-                  key: pgcPanelKey,
-                  heroTag: heroTag,
-                  cid: videoDetailController.cid.value,
-                  showEpisodes: showEpisodes,
-                  showIntroDetail: showIntroDetail,
+      key: const PageStorageKey<String>('简介'),
+      controller: needCtr ? _introController : null,
+      physics: !needCtr
+          ? const AlwaysScrollableScrollPhysics(parent: ClampingScrollPhysics())
+          : null,
+      slivers: [
+        if (videoDetailController.videoType == SearchType.video) ...[
+          VideoIntroPanel(
+            key: ugcPanelKey,
+            heroTag: heroTag,
+            showAiBottomSheet: showAiBottomSheet,
+            showEpisodes: showEpisodes,
+            onShowMemberPage: onShowMemberPage,
+          ),
+          if (needRelated &&
+              videoDetailController.plPlayerController.showRelatedVideo) ...[
+            SliverToBoxAdapter(
+              child: Padding(
+                padding: const EdgeInsets.only(top: StyleString.safeSpace),
+                child: Divider(
+                  height: 1,
+                  indent: 12,
+                  endIndent: 12,
+                  color: themeData.colorScheme.outline.withValues(alpha: 0.08),
                 ),
               ),
+            ),
+            RelatedVideoPanel(key: relatedVideoPanelKey, heroTag: heroTag),
+          ] else
             SliverToBoxAdapter(
               child: SizedBox(
-                height: bottom +
-                    (videoDetailController.isPlayAll &&
-                            MediaQuery.orientationOf(context) ==
-                                Orientation.landscape
-                        ? 75
-                        : 0),
+                height: bottom + StyleString.safeSpace,
               ),
-            )
-          ],
-        );
+            ),
+        ] else if (videoDetailController.videoType == SearchType.media_bangumi)
+          Obx(
+            () => PgcIntroPage(
+              key: pgcPanelKey,
+              heroTag: heroTag,
+              cid: videoDetailController.cid.value,
+              showEpisodes: showEpisodes,
+              showIntroDetail: showIntroDetail,
+            ),
+          ),
+        SliverToBoxAdapter(
+          child: SizedBox(
+            height:
+                bottom +
+                (videoDetailController.isPlayAll &&
+                        MediaQuery.orientationOf(context) ==
+                            Orientation.landscape
+                    ? 75
+                    : 0),
+          ),
+        ),
+      ],
+    );
     return Stack(
       clipBehavior: Clip.none,
       children: [
@@ -1801,8 +1852,9 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                   height: 54,
                   padding: const EdgeInsets.symmetric(horizontal: 16),
                   decoration: BoxDecoration(
-                    color: themeData.colorScheme.secondaryContainer
-                        .withValues(alpha: 0.95),
+                    color: themeData.colorScheme.secondaryContainer.withValues(
+                      alpha: 0.95,
+                    ),
                     borderRadius: const BorderRadius.all(Radius.circular(14)),
                   ),
                   child: Row(
@@ -1860,12 +1912,14 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                   aid: IdUtils.bv2av(videoDetailController.bvid),
                   cid: videoDetailController.cid.value,
                   isReversed: videoDetail.isPageReversed,
-                  changeFucCall: videoDetailController.videoType ==
+                  changeFucCall:
+                      videoDetailController.videoType ==
                           SearchType.media_bangumi
                       ? pgcIntroController.changeSeasonOrbangu
                       : videoIntroController.changeSeasonOrbangu,
                   showTitle: false,
-                  isSupportReverse: videoDetailController.videoType !=
+                  isSupportReverse:
+                      videoDetailController.videoType !=
                       SearchType.media_bangumi,
                   onReverse: () => onReversePlay(
                     bvid: videoDetailController.bvid,
@@ -1915,8 +1969,8 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                     .isReversed,
                 changeFucCall:
                     videoDetailController.videoType == SearchType.media_bangumi
-                        ? pgcIntroController.changeSeasonOrbangu
-                        : videoIntroController.changeSeasonOrbangu,
+                    ? pgcIntroController.changeSeasonOrbangu
+                    : videoIntroController.changeSeasonOrbangu,
                 showTitle: false,
                 isSupportReverse:
                     videoDetailController.videoType != SearchType.media_bangumi,
@@ -1934,46 +1988,46 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
   }
 
   Widget videoReplyPanel([bool needCtr = true]) => Obx(
-        () => VideoReplyPanel(
-          key: videoReplyPanelKey,
-          needController: needCtr,
-          bvid: videoDetailController.bvid,
-          oid: videoDetailController.oid.value,
-          heroTag: heroTag,
-          replyReply: replyReply,
-          onViewImage: videoDetailController.onViewImage,
-          onDismissed: videoDetailController.onDismissed,
-          callback: _horizontalPreview
-              ? (imgList, index) {
-                  final ctr = AnimationController(
-                    vsync: this,
-                    duration: const Duration(milliseconds: 200),
-                  )..forward();
-                  PageUtils.onHorizontalPreview(
-                    videoDetailController.childKey,
-                    AnimationController(
-                      vsync: this,
-                      duration: Duration.zero,
-                    ),
-                    ctr,
-                    imgList,
-                    index,
-                    (value) async {
-                      if (value == false) {
-                        await ctr.reverse();
-                      }
-                      try {
-                        ctr.dispose();
-                      } catch (_) {}
-                      if (value == false) {
-                        Get.back();
-                      }
-                    },
-                  );
-                }
-              : null,
-        ),
-      );
+    () => VideoReplyPanel(
+      key: videoReplyPanelKey,
+      needController: needCtr,
+      bvid: videoDetailController.bvid,
+      oid: videoDetailController.oid.value,
+      heroTag: heroTag,
+      replyReply: replyReply,
+      onViewImage: videoDetailController.onViewImage,
+      onDismissed: videoDetailController.onDismissed,
+      callback: _horizontalPreview
+          ? (imgList, index) {
+              final ctr = AnimationController(
+                vsync: this,
+                duration: const Duration(milliseconds: 200),
+              )..forward();
+              PageUtils.onHorizontalPreview(
+                videoDetailController.childKey,
+                AnimationController(
+                  vsync: this,
+                  duration: Duration.zero,
+                ),
+                ctr,
+                imgList,
+                index,
+                (value) async {
+                  if (value == false) {
+                    await ctr.reverse();
+                  }
+                  try {
+                    ctr.dispose();
+                  } catch (_) {}
+                  if (value == false) {
+                    Get.back();
+                  }
+                },
+              );
+            }
+          : null,
+    ),
+  );
 
   // 展示二级回复
   void replyReply(ReplyInfo replyItem, int? id) {
@@ -2006,7 +2060,9 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
   }
 
   void showIntroDetail(
-      PgcInfoModel videoDetail, List<VideoTagItem>? videoTags) {
+    PgcInfoModel videoDetail,
+    List<VideoTagItem>? videoTags,
+  ) {
     videoDetailController.childKey.currentState?.showBottomSheet(
       backgroundColor: Colors.transparent,
       (context) => PgcIntroPanel(
@@ -2022,48 +2078,46 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
       return;
     }
     Widget listSheetContent([bool? enableSlide]) => EpisodePanel(
-          heroTag: heroTag,
-          videoIntroController: videoIntroController,
-          type: season != null
-              ? EpisodeType.season
-              : episodes is List<Part>
-                  ? EpisodeType.part
-                  : EpisodeType.pgc,
-          cover: videoDetailController.cover.value,
-          enableSlide: enableSlide,
-          initialTabIndex: index ?? 0,
+      heroTag: heroTag,
+      videoIntroController: videoIntroController,
+      type: season != null
+          ? EpisodeType.season
+          : episodes is List<Part>
+          ? EpisodeType.part
+          : EpisodeType.pgc,
+      cover: videoDetailController.cover.value,
+      enableSlide: enableSlide,
+      initialTabIndex: index ?? 0,
+      bvid: bvid,
+      aid: aid,
+      cid: cid,
+      seasonId: season?.id,
+      list: season != null ? season.sections : [episodes],
+      isReversed: videoDetailController.videoType == SearchType.media_bangumi
+          ? null
+          : season != null
+          ? videoIntroController
+                .videoDetail
+                .value
+                .ugcSeason!
+                .sections![videoDetailController.seasonIndex.value]
+                .isReversed
+          : videoIntroController.videoDetail.value.isPageReversed,
+      isSupportReverse:
+          videoDetailController.videoType != SearchType.media_bangumi,
+      changeFucCall: videoDetailController.videoType == SearchType.media_bangumi
+          ? pgcIntroController.changeSeasonOrbangu
+          : videoIntroController.changeSeasonOrbangu,
+      onClose: Get.back,
+      onReverse: () {
+        Get.back();
+        onReversePlay(
           bvid: bvid,
           aid: aid,
-          cid: cid,
-          seasonId: season?.id,
-          list: season != null ? season.sections : [episodes],
-          isReversed:
-              videoDetailController.videoType == SearchType.media_bangumi
-                  ? null
-                  : season != null
-                      ? videoIntroController
-                          .videoDetail
-                          .value
-                          .ugcSeason!
-                          .sections![videoDetailController.seasonIndex.value]
-                          .isReversed
-                      : videoIntroController.videoDetail.value.isPageReversed,
-          isSupportReverse:
-              videoDetailController.videoType != SearchType.media_bangumi,
-          changeFucCall:
-              videoDetailController.videoType == SearchType.media_bangumi
-                  ? pgcIntroController.changeSeasonOrbangu
-                  : videoIntroController.changeSeasonOrbangu,
-          onClose: Get.back,
-          onReverse: () {
-            Get.back();
-            onReversePlay(
-              bvid: bvid,
-              aid: aid,
-              isSeason: season != null,
-            );
-          },
+          isSeason: season != null,
         );
+      },
+    );
     if (isFullScreen || videoDetailController.showVideoSheet) {
       PageUtils.showVideoBottomSheet(
         context,
@@ -2102,8 +2156,8 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
         episode is EpisodeItem
             ? episode.arc?.pic
             : episode is pgc.EpisodeItem
-                ? episode.cover
-                : null,
+            ? episode.cover
+            : null,
       );
     }
 
@@ -2111,7 +2165,8 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
     if (isSeason) {
       // reverse season
       final item = videoDetail
-          .ugcSeason!.sections![videoDetailController.seasonIndex.value];
+          .ugcSeason!
+          .sections![videoDetailController.seasonIndex.value];
       item
         ..isReversed = !item.isReversed
         ..episodes = item.episodes!.reversed.toList();
@@ -2123,8 +2178,13 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
           ..cid.refresh();
       } else {
         // switch to first episode
-        var episode = videoIntroController.videoDetail.value.ugcSeason!
-            .sections![videoDetailController.seasonIndex.value].episodes!.first;
+        var episode = videoIntroController
+            .videoDetail
+            .value
+            .ugcSeason!
+            .sections![videoDetailController.seasonIndex.value]
+            .episodes!
+            .first;
         if (episode.cid != videoDetailController.cid.value) {
           changeEpisode(episode);
           videoDetailController.seasonCid = episode.cid;
diff --git a/lib/pages/video/view_point/view.dart b/lib/pages/video/view_point/view.dart
index 5ccde8ee3..4e361bea0 100644
--- a/lib/pages/video/view_point/view.dart
+++ b/lib/pages/video/view_point/view.dart
@@ -94,8 +94,9 @@ class _ViewPointsPageState
     return ListView.separated(
       controller: ScrollController(),
       physics: const AlwaysScrollableScrollPhysics(),
-      padding:
-          EdgeInsets.only(bottom: MediaQuery.paddingOf(context).bottom + 80),
+      padding: EdgeInsets.only(
+        bottom: MediaQuery.paddingOf(context).bottom + 80,
+      ),
       itemCount: videoDetailController.viewPointList.length,
       itemBuilder: (context, index) {
         Segment segment = videoDetailController.viewPointList[index];
@@ -113,8 +114,9 @@ class _ViewPointsPageState
               ? () {
                   currentIndex = index;
                   plPlayerController?.danmakuController?.clear();
-                  plPlayerController?.videoPlayerController
-                      ?.seek(Duration(seconds: segment.from!));
+                  plPlayerController?.videoPlayerController?.seek(
+                    Duration(seconds: segment.from!),
+                  );
                   Get.back();
                 }
               : null,
@@ -123,8 +125,9 @@ class _ViewPointsPageState
                   margin: const EdgeInsets.symmetric(vertical: 6),
                   decoration: currentIndex == index
                       ? BoxDecoration(
-                          borderRadius:
-                              const BorderRadius.all(Radius.circular(6)),
+                          borderRadius: const BorderRadius.all(
+                            Radius.circular(6),
+                          ),
                           border: Border.all(
                             width: 1.8,
                             strokeAlign: BorderSide.strokeAlignOutside,
diff --git a/lib/pages/video/widgets/header_control.dart b/lib/pages/video/widgets/header_control.dart
index 2a289f729..acdf7844d 100644
--- a/lib/pages/video/widgets/header_control.dart
+++ b/lib/pages/video/widgets/header_control.dart
@@ -162,7 +162,7 @@ class HeaderControlState extends State<HeaderControl> {
                   dense: true,
                   onTap: () => {
                     Get.back(),
-                    PageUtils.scheduleExit(this.context, isFullScreen)
+                    PageUtils.scheduleExit(this.context, isFullScreen),
                   },
                   leading: const Icon(Icons.hourglass_top_outlined, size: 20),
                   title: const Text('定时关闭', style: titleStyle),
@@ -173,15 +173,17 @@ class HeaderControlState extends State<HeaderControl> {
                     Get.back(),
                     videoDetailCtr.queryVideoUrl(
                       videoDetailCtr.playedTime,
-                    )
+                    ),
                   },
                   leading: const Icon(Icons.refresh_outlined, size: 20),
                   title: const Text('重载视频', style: titleStyle),
                 ),
                 ListTile(
                   dense: true,
-                  leading: const Icon(Icons.stay_current_landscape_outlined,
-                      size: 20),
+                  leading: const Icon(
+                    Icons.stay_current_landscape_outlined,
+                    size: 20,
+                  ),
                   title: Row(
                     children: [
                       const Text(
@@ -204,11 +206,14 @@ class HeaderControlState extends State<HeaderControl> {
                               children: [
                                 Text(
                                   SuperResolutionType
-                                      .values[
-                                          widget.controller.superResolutionType]
+                                      .values[widget
+                                          .controller
+                                          .superResolutionType]
                                       .title,
-                                  strutStyle:
-                                      const StrutStyle(leading: 0, height: 1),
+                                  strutStyle: const StrutStyle(
+                                    leading: 0,
+                                    height: 1,
+                                  ),
                                   style: TextStyle(
                                     height: 1,
                                     fontSize: 14,
@@ -217,10 +222,11 @@ class HeaderControlState extends State<HeaderControl> {
                                 ),
                                 Icon(
                                   MdiIcons.unfoldMoreHorizontal,
-                                  size: MediaQuery.textScalerOf(context)
-                                      .scale(14),
+                                  size: MediaQuery.textScalerOf(
+                                    context,
+                                  ).scale(14),
                                   color: theme.colorScheme.secondary,
-                                )
+                                ),
                               ],
                             ),
                           ),
@@ -231,10 +237,12 @@ class HeaderControlState extends State<HeaderControl> {
                             }
                           },
                           itemBuilder: (context) => SuperResolutionType.values
-                              .map((item) => PopupMenuItem(
-                                    value: item,
-                                    child: Text(item.title),
-                                  ))
+                              .map(
+                                (item) => PopupMenuItem(
+                                  value: item,
+                                  child: Text(item.title),
+                                ),
+                              )
                               .toList(),
                         ),
                       ),
@@ -255,14 +263,16 @@ class HeaderControlState extends State<HeaderControl> {
                       context: context,
                       builder: (context) {
                         return CdnSelectDialog(
-                            sample: videoInfo.dash?.video?.first);
+                          sample: videoInfo.dash?.video?.first,
+                        );
                       },
                     );
                     if (result != null) {
                       VideoUtils.cdnService = result;
                       setting.put(SettingBoxKey.CDNService, result);
                       SmartDialog.showToast(
-                          '已设置为 ${CDNService.fromCode(result).desc}，正在重载视频');
+                        '已设置为 ${CDNService.fromCode(result).desc}，正在重载视频',
+                      );
                       setState(() {});
                       videoDetailCtr.queryVideoUrl(
                         videoDetailCtr.playedTime,
@@ -342,8 +352,10 @@ class HeaderControlState extends State<HeaderControl> {
                   onTap: () => {Get.back(), showSetVideoQa()},
                   leading: const Icon(Icons.play_circle_outline, size: 20),
                   title: const Text('选择画质', style: titleStyle),
-                  subtitle: Text('当前画质 ${videoDetailCtr.currentVideoQa.desc}',
-                      style: subTitleStyle),
+                  subtitle: Text(
+                    '当前画质 ${videoDetailCtr.currentVideoQa.desc}',
+                    style: subTitleStyle,
+                  ),
                 ),
                 if (videoDetailCtr.currentAudioQa != null)
                   ListTile(
@@ -352,8 +364,9 @@ class HeaderControlState extends State<HeaderControl> {
                     leading: const Icon(Icons.album_outlined, size: 20),
                     title: const Text('选择音质', style: titleStyle),
                     subtitle: Text(
-                        '当前音质 ${videoDetailCtr.currentAudioQa!.desc}',
-                        style: subTitleStyle),
+                      '当前音质 ${videoDetailCtr.currentAudioQa!.desc}',
+                      style: subTitleStyle,
+                    ),
                   ),
                 ListTile(
                   dense: true,
@@ -361,16 +374,19 @@ class HeaderControlState extends State<HeaderControl> {
                   leading: const Icon(Icons.av_timer_outlined, size: 20),
                   title: const Text('解码格式', style: titleStyle),
                   subtitle: Text(
-                      '当前解码格式 ${videoDetailCtr.currentDecodeFormats.description}',
-                      style: subTitleStyle),
+                    '当前解码格式 ${videoDetailCtr.currentDecodeFormats.description}',
+                    style: subTitleStyle,
+                  ),
                 ),
                 ListTile(
                   dense: true,
                   onTap: () => {Get.back(), showSetRepeat()},
                   leading: const Icon(Icons.repeat, size: 20),
                   title: const Text('播放顺序', style: titleStyle),
-                  subtitle: Text(widget.controller.playRepeat.desc,
-                      style: subTitleStyle),
+                  subtitle: Text(
+                    widget.controller.playRepeat.desc,
+                    style: subTitleStyle,
+                  ),
                 ),
                 ListTile(
                   dense: true,
@@ -413,7 +429,8 @@ class HeaderControlState extends State<HeaderControl> {
                                   dense: true,
                                   title: const Text("Resolution"),
                                   subtitle: Text(
-                                      '${player.state.width}x${player.state.height}'),
+                                    '${player.state.width}x${player.state.height}',
+                                  ),
                                   onTap: () => Utils.copyText(
                                     'Resolution\n${player.state.width}x${player.state.height}',
                                     needToast: false,
@@ -422,8 +439,9 @@ class HeaderControlState extends State<HeaderControl> {
                                 ListTile(
                                   dense: true,
                                   title: const Text("VideoParams"),
-                                  subtitle:
-                                      Text(player.state.videoParams.toString()),
+                                  subtitle: Text(
+                                    player.state.videoParams.toString(),
+                                  ),
                                   onTap: () => Utils.copyText(
                                     'VideoParams\n${player.state.videoParams}',
                                     needToast: false,
@@ -432,8 +450,9 @@ class HeaderControlState extends State<HeaderControl> {
                                 ListTile(
                                   dense: true,
                                   title: const Text("AudioParams"),
-                                  subtitle:
-                                      Text(player.state.audioParams.toString()),
+                                  subtitle: Text(
+                                    player.state.audioParams.toString(),
+                                  ),
                                   onTap: () => Utils.copyText(
                                     'AudioParams\n${player.state.audioParams}',
                                     needToast: false,
@@ -442,8 +461,9 @@ class HeaderControlState extends State<HeaderControl> {
                                 ListTile(
                                   dense: true,
                                   title: const Text("Media"),
-                                  subtitle:
-                                      Text(player.state.playlist.toString()),
+                                  subtitle: Text(
+                                    player.state.playlist.toString(),
+                                  ),
                                   onTap: () => Utils.copyText(
                                     'Media\n${player.state.playlist}',
                                     needToast: false,
@@ -452,8 +472,9 @@ class HeaderControlState extends State<HeaderControl> {
                                 ListTile(
                                   dense: true,
                                   title: const Text("AudioTrack"),
-                                  subtitle:
-                                      Text(player.state.track.audio.toString()),
+                                  subtitle: Text(
+                                    player.state.track.audio.toString(),
+                                  ),
                                   onTap: () => Utils.copyText(
                                     'AudioTrack\n${player.state.track.audio}',
                                     needToast: false,
@@ -462,8 +483,9 @@ class HeaderControlState extends State<HeaderControl> {
                                 ListTile(
                                   dense: true,
                                   title: const Text("VideoTrack"),
-                                  subtitle:
-                                      Text(player.state.track.video.toString()),
+                                  subtitle: Text(
+                                    player.state.track.video.toString(),
+                                  ),
                                   onTap: () => Utils.copyText(
                                     'VideoTrack\n${player.state.track.audio}',
                                     needToast: false,
@@ -491,7 +513,8 @@ class HeaderControlState extends State<HeaderControl> {
                                   dense: true,
                                   title: const Text("AudioBitrate"),
                                   subtitle: Text(
-                                      player.state.audioBitrate.toString()),
+                                    player.state.audioBitrate.toString(),
+                                  ),
                                   onTap: () => Utils.copyText(
                                     'AudioBitrate\n${player.state.audioBitrate}',
                                     needToast: false,
@@ -500,8 +523,9 @@ class HeaderControlState extends State<HeaderControl> {
                                 ListTile(
                                   dense: true,
                                   title: const Text("Volume"),
-                                  subtitle:
-                                      Text(player.state.volume.toString()),
+                                  subtitle: Text(
+                                    player.state.volume.toString(),
+                                  ),
                                   onTap: () => Utils.copyText(
                                     'Volume\n${player.state.volume}',
                                     needToast: false,
@@ -515,8 +539,9 @@ class HeaderControlState extends State<HeaderControl> {
                               onPressed: Get.back,
                               child: Text(
                                 '确定',
-                                style:
-                                    TextStyle(color: theme.colorScheme.outline),
+                                style: TextStyle(
+                                  color: theme.colorScheme.outline,
+                                ),
                               ),
                             ),
                           ],
@@ -586,7 +611,8 @@ class HeaderControlState extends State<HeaderControl> {
                   height: 45,
                   child: GestureDetector(
                     onTap: () => SmartDialog.showToast(
-                        '标灰画质需要bilibili会员（已是会员？请关闭无痕模式）；4k和杜比视界播放效果可能不佳'),
+                      '标灰画质需要bilibili会员（已是会员？请关闭无痕模式）；4k和杜比视界播放效果可能不佳',
+                    ),
                     child: Row(
                       spacing: 8,
                       mainAxisAlignment: MainAxisAlignment.center,
@@ -596,7 +622,7 @@ class HeaderControlState extends State<HeaderControl> {
                           Icons.info_outline,
                           size: 16,
                           color: theme.colorScheme.outline,
-                        )
+                        ),
                       ],
                     ),
                   ),
@@ -619,16 +645,17 @@ class HeaderControlState extends State<HeaderControl> {
                       late String oldQualityDesc;
                       await Connectivity().checkConnectivity().then((res) {
                         if (res.contains(ConnectivityResult.wifi)) {
-                          oldQualityDesc =
-                              VideoQuality.fromCode(Pref.defaultVideoQa).desc;
+                          oldQualityDesc = VideoQuality.fromCode(
+                            Pref.defaultVideoQa,
+                          ).desc;
                           setting.put(
                             SettingBoxKey.defaultVideoQa,
                             quality,
                           );
                         } else {
-                          oldQualityDesc =
-                              VideoQuality.fromCode(Pref.defaultVideoQaCellular)
-                                  .desc;
+                          oldQualityDesc = VideoQuality.fromCode(
+                            Pref.defaultVideoQaCellular,
+                          ).desc;
                           setting.put(
                             SettingBoxKey.defaultVideoQaCellular,
                             quality,
@@ -701,16 +728,17 @@ class HeaderControlState extends State<HeaderControl> {
                       late String oldQualityDesc;
                       await Connectivity().checkConnectivity().then((res) {
                         if (res.contains(ConnectivityResult.wifi)) {
-                          oldQualityDesc =
-                              AudioQuality.fromCode(Pref.defaultAudioQa).desc;
+                          oldQualityDesc = AudioQuality.fromCode(
+                            Pref.defaultAudioQa,
+                          ).desc;
                           setting.put(
                             SettingBoxKey.defaultAudioQa,
                             quality,
                           );
                         } else {
-                          oldQualityDesc =
-                              AudioQuality.fromCode(Pref.defaultAudioQaCellular)
-                                  .desc;
+                          oldQualityDesc = AudioQuality.fromCode(
+                            Pref.defaultAudioQaCellular,
+                          ).desc;
                           setting.put(
                             SettingBoxKey.defaultAudioQaCellular,
                             quality,
@@ -734,7 +762,7 @@ class HeaderControlState extends State<HeaderControl> {
                           )
                         : const SizedBox.shrink(),
                   ),
-                ]
+                ],
               ],
             ),
           ),
@@ -793,10 +821,13 @@ class HeaderControlState extends State<HeaderControl> {
                               ..updatePlayer();
                             Get.back();
                           },
-                          contentPadding:
-                              const EdgeInsets.only(left: 20, right: 20),
-                          title: Text(VideoDecodeFormatTypeExt.fromString(i)!
-                              .description),
+                          contentPadding: const EdgeInsets.only(
+                            left: 20,
+                            right: 20,
+                          ),
+                          title: Text(
+                            VideoDecodeFormatTypeExt.fromString(i)!.description,
+                          ),
                           subtitle: Text(
                             i!,
                             style: subTitleStyle,
@@ -808,7 +839,7 @@ class HeaderControlState extends State<HeaderControl> {
                                 )
                               : const SizedBox.shrink(),
                         ),
-                      ]
+                      ],
                     ],
                   ),
                 ),
@@ -849,10 +880,10 @@ class HeaderControlState extends State<HeaderControl> {
                             try {
                               DocumentFileSavePlusPlatform.instance
                                   .saveMultipleFiles(
-                                dataList: [res.data],
-                                fileNameList: [name],
-                                mimeTypeList: ['text/plain'],
-                              );
+                                    dataList: [res.data],
+                                    fileNameList: [name],
+                                    mimeTypeList: ['text/plain'],
+                                  );
                               if (Platform.isAndroid) {
                                 SmartDialog.showToast('已保存');
                               }
@@ -867,7 +898,11 @@ class HeaderControlState extends State<HeaderControl> {
                                 ],
                                 sharePositionOrigin: await Utils.isIpad()
                                     ? Rect.fromLTWH(
-                                        0, 0, Get.width, Get.height / 2)
+                                        0,
+                                        0,
+                                        Get.width,
+                                        Get.height / 2,
+                                      )
                                     : null,
                               );
                             }
@@ -997,7 +1032,8 @@ class HeaderControlState extends State<HeaderControl> {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       Text(
-                          '字体大小 ${(subtitleFontScale * 100).toStringAsFixed(1)}%'),
+                        '字体大小 ${(subtitleFontScale * 100).toStringAsFixed(1)}%',
+                      ),
                       resetBtn(theme, '100.0%', () => updateFontScale(1.0)),
                     ],
                   ),
@@ -1025,7 +1061,8 @@ class HeaderControlState extends State<HeaderControl> {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       Text(
-                          '全屏字体大小 ${(subtitleFontScaleFS * 100).toStringAsFixed(1)}%'),
+                        '全屏字体大小 ${(subtitleFontScaleFS * 100).toStringAsFixed(1)}%',
+                      ),
                       resetBtn(theme, '150.0%', () => updateFontScaleFS(1.5)),
                     ],
                   ),
@@ -1277,7 +1314,8 @@ class HeaderControlState extends State<HeaderControl> {
           try {
             danmakuController?.updateOption(
               danmakuController.option.copyWith(
-                  duration: danmakuDuration / widget.controller.playbackSpeed),
+                duration: danmakuDuration / widget.controller.playbackSpeed,
+              ),
             );
           } catch (_) {}
         }
@@ -1291,8 +1329,9 @@ class HeaderControlState extends State<HeaderControl> {
           try {
             danmakuController?.updateOption(
               danmakuController.option.copyWith(
-                  staticDuration:
-                      danmakuStaticDuration / widget.controller.playbackSpeed),
+                staticDuration:
+                    danmakuStaticDuration / widget.controller.playbackSpeed,
+              ),
             );
           } catch (_) {}
         }
@@ -1404,18 +1443,22 @@ class HeaderControlState extends State<HeaderControl> {
                       Text('智能云屏蔽 $danmakuWeight 级'),
                       const Spacer(),
                       TextButton(
-                          style: TextButton.styleFrom(
-                            padding: EdgeInsets.zero,
-                            minimumSize: Size.zero,
-                            tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                        style: TextButton.styleFrom(
+                          padding: EdgeInsets.zero,
+                          minimumSize: Size.zero,
+                          tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                        ),
+                        onPressed: () => {
+                          Get.back(),
+                          Get.toNamed(
+                            '/danmakuBlock',
+                            arguments: widget.controller,
                           ),
-                          onPressed: () => {
-                                Get.back(),
-                                Get.toNamed('/danmakuBlock',
-                                    arguments: widget.controller)
-                              },
-                          child: Text(
-                              "屏蔽管理(${plPlayerController.filters.count})")),
+                        },
+                        child: Text(
+                          "屏蔽管理(${plPlayerController.filters.count})",
+                        ),
+                      ),
                     ],
                   ),
                   Padding(
@@ -1476,7 +1519,7 @@ class HeaderControlState extends State<HeaderControl> {
                             selectStatus: blockTypes.contains(value),
                           ),
                           const SizedBox(width: 10),
-                        ]
+                        ],
                       ],
                     ),
                   ),
@@ -1783,7 +1826,7 @@ class HeaderControlState extends State<HeaderControl> {
                             color: theme.colorScheme.primary,
                           )
                         : const SizedBox.shrink(),
-                  )
+                  ),
                 ],
               ],
             ),
@@ -1806,614 +1849,625 @@ class HeaderControlState extends State<HeaderControl> {
   }
 
   Widget _buildHeader(bool showFSActionItem) => AppBar(
-        elevation: 0,
-        scrolledUnderElevation: 0,
-        backgroundColor: Colors.transparent,
-        foregroundColor: Colors.white,
-        primary: false,
-        automaticallyImplyLeading: false,
-        toolbarHeight: showFSActionItem && isFullScreen ? 112 : null,
-        flexibleSpace: Column(
-          mainAxisSize: MainAxisSize.min,
+    elevation: 0,
+    scrolledUnderElevation: 0,
+    backgroundColor: Colors.transparent,
+    foregroundColor: Colors.white,
+    primary: false,
+    automaticallyImplyLeading: false,
+    toolbarHeight: showFSActionItem && isFullScreen ? 112 : null,
+    flexibleSpace: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        const SizedBox(height: 11),
+        Row(
           children: [
-            const SizedBox(height: 11),
-            Row(
-              children: [
-                SizedBox(
-                  width: 42,
-                  height: 34,
-                  child: IconButton(
-                    tooltip: '返回',
-                    icon: const Icon(
-                      FontAwesomeIcons.arrowLeft,
-                      size: 15,
-                      color: Colors.white,
-                    ),
-                    onPressed: () {
-                      if (isFullScreen) {
-                        widget.controller.triggerFullScreen(status: false);
-                      } else if (MediaQuery.orientationOf(context) ==
-                              Orientation.landscape &&
-                          !horizontalScreen) {
-                        verticalScreenForTwoSeconds();
-                      } else {
-                        Get.back();
-                      }
-                    },
-                  ),
+            SizedBox(
+              width: 42,
+              height: 34,
+              child: IconButton(
+                tooltip: '返回',
+                icon: const Icon(
+                  FontAwesomeIcons.arrowLeft,
+                  size: 15,
+                  color: Colors.white,
                 ),
-                if (!isFullScreen ||
-                    MediaQuery.orientationOf(context) != Orientation.portrait)
-                  SizedBox(
-                    width: 42,
-                    height: 34,
-                    child: IconButton(
-                      tooltip: '返回主页',
-                      icon: const Icon(
-                        FontAwesomeIcons.house,
-                        size: 15,
-                        color: Colors.white,
-                      ),
-                      onPressed: () {
-                        videoDetailCtr.plPlayerController.backToHome = true;
-                        Get.until((route) => route.isFirst);
-                      },
-                    ),
+                onPressed: () {
+                  if (isFullScreen) {
+                    widget.controller.triggerFullScreen(status: false);
+                  } else if (MediaQuery.orientationOf(context) ==
+                          Orientation.landscape &&
+                      !horizontalScreen) {
+                    verticalScreenForTwoSeconds();
+                  } else {
+                    Get.back();
+                  }
+                },
+              ),
+            ),
+            if (!isFullScreen ||
+                MediaQuery.orientationOf(context) != Orientation.portrait)
+              SizedBox(
+                width: 42,
+                height: 34,
+                child: IconButton(
+                  tooltip: '返回主页',
+                  icon: const Icon(
+                    FontAwesomeIcons.house,
+                    size: 15,
+                    color: Colors.white,
                   ),
-                if ((videoIntroController.videoDetail.value.title != null) &&
-                    (isFullScreen ||
-                        (!isFullScreen &&
-                            !horizontalScreen &&
-                            MediaQuery.orientationOf(context) ==
-                                Orientation.landscape)))
-                  Expanded(
-                    child: Column(
-                      mainAxisSize: MainAxisSize.min,
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        LayoutBuilder(
-                          builder: (context, constraints) {
-                            return Obx(
-                              () {
-                                String title;
-                                final videoDetail =
-                                    videoIntroController.videoDetail.value;
-                                if (videoDetail.videos == 1) {
-                                  title = videoDetail.title!;
-                                } else {
-                                  title = videoDetail.pages
-                                          ?.firstWhereOrNull((e) =>
-                                              e.cid == videoDetailCtr.cid.value)
-                                          ?.pagePart ??
-                                      videoDetail.title!;
-                                }
-                                final textPainter = TextPainter(
-                                  text: TextSpan(
-                                    text: title,
-                                    style: const TextStyle(
-                                      color: Colors.white,
-                                      fontSize: 16,
-                                    ),
-                                  ),
-                                  textDirection: TextDirection.ltr,
-                                  maxLines: 1,
-                                )..layout(maxWidth: constraints.maxWidth);
-                                if (textPainter.didExceedMaxLines) {
-                                  return ConstrainedBox(
-                                    constraints:
-                                        const BoxConstraints(maxHeight: 25),
-                                    child: Marquee(
-                                      text: title,
-                                      style: const TextStyle(
-                                        color: Colors.white,
-                                        fontSize: 16,
-                                      ),
-                                      scrollAxis: Axis.horizontal,
-                                      crossAxisAlignment:
-                                          CrossAxisAlignment.start,
-                                      blankSpace: 200,
-                                      velocity: 40,
-                                      startAfter: const Duration(seconds: 1),
-                                      showFadingOnlyWhenScrolling: true,
-                                      fadingEdgeStartFraction: 0,
-                                      fadingEdgeEndFraction: 0.1,
-                                      numberOfRounds: 1,
-                                      startPadding: 0,
-                                      accelerationDuration:
-                                          const Duration(seconds: 1),
-                                      accelerationCurve: Curves.linear,
-                                      decelerationDuration:
-                                          const Duration(milliseconds: 500),
-                                      decelerationCurve: Curves.easeOut,
-                                    ),
-                                  );
-                                } else {
-                                  return Text(
-                                    title,
-                                    style: const TextStyle(
-                                      color: Colors.white,
-                                      fontSize: 16,
-                                    ),
-                                    maxLines: 1,
-                                    textDirection: TextDirection.ltr,
-                                  );
-                                }
-                              },
-                            );
-                          },
-                        ),
-                        if (videoIntroController.isShowOnlineTotal)
-                          Obx(
-                            () => Text(
-                              '${videoIntroController.total.value}人正在看',
-                              style: const TextStyle(
-                                color: Colors.white,
-                                fontSize: 11,
-                              ),
-                            ),
-                          ),
-                      ],
-                    ),
-                  )
-                else
-                  const Spacer(),
-                // show current datetime
-                Obx(
-                  () {
-                    if ((isFullScreen || !horizontalScreen) &&
-                        MediaQuery.orientationOf(context) ==
-                            Orientation.landscape) {
-                      startClock();
-                      return Text(
-                        now.value,
-                        style: const TextStyle(
-                          color: Colors.white,
-                          fontSize: 13,
-                        ),
-                      );
-                    }
-                    clock?.cancel();
-                    clock = null;
-                    return const SizedBox.shrink();
+                  onPressed: () {
+                    videoDetailCtr.plPlayerController.backToHome = true;
+                    Get.until((route) => route.isFirst);
                   },
                 ),
-                if (plPlayerController.enableSponsorBlock == true)
-                  SizedBox(
-                    width: 42,
-                    height: 34,
-                    child: IconButton(
-                      tooltip: '提交片段',
-                      style: ButtonStyle(
-                        padding: WidgetStateProperty.all(EdgeInsets.zero),
-                      ),
-                      onPressed: () => videoDetailCtr.onBlock(context),
-                      icon: const Stack(
-                        clipBehavior: Clip.none,
-                        alignment: Alignment.center,
-                        children: [
-                          Icon(
-                            Icons.shield_outlined,
-                            size: 19,
-                            color: Colors.white,
-                          ),
-                          Icon(
-                            Icons.play_arrow_rounded,
-                            size: 13,
-                            color: Colors.white,
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                Obx(
-                  () => videoDetailCtr.segmentList.isNotEmpty == true
-                      ? SizedBox(
-                          width: 42,
-                          height: 34,
-                          child: IconButton(
-                            tooltip: '片段信息',
-                            style: ButtonStyle(
-                              padding: WidgetStateProperty.all(EdgeInsets.zero),
-                            ),
-                            onPressed: () =>
-                                videoDetailCtr.showSBDetail(context),
-                            icon: const Icon(
-                              MdiIcons.advertisements,
-                              size: 19,
-                              color: Colors.white,
-                            ),
-                          ),
-                        )
-                      : const SizedBox.shrink(),
-                ),
-                SizedBox(
-                  width: 42,
-                  height: 34,
-                  child: IconButton(
-                    tooltip: '发弹幕',
-                    style: ButtonStyle(
-                      padding: WidgetStateProperty.all(EdgeInsets.zero),
-                    ),
-                    onPressed: videoDetailCtr.showShootDanmakuSheet,
-                    icon: const Icon(
-                      Icons.comment_outlined,
-                      size: 19,
-                      color: Colors.white,
-                    ),
-                  ),
-                ),
-                SizedBox(
-                  width: 42,
-                  height: 34,
-                  child: Obx(
-                    () {
-                      final enableShowDanmaku =
-                          plPlayerController.enableShowDanmaku.value;
-                      return IconButton(
-                        tooltip: "${enableShowDanmaku ? '关闭' : '开启'}弹幕",
-                        style: ButtonStyle(
-                          padding: WidgetStateProperty.all(EdgeInsets.zero),
-                        ),
-                        onPressed: () {
-                          final newVal = !enableShowDanmaku;
-                          plPlayerController.enableShowDanmaku.value = newVal;
-                          setting.put(SettingBoxKey.enableShowDanmaku, newVal);
-                        },
-                        icon: Icon(
-                          enableShowDanmaku
-                              ? Icons.subtitles_outlined
-                              : Icons.subtitles_off_outlined,
-                          size: 19,
-                          color: Colors.white,
-                        ),
-                      );
-                    },
-                  ),
-                ),
-                if (Platform.isAndroid)
-                  SizedBox(
-                    width: 42,
-                    height: 34,
-                    child: IconButton(
-                      tooltip: '画中画',
-                      style: ButtonStyle(
-                        padding: WidgetStateProperty.all(EdgeInsets.zero),
-                      ),
-                      onPressed: () async {
-                        bool canUsePiP = await Floating().isPipAvailable;
-                        widget.controller.hiddenControls(false);
-                        if (canUsePiP) {
-                          if (!videoPlayerServiceHandler.enableBackgroundPlay &&
-                              mounted) {
-                            final theme = Theme.of(context);
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              SnackBar(
-                                content: Column(
-                                  children: [
-                                    const Row(
-                                      children: [
-                                        Icon(
-                                          Icons.check,
-                                          color: Colors.green,
-                                        ),
-                                        SizedBox(width: 10),
-                                        Text('画中画',
-                                            style: TextStyle(
-                                                fontSize: 15, height: 1.5))
-                                      ],
-                                    ),
-                                    const SizedBox(height: 10),
-                                    const Text(
-                                        '建议开启【后台音频服务】\n'
-                                        '避免画中画没有暂停按钮',
-                                        style: TextStyle(
-                                            fontSize: 12.5, height: 1.5)),
-                                    Row(children: [
-                                      TextButton(
-                                          style: ButtonStyle(
-                                            foregroundColor:
-                                                WidgetStateProperty.resolveWith(
-                                                    (states) {
-                                              return theme.snackBarTheme
-                                                  .actionTextColor;
-                                            }),
-                                          ),
-                                          onPressed: () {
-                                            plPlayerController
-                                                .setBackgroundPlay(true);
-                                            SmartDialog.showToast("请重新载入本页面刷新");
-                                          },
-                                          child: const Text('启用后台音频服务')),
-                                      const SizedBox(width: 10),
-                                      TextButton(
-                                          style: ButtonStyle(
-                                            foregroundColor:
-                                                WidgetStateProperty.resolveWith(
-                                                    (states) {
-                                              return theme.snackBarTheme
-                                                  .actionTextColor;
-                                            }),
-                                          ),
-                                          onPressed: () {},
-                                          child: const Text('不启用'))
-                                    ])
-                                  ],
+              ),
+            if ((videoIntroController.videoDetail.value.title != null) &&
+                (isFullScreen ||
+                    (!isFullScreen &&
+                        !horizontalScreen &&
+                        MediaQuery.orientationOf(context) ==
+                            Orientation.landscape)))
+              Expanded(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    LayoutBuilder(
+                      builder: (context, constraints) {
+                        return Obx(
+                          () {
+                            String title;
+                            final videoDetail =
+                                videoIntroController.videoDetail.value;
+                            if (videoDetail.videos == 1) {
+                              title = videoDetail.title!;
+                            } else {
+                              title =
+                                  videoDetail.pages
+                                      ?.firstWhereOrNull(
+                                        (e) =>
+                                            e.cid == videoDetailCtr.cid.value,
+                                      )
+                                      ?.pagePart ??
+                                  videoDetail.title!;
+                            }
+                            final textPainter = TextPainter(
+                              text: TextSpan(
+                                text: title,
+                                style: const TextStyle(
+                                  color: Colors.white,
+                                  fontSize: 16,
                                 ),
-                                duration: const Duration(seconds: 2),
-                                showCloseIcon: true,
                               ),
-                            );
-                            await Future.delayed(
-                                const Duration(seconds: 3), () {});
-                          }
-                          if (!context.mounted) return;
-                          PageUtils.enterPip(
-                            width: widget.videoDetailCtr.firstVideo.width,
-                            height: widget.videoDetailCtr.firstVideo.height,
-                          );
-                        }
+                              textDirection: TextDirection.ltr,
+                              maxLines: 1,
+                            )..layout(maxWidth: constraints.maxWidth);
+                            if (textPainter.didExceedMaxLines) {
+                              return ConstrainedBox(
+                                constraints: const BoxConstraints(
+                                  maxHeight: 25,
+                                ),
+                                child: Marquee(
+                                  text: title,
+                                  style: const TextStyle(
+                                    color: Colors.white,
+                                    fontSize: 16,
+                                  ),
+                                  scrollAxis: Axis.horizontal,
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  blankSpace: 200,
+                                  velocity: 40,
+                                  startAfter: const Duration(seconds: 1),
+                                  showFadingOnlyWhenScrolling: true,
+                                  fadingEdgeStartFraction: 0,
+                                  fadingEdgeEndFraction: 0.1,
+                                  numberOfRounds: 1,
+                                  startPadding: 0,
+                                  accelerationDuration: const Duration(
+                                    seconds: 1,
+                                  ),
+                                  accelerationCurve: Curves.linear,
+                                  decelerationDuration: const Duration(
+                                    milliseconds: 500,
+                                  ),
+                                  decelerationCurve: Curves.easeOut,
+                                ),
+                              );
+                            } else {
+                              return Text(
+                                title,
+                                style: const TextStyle(
+                                  color: Colors.white,
+                                  fontSize: 16,
+                                ),
+                                maxLines: 1,
+                                textDirection: TextDirection.ltr,
+                              );
+                            }
+                          },
+                        );
                       },
-                      icon: const Icon(
-                        Icons.picture_in_picture_outlined,
+                    ),
+                    if (videoIntroController.isShowOnlineTotal)
+                      Obx(
+                        () => Text(
+                          '${videoIntroController.total.value}人正在看',
+                          style: const TextStyle(
+                            color: Colors.white,
+                            fontSize: 11,
+                          ),
+                        ),
+                      ),
+                  ],
+                ),
+              )
+            else
+              const Spacer(),
+            // show current datetime
+            Obx(
+              () {
+                if ((isFullScreen || !horizontalScreen) &&
+                    MediaQuery.orientationOf(context) ==
+                        Orientation.landscape) {
+                  startClock();
+                  return Text(
+                    now.value,
+                    style: const TextStyle(
+                      color: Colors.white,
+                      fontSize: 13,
+                    ),
+                  );
+                }
+                clock?.cancel();
+                clock = null;
+                return const SizedBox.shrink();
+              },
+            ),
+            if (plPlayerController.enableSponsorBlock == true)
+              SizedBox(
+                width: 42,
+                height: 34,
+                child: IconButton(
+                  tooltip: '提交片段',
+                  style: ButtonStyle(
+                    padding: WidgetStateProperty.all(EdgeInsets.zero),
+                  ),
+                  onPressed: () => videoDetailCtr.onBlock(context),
+                  icon: const Stack(
+                    clipBehavior: Clip.none,
+                    alignment: Alignment.center,
+                    children: [
+                      Icon(
+                        Icons.shield_outlined,
                         size: 19,
                         color: Colors.white,
                       ),
-                    ),
+                      Icon(
+                        Icons.play_arrow_rounded,
+                        size: 13,
+                        color: Colors.white,
+                      ),
+                    ],
                   ),
-                SizedBox(
-                  width: 42,
-                  height: 34,
-                  child: IconButton(
-                    tooltip: "更多设置",
+                ),
+              ),
+            Obx(
+              () => videoDetailCtr.segmentList.isNotEmpty == true
+                  ? SizedBox(
+                      width: 42,
+                      height: 34,
+                      child: IconButton(
+                        tooltip: '片段信息',
+                        style: ButtonStyle(
+                          padding: WidgetStateProperty.all(EdgeInsets.zero),
+                        ),
+                        onPressed: () => videoDetailCtr.showSBDetail(context),
+                        icon: const Icon(
+                          MdiIcons.advertisements,
+                          size: 19,
+                          color: Colors.white,
+                        ),
+                      ),
+                    )
+                  : const SizedBox.shrink(),
+            ),
+            SizedBox(
+              width: 42,
+              height: 34,
+              child: IconButton(
+                tooltip: '发弹幕',
+                style: ButtonStyle(
+                  padding: WidgetStateProperty.all(EdgeInsets.zero),
+                ),
+                onPressed: videoDetailCtr.showShootDanmakuSheet,
+                icon: const Icon(
+                  Icons.comment_outlined,
+                  size: 19,
+                  color: Colors.white,
+                ),
+              ),
+            ),
+            SizedBox(
+              width: 42,
+              height: 34,
+              child: Obx(
+                () {
+                  final enableShowDanmaku =
+                      plPlayerController.enableShowDanmaku.value;
+                  return IconButton(
+                    tooltip: "${enableShowDanmaku ? '关闭' : '开启'}弹幕",
                     style: ButtonStyle(
                       padding: WidgetStateProperty.all(EdgeInsets.zero),
                     ),
-                    onPressed: showSettingSheet,
-                    icon: const Icon(
-                      Icons.more_vert_outlined,
+                    onPressed: () {
+                      final newVal = !enableShowDanmaku;
+                      plPlayerController.enableShowDanmaku.value = newVal;
+                      setting.put(SettingBoxKey.enableShowDanmaku, newVal);
+                    },
+                    icon: Icon(
+                      enableShowDanmaku
+                          ? Icons.subtitles_outlined
+                          : Icons.subtitles_off_outlined,
                       size: 19,
                       color: Colors.white,
                     ),
+                  );
+                },
+              ),
+            ),
+            if (Platform.isAndroid)
+              SizedBox(
+                width: 42,
+                height: 34,
+                child: IconButton(
+                  tooltip: '画中画',
+                  style: ButtonStyle(
+                    padding: WidgetStateProperty.all(EdgeInsets.zero),
+                  ),
+                  onPressed: () async {
+                    bool canUsePiP = await Floating().isPipAvailable;
+                    widget.controller.hiddenControls(false);
+                    if (canUsePiP) {
+                      if (!videoPlayerServiceHandler.enableBackgroundPlay &&
+                          mounted) {
+                        final theme = Theme.of(context);
+                        ScaffoldMessenger.of(context).showSnackBar(
+                          SnackBar(
+                            content: Column(
+                              children: [
+                                const Row(
+                                  children: [
+                                    Icon(
+                                      Icons.check,
+                                      color: Colors.green,
+                                    ),
+                                    SizedBox(width: 10),
+                                    Text(
+                                      '画中画',
+                                      style: TextStyle(
+                                        fontSize: 15,
+                                        height: 1.5,
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                                const SizedBox(height: 10),
+                                const Text(
+                                  '建议开启【后台音频服务】\n'
+                                  '避免画中画没有暂停按钮',
+                                  style: TextStyle(fontSize: 12.5, height: 1.5),
+                                ),
+                                Row(
+                                  children: [
+                                    TextButton(
+                                      style: ButtonStyle(
+                                        foregroundColor:
+                                            WidgetStateProperty.resolveWith((
+                                              states,
+                                            ) {
+                                              return theme
+                                                  .snackBarTheme
+                                                  .actionTextColor;
+                                            }),
+                                      ),
+                                      onPressed: () {
+                                        plPlayerController.setBackgroundPlay(
+                                          true,
+                                        );
+                                        SmartDialog.showToast("请重新载入本页面刷新");
+                                      },
+                                      child: const Text('启用后台音频服务'),
+                                    ),
+                                    const SizedBox(width: 10),
+                                    TextButton(
+                                      style: ButtonStyle(
+                                        foregroundColor:
+                                            WidgetStateProperty.resolveWith((
+                                              states,
+                                            ) {
+                                              return theme
+                                                  .snackBarTheme
+                                                  .actionTextColor;
+                                            }),
+                                      ),
+                                      onPressed: () {},
+                                      child: const Text('不启用'),
+                                    ),
+                                  ],
+                                ),
+                              ],
+                            ),
+                            duration: const Duration(seconds: 2),
+                            showCloseIcon: true,
+                          ),
+                        );
+                        await Future.delayed(const Duration(seconds: 3), () {});
+                      }
+                      if (!context.mounted) return;
+                      PageUtils.enterPip(
+                        width: widget.videoDetailCtr.firstVideo.width,
+                        height: widget.videoDetailCtr.firstVideo.height,
+                      );
+                    }
+                  },
+                  icon: const Icon(
+                    Icons.picture_in_picture_outlined,
+                    size: 19,
+                    color: Colors.white,
                   ),
                 ),
-              ],
+              ),
+            SizedBox(
+              width: 42,
+              height: 34,
+              child: IconButton(
+                tooltip: "更多设置",
+                style: ButtonStyle(
+                  padding: WidgetStateProperty.all(EdgeInsets.zero),
+                ),
+                onPressed: showSettingSheet,
+                icon: const Icon(
+                  Icons.more_vert_outlined,
+                  size: 19,
+                  color: Colors.white,
+                ),
+              ),
             ),
-            if (showFSActionItem)
-              isFullScreen
-                  ? Row(
-                      mainAxisAlignment: MainAxisAlignment.end,
-                      children: [
-                        if (videoDetailCtr.videoType == SearchType.video) ...[
-                          SizedBox(
-                            width: 42,
-                            height: 34,
-                            child: Obx(
-                              () => ActionItem(
-                                expand: false,
-                                icon: const Icon(
-                                  FontAwesomeIcons.thumbsUp,
-                                  color: Colors.white,
-                                ),
-                                selectIcon:
-                                    const Icon(FontAwesomeIcons.solidThumbsUp),
-                                onTap: videoIntroController.actionLikeVideo,
-                                onLongPress: () {
-                                  videoIntroController.actionOneThree();
-                                  plPlayerController
-                                    ..isTriple = null
-                                    ..hideTaskControls();
-                                },
-                                selectStatus:
-                                    videoIntroController.hasLike.value,
-                                semanticsLabel: '点赞',
-                                needAnim: true,
-                                hasTriple: videoIntroController.hasLike.value &&
-                                    videoIntroController.hasCoin &&
-                                    videoIntroController.hasFav.value,
-                                callBack: (start) {
-                                  if (start) {
-                                    HapticFeedback.lightImpact();
-                                    plPlayerController.isTriple = true;
-                                    _coinKey.currentState?.controller
-                                        ?.forward();
-                                    _favKey.currentState?.controller?.forward();
-                                  } else {
-                                    _coinKey.currentState?.controller
-                                        ?.reverse();
-                                    _favKey.currentState?.controller?.reverse();
-                                    plPlayerController
-                                      ..isTriple = null
-                                      ..hideTaskControls();
-                                  }
-                                },
-                              ),
-                            ),
-                          ),
-                          SizedBox(
-                            width: 42,
-                            height: 34,
-                            child: Obx(
-                              () => ActionItem(
-                                expand: false,
-                                icon: const Icon(
-                                  FontAwesomeIcons.thumbsDown,
-                                  color: Colors.white,
-                                ),
-                                selectIcon: const Icon(
-                                    FontAwesomeIcons.solidThumbsDown),
-                                onTap: videoIntroController.actionDislikeVideo,
-                                selectStatus:
-                                    videoIntroController.hasDislike.value,
-                                semanticsLabel: '点踩',
-                              ),
-                            ),
-                          ),
-                          SizedBox(
-                            width: 42,
-                            height: 34,
-                            child: Obx(
-                              () => ActionItem(
-                                key: _coinKey,
-                                expand: false,
-                                icon: const Icon(
-                                  FontAwesomeIcons.b,
-                                  color: Colors.white,
-                                ),
-                                selectIcon: const Icon(FontAwesomeIcons.b),
-                                onTap: videoIntroController.actionCoinVideo,
-                                selectStatus: videoIntroController.hasCoin,
-                                semanticsLabel: '投币',
-                                needAnim: true,
-                              ),
-                            ),
-                          ),
-                          SizedBox(
-                            width: 42,
-                            height: 34,
-                            child: Obx(
-                              () => ActionItem(
-                                key: _favKey,
-                                expand: false,
-                                icon: const Icon(
-                                  FontAwesomeIcons.star,
-                                  color: Colors.white,
-                                ),
-                                selectIcon:
-                                    const Icon(FontAwesomeIcons.solidStar),
-                                onTap: () => videoIntroController
-                                    .showFavBottomSheet(context),
-                                onLongPress: () => videoIntroController
-                                    .showFavBottomSheet(context,
-                                        type: 'longPress'),
-                                selectStatus: videoIntroController.hasFav.value,
-                                semanticsLabel: '收藏',
-                                needAnim: true,
-                              ),
-                            ),
-                          ),
-                          SizedBox(
-                            width: 42,
-                            height: 34,
-                            child: ActionItem(
-                              expand: false,
-                              icon: const Icon(
-                                FontAwesomeIcons.shareFromSquare,
-                                color: Colors.white,
-                              ),
-                              onTap: () => videoIntroController
-                                  .actionShareVideo(context),
-                              semanticsLabel: '分享',
-                            ),
-                          ),
-                        ] else ...[
-                          SizedBox(
-                            width: 42,
-                            height: 34,
-                            child: Obx(
-                              () => ActionItem(
-                                expand: false,
-                                icon: const Icon(
-                                  FontAwesomeIcons.thumbsUp,
-                                  color: Colors.white,
-                                ),
-                                selectIcon:
-                                    const Icon(FontAwesomeIcons.solidThumbsUp),
-                                onTap: pgcIntroController.actionLikeVideo,
-                                onLongPress: () {
-                                  pgcIntroController.actionOneThree();
-                                  plPlayerController
-                                    ..isTriple = null
-                                    ..hideTaskControls();
-                                },
-                                selectStatus: pgcIntroController.hasLike.value,
-                                semanticsLabel: '点赞',
-                                needAnim: true,
-                                hasTriple: pgcIntroController.hasLike.value &&
-                                    pgcIntroController.hasCoin &&
-                                    pgcIntroController.hasFav.value,
-                                callBack: (start) {
-                                  if (start) {
-                                    HapticFeedback.lightImpact();
-                                    plPlayerController.isTriple = true;
-                                    _coinKey.currentState?.controller
-                                        ?.forward();
-                                    _favKey.currentState?.controller?.forward();
-                                  } else {
-                                    _coinKey.currentState?.controller
-                                        ?.reverse();
-                                    _favKey.currentState?.controller?.reverse();
-                                    plPlayerController
-                                      ..isTriple = null
-                                      ..hideTaskControls();
-                                  }
-                                },
-                              ),
-                            ),
-                          ),
-                          SizedBox(
-                            width: 42,
-                            height: 34,
-                            child: Obx(
-                              () => ActionItem(
-                                expand: false,
-                                key: _coinKey,
-                                icon: const Icon(
-                                  FontAwesomeIcons.b,
-                                  color: Colors.white,
-                                ),
-                                selectIcon: const Icon(FontAwesomeIcons.b),
-                                onTap: pgcIntroController.actionCoinVideo,
-                                selectStatus: pgcIntroController.hasCoin,
-                                semanticsLabel: '投币',
-                                needAnim: true,
-                              ),
-                            ),
-                          ),
-                          SizedBox(
-                            width: 42,
-                            height: 34,
-                            child: Obx(
-                              () => ActionItem(
-                                key: _favKey,
-                                expand: false,
-                                icon: const Icon(
-                                  FontAwesomeIcons.star,
-                                  color: Colors.white,
-                                ),
-                                selectIcon:
-                                    const Icon(FontAwesomeIcons.solidStar),
-                                onTap: () => pgcIntroController
-                                    .showFavBottomSheet(context),
-                                onLongPress: () => pgcIntroController
-                                    .showFavBottomSheet(context,
-                                        type: 'longPress'),
-                                selectStatus: pgcIntroController.hasFav.value,
-                                semanticsLabel: '收藏',
-                                needAnim: true,
-                              ),
-                            ),
-                          ),
-                          SizedBox(
-                            width: 42,
-                            height: 34,
-                            child: ActionItem(
-                              expand: false,
-                              icon: const Icon(
-                                FontAwesomeIcons.shareFromSquare,
-                                color: Colors.white,
-                              ),
-                              onTap: () =>
-                                  pgcIntroController.actionShareVideo(context),
-                              semanticsLabel: '转发',
-                            ),
-                          ),
-                        ],
-                      ],
-                    )
-                  : const SizedBox.shrink(),
           ],
         ),
-      );
+        if (showFSActionItem)
+          isFullScreen
+              ? Row(
+                  mainAxisAlignment: MainAxisAlignment.end,
+                  children: [
+                    if (videoDetailCtr.videoType == SearchType.video) ...[
+                      SizedBox(
+                        width: 42,
+                        height: 34,
+                        child: Obx(
+                          () => ActionItem(
+                            expand: false,
+                            icon: const Icon(
+                              FontAwesomeIcons.thumbsUp,
+                              color: Colors.white,
+                            ),
+                            selectIcon: const Icon(
+                              FontAwesomeIcons.solidThumbsUp,
+                            ),
+                            onTap: videoIntroController.actionLikeVideo,
+                            onLongPress: () {
+                              videoIntroController.actionOneThree();
+                              plPlayerController
+                                ..isTriple = null
+                                ..hideTaskControls();
+                            },
+                            selectStatus: videoIntroController.hasLike.value,
+                            semanticsLabel: '点赞',
+                            needAnim: true,
+                            hasTriple:
+                                videoIntroController.hasLike.value &&
+                                videoIntroController.hasCoin &&
+                                videoIntroController.hasFav.value,
+                            callBack: (start) {
+                              if (start) {
+                                HapticFeedback.lightImpact();
+                                plPlayerController.isTriple = true;
+                                _coinKey.currentState?.controller?.forward();
+                                _favKey.currentState?.controller?.forward();
+                              } else {
+                                _coinKey.currentState?.controller?.reverse();
+                                _favKey.currentState?.controller?.reverse();
+                                plPlayerController
+                                  ..isTriple = null
+                                  ..hideTaskControls();
+                              }
+                            },
+                          ),
+                        ),
+                      ),
+                      SizedBox(
+                        width: 42,
+                        height: 34,
+                        child: Obx(
+                          () => ActionItem(
+                            expand: false,
+                            icon: const Icon(
+                              FontAwesomeIcons.thumbsDown,
+                              color: Colors.white,
+                            ),
+                            selectIcon: const Icon(
+                              FontAwesomeIcons.solidThumbsDown,
+                            ),
+                            onTap: videoIntroController.actionDislikeVideo,
+                            selectStatus: videoIntroController.hasDislike.value,
+                            semanticsLabel: '点踩',
+                          ),
+                        ),
+                      ),
+                      SizedBox(
+                        width: 42,
+                        height: 34,
+                        child: Obx(
+                          () => ActionItem(
+                            key: _coinKey,
+                            expand: false,
+                            icon: const Icon(
+                              FontAwesomeIcons.b,
+                              color: Colors.white,
+                            ),
+                            selectIcon: const Icon(FontAwesomeIcons.b),
+                            onTap: videoIntroController.actionCoinVideo,
+                            selectStatus: videoIntroController.hasCoin,
+                            semanticsLabel: '投币',
+                            needAnim: true,
+                          ),
+                        ),
+                      ),
+                      SizedBox(
+                        width: 42,
+                        height: 34,
+                        child: Obx(
+                          () => ActionItem(
+                            key: _favKey,
+                            expand: false,
+                            icon: const Icon(
+                              FontAwesomeIcons.star,
+                              color: Colors.white,
+                            ),
+                            selectIcon: const Icon(FontAwesomeIcons.solidStar),
+                            onTap: () => videoIntroController
+                                .showFavBottomSheet(context),
+                            onLongPress: () => videoIntroController
+                                .showFavBottomSheet(context, type: 'longPress'),
+                            selectStatus: videoIntroController.hasFav.value,
+                            semanticsLabel: '收藏',
+                            needAnim: true,
+                          ),
+                        ),
+                      ),
+                      SizedBox(
+                        width: 42,
+                        height: 34,
+                        child: ActionItem(
+                          expand: false,
+                          icon: const Icon(
+                            FontAwesomeIcons.shareFromSquare,
+                            color: Colors.white,
+                          ),
+                          onTap: () =>
+                              videoIntroController.actionShareVideo(context),
+                          semanticsLabel: '分享',
+                        ),
+                      ),
+                    ] else ...[
+                      SizedBox(
+                        width: 42,
+                        height: 34,
+                        child: Obx(
+                          () => ActionItem(
+                            expand: false,
+                            icon: const Icon(
+                              FontAwesomeIcons.thumbsUp,
+                              color: Colors.white,
+                            ),
+                            selectIcon: const Icon(
+                              FontAwesomeIcons.solidThumbsUp,
+                            ),
+                            onTap: pgcIntroController.actionLikeVideo,
+                            onLongPress: () {
+                              pgcIntroController.actionOneThree();
+                              plPlayerController
+                                ..isTriple = null
+                                ..hideTaskControls();
+                            },
+                            selectStatus: pgcIntroController.hasLike.value,
+                            semanticsLabel: '点赞',
+                            needAnim: true,
+                            hasTriple:
+                                pgcIntroController.hasLike.value &&
+                                pgcIntroController.hasCoin &&
+                                pgcIntroController.hasFav.value,
+                            callBack: (start) {
+                              if (start) {
+                                HapticFeedback.lightImpact();
+                                plPlayerController.isTriple = true;
+                                _coinKey.currentState?.controller?.forward();
+                                _favKey.currentState?.controller?.forward();
+                              } else {
+                                _coinKey.currentState?.controller?.reverse();
+                                _favKey.currentState?.controller?.reverse();
+                                plPlayerController
+                                  ..isTriple = null
+                                  ..hideTaskControls();
+                              }
+                            },
+                          ),
+                        ),
+                      ),
+                      SizedBox(
+                        width: 42,
+                        height: 34,
+                        child: Obx(
+                          () => ActionItem(
+                            expand: false,
+                            key: _coinKey,
+                            icon: const Icon(
+                              FontAwesomeIcons.b,
+                              color: Colors.white,
+                            ),
+                            selectIcon: const Icon(FontAwesomeIcons.b),
+                            onTap: pgcIntroController.actionCoinVideo,
+                            selectStatus: pgcIntroController.hasCoin,
+                            semanticsLabel: '投币',
+                            needAnim: true,
+                          ),
+                        ),
+                      ),
+                      SizedBox(
+                        width: 42,
+                        height: 34,
+                        child: Obx(
+                          () => ActionItem(
+                            key: _favKey,
+                            expand: false,
+                            icon: const Icon(
+                              FontAwesomeIcons.star,
+                              color: Colors.white,
+                            ),
+                            selectIcon: const Icon(FontAwesomeIcons.solidStar),
+                            onTap: () =>
+                                pgcIntroController.showFavBottomSheet(context),
+                            onLongPress: () => pgcIntroController
+                                .showFavBottomSheet(context, type: 'longPress'),
+                            selectStatus: pgcIntroController.hasFav.value,
+                            semanticsLabel: '收藏',
+                            needAnim: true,
+                          ),
+                        ),
+                      ),
+                      SizedBox(
+                        width: 42,
+                        height: 34,
+                        child: ActionItem(
+                          expand: false,
+                          icon: const Icon(
+                            FontAwesomeIcons.shareFromSquare,
+                            color: Colors.white,
+                          ),
+                          onTap: () =>
+                              pgcIntroController.actionShareVideo(context),
+                          semanticsLabel: '转发',
+                        ),
+                      ),
+                    ],
+                  ],
+                )
+              : const SizedBox.shrink(),
+      ],
+    ),
+  );
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/webdav/webdav.dart b/lib/pages/webdav/webdav.dart
index 59e71f2dc..1fcc89371 100644
--- a/lib/pages/webdav/webdav.dart
+++ b/lib/pages/webdav/webdav.dart
@@ -29,15 +29,16 @@ class WebDav {
 
     try {
       _client = null;
-      final client = webdav.newClient(
-        webDavUri,
-        user: webDavUsername,
-        password: webDavPassword,
-      )
-        ..setHeaders({'accept-charset': 'utf-8'})
-        ..setConnectTimeout(4000)
-        ..setReceiveTimeout(4000)
-        ..setSendTimeout(4000);
+      final client =
+          webdav.newClient(
+              webDavUri,
+              user: webDavUsername,
+              password: webDavPassword,
+            )
+            ..setHeaders({'accept-charset': 'utf-8'})
+            ..setConnectTimeout(4000)
+            ..setReceiveTimeout(4000)
+            ..setSendTimeout(4000);
 
       await client.mkdirAll(_webdavDirectory);
 
diff --git a/lib/pages/webview/view.dart b/lib/pages/webview/view.dart
index b74ecf182..c24fc918a 100644
--- a/lib/pages/webview/view.dart
+++ b/lib/pages/webview/view.dart
@@ -129,18 +129,24 @@ class _WebviewPageState extends State<WebviewPage> {
                   itemBuilder: (context) => <PopupMenuEntry<WebviewMenuItem>>[
                     ...WebviewMenuItem.values
                         .sublist(0, WebviewMenuItem.values.length - 1)
-                        .map((item) => PopupMenuItem(
-                            value: item, child: Text(item.title))),
+                        .map(
+                          (item) => PopupMenuItem(
+                            value: item,
+                            child: Text(item.title),
+                          ),
+                        ),
                     const PopupMenuDivider(),
                     PopupMenuItem(
-                        value: WebviewMenuItem.goBack,
-                        child: Text(
-                          WebviewMenuItem.goBack.title,
-                          style: TextStyle(
-                              color: Theme.of(context).colorScheme.error),
-                        )),
+                      value: WebviewMenuItem.goBack,
+                      child: Text(
+                        WebviewMenuItem.goBack.title,
+                        style: TextStyle(
+                          color: Theme.of(context).colorScheme.error,
+                        ),
+                      ),
+                    ),
                   ],
-                )
+                ),
               ],
             ),
       body: SafeArea(
@@ -155,8 +161,9 @@ class _WebviewPageState extends State<WebviewPage> {
             userAgent: Request.headerUa(type: uaType),
             mixedContentMode: MixedContentMode.MIXED_CONTENT_ALWAYS_ALLOW,
           ),
-          initialUrlRequest:
-              URLRequest(url: WebUri.uri(Uri.tryParse(_url) ?? Uri())),
+          initialUrlRequest: URLRequest(
+            url: WebUri.uri(Uri.tryParse(_url) ?? Uri()),
+          ),
           onWebViewCreated: (InAppWebViewController controller) {
             _webViewController = controller;
             controller
@@ -190,16 +197,20 @@ class _WebviewPageState extends State<WebviewPage> {
             final url = uri.toString();
             if (url.startsWith('https://www.bilibili.com/h5/note-app')) {
               controller
-                ..evaluateJavascript(source: """
+                ..evaluateJavascript(
+                  source: """
   document.querySelector('.finish-btn').addEventListener('click', function() {
       window.flutter_inappwebview.callHandler('finishButtonClicked');
   });
-""")
-                ..evaluateJavascript(source: """
+""",
+                )
+                ..evaluateJavascript(
+                  source: """
   document.querySelector('.info-bar').addEventListener('click', function() {
       window.flutter_inappwebview.callHandler('infoBarClicked');
   });
-""");
+""",
+                );
             } else if (url.startsWith('https://live.bilibili.com')) {
               controller.evaluateJavascript(
                 source: '''
@@ -218,43 +229,47 @@ class _WebviewPageState extends State<WebviewPage> {
           onDownloadStartRequest: Platform.isAndroid
               ? (controller, request) {
                   showDialog(
-                      context: context,
-                      builder: (context) {
-                        String suggestedFilename =
-                            request.suggestedFilename.toString();
-                        String fileSize = CacheManage.formatSize(
-                            request.contentLength.toDouble());
-                        try {
-                          suggestedFilename =
-                              Uri.decodeComponent(suggestedFilename);
-                        } catch (e) {
-                          if (kDebugMode) debugPrint(e.toString());
-                        }
-                        return AlertDialog(
-                          title: Text(
-                            '下载文件: $suggestedFilename ?',
-                            style: const TextStyle(fontSize: 18),
-                          ),
-                          content: SelectableText(request.url.toString()),
-                          actions: [
-                            TextButton(
-                              onPressed: Get.back,
-                              child: Text(
-                                '取消',
-                                style: TextStyle(
-                                    color:
-                                        Theme.of(context).colorScheme.outline),
+                    context: context,
+                    builder: (context) {
+                      String suggestedFilename = request.suggestedFilename
+                          .toString();
+                      String fileSize = CacheManage.formatSize(
+                        request.contentLength.toDouble(),
+                      );
+                      try {
+                        suggestedFilename = Uri.decodeComponent(
+                          suggestedFilename,
+                        );
+                      } catch (e) {
+                        if (kDebugMode) debugPrint(e.toString());
+                      }
+                      return AlertDialog(
+                        title: Text(
+                          '下载文件: $suggestedFilename ?',
+                          style: const TextStyle(fontSize: 18),
+                        ),
+                        content: SelectableText(request.url.toString()),
+                        actions: [
+                          TextButton(
+                            onPressed: Get.back,
+                            child: Text(
+                              '取消',
+                              style: TextStyle(
+                                color: Theme.of(context).colorScheme.outline,
                               ),
                             ),
-                            TextButton(
-                                onPressed: () {
-                                  Get.back();
-                                  PageUtils.launchURL(request.url.toString());
-                                },
-                                child: Text('确定 ($fileSize)')),
-                          ],
-                        );
-                      });
+                          ),
+                          TextButton(
+                            onPressed: () {
+                              Get.back();
+                              PageUtils.launchURL(request.url.toString());
+                            },
+                            child: Text('确定 ($fileSize)'),
+                          ),
+                        ],
+                      );
+                    },
+                  );
                   progress.value = 1;
                 }
               : null,
@@ -263,16 +278,18 @@ class _WebviewPageState extends State<WebviewPage> {
             if (url.startsWith('//api.bilibili.com/x/note/add') &&
                 widget.title != null) {
               return ajaxRequest
-                ..data = ajaxRequest.data
-                    .toString()
-                    .replaceFirst('&title=--&', '&title=${widget.title}&');
+                ..data = ajaxRequest.data.toString().replaceFirst(
+                  '&title=--&',
+                  '&title=${widget.title}&',
+                );
             }
             return null;
           },
           shouldInterceptRequest: (controller, request) async {
             String url = request.url.toString();
             if (url.startsWith(
-                'https://passport.bilibili.com/x/passport-login/web')) {
+              'https://passport.bilibili.com/x/passport-login/web',
+            )) {
               progress.value = 1;
               return WebResourceResponse();
             }
@@ -292,8 +309,10 @@ class _WebviewPageState extends State<WebviewPage> {
             if (hasMatch) {
               progress.value = 1;
               return NavigationActionPolicy.CANCEL;
-            } else if (RegExp(r'^(?!(https?://))\S+://', caseSensitive: false)
-                .hasMatch(url)) {
+            } else if (RegExp(
+              r'^(?!(https?://))\S+://',
+              caseSensitive: false,
+            ).hasMatch(url)) {
               if (context.mounted) {
                 SnackBar snackBar = SnackBar(
                   content: const Text('当前网页将要打开外部链接，是否打开'),
diff --git a/lib/pages/whisper/controller.dart b/lib/pages/whisper/controller.dart
index 23ed9f645..18bba21fb 100644
--- a/lib/pages/whisper/controller.dart
+++ b/lib/pages/whisper/controller.dart
@@ -15,7 +15,7 @@ class WhisperController extends CommonWhisperController<SessionMainReply> {
   SessionPageType sessionPageType = SessionPageType.SESSION_PAGE_TYPE_HOME;
 
   late final List<({bool enabled, IconData icon, String name, String route})>
-      msgFeedTopItems;
+  msgFeedTopItems;
   late final RxList<int> unreadCounts;
 
   PbMap<int, Offset>? offset;
@@ -79,7 +79,9 @@ class WhisperController extends CommonWhisperController<SessionMainReply> {
 
   @override
   bool customHandleResponse(
-      bool isRefresh, Success<SessionMainReply> response) {
+    bool isRefresh,
+    Success<SessionMainReply> response,
+  ) {
     if (isRefresh) {
       threeDotItems.value = response.response.threeDotItems;
       outsideItem.value = response.response.outsideItem;
diff --git a/lib/pages/whisper/view.dart b/lib/pages/whisper/view.dart
index 1e4af36e9..b20c3e417 100644
--- a/lib/pages/whisper/view.dart
+++ b/lib/pages/whisper/view.dart
@@ -30,16 +30,17 @@ class _WhisperPageState extends State<WhisperPage> {
             final outsideItem = _controller.outsideItem.value;
             if (outsideItem?.isNotEmpty == true) {
               return Row(
-                  children: outsideItem!.map((e) {
-                return IconButton(
-                  tooltip: e.hasTitle() ? e.title : null,
-                  onPressed: () => e.type.action(
-                    context: context,
-                    controller: _controller,
-                  ),
-                  icon: e.type.icon,
-                );
-              }).toList());
+                children: outsideItem!.map((e) {
+                  return IconButton(
+                    tooltip: e.hasTitle() ? e.title : null,
+                    onPressed: () => e.type.action(
+                      context: context,
+                      controller: _controller,
+                    ),
+                    icon: e.type.icon,
+                  );
+                }).toList(),
+              );
             }
             return const SizedBox.shrink();
           }),
@@ -49,18 +50,20 @@ class _WhisperPageState extends State<WhisperPage> {
               return PopupMenuButton(
                 itemBuilder: (context) {
                   return threeDotItems!
-                      .map((e) => PopupMenuItem(
-                            onTap: () => e.type.action(
-                              context: context,
-                              controller: _controller,
-                            ),
-                            child: Row(
-                              children: [
-                                e.type.icon,
-                                Text('  ${e.title}'),
-                              ],
-                            ),
-                          ))
+                      .map(
+                        (e) => PopupMenuItem(
+                          onTap: () => e.type.action(
+                            context: context,
+                            controller: _controller,
+                          ),
+                          child: Row(
+                            children: [
+                              e.type.icon,
+                              Text('  ${e.title}'),
+                            ],
+                          ),
+                        ),
+                      )
                       .toList();
                 },
               );
@@ -96,37 +99,39 @@ class _WhisperPageState extends State<WhisperPage> {
     );
     return switch (loadingState) {
       Loading() => SliverList.builder(
-          itemCount: 12,
-          itemBuilder: (context, index) {
-            return const WhisperItemSkeleton();
-          },
-        ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverList.separated(
-              itemCount: response!.length,
-              itemBuilder: (context, index) {
-                if (index == response.length - 1) {
-                  _controller.onLoadMore();
-                }
-                final item = response[index];
-                return WhisperSessionItem(
-                  item: item,
-                  onSetTop: (isTop, id) =>
-                      _controller.onSetTop(item, index, isTop, id),
-                  onSetMute: (isMuted, talkerUid) =>
-                      _controller.onSetMute(item, isMuted, talkerUid),
-                  onRemove: (talkerId) => _controller.onRemove(index, talkerId),
-                );
-              },
-              separatorBuilder: (context, index) => divider,
-            )
-          : HttpError(
-              onReload: _controller.onReload,
-            ),
+        itemCount: 12,
+        itemBuilder: (context, index) {
+          return const WhisperItemSkeleton();
+        },
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverList.separated(
+                itemCount: response!.length,
+                itemBuilder: (context, index) {
+                  if (index == response.length - 1) {
+                    _controller.onLoadMore();
+                  }
+                  final item = response[index];
+                  return WhisperSessionItem(
+                    item: item,
+                    onSetTop: (isTop, id) =>
+                        _controller.onSetTop(item, index, isTop, id),
+                    onSetMute: (isMuted, talkerUid) =>
+                        _controller.onSetMute(item, isMuted, talkerUid),
+                    onRemove: (talkerId) =>
+                        _controller.onRemove(index, talkerId),
+                  );
+                },
+                separatorBuilder: (context, index) => divider,
+              )
+            : HttpError(
+                onReload: _controller.onReload,
+              ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
diff --git a/lib/pages/whisper/widgets/item.dart b/lib/pages/whisper/widgets/item.dart
index b4cfc31ad..62c58d25c 100644
--- a/lib/pages/whisper/widgets/item.dart
+++ b/lib/pages/whisper/widgets/item.dart
@@ -35,16 +35,17 @@ class WhisperSessionItem extends StatelessWidget {
     final avatar = resource.hasResImage()
         ? resource.resImage.imageSrc.remote.url
         : resource.hasResAnimation()
-            ? resource.resAnimation.webpSrc.remote.url
-            : resource.resNativeDraw.drawSrc.remote.url;
+        ? resource.resAnimation.webpSrc.remote.url
+        : resource.resNativeDraw.drawSrc.remote.url;
     Map? vipInfo = item.sessionInfo.hasVipInfo()
         ? jsonDecode(item.sessionInfo.vipInfo)
         : null;
     final ThemeData theme = Theme.of(context);
     return ListTile(
       tileColor: item.isPinned
-          ? theme.colorScheme.onInverseSurface
-              .withValues(alpha: Get.isDarkMode ? 0.4 : 0.8)
+          ? theme.colorScheme.onInverseSurface.withValues(
+              alpha: Get.isDarkMode ? 0.4 : 0.8,
+            )
           : null,
       onLongPress: () => showDialog(
         context: context,
@@ -155,13 +156,20 @@ class WhisperSessionItem extends StatelessWidget {
           final pendant = item.sessionInfo.avatar.fallbackLayers.layers
               .getOrNull(1)
               ?.resource;
-          final offcial = item.sessionInfo.avatar.fallbackLayers.layers
-              .lastOrNull?.resource.resImage.imageSrc;
+          final offcial = item
+              .sessionInfo
+              .avatar
+              .fallbackLayers
+              .layers
+              .lastOrNull
+              ?.resource
+              .resImage
+              .imageSrc;
 
           return GestureDetector(
             onTap: item.sessionInfo.avatar.hasMid()
                 ? () =>
-                    Get.toNamed('/member?mid=${item.sessionInfo.avatar.mid}')
+                      Get.toNamed('/member?mid=${item.sessionInfo.avatar.mid}')
                 : null,
             child: PendantAvatar(
               size: 42,
@@ -169,8 +177,8 @@ class WhisperSessionItem extends StatelessWidget {
               avatar: avatar,
               garbPendantImage:
                   pendant?.resImage.imageSrc.remote.hasUrl() == true
-                      ? pendant!.resImage.imageSrc.remote.url
-                      : pendant?.resAnimation.webpSrc.remote.url,
+                  ? pendant!.resImage.imageSrc.remote.url
+                  : pendant?.resAnimation.webpSrc.remote.url,
               isVip: vipInfo?['status'] != null && vipInfo!['status'] > 0,
               officialType: offcial?.hasLocalValue() == true
                   ? switch (offcial!.localValue) {
@@ -197,7 +205,8 @@ class WhisperSessionItem extends StatelessWidget {
                     overflow: TextOverflow.ellipsis,
                     style: TextStyle(
                       fontSize: 15,
-                      color: vipInfo?['status'] != null &&
+                      color:
+                          vipInfo?['status'] != null &&
                               vipInfo!['status'] > 0 &&
                               vipInfo['type'] == 2
                           ? context.vipColor
@@ -240,8 +249,9 @@ class WhisperSessionItem extends StatelessWidget {
               item.msgSummary.rawMsg,
               maxLines: 1,
               overflow: TextOverflow.ellipsis,
-              style: theme.textTheme.labelMedium!
-                  .copyWith(color: theme.colorScheme.outline),
+              style: theme.textTheme.labelMedium!.copyWith(
+                color: theme.colorScheme.outline,
+              ),
             ),
           ),
           if (item.isMuted)
@@ -256,7 +266,7 @@ class WhisperSessionItem extends StatelessWidget {
               label: item.unread.style == UnreadStyle.UNREAD_STYLE_NUMBER
                   ? Text(item.unread.number.toString())
                   : null,
-            )
+            ),
         ],
       ),
     );
diff --git a/lib/pages/whisper_block/controller.dart b/lib/pages/whisper_block/controller.dart
index 8942cc1f7..df27399d7 100644
--- a/lib/pages/whisper_block/controller.dart
+++ b/lib/pages/whisper_block/controller.dart
@@ -5,8 +5,9 @@ import 'package:PiliPlus/pages/common/common_list_controller.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 
-class WhisperBlockController extends CommonListController<
-    KeywordBlockingListReply, KeywordBlockingItem> {
+class WhisperBlockController
+    extends
+        CommonListController<KeywordBlockingListReply, KeywordBlockingItem> {
   @override
   void onInit() {
     super.onInit();
diff --git a/lib/pages/whisper_block/view.dart b/lib/pages/whisper_block/view.dart
index 94e947de9..622ae8e1e 100644
--- a/lib/pages/whisper_block/view.dart
+++ b/lib/pages/whisper_block/view.dart
@@ -33,47 +33,51 @@ class _WhisperBlockPageState extends State<WhisperBlockPage> {
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<List<KeywordBlockingItem>?> loadingState) {
+    ThemeData theme,
+    LoadingState<List<KeywordBlockingItem>?> loadingState,
+  ) {
     return switch (loadingState) {
       Loading() => loadingWidget,
-      Success(:var response) => response?.isNotEmpty == true
-          ? Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 12),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Text(
-                        '点击屏蔽词即可删除',
-                        style: TextStyle(
-                          fontSize: 13,
-                          color: theme.colorScheme.outline,
-                        ),
-                      ),
-                      if (_controller.listLimit != null)
-                        Obx(
-                          () => Text(
-                            '${_controller.count.value}/${_controller.listLimit}',
-                            style: TextStyle(
-                              fontSize: 13,
-                              color: theme.colorScheme.outline,
-                            ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 12),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Text(
+                          '点击屏蔽词即可删除',
+                          style: TextStyle(
+                            fontSize: 13,
+                            color: theme.colorScheme.outline,
                           ),
                         ),
-                    ],
+                        if (_controller.listLimit != null)
+                          Obx(
+                            () => Text(
+                              '${_controller.count.value}/${_controller.listLimit}',
+                              style: TextStyle(
+                                fontSize: 13,
+                                color: theme.colorScheme.outline,
+                              ),
+                            ),
+                          ),
+                      ],
+                    ),
                   ),
-                ),
-                Expanded(
-                  child: Padding(
-                    padding: const EdgeInsets.all(12),
-                    child: SingleChildScrollView(
-                      child: Wrap(
-                        spacing: 12,
-                        runSpacing: 12,
-                        children: response!
-                            .map((e) => SearchText(
+                  Expanded(
+                    child: Padding(
+                      padding: const EdgeInsets.all(12),
+                      child: SingleChildScrollView(
+                        child: Wrap(
+                          spacing: 12,
+                          runSpacing: 12,
+                          children: response!
+                              .map(
+                                (e) => SearchText(
                                   text: e.keyword,
                                   onTap: (keyword) {
                                     showConfirmDialog(
@@ -83,61 +87,66 @@ class _WhisperBlockPageState extends State<WhisperBlockPage> {
                                       onConfirm: () => _controller.onRemove(e),
                                     );
                                   },
-                                ))
-                            .toList(),
+                                ),
+                              )
+                              .toList(),
+                        ),
                       ),
                     ),
                   ),
-                ),
-                Padding(
-                  padding: EdgeInsets.only(
-                    left: 25,
-                    right: 25,
-                    bottom: MediaQuery.paddingOf(context).bottom + 10,
-                  ),
-                  child: FilledButton.tonal(
-                    onPressed: _onAdd,
-                    child: const Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [Icon(Icons.add, size: 22), Text('添加消息屏蔽词')],
+                  Padding(
+                    padding: EdgeInsets.only(
+                      left: 25,
+                      right: 25,
+                      bottom: MediaQuery.paddingOf(context).bottom + 10,
+                    ),
+                    child: FilledButton.tonal(
+                      onPressed: _onAdd,
+                      child: const Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [Icon(Icons.add, size: 22), Text('添加消息屏蔽词')],
+                      ),
                     ),
                   ),
-                ),
-              ],
-            )
-          : SizedBox.expand(
-              child: Column(
-                children: [
-                  const Spacer(),
-                  SvgPicture.asset("assets/images/error.svg", height: 156),
-                  const SizedBox(height: 6),
-                  const Text(
-                    '还未添加屏蔽词',
-                    style: TextStyle(fontSize: 15, fontWeight: FontWeight.bold),
-                  ),
-                  const SizedBox(height: 6),
-                  const Text('添加后，将不再接受包含屏蔽词的消息'),
-                  const SizedBox(height: 6),
-                  FilledButton.tonal(
-                    onPressed: _onAdd,
-                    style: FilledButton.styleFrom(
-                        visualDensity: VisualDensity.compact),
-                    child: const Row(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Icon(Icons.add, size: 22),
-                        Text('添加'),
-                      ],
-                    ),
-                  ),
-                  const Spacer(flex: 2),
                 ],
+              )
+            : SizedBox.expand(
+                child: Column(
+                  children: [
+                    const Spacer(),
+                    SvgPicture.asset("assets/images/error.svg", height: 156),
+                    const SizedBox(height: 6),
+                    const Text(
+                      '还未添加屏蔽词',
+                      style: TextStyle(
+                        fontSize: 15,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                    const SizedBox(height: 6),
+                    const Text('添加后，将不再接受包含屏蔽词的消息'),
+                    const SizedBox(height: 6),
+                    FilledButton.tonal(
+                      onPressed: _onAdd,
+                      style: FilledButton.styleFrom(
+                        visualDensity: VisualDensity.compact,
+                      ),
+                      child: const Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Icon(Icons.add, size: 22),
+                          Text('添加'),
+                        ],
+                      ),
+                    ),
+                    const Spacer(flex: 2),
+                  ],
+                ),
               ),
-            ),
       Error(:var errMsg) => scrollErrorWidget(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 
@@ -151,10 +160,13 @@ class _WhisperBlockPageState extends State<WhisperBlockPage> {
       builder: (context) {
         final theme = Theme.of(context);
         return Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12) +
+          padding:
+              const EdgeInsets.symmetric(horizontal: 14, vertical: 12) +
               EdgeInsets.only(
-                  bottom: MediaQuery.paddingOf(context).bottom +
-                      MediaQuery.viewInsetsOf(context).bottom),
+                bottom:
+                    MediaQuery.paddingOf(context).bottom +
+                    MediaQuery.viewInsetsOf(context).bottom,
+              ),
           child: Column(
             mainAxisSize: MainAxisSize.min,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -186,8 +198,10 @@ class _WhisperBlockPageState extends State<WhisperBlockPage> {
                   isDense: true,
                   hintText: '请输入',
                   hintStyle: const TextStyle(fontSize: 14),
-                  contentPadding:
-                      const EdgeInsets.symmetric(horizontal: 14, vertical: 6),
+                  contentPadding: const EdgeInsets.symmetric(
+                    horizontal: 14,
+                    vertical: 6,
+                  ),
                   border: const OutlineInputBorder(
                     borderSide: BorderSide.none,
                     borderRadius: BorderRadius.all(Radius.circular(25)),
diff --git a/lib/pages/whisper_detail/controller.dart b/lib/pages/whisper_detail/controller.dart
index 6fd674a00..5c705b7fb 100644
--- a/lib/pages/whisper_detail/controller.dart
+++ b/lib/pages/whisper_detail/controller.dart
@@ -82,8 +82,9 @@ class WhisperDetailController extends CommonListController<RspSessionMsg, Msg> {
     var result = await ImGrpc.sendMsg(
       senderUid: accountService.mid,
       receiverId: mid!,
-      content:
-          msgType == 5 ? message! : jsonEncode(picMsg ?? {"content": message!}),
+      content: msgType == 5
+          ? message!
+          : jsonEncode(picMsg ?? {"content": message!}),
       msgType: MsgType.values[msgType ?? (picMsg != null ? 2 : 1)],
     );
     SmartDialog.dismiss();
diff --git a/lib/pages/whisper_detail/view.dart b/lib/pages/whisper_detail/view.dart
index c8f026d9f..544ccad72 100644
--- a/lib/pages/whisper_detail/view.dart
+++ b/lib/pages/whisper_detail/view.dart
@@ -88,8 +88,11 @@ class _WhisperDetailPageState
                   maxLines: 1,
                   overflow: TextOverflow.ellipsis,
                   style: const TextStyle(height: 1, fontSize: 16),
-                  strutStyle:
-                      const StrutStyle(leading: 0, height: 1, fontSize: 16),
+                  strutStyle: const StrutStyle(
+                    leading: 0,
+                    height: 1,
+                    fontSize: 16,
+                  ),
                 ),
               ),
               if (_whisperDetailController.isLive) ...[
@@ -105,9 +108,11 @@ class _WhisperDetailPageState
         ),
         actions: [
           IconButton(
-            onPressed: () => Get.to(WhisperLinkSettingPage(
-              talkerUid: _whisperDetailController.talkerId,
-            )),
+            onPressed: () => Get.to(
+              WhisperLinkSettingPage(
+                talkerUid: _whisperDetailController.talkerId,
+              ),
+            ),
             icon: Icon(
               size: 20,
               Icons.settings,
@@ -130,8 +135,10 @@ class _WhisperDetailPageState
                 behavior: HitTestBehavior.opaque,
                 child: refreshIndicator(
                   onRefresh: _whisperDetailController.onRefresh,
-                  child: Obx(() =>
-                      _buildBody(_whisperDetailController.loadingState.value)),
+                  child: Obx(
+                    () =>
+                        _buildBody(_whisperDetailController.loadingState.value),
+                  ),
                 ),
               ),
             ),
@@ -149,39 +156,42 @@ class _WhisperDetailPageState
   Widget _buildBody(LoadingState<List<Msg>?> loadingState) {
     return switch (loadingState) {
       Loading() => loadingWidget,
-      Success(:var response) => response?.isNotEmpty == true
-          ? ListView.separated(
-              shrinkWrap: true,
-              reverse: true,
-              itemCount: response!.length,
-              padding: const EdgeInsets.all(14),
-              physics: const AlwaysScrollableScrollPhysics(
-                parent: ClampingScrollPhysics(),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? ListView.separated(
+                shrinkWrap: true,
+                reverse: true,
+                itemCount: response!.length,
+                padding: const EdgeInsets.all(14),
+                physics: const AlwaysScrollableScrollPhysics(
+                  parent: ClampingScrollPhysics(),
+                ),
+                controller: _whisperDetailController.scrollController,
+                itemBuilder: (context, int index) {
+                  if (index == response.length - 1) {
+                    _whisperDetailController.onLoadMore();
+                  }
+                  final item = response[index];
+                  return ChatItem(
+                    item: item,
+                    eInfos: _whisperDetailController.eInfos,
+                    onLongPress:
+                        item.senderUid.toInt() ==
+                            _whisperDetailController.accountService.mid
+                        ? () => onLongPress(index, item)
+                        : null,
+                  );
+                },
+                separatorBuilder: (context, index) =>
+                    const SizedBox(height: 12),
+              )
+            : scrollErrorWidget(
+                onReload: _whisperDetailController.onReload,
               ),
-              controller: _whisperDetailController.scrollController,
-              itemBuilder: (context, int index) {
-                if (index == response.length - 1) {
-                  _whisperDetailController.onLoadMore();
-                }
-                final item = response[index];
-                return ChatItem(
-                  item: item,
-                  eInfos: _whisperDetailController.eInfos,
-                  onLongPress: item.senderUid.toInt() ==
-                          _whisperDetailController.accountService.mid
-                      ? () => onLongPress(index, item)
-                      : null,
-                );
-              },
-              separatorBuilder: (context, index) => const SizedBox(height: 12),
-            )
-          : scrollErrorWidget(
-              onReload: _whisperDetailController.onReload,
-            ),
       Error(:var errMsg) => scrollErrorWidget(
-          errMsg: errMsg,
-          onReload: _whisperDetailController.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _whisperDetailController.onReload,
+      ),
     };
   }
 
@@ -297,9 +307,10 @@ class _WhisperDetailPageState
                           biz: 'im',
                         );
                         if (result['status']) {
-                          String mimeType = lookupMimeType(pickedFile.path)
-                                  ?.split('/')
-                                  .getOrNull(1) ??
+                          String mimeType =
+                              lookupMimeType(
+                                pickedFile.path,
+                              )?.split('/').getOrNull(1) ??
                               'jpg';
                           UploadBfsResData data = result['data'];
                           Map picMsg = {
@@ -326,9 +337,11 @@ class _WhisperDetailPageState
                     }
                   }
                 },
-                icon: Icon(enablePublish
-                    ? Icons.send
-                    : Icons.add_photo_alternate_outlined),
+                icon: Icon(
+                  enablePublish
+                      ? Icons.send
+                      : Icons.add_photo_alternate_outlined,
+                ),
                 tooltip: enablePublish ? '发送' : '图片',
               );
             },
diff --git a/lib/pages/whisper_detail/widget/chat_item.dart b/lib/pages/whisper_detail/widget/chat_item.dart
index f911ec2cc..116fa69a6 100644
--- a/lib/pages/whisper_detail/widget/chat_item.dart
+++ b/lib/pages/whisper_detail/widget/chat_item.dart
@@ -52,7 +52,8 @@ class ChatItem extends StatelessWidget {
   Widget build(BuildContext context) {
     bool isPic = item.msgType == MsgType.EN_MSG_TYPE_PIC.value; // 图片
     bool isRevoke = item.msgType == MsgType.EN_MSG_TYPE_DRAW_BACK.value; // 撤回消息
-    bool isSystem = item.msgType == MsgType.EN_MSG_TYPE_VIDEO_CARD.value ||
+    bool isSystem =
+        item.msgType == MsgType.EN_MSG_TYPE_VIDEO_CARD.value ||
         item.msgType == MsgType.EN_MSG_TYPE_TIP_MESSAGE.value ||
         item.msgType == MsgType.EN_MSG_TYPE_NOTIFY_MSG.value ||
         item.msgType == MsgType.EN_MSG_TYPE_PICTURE_CARD.value ||
@@ -138,17 +139,18 @@ class ChatItem extends StatelessWidget {
                                   Divider(
                                     height: 10,
                                     thickness: 1,
-                                    color: theme.colorScheme.outline
-                                        .withValues(alpha: 0.2),
+                                    color: theme.colorScheme.outline.withValues(
+                                      alpha: 0.2,
+                                    ),
                                   ),
                                   Text(
                                     '此条消息为自动回复',
-                                    style:
-                                        theme.textTheme.labelMedium!.copyWith(
-                                      color: theme.colorScheme.outline,
-                                    ),
+                                    style: theme.textTheme.labelMedium!
+                                        .copyWith(
+                                          color: theme.colorScheme.outline,
+                                        ),
                                   ),
-                                ]
+                                ],
                               ],
                             ),
                           ),
@@ -313,8 +315,9 @@ class ChatItem extends StatelessWidget {
             for (var i in content['sub_cards'])
               GestureDetector(
                 onTap: () async {
-                  String? bvid =
-                      IdUtils.bvRegex.firstMatch(i['jump_url'])?.group(0);
+                  String? bvid = IdUtils.bvRegex
+                      .firstMatch(i['jump_url'])
+                      ?.group(0);
                   if (bvid != null) {
                     try {
                       SmartDialog.showLoading();
@@ -442,12 +445,14 @@ class ChatItem extends StatelessWidget {
                         text: content['times'] == 0
                             ? '--:--'
                             : DurationUtil.formatDuration(content['times']),
-                      )
+                      ),
                     ],
                   ),
                   Padding(
-                    padding:
-                        const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 12,
+                      vertical: 8,
+                    ),
                     child: Text(
                       content['times'] == 0 ? '内容已失效' : content['title'],
                       style: TextStyle(
@@ -509,12 +514,12 @@ class ChatItem extends StatelessWidget {
       case 6:
         type = '专栏';
         onTap = () => Get.toNamed(
-              '/articlePage',
-              parameters: {
-                'id': '${content['id']}',
-                'type': 'read',
-              },
-            );
+          '/articlePage',
+          parameters: {
+            'id': '${content['id']}',
+            'type': 'read',
+          },
+        );
         break;
 
       // dynamic
@@ -530,7 +535,8 @@ class ChatItem extends StatelessWidget {
 
       default:
         onTap = () => SmartDialog.showToast(
-            'unsupported source type: ${content['source']}');
+          'unsupported source type: ${content['source']}',
+        );
     }
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -698,15 +704,21 @@ class ChatItem extends StatelessWidget {
               Text.rich(
                 TextSpan(
                   children: modules!.indexed
-                      .map((e) => TextSpan(children: [
+                      .map(
+                        (e) => TextSpan(
+                          children: [
                             TextSpan(
-                                text: e.$2['title'],
-                                style: TextStyle(
-                                    color: theme.colorScheme.outline)),
+                              text: e.$2['title'],
+                              style: TextStyle(
+                                color: theme.colorScheme.outline,
+                              ),
+                            ),
                             TextSpan(text: '    ${e.$2['detail']}'),
                             if (e.$1 != modules.length - 1)
                               const TextSpan(text: '\n'),
-                          ]))
+                          ],
+                        ),
+                      )
                       .toList(),
                 ),
               ),
diff --git a/lib/pages/whisper_link_setting/controller.dart b/lib/pages/whisper_link_setting/controller.dart
index 3424cabaa..38dafacfb 100644
--- a/lib/pages/whisper_link_setting/controller.dart
+++ b/lib/pages/whisper_link_setting/controller.dart
@@ -24,8 +24,9 @@ class WhisperLinkSettingController extends GetxController {
 
   final int talkerUid;
   RxBool isPinned = false.obs;
-  late final sessionId =
-      SessionId(privateId: PrivateId(talkerUid: Int64(talkerUid)));
+  late final sessionId = SessionId(
+    privateId: PrivateId(talkerUid: Int64(talkerUid)),
+  );
 
   @override
   void onInit() {
diff --git a/lib/pages/whisper_link_setting/view.dart b/lib/pages/whisper_link_setting/view.dart
index 035d9aa46..98648ebaf 100644
--- a/lib/pages/whisper_link_setting/view.dart
+++ b/lib/pages/whisper_link_setting/view.dart
@@ -43,18 +43,29 @@ class _WhisperLinkSettingPageState extends State<WhisperLinkSettingPage> {
     return Scaffold(
       appBar: AppBar(title: const Text('聊天设置')),
       body: ListView(
-        padding:
-            EdgeInsets.only(bottom: MediaQuery.paddingOf(context).bottom + 80),
+        padding: EdgeInsets.only(
+          bottom: MediaQuery.paddingOf(context).bottom + 80,
+        ),
         children: [
           divider,
-          Obx(() =>
-              _buildUserInfo(theme, divider, _controller.userState.value)),
-          Obx(() => _buildSessionSs(
-              theme, divider, divider2, _controller.sessionSs.value)),
-          Obx(() => _controller.sessionSs.value.isSuccess
-              ? _buildBlockItem(
-                  _controller.sessionSs.value.data.followStatus == 128)
-              : const SizedBox.shrink()),
+          Obx(
+            () => _buildUserInfo(theme, divider, _controller.userState.value),
+          ),
+          Obx(
+            () => _buildSessionSs(
+              theme,
+              divider,
+              divider2,
+              _controller.sessionSs.value,
+            ),
+          ),
+          Obx(
+            () => _controller.sessionSs.value.isSuccess
+                ? _buildBlockItem(
+                    _controller.sessionSs.value.data.followStatus == 128,
+                  )
+                : const SizedBox.shrink(),
+          ),
           divider2,
           ListTile(
             dense: true,
@@ -80,8 +91,9 @@ class _WhisperLinkSettingPageState extends State<WhisperLinkSettingPage> {
         alignment: Alignment.centerRight,
         scale: 0.8,
         child: Switch(
-          thumbIcon:
-              WidgetStateProperty.resolveWith<Icon?>((Set<WidgetState> states) {
+          thumbIcon: WidgetStateProperty.resolveWith<Icon?>((
+            Set<WidgetState> states,
+          ) {
             if (states.isNotEmpty && states.first == WidgetState.selected) {
               return const Icon(Icons.done);
             }
@@ -101,56 +113,59 @@ class _WhisperLinkSettingPageState extends State<WhisperLinkSettingPage> {
   ) {
     return switch (loadingState) {
       Loading() => const SizedBox.shrink(),
-      Success(:var response) => response?.isNotEmpty == true
-          ? Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Builder(
-                  builder: (context) {
-                    final ImUserInfosData item = response!.first;
-                    return ListTile(
-                      onTap: () => Get.toNamed('/member?mid=${item.mid}'),
-                      leading: PendantAvatar(
-                        avatar: item.face,
-                        size: 42,
-                        badgeSize: 14,
-                        isVip: item.vip?.status != null && item.vip!.status > 0,
-                        garbPendantImage: item.pendant?.image,
-                        officialType: item.official?.type,
-                      ),
-                      title: Text(
-                        item.name!,
-                        style: TextStyle(
-                          fontSize: 14,
-                          color: item.vip?.status != null &&
-                                  item.vip!.status > 0 &&
-                                  item.vip?.type == 2
-                              ? context.vipColor
-                              : null,
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Builder(
+                    builder: (context) {
+                      final ImUserInfosData item = response!.first;
+                      return ListTile(
+                        onTap: () => Get.toNamed('/member?mid=${item.mid}'),
+                        leading: PendantAvatar(
+                          avatar: item.face,
+                          size: 42,
+                          badgeSize: 14,
+                          isVip:
+                              item.vip?.status != null && item.vip!.status > 0,
+                          garbPendantImage: item.pendant?.image,
+                          officialType: item.official?.type,
                         ),
-                      ),
-                      subtitle: Text(
-                        'UID: ${item.mid}${item.sign?.isNotEmpty == true ? '\n${item.sign}' : ''}',
-                        maxLines: 2,
-                        overflow: TextOverflow.ellipsis,
-                        style: TextStyle(
-                          fontSize: 13,
+                        title: Text(
+                          item.name!,
+                          style: TextStyle(
+                            fontSize: 14,
+                            color:
+                                item.vip?.status != null &&
+                                    item.vip!.status > 0 &&
+                                    item.vip?.type == 2
+                                ? context.vipColor
+                                : null,
+                          ),
+                        ),
+                        subtitle: Text(
+                          'UID: ${item.mid}${item.sign?.isNotEmpty == true ? '\n${item.sign}' : ''}',
+                          maxLines: 2,
+                          overflow: TextOverflow.ellipsis,
+                          style: TextStyle(
+                            fontSize: 13,
+                            color: theme.colorScheme.outline,
+                          ),
+                        ),
+                        trailing: Icon(
+                          size: 22,
+                          Icons.keyboard_arrow_right,
                           color: theme.colorScheme.outline,
                         ),
-                      ),
-                      trailing: Icon(
-                        size: 22,
-                        Icons.keyboard_arrow_right,
-                        color: theme.colorScheme.outline,
-                      ),
-                    );
-                  },
-                ),
-                divider,
-              ],
-            )
-          : const SizedBox.shrink(),
+                      );
+                    },
+                  ),
+                  divider,
+                ],
+              )
+            : const SizedBox.shrink(),
       Error(:var errMsg) => _errWidget(errMsg, _controller.getUserInfo),
     };
   }
@@ -164,71 +179,75 @@ class _WhisperLinkSettingPageState extends State<WhisperLinkSettingPage> {
     return switch (loadingState) {
       Loading() => const SizedBox.shrink(),
       Success(:var response) => Builder(
-          builder: (context) {
-            late final subTitleS =
-                TextStyle(fontSize: 13, color: theme.colorScheme.outline);
-            return Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                if (response.showPushSetting == 1)
-                  ListTile(
-                    dense: true,
-                    onTap: () => _controller.setPush(response.pushSetting == 0),
-                    title: const Text('接收消息推送', style: TextStyle(fontSize: 14)),
-                    subtitle: Text(
-                      '若关闭此开关，你将不再收到该账号的图文消息与稿件推送，但通知类消息不受影响',
-                      style: subTitleS,
-                    ),
-                    trailing: Transform.scale(
-                      alignment: Alignment.centerRight,
-                      scale: 0.8,
-                      child: Switch(
-                        thumbIcon: WidgetStateProperty.resolveWith<Icon?>(
-                            (Set<WidgetState> states) {
-                          if (states.isNotEmpty &&
-                              states.first == WidgetState.selected) {
-                            return const Icon(Icons.done);
-                          }
-                          return null;
-                        }),
-                        value: response.pushSetting == 0,
-                        onChanged: (value) =>
-                            _controller.setPush(response.pushSetting == 0),
-                      ),
-                    ),
+        builder: (context) {
+          late final subTitleS = TextStyle(
+            fontSize: 13,
+            color: theme.colorScheme.outline,
+          );
+          return Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              if (response.showPushSetting == 1)
+                ListTile(
+                  dense: true,
+                  onTap: () => _controller.setPush(response.pushSetting == 0),
+                  title: const Text('接收消息推送', style: TextStyle(fontSize: 14)),
+                  subtitle: Text(
+                    '若关闭此开关，你将不再收到该账号的图文消息与稿件推送，但通知类消息不受影响',
+                    style: subTitleS,
                   ),
-                divider2,
-                Obx(
-                  () => ListTile(
-                    dense: true,
-                    onTap: _controller.setPin,
-                    title: const Text('置顶聊天', style: TextStyle(fontSize: 14)),
-                    trailing: Transform.scale(
-                      alignment: Alignment.centerRight,
-                      scale: 0.8,
-                      child: Switch(
-                        thumbIcon: WidgetStateProperty.resolveWith<Icon?>(
-                            (Set<WidgetState> states) {
-                          if (states.isNotEmpty &&
-                              states.first == WidgetState.selected) {
-                            return const Icon(Icons.done);
-                          }
-                          return null;
-                        }),
-                        value: _controller.isPinned.value,
-                        onChanged: (value) => _controller.setPin(),
-                      ),
+                  trailing: Transform.scale(
+                    alignment: Alignment.centerRight,
+                    scale: 0.8,
+                    child: Switch(
+                      thumbIcon: WidgetStateProperty.resolveWith<Icon?>((
+                        Set<WidgetState> states,
+                      ) {
+                        if (states.isNotEmpty &&
+                            states.first == WidgetState.selected) {
+                          return const Icon(Icons.done);
+                        }
+                        return null;
+                      }),
+                      value: response.pushSetting == 0,
+                      onChanged: (value) =>
+                          _controller.setPush(response.pushSetting == 0),
                     ),
                   ),
                 ),
-                divider2,
-                Obx(() => _buildMuteItem(_controller.msgDnd.value)),
-                divider,
-              ],
-            );
-          },
-        ),
+              divider2,
+              Obx(
+                () => ListTile(
+                  dense: true,
+                  onTap: _controller.setPin,
+                  title: const Text('置顶聊天', style: TextStyle(fontSize: 14)),
+                  trailing: Transform.scale(
+                    alignment: Alignment.centerRight,
+                    scale: 0.8,
+                    child: Switch(
+                      thumbIcon: WidgetStateProperty.resolveWith<Icon?>((
+                        Set<WidgetState> states,
+                      ) {
+                        if (states.isNotEmpty &&
+                            states.first == WidgetState.selected) {
+                          return const Icon(Icons.done);
+                        }
+                        return null;
+                      }),
+                      value: _controller.isPinned.value,
+                      onChanged: (value) => _controller.setPin(),
+                    ),
+                  ),
+                ),
+              ),
+              divider2,
+              Obx(() => _buildMuteItem(_controller.msgDnd.value)),
+              divider,
+            ],
+          );
+        },
+      ),
       Error(:var errMsg) => _errWidget(errMsg, _controller.getSessionSs),
     };
   }
@@ -236,30 +255,32 @@ class _WhisperLinkSettingPageState extends State<WhisperLinkSettingPage> {
   Widget _buildMuteItem(LoadingState<List<UidSetting>?> loadingState) {
     return switch (loadingState) {
       Loading() => const SizedBox.shrink(),
-      Success(:var response) => response?.isNotEmpty == true
-          ? ListTile(
-              dense: true,
-              onTap: () => _controller.setMute(response.first.setting == 1),
-              title: const Text('消息免打扰', style: TextStyle(fontSize: 14)),
-              trailing: Transform.scale(
-                alignment: Alignment.centerRight,
-                scale: 0.8,
-                child: Switch(
-                  thumbIcon: WidgetStateProperty.resolveWith<Icon?>(
-                      (Set<WidgetState> states) {
-                    if (states.isNotEmpty &&
-                        states.first == WidgetState.selected) {
-                      return const Icon(Icons.done);
-                    }
-                    return null;
-                  }),
-                  value: response!.first.setting == 1,
-                  onChanged: (value) =>
-                      _controller.setMute(response.first.setting == 1),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? ListTile(
+                dense: true,
+                onTap: () => _controller.setMute(response.first.setting == 1),
+                title: const Text('消息免打扰', style: TextStyle(fontSize: 14)),
+                trailing: Transform.scale(
+                  alignment: Alignment.centerRight,
+                  scale: 0.8,
+                  child: Switch(
+                    thumbIcon: WidgetStateProperty.resolveWith<Icon?>((
+                      Set<WidgetState> states,
+                    ) {
+                      if (states.isNotEmpty &&
+                          states.first == WidgetState.selected) {
+                        return const Icon(Icons.done);
+                      }
+                      return null;
+                    }),
+                    value: response!.first.setting == 1,
+                    onChanged: (value) =>
+                        _controller.setMute(response.first.setting == 1),
+                  ),
                 ),
-              ),
-            )
-          : const SizedBox.shrink(),
+              )
+            : const SizedBox.shrink(),
       Error(:var errMsg) => _errWidget(errMsg, _controller.getMsgDnd),
     };
   }
diff --git a/lib/pages/whisper_secondary/controller.dart b/lib/pages/whisper_secondary/controller.dart
index 79d7ca0bc..2848acff1 100644
--- a/lib/pages/whisper_secondary/controller.dart
+++ b/lib/pages/whisper_secondary/controller.dart
@@ -41,7 +41,9 @@ class WhisperSecController
 
   @override
   bool customHandleResponse(
-      bool isRefresh, Success<SessionSecondaryReply> response) {
+    bool isRefresh,
+    Success<SessionSecondaryReply> response,
+  ) {
     if (isRefresh) {
       threeDotItems.value = response.response.threeDotItems;
     }
diff --git a/lib/pages/whisper_secondary/view.dart b/lib/pages/whisper_secondary/view.dart
index 9066cb9e5..434df5fb0 100644
--- a/lib/pages/whisper_secondary/view.dart
+++ b/lib/pages/whisper_secondary/view.dart
@@ -41,18 +41,20 @@ class _WhisperSecPageState extends State<WhisperSecPage> {
               return PopupMenuButton(
                 itemBuilder: (context) {
                   return threeDotItems!
-                      .map((e) => PopupMenuItem(
-                            onTap: () => e.type.action(
-                              context: context,
-                              controller: _controller,
-                            ),
-                            child: Row(
-                              children: [
-                                e.type.icon,
-                                Text('  ${e.title}'),
-                              ],
-                            ),
-                          ))
+                      .map(
+                        (e) => PopupMenuItem(
+                          onTap: () => e.type.action(
+                            context: context,
+                            controller: _controller,
+                          ),
+                          child: Row(
+                            children: [
+                              e.type.icon,
+                              Text('  ${e.title}'),
+                            ],
+                          ),
+                        ),
+                      )
                       .toList();
                 },
               );
@@ -68,9 +70,10 @@ class _WhisperSecPageState extends State<WhisperSecPage> {
           slivers: [
             SliverPadding(
               padding: EdgeInsets.only(
-                  bottom: MediaQuery.paddingOf(context).bottom + 80),
+                bottom: MediaQuery.paddingOf(context).bottom + 80,
+              ),
               sliver: Obx(() => _buildBody(_controller.loadingState.value)),
-            )
+            ),
           ],
         ),
       ),
@@ -86,37 +89,39 @@ class _WhisperSecPageState extends State<WhisperSecPage> {
     );
     return switch (loadingState) {
       Loading() => SliverList.builder(
-          itemCount: 12,
-          itemBuilder: (context, index) {
-            return const WhisperItemSkeleton();
-          },
-        ),
-      Success(:var response) => response?.isNotEmpty == true
-          ? SliverList.separated(
-              itemCount: response!.length,
-              itemBuilder: (context, index) {
-                if (index == response.length - 1) {
-                  _controller.onLoadMore();
-                }
-                final item = response[index];
-                return WhisperSessionItem(
-                  item: item,
-                  onSetTop: (isTop, talkerId) =>
-                      _controller.onSetTop(item, index, isTop, talkerId),
-                  onSetMute: (isMuted, talkerUid) =>
-                      _controller.onSetMute(item, isMuted, talkerUid),
-                  onRemove: (talkerId) => _controller.onRemove(index, talkerId),
-                );
-              },
-              separatorBuilder: (context, index) => divider,
-            )
-          : HttpError(
-              onReload: _controller.onReload,
-            ),
+        itemCount: 12,
+        itemBuilder: (context, index) {
+          return const WhisperItemSkeleton();
+        },
+      ),
+      Success(:var response) =>
+        response?.isNotEmpty == true
+            ? SliverList.separated(
+                itemCount: response!.length,
+                itemBuilder: (context, index) {
+                  if (index == response.length - 1) {
+                    _controller.onLoadMore();
+                  }
+                  final item = response[index];
+                  return WhisperSessionItem(
+                    item: item,
+                    onSetTop: (isTop, talkerId) =>
+                        _controller.onSetTop(item, index, isTop, talkerId),
+                    onSetMute: (isMuted, talkerUid) =>
+                        _controller.onSetMute(item, isMuted, talkerUid),
+                    onRemove: (talkerId) =>
+                        _controller.onRemove(index, talkerId),
+                  );
+                },
+                separatorBuilder: (context, index) => divider,
+              )
+            : HttpError(
+                onReload: _controller.onReload,
+              ),
       Error(:var errMsg) => HttpError(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/pages/whisper_settings/controller.dart b/lib/pages/whisper_settings/controller.dart
index 7f2bd49d3..ae0010bb9 100644
--- a/lib/pages/whisper_settings/controller.dart
+++ b/lib/pages/whisper_settings/controller.dart
@@ -24,7 +24,9 @@ class WhisperSettingsController
 
   @override
   bool customHandleResponse(
-      bool isRefresh, Success<GetImSettingsReply> response) {
+    bool isRefresh,
+    Success<GetImSettingsReply> response,
+  ) {
     title.value = response.response.pageTitle;
     loadingState.value = Success(response.response.settings);
     return true;
diff --git a/lib/pages/whisper_settings/view.dart b/lib/pages/whisper_settings/view.dart
index c28bb4b89..a0ebffcea 100644
--- a/lib/pages/whisper_settings/view.dart
+++ b/lib/pages/whisper_settings/view.dart
@@ -42,7 +42,10 @@ class _WhisperSettingsPageState extends State<WhisperSettingsPage> {
   }
 
   Future<bool> onSet(
-      int key, PbMap<int, Setting> response, Setting item) async {
+    int key,
+    PbMap<int, Setting> response,
+    Setting item,
+  ) async {
     PbMap<int, Setting> settings = PbMap<int, Setting>(
       response.keyFieldType,
       response.valueFieldType,
@@ -55,7 +58,11 @@ class _WhisperSettingsPageState extends State<WhisperSettingsPage> {
   }
 
   void onRedirect(
-      ThemeData theme, int key, PbMap<int, Setting> response, Setting item) {
+    ThemeData theme,
+    int key,
+    PbMap<int, Setting> response,
+    Setting item,
+  ) {
     if (item.redirect.settingPage.hasParentSettingType()) {
       Get.to(
         WhisperSettingsPage(
@@ -126,8 +133,10 @@ class _WhisperSettingsPageState extends State<WhisperSettingsPage> {
       if (item.redirect.title == '黑名单') {
         Get.toNamed('/blackListPage');
       } else if (item.redirect.otherPage.url.startsWith('http')) {
-        Get.toNamed('/webview',
-            parameters: {'url': item.redirect.otherPage.url});
+        Get.toNamed(
+          '/webview',
+          parameters: {'url': item.redirect.otherPage.url},
+        );
       } else {
         SmartDialog.showToast(item.redirect.otherPage.url);
       }
@@ -135,8 +144,10 @@ class _WhisperSettingsPageState extends State<WhisperSettingsPage> {
       if (item.redirect.title == '消息屏蔽词') {
         Get.to(const WhisperBlockPage());
       } else if (item.redirect.settingPage.url.startsWith('http')) {
-        Get.toNamed('/webview',
-            parameters: {'url': item.redirect.settingPage.url});
+        Get.toNamed(
+          '/webview',
+          parameters: {'url': item.redirect.settingPage.url},
+        );
       } else {
         SmartDialog.showToast(item.redirect.settingPage.url);
       }
@@ -144,19 +155,22 @@ class _WhisperSettingsPageState extends State<WhisperSettingsPage> {
   }
 
   Widget _buildBody(
-      ThemeData theme, LoadingState<PbMap<int, Setting>> loadingState) {
+    ThemeData theme,
+    LoadingState<PbMap<int, Setting>> loadingState,
+  ) {
     late final divider = Divider(
       height: 1,
       color: theme.colorScheme.outline.withValues(alpha: 0.1),
     );
     return switch (loadingState) {
       Loading() => const SizedBox.shrink(),
-      Success<PbMap<int, Setting>>(:var response) =>
-        Builder(builder: (context) {
+      Success<PbMap<int, Setting>>(:var response) => Builder(
+        builder: (context) {
           final keys = response.keys.toList()..sort();
           return ListView.separated(
             padding: EdgeInsets.only(
-                bottom: MediaQuery.paddingOf(context).bottom + 80),
+              bottom: MediaQuery.paddingOf(context).bottom + 80,
+            ),
             itemCount: keys.length,
             itemBuilder: (context, index) {
               final key = keys[index];
@@ -169,11 +183,12 @@ class _WhisperSettingsPageState extends State<WhisperSettingsPage> {
             },
             separatorBuilder: (context, index) => divider,
           );
-        }),
+        },
+      ),
       Error(:var errMsg) => scrollErrorWidget(
-          errMsg: errMsg,
-          onReload: _controller.onReload,
-        ),
+        errMsg: errMsg,
+        onReload: _controller.onReload,
+      ),
     };
   }
 }
diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart
index 2e7ec66e7..e2c361404 100644
--- a/lib/plugin/pl_player/controller.dart
+++ b/lib/plugin/pl_player/controller.dart
@@ -343,8 +343,9 @@ class PlPlayerController {
   late final fullScreenGestureReverse = Pref.fullScreenGestureReverse;
 
   late final isRelative = Pref.useRelativeSlide;
-  late final offset =
-      isRelative ? Pref.sliderDuration / 100 : Pref.sliderDuration * 1000;
+  late final offset = isRelative
+      ? Pref.sliderDuration / 100
+      : Pref.sliderDuration * 1000;
 
   num get sliderScale =>
       isRelative ? duration.value.inMilliseconds * offset : offset;
@@ -353,17 +354,17 @@ class PlPlayerController {
   late PlayRepeat playRepeat = PlayRepeat.values[Pref.playRepeat];
 
   TextStyle get subTitleStyle => TextStyle(
-        height: 1.5,
-        fontSize:
-            16 * (isFullScreen.value ? subtitleFontScaleFS : subtitleFontScale),
-        letterSpacing: 0.1,
-        wordSpacing: 0.1,
-        color: Colors.white,
-        fontWeight: FontWeight.values[subtitleFontWeight],
-        backgroundColor: subtitleBgOpaticy == 0
-            ? null
-            : Colors.black.withValues(alpha: subtitleBgOpaticy),
-      );
+    height: 1.5,
+    fontSize:
+        16 * (isFullScreen.value ? subtitleFontScaleFS : subtitleFontScale),
+    letterSpacing: 0.1,
+    wordSpacing: 0.1,
+    color: Colors.white,
+    fontWeight: FontWeight.values[subtitleFontWeight],
+    backgroundColor: subtitleBgOpaticy == 0
+        ? null
+        : Colors.black.withValues(alpha: subtitleBgOpaticy),
+  );
 
   SubtitleViewConfiguration get subtitleViewConfiguration =>
       SubtitleViewConfiguration(
@@ -381,8 +382,8 @@ class PlPlayerController {
 
   void updateSubtitleStyle() {
     getPlayerKey?.call().currentState?.update(
-          subtitleViewConfiguration: subtitleViewConfiguration,
-        );
+      subtitleViewConfiguration: subtitleViewConfiguration,
+    );
   }
 
   void onUpdatePadding(EdgeInsets padding) {
@@ -439,8 +440,10 @@ class PlPlayerController {
     return _instance?.playerStatus.status.value;
   }
 
-  static Future<void> pauseIfExists(
-      {bool notify = true, bool isInterrupt = false}) async {
+  static Future<void> pauseIfExists({
+    bool notify = true,
+    bool isInterrupt = false,
+  }) async {
     if (_instance?.playerStatus.status.value == PlayerStatus.playing) {
       await _instance?.pause(notify: notify, isInterrupt: isInterrupt);
     }
@@ -454,8 +457,10 @@ class PlPlayerController {
     return _instance?.volume.value;
   }
 
-  static Future<void> setVolumeIfExists(double volumeNew,
-      {bool videoPlayerVolume = false}) async {
+  static Future<void> setVolumeIfExists(
+    double volumeNew, {
+    bool videoPlayerVolume = false,
+  }) async {
     await _instance?.setVolume(volumeNew, videoPlayerVolume: videoPlayerVolume);
   }
 
@@ -561,13 +566,16 @@ class PlPlayerController {
         return;
       }
       // 配置Player 音轨、字幕等等
-      _videoPlayerController =
-          await _createVideoController(dataSource, _looping, seekTo);
+      _videoPlayerController = await _createVideoController(
+        dataSource,
+        _looping,
+        seekTo,
+      );
       callback?.call();
       // 获取视频时长 00:00
       _duration.value = duration ?? _videoPlayerController!.state.duration;
-      _position.value =
-          _buffered.value = _sliderPosition.value = seekTo ?? Duration.zero;
+      _position.value = _buffered.value = _sliderPosition.value =
+          seekTo ?? Duration.zero;
       updateDurationSecond();
       updatePositionSecond();
       updateSliderPositionSecond();
@@ -603,8 +611,10 @@ class PlPlayerController {
       await shadersDirectory!.create(recursive: true);
     }
 
-    final shaderFiles = manifestMap.keys.where((String key) =>
-        key.startsWith('assets/shaders/') && key.endsWith('.glsl'));
+    final shaderFiles = manifestMap.keys.where(
+      (String key) =>
+          key.startsWith('assets/shaders/') && key.endsWith('.glsl'),
+    );
 
     // int copiedFilesCount = 0;
 
@@ -681,17 +691,18 @@ class PlPlayerController {
     _position.value = Duration.zero;
     // 初始化时清空弹幕，防止上次重叠
     danmakuController?.clear();
-    Player player = _videoPlayerController ??
+    Player player =
+        _videoPlayerController ??
         Player(
           configuration: PlayerConfiguration(
             // 默认缓冲 4M 大小
             bufferSize: Pref.expandBuffer
                 ? (videoType.value == 'live'
-                    ? 64 * 1024 * 1024
-                    : 32 * 1024 * 1024)
+                      ? 64 * 1024 * 1024
+                      : 32 * 1024 * 1024)
                 : (videoType.value == 'live'
-                    ? 16 * 1024 * 1024
-                    : 4 * 1024 * 1024),
+                      ? 16 * 1024 * 1024
+                      : 4 * 1024 * 1024),
           ),
         );
     var pp = player.platform as NativePlayer;
@@ -712,8 +723,9 @@ class PlPlayerController {
       );
       if (Platform.isAndroid) {
         await pp.setProperty("volume-max", "100");
-        String ao =
-            Pref.useOpenSLES ? "opensles,audiotrack" : "audiotrack,opensles";
+        String ao = Pref.useOpenSLES
+            ? "opensles,audiotrack"
+            : "audiotrack,opensles";
         await pp.setProperty("ao", ao);
       }
       // video-sync=display-resample
@@ -770,8 +782,11 @@ class PlPlayerController {
       );
     } else {
       await player.open(
-        Media(dataSource.videoSource!,
-            httpHeaders: dataSource.httpHeaders, start: seekTo),
+        Media(
+          dataSource.videoSource!,
+          httpHeaders: dataSource.httpHeaders,
+          start: seekTo,
+        ),
         play: false,
       );
     }
@@ -937,22 +952,28 @@ class PlPlayerController {
             //tcp: ffurl_read returned 0xdfb9b0bb
             //tcp: ffurl_read returned 0xffffff99
             event.startsWith('tcp: ffurl_read returned ')) {
-          EasyThrottle.throttle('videoPlayerController!.stream.error.listen',
-              const Duration(milliseconds: 10000), () {
-            Future.delayed(const Duration(milliseconds: 3000), () async {
-              if (kDebugMode) {
-                debugPrint("isBuffering.value: ${isBuffering.value}");
-              }
-              if (kDebugMode) debugPrint("_buffered.value: ${_buffered.value}");
-              if (isBuffering.value && _buffered.value == Duration.zero) {
-                SmartDialog.showToast('视频链接打开失败，重试中',
-                    displayTime: const Duration(milliseconds: 500));
-                if (!await refreshPlayer()) {
-                  if (kDebugMode) debugPrint("failed");
+          EasyThrottle.throttle(
+            'videoPlayerController!.stream.error.listen',
+            const Duration(milliseconds: 10000),
+            () {
+              Future.delayed(const Duration(milliseconds: 3000), () async {
+                if (kDebugMode) {
+                  debugPrint("isBuffering.value: ${isBuffering.value}");
                 }
-              }
-            });
-          });
+                if (kDebugMode)
+                  debugPrint("_buffered.value: ${_buffered.value}");
+                if (isBuffering.value && _buffered.value == Duration.zero) {
+                  SmartDialog.showToast(
+                    '视频链接打开失败，重试中',
+                    displayTime: const Duration(milliseconds: 500),
+                  );
+                  if (!await refreshPlayer()) {
+                    if (kDebugMode) debugPrint("failed");
+                  }
+                }
+              });
+            },
+          );
         } else if (event.startsWith('Could not open codec')) {
           SmartDialog.showToast('无法加载解码器, $event，可能会切换至软解');
         } else {
@@ -982,9 +1003,10 @@ class PlPlayerController {
       }),
       onPositionChanged.listen((Duration event) {
         EasyThrottle.throttle(
-            'mediaServicePosition',
-            const Duration(seconds: 1),
-            () => videoPlayerServiceHandler.onPositionChange(event));
+          'mediaServicePosition',
+          const Duration(seconds: 1),
+          () => videoPlayerServiceHandler.onPositionChange(event),
+        );
       }),
     };
   }
@@ -1027,8 +1049,9 @@ class PlPlayerController {
     } else {
       if (kDebugMode) debugPrint('seek duration else');
       _timerForSeek?.cancel();
-      _timerForSeek =
-          Timer.periodic(const Duration(milliseconds: 200), (Timer t) async {
+      _timerForSeek = Timer.periodic(const Duration(milliseconds: 200), (
+        Timer t,
+      ) async {
         //_timerForSeek = null;
         if (_playerCount.value == 0) {
           _timerForSeek?.cancel();
@@ -1174,8 +1197,10 @@ class PlPlayerController {
     } catch (_) {}
   }
 
-  Future<void> setVolume(double volumeNew,
-      {bool videoPlayerVolume = false}) async {
+  Future<void> setVolume(
+    double volumeNew, {
+    bool videoPlayerVolume = false,
+  }) async {
     if (volumeNew < 0.0) {
       volumeNew = 0.0;
     } else if (volumeNew > 1.0) {
@@ -1235,8 +1260,10 @@ class PlPlayerController {
 
   /// 缓存fit
   Future<void> setVideoFit() async {
-    SmartDialog.showToast(_videoFit.value.toast,
-        displayTime: const Duration(seconds: 1));
+    SmartDialog.showToast(
+      _videoFit.value.toast,
+      displayTime: const Duration(seconds: 1),
+    );
     video.put(VideoBoxKey.cacheVideoFit, _videoFit.value.index);
   }
 
@@ -1299,7 +1326,8 @@ class PlPlayerController {
         _longPressStatus.value = val;
         HapticFeedback.lightImpact();
         await setPlaybackSpeed(
-            enableAutoLongPressSpeed ? playbackSpeed * 2 : longPressSpeed);
+          enableAutoLongPressSpeed ? playbackSpeed * 2 : longPressSpeed,
+        );
       }
     } else {
       // if (kDebugMode) debugPrint('$playbackSpeed');
@@ -1385,8 +1413,9 @@ class PlPlayerController {
 
   /// 截屏
   Future<Uint8List?> screenshot() async {
-    final Uint8List? screenshot =
-        await _videoPlayerController!.screenshot(format: 'image/png');
+    final Uint8List? screenshot = await _videoPlayerController!.screenshot(
+      format: 'image/png',
+    );
     return screenshot;
   }
 
@@ -1419,7 +1448,8 @@ class PlPlayerController {
     if (videoType.value == 'live') {
       return;
     }
-    bool isComplete = playerStatus.status.value == PlayerStatus.completed ||
+    bool isComplete =
+        playerStatus.status.value == PlayerStatus.completed ||
         type == 'completed';
     if ((durationSeconds.value - position.value).inMilliseconds > 1000) {
       isComplete = false;
@@ -1539,14 +1569,17 @@ class PlPlayerController {
 
   void setContinuePlayInBackground() {
     _continuePlayInBackground.value = !_continuePlayInBackground.value;
-    setting.put(SettingBoxKey.continuePlayInBackground,
-        _continuePlayInBackground.value);
+    setting.put(
+      SettingBoxKey.continuePlayInBackground,
+      _continuePlayInBackground.value,
+    );
   }
 
   void setOnlyPlayAudio() {
     onlyPlayAudio.value = !onlyPlayAudio.value;
     videoPlayerController?.setVideoTrack(
-        onlyPlayAudio.value ? VideoTrack.no() : VideoTrack.auto());
+      onlyPlayAudio.value ? VideoTrack.no() : VideoTrack.auto(),
+    );
   }
 
   late final showSeekPreview = Pref.showSeekPreview;
@@ -1593,12 +1626,12 @@ extension BoxFitExt on BoxFit {
   String get desc => const ['拉伸', '自动', '裁剪', '等宽', '等高', '原始', '限制'][index];
 
   String get toast => const [
-        '拉伸至播放器尺寸，将产生变形（竖屏改为自动）',
-        '缩放至播放器尺寸，保留黑边',
-        '缩放至填满播放器，裁剪超出部分',
-        '缩放至撑满播放器宽度',
-        '缩放至撑满播放器高度',
-        '不缩放，以视频原始尺寸显示',
-        '仅超出时缩小至播放器尺寸',
-      ][index];
+    '拉伸至播放器尺寸，将产生变形（竖屏改为自动）',
+    '缩放至播放器尺寸，保留黑边',
+    '缩放至填满播放器，裁剪超出部分',
+    '缩放至撑满播放器宽度',
+    '缩放至撑满播放器高度',
+    '不缩放，以视频原始尺寸显示',
+    '仅超出时缩小至播放器尺寸',
+  ][index];
 }
diff --git a/lib/plugin/pl_player/models/bottom_progress_behavior.dart b/lib/plugin/pl_player/models/bottom_progress_behavior.dart
index 8db45c63a..0fdb94861 100644
--- a/lib/plugin/pl_player/models/bottom_progress_behavior.dart
+++ b/lib/plugin/pl_player/models/bottom_progress_behavior.dart
@@ -2,8 +2,7 @@ enum BtmProgressBehavior {
   alwaysShow('始终展示'),
   alwaysHide('始终隐藏'),
   onlyShowFullScreen('仅全屏时展示'),
-  onlyHideFullScreen('仅全屏时隐藏'),
-  ;
+  onlyHideFullScreen('仅全屏时隐藏');
 
   final String desc;
   const BtmProgressBehavior(this.desc);
diff --git a/lib/plugin/pl_player/models/data_source.dart b/lib/plugin/pl_player/models/data_source.dart
index 2fbc65b3b..2eecc5a1d 100644
--- a/lib/plugin/pl_player/models/data_source.dart
+++ b/lib/plugin/pl_player/models/data_source.dart
@@ -32,8 +32,9 @@ class DataSource {
     this.subFiles,
     required this.type,
     this.httpHeaders,
-  }) : assert((type == DataSourceType.file && file != null) ||
-            videoSource != null);
+  }) : assert(
+         (type == DataSourceType.file && file != null) || videoSource != null,
+       );
 
   DataSource copyWith({
     File? file,
diff --git a/lib/plugin/pl_player/models/fullscreen_mode.dart b/lib/plugin/pl_player/models/fullscreen_mode.dart
index 7eced72f4..9a17cb087 100644
--- a/lib/plugin/pl_player/models/fullscreen_mode.dart
+++ b/lib/plugin/pl_player/models/fullscreen_mode.dart
@@ -11,8 +11,7 @@ enum FullScreenMode {
   // 屏幕长宽比<1.25或为竖屏视频时竖屏，否则横屏
   ratio('屏幕长宽比<1.25或为竖屏视频时竖屏，否则横屏'),
   // 强制重力转屏（仅安卓）
-  gravity('忽略系统方向锁定，强制按重力转屏（仅安卓）'),
-  ;
+  gravity('忽略系统方向锁定，强制按重力转屏（仅安卓）');
 
   final String desc;
   const FullScreenMode(this.desc);
diff --git a/lib/plugin/pl_player/models/play_repeat.dart b/lib/plugin/pl_player/models/play_repeat.dart
index e01aa36c8..5ceaea91f 100644
--- a/lib/plugin/pl_player/models/play_repeat.dart
+++ b/lib/plugin/pl_player/models/play_repeat.dart
@@ -3,8 +3,7 @@ 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 4a4dfc5a2..af343724c 100644
--- a/lib/plugin/pl_player/models/play_speed.dart
+++ b/lib/plugin/pl_player/models/play_speed.dart
@@ -8,8 +8,7 @@ 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/utils.dart b/lib/plugin/pl_player/utils.dart
index 44f62da7b..122dfbf6e 100644
--- a/lib/plugin/pl_player/utils.dart
+++ b/lib/plugin/pl_player/utils.dart
@@ -8,8 +8,9 @@ String printDuration(Duration? duration) {
   String twoDigits(int n) => n.toString().padLeft(2, "0");
 
   String twoDigitMinutes = twoDigits(duration.inMinutes).replaceAll("-", "");
-  String twoDigitSeconds =
-      twoDigits(duration.inSeconds.remainder(60)).replaceAll("-", "");
+  String twoDigitSeconds = twoDigits(
+    duration.inSeconds.remainder(60),
+  ).replaceAll("-", "");
   //customDebugPrint(duration.inSeconds.remainder(60));
   return "$twoDigitMinutes:$twoDigitSeconds";
 }
diff --git a/lib/plugin/pl_player/utils/fullscreen.dart b/lib/plugin/pl_player/utils/fullscreen.dart
index 6459e8b23..f62b9707a 100644
--- a/lib/plugin/pl_player/utils/fullscreen.dart
+++ b/lib/plugin/pl_player/utils/fullscreen.dart
@@ -16,8 +16,9 @@ Future<void> landScape() async {
     } else if (Platform.isAndroid || Platform.isIOS) {
       await AutoOrientation.landscapeAutoMode(forceSensor: true);
     } else if (Platform.isMacOS || Platform.isWindows || Platform.isLinux) {
-      await const MethodChannel('com.alexmercerind/media_kit_video')
-          .invokeMethod(
+      await const MethodChannel(
+        'com.alexmercerind/media_kit_video',
+      ).invokeMethod(
         'Utils.EnterNativeFullscreen',
       );
     }
@@ -84,8 +85,9 @@ Future<void> showStatusBar() async {
         overlays: SystemUiOverlay.values,
       );
     } else if (Platform.isMacOS || Platform.isWindows || Platform.isLinux) {
-      await const MethodChannel('com.alexmercerind/media_kit_video')
-          .invokeMethod(
+      await const MethodChannel(
+        'com.alexmercerind/media_kit_video',
+      ).invokeMethod(
         'Utils.ExitNativeFullscreen',
       );
     }
diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart
index fd539eaec..91b7e84eb 100644
--- a/lib/plugin/pl_player/view.dart
+++ b/lib/plugin/pl_player/view.dart
@@ -165,7 +165,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     super.initState();
     plPlayerController.getPlayerKey = () => key;
     animationController = AnimationController(
-        vsync: this, duration: const Duration(milliseconds: 100));
+      vsync: this,
+      duration: const Duration(milliseconds: 100),
+    );
     videoController = plPlayerController.videoController!;
     videoIntroController = widget.videoIntroController;
     pgcIntroController = widget.pgcIntroController;
@@ -193,13 +195,12 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     Future.microtask(() async {
       try {
         _brightnessValue.value = await ScreenBrightness().application;
-        _listener = ScreenBrightness()
-            .onApplicationScreenBrightnessChanged
+        _listener = ScreenBrightness().onApplicationScreenBrightnessChanged
             .listen((double value) {
-          if (mounted) {
-            _brightnessValue.value = value;
-          }
-        });
+              if (mounted) {
+                _brightnessValue.value = value;
+              }
+            });
       } catch (_) {}
     });
   }
@@ -321,7 +322,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
           Obx(() {
             return Text(
               DurationUtil.formatDuration(
-                  plPlayerController.positionSeconds.value),
+                plPlayerController.positionSeconds.value,
+              ),
               style: const TextStyle(
                 color: Colors.white,
                 fontSize: 10,
@@ -333,7 +335,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
           Obx(
             () => Text(
               DurationUtil.formatDuration(
-                  plPlayerController.durationSeconds.value.inSeconds),
+                plPlayerController.durationSeconds.value.inSeconds,
+              ),
               style: const TextStyle(
                 color: Color(0xFFD0D0D0),
                 fontSize: 10,
@@ -346,43 +349,45 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
       ),
 
       /// 高能进度条
-      BottomControlType.dmChart: Obx(() => plPlayerController.dmTrend.isEmpty
-          ? const SizedBox.shrink()
-          : Container(
-              width: widgetWidth,
-              height: 30,
-              alignment: Alignment.center,
-              child: ComBtn(
-                icon: plPlayerController.showDmTreandChart.value
-                    ? const Icon(
-                        Icons.show_chart,
-                        size: 22,
-                        color: Colors.white,
-                      )
-                    : const Stack(
-                        clipBehavior: Clip.none,
-                        alignment: Alignment.center,
-                        children: [
-                          Icon(
-                            Icons.show_chart,
-                            size: 22,
-                            color: Colors.white,
-                          ),
-                          Icon(
-                            Icons.hide_source,
-                            size: 22,
-                            color: Colors.white,
-                          ),
-                        ],
-                      ),
-                onTap: () => plPlayerController.showDmTreandChart.value =
-                    !plPlayerController.showDmTreandChart.value,
+      BottomControlType.dmChart: Obx(
+        () => plPlayerController.dmTrend.isEmpty
+            ? const SizedBox.shrink()
+            : Container(
+                width: widgetWidth,
+                height: 30,
+                alignment: Alignment.center,
+                child: ComBtn(
+                  icon: plPlayerController.showDmTreandChart.value
+                      ? const Icon(
+                          Icons.show_chart,
+                          size: 22,
+                          color: Colors.white,
+                        )
+                      : const Stack(
+                          clipBehavior: Clip.none,
+                          alignment: Alignment.center,
+                          children: [
+                            Icon(
+                              Icons.show_chart,
+                              size: 22,
+                              color: Colors.white,
+                            ),
+                            Icon(
+                              Icons.hide_source,
+                              size: 22,
+                              color: Colors.white,
+                            ),
+                          ],
+                        ),
+                  onTap: () => plPlayerController.showDmTreandChart.value =
+                      !plPlayerController.showDmTreandChart.value,
+                ),
               ),
-            )),
+      ),
 
       /// 超分辨率
-      BottomControlType.superResolution: Get.parameters['type'] == '1' ||
-              Get.parameters['type'] == '4'
+      BottomControlType.superResolution:
+          Get.parameters['type'] == '1' || Get.parameters['type'] == '4'
           ? Container(
               height: 30,
               margin: const EdgeInsets.symmetric(horizontal: 10),
@@ -392,8 +397,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     .values[plPlayerController.superResolutionType],
                 color: Colors.black.withValues(alpha: 0.8),
                 itemBuilder: (BuildContext context) {
-                  return SuperResolutionType.values
-                      .map((SuperResolutionType type) {
+                  return SuperResolutionType.values.map((
+                    SuperResolutionType type,
+                  ) {
                     return PopupMenuItem<SuperResolutionType>(
                       height: 35,
                       padding: const EdgeInsets.only(left: 30),
@@ -401,15 +407,18 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                       onTap: () => plPlayerController.setShader(type.index),
                       child: Text(
                         type.title,
-                        style:
-                            const TextStyle(color: Colors.white, fontSize: 13),
+                        style: const TextStyle(
+                          color: Colors.white,
+                          fontSize: 13,
+                        ),
                       ),
                     );
                   }).toList();
                 },
                 child: Text(
                   SuperResolutionType
-                      .values[plPlayerController.superResolutionType].title,
+                      .values[plPlayerController.superResolutionType]
+                      .title,
                   style: const TextStyle(color: Colors.white, fontSize: 13),
                 ),
               ),
@@ -537,7 +546,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                 height: 30,
                 child: PopupMenuButton<int>(
                   initialValue: widget
-                      .videoDetailController!.vttSubtitlesIndex.value
+                      .videoDetailController!
+                      .vttSubtitlesIndex
+                      .value
                       .clamp(0, widget.videoDetailController!.subtitles.length),
                   color: Colors.black.withValues(alpha: 0.8),
                   itemBuilder: (BuildContext context) {
@@ -551,8 +562,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                           style: TextStyle(color: Colors.white),
                         ),
                       ),
-                      ...widget.videoDetailController!.subtitles.indexed
-                          .map((e) {
+                      ...widget.videoDetailController!.subtitles.indexed.map((
+                        e,
+                      ) {
                         return PopupMenuItem<int>(
                           value: e.$1 + 1,
                           onTap: () => widget.videoDetailController!
@@ -562,7 +574,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                             style: const TextStyle(color: Colors.white),
                           ),
                         );
-                      })
+                      }),
                     ];
                   },
                   child: Container(
@@ -606,9 +618,11 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                 );
               }).toList();
             },
-            child: Text("${plPlayerController.playbackSpeed}X",
-                style: const TextStyle(color: Colors.white, fontSize: 13),
-                semanticsLabel: "${plPlayerController.playbackSpeed}倍速"),
+            child: Text(
+              "${plPlayerController.playbackSpeed}X",
+              style: const TextStyle(color: Colors.white, fontSize: 13),
+              semanticsLabel: "${plPlayerController.playbackSpeed}倍速",
+            ),
           ),
         ),
       ),
@@ -798,13 +812,15 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     final int curSliderPosition =
                         plPlayerController.sliderPosition.value.inMilliseconds;
                     final Duration pos = Duration(
-                        milliseconds: curSliderPosition +
-                            (plPlayerController.sliderScale *
-                                    delta.dx /
-                                    maxWidth)
-                                .round()); // TODO
+                      milliseconds:
+                          curSliderPosition +
+                          (plPlayerController.sliderScale * delta.dx / maxWidth)
+                              .round(),
+                    ); // TODO
                     final Duration result = pos.clamp(
-                        Duration.zero, plPlayerController.duration.value);
+                      Duration.zero,
+                      plPlayerController.duration.value,
+                    );
                     final height = maxHeight * 0.125;
                     if (details.localFocalPoint.dy <= height &&
                         (details.localFocalPoint.dx >= maxWidth * 0.875 ||
@@ -822,10 +838,13 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                           maskColor: Colors.transparent,
                           builder: (context) => Container(
                             padding: const EdgeInsets.symmetric(
-                                horizontal: 8, vertical: 4),
+                              horizontal: 8,
+                              vertical: 4,
+                            ),
                             decoration: BoxDecoration(
-                              borderRadius:
-                                  const BorderRadius.all(Radius.circular(6)),
+                              borderRadius: const BorderRadius.all(
+                                Radius.circular(6),
+                              ),
                               color: theme.colorScheme.secondaryContainer,
                             ),
                             child: Text(
@@ -852,9 +871,11 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                       try {
                         plPlayerController.previewDx.value =
                             result.inMilliseconds /
-                                plPlayerController
-                                    .durationSeconds.value.inMilliseconds *
-                                maxWidth;
+                            plPlayerController
+                                .durationSeconds
+                                .value
+                                .inMilliseconds *
+                            maxWidth;
                         if (!plPlayerController.showPreview.value) {
                           plPlayerController.showPreview.value = true;
                         }
@@ -882,7 +903,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                       if (isFullScreen ^
                           plPlayerController.fullScreenGestureReverse) {
                         fullScreenTrigger(
-                            plPlayerController.fullScreenGestureReverse);
+                          plPlayerController.fullScreenGestureReverse,
+                        );
                       }
                       // if (kDebugMode) debugPrint('center_down:$cumulativeDy');
                     } else if (cumulativeDy < -threshold) {
@@ -890,7 +912,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                       if (!isFullScreen ^
                           plPlayerController.fullScreenGestureReverse) {
                         fullScreenTrigger(
-                            !plPlayerController.fullScreenGestureReverse);
+                          !plPlayerController.fullScreenGestureReverse,
+                        );
                       }
                       // if (kDebugMode) debugPrint('center_up:$cumulativeDy');
                     }
@@ -898,12 +921,15 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     // 右边区域
                     final double level = maxHeight * 0.5;
                     EasyThrottle.throttle(
-                        'setVolume', const Duration(milliseconds: 20), () {
-                      final double volume =
-                          _volumeValue.value - delta.dy / level;
-                      final double result = volume.clamp(0.0, 1.0);
-                      setVolume(result);
-                    });
+                      'setVolume',
+                      const Duration(milliseconds: 20),
+                      () {
+                        final double volume =
+                            _volumeValue.value - delta.dy / level;
+                        final double result = volume.clamp(0.0, 1.0);
+                        setVolume(result);
+                      },
+                    );
                   }
                 },
                 onInteractionEnd: (ScaleEndDetails details) {
@@ -994,7 +1020,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                       if (isFullScreen ^
                           plPlayerController.fullScreenGestureReverse) {
                         fullScreenTrigger(
-                            plPlayerController.fullScreenGestureReverse);
+                          plPlayerController.fullScreenGestureReverse,
+                        );
                       }
                       // if (kDebugMode) debugPrint('center_down:$cumulativeDy');
                     } else if (cumulativeDy < -threshold) {
@@ -1002,7 +1029,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                       if (!isFullScreen ^
                           plPlayerController.fullScreenGestureReverse) {
                         fullScreenTrigger(
-                            !plPlayerController.fullScreenGestureReverse);
+                          !plPlayerController.fullScreenGestureReverse,
+                        );
                       }
                       // if (kDebugMode)   debugPrint('center_up:$cumulativeDy');
                     }
@@ -1010,12 +1038,15 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     // 右边区域
                     final double level = maxHeight * 0.5;
                     EasyThrottle.throttle(
-                        'setVolume', const Duration(milliseconds: 20), () {
-                      final double volume =
-                          _volumeValue.value - details.delta.dy / level;
-                      final double result = volume.clamp(0.0, 1.0);
-                      setVolume(result);
-                    });
+                      'setVolume',
+                      const Duration(milliseconds: 20),
+                      () {
+                        final double volume =
+                            _volumeValue.value - details.delta.dy / level;
+                        final double result = volume.clamp(0.0, 1.0);
+                        setVolume(result);
+                      },
+                    );
                   }
                 },
                 onVerticalDragEnd: (details) {
@@ -1070,8 +1101,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                   translation: const Offset(0.0, 0.3), // 上下偏移量（负数向上偏移）
                   child: AnimatedOpacity(
                     curve: Curves.easeInOut,
-                    opacity:
-                        plPlayerController.longPressStatus.value ? 1.0 : 0.0,
+                    opacity: plPlayerController.longPressStatus.value
+                        ? 1.0
+                        : 0.0,
                     duration: const Duration(milliseconds: 150),
                     child: Container(
                       alignment: Alignment.center,
@@ -1086,7 +1118,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                           () => Text(
                             '${plPlayerController.enableAutoLongPressSpeed ? (plPlayerController.longPressStatus.value ? plPlayerController.lastPlaybackSpeed : plPlayerController.playbackSpeed) * 2 : plPlayerController.longPressSpeed}倍速中',
                             style: const TextStyle(
-                                color: Colors.white, fontSize: 13),
+                              color: Colors.white,
+                              fontSize: 13,
+                            ),
                           ),
                         ),
                       ),
@@ -1106,8 +1140,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                   child: Obx(
                     () => AnimatedOpacity(
                       curve: Curves.easeInOut,
-                      opacity:
-                          plPlayerController.isSliderMoving.value ? 1.0 : 0.0,
+                      opacity: plPlayerController.isSliderMoving.value
+                          ? 1.0
+                          : 0.0,
                       duration: const Duration(milliseconds: 150),
                       child: IntrinsicWidth(
                         child: Container(
@@ -1123,8 +1158,12 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                             children: [
                               Obx(() {
                                 return Text(
-                                  DurationUtil.formatDuration(plPlayerController
-                                      .sliderTempPosition.value.inSeconds),
+                                  DurationUtil.formatDuration(
+                                    plPlayerController
+                                        .sliderTempPosition
+                                        .value
+                                        .inSeconds,
+                                  ),
                                   style: textStyle,
                                 );
                               }),
@@ -1138,7 +1177,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                                   return Text(
                                     durationSeconds.inMinutes >= 60
                                         ? printDurationWithHours(
-                                            durationSeconds)
+                                            durationSeconds,
+                                          )
                                         : printDuration(durationSeconds),
                                     style: textStyle,
                                   );
@@ -1166,7 +1206,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     duration: const Duration(milliseconds: 150),
                     child: Container(
                       padding: const EdgeInsets.symmetric(
-                          horizontal: 8, vertical: 5),
+                        horizontal: 8,
+                        vertical: 5,
+                      ),
                       decoration: const BoxDecoration(
                         color: Color(0x88000000),
                         borderRadius: BorderRadius.all(Radius.circular(64)),
@@ -1179,8 +1221,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                             _volumeValue.value == 0.0
                                 ? Icons.volume_off
                                 : _volumeValue.value < 0.5
-                                    ? Icons.volume_down
-                                    : Icons.volume_up,
+                                ? Icons.volume_down
+                                : Icons.volume_up,
                             color: Colors.white,
                             size: 20.0,
                           ),
@@ -1212,7 +1254,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     duration: const Duration(milliseconds: 150),
                     child: Container(
                       padding: const EdgeInsets.symmetric(
-                          horizontal: 8, vertical: 5),
+                        horizontal: 8,
+                        vertical: 5,
+                      ),
                       decoration: const BoxDecoration(
                         color: Color(0x88000000),
                         borderRadius: BorderRadius.all(Radius.circular(64)),
@@ -1225,8 +1269,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                             _brightnessValue.value < 1.0 / 3.0
                                 ? Icons.brightness_low
                                 : _brightnessValue.value < 2.0 / 3.0
-                                    ? Icons.brightness_medium
-                                    : Icons.brightness_high,
+                                ? Icons.brightness_medium
+                                : Icons.brightness_high,
                             color: Colors.white,
                             size: 18.0,
                           ),
@@ -1249,7 +1293,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
             // 头部、底部控制条
             Obx(
               () {
-                final visible = !plPlayerController.controlsLock.value &&
+                final visible =
+                    !plPlayerController.controlsLock.value &&
                     plPlayerController.showControls.value;
                 return Positioned.fill(
                   child: ClipRect(
@@ -1266,7 +1311,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                           controller: animationController,
                           visible: visible,
                           position: 'bottom',
-                          child: widget.bottomControl ??
+                          child:
+                              widget.bottomControl ??
                               BottomControl(
                                 controller: plPlayerController,
                                 buildBottomControl: buildBottomControl,
@@ -1295,9 +1341,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
             //     child: const Text('scale'),
             //   ),
             // ),
-
             Obx(
-              () => showRestoreScaleBtn.value &&
+              () =>
+                  showRestoreScaleBtn.value &&
                       plPlayerController.showControls.value
                   ? Align(
                       alignment: Alignment.bottomCenter,
@@ -1307,13 +1353,15 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                           style: FilledButton.styleFrom(
                             tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                             backgroundColor: theme
-                                .colorScheme.secondaryContainer
+                                .colorScheme
+                                .secondaryContainer
                                 .withValues(alpha: 0.8),
                             visualDensity: VisualDensity.compact,
                             padding: const EdgeInsets.all(15),
                             shape: const RoundedRectangleBorder(
-                              borderRadius:
-                                  BorderRadius.all(Radius.circular(6)),
+                              borderRadius: BorderRadius.all(
+                                Radius.circular(6),
+                              ),
                             ),
                           ),
                           onPressed: () async {
@@ -1322,13 +1370,15 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                               vsync: this,
                               duration: const Duration(milliseconds: 255),
                             );
-                            final anim = Matrix4Tween(
-                              begin: transformationController.value,
-                              end: Matrix4.identity(),
-                            ).animate(
-                              CurveTween(curve: Curves.easeOut)
-                                  .animate(animController),
-                            );
+                            final anim =
+                                Matrix4Tween(
+                                  begin: transformationController.value,
+                                  end: Matrix4.identity(),
+                                ).animate(
+                                  CurveTween(
+                                    curve: Curves.easeOut,
+                                  ).animate(animController),
+                                );
                             void listener() {
                               transformationController.value = anim.value;
                             }
@@ -1382,114 +1432,115 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                 }
 
                 return Positioned(
-                    bottom: -2.2,
-                    left: 0,
-                    right: 0,
-                    child: Semantics(
-                      // label: '${(value / max * 100).round()}%',
-                      value: '${(value / max * 100).round()}%',
-                      // enabled: false,
-                      child: Stack(
-                        clipBehavior: Clip.none,
-                        alignment: Alignment.bottomCenter,
-                        children: [
-                          if (plPlayerController.dmTrend.isNotEmpty &&
-                              plPlayerController.showDmTreandChart.value)
-                            buildDmChart(theme, plPlayerController),
-                          if (plPlayerController.viewPointList.isNotEmpty &&
-                              plPlayerController.showVP.value)
-                            buildViewPointWidget(plPlayerController, 4.25),
-                          IgnorePointer(
-                            child: ProgressBar(
-                              progress: Duration(seconds: value),
-                              buffered: Duration(seconds: buffer),
-                              total: Duration(seconds: max),
-                              progressBarColor: primary,
-                              baseBarColor: Colors.white.withValues(alpha: 0.2),
-                              bufferedBarColor: primary.withValues(alpha: 0.4),
-                              timeLabelLocation: TimeLabelLocation.none,
-                              thumbColor: primary,
-                              barHeight: 3.5,
-                              thumbRadius:
-                                  draggingFixedProgressBar.value ? 7 : 2.5,
-                              // onDragStart: (duration) {
-                              //   feedBack();
-                              //   plPlayerController.onChangedSliderStart();
-                              // },
-                              // onDragUpdate: (duration) {
-                              //   plPlayerController
-                              //       .onUpdatedSliderProgress(duration.timeStamp);
-                              //   if (plPlayerController.showSeekPreview) {
-                              //     if (plPlayerController.showPreview.value.not) {
-                              //       plPlayerController.showPreview.value = true;
-                              //     }
-                              //     plPlayerController.previewDx.value =
-                              //         duration.localPosition.dx;
-                              //   }
-                              // },
-                              // onSeek: (duration) {
-                              //   if (plPlayerController.showSeekPreview) {
-                              //     plPlayerController.showPreview.value = false;
-                              //   }
-                              //   plPlayerController.onChangedSliderEnd();
-                              //   plPlayerController
-                              //       .onChangedSlider(duration.inSeconds.toDouble());
-                              //   plPlayerController.seekTo(
-                              //       Duration(seconds: duration.inSeconds),
-                              //       type: 'slider');
-                              // },
+                  bottom: -2.2,
+                  left: 0,
+                  right: 0,
+                  child: Semantics(
+                    // label: '${(value / max * 100).round()}%',
+                    value: '${(value / max * 100).round()}%',
+                    // enabled: false,
+                    child: Stack(
+                      clipBehavior: Clip.none,
+                      alignment: Alignment.bottomCenter,
+                      children: [
+                        if (plPlayerController.dmTrend.isNotEmpty &&
+                            plPlayerController.showDmTreandChart.value)
+                          buildDmChart(theme, plPlayerController),
+                        if (plPlayerController.viewPointList.isNotEmpty &&
+                            plPlayerController.showVP.value)
+                          buildViewPointWidget(plPlayerController, 4.25),
+                        IgnorePointer(
+                          child: ProgressBar(
+                            progress: Duration(seconds: value),
+                            buffered: Duration(seconds: buffer),
+                            total: Duration(seconds: max),
+                            progressBarColor: primary,
+                            baseBarColor: Colors.white.withValues(alpha: 0.2),
+                            bufferedBarColor: primary.withValues(alpha: 0.4),
+                            timeLabelLocation: TimeLabelLocation.none,
+                            thumbColor: primary,
+                            barHeight: 3.5,
+                            thumbRadius: draggingFixedProgressBar.value
+                                ? 7
+                                : 2.5,
+                            // onDragStart: (duration) {
+                            //   feedBack();
+                            //   plPlayerController.onChangedSliderStart();
+                            // },
+                            // onDragUpdate: (duration) {
+                            //   plPlayerController
+                            //       .onUpdatedSliderProgress(duration.timeStamp);
+                            //   if (plPlayerController.showSeekPreview) {
+                            //     if (plPlayerController.showPreview.value.not) {
+                            //       plPlayerController.showPreview.value = true;
+                            //     }
+                            //     plPlayerController.previewDx.value =
+                            //         duration.localPosition.dx;
+                            //   }
+                            // },
+                            // onSeek: (duration) {
+                            //   if (plPlayerController.showSeekPreview) {
+                            //     plPlayerController.showPreview.value = false;
+                            //   }
+                            //   plPlayerController.onChangedSliderEnd();
+                            //   plPlayerController
+                            //       .onChangedSlider(duration.inSeconds.toDouble());
+                            //   plPlayerController.seekTo(
+                            //       Duration(seconds: duration.inSeconds),
+                            //       type: 'slider');
+                            // },
+                          ),
+                        ),
+                        if (plPlayerController.segmentList.isNotEmpty)
+                          Positioned(
+                            left: 0,
+                            right: 0,
+                            bottom: 0.75,
+                            child: IgnorePointer(
+                              child: CustomPaint(
+                                size: const Size(double.infinity, 3.5),
+                                painter: SegmentProgressBar(
+                                  segmentColors: plPlayerController.segmentList,
+                                ),
+                              ),
                             ),
                           ),
-                          if (plPlayerController.segmentList.isNotEmpty)
-                            Positioned(
-                              left: 0,
-                              right: 0,
-                              bottom: 0.75,
-                              child: IgnorePointer(
-                                child: CustomPaint(
-                                  size: const Size(double.infinity, 3.5),
-                                  painter: SegmentProgressBar(
-                                    segmentColors:
-                                        plPlayerController.segmentList,
-                                  ),
+                        if (plPlayerController.viewPointList.isNotEmpty &&
+                            plPlayerController.showVP.value)
+                          Positioned(
+                            left: 0,
+                            right: 0,
+                            bottom: 0.75,
+                            child: IgnorePointer(
+                              child: CustomPaint(
+                                size: const Size(double.infinity, 3.5),
+                                painter: SegmentProgressBar(
+                                  segmentColors:
+                                      plPlayerController.viewPointList,
                                 ),
                               ),
                             ),
-                          if (plPlayerController.viewPointList.isNotEmpty &&
-                              plPlayerController.showVP.value)
-                            Positioned(
-                              left: 0,
-                              right: 0,
-                              bottom: 0.75,
-                              child: IgnorePointer(
-                                child: CustomPaint(
-                                  size: const Size(double.infinity, 3.5),
-                                  painter: SegmentProgressBar(
-                                    segmentColors:
-                                        plPlayerController.viewPointList,
-                                  ),
-                                ),
-                              ),
-                            ),
-                          if (plPlayerController.showSeekPreview)
-                            Positioned(
-                              left: 0,
-                              right: 0,
-                              bottom: 12,
-                              child: buildSeekPreviewWidget(plPlayerController),
-                            ),
-                        ],
-                      ),
-                      // SlideTransition(
-                      //     position: Tween<Offset>(
-                      //       begin: Offset.zero,
-                      //       end: const Offset(0, -1),
-                      //     ).animate(CurvedAnimation(
-                      //       parent: animationController,
-                      //       curve: Curves.easeInOut,
-                      //     )),
-                      //     child: ),
-                    ));
+                          ),
+                        if (plPlayerController.showSeekPreview)
+                          Positioned(
+                            left: 0,
+                            right: 0,
+                            bottom: 12,
+                            child: buildSeekPreviewWidget(plPlayerController),
+                          ),
+                      ],
+                    ),
+                    // SlideTransition(
+                    //     position: Tween<Offset>(
+                    //       begin: Offset.zero,
+                    //       end: const Offset(0, -1),
+                    //     ).animate(CurvedAnimation(
+                    //       parent: animationController,
+                    //       curve: Curves.easeInOut,
+                    //     )),
+                    //     child: ),
+                  ),
+                );
               },
             ),
 
@@ -1497,14 +1548,16 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
             SafeArea(
               child: Obx(
                 () => Visibility(
-                  visible: plPlayerController.videoType.value != 'live' &&
+                  visible:
+                      plPlayerController.videoType.value != 'live' &&
                       isFullScreen,
                   child: Align(
                     alignment: Alignment.centerLeft,
                     child: FractionalTranslation(
                       translation: const Offset(1, -0.4),
                       child: Visibility(
-                        visible: plPlayerController.showControls.value &&
+                        visible:
+                            plPlayerController.showControls.value &&
                             (isFullScreen ||
                                 plPlayerController.controlsLock.value),
                         child: DecoratedBox(
@@ -1519,13 +1572,14 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                                   : FontAwesomeIcons.lockOpen,
                               semanticLabel:
                                   plPlayerController.controlsLock.value
-                                      ? '解锁'
-                                      : '锁定',
+                                  ? '解锁'
+                                  : '锁定',
                               size: 15,
                               color: Colors.white,
                             ),
                             onTap: () => plPlayerController.onLockControl(
-                                !plPlayerController.controlsLock.value),
+                              !plPlayerController.controlsLock.value,
+                            ),
                           ),
                         ),
                       ),
@@ -1562,56 +1616,61 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                             plPlayerController.videoPlayerController
                                 ?.screenshot(format: 'image/png')
                                 .then((value) {
-                              if (value != null && context.mounted) {
-                                SmartDialog.showToast('点击弹窗保存截图');
-                                showDialog(
-                                  context: context,
-                                  builder: (BuildContext context) {
-                                    return AlertDialog(
-                                      // title: const Text('点击保存'),
-                                      titlePadding: EdgeInsets.zero,
-                                      contentPadding: const EdgeInsets.all(8),
-                                      insetPadding: EdgeInsets.only(
-                                          left: context.width / 2),
-                                      //移除圆角
-                                      shape: const RoundedRectangleBorder(),
-                                      content: GestureDetector(
-                                        onTap: () async {
-                                          String name =
-                                              DateTime.now().toString();
-                                          final SaveResult result =
-                                              await SaverGallery.saveImage(
-                                            value,
-                                            fileName: name,
-                                            androidRelativePath:
-                                                "Pictures/Screenshots",
-                                            skipIfExists: false,
-                                          );
-
-                                          if (result.isSuccess) {
-                                            Get.back();
-                                            SmartDialog.showToast(
-                                                '$name.png已保存到相册/截图');
-                                          } else {
-                                            await SmartDialog.showToast(
-                                                '保存失败，${result.errorMessage}');
-                                          }
-                                        },
-                                        child: ConstrainedBox(
-                                          constraints: BoxConstraints(
-                                            maxWidth: maxWidth / 3,
-                                            maxHeight: maxHeight / 3,
+                                  if (value != null && context.mounted) {
+                                    SmartDialog.showToast('点击弹窗保存截图');
+                                    showDialog(
+                                      context: context,
+                                      builder: (BuildContext context) {
+                                        return AlertDialog(
+                                          // title: const Text('点击保存'),
+                                          titlePadding: EdgeInsets.zero,
+                                          contentPadding: const EdgeInsets.all(
+                                            8,
                                           ),
-                                          child: Image.memory(value),
-                                        ),
-                                      ),
+                                          insetPadding: EdgeInsets.only(
+                                            left: context.width / 2,
+                                          ),
+                                          //移除圆角
+                                          shape: const RoundedRectangleBorder(),
+                                          content: GestureDetector(
+                                            onTap: () async {
+                                              String name = DateTime.now()
+                                                  .toString();
+                                              final SaveResult result =
+                                                  await SaverGallery.saveImage(
+                                                    value,
+                                                    fileName: name,
+                                                    androidRelativePath:
+                                                        "Pictures/Screenshots",
+                                                    skipIfExists: false,
+                                                  );
+
+                                              if (result.isSuccess) {
+                                                Get.back();
+                                                SmartDialog.showToast(
+                                                  '$name.png已保存到相册/截图',
+                                                );
+                                              } else {
+                                                await SmartDialog.showToast(
+                                                  '保存失败，${result.errorMessage}',
+                                                );
+                                              }
+                                            },
+                                            child: ConstrainedBox(
+                                              constraints: BoxConstraints(
+                                                maxWidth: maxWidth / 3,
+                                                maxHeight: maxHeight / 3,
+                                              ),
+                                              child: Image.memory(value),
+                                            ),
+                                          ),
+                                        );
+                                      },
                                     );
-                                  },
-                                );
-                              } else {
-                                SmartDialog.showToast('截图失败');
-                              }
-                            });
+                                  } else {
+                                    SmartDialog.showToast('截图失败');
+                                  }
+                                });
                           },
                         ),
                       ),
@@ -1625,41 +1684,51 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
               if (plPlayerController.dataStatus.loading ||
                   plPlayerController.isBuffering.value) {
                 return Center(
-                    child: GestureDetector(
-                        onTap: plPlayerController.refreshPlayer,
-                        child: Container(
-                          padding: const EdgeInsets.all(30),
-                          decoration: const BoxDecoration(
-                            shape: BoxShape.circle,
-                            gradient: RadialGradient(
-                              colors: [Colors.black26, Colors.transparent],
-                            ),
+                  child: GestureDetector(
+                    onTap: plPlayerController.refreshPlayer,
+                    child: Container(
+                      padding: const EdgeInsets.all(30),
+                      decoration: const BoxDecoration(
+                        shape: BoxShape.circle,
+                        gradient: RadialGradient(
+                          colors: [Colors.black26, Colors.transparent],
+                        ),
+                      ),
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Image.asset(
+                            'assets/images/loading.gif',
+                            height: 25,
+                            semanticLabel: "加载中",
                           ),
-                          child:
-                              Column(mainAxisSize: MainAxisSize.min, children: [
-                            Image.asset(
-                              'assets/images/loading.gif',
-                              height: 25,
-                              semanticLabel: "加载中",
-                            ),
-                            if (plPlayerController.isBuffering.value)
-                              Obx(() {
-                                if (plPlayerController.buffered.value ==
-                                    Duration.zero) {
-                                  return const Text('加载中...',
-                                      style: TextStyle(
-                                          color: Colors.white, fontSize: 12));
-                                }
-                                String bufferStr =
-                                    plPlayerController.buffered.toString();
-                                return Text(
-                                  bufferStr.substring(0, bufferStr.length - 3),
-                                  style: const TextStyle(
-                                      color: Colors.white, fontSize: 12),
+                          if (plPlayerController.isBuffering.value)
+                            Obx(() {
+                              if (plPlayerController.buffered.value ==
+                                  Duration.zero) {
+                                return const Text(
+                                  '加载中...',
+                                  style: TextStyle(
+                                    color: Colors.white,
+                                    fontSize: 12,
+                                  ),
                                 );
-                              }),
-                          ]),
-                        )));
+                              }
+                              String bufferStr = plPlayerController.buffered
+                                  .toString();
+                              return Text(
+                                bufferStr.substring(0, bufferStr.length - 3),
+                                style: const TextStyle(
+                                  color: Colors.white,
+                                  fontSize: 12,
+                                ),
+                              );
+                            }),
+                        ],
+                      ),
+                    ),
+                  ),
+                );
               } else {
                 return const SizedBox.shrink();
               }
@@ -1667,7 +1736,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
 
             /// 点击 快进/快退
             Obx(
-              () => _mountSeekBackwardButton.value ||
+              () =>
+                  _mountSeekBackwardButton.value ||
                       _mountSeekForwardButton.value
                   ? Positioned.fill(
                       child: Row(
@@ -1761,7 +1831,8 @@ Widget buildDmChart(
     child: Container(
       height: 12,
       margin: EdgeInsets.only(
-        bottom: plPlayerController.viewPointList.isNotEmpty &&
+        bottom:
+            plPlayerController.viewPointList.isNotEmpty &&
                 plPlayerController.showVP.value
             ? 20.25 + offset
             : 4.25 + offset,
@@ -1819,7 +1890,8 @@ Widget buildSeekPreviewWidget(PlPlayerController plPlayerController) {
       return LayoutBuilder(
         builder: (context, constraints) {
           try {
-            double scale = plPlayerController.isFullScreen.value &&
+            double scale =
+                plPlayerController.isFullScreen.value &&
                     plPlayerController.direction.value == 'horizontal'
                 ? 4
                 : 2.5;
@@ -1830,13 +1902,16 @@ Widget buildSeekPreviewWidget(PlPlayerController plPlayerController) {
             // index
             // int index = plPlayerController.sliderPositionSeconds.value ~/ 5;
             int index = max(
-                0,
-                (data.index!
-                        .where((item) =>
+              0,
+              (data.index!
+                      .where(
+                        (item) =>
                             item <=
-                            plPlayerController.sliderPositionSeconds.value)
-                        .length -
-                    2));
+                            plPlayerController.sliderPositionSeconds.value,
+                      )
+                      .length -
+                  2),
+            );
 
             // pageIndex
             int pageIndex = (index ~/ 100).clamp(0, data.image!.length - 1);
@@ -1886,7 +1961,9 @@ Widget buildSeekPreviewWidget(PlPlayerController plPlayerController) {
 }
 
 Widget buildViewPointWidget(
-    PlPlayerController plPlayerController, double offset) {
+  PlPlayerController plPlayerController,
+  double offset,
+) {
   return LayoutBuilder(
     builder: (context, constraints) {
       return Container(
@@ -1897,13 +1974,16 @@ Widget buildViewPointWidget(
           onPointerDown: (event) {
             try {
               double seg = event.localPosition.dx / constraints.maxWidth;
-              Segment item = plPlayerController.viewPointList.where((item) {
-                return item.start >= seg;
-              }).reduce((a, b) => a.start < b.start ? a : b);
+              Segment item = plPlayerController.viewPointList
+                  .where((item) {
+                    return item.start >= seg;
+                  })
+                  .reduce((a, b) => a.start < b.start ? a : b);
               if (item.from != null) {
                 plPlayerController.danmakuController?.clear();
-                plPlayerController.videoPlayerController
-                    ?.seek(Duration(seconds: item.from!));
+                plPlayerController.videoPlayerController?.seek(
+                  Duration(seconds: item.from!),
+                );
               }
               // if (kDebugMode) debugPrint('${item.title},,${item.from}');
             } catch (e) {
diff --git a/lib/plugin/pl_player/widgets/app_bar_ani.dart b/lib/plugin/pl_player/widgets/app_bar_ani.dart
index 8a94d3456..dfe083ea6 100644
--- a/lib/plugin/pl_player/widgets/app_bar_ani.dart
+++ b/lib/plugin/pl_player/widgets/app_bar_ani.dart
@@ -18,13 +18,16 @@ class AppBarAni extends StatelessWidget {
   Widget build(BuildContext context) {
     visible ? controller.forward() : controller.reverse();
     return SlideTransition(
-      position: Tween<Offset>(
-        begin: Offset(0, position! == 'top' ? -1 : 1.1),
-        end: Offset.zero,
-      ).animate(CurvedAnimation(
-        parent: controller,
-        curve: Curves.linear,
-      )),
+      position:
+          Tween<Offset>(
+            begin: Offset(0, position! == 'top' ? -1 : 1.1),
+            end: Offset.zero,
+          ).animate(
+            CurvedAnimation(
+              parent: controller,
+              curve: Curves.linear,
+            ),
+          ),
       child: DecoratedBox(
         decoration: BoxDecoration(
           gradient: position! == 'top'
diff --git a/lib/plugin/pl_player/widgets/bottom_control.dart b/lib/plugin/pl_player/widgets/bottom_control.dart
index e05491b49..217b5cf53 100644
--- a/lib/plugin/pl_player/widgets/bottom_control.dart
+++ b/lib/plugin/pl_player/widgets/bottom_control.dart
@@ -79,16 +79,20 @@ class BottomControl extends StatelessWidget {
                           }
                           if ((newProgress - lastAnnouncedValue).abs() > 0.02) {
                             accessibilityDebounce?.cancel();
-                            accessibilityDebounce =
-                                Timer(const Duration(milliseconds: 200), () {
-                              SemanticsService.announce(
+                            accessibilityDebounce = Timer(
+                              const Duration(milliseconds: 200),
+                              () {
+                                SemanticsService.announce(
                                   "${(newProgress * 100).round()}%",
-                                  TextDirection.ltr);
-                              lastAnnouncedValue = newProgress;
-                            });
+                                  TextDirection.ltr,
+                                );
+                                lastAnnouncedValue = newProgress;
+                              },
+                            );
                           }
-                          controller
-                              .onUpdatedSliderProgress(duration.timeStamp);
+                          controller.onUpdatedSliderProgress(
+                            duration.timeStamp,
+                          );
                         },
                         onSeek: (duration) {
                           if (controller.showSeekPreview) {
@@ -97,11 +101,14 @@ class BottomControl extends StatelessWidget {
                           controller
                             ..onChangedSliderEnd()
                             ..onChangedSlider(duration.inSeconds.toDouble())
-                            ..seekTo(Duration(seconds: duration.inSeconds),
-                                type: 'slider');
+                            ..seekTo(
+                              Duration(seconds: duration.inSeconds),
+                              type: 'slider',
+                            );
                           SemanticsService.announce(
-                              "${(duration.inSeconds / max * 100).round()}%",
-                              TextDirection.ltr);
+                            "${(duration.inSeconds / max * 100).round()}%",
+                            TextDirection.ltr,
+                          );
                         },
                       ),
                       if (controller.segmentList.isNotEmpty)
diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart
index 62c01f8ed..e2c6491d0 100644
--- a/lib/router/app_pages.dart
+++ b/lib/router/app_pages.dart
@@ -98,7 +98,9 @@ class Routes {
     CustomGetPage(name: '/dynamics', page: () => const DynamicsPage()),
     // 动态详情
     CustomGetPage(
-        name: '/dynamicDetail', page: () => const DynamicDetailPage()),
+      name: '/dynamicDetail',
+      page: () => const DynamicDetailPage(),
+    ),
     // 关注
     CustomGetPage(name: '/follow', page: () => const FollowPage()),
     // 粉丝
@@ -110,7 +112,9 @@ class Routes {
     CustomGetPage(name: '/memberSearch', page: () => const MemberSearchPage()),
     // 推荐流设置
     CustomGetPage(
-        name: '/recommendSetting', page: () => const RecommendSetting()),
+      name: '/recommendSetting',
+      page: () => const RecommendSetting(),
+    ),
     // 音视频设置
     CustomGetPage(name: '/videoSetting', page: () => const VideoSetting()),
     // 播放器设置
@@ -125,28 +129,36 @@ class Routes {
     CustomGetPage(name: '/blackListPage', page: () => const BlackListPage()),
     CustomGetPage(name: '/colorSetting', page: () => const ColorSelectPage()),
     CustomGetPage(
-        name: '/fontSizeSetting', page: () => const FontSizeSelectPage()),
+      name: '/fontSizeSetting',
+      page: () => const FontSizeSelectPage(),
+    ),
     // 屏幕帧率
     CustomGetPage(
-        name: '/displayModeSetting', page: () => const SetDisplayMode()),
+      name: '/displayModeSetting',
+      page: () => const SetDisplayMode(),
+    ),
     // 关于
     CustomGetPage(name: '/about', page: () => const AboutPage()),
     //
     CustomGetPage(name: '/articlePage', page: () => const ArticlePage()),
-    // 历史记录搜索
 
+    // 历史记录搜索
     CustomGetPage(name: '/playSpeedSet', page: () => const PlaySpeedPage()),
     // 收藏搜索
     CustomGetPage(name: '/favSearch', page: () => const FavSearchPage()),
     CustomGetPage(
-        name: '/historySearch', page: () => const HistorySearchPage()),
+      name: '/historySearch',
+      page: () => const HistorySearchPage(),
+    ),
     CustomGetPage(name: '/laterSearch', page: () => const LaterSearchPage()),
     CustomGetPage(name: '/followSearch', page: () => const FollowSearchPage()),
     // 消息页面
     CustomGetPage(name: '/whisper', page: () => const WhisperPage()),
     // 私信详情
     CustomGetPage(
-        name: '/whisperDetail', page: () => const WhisperDetailPage()),
+      name: '/whisperDetail',
+      page: () => const WhisperDetailPage(),
+    ),
     // 回复我的
     CustomGetPage(name: '/replyMe', page: () => const ReplyMePage()),
     // @我的
@@ -159,7 +171,9 @@ class Routes {
     CustomGetPage(name: '/loginPage', page: () => const LoginPage()),
     // 用户动态
     CustomGetPage(
-        name: '/memberDynamics', page: () => const MemberDynamicsPage()),
+      name: '/memberDynamics',
+      page: () => const MemberDynamicsPage(),
+    ),
     // 日志
     CustomGetPage(name: '/logs', page: () => const LogsPage()),
     // 订阅
@@ -172,11 +186,17 @@ class Routes {
     CustomGetPage(name: '/createFav', page: () => const CreateFavPage()),
     CustomGetPage(name: '/editProfile', page: () => const EditProfilePage()),
     CustomGetPage(
-        name: '/settingsSearch', page: () => const SettingsSearchPage()),
+      name: '/settingsSearch',
+      page: () => const SettingsSearchPage(),
+    ),
     CustomGetPage(
-        name: '/webdavSetting', page: () => const WebDavSettingPage()),
+      name: '/webdavSetting',
+      page: () => const WebDavSettingPage(),
+    ),
     CustomGetPage(
-        name: '/searchTrending', page: () => const SearchTrendingPage()),
+      name: '/searchTrending',
+      page: () => const SearchTrendingPage(),
+    ),
     CustomGetPage(name: '/dynTopic', page: () => const DynTopicPage()),
     CustomGetPage(name: '/articleList', page: () => const ArticleListPage()),
     CustomGetPage(name: '/barSetting', page: () => const BarSetPage()),
@@ -186,7 +206,9 @@ class Routes {
     CustomGetPage(name: '/matchInfo', page: () => const MatchInfoPage()),
     CustomGetPage(name: '/msgLikeDetail', page: () => const LikeDetailPage()),
     CustomGetPage(
-        name: '/liveDmBlockPage', page: () => const LiveDmBlockPage()),
+      name: '/liveDmBlockPage',
+      page: () => const LiveDmBlockPage(),
+    ),
     CustomGetPage(name: '/createVote', page: () => const CreateVotePage()),
   ];
 }
@@ -198,11 +220,11 @@ class CustomGetPage extends GetPage<dynamic> {
     bool fullscreen = false,
     super.transitionDuration,
   }) : super(
-          curve: Curves.linear,
-          transition: pageTransition,
-          showCupertinoParallax: false,
-          popGesture: false,
-          fullscreenDialog: fullscreen,
-        );
+         curve: Curves.linear,
+         transition: pageTransition,
+         showCupertinoParallax: false,
+         popGesture: false,
+         fullscreenDialog: fullscreen,
+       );
   static Transition pageTransition = Transition.values[Pref.pageTransition];
 }
diff --git a/lib/services/audio_handler.dart b/lib/services/audio_handler.dart
index e3bae4be4..d462389ec 100644
--- a/lib/services/audio_handler.dart
+++ b/lib/services/audio_handler.dart
@@ -41,9 +41,11 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
 
   @override
   Future<void> seek(Duration position) async {
-    playbackState.add(playbackState.value.copyWith(
-      updatePosition: position,
-    ));
+    playbackState.add(
+      playbackState.value.copyWith(
+        updatePosition: position,
+      ),
+    );
     await PlPlayerController.seekToIfExists(position, type: 'slider');
     // await player.seekTo(position);
   }
@@ -60,7 +62,10 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
   }
 
   Future<void> setPlaybackState(
-      PlayerStatus status, bool isBuffering, bool isLive) async {
+    PlayerStatus status,
+    bool isBuffering,
+    bool isLive,
+  ) async {
     if (!enableBackgroundPlay ||
         _item.isEmpty ||
         !PlPlayerController.instanceExists()) {
@@ -77,23 +82,28 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
       processingState = AudioProcessingState.ready;
     }
 
-    playbackState.add(playbackState.value.copyWith(
-      processingState:
-          isBuffering ? AudioProcessingState.buffering : processingState,
-      controls: [
-        if (!isLive)
-          MediaControl.rewind
-              .copyWith(androidIcon: 'drawable/ic_baseline_replay_10_24'),
-        if (playing) MediaControl.pause else MediaControl.play,
-        if (!isLive)
-          MediaControl.fastForward
-              .copyWith(androidIcon: 'drawable/ic_baseline_forward_10_24'),
-      ],
-      playing: playing,
-      systemActions: const {
-        MediaAction.seek,
-      },
-    ));
+    playbackState.add(
+      playbackState.value.copyWith(
+        processingState: isBuffering
+            ? AudioProcessingState.buffering
+            : processingState,
+        controls: [
+          if (!isLive)
+            MediaControl.rewind.copyWith(
+              androidIcon: 'drawable/ic_baseline_replay_10_24',
+            ),
+          if (playing) MediaControl.pause else MediaControl.play,
+          if (!isLive)
+            MediaControl.fastForward.copyWith(
+              androidIcon: 'drawable/ic_baseline_forward_10_24',
+            ),
+        ],
+        playing: playing,
+        systemActions: const {
+          MediaAction.seek,
+        },
+      ),
+    );
   }
 
   void onStatusChange(PlayerStatus status, bool isBuffering, isLive) {
@@ -116,8 +126,9 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
     MediaItem? mediaItem;
     if (data is VideoDetailData) {
       if ((data.pages?.length ?? 0) > 1) {
-        final current =
-            data.pages?.firstWhereOrNull((element) => element.cid == cid);
+        final current = data.pages?.firstWhereOrNull(
+          (element) => element.cid == cid,
+        );
         mediaItem = MediaItem(
           id: id,
           title: current?.pagePart ?? "",
@@ -136,8 +147,9 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
         );
       }
     } else if (data is PgcInfoModel) {
-      final current =
-          data.episodes?.firstWhereOrNull((element) => element.cid == cid);
+      final current = data.episodes?.firstWhereOrNull(
+        (element) => element.cid == cid,
+      );
       mediaItem = MediaItem(
         id: id,
         title: current?.longTitle ?? "",
@@ -168,10 +180,12 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
       _item.removeWhere((item) => item.id.endsWith(herotag));
     }
     if (_item.isNotEmpty) {
-      playbackState.add(playbackState.value.copyWith(
-        processingState: AudioProcessingState.idle,
-        playing: false,
-      ));
+      playbackState.add(
+        playbackState.value.copyWith(
+          processingState: AudioProcessingState.idle,
+          playing: false,
+        ),
+      );
       setMediaItem(_item.last);
       stop();
     }
@@ -188,15 +202,19 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
         }
      */
     if (playbackState.value.processingState == AudioProcessingState.idle) {
-      playbackState.add(PlaybackState(
-        processingState: AudioProcessingState.completed,
-        playing: false,
-      ));
+      playbackState.add(
+        PlaybackState(
+          processingState: AudioProcessingState.completed,
+          playing: false,
+        ),
+      );
     }
-    playbackState.add(PlaybackState(
-      processingState: AudioProcessingState.idle,
-      playing: false,
-    ));
+    playbackState.add(
+      PlaybackState(
+        processingState: AudioProcessingState.idle,
+        playing: false,
+      ),
+    );
   }
 
   void onPositionChange(Duration position) {
@@ -206,8 +224,10 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
       return;
     }
 
-    playbackState.add(playbackState.value.copyWith(
-      updatePosition: position,
-    ));
+    playbackState.add(
+      playbackState.value.copyWith(
+        updatePosition: position,
+      ),
+    );
   }
 }
diff --git a/lib/services/audio_session.dart b/lib/services/audio_session.dart
index 792bd66ff..6952d94fe 100644
--- a/lib/services/audio_session.dart
+++ b/lib/services/audio_session.dart
@@ -27,7 +27,8 @@ class AudioSessionHandler {
         switch (event.type) {
           case AudioInterruptionType.duck:
             PlPlayerController.setVolumeIfExists(
-                (PlPlayerController.getVolumeIfExists() ?? 0) * 0.5);
+              (PlPlayerController.getVolumeIfExists() ?? 0) * 0.5,
+            );
             // player.setVolume(player.volume.value * 0.5);
             break;
           case AudioInterruptionType.pause:
@@ -45,7 +46,8 @@ class AudioSessionHandler {
         switch (event.type) {
           case AudioInterruptionType.duck:
             PlPlayerController.setVolumeIfExists(
-                (PlPlayerController.getVolumeIfExists() ?? 0) * 2);
+              (PlPlayerController.getVolumeIfExists() ?? 0) * 2,
+            );
             // player.setVolume(player.volume.value * 2);
             break;
           case AudioInterruptionType.pause:
diff --git a/lib/services/loggeer.dart b/lib/services/loggeer.dart
index 374a9bd53..0a13fd817 100644
--- a/lib/services/loggeer.dart
+++ b/lib/services/loggeer.dart
@@ -16,8 +16,13 @@ class PiliLogger extends Logger {
   PiliLogger() : super();
 
   @override
-  Future<void> log(Level level, dynamic message,
-      {Object? error, StackTrace? stackTrace, DateTime? time}) async {
+  Future<void> log(
+    Level level,
+    dynamic message, {
+    Object? error,
+    StackTrace? stackTrace,
+    DateTime? time,
+  }) async {
     if (level == Level.error || level == Level.fatal) {
       // 添加至文件末尾
       File logFile = await getLogsPath();
diff --git a/lib/services/shutdown_timer_service.dart b/lib/services/shutdown_timer_service.dart
index f642b2e18..e78a31efe 100644
--- a/lib/services/shutdown_timer_service.dart
+++ b/lib/services/shutdown_timer_service.dart
@@ -45,8 +45,10 @@ class ShutdownTimerService with WidgetsBindingObserver {
       return;
     }
     SmartDialog.showToast("设置 $scheduledExitInMinutes 分钟后定时关闭");
-    _shutdownTimer =
-        Timer(Duration(minutes: scheduledExitInMinutes), _shutdownDecider);
+    _shutdownTimer = Timer(
+      Duration(minutes: scheduledExitInMinutes),
+      _shutdownDecider,
+    );
   }
 
   void _showTimeUpButPauseDialog() {
diff --git a/lib/tcp/live.dart b/lib/tcp/live.dart
index ebf476c86..5475b1ea2 100644
--- a/lib/tcp/live.dart
+++ b/lib/tcp/live.dart
@@ -223,8 +223,9 @@ class LiveMessageStream {
                   decompressedData = ZLibDecoder().convert(data.sublist(0x10));
                   break;
                 case 3:
-                  decompressedData =
-                      const BrotliDecoder().convert(data.sublist(0x10));
+                  decompressedData = const BrotliDecoder().convert(
+                    data.sublist(0x10),
+                  );
                 //debugPrint('Body: ${utf8.decode()}');
               }
               _processingData(decompressedData);
@@ -243,11 +244,13 @@ class LiveMessageStream {
 
   void _processingData(List<int> data) {
     try {
-      PackageHeader? subHeader =
-          PackageHeader.fromBytesData(Uint8List.fromList(data));
+      PackageHeader? subHeader = PackageHeader.fromBytesData(
+        Uint8List.fromList(data),
+      );
       if (subHeader != null) {
-        var msgBody = utf8
-            .decode(data.sublist(subHeader.headerSize, subHeader.totalSize));
+        var msgBody = utf8.decode(
+          data.sublist(subHeader.headerSize, subHeader.totalSize),
+        );
         for (var f in eventListeners) {
           f(jsonDecode(msgBody));
         }
diff --git a/lib/utils/accounts.dart b/lib/utils/accounts.dart
index 2a497702f..0e224baca 100644
--- a/lib/utils/accounts.dart
+++ b/lib/utils/accounts.dart
@@ -18,10 +18,12 @@ class Accounts {
   // static set main(Account account) => set(AccountType.main, account);
 
   static Future<void> init() async {
-    account = await Hive.openBox('account',
-        compactionStrategy: (int entries, int deletedEntries) {
-      return deletedEntries > 2;
-    });
+    account = await Hive.openBox(
+      'account',
+      compactionStrategy: (int entries, int deletedEntries) {
+        return deletedEntries > 2;
+      },
+    );
     await _migrate();
   }
 
@@ -31,13 +33,17 @@ class Accounts {
     final Directory dir = Directory(tempPath);
     if (dir.existsSync()) {
       if (kDebugMode) debugPrint('migrating...');
-      final cookieJar =
-          PersistCookieJar(ignoreExpires: true, storage: FileStorage(tempPath));
+      final cookieJar = PersistCookieJar(
+        ignoreExpires: true,
+        storage: FileStorage(tempPath),
+      );
       await cookieJar.forceInit();
       final cookies = DefaultCookieJar(ignoreExpires: true)
         ..domainCookies.addAll(cookieJar.domainCookies);
-      final localAccessKey =
-          GStorage.localCache.get('accessKey', defaultValue: {});
+      final localAccessKey = GStorage.localCache.get(
+        'accessKey',
+        defaultValue: {},
+      );
 
       final isLogin =
           cookies.domainCookies['bilibili.com']?['/']?['SESSDATA'] != null;
@@ -48,9 +54,12 @@ class Accounts {
         GStorage.localCache.delete('blackMidsList'),
         dir.delete(recursive: true),
         if (isLogin)
-          LoginAccount(cookies, localAccessKey['value'],
-                  localAccessKey['refresh'], AccountType.values.toSet())
-              .onChange()
+          LoginAccount(
+            cookies,
+            localAccessKey['value'],
+            localAccessKey['refresh'],
+            AccountType.values.toSet(),
+          ).onChange(),
       ]);
       if (kDebugMode) debugPrint('migrated successfully');
     }
@@ -65,9 +74,11 @@ class Accounts {
     for (var type in AccountType.values) {
       accountMode[type] ??= AnonymousAccount();
     }
-    await Future.wait((accountMode.values.toSet()
-          ..retainWhere((i) => !i.activited))
-        .map((i) => Request.buvidActive(i)));
+    await Future.wait(
+      (accountMode.values.toSet()..retainWhere((i) => !i.activited)).map(
+        (i) => Request.buvidActive(i),
+      ),
+    );
   }
 
   static Future<void> clear() async {
@@ -87,8 +98,9 @@ class Accounts {
 
   static Future<void> deleteAll(Set<Account> accounts) async {
     var isloginMain = Accounts.main.isLogin;
-    Accounts.accountMode
-        .updateAll((_, a) => accounts.contains(a) ? AnonymousAccount() : a);
+    Accounts.accountMode.updateAll(
+      (_, a) => accounts.contains(a) ? AnonymousAccount() : a,
+    );
     await Future.wait(accounts.map((i) => i.delete()));
     if (isloginMain && !Accounts.main.isLogin) {
       await LoginUtils.onLogoutMain();
diff --git a/lib/utils/accounts/account.dart b/lib/utils/accounts/account.dart
index 714593e5d..4e6cbcba8 100644
--- a/lib/utils/accounts/account.dart
+++ b/lib/utils/accounts/account.dart
@@ -63,20 +63,25 @@ class LoginAccount implements Account {
 
   @override
   Map<String, dynamic>? toJson() => {
-        'cookies': cookieJar.toJson(),
-        'accessKey': accessKey,
-        'refresh': refresh,
-        'type': type.map((i) => i.index).toList()
-      };
+    'cookies': cookieJar.toJson(),
+    'accessKey': accessKey,
+    'refresh': refresh,
+    'type': type.map((i) => i.index).toList(),
+  };
 
   late final String _midStr = cookieJar
-      .domainCookies['bilibili.com']!['/']!['DedeUserID']!.cookie.value;
+      .domainCookies['bilibili.com']!['/']!['DedeUserID']!
+      .cookie
+      .value;
 
   late final Box<LoginAccount> _box = Accounts.account;
 
-  LoginAccount(this.cookieJar, this.accessKey, this.refresh,
-      [Set<AccountType>? type])
-      : type = type ?? {} {
+  LoginAccount(
+    this.cookieJar,
+    this.accessKey,
+    this.refresh, [
+    Set<AccountType>? type,
+  ]) : type = type ?? {} {
     cookieJar.setBuvid3();
   }
 
@@ -84,7 +89,8 @@ class LoginAccount implements Account {
     cookieJar = BiliCookieJar.fromJson(json['cookies'])..setBuvid3();
     accessKey = json['accessKey'];
     refresh = json['refresh'];
-    type = (json['type'] as Iterable?)
+    type =
+        (json['type'] as Iterable?)
             ?.map((i) => AccountType.values[i])
             .toSet() ??
         {};
@@ -164,8 +170,7 @@ extension BiliCookieJar on DefaultCookieJar {
   }
 
   List<Cookie> toList() =>
-      domainCookies['bilibili.com']?['/']
-          ?.entries
+      domainCookies['bilibili.com']?['/']?.entries
           .map((i) => i.value.cookie)
           .toList() ??
       [];
@@ -173,7 +178,8 @@ extension BiliCookieJar on DefaultCookieJar {
   void setBuvid3() {
     domainCookies['bilibili.com'] ??= {'/': {}};
     domainCookies['bilibili.com']!['/']!['buvid3'] ??= SerializableCookie(
-        Cookie('buvid3', IdUtils.genBuvid3())..setBiliDomain());
+      Cookie('buvid3', IdUtils.genBuvid3())..setBiliDomain(),
+    );
   }
 
   static DefaultCookieJar fromJson(Map json) =>
@@ -181,7 +187,9 @@ extension BiliCookieJar on DefaultCookieJar {
         ..domainCookies['bilibili.com'] = {
           '/': {
             for (var i in json.entries)
-              i.key: SerializableCookie(Cookie(i.key, i.value)..setBiliDomain())
+              i.key: SerializableCookie(
+                Cookie(i.key, i.value)..setBiliDomain(),
+              ),
           },
         };
 
@@ -191,7 +199,8 @@ extension BiliCookieJar on DefaultCookieJar {
           '/': {
             for (var i in cookies)
               i['name']!: SerializableCookie(
-                  Cookie(i['name']!, i['value']!)..setBiliDomain()),
+                Cookie(i['name']!, i['value']!)..setBiliDomain(),
+              ),
           },
         };
 }
diff --git a/lib/utils/accounts/account_manager/account_mgr.dart b/lib/utils/accounts/account_manager/account_mgr.dart
index 60c664682..69d190ddd 100644
--- a/lib/utils/accounts/account_manager/account_mgr.dart
+++ b/lib/utils/accounts/account_manager/account_mgr.dart
@@ -37,7 +37,7 @@ class AccountManager extends Interceptor {
       Api.liveRoomDmPrefetch,
       Api.searchByType,
       Api.dynSearch,
-      Api.searchArchive
+      Api.searchArchive,
     },
     AccountType.recommend: {
       Api.recommendListWeb,
@@ -53,7 +53,7 @@ class AccountManager extends Interceptor {
       Api.searchTrending,
       Api.searchRecommend,
     },
-    AccountType.video: {Api.ugcUrl, Api.pgcUrl}
+    AccountType.video: {Api.ugcUrl, Api.pgcUrl},
   };
 
   static const loginApi = {
@@ -103,8 +103,9 @@ class AccountManager extends Interceptor {
       options.headers.addAll(account.headers);
     } else if (path == Api.heartBeat) {
       return handler.reject(
-          DioException.requestCancelled(requestOptions: options, reason: null),
-          false);
+        DioException.requestCancelled(requestOptions: options, reason: null),
+        false,
+      );
     }
 
     // app端不需要管理cookie
@@ -112,16 +113,17 @@ class AccountManager extends Interceptor {
       // if (kDebugMode) debugPrint('is app: ${options.path}');
       // bytes是grpc响应
       if (options.responseType != ResponseType.bytes) {
-        final dataPtr = (options.method == 'POST' && options.data is Map
-                ? options.data as Map
-                : options.queryParameters)
-            .cast<String, dynamic>();
+        final dataPtr =
+            (options.method == 'POST' && options.data is Map
+                    ? options.data as Map
+                    : options.queryParameters)
+                .cast<String, dynamic>();
         if (dataPtr.isNotEmpty) {
           if (!account.accessKey.isNullOrEmpty) {
             dataPtr['access_key'] = account.accessKey!;
           }
-          dataPtr['ts'] ??=
-              (DateTime.now().millisecondsSinceEpoch ~/ 1000).toString();
+          dataPtr['ts'] ??= (DateTime.now().millisecondsSinceEpoch ~/ 1000)
+              .toString();
           AppSign.appSign(dataPtr);
           // if (kDebugMode) debugPrint(dataPtr.toString());
         }
@@ -133,27 +135,31 @@ class AccountManager extends Interceptor {
         handler.next(options);
         return;
       }
-      account.cookieJar.loadForRequest(options.uri).then((cookies) {
-        final previousCookies =
-            options.headers[HttpHeaders.cookieHeader] as String?;
-        final newCookies = getCookies([
-          ...?previousCookies
-              ?.split(';')
-              .where((e) => e.isNotEmpty)
-              .map((c) => Cookie.fromSetCookieValue(c)),
-          ...cookies,
-        ]);
-        options.headers[HttpHeaders.cookieHeader] =
-            newCookies.isNotEmpty ? newCookies : '';
-        handler.next(options);
-      }).catchError((dynamic e, StackTrace s) {
-        final err = DioException(
-          requestOptions: options,
-          error: e,
-          stackTrace: s,
-        );
-        handler.reject(err, true);
-      });
+      account.cookieJar
+          .loadForRequest(options.uri)
+          .then((cookies) {
+            final previousCookies =
+                options.headers[HttpHeaders.cookieHeader] as String?;
+            final newCookies = getCookies([
+              ...?previousCookies
+                  ?.split(';')
+                  .where((e) => e.isNotEmpty)
+                  .map((c) => Cookie.fromSetCookieValue(c)),
+              ...cookies,
+            ]);
+            options.headers[HttpHeaders.cookieHeader] = newCookies.isNotEmpty
+                ? newCookies
+                : '';
+            handler.next(options);
+          })
+          .catchError((dynamic e, StackTrace s) {
+            final err = DioException(
+              requestOptions: options,
+              error: e,
+              stackTrace: s,
+            );
+            handler.reject(err, true);
+          });
     }
   }
 
@@ -163,9 +169,9 @@ class AccountManager extends Interceptor {
     if (path.startsWith(HttpString.appBaseUrl) || _skipCookie(path)) {
       return handler.next(response);
     } else {
-      _saveCookies(response)
-          .whenComplete(() => handler.next(response))
-          .catchError(
+      _saveCookies(
+        response,
+      ).whenComplete(() => handler.next(response)).catchError(
         (dynamic e, StackTrace s) {
           final error = DioException(
             requestOptions: response.requestOptions,
@@ -185,9 +191,9 @@ class AccountManager extends Interceptor {
     }
     if (err.response != null &&
         !err.response!.requestOptions.path.startsWith(HttpString.appBaseUrl)) {
-      _saveCookies(err.response!)
-          .whenComplete(() => handler.next(err))
-          .catchError(
+      _saveCookies(
+        err.response!,
+      ).whenComplete(() => handler.next(err)).catchError(
         (dynamic e, StackTrace s) {
           final error = DioException(
             requestOptions: err.response!.requestOptions,
@@ -225,7 +231,8 @@ class AccountManager extends Interceptor {
   }
 
   Future<void> _saveCookies(Response response) async {
-    final Account account = response.requestOptions.extra['account'] ??
+    final Account account =
+        response.requestOptions.extra['account'] ??
         _findAccount(response.requestOptions.path);
     final setCookies = response.headers[HttpHeaders.setCookieHeader];
     if (setCookies == null || setCookies.isEmpty) {
@@ -266,9 +273,12 @@ class AccountManager extends Interceptor {
 
   Account _findAccount(String path) => loginApi.contains(path)
       ? AnonymousAccount()
-      : Accounts.get(AccountType.values.firstWhere(
-          (i) => apiTypeSet[i]?.contains(path) == true,
-          orElse: () => AccountType.main));
+      : Accounts.get(
+          AccountType.values.firstWhere(
+            (i) => apiTypeSet[i]?.contains(path) == true,
+            orElse: () => AccountType.main,
+          ),
+        );
 
   static Future<String> dioError(DioException error) async {
     switch (error.type) {
diff --git a/lib/utils/app_scheme.dart b/lib/utils/app_scheme.dart
index d3ad86f01..7e19d4cb1 100644
--- a/lib/utils/app_scheme.dart
+++ b/lib/utils/app_scheme.dart
@@ -127,8 +127,10 @@ class PiliScheme {
                         IconButton(
                           tooltip: '前往原视频',
                           onPressed: () {
-                            String? enterUri =
-                                uri.toString().split('?').first; // to check
+                            String? enterUri = uri
+                                .toString()
+                                .split('?')
+                                .first; // to check
                             routePush(Uri.parse(enterUri));
                           },
                           icon: const Icon(Icons.open_in_new),
@@ -240,7 +242,9 @@ class PiliScheme {
               int type = int.parse(pathSegments[1]); // business_id
               int oid = int.parse(pathSegments[2]); // subject_id
               int rootId = int.parse(pathSegments[3]); // root_id // target_id
-              int? rpId = queryParameters['anchor'] != null // source_id
+              int? rpId =
+                  queryParameters['anchor'] !=
+                      null // source_id
                   ? int.tryParse(queryParameters['anchor']!)
                   : null;
               // int subType = int.parse(queryParameters['subType'] ?? '0');
@@ -266,7 +270,8 @@ class PiliScheme {
                             routePush(Uri.parse(enterUri));
                           } else {
                             routePush(
-                                Uri.parse('bilibili://following/detail/$oid'));
+                              Uri.parse('bilibili://following/detail/$oid'),
+                            );
                           }
                         },
                         icon: const Icon(Icons.open_in_new),
@@ -345,9 +350,10 @@ class PiliScheme {
             // businessId == 17 => dynId == oid
             // bilibili://following/detail/832703053858603029 (dynId)
             // bilibili://following/detail/12345678?comment_root_id=654321\u0026comment_on=1
-            String? cvid = RegExp(r'^/detail/cv(\d+)', caseSensitive: false)
-                .matchAsPrefix(path)
-                ?.group(1);
+            String? cvid = RegExp(
+              r'^/detail/cv(\d+)',
+              caseSensitive: false,
+            ).matchAsPrefix(path)?.group(1);
             if (cvid != null) {
               PageUtils.toDupNamed(
                 '/articlePage',
@@ -611,10 +617,12 @@ class PiliScheme {
         return hasMatch;
       case 'playlist':
         // http://m.bilibili.com/playlist/pl12345678?bvid=BVxxxxxxxx&page_type=4
-        String? mediaId = RegExp(r'/pl(\d+)', caseSensitive: false)
-            .firstMatch(path)
-            ?.group(1);
-        String? bvid = uri.queryParameters['bvid'] ??
+        String? mediaId = RegExp(
+          r'/pl(\d+)',
+          caseSensitive: false,
+        ).firstMatch(path)?.group(1);
+        String? bvid =
+            uri.queryParameters['bvid'] ??
             IdUtils.bvRegex.firstMatch(path)?.group(0);
         if (bvid != null) {
           if (mediaId != null) {
@@ -670,9 +678,10 @@ class PiliScheme {
         return false;
       case 'read':
         if (path.contains('readlist')) {
-          String? id = RegExp(r'/rl(\d+)', caseSensitive: false)
-              .firstMatch(path)
-              ?.group(1);
+          String? id = RegExp(
+            r'/rl(\d+)',
+            caseSensitive: false,
+          ).firstMatch(path)?.group(1);
           if (id != null) {
             PageUtils.toDupNamed(
               '/articleList',
@@ -685,8 +694,10 @@ class PiliScheme {
           return false;
         }
         // if (kDebugMode) debugPrint('专栏');
-        String? id =
-            RegExp(r'cv(\d+)', caseSensitive: false).firstMatch(path)?.group(1);
+        String? id = RegExp(
+          r'cv(\d+)',
+          caseSensitive: false,
+        ).firstMatch(path)?.group(1);
         if (id != null) {
           PageUtils.toDupNamed(
             '/articlePage',
diff --git a/lib/utils/app_sign.dart b/lib/utils/app_sign.dart
index 7be544c03..b2bf2eaa5 100644
--- a/lib/utils/app_sign.dart
+++ b/lib/utils/app_sign.dart
@@ -4,12 +4,17 @@ import 'package:PiliPlus/common/constants.dart';
 import 'package:crypto/crypto.dart';
 
 class AppSign {
-  static void appSign(Map<String, dynamic> params,
-      [String appkey = Constants.appKey, String appsec = Constants.appSec]) {
+  static void appSign(
+    Map<String, dynamic> params, [
+    String appkey = Constants.appKey,
+    String appsec = Constants.appSec,
+  ]) {
     params['appkey'] = appkey;
     var searchParams = Uri(
-        queryParameters:
-            params.map((key, value) => MapEntry(key, value.toString()))).query;
+      queryParameters: params.map(
+        (key, value) => MapEntry(key, value.toString()),
+      ),
+    ).query;
     var sortedQueryString = (searchParams.split('&')..sort()).join('&');
 
     params['sign'] = md5
diff --git a/lib/utils/cache_manage.dart b/lib/utils/cache_manage.dart
index df5536170..51b4eb8da 100644
--- a/lib/utils/cache_manage.dart
+++ b/lib/utils/cache_manage.dart
@@ -93,8 +93,9 @@ class CacheManage {
     var appDocDir = await getTemporaryDirectory();
     if (appDocDir.existsSync()) {
       // await appDocDir.delete(recursive: true);
-      final List<FileSystemEntity> children =
-          appDocDir.listSync(recursive: false);
+      final List<FileSystemEntity> children = appDocDir.listSync(
+        recursive: false,
+      );
       for (final FileSystemEntity file in children) {
         await file.delete(recursive: true);
       }
diff --git a/lib/utils/date_util.dart b/lib/utils/date_util.dart
index c5480675e..b28173fd4 100644
--- a/lib/utils/date_util.dart
+++ b/lib/utils/date_util.dart
@@ -62,8 +62,9 @@ class DateUtil {
       return '昨天 ${_twoDigits(date.hour)}:${_twoDigits(date.minute)}';
     }
     if (isHistory) {
-      final DateFormat sdf =
-          now.year == date.year ? _shortFormatD : longFormatD;
+      final DateFormat sdf = now.year == date.year
+          ? _shortFormatD
+          : longFormatD;
       return sdf.format(date);
     }
     return longFormatD.format(date);
diff --git a/lib/utils/duration_util.dart b/lib/utils/duration_util.dart
index d492c3c07..41d8ef626 100644
--- a/lib/utils/duration_util.dart
+++ b/lib/utils/duration_util.dart
@@ -21,8 +21,11 @@ class DurationUtil {
     if (data == null || data.isEmpty) {
       return 0;
     }
-    List<int> split =
-        data.split(':').reversed.map((e) => int.parse(e)).toList();
+    List<int> split = data
+        .split(':')
+        .reversed
+        .map((e) => int.parse(e))
+        .toList();
     int duration = 0;
     for (int i = 0; i < split.length; i++) {
       duration += split[i] * pow(60, i).toInt();
diff --git a/lib/utils/extension.dart b/lib/utils/extension.dart
index cf5dd7a2f..51cd405fa 100644
--- a/lib/utils/extension.dart
+++ b/lib/utils/extension.dart
@@ -29,8 +29,11 @@ extension ScrollControllerExt on ScrollController {
     if (offset >= Get.mediaQuery.size.height * 7) {
       jumpTo(0);
     } else {
-      animateTo(0,
-          duration: const Duration(milliseconds: 500), curve: Curves.easeInOut);
+      animateTo(
+        0,
+        duration: const Duration(milliseconds: 500),
+        curve: Curves.easeInOut,
+      );
     }
   }
 
@@ -141,20 +144,32 @@ extension RationalExt on Rational {
 
 extension ThreeDotItemTypeExt on ThreeDotItemType {
   Icon get icon => switch (this) {
-        ThreeDotItemType.THREE_DOT_ITEM_TYPE_MSG_SETTING =>
-          const Icon(Icons.settings, size: 20),
-        ThreeDotItemType.THREE_DOT_ITEM_TYPE_READ_ALL =>
-          const Icon(Icons.cleaning_services, size: 20),
-        ThreeDotItemType.THREE_DOT_ITEM_TYPE_CLEAR_LIST =>
-          const Icon(Icons.delete_forever_outlined, size: 20),
-        ThreeDotItemType.THREE_DOT_ITEM_TYPE_UP_HELPER =>
-          const Icon(Icons.live_tv, size: 20),
-        ThreeDotItemType.THREE_DOT_ITEM_TYPE_CONTACTS =>
-          const Icon(Icons.account_box_outlined, size: 20),
-        ThreeDotItemType.THREE_DOT_ITEM_TYPE_FANS_GROUP_HELPER =>
-          const Icon(Icons.notifications_none, size: 20),
-        _ => const Icon(MdiIcons.circleMedium, size: 20),
-      };
+    ThreeDotItemType.THREE_DOT_ITEM_TYPE_MSG_SETTING => const Icon(
+      Icons.settings,
+      size: 20,
+    ),
+    ThreeDotItemType.THREE_DOT_ITEM_TYPE_READ_ALL => const Icon(
+      Icons.cleaning_services,
+      size: 20,
+    ),
+    ThreeDotItemType.THREE_DOT_ITEM_TYPE_CLEAR_LIST => const Icon(
+      Icons.delete_forever_outlined,
+      size: 20,
+    ),
+    ThreeDotItemType.THREE_DOT_ITEM_TYPE_UP_HELPER => const Icon(
+      Icons.live_tv,
+      size: 20,
+    ),
+    ThreeDotItemType.THREE_DOT_ITEM_TYPE_CONTACTS => const Icon(
+      Icons.account_box_outlined,
+      size: 20,
+    ),
+    ThreeDotItemType.THREE_DOT_ITEM_TYPE_FANS_GROUP_HELPER => const Icon(
+      Icons.notifications_none,
+      size: 20,
+    ),
+    _ => const Icon(MdiIcons.circleMedium, size: 20),
+  };
 
   void action({
     required BuildContext context,
@@ -176,9 +191,11 @@ extension ThreeDotItemTypeExt on ThreeDotItemType {
           onConfirm: controller.onDeleteList,
         );
       case ThreeDotItemType.THREE_DOT_ITEM_TYPE_MSG_SETTING:
-        Get.to(const WhisperSettingsPage(
-          imSettingType: IMSettingType.SETTING_TYPE_NEED_ALL,
-        ));
+        Get.to(
+          const WhisperSettingsPage(
+            imSettingType: IMSettingType.SETTING_TYPE_NEED_ALL,
+          ),
+        );
       case ThreeDotItemType.THREE_DOT_ITEM_TYPE_UP_HELPER:
         Get.toNamed(
           '/whisperDetail',
diff --git a/lib/utils/grid.dart b/lib/utils/grid.dart
index 1cbe7f995..f2193ab9e 100644
--- a/lib/utils/grid.dart
+++ b/lib/utils/grid.dart
@@ -9,14 +9,14 @@ class Grid {
   static final double smallCardWidth = Pref.smallCardWidth;
 
   static SliverGridDelegateWithExtentAndRatio videoCardHDelegate(
-          BuildContext context,
-          {double minHeight = 90}) =>
-      SliverGridDelegateWithExtentAndRatio(
-        mainAxisSpacing: 2,
-        maxCrossAxisExtent: Grid.smallCardWidth * 2,
-        childAspectRatio: StyleString.aspectRatio * 2.2,
-        minHeight: MediaQuery.textScalerOf(context).scale(minHeight),
-      );
+    BuildContext context, {
+    double minHeight = 90,
+  }) => SliverGridDelegateWithExtentAndRatio(
+    mainAxisSpacing: 2,
+    maxCrossAxisExtent: Grid.smallCardWidth * 2,
+    childAspectRatio: StyleString.aspectRatio * 2.2,
+    minHeight: MediaQuery.textScalerOf(context).scale(minHeight),
+  );
 }
 
 class SliverGridDelegateWithExtentAndRatio extends SliverGridDelegate {
@@ -33,11 +33,11 @@ class SliverGridDelegateWithExtentAndRatio extends SliverGridDelegate {
     this.childAspectRatio = 1.0,
     this.mainAxisExtent = 0.0,
     this.minHeight = 0.0,
-  })  : assert(maxCrossAxisExtent > 0),
-        assert(mainAxisSpacing >= 0),
-        assert(crossAxisSpacing >= 0),
-        assert(childAspectRatio > 0),
-        assert(minHeight >= 0);
+  }) : assert(maxCrossAxisExtent > 0),
+       assert(mainAxisSpacing >= 0),
+       assert(crossAxisSpacing >= 0),
+       assert(childAspectRatio > 0),
+       assert(minHeight >= 0);
 
   final double minHeight;
 
@@ -79,9 +79,10 @@ class SliverGridDelegateWithExtentAndRatio extends SliverGridDelegate {
   @override
   SliverGridLayout getLayout(SliverConstraints constraints) {
     assert(_debugAssertIsValid(constraints.crossAxisExtent));
-    int crossAxisCount = ((constraints.crossAxisExtent - crossAxisSpacing) /
-            (maxCrossAxisExtent + crossAxisSpacing))
-        .ceil();
+    int crossAxisCount =
+        ((constraints.crossAxisExtent - crossAxisSpacing) /
+                (maxCrossAxisExtent + crossAxisSpacing))
+            .ceil();
     // Ensure a minimum count of 1, can be zero and result in an infinite extent
     // below when the window size is 0.
     crossAxisCount = max(1, crossAxisCount);
@@ -91,7 +92,9 @@ class SliverGridDelegateWithExtentAndRatio extends SliverGridDelegate {
     );
     final double childCrossAxisExtent = usableCrossAxisExtent / crossAxisCount;
     final double childMainAxisExtent = max(
-        minHeight, childCrossAxisExtent / childAspectRatio + mainAxisExtent);
+      minHeight,
+      childCrossAxisExtent / childAspectRatio + mainAxisExtent,
+    );
     return SliverGridRegularTileLayout(
       crossAxisCount: crossAxisCount,
       mainAxisStride: childMainAxisExtent + mainAxisSpacing,
diff --git a/lib/utils/id_utils.dart b/lib/utils/id_utils.dart
index 33a1e1c52..4518b36dc 100644
--- a/lib/utils/id_utils.dart
+++ b/lib/utils/id_utils.dart
@@ -16,8 +16,10 @@ class IdUtils {
   static final invData = {for (var (i, c) in data.codeUnits.indexed) c: i};
 
   static final bvRegex = RegExp(r'bv[0-9a-zA-Z]{10}', caseSensitive: false);
-  static final bvRegexExact =
-      RegExp(r'^bv[0-9a-zA-Z]{10}$', caseSensitive: false);
+  static final bvRegexExact = RegExp(
+    r'^bv[0-9a-zA-Z]{10}$',
+    caseSensitive: false,
+  );
   static final avRegex = RegExp(r'av(\d+)', caseSensitive: false);
   static final avRegexExact = RegExp(r'^av(\d+)$', caseSensitive: false);
   static final digitOnlyRegExp = RegExp(r'^\d+$');
diff --git a/lib/utils/image_util.dart b/lib/utils/image_util.dart
index e8a5a2d62..bc2abe3a5 100644
--- a/lib/utils/image_util.dart
+++ b/lib/utils/image_util.dart
@@ -23,8 +23,10 @@ class ImageUtil {
   static Future<void> onShareImg(String url) async {
     try {
       SmartDialog.showLoading();
-      var response = await Request()
-          .get(url, options: Options(responseType: ResponseType.bytes));
+      var response = await Request().get(
+        url,
+        options: Options(responseType: ResponseType.bytes),
+      );
       final temp = await getTemporaryDirectory();
       SmartDialog.dismiss();
       var name = Utils.getFileName(url);
@@ -63,7 +65,7 @@ class ImageUtil {
               TextButton(
                 onPressed: openAppSettings,
                 child: Text('去授权'),
-              )
+              ),
             ],
           );
         },
@@ -87,7 +89,8 @@ class ImageUtil {
   }
 
   static Future<bool> checkPermissionDependOnSdkInt(
-      BuildContext context) async {
+    BuildContext context,
+  ) async {
     if (Platform.isAndroid) {
       if (await Utils.sdkInt <= 32) {
         if (!context.mounted) return false;
@@ -161,7 +164,9 @@ class ImageUtil {
   }
 
   static Future<bool> downloadImg(
-      BuildContext context, List<String> imgList) async {
+    BuildContext context,
+    List<String> imgList,
+  ) async {
     if (!await checkPermissionDependOnSdkInt(context)) return false;
     final cancelToken = CancelToken();
     SmartDialog.showLoading(
@@ -230,8 +235,10 @@ class ImageUtil {
     }
   }
 
-  static final _thumbRegex =
-      RegExp(r'(@(\d+[a-z]_?)*)(\..*)?$', caseSensitive: false);
+  static final _thumbRegex = RegExp(
+    r'(@(\d+[a-z]_?)*)(\..*)?$',
+    caseSensitive: false,
+  );
   static String thumbnailUrl(String? src, [int? quality]) {
     if (src != null && quality != 100) {
       bool hasMatch = false;
diff --git a/lib/utils/login_utils.dart b/lib/utils/login_utils.dart
index 7a774f277..6f4e9f06c 100644
--- a/lib/utils/login_utils.dart
+++ b/lib/utils/login_utils.dart
@@ -31,15 +31,17 @@ class LoginUtils {
       final cookies = account.cookieJar.toList();
       final webManager = web.CookieManager();
       Future.wait([
-        ...cookies.map((item) => webManager.setCookie(
-              url: web.WebUri(item.domain ?? ''),
-              name: item.name,
-              value: item.value,
-              path: item.path ?? '',
-              domain: item.domain,
-              isSecure: item.secure,
-              isHttpOnly: item.httpOnly,
-            ))
+        ...cookies.map(
+          (item) => webManager.setCookie(
+            url: web.WebUri(item.domain ?? ''),
+            name: item.name,
+            value: item.value,
+            path: item.path ?? '',
+            domain: item.domain,
+            isSecure: item.secure,
+            isHttpOnly: item.httpOnly,
+          ),
+        ),
       ]);
     } catch (e) {
       SmartDialog.showToast('设置登录态失败，$e');
@@ -80,21 +82,24 @@ class LoginUtils {
         } catch (_) {}
 
         try {
-          Get.find<PgcController>(tag: HomeTabType.bangumi.name)
-              .queryPgcFollow();
+          Get.find<PgcController>(
+            tag: HomeTabType.bangumi.name,
+          ).queryPgcFollow();
         } catch (_) {}
 
         try {
-          Get.find<PgcController>(tag: HomeTabType.cinema.name)
-              .queryPgcFollow();
+          Get.find<PgcController>(
+            tag: HomeTabType.cinema.name,
+          ).queryPgcFollow();
         } catch (_) {}
       }
     } else {
       // 获取用户信息失败
       await Accounts.deleteAll({account});
       SmartDialog.showNotify(
-          msg: '登录失败，请检查cookie是否正确，${result['msg']}',
-          notifyType: NotifyType.warning);
+        msg: '登录失败，请检查cookie是否正确，${result['msg']}',
+        notifyType: NotifyType.warning,
+      );
     }
   }
 
@@ -149,10 +154,10 @@ class LoginUtils {
   }
 
   static String generateBuvid() {
-    var md5Str =
-        Iterable.generate(32, (_) => random.nextInt(16).toRadixString(16))
-            .join()
-            .toUpperCase();
+    var md5Str = Iterable.generate(
+      32,
+      (_) => random.nextInt(16).toRadixString(16),
+    ).join().toUpperCase();
     return 'XY${md5Str[2]}${md5Str[12]}${md5Str[22]}$md5Str';
   }
 
@@ -174,12 +179,14 @@ class LoginUtils {
         .replaceAll(RegExp(r'[-:TZ]'), '')
         .substring(0, 14);
 
-    final String randomHex32 =
-        List.generate(32, (index) => random.nextInt(16).toRadixString(16))
-            .join();
-    final String randomHex16 =
-        List.generate(16, (index) => random.nextInt(16).toRadixString(16))
-            .join();
+    final String randomHex32 = List.generate(
+      32,
+      (index) => random.nextInt(16).toRadixString(16),
+    ).join();
+    final String randomHex16 = List.generate(
+      16,
+      (index) => random.nextInt(16).toRadixString(16),
+    ).join();
 
     final String deviceID = randomHex32 + yyyyMMddHHmmss + randomHex16;
 
diff --git a/lib/utils/page_utils.dart b/lib/utils/page_utils.dart
index 4370dab7d..278a431c6 100644
--- a/lib/utils/page_utils.dart
+++ b/lib/utils/page_utils.dart
@@ -33,8 +33,10 @@ import 'package:get/get.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class PageUtils {
-  static Future<void> pmShare(BuildContext context,
-      {required Map content}) async {
+  static Future<void> pmShare(
+    BuildContext context, {
+    required Map content,
+  }) async {
     // if (kDebugMode) debugPrint(content.toString());
 
     int? selectedIndex;
@@ -42,13 +44,17 @@ class PageUtils {
 
     final shareListRes = await ImGrpc.shareList(size: 3);
     if (shareListRes.isSuccess && shareListRes.data.sessionList.isNotEmpty) {
-      userList.addAll(shareListRes.data.sessionList
-          .map<UserModel>((item) => UserModel(
+      userList.addAll(
+        shareListRes.data.sessionList
+            .map<UserModel>(
+              (item) => UserModel(
                 mid: item.talkerId.toInt(),
                 name: item.talkerUname,
                 avatar: item.talkerIcon,
-              ))
-          .toList());
+              ),
+            )
+            .toList(),
+      );
     } else if (context.mounted) {
       UserModel? userModel = await Navigator.of(context).push(
         GetPageRoute(page: () => const ContactPage()),
@@ -74,8 +80,11 @@ class PageUtils {
     }
   }
 
-  static void scheduleExit(BuildContext context, isFullScreen,
-      [bool isLive = false]) {
+  static void scheduleExit(
+    BuildContext context,
+    isFullScreen, [
+    bool isLive = false,
+  ]) {
     if (!context.mounted) {
       return;
     }
@@ -153,7 +162,8 @@ class PageUtils {
                       ...[
                         ...scheduleTimeChoices,
                         if (!scheduleTimeChoices.contains(
-                            shutdownTimerService.scheduledExitInMinutes))
+                          shutdownTimerService.scheduledExitInMinutes,
+                        ))
                           shutdownTimerService.scheduledExitInMinutes,
                       ]..sort(),
                       -1,
@@ -165,11 +175,12 @@ class PageUtils {
                           choice == -1
                               ? '自定义'
                               : choice == 0
-                                  ? "禁用"
-                                  : "$choice分钟后",
+                              ? "禁用"
+                              : "$choice分钟后",
                           style: titleStyle,
                         ),
-                        trailing: shutdownTimerService.scheduledExitInMinutes ==
+                        trailing:
+                            shutdownTimerService.scheduledExitInMinutes ==
                                 choice
                             ? Icon(
                                 size: 20,
@@ -195,14 +206,16 @@ class PageUtils {
                               scale: 0.8,
                               child: Switch(
                                 thumbIcon:
-                                    WidgetStateProperty.resolveWith<Icon?>(
-                                        (Set<WidgetState> states) {
-                                  if (states.isNotEmpty &&
-                                      states.first == WidgetState.selected) {
-                                    return const Icon(Icons.done);
-                                  }
-                                  return null;
-                                }),
+                                    WidgetStateProperty.resolveWith<Icon?>((
+                                      Set<WidgetState> states,
+                                    ) {
+                                      if (states.isNotEmpty &&
+                                          states.first ==
+                                              WidgetState.selected) {
+                                        return const Icon(Icons.done);
+                                      }
+                                      return null;
+                                    }),
                                 value: shutdownTimerService
                                     .waitForPlayingCompleted,
                                 onChanged: (value) {
@@ -335,8 +348,8 @@ class PageUtils {
           aspectRatio: aspectRatio.fitsInAndroidRequirements
               ? aspectRatio
               : height > width
-                  ? const Rational.vertical()
-                  : const Rational.landscape(),
+              ? const Rational.vertical()
+              : const Rational.landscape(),
         ),
       );
     } else {
@@ -344,8 +357,11 @@ class PageUtils {
     }
   }
 
-  static Future<void> pushDynDetail(DynamicItemModel item, floor,
-      {action = 'all'}) async {
+  static Future<void> pushDynDetail(
+    DynamicItemModel item,
+    floor, {
+    action = 'all',
+  }) async {
     feedBack();
 
     void push() {
@@ -378,13 +394,16 @@ class PageUtils {
     switch (item.type) {
       case 'DYNAMIC_TYPE_AV':
         if (item.modules.moduleDynamic?.major?.archive?.type == 2) {
-          if (item.modules.moduleDynamic!.major!.archive!.jumpUrl!
-              .startsWith('//')) {
+          if (item.modules.moduleDynamic!.major!.archive!.jumpUrl!.startsWith(
+            '//',
+          )) {
             item.modules.moduleDynamic!.major!.archive!.jumpUrl =
                 'https:${item.modules.moduleDynamic!.major!.archive!.jumpUrl!}';
           }
           String? redirectUrl = await UrlUtils.parseRedirectUrl(
-              item.modules.moduleDynamic!.major!.archive!.jumpUrl!, false);
+            item.modules.moduleDynamic!.major!.archive!.jumpUrl!,
+            false,
+          );
           if (redirectUrl != null) {
             viewPgcFromUri(redirectUrl);
             return;
@@ -622,10 +641,12 @@ class PageUtils {
       transitionBuilder: (context, animation, secondaryAnimation, child) {
         Offset begin =
             MediaQuery.orientationOf(Get.context!) == Orientation.portrait
-                ? const Offset(0.0, 1.0)
-                : const Offset(1.0, 0.0);
-        var tween = Tween(begin: begin, end: Offset.zero)
-            .chain(CurveTween(curve: Curves.easeInOut));
+            ? const Offset(0.0, 1.0)
+            : const Offset(1.0, 0.0);
+        var tween = Tween(
+          begin: begin,
+          end: Offset.zero,
+        ).chain(CurveTween(curve: Curves.easeInOut));
         return SlideTransition(
           position: animation.drive(tween),
           child: child,
@@ -678,8 +699,11 @@ class PageUtils {
     return false;
   }
 
-  static Future<void> viewPgc(
-      {dynamic seasonId, dynamic epId, String? progress}) async {
+  static Future<void> viewPgc({
+    dynamic seasonId,
+    dynamic epId,
+    String? progress,
+  }) async {
     try {
       SmartDialog.showLoading(msg: '资源获取中');
       var result = await SearchHttp.pgcInfo(seasonId: seasonId, epId: epId);
@@ -711,7 +735,8 @@ class PageUtils {
                         'pic': item.cover,
                         'heroTag': Utils.makeHeroTag(item.cid),
                         'videoType': SearchType.video,
-                        if (progress != null) 'progress': int.tryParse(progress)
+                        if (progress != null)
+                          'progress': int.tryParse(progress),
                       },
                       preventDuplicates: false,
                     );
@@ -730,9 +755,9 @@ class PageUtils {
 
         episode ??= data.userStatus?.progress?.lastEpId != null
             ? data.episodes!.firstWhereOrNull(
-                  (item) => item.epId == data.userStatus?.progress?.lastEpId,
-                ) ??
-                data.episodes!.first
+                    (item) => item.epId == data.userStatus?.progress?.lastEpId,
+                  ) ??
+                  data.episodes!.first
             : data.episodes!.first;
         toVideoPage(
           'bvid=${episode.bvid}&cid=${episode.cid}&seasonId=${data.seasonId}&epId=${episode.epId}&type=${data.type}',
@@ -741,7 +766,7 @@ class PageUtils {
             'heroTag': Utils.makeHeroTag(episode.cid),
             'videoType': SearchType.media_bangumi,
             'pgcItem': data,
-            if (progress != null) 'progress': int.tryParse(progress)
+            if (progress != null) 'progress': int.tryParse(progress),
           },
           preventDuplicates: false,
         );
diff --git a/lib/utils/proxy.dart b/lib/utils/proxy.dart
index dae6fce3b..fbc08d780 100644
--- a/lib/utils/proxy.dart
+++ b/lib/utils/proxy.dart
@@ -6,8 +6,10 @@ class CustomProxy {
   Future<void> init() async {
     Map<String, String>? proxy = await SystemProxy.getProxySettings();
     if (proxy != null) {
-      HttpOverrides.global =
-          ProxiedHttpOverrides(proxy['host']!, proxy['port']!);
+      HttpOverrides.global = ProxiedHttpOverrides(
+        proxy['host']!,
+        proxy['port']!,
+      );
     }
   }
 }
diff --git a/lib/utils/recommend_filter.dart b/lib/utils/recommend_filter.dart
index 8a7fee903..756c3d0ab 100644
--- a/lib/utils/recommend_filter.dart
+++ b/lib/utils/recommend_filter.dart
@@ -7,8 +7,10 @@ class RecommendFilter {
   static int minLikeRatioForRecommend = Pref.minLikeRatioForRecommend;
   static bool exemptFilterForFollowed = Pref.exemptFilterForFollowed;
   static bool applyFilterToRelatedVideos = Pref.applyFilterToRelatedVideos;
-  static RegExp rcmdRegExp =
-      RegExp(Pref.banWordForRecommend, caseSensitive: false);
+  static RegExp rcmdRegExp = RegExp(
+    Pref.banWordForRecommend,
+    caseSensitive: false,
+  );
   static bool enableFilter = rcmdRegExp.pattern.isNotEmpty;
 
   static bool filter(BaseVideoItemModel videoItem) {
diff --git a/lib/utils/reply_utils.dart b/lib/utils/reply_utils.dart
index 6dab6a29b..6b7b8b175 100644
--- a/lib/utils/reply_utils.dart
+++ b/lib/utils/reply_utils.dart
@@ -122,7 +122,7 @@ class ReplyUtils {
                         '/webview',
                         parameters: {
                           'url':
-                              'https://www.bilibili.com/h5/comment/appeal?native.theme=2&night=${Get.isDarkMode ? 1 : 0}'
+                              'https://www.bilibili.com/h5/comment/appeal?native.theme=2&night=${Get.isDarkMode ? 1 : 0}',
                         },
                       );
                     },
@@ -200,20 +200,22 @@ class ReplyUtils {
               );
             } else {
               // found
-              showReplyCheckResult(isManual
-                  ? '无账号状态下找到了你的评论，评论正常！\n\n你的评论：$message'
-                  : '''
+              showReplyCheckResult(
+                isManual
+                    ? '无账号状态下找到了你的评论，评论正常！\n\n你的评论：$message'
+                    : '''
 你评论状态有点可疑，虽然无账号翻找评论区获取不到你的评论，但是无账号可通过
 https://api.bilibili.com/x/v2/reply/reply?oid=$oid&pn=1&ps=20&root=$id&type=$type
 获取你的评论，疑似评论区被戒严或者这是你的视频。
 
-你的评论：$message''');
+你的评论：$message''',
+              );
             }
           }
         }
       }
     } else {
-      for (int i = 1;; i++) {
+      for (int i = 1; ; i++) {
         final res3 = await ReplyHttp.replyReplyList(
           isLogin: false,
           oid: oid,
@@ -242,7 +244,7 @@ https://api.bilibili.com/x/v2/reply/reply?oid=$oid&pn=1&ps=20&root=$id&type=$typ
         }
       }
 
-      for (int i = 1;; i++) {
+      for (int i = 1; ; i++) {
         final res4 = await ReplyHttp.replyReplyList(
           isLogin: true,
           oid: oid,
diff --git a/lib/utils/request_utils.dart b/lib/utils/request_utils.dart
index 021540e61..3d02f52ee 100644
--- a/lib/utils/request_utils.dart
+++ b/lib/utils/request_utils.dart
@@ -161,8 +161,9 @@ class RequestUtils {
                         context: context,
                         useSafeArea: true,
                         isScrollControlled: true,
-                        sheetAnimationStyle:
-                            const AnimationStyle(curve: Curves.ease),
+                        sheetAnimationStyle: const AnimationStyle(
+                          curve: Curves.ease,
+                        ),
                         constraints: BoxConstraints(
                           maxWidth: min(640, context.mediaQueryShortestSide),
                         ),
@@ -174,14 +175,17 @@ class RequestUtils {
                             snap: true,
                             expand: false,
                             snapSizes: const [0.7],
-                            builder: (BuildContext context,
-                                ScrollController scrollController) {
-                              return GroupPanel(
-                                mid: mid,
-                                tags: followStatus!['tag'],
-                                scrollController: scrollController,
-                              );
-                            },
+                            builder:
+                                (
+                                  BuildContext context,
+                                  ScrollController scrollController,
+                                ) {
+                                  return GroupPanel(
+                                    mid: mid,
+                                    tags: followStatus!['tag'],
+                                    scrollController: scrollController,
+                                  );
+                                },
                           );
                         },
                       );
@@ -205,7 +209,8 @@ class RequestUtils {
                         reSrc: 11,
                       );
                       SmartDialog.showToast(
-                          res['status'] ? "取消关注成功" : res['msg']);
+                        res['status'] ? "取消关注成功" : res['msg'],
+                      );
                       if (res['status']) {
                         callback?.call(0);
                       }
@@ -229,21 +234,20 @@ class RequestUtils {
     emote?.forEach((key, value) {
       value['size'] = value['meta']['size'];
     });
-    return ReplyInfo.create()
-      ..mergeFromProto3Json(
-        res
-          ..['content'].remove('members')
-          ..['id'] = res['rpid']
-          ..['member']['name'] = res['member']['uname']
-          ..['member']['face'] = res['member']['avatar']
-          ..['member']['level'] = res['member']['level_info']['current_level']
-          ..['member']['vipStatus'] = res['member']['vip']['vipStatus']
-          ..['member']['vipType'] = res['member']['vip']['vipType']
-          ..['member']['officialVerifyType'] =
-              res['member']['official_verify']['type']
-          ..['content']['emotes'] = emote,
-        ignoreUnknownFields: true,
-      );
+    return ReplyInfo.create()..mergeFromProto3Json(
+      res
+        ..['content'].remove('members')
+        ..['id'] = res['rpid']
+        ..['member']['name'] = res['member']['uname']
+        ..['member']['face'] = res['member']['avatar']
+        ..['member']['level'] = res['member']['level_info']['current_level']
+        ..['member']['vipStatus'] = res['member']['vip']['vipStatus']
+        ..['member']['vipType'] = res['member']['vip']['vipType']
+        ..['member']['officialVerifyType'] =
+            res['member']['official_verify']['type']
+        ..['content']['emotes'] = emote,
+      ignoreUnknownFields: true,
+    );
   }
 
   // static Future<dynamic> getWwebid(mid) async {
@@ -288,8 +292,11 @@ class RequestUtils {
     }
   }
 
-  static Future<void> checkCreatedDyn(
-      {dynamic id, String? dynText, bool isManual = false}) async {
+  static Future<void> checkCreatedDyn({
+    dynamic id,
+    String? dynText,
+    bool isManual = false,
+  }) async {
     if (isManual || Pref.enableCreateDynAntifraud) {
       try {
         if (id != null) {
@@ -302,7 +309,8 @@ class RequestUtils {
             AlertDialog(
               title: const Text('动态检查结果'),
               content: SelectableText(
-                  '${!isBan ? '无账号状态下找到了你的动态，动态正常！' : '你的动态被shadow ban（仅自己可见）！'}${dynText != null ? ' \n\n动态内容: $dynText' : ''}'),
+                '${!isBan ? '无账号状态下找到了你的动态，动态正常！' : '你的动态被shadow ban（仅自己可见）！'}${dynText != null ? ' \n\n动态内容: $dynText' : ''}',
+              ),
               actions: isBan
                   ? [
                       TextButton(
@@ -313,7 +321,7 @@ class RequestUtils {
                             '/webview',
                             parameters: {
                               'url':
-                                  'https://www.bilibili.com/h5/comment/appeal?native.theme=2&night=${Get.isDarkMode ? 1 : 0}'
+                                  'https://www.bilibili.com/h5/comment/appeal?native.theme=2&night=${Get.isDarkMode ? 1 : 0}',
                             },
                           );
                         },
@@ -332,7 +340,9 @@ class RequestUtils {
 
   // 动态点赞
   static Future<void> onLikeDynamic(
-      DynamicItemModel item, VoidCallback callback) async {
+    DynamicItemModel item,
+    VoidCallback callback,
+  ) async {
     feedBack();
     String dynamicId = item.idStr!;
     // 1 已点赞 2 不喜欢 0 未操作
@@ -403,8 +413,9 @@ class RequestUtils {
                   onPressed: Get.back,
                   child: Text(
                     '取消',
-                    style:
-                        TextStyle(color: Theme.of(context).colorScheme.outline),
+                    style: TextStyle(
+                      color: Theme.of(context).colorScheme.outline,
+                    ),
                   ),
                 ),
                 TextButton(
@@ -420,9 +431,11 @@ class RequestUtils {
                         srcMediaId: mediaId,
                         tarMediaId: checkedId,
                         resources: resources
-                            .map((item) => ctr is LaterController
-                                ? item.aid
-                                : '${item.id}:${item.type}')
+                            .map(
+                              (item) => ctr is LaterController
+                                  ? item.aid
+                                  : '${item.id}:${item.type}',
+                            )
                             .toList(),
                         mid: isCopy ? mid : null,
                       ).then((res) {
@@ -459,7 +472,9 @@ class RequestUtils {
   }
 
   static Future<void> validate(
-      String vVoucher, ValueChanged<String> onSuccess) async {
+    String vVoucher,
+    ValueChanged<String> onSuccess,
+  ) async {
     final res = await ValidateHttp.gaiaVgateRegister(vVoucher);
     if (!res['status']) {
       SmartDialog.showToast("${res['msg']}");
diff --git a/lib/utils/storage_key.dart b/lib/utils/storage_key.dart
index 1f7135d8f..7e38526cf 100644
--- a/lib/utils/storage_key.dart
+++ b/lib/utils/storage_key.dart
@@ -1,251 +1,78 @@
 class SettingBoxKey {
   /// 播放器
-  static const String btmProgressBehavior = 'btmProgressBehavior',
-      defaultVideoSpeed = 'defaultVideoSpeed',
-      autoUpgradeEnable = 'autoUpgradeEnable',
-      feedBackEnable = 'feedBackEnable',
-      defaultVideoQa = 'defaultVideoQa',
-      defaultVideoQaCellular = 'defaultVideoQaCellular',
-      defaultAudioQa = 'defaultAudioQa',
-      defaultAudioQaCellular = 'defaultAudioQaCellular',
-      autoPlayEnable = 'autoPlayEnable',
-      fullScreenMode = 'fullScreenMode',
-      defaultDecode = 'defaultDecode',
-      secondDecode = 'secondDecode',
-      danmakuEnable = 'danmakuEnable',
-      defaultToastOp = 'defaultToastOp',
-      defaultPicQa = 'defaultPicQa',
-      enableHA = 'enableHA',
-      useOpenSLES = 'useOpenSLES',
-      expandBuffer = 'expandBuffer',
-      hardwareDecoding = 'hardwareDecoding',
-      videoSync = 'videoSync',
-      enableVerticalExpand = 'enableVerticalExpand',
-      enableOnlineTotal = 'enableOnlineTotal',
-      enableAutoBrightness = 'enableAutoBrightness',
-      enableAutoEnter = 'enableAutoEnter',
-      enableAutoExit = 'enableAutoExit',
-      enableLongShowControl = 'enableLongShowControl',
-      allowRotateScreen = 'allowRotateScreen',
-      horizontalScreen = 'horizontalScreen',
-      p1080 = 'p1080',
-      // ignore: constant_identifier_names
-      CDNService = 'CDNService',
-      disableAudioCDN = 'disableAudioCDN',
-      autoPiP = 'autoPiP',
-      pipNoDanmaku = 'pipNoDanmaku',
-      enableAutoLongPressSpeed = 'enableAutoLongPressSpeed',
-      subtitlePreference = 'subtitlePreference',
-      useRelativeSlide = 'useRelativeSlide',
-      sliderDuration = 'sliderOffset',
-
-      // youtube 双击快进快退
-      enableQuickDouble = 'enableQuickDouble',
-      fullScreenGestureReverse = 'fullScreenGestureReverse',
-      enableShowDanmaku = 'enableShowDanmaku',
-      enableBackgroundPlay = 'enableBackgroundPlay',
-      continuePlayInBackground = 'continuePlayInBackground',
-
-      /// 隐私
-      // anonymity = 'anonymity',
-
-      /// 推荐
-      enableRcmdDynamic = 'enableRcmdDynamic',
-      appRcmd = 'appRcmd',
-      enableSaveLastData = 'enableSaveLastData',
-      minDurationForRcmd = 'minDurationForRcmd',
-      minPlayForRcmd = 'minPlayForRcmd',
-      minLikeRatioForRecommend = 'minLikeRatioForRecommend',
-      exemptFilterForFollowed = 'exemptFilterForFollowed',
-      banWordForRecommend = 'banWordForRecommend',
-      applyFilterToRelatedVideos = 'applyFilterToRelatedVideos',
-
-      /// 其他
-      autoUpdate = 'autoUpdate',
-      autoClearCache = 'autoClearCache',
-      maxCacheSize = 'maxCacheSize',
-      defaultShowComment = 'defaultShowComment',
-      replySortType = 'replySortType',
-      defaultDynamicType = 'defaultDynamicType',
-      enableHotKey = 'enableHotKey',
-      enableSearchRcmd = 'enableSearchRcmd',
-      enableQuickFav = 'enableQuickFav',
-      enableWordRe = 'enableWordRe',
-      enableSearchWord = 'enableSearchWord',
-      enableSystemProxy = 'enableSystemProxy',
-      enableAi = 'enableAi',
-      disableLikeMsg = 'disableLikeMsg',
-      defaultHomePage = 'defaultHomePage',
-      previewQuality = 'previewQuality',
-      checkDynamic = 'checkDynamic',
-      dynamicPeriod = 'dynamicPeriod',
-      schemeVariant = 'schemeVariant',
-      showViewPoints = 'showViewPoints',
-      showRelatedVideo = 'showRelatedVideo',
-      showVideoReply = 'showVideoReply',
-      showBangumiReply = 'showBangumiReply',
-      alwaysExapndIntroPanel = 'alwaysExapndIntroPanel',
-      exapndIntroPanelH = 'exapndIntroPanelH',
-      horizontalSeasonPanel = 'horizontalSeasonPanel',
-      horizontalMemberPage = 'horizontalMemberPage',
-      replyLengthLimit = 'replyLengthLimit',
-      showArgueMsg = 'showArgueMsg',
-      reverseFromFirst = 'reverseFromFirst',
-      subtitlePaddingH = 'subtitlePaddingH',
-      subtitlePaddingB = 'subtitlePaddingB',
-      subtitleBgOpaticy = 'subtitleBgOpaticy',
-      subtitleStrokeWidth = 'subtitleStrokeWidth',
-      subtitleFontScale = 'subtitleFontScale',
-      subtitleFontScaleFS = 'subtitleFontScaleFS',
-      subtitleFontWeight = 'subtitleFontWeight',
-      badCertificateCallback = 'badCertificateCallback',
-      continuePlayingPart = 'continuePlayingPart',
-      cdnSpeedTest = 'cdnSpeedTest',
-      horizontalPreview = 'horizontalPreview',
-      banWordForReply = 'banWordForReply',
-      banWordForZone = 'banWordForZone',
-      savedRcmdTip = 'savedRcmdTip',
-      openInBrowser = 'openInBrowser',
-      refreshDragPercentage = 'refreshDragPercentage',
-      refreshDisplacement = 'refreshDisplacement',
-      showVipDanmaku = 'showVipDanmaku',
-      showSpecialDanmaku = 'showSpecialDanmaku',
-      mergeDanmaku = 'mergeDanmaku',
-      showHotRcmd = 'showHotRcmd',
-      audioNormalization = 'audioNormalization',
-      superResolutionType = 'superResolutionType',
-      preInitPlayer = 'preInitPlayer',
-      mainTabBarView = 'mainTabBarView',
-      searchSuggestion = 'searchSuggestion',
-      showDynDecorate = 'showDynDecorate',
-      enableLivePhoto = 'enableLivePhoto',
-      showSeekPreview = 'showSeekPreview',
-      showDmChart = 'showDmChart',
-      enableCommAntifraud = 'enableCommAntifraud',
-      biliSendCommAntifraud = 'biliSendCommAntifraud',
-      enableCreateDynAntifraud = 'enableCreateDynAntifraud',
-      coinWithLike = 'coinWithLike',
-      isPureBlackTheme = 'isPureBlackTheme',
-      antiGoodsDyn = 'antiGoodsDyn',
-      antiGoodsReply = 'antiGoodsReply',
-      expandDynLivePanel = 'expandDynLivePanel',
-      springDescription = 'springDescription',
-      enableHttp2 = 'enableHttp2',
-      slideDismissReplyPage = 'slideDismissReplyPage',
-      showFSActionItem = 'showFSActionItem',
-      enableShrinkVideoSize = 'enableShrinkVideoSize',
-      showDynActionBar = 'showDynActionBar',
-      darkVideoPage = 'darkVideoPage',
-      enableSlideVolumeBrightness = 'enableSlideVolumeBrightness',
-      enableSlideFS = 'enableSlideFS',
-      retryCount = 'retryCount',
-      retryDelay = 'retryDelay',
-      liveQuality = 'liveQuality',
-      liveQualityCellular = 'liveQualityCellular',
-      appFontWeight = 'appFontWeight',
-      enableDragSubtitle = 'enableDragSubtitle',
-      fastForBackwardDuration = 'fastForBackwardDuration',
-      recordSearchHistory = 'recordSearchHistory',
-      navSearchStreamDebounce = 'navSearchStreamDebounce',
-      showPgcTimeline = 'showPgcTimeline',
-      pageTransition = 'pageTransition',
-      optTabletNav = 'optTabletNav',
-      banWordForDyn = 'banWordForDyn',
-      enableLog = 'enableLog',
-
-      // WebDAV
-      webdavUri = 'webdavUri',
-      webdavUsername = 'webdavUsername',
-      webdavPassword = 'webdavPassword',
-      webdavDirectory = 'webdavDirectory',
-
-      // Sponsor Block
-      enableSponsorBlock = 'enableSponsorBlock',
-      blockSettings = 'blockSettings',
-      blockLimit = 'blockLimit',
-      blockColor = 'blockColor',
-      blockUserID = 'blockUserID',
-      blockToast = 'blockToast',
-      blockServer = 'blockServer',
-      blockTrack = 'blockTrack',
-
-      // 弹幕相关设置 权重（云屏蔽） 屏蔽类型 显示区域 透明度 字体大小 弹幕时间 描边粗细 字体粗细
-      danmakuWeight = 'danmakuWeight',
-      danmakuBlockType = 'danmakuBlockType',
-      danmakuShowArea = 'danmakuShowArea',
-      danmakuOpacity = 'danmakuOpacity',
-      danmakuFontScale = 'danmakuFontScale',
-      danmakuFontScaleFS = 'danmakuFontScaleFS',
-      danmakuDuration = 'danmakuDuration',
-      danmakuStaticDuration = 'danmakuStaticDuration',
-      danmakuMassiveMode = 'danmakuMassiveMode',
-      danmakuLineHeight = 'danmakuLineHeight',
-      strokeWidth = 'strokeWidth',
-      fontWeight = 'fontWeight',
-      memberTab = 'memberTab',
-      dynamicDetailRatio = 'dynamicDetailRatio',
-
-      // 代理host port
-      systemProxyHost = 'systemProxyHost',
-      systemProxyPort = 'systemProxyPort';
+  static const String btmProgressBehavior = 'btmProgressBehavior', defaultVideoSpeed = 'defaultVideoSpeed', autoUpgradeEnable = 'autoUpgradeEnable', feedBackEnable = 'feedBackEnable', defaultVideoQa = 'defaultVideoQa', defaultVideoQaCellular = 'defaultVideoQaCellular', defaultAudioQa = 'defaultAudioQa', defaultAudioQaCellular = 'defaultAudioQaCellular', autoPlayEnable = 'autoPlayEnable', fullScreenMode = 'fullScreenMode', defaultDecode = 'defaultDecode', secondDecode = 'secondDecode', danmakuEnable = 'danmakuEnable', defaultToastOp = 'defaultToastOp', defaultPicQa = 'defaultPicQa', enableHA = 'enableHA', useOpenSLES = 'useOpenSLES', expandBuffer = 'expandBuffer', hardwareDecoding = 'hardwareDecoding', videoSync = 'videoSync', enableVerticalExpand = 'enableVerticalExpand', enableOnlineTotal = 'enableOnlineTotal', enableAutoBrightness = 'enableAutoBrightness', enableAutoEnter = 'enableAutoEnter', enableAutoExit = 'enableAutoExit', enableLongShowControl = 'enableLongShowControl', allowRotateScreen = 'allowRotateScreen', horizontalScreen = 'horizontalScreen', p1080 = 'p1080',
+  // ignore: constant_identifier_names
+  CDNService = 'CDNService', disableAudioCDN = 'disableAudioCDN', autoPiP = 'autoPiP', pipNoDanmaku = 'pipNoDanmaku', enableAutoLongPressSpeed = 'enableAutoLongPressSpeed', subtitlePreference = 'subtitlePreference', useRelativeSlide = 'useRelativeSlide', sliderDuration = 'sliderOffset',
+  // youtube 双击快进快退
+  enableQuickDouble = 'enableQuickDouble', fullScreenGestureReverse = 'fullScreenGestureReverse', enableShowDanmaku = 'enableShowDanmaku', enableBackgroundPlay = 'enableBackgroundPlay', continuePlayInBackground = 'continuePlayInBackground',
+  /// 隐私
+  // anonymity = 'anonymity',
+  /// 推荐
+  enableRcmdDynamic = 'enableRcmdDynamic', appRcmd = 'appRcmd', enableSaveLastData = 'enableSaveLastData', minDurationForRcmd = 'minDurationForRcmd', minPlayForRcmd = 'minPlayForRcmd', minLikeRatioForRecommend = 'minLikeRatioForRecommend', exemptFilterForFollowed = 'exemptFilterForFollowed', banWordForRecommend = 'banWordForRecommend', applyFilterToRelatedVideos = 'applyFilterToRelatedVideos',
+  /// 其他
+  autoUpdate = 'autoUpdate', autoClearCache = 'autoClearCache', maxCacheSize = 'maxCacheSize', defaultShowComment = 'defaultShowComment', replySortType = 'replySortType', defaultDynamicType = 'defaultDynamicType', enableHotKey = 'enableHotKey', enableSearchRcmd = 'enableSearchRcmd', enableQuickFav = 'enableQuickFav', enableWordRe = 'enableWordRe', enableSearchWord = 'enableSearchWord', enableSystemProxy = 'enableSystemProxy', enableAi = 'enableAi', disableLikeMsg = 'disableLikeMsg', defaultHomePage = 'defaultHomePage', previewQuality = 'previewQuality', checkDynamic = 'checkDynamic', dynamicPeriod = 'dynamicPeriod', schemeVariant = 'schemeVariant', showViewPoints = 'showViewPoints', showRelatedVideo = 'showRelatedVideo', showVideoReply = 'showVideoReply', showBangumiReply = 'showBangumiReply', alwaysExapndIntroPanel = 'alwaysExapndIntroPanel', exapndIntroPanelH = 'exapndIntroPanelH', horizontalSeasonPanel = 'horizontalSeasonPanel', horizontalMemberPage = 'horizontalMemberPage', replyLengthLimit = 'replyLengthLimit', showArgueMsg = 'showArgueMsg', reverseFromFirst = 'reverseFromFirst', subtitlePaddingH = 'subtitlePaddingH', subtitlePaddingB = 'subtitlePaddingB', subtitleBgOpaticy = 'subtitleBgOpaticy', subtitleStrokeWidth = 'subtitleStrokeWidth', subtitleFontScale = 'subtitleFontScale', subtitleFontScaleFS = 'subtitleFontScaleFS', subtitleFontWeight = 'subtitleFontWeight', badCertificateCallback = 'badCertificateCallback', continuePlayingPart = 'continuePlayingPart', cdnSpeedTest = 'cdnSpeedTest', horizontalPreview = 'horizontalPreview', banWordForReply = 'banWordForReply', banWordForZone = 'banWordForZone', savedRcmdTip = 'savedRcmdTip', openInBrowser = 'openInBrowser', refreshDragPercentage = 'refreshDragPercentage', refreshDisplacement = 'refreshDisplacement', showVipDanmaku = 'showVipDanmaku', showSpecialDanmaku = 'showSpecialDanmaku', mergeDanmaku = 'mergeDanmaku', showHotRcmd = 'showHotRcmd', audioNormalization = 'audioNormalization', superResolutionType = 'superResolutionType', preInitPlayer = 'preInitPlayer', mainTabBarView = 'mainTabBarView', searchSuggestion = 'searchSuggestion', showDynDecorate = 'showDynDecorate', enableLivePhoto = 'enableLivePhoto', showSeekPreview = 'showSeekPreview', showDmChart = 'showDmChart', enableCommAntifraud = 'enableCommAntifraud', biliSendCommAntifraud = 'biliSendCommAntifraud', enableCreateDynAntifraud = 'enableCreateDynAntifraud', coinWithLike = 'coinWithLike', isPureBlackTheme = 'isPureBlackTheme', antiGoodsDyn = 'antiGoodsDyn', antiGoodsReply = 'antiGoodsReply', expandDynLivePanel = 'expandDynLivePanel', springDescription = 'springDescription', enableHttp2 = 'enableHttp2', slideDismissReplyPage = 'slideDismissReplyPage', showFSActionItem = 'showFSActionItem', enableShrinkVideoSize = 'enableShrinkVideoSize', showDynActionBar = 'showDynActionBar', darkVideoPage = 'darkVideoPage', enableSlideVolumeBrightness = 'enableSlideVolumeBrightness', enableSlideFS = 'enableSlideFS', retryCount = 'retryCount', retryDelay = 'retryDelay', liveQuality = 'liveQuality', liveQualityCellular = 'liveQualityCellular', appFontWeight = 'appFontWeight', enableDragSubtitle = 'enableDragSubtitle', fastForBackwardDuration = 'fastForBackwardDuration', recordSearchHistory = 'recordSearchHistory', navSearchStreamDebounce = 'navSearchStreamDebounce', showPgcTimeline = 'showPgcTimeline', pageTransition = 'pageTransition', optTabletNav = 'optTabletNav', banWordForDyn = 'banWordForDyn', enableLog = 'enableLog',
+  // WebDAV
+  webdavUri = 'webdavUri', webdavUsername = 'webdavUsername', webdavPassword = 'webdavPassword', webdavDirectory = 'webdavDirectory',
+  // Sponsor Block
+  enableSponsorBlock = 'enableSponsorBlock', blockSettings = 'blockSettings', blockLimit = 'blockLimit', blockColor = 'blockColor', blockUserID = 'blockUserID', blockToast = 'blockToast', blockServer = 'blockServer', blockTrack = 'blockTrack',
+  // 弹幕相关设置 权重（云屏蔽） 屏蔽类型 显示区域 透明度 字体大小 弹幕时间 描边粗细 字体粗细
+  danmakuWeight = 'danmakuWeight', danmakuBlockType = 'danmakuBlockType', danmakuShowArea = 'danmakuShowArea', danmakuOpacity = 'danmakuOpacity', danmakuFontScale = 'danmakuFontScale', danmakuFontScaleFS = 'danmakuFontScaleFS', danmakuDuration = 'danmakuDuration', danmakuStaticDuration = 'danmakuStaticDuration', danmakuMassiveMode = 'danmakuMassiveMode', danmakuLineHeight = 'danmakuLineHeight', strokeWidth = 'strokeWidth', fontWeight = 'fontWeight', memberTab = 'memberTab', dynamicDetailRatio = 'dynamicDetailRatio',
+  // 代理host port
+  systemProxyHost = 'systemProxyHost', systemProxyPort = 'systemProxyPort';
 
   /// 外观
-  static const String themeMode = 'themeMode',
-      defaultTextScale = 'textScale',
-      dynamicColor = 'dynamicColor', // bool
-      customColor = 'customColor', // 自定义主题色
-      enableSingleRow = 'enableSingleRow', // 首页单列
-      displayMode = 'displayMode',
-      smallCardWidth = 'smallCardWidth',
-      videoPlayerRemoveSafeArea = 'videoPlayerRemoveSafeArea', // 视频播放器移除安全边距
-      dynamicsWaterfallFlow = 'dynamicsWaterfallFlow', // 动态瀑布流
-      upPanelPosition = 'upPanelPosition', // up主面板位置
-      dynamicsShowAllFollowedUp = 'dynamicsShowAllFollowedUp', // 动态显示全部关注up
-      useSideBar = 'useSideBar',
-      enableMYBar = 'enableMYBar',
-      hideSearchBar = 'hideSearchBar', // 收起顶栏
-      hideTabBar = 'hideTabBar', // 收起底栏
-      tabBarSort = 'tabBarSort', // 首页tabbar
-      dynamicBadgeMode = 'dynamicBadgeMode',
-      msgBadgeMode = 'msgBadgeMode',
-      msgUnReadTypeV2 = 'msgUnReadTypeV2',
-      hiddenSettingUnlocked = 'hiddenSettingUnlocked',
-      enableGradientBg = 'enableGradientBg',
-      navBarSort = 'navBarSort',
-      directExitOnBack = 'directExitOnBack';
+  static const String themeMode = 'themeMode', defaultTextScale = 'textScale', dynamicColor = 'dynamicColor', // bool
+  customColor = 'customColor', // 自定义主题色
+  enableSingleRow = 'enableSingleRow', // 首页单列
+  displayMode = 'displayMode', smallCardWidth = 'smallCardWidth', videoPlayerRemoveSafeArea = 'videoPlayerRemoveSafeArea', // 视频播放器移除安全边距
+  dynamicsWaterfallFlow = 'dynamicsWaterfallFlow', // 动态瀑布流
+  upPanelPosition = 'upPanelPosition', // up主面板位置
+  dynamicsShowAllFollowedUp = 'dynamicsShowAllFollowedUp', // 动态显示全部关注up
+  useSideBar = 'useSideBar', enableMYBar = 'enableMYBar', hideSearchBar = 'hideSearchBar', // 收起顶栏
+  hideTabBar = 'hideTabBar', // 收起底栏
+  tabBarSort = 'tabBarSort', // 首页tabbar
+  dynamicBadgeMode = 'dynamicBadgeMode', msgBadgeMode = 'msgBadgeMode', msgUnReadTypeV2 = 'msgUnReadTypeV2', hiddenSettingUnlocked = 'hiddenSettingUnlocked', enableGradientBg = 'enableGradientBg', navBarSort = 'navBarSort', directExitOnBack = 'directExitOnBack';
 }
 
 class LocalCacheKey {
   // 历史记录暂停状态 默认false 记录
   static const String historyPause = 'historyPause',
-
-      // 隐私设置-黑名单管理
-      blackMids = 'blackMids',
-      // 弹幕屏蔽规则
-      danmakuFilterRules = 'danmakuFilterRules',
-      // // access_key
-      // accessKey = 'accessKey',
-
-      //
-      mixinKey = 'mixinKey',
+          // 隐私设置-黑名单管理
+          blackMids =
+          'blackMids',
+          // 弹幕屏蔽规则
+          danmakuFilterRules =
+          'danmakuFilterRules',
+          // // access_key
+          // accessKey = 'accessKey',
+          //
+          mixinKey =
+          'mixinKey',
       timeStamp = 'timeStamp';
 }
 
 class VideoBoxKey {
   // 视频比例
   static const String videoFit = 'videoFit',
-      // 亮度
-      videoBrightness = 'videoBrightness',
-      // 倍速
-      videoSpeed = 'videoSpeed',
-      // 播放顺序
-      playRepeat = 'playRepeat',
-      // 默认倍速
-      playSpeedDefault = 'playSpeedDefault',
-      // 默认长按倍速
-      longPressSpeedDefault = 'longPressSpeedDefault',
-      // 倍速集合
-      speedsList = 'speedsList',
-      // 画面填充比例
-      cacheVideoFit = 'cacheVideoFit';
+          // 亮度
+          videoBrightness =
+          'videoBrightness',
+          // 倍速
+          videoSpeed =
+          'videoSpeed',
+          // 播放顺序
+          playRepeat =
+          'playRepeat',
+          // 默认倍速
+          playSpeedDefault =
+          'playSpeedDefault',
+          // 默认长按倍速
+          longPressSpeedDefault =
+          'longPressSpeedDefault',
+          // 倍速集合
+          speedsList =
+          'speedsList',
+          // 画面填充比例
+          cacheVideoFit =
+          'cacheVideoFit';
 }
diff --git a/lib/utils/storage_pref.dart b/lib/utils/storage_pref.dart
index 6867cbd62..66c56605a 100644
--- a/lib/utils/storage_pref.dart
+++ b/lib/utils/storage_pref.dart
@@ -34,8 +34,12 @@ class Pref {
   static final Box _video = GStorage.video;
   static final Box _localCache = GStorage.localCache;
 
-  static List<double> get dynamicDetailRatio => List<double>.from(_setting
-      .get(SettingBoxKey.dynamicDetailRatio, defaultValue: const [60.0, 40.0]));
+  static List<double> get dynamicDetailRatio => List<double>.from(
+    _setting.get(
+      SettingBoxKey.dynamicDetailRatio,
+      defaultValue: const [60.0, 40.0],
+    ),
+  );
 
   static Set<int> get blackMids =>
       _localCache.get(LocalCacheKey.blackMids, defaultValue: const <int>{});
@@ -44,8 +48,10 @@ class Pref {
     _localCache.put(LocalCacheKey.blackMids, blackMidsSet);
   }
 
-  static RuleFilter get danmakuFilterRule => _localCache
-      .get(LocalCacheKey.danmakuFilterRules, defaultValue: RuleFilter.empty());
+  static RuleFilter get danmakuFilterRule => _localCache.get(
+    LocalCacheKey.danmakuFilterRules,
+    defaultValue: RuleFilter.empty(),
+  );
 
   static void setBlackMid(int mid) {
     _localCache.put(LocalCacheKey.blackMids, GlobalData().blackMids..add(mid));
@@ -53,59 +59,76 @@ class Pref {
 
   static void removeBlackMid(int mid) {
     _localCache.put(
-        LocalCacheKey.blackMids, GlobalData().blackMids..remove(mid));
+      LocalCacheKey.blackMids,
+      GlobalData().blackMids..remove(mid),
+    );
   }
 
-  static MemberTabType get memberTab => MemberTabType
-      .values[_setting.get(SettingBoxKey.memberTab, defaultValue: 0)];
+  static MemberTabType get memberTab =>
+      MemberTabType.values[_setting.get(
+        SettingBoxKey.memberTab,
+        defaultValue: 0,
+      )];
 
-  static int get themeTypeInt => _setting.get(SettingBoxKey.themeMode,
-      defaultValue: ThemeType.system.index);
+  static int get themeTypeInt => _setting.get(
+    SettingBoxKey.themeMode,
+    defaultValue: ThemeType.system.index,
+  );
 
   static ThemeMode get themeMode {
     return switch (themeTypeInt) {
       0 => ThemeMode.light,
       1 => ThemeMode.dark,
-      _ => ThemeMode.system
+      _ => ThemeMode.system,
     };
   }
 
   static List<double> get springDescription => List<double>.from(
-        _setting.get(SettingBoxKey.springDescription) ??
-            [0.5, 100.0, 2.2 * sqrt(50)], // [mass, stiffness, damping]
-      );
+    _setting.get(SettingBoxKey.springDescription) ??
+        [0.5, 100.0, 2.2 * sqrt(50)], // [mass, stiffness, damping]
+  );
 
   static List<double> get speedList => List<double>.from(
-        _video.get(
-          VideoBoxKey.speedsList,
-          defaultValue: const [0.5, 0.75, 1.0, 1.25, 1.5, 1.75, 2.0, 3.0],
-        ),
-      );
+    _video.get(
+      VideoBoxKey.speedsList,
+      defaultValue: const [0.5, 0.75, 1.0, 1.25, 1.5, 1.75, 2.0, 3.0],
+    ),
+  );
 
-  static List<int> get tabbarSort =>
-      List<int>.from(_setting.get(SettingBoxKey.tabBarSort) ??
-          HomeTabType.values.map((item) => item.index).toList());
+  static List<int> get tabbarSort => List<int>.from(
+    _setting.get(SettingBoxKey.tabBarSort) ??
+        HomeTabType.values.map((item) => item.index).toList(),
+  );
 
   static List<Pair<SegmentType, SkipType>> get blockSettings {
-    List<int> list = List<int>.from(_setting.get(SettingBoxKey.blockSettings) ??
-        List.generate(SegmentType.values.length, (_) => 1));
+    List<int> list = List<int>.from(
+      _setting.get(SettingBoxKey.blockSettings) ??
+          List.generate(SegmentType.values.length, (_) => 1),
+    );
     return SegmentType.values
-        .map((item) => Pair<SegmentType, SkipType>(
-              first: item,
-              second: SkipType.values[list[item.index]],
-            ))
+        .map(
+          (item) => Pair<SegmentType, SkipType>(
+            first: item,
+            second: SkipType.values[list[item.index]],
+          ),
+        )
         .toList();
   }
 
   static List<Color> get blockColor {
     List<String> list = List<String>.from(
-        _setting.get(SettingBoxKey.blockColor) ??
-            List.generate(SegmentType.values.length, (_) => ''));
+      _setting.get(SettingBoxKey.blockColor) ??
+          List.generate(SegmentType.values.length, (_) => ''),
+    );
     return SegmentType.values
-        .map((item) => list[item.index].isNotEmpty
-            ? Color(
-                int.tryParse('FF${list[item.index]}', radix: 16) ?? 0xFF000000)
-            : item.color)
+        .map(
+          (item) => list[item.index].isNotEmpty
+              ? Color(
+                  int.tryParse('FF${list[item.index]}', radix: 16) ??
+                      0xFF000000,
+                )
+              : item.color,
+        )
         .toList();
   }
 
@@ -148,19 +171,25 @@ class Pref {
       _setting.get(SettingBoxKey.smallCardWidth, defaultValue: 240.0);
 
   static UpPanelPosition get upPanelPosition =>
-      UpPanelPosition.values[_setting.get(SettingBoxKey.upPanelPosition,
-          defaultValue: UpPanelPosition.leftFixed.index)];
+      UpPanelPosition.values[_setting.get(
+        SettingBoxKey.upPanelPosition,
+        defaultValue: UpPanelPosition.leftFixed.index,
+      )];
 
-  static int get fullScreenMode => _setting.get(SettingBoxKey.fullScreenMode,
-      defaultValue: FullScreenMode.auto.index);
+  static int get fullScreenMode => _setting.get(
+    SettingBoxKey.fullScreenMode,
+    defaultValue: FullScreenMode.auto.index,
+  );
 
-  static int get btmProgressBehavior =>
-      _setting.get(SettingBoxKey.btmProgressBehavior,
-          defaultValue: BtmProgressBehavior.alwaysShow.index);
+  static int get btmProgressBehavior => _setting.get(
+    SettingBoxKey.btmProgressBehavior,
+    defaultValue: BtmProgressBehavior.alwaysShow.index,
+  );
 
-  static String get subtitlePreference =>
-      _setting.get(SettingBoxKey.subtitlePreference,
-          defaultValue: SubtitlePrefType.off.code);
+  static String get subtitlePreference => _setting.get(
+    SettingBoxKey.subtitlePreference,
+    defaultValue: SubtitlePrefType.off.code,
+  );
 
   static bool get useRelativeSlide =>
       _setting.get(SettingBoxKey.useRelativeSlide, defaultValue: false);
@@ -169,47 +198,47 @@ class Pref {
       _setting.get(SettingBoxKey.sliderDuration, defaultValue: 90);
 
   static int get defaultVideoQa => _setting.get(
-        SettingBoxKey.defaultVideoQa,
-        defaultValue: VideoQuality.values.last.code,
-      );
+    SettingBoxKey.defaultVideoQa,
+    defaultValue: VideoQuality.values.last.code,
+  );
 
   static int get defaultVideoQaCellular => _setting.get(
-        SettingBoxKey.defaultVideoQaCellular,
-        defaultValue: VideoQuality.high1080.code,
-      );
+    SettingBoxKey.defaultVideoQaCellular,
+    defaultValue: VideoQuality.high1080.code,
+  );
 
   static int get defaultAudioQa => _setting.get(
-        SettingBoxKey.defaultAudioQa,
-        defaultValue: AudioQuality.values.last.code,
-      );
+    SettingBoxKey.defaultAudioQa,
+    defaultValue: AudioQuality.values.last.code,
+  );
 
   static int get defaultAudioQaCellular => _setting.get(
-        SettingBoxKey.defaultAudioQaCellular,
-        defaultValue: AudioQuality.k192.code,
-      );
+    SettingBoxKey.defaultAudioQaCellular,
+    defaultValue: AudioQuality.k192.code,
+  );
 
   static String get defaultDecode => _setting.get(
-        SettingBoxKey.defaultDecode,
-        defaultValue: VideoDecodeFormatType.values.last.code,
-      );
+    SettingBoxKey.defaultDecode,
+    defaultValue: VideoDecodeFormatType.values.last.code,
+  );
 
   static String get secondDecode => _setting.get(
-        SettingBoxKey.secondDecode,
-        defaultValue: VideoDecodeFormatType.AV1.code,
-      );
+    SettingBoxKey.secondDecode,
+    defaultValue: VideoDecodeFormatType.AV1.code,
+  );
 
   static String get hardwareDecoding => _setting.get(
-        SettingBoxKey.hardwareDecoding,
-        defaultValue: Platform.isAndroid ? 'auto-safe' : 'auto',
-      );
+    SettingBoxKey.hardwareDecoding,
+    defaultValue: Platform.isAndroid ? 'auto-safe' : 'auto',
+  );
 
   static String get videoSync =>
       _setting.get(SettingBoxKey.videoSync, defaultValue: 'display-resample');
 
   static String get defaultCDNService => _setting.get(
-        SettingBoxKey.CDNService,
-        defaultValue: CDNService.backupUrl.code,
-      );
+    SettingBoxKey.CDNService,
+    defaultValue: CDNService.backupUrl.code,
+  );
 
   static String get banWordForRecommend =>
       _setting.get(SettingBoxKey.banWordForRecommend, defaultValue: '');
@@ -242,8 +271,10 @@ class Pref {
       _setting.get(SettingBoxKey.refreshDisplacement, defaultValue: 20.0);
 
   static String get blockUserID {
-    String blockUserID =
-        _setting.get(SettingBoxKey.blockUserID, defaultValue: '');
+    String blockUserID = _setting.get(
+      SettingBoxKey.blockUserID,
+      defaultValue: '',
+    );
     if (blockUserID.isEmpty) {
       blockUserID = const Uuid().v4().replaceAll('-', '');
       _setting.put(SettingBoxKey.blockUserID, blockUserID);
@@ -254,8 +285,10 @@ class Pref {
   static bool get blockToast =>
       _setting.get(SettingBoxKey.blockToast, defaultValue: true);
 
-  static String get blockServer => _setting.get(SettingBoxKey.blockServer,
-      defaultValue: HttpString.sponsorBlockBaseUrl);
+  static String get blockServer => _setting.get(
+    SettingBoxKey.blockServer,
+    defaultValue: HttpString.sponsorBlockBaseUrl,
+  );
 
   static bool get blockTrack =>
       _setting.get(SettingBoxKey.blockTrack, defaultValue: true);
@@ -424,8 +457,10 @@ class Pref {
   static bool get expandDynLivePanel =>
       _setting.get(SettingBoxKey.expandDynLivePanel, defaultValue: false);
 
-  static bool get slideDismissReplyPage => _setting
-      .get(SettingBoxKey.slideDismissReplyPage, defaultValue: Platform.isIOS);
+  static bool get slideDismissReplyPage => _setting.get(
+    SettingBoxKey.slideDismissReplyPage,
+    defaultValue: Platform.isIOS,
+  );
 
   static bool get showFSActionItem =>
       _setting.get(SettingBoxKey.showFSActionItem, defaultValue: true);
@@ -439,8 +474,10 @@ class Pref {
   static bool get darkVideoPage =>
       _setting.get(SettingBoxKey.darkVideoPage, defaultValue: false);
 
-  static bool get enableSlideVolumeBrightness => _setting
-      .get(SettingBoxKey.enableSlideVolumeBrightness, defaultValue: true);
+  static bool get enableSlideVolumeBrightness => _setting.get(
+    SettingBoxKey.enableSlideVolumeBrightness,
+    defaultValue: true,
+  );
 
   static bool get enableSlideFS =>
       _setting.get(SettingBoxKey.enableSlideFS, defaultValue: true);
@@ -451,12 +488,15 @@ class Pref {
   static int get retryDelay =>
       _setting.get(SettingBoxKey.retryDelay, defaultValue: 500);
 
-  static int get liveQuality => _setting.get(SettingBoxKey.liveQuality,
-      defaultValue: LiveQuality.origin.code);
+  static int get liveQuality => _setting.get(
+    SettingBoxKey.liveQuality,
+    defaultValue: LiveQuality.origin.code,
+  );
 
-  static int get liveQualityCellular =>
-      _setting.get(SettingBoxKey.liveQualityCellular,
-          defaultValue: LiveQuality.superHD.code);
+  static int get liveQualityCellular => _setting.get(
+    SettingBoxKey.liveQualityCellular,
+    defaultValue: LiveQuality.superHD.code,
+  );
 
   static int get appFontWeight =>
       _setting.get(SettingBoxKey.appFontWeight, defaultValue: -1);
@@ -532,8 +572,10 @@ class Pref {
   static bool get exemptFilterForFollowed =>
       _setting.get(SettingBoxKey.exemptFilterForFollowed, defaultValue: true);
 
-  static bool get applyFilterToRelatedVideos => _setting
-      .get(SettingBoxKey.applyFilterToRelatedVideos, defaultValue: true);
+  static bool get applyFilterToRelatedVideos => _setting.get(
+    SettingBoxKey.applyFilterToRelatedVideos,
+    defaultValue: true,
+  );
 
   static bool get enableBackgroundPlay =>
       _setting.get(SettingBoxKey.enableBackgroundPlay, defaultValue: true);
@@ -559,8 +601,10 @@ class Pref {
   static bool get enableVerticalExpand =>
       _setting.get(SettingBoxKey.enableVerticalExpand, defaultValue: false);
 
-  static bool get removeSafeArea => _setting
-      .get(SettingBoxKey.videoPlayerRemoveSafeArea, defaultValue: false);
+  static bool get removeSafeArea => _setting.get(
+    SettingBoxKey.videoPlayerRemoveSafeArea,
+    defaultValue: false,
+  );
 
   static double get defaultTextScale =>
       _setting.get(SettingBoxKey.defaultTextScale, defaultValue: 1.0);
@@ -577,8 +621,10 @@ class Pref {
   static bool get useSideBar =>
       _setting.get(SettingBoxKey.useSideBar, defaultValue: false);
 
-  static bool get dynamicsShowAllFollowedUp => _setting
-      .get(SettingBoxKey.dynamicsShowAllFollowedUp, defaultValue: false);
+  static bool get dynamicsShowAllFollowedUp => _setting.get(
+    SettingBoxKey.dynamicsShowAllFollowedUp,
+    defaultValue: false,
+  );
 
   static bool get enableShowDanmaku =>
       _setting.get(SettingBoxKey.enableShowDanmaku, defaultValue: true);
@@ -613,15 +659,18 @@ class Pref {
   static bool get hideTabBar =>
       _setting.get(SettingBoxKey.hideTabBar, defaultValue: true);
 
-  static int get dynamicBadgeMode =>
-      _setting.get(SettingBoxKey.dynamicBadgeMode,
-          defaultValue: DynamicBadgeMode.number.index);
+  static int get dynamicBadgeMode => _setting.get(
+    SettingBoxKey.dynamicBadgeMode,
+    defaultValue: DynamicBadgeMode.number.index,
+  );
 
   static bool get enableMYBar =>
       _setting.get(SettingBoxKey.enableMYBar, defaultValue: true);
 
-  static int get pageTransition => _setting.get(SettingBoxKey.pageTransition,
-      defaultValue: Transition.native.index);
+  static int get pageTransition => _setting.get(
+    SettingBoxKey.pageTransition,
+    defaultValue: Transition.native.index,
+  );
 
   static bool get enableQuickDouble =>
       _setting.get(SettingBoxKey.enableQuickDouble, defaultValue: true);
diff --git a/lib/utils/theme_utils.dart b/lib/utils/theme_utils.dart
index 5393e368a..2c270d71a 100644
--- a/lib/utils/theme_utils.dart
+++ b/lib/utils/theme_utils.dart
@@ -12,10 +12,13 @@ class ThemeUtils {
     bool isDark = false,
     required FlexSchemeVariant variant,
   }) {
-    final appFontWeight =
-        Pref.appFontWeight.clamp(-1, FontWeight.values.length - 1);
-    final fontWeight =
-        appFontWeight == -1 ? null : FontWeight.values[appFontWeight];
+    final appFontWeight = Pref.appFontWeight.clamp(
+      -1,
+      FontWeight.values.length - 1,
+    );
+    final fontWeight = appFontWeight == -1
+        ? null
+        : FontWeight.values[appFontWeight];
     late final textStyle = TextStyle(fontWeight: fontWeight);
     ThemeData themeData = ThemeData(
       colorScheme: colorScheme,
@@ -39,8 +42,9 @@ class ThemeUtils {
               labelMedium: textStyle,
               labelSmall: textStyle,
             ),
-      tabBarTheme:
-          fontWeight == null ? null : TabBarThemeData(labelStyle: textStyle),
+      tabBarTheme: fontWeight == null
+          ? null
+          : TabBarThemeData(labelStyle: textStyle),
       appBarTheme: AppBarTheme(
         elevation: 0,
         titleSpacing: 0,
@@ -72,8 +76,8 @@ class ThemeUtils {
         surfaceTintColor: isDynamic
             ? colorScheme.onSurfaceVariant
             : isDark
-                ? colorScheme.onSurfaceVariant
-                : null,
+            ? colorScheme.onSurfaceVariant
+            : null,
         shadowColor: Colors.transparent,
       ),
       progressIndicatorTheme: ProgressIndicatorThemeData(
@@ -132,27 +136,34 @@ class ThemeUtils {
       dialogTheme: themeData.dialogTheme.copyWith(
         backgroundColor: color,
       ),
-      bottomSheetTheme:
-          themeData.bottomSheetTheme.copyWith(backgroundColor: color),
-      bottomNavigationBarTheme:
-          themeData.bottomNavigationBarTheme.copyWith(backgroundColor: color),
-      navigationBarTheme:
-          themeData.navigationBarTheme.copyWith(backgroundColor: color),
-      navigationRailTheme:
-          themeData.navigationRailTheme.copyWith(backgroundColor: Colors.black),
+      bottomSheetTheme: themeData.bottomSheetTheme.copyWith(
+        backgroundColor: color,
+      ),
+      bottomNavigationBarTheme: themeData.bottomNavigationBarTheme.copyWith(
+        backgroundColor: color,
+      ),
+      navigationBarTheme: themeData.navigationBarTheme.copyWith(
+        backgroundColor: color,
+      ),
+      navigationRailTheme: themeData.navigationRailTheme.copyWith(
+        backgroundColor: Colors.black,
+      ),
       colorScheme: themeData.colorScheme.copyWith(
         primary: themeData.colorScheme.primary.darken(0.1),
         onPrimary: themeData.colorScheme.onPrimary.darken(0.1),
         primaryContainer: themeData.colorScheme.primaryContainer.darken(0.1),
-        onPrimaryContainer:
-            themeData.colorScheme.onPrimaryContainer.darken(0.1),
+        onPrimaryContainer: themeData.colorScheme.onPrimaryContainer.darken(
+          0.1,
+        ),
         inversePrimary: themeData.colorScheme.inversePrimary.darken(0.1),
         secondary: themeData.colorScheme.secondary.darken(0.1),
         onSecondary: themeData.colorScheme.onSecondary.darken(0.1),
-        secondaryContainer:
-            themeData.colorScheme.secondaryContainer.darken(0.1),
-        onSecondaryContainer:
-            themeData.colorScheme.onSecondaryContainer.darken(0.1),
+        secondaryContainer: themeData.colorScheme.secondaryContainer.darken(
+          0.1,
+        ),
+        onSecondaryContainer: themeData.colorScheme.onSecondaryContainer.darken(
+          0.1,
+        ),
         error: themeData.colorScheme.error.darken(0.1),
         surface: Colors.black,
         onSurface: themeData.colorScheme.onSurface.darken(0.15),
@@ -160,10 +171,10 @@ class ThemeUtils {
         inverseSurface: themeData.colorScheme.inverseSurface.darken(),
         onInverseSurface: themeData.colorScheme.onInverseSurface.darken(),
         surfaceContainer: themeData.colorScheme.surfaceContainer.darken(),
-        surfaceContainerHigh:
-            themeData.colorScheme.surfaceContainerHigh.darken(),
-        surfaceContainerHighest:
-            themeData.colorScheme.surfaceContainerHighest.darken(0.4),
+        surfaceContainerHigh: themeData.colorScheme.surfaceContainerHigh
+            .darken(),
+        surfaceContainerHighest: themeData.colorScheme.surfaceContainerHighest
+            .darken(0.4),
       ),
     );
   }
diff --git a/lib/utils/update.dart b/lib/utils/update.dart
index 05e7ca9e2..3e5f1921a 100644
--- a/lib/utils/update.dart
+++ b/lib/utils/update.dart
@@ -26,7 +26,7 @@ class Update {
       }
       int latest =
           DateTime.parse(res.data[0]['created_at']).millisecondsSinceEpoch ~/
-              1000;
+          1000;
       if (BuildConfig.buildTime >= latest) {
         if (!isAuto) {
           SmartDialog.showToast('已是最新版本');
@@ -52,7 +52,8 @@ class Update {
                       Text('${res.data[0]['body']}'),
                       TextButton(
                         onPressed: () => PageUtils.launchURL(
-                            'https://github.com/bggRGjQaUbCoE/PiliPlus/commits/main'),
+                          'https://github.com/bggRGjQaUbCoE/PiliPlus/commits/main',
+                        ),
                         child: Text(
                           "点此查看完整更新(即commit)内容",
                           style: TextStyle(
@@ -125,7 +126,8 @@ class Update {
       }
     } catch (_) {
       PageUtils.launchURL(
-          'https://github.com/bggRGjQaUbCoE/PiliPlus/releases/latest');
+        'https://github.com/bggRGjQaUbCoE/PiliPlus/releases/latest',
+      );
     }
   }
 }
diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart
index 5229a37d1..7e6de88bc 100644
--- a/lib/utils/utils.dart
+++ b/lib/utils/utils.dart
@@ -56,7 +56,9 @@ class Utils {
   }
 
   static String buildShadersAbsolutePath(
-      String baseDirectory, List<String> shaders) {
+    String baseDirectory,
+    List<String> shaders,
+  ) {
     List<String> absolutePaths = shaders.map((shader) {
       return path.join(baseDirectory, shader);
     }).toList();
@@ -71,8 +73,12 @@ class Utils {
   static String generateRandomString(int length) {
     const characters = '0123456789abcdefghijklmnopqrstuvwxyz';
 
-    return String.fromCharCodes(Iterable.generate(length,
-        (_) => characters.codeUnitAt(random.nextInt(characters.length))));
+    return String.fromCharCodes(
+      Iterable.generate(
+        length,
+        (_) => characters.codeUnitAt(random.nextInt(characters.length)),
+      ),
+    );
   }
 
   static void copyText(
diff --git a/lib/utils/video_utils.dart b/lib/utils/video_utils.dart
index dbbee2998..2b440a807 100644
--- a/lib/utils/video_utils.dart
+++ b/lib/utils/video_utils.dart
@@ -25,7 +25,8 @@ class VideoUtils {
           : item.backupUrl ?? "";
     }
     if (item is CodecItem) {
-      backupUrl = (item.urlInfo?.first.host)! +
+      backupUrl =
+          (item.urlInfo?.first.host)! +
           item.baseUrl! +
           item.urlInfo!.first.extra!;
     } else {
@@ -49,9 +50,9 @@ class VideoUtils {
       videoUrl = uri.replace(host: hostname, port: 443).toString();
     } else if (videoUrl.contains(".mcdn.bilivideo") ||
         videoUrl.contains("/upgcxcode/")) {
-      videoUrl = Uri.parse(videoUrl)
-          .replace(host: defaultCDNHost, port: 443)
-          .toString();
+      videoUrl = Uri.parse(
+        videoUrl,
+      ).replace(host: defaultCDNHost, port: 443).toString();
       // videoUrl =
       //     'https://proxy-tf-all-ws.bilivideo.com/?url=${Uri.encodeComponent(videoUrl)}';
     }
diff --git a/lib/utils/wbi_sign.dart b/lib/utils/wbi_sign.dart
index 846663a7d..89010d8eb 100644
--- a/lib/utils/wbi_sign.dart
+++ b/lib/utils/wbi_sign.dart
@@ -49,7 +49,7 @@ class WbiSign {
     12,
     38,
     41,
-    13
+    13,
   ];
 
   // 对 imgKey 和 subKey 进行字符顺序打乱编码
@@ -63,11 +63,14 @@ class WbiSign {
     // 按照 key 重排参数
     final List<String> keys = params.keys.toList()..sort();
     final queryStr = keys
-        .map((i) =>
-            '${Uri.encodeComponent(i)}=${Uri.encodeComponent(params[i].toString().replaceAll(chrFilter, ''))}')
+        .map(
+          (i) =>
+              '${Uri.encodeComponent(i)}=${Uri.encodeComponent(params[i].toString().replaceAll(chrFilter, ''))}',
+        )
         .join('&');
-    params['w_rid'] =
-        md5.convert(utf8.encode(queryStr + mixinKey)).toString(); // 计算 w_rid
+    params['w_rid'] = md5
+        .convert(utf8.encode(queryStr + mixinKey))
+        .toString(); // 计算 w_rid
   }
 
   // 获取最新的 img_key 和 sub_key 可以从缓存中获取
@@ -76,8 +79,8 @@ class WbiSign {
     String? mixinKey = localCache.get(LocalCacheKey.mixinKey);
     if (mixinKey != null &&
         DateTime.fromMillisecondsSinceEpoch(
-                    localCache.get(LocalCacheKey.timeStamp) as int)
-                .day ==
+              localCache.get(LocalCacheKey.timeStamp) as int,
+            ).day ==
             nowDate.day) {
       return mixinKey;
     }
@@ -87,8 +90,9 @@ class WbiSign {
       final wbiUrls = resp.data['data']['wbi_img'];
 
       mixinKey = getMixinKey(
-          Utils.getFileName(wbiUrls['img_url'], fileExt: false) +
-              Utils.getFileName(wbiUrls['sub_url'], fileExt: false));
+        Utils.getFileName(wbiUrls['img_url'], fileExt: false) +
+            Utils.getFileName(wbiUrls['sub_url'], fileExt: false),
+      );
 
       localCache
         ..put(LocalCacheKey.mixinKey, mixinKey)
@@ -101,7 +105,8 @@ class WbiSign {
   }
 
   static Future<Map<String, dynamic>> makSign(
-      Map<String, dynamic> params) async {
+    Map<String, dynamic> params,
+  ) async {
     // params 为需要加密的请求参数
     final String mixinKey = await lock.synchronized(getWbiKeys);
     encWbi(params, mixinKey);