Merge branch 'fix-seasonChange'

lib/common/pages_bottom_sheet.dart

@@ -105,7 +105,8 @@ class _PagesBottomSheetState extends State<PagesBottomSheet>
   List<ScrollController>? _listScrollControllerList;
   final String heroTag = Get.arguments['heroTag'];
   VideoDetailController? _videoDetailController;
-  late RxInt isSubscribe = (-1).obs;
+  RxInt isSubscribe = (-1).obs;
+  bool isVisible = false;
 
   @override
   void initState() {
@@ -224,6 +225,13 @@ class _PagesBottomSheetState extends State<PagesBottomSheet>
     }
   }
 
+  // 更改展开状态
+  void _changeVisible() {
+    setState(() {
+      isVisible = !isVisible;
+    });
+  }
+
   @override
   void dispose() {
     try {
@@ -255,7 +263,9 @@ class _PagesBottomSheetState extends State<PagesBottomSheet>
               UgcSeasonBuild(
                 ugcSeason: widget.ugcSeason!,
                 isSubscribe: isSubscribe,
+                isVisible: isVisible,
                 changeFucCall: _changeSubscribeStatus,
+                changeVisible: _changeVisible,
               ),
             ],
             Expanded(
@@ -325,7 +335,10 @@ class _PagesBottomSheetState extends State<PagesBottomSheet>
   Widget buildTabBar() {
     return Column(
       children: [
-        TabBar(
+        // 背景色
+        Container(
+          color: Theme.of(context).colorScheme.surface,
+          child: TabBar(
             controller: tabController,
             isScrollable: true,
             indicatorSize: TabBarIndicatorSize.label,
@@ -339,6 +352,7 @@ class _PagesBottomSheetState extends State<PagesBottomSheet>
               }).toList()
             ],
           ),
+        ),
         Expanded(
           child: TabBarView(
             controller: tabController,
@@ -678,46 +692,52 @@ class EpisodeGridItem extends StatelessWidget {
 class UgcSeasonBuild extends StatelessWidget {
   final UgcSeason ugcSeason;
   final RxInt isSubscribe;
+  final bool isVisible;
   final Function changeFucCall;
+  final Function changeVisible;
 
   const UgcSeasonBuild({
     Key? key,
     required this.ugcSeason,
     required this.isSubscribe,
+    required this.isVisible,
     required this.changeFucCall,
+    required this.changeVisible,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    final ThemeData t = Theme.of(context);
+    final ThemeData theme = Theme.of(context);
-    final Color outline = t.colorScheme.outline;
+    final Color outline = theme.colorScheme.outline;
-    return Container(
+    final Color surface = theme.colorScheme.surface;
+    final Color primary = theme.colorScheme.primary;
+    final Color onPrimary = theme.colorScheme.onPrimary;
+    final Color onInverseSurface = theme.colorScheme.onInverseSurface;
+    final TextStyle titleMedium = theme.textTheme.titleMedium!;
+    final TextStyle labelMedium = theme.textTheme.labelMedium!;
+    final Color dividerColor = theme.dividerColor.withOpacity(0.1);
+
+    return isVisible
+        ? Container(
             padding: const EdgeInsets.fromLTRB(12, 0, 12, 0),
-      color: Theme.of(context).colorScheme.surface,
+            color: surface,
             child: Column(
               mainAxisAlignment: MainAxisAlignment.start,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-          Divider(
+                Divider(height: 1, thickness: 1, color: dividerColor),
-            height: 1,
-            thickness: 1,
-            color: Theme.of(context).dividerColor.withOpacity(0.1),
-          ),
                 const SizedBox(height: 10),
-          Text(
-            '合集：${ugcSeason.title}',
-            style: Theme.of(context).textTheme.titleMedium,
-            overflow: TextOverflow.ellipsis,
-          ),
-          if (ugcSeason.intro != null && ugcSeason.intro != '') ...[
-            const SizedBox(height: 4),
                 Row(
                   children: [
                     Expanded(
-                  child: Text(ugcSeason.intro ?? '',
+                      child: Text(
-                      style: TextStyle(
+                        '合集：${ugcSeason.title}',
-                          color: Theme.of(context).colorScheme.outline)),
+                        style: titleMedium,
+                        maxLines: 2,
+                        overflow: TextOverflow.ellipsis,
                       ),
+                    ),
+                    const SizedBox(width: 10),
                     Obx(
                       () => isSubscribe.value == -1
                           ? const SizedBox(height: 32)
@@ -726,47 +746,79 @@ class UgcSeasonBuild extends StatelessWidget {
                               child: FilledButton.tonal(
                                 onPressed: () => changeFucCall.call(),
                                 style: TextButton.styleFrom(
-                              padding: const EdgeInsets.only(
+                                  padding:
-                                left: 8,
+                                      const EdgeInsets.only(left: 8, right: 8),
-                                right: 8,
-                              ),
                                   foregroundColor: isSubscribe.value == 1
                                       ? outline
-                                  : t.colorScheme.onPrimary,
+                                      : onPrimary,
                                   backgroundColor: isSubscribe.value == 1
-                                  ? t.colorScheme.onInverseSurface
+                                      ? onInverseSurface
-                                  : t.colorScheme.primary, // 设置按钮背景色
+                                      : primary,
                                 ),
-                            child: Text(isSubscribe.value == 1 ? '已订阅' : '订阅'),
+                                child:
+                                    Text(isSubscribe.value == 1 ? '已订阅' : '订阅'),
                               ),
                             ),
                     ),
-                const SizedBox(width: 6),
                   ],
                 ),
+                if (ugcSeason.intro != null && ugcSeason.intro != '') ...[
+                  const SizedBox(height: 4),
+                  Text(
+                    ugcSeason.intro!,
+                    style: TextStyle(color: outline, fontSize: 12),
+                  ),
                 ],
                 const SizedBox(height: 4),
                 Text.rich(
                   TextSpan(
                     style: TextStyle(
-                fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
+                        fontSize: labelMedium.fontSize, color: outline),
-                color: Theme.of(context).colorScheme.outline,
-              ),
                     children: [
-                TextSpan(text: '${Utils.numFormat(ugcSeason.stat!.view)}播放'),
+                      TextSpan(
+                          text: '${Utils.numFormat(ugcSeason.stat!.view)}播放'),
                       const TextSpan(text: '  ·  '),
-                TextSpan(text: '${Utils.numFormat(ugcSeason.stat!.danmaku)}弹幕'),
+                      TextSpan(
+                          text:
+                              '${Utils.numFormat(ugcSeason.stat!.danmaku)}弹幕'),
                     ],
                   ),
                 ),
                 const SizedBox(height: 14),
-          Divider(
+                Align(
-            height: 1,
+                  alignment: Alignment.center,
-            thickness: 1,
+                  child: Material(
-            color: Theme.of(context).dividerColor.withOpacity(0.1),
+                    color: surface,
+                    child: InkWell(
+                      onTap: () => changeVisible.call(),
+                      child: Padding(
+                        padding: const EdgeInsets.symmetric(
+                            vertical: 10, horizontal: 0),
+                        child: Text(
+                          '收起简介',
+                          style: TextStyle(color: primary, fontSize: 12),
                         ),
+                      ),
+                    ),
+                  ),
+                ),
+                Divider(height: 1, thickness: 1, color: dividerColor),
               ],
             ),
+          )
+        : Align(
+            alignment: Alignment.center,
+            child: InkWell(
+              onTap: () => changeVisible.call(),
+              child: Padding(
+                padding:
+                    const EdgeInsets.symmetric(vertical: 10, horizontal: 0),
+                child: Text(
+                  '展开简介',
+                  style: TextStyle(color: primary, fontSize: 12),
+                ),
+              ),
+            ),
           );
   }
 }