Merge branch 'design'

lib/pages/fav/view.dart

@@ -1,6 +1,7 @@
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/common/skeleton/video_card_h.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/pages/fav/index.dart';
 import 'package:pilipala/pages/fav/widgets/item.dart';
@@ -93,7 +94,12 @@ class _FavPageState extends State<FavPage> {
             }
           } else {
             // 骨架屏
-            return const Text('请求中');
+            return ListView.builder(
+              itemBuilder: (context, index) {
+                return const VideoCardHSkeleton();
+              },
+              itemCount: 10,
+            );
           }
         },
       ),

lib/pages/subscription/view.dart

@@ -1,6 +1,7 @@
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/common/skeleton/video_card_h.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/utils/route_push.dart';
 import 'controller.dart';
@@ -87,7 +88,12 @@ class _SubPageState extends State<SubPage> {
             }
           } else {
             // 骨架屏
-            return const Text('请求中');
+            return ListView.builder(
+              itemBuilder: (context, index) {
+                return const VideoCardHSkeleton();
+              },
+              itemCount: 10,
+            );
           }
         },
       ),

lib/pages/video/detail/view.dart

@@ -525,11 +525,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
           Scaffold(
             resizeToAvoidBottomInset: false,
             key: vdCtr.scaffoldKey,
-            backgroundColor: Colors.black,
             appBar: PreferredSize(
               preferredSize: const Size.fromHeight(0),
               child: AppBar(
-                backgroundColor: Colors.transparent,
+                backgroundColor: Colors.black,
                 elevation: 0,
               ),
             ),
@@ -559,8 +558,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                       }
                       return SliverAppBar(
                         automaticallyImplyLeading: false,
-                        // 假装使用一个非空变量，避免Obx检测不到而罢工
+                        pinned: true,
-                        pinned: vdCtr.autoPlay.value,
                         elevation: 0,
                         scrolledUnderElevation: 0,
                         forceElevated: innerBoxIsScrolled,
@@ -568,8 +566,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                         backgroundColor: Colors.black,
                         flexibleSpace: FlexibleSpaceBar(
                           background: PopScope(
-                              canPop: plPlayerController?.isFullScreen.value !=
+                            canPop:
-                                  true,
+                                plPlayerController?.isFullScreen.value != true,
                             onPopInvoked: (bool didPop) {
                               if (plPlayerController?.isFullScreen.value ==
                                   true) {
@@ -581,16 +579,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                 verticalScreen();
                               }
                             },
-                              child: LayoutBuilder(
+                            child: Hero(
-                                builder: (BuildContext context,
+                              tag: heroTag,
-                                    BoxConstraints boxConstraints) {
+                              child: Stack(
-                                  return Stack(
                                 children: <Widget>[
-                                      if (isShowing)
+                                  if (isShowing) videoPlayerPanel,
-                                        Padding(
-                                          padding: EdgeInsets.only(top: 0),
-                                          child: videoPlayerPanel,
-                                        ),
 
                                   /// 关闭自动播放时 手动播放
                                   Obx(
@@ -606,9 +599,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                     ),
                                   ),
                                 ],
-                                  );
+                              ),
-                                },
+                            ),
-                              )),
+                          ),
                         ),
                       );
                     },
@@ -627,10 +620,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                         : pinnedHeaderHeight;
               },
               onlyOneScrollInBody: true,
-              body: ColoredBox(
+              body: Column(
-                key: Key(heroTag),
-                color: Theme.of(context).colorScheme.background,
-                child: Column(
                 children: [
                   tabbarBuild(),
                   Expanded(
@@ -646,8 +636,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                   VideoIntroPanel(bvid: vdCtr.bvid),
                                 ] else if (vdCtr.videoType ==
                                     SearchType.media_bangumi) ...[
-                                    Obx(() => BangumiIntroPanel(
+                                  Obx(() =>
-                                        cid: vdCtr.cid.value)),
+                                      BangumiIntroPanel(cid: vdCtr.cid.value)),
                                 ],
                                 SliverToBoxAdapter(
                                   child: Divider(
@@ -678,7 +668,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
               ),
             ),
           ),
-          ),
 
           /// 重新进入会刷新
           // 播放完成/暂停播放