opt: code

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

lib/common/widgets/custom_sliver_persistent_header_delegate.dart

@@ -4,12 +4,14 @@ class CustomSliverPersistentHeaderDelegate
     extends SliverPersistentHeaderDelegate {
   CustomSliverPersistentHeaderDelegate({
     required this.child,
+    required this.bgColor,
     double extent = 45,
   })  : _minExtent = extent,
         _maxExtent = extent;
   final double _minExtent;
   final double _maxExtent;
   final Widget child;
+  final Color bgColor;
 
   @override
   Widget build(
@@ -17,7 +19,10 @@ class CustomSliverPersistentHeaderDelegate
     //创建child子组件
     //shrinkOffset：child偏移值minExtent~maxExtent
     //overlapsContent：SliverPersistentHeader覆盖其他子组件返回true，否则返回false
-    return child;
+    return ColoredBox(
+      color: bgColor,
+      child: child,
+    );
   }
 
   //SliverPersistentHeader最大高度
@@ -31,6 +36,6 @@ class CustomSliverPersistentHeaderDelegate
   @override
   bool shouldRebuild(
       covariant CustomSliverPersistentHeaderDelegate oldDelegate) {
-    return true;
+    return oldDelegate.bgColor != bgColor;
   }
 }

lib/models/common/dynamics_type.dart

@@ -11,35 +11,35 @@ extension BusinessTypeExtension on DynamicsType {
   String get labels => ['全部', '投稿', '番剧', '专栏', 'UP'][index];
 }
 
-List tabsConfig = [
+List get tabsConfig => [
-  {
+      {
-    'tag': 'all',
+        'tag': 'all',
-    'value': DynamicsType.all,
+        'value': DynamicsType.all,
-    'label': '全部',
+        'label': '全部',
-    'enabled': true,
+        'enabled': true,
-  },
+      },
-  {
+      {
-    'tag': 'video',
+        'tag': 'video',
-    'value': DynamicsType.video,
+        'value': DynamicsType.video,
-    'label': '投稿',
+        'label': '投稿',
-    'enabled': true,
+        'enabled': true,
-  },
+      },
-  {
+      {
-    'tag': 'pgc',
+        'tag': 'pgc',
-    'value': DynamicsType.pgc,
+        'value': DynamicsType.pgc,
-    'label': '番剧',
+        'label': '番剧',
-    'enabled': true,
+        'enabled': true,
-  },
+      },
-  {
+      {
-    'tag': 'article',
+        'tag': 'article',
-    'value': DynamicsType.article,
+        'value': DynamicsType.article,
-    'label': '专栏',
+        'label': '专栏',
-    'enabled': true,
+        'enabled': true,
-  },
+      },
-  {
+      {
-    'tag': 'up',
+        'tag': 'up',
-    'value': DynamicsType.up,
+        'value': DynamicsType.up,
-    'label': 'UP',
+        'label': 'UP',
-    'enabled': true,
+        'enabled': true,
-  },
+      },
-];
+    ];

lib/models/common/nav_bar_config.dart

@@ -1,43 +1,43 @@
 import 'package:flutter/material.dart';
 
-List defaultNavigationBars = [
+List get defaultNavigationBars => [
-  {
+      {
-    'id': 0,
+        'id': 0,
-    'icon': const Icon(
+        'icon': const Icon(
-      Icons.home_outlined,
+          Icons.home_outlined,
-      size: 23,
+          size: 23,
-    ),
+        ),
-    'selectIcon': const Icon(
+        'selectIcon': const Icon(
-      Icons.home,
+          Icons.home,
-      size: 23,
+          size: 23,
-    ),
+        ),
-    'label': "首页",
+        'label': "首页",
-    'count': 0,
+        'count': 0,
-  },
+      },
-  {
+      {
-    'id': 1,
+        'id': 1,
-    'icon': const Icon(
+        'icon': const Icon(
-      Icons.motion_photos_on_outlined,
+          Icons.motion_photos_on_outlined,
-      size: 21,
+          size: 21,
-    ),
+        ),
-    'selectIcon': const Icon(
+        'selectIcon': const Icon(
-      Icons.motion_photos_on,
+          Icons.motion_photos_on,
-      size: 21,
+          size: 21,
-    ),
+        ),
-    'label': "动态",
+        'label': "动态",
-    'count': 0,
+        'count': 0,
-  },
+      },
-  {
+      {
-    'id': 2,
+        'id': 2,
-    'icon': const Icon(
+        'icon': const Icon(
-      Icons.video_collection_outlined,
+          Icons.video_collection_outlined,
-      size: 21,
+          size: 21,
-    ),
+        ),
-    'selectIcon': const Icon(
+        'selectIcon': const Icon(
-      Icons.video_collection,
+          Icons.video_collection,
-      size: 21,
+          size: 21,
-    ),
+        ),
-    'label': "媒体库",
+        'label': "媒体库",
-    'count': 0,
+        'count': 0,
-  }
+      }
-];
+    ];

lib/models/common/tab_type.dart

@@ -13,55 +13,55 @@ extension TabTypeDesc on TabType {
   String get id => ['live', 'rcmd', 'hot', 'rank', 'bangumi'][index];
 }
 
-List tabsConfig = [
+List get tabsConfig => [
-  {
+      {
-    'icon': const Icon(
+        'icon': const Icon(
-      Icons.live_tv_outlined,
+          Icons.live_tv_outlined,
-      size: 15,
+          size: 15,
-    ),
+        ),
-    'label': '直播',
+        'label': '直播',
-    'type': TabType.live,
+        'type': TabType.live,
-    'ctr': Get.find<LiveController>,
+        'ctr': Get.find<LiveController>,
-    'page': const RcmdPage(tabType: TabType.live),
+        'page': const RcmdPage(tabType: TabType.live),
-  },
+      },
-  {
+      {
-    'icon': const Icon(
+        'icon': const Icon(
-      Icons.thumb_up_off_alt_outlined,
+          Icons.thumb_up_off_alt_outlined,
-      size: 15,
+          size: 15,
-    ),
+        ),
-    'label': '推荐',
+        'label': '推荐',
-    'type': TabType.rcmd,
+        'type': TabType.rcmd,
-    'ctr': Get.find<RcmdController>,
+        'ctr': Get.find<RcmdController>,
-    'page': const RcmdPage(tabType: TabType.rcmd),
+        'page': const RcmdPage(tabType: TabType.rcmd),
-  },
+      },
-  {
+      {
-    'icon': const Icon(
+        'icon': const Icon(
-      Icons.whatshot_outlined,
+          Icons.whatshot_outlined,
-      size: 15,
+          size: 15,
-    ),
+        ),
-    'label': '热门',
+        'label': '热门',
-    'type': TabType.hot,
+        'type': TabType.hot,
-    'ctr': Get.find<HotController>,
+        'ctr': Get.find<HotController>,
-    'page': const HotPage(),
+        'page': const HotPage(),
-  },
+      },
-  {
+      {
-    'icon': const Icon(
+        'icon': const Icon(
-      Icons.category_outlined,
+          Icons.category_outlined,
-      size: 15,
+          size: 15,
-    ),
+        ),
-    'label': '分区',
+        'label': '分区',
-    'type': TabType.rank,
+        'type': TabType.rank,
-    'ctr': Get.find<RankController>,
+        'ctr': Get.find<RankController>,
-    'page': const RankPage(),
+        'page': const RankPage(),
-  },
+      },
-  {
+      {
-    'icon': const Icon(
+        'icon': const Icon(
-      Icons.play_circle_outlined,
+          Icons.play_circle_outlined,
-      size: 15,
+          size: 15,
-    ),
+        ),
-    'label': '番剧',
+        'label': '番剧',
-    'type': TabType.bangumi,
+        'type': TabType.bangumi,
-    'ctr': Get.find<BangumiController>,
+        'ctr': Get.find<BangumiController>,
-    'page': const BangumiPage(),
+        'page': const BangumiPage(),
-  },
+      },
-];
+    ];

lib/pages/dynamics/detail/view.dart

@@ -400,8 +400,8 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
   SliverPersistentHeader replyPersistentHeader(BuildContext context) {
     return SliverPersistentHeader(
       delegate: CustomSliverPersistentHeaderDelegate(
+        bgColor: Theme.of(context).colorScheme.surface,
         child: Container(
-          color: Theme.of(context).colorScheme.surface,
           height: 45,
           padding: const EdgeInsets.only(left: 12, right: 6),
           child: Row(

lib/pages/member/new/content/member_contribute/content/video/member_video.dart

@@ -73,10 +73,10 @@ class _MemberVideoState extends State<MemberVideo>
                     floating: true,
                     delegate: CustomSliverPersistentHeaderDelegate(
                       extent: 40,
+                      bgColor: Theme.of(context).colorScheme.surface,
                       child: Container(
                         height: 40,
                         padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
-                        color: Theme.of(context).colorScheme.surface,
                         child: Row(
                           children: [
                             Obx(

lib/pages/search_panel/widgets/article_panel.dart

@@ -28,9 +28,9 @@ Widget searchArticlePanel(context, searchPanelCtr, LoadingState loadingState) {
         floating: true,
         delegate: CustomSliverPersistentHeaderDelegate(
           extent: 40,
+          bgColor: Theme.of(context).colorScheme.surface,
           child: Container(
             height: 40,
-            color: Theme.of(context).colorScheme.surface,
             padding: const EdgeInsets.only(left: 25, right: 12),
             child: Row(
               children: [

lib/pages/search_panel/widgets/user_panel.dart

@@ -26,9 +26,9 @@ Widget searchUserPanel(context, searchPanelCtr, LoadingState loadingState) {
         floating: true,
         delegate: CustomSliverPersistentHeaderDelegate(
           extent: 40,
+          bgColor: Theme.of(context).colorScheme.surface,
           child: Container(
             height: 40,
-            color: Theme.of(context).colorScheme.surface,
             padding: const EdgeInsets.only(left: 25, right: 12),
             child: Row(
               children: [

lib/pages/search_panel/widgets/video_panel.dart

@@ -24,9 +24,9 @@ Widget searchVideoPanel(context, ctr, LoadingState loadingState) {
         floating: true,
         delegate: CustomSliverPersistentHeaderDelegate(
           extent: 34,
+          bgColor: Theme.of(context).colorScheme.surface,
           child: Container(
             height: 34,
-            color: Theme.of(context).colorScheme.surface,
             padding: const EdgeInsets.symmetric(horizontal: 12),
             child: Row(
               children: [

lib/pages/video/detail/member/horizontal_member_page.dart

@@ -112,10 +112,10 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
       floating: true,
       delegate: CustomSliverPersistentHeaderDelegate(
         extent: 40,
+        bgColor: Theme.of(context).colorScheme.surface,
         child: Container(
           height: 40,
           padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
-          color: Theme.of(context).colorScheme.surface,
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [

lib/pages/video/detail/reply/view.dart

@@ -134,10 +134,10 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                 floating: true,
                 delegate: CustomSliverPersistentHeaderDelegate(
                   extent: 40,
+                  bgColor: Theme.of(context).colorScheme.surface,
                   child: Container(
                     height: 40,
                     padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
-                    color: Theme.of(context).colorScheme.surface,
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [