Merge branch 'design'

lib/common/widgets/overlay_pop.dart

@@ -62,6 +62,7 @@ class OverlayPop extends StatelessWidget {
                   Expanded(
                     child: Text(
                       videoItem.title! as String,
+                      style: Theme.of(context).textTheme.titleSmall,
                     ),
                   ),
                   const SizedBox(width: 4),

lib/common/widgets/video_card_v.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/utils/feed_back.dart';
 import '../../models/model_rec_video_item.dart';
+import 'overlay_pop.dart';
 import 'stat/danmu.dart';
 import 'stat/view.dart';
 import '../../http/dynamics.dart';
@@ -19,15 +21,11 @@ import 'network_img_layer.dart';
 class VideoCardV extends StatelessWidget {
   final dynamic videoItem;
   final int crossAxisCount;
-  final Function()? longPress;
-  final Function()? longPressEnd;
 
   const VideoCardV({
     Key? key,
     required this.videoItem,
     required this.crossAxisCount,
-    this.longPress,
-    this.longPressEnd,
   }) : super(key: key);
 
   bool isStringNumeric(String str) {
@@ -127,23 +125,17 @@ class VideoCardV extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     String heroTag = Utils.makeHeroTag(videoItem.id);
-    return Card(
+    return InkWell(
-      elevation: 0,
-      clipBehavior: Clip.hardEdge,
-      margin: EdgeInsets.zero,
-      child: GestureDetector(
-        onLongPress: () {
-          if (longPress != null) {
-            longPress!();
-          }
-        },
-        // onLongPressEnd: (details) {
-        //   if (longPressEnd != null) {
-        //     longPressEnd!();
-        //   }
-        // },
-        child: InkWell(
       onTap: () async => onPushDetail(heroTag),
+      onLongPress: () {
+        SmartDialog.show(
+          builder: (context) => OverlayPop(
+            videoItem: videoItem,
+            closeFn: () => SmartDialog.dismiss(),
+          ),
+        );
+      },
+      borderRadius: BorderRadius.circular(16),
       child: Column(
         children: [
           AspectRatio(
@@ -184,8 +176,6 @@ class VideoCardV extends StatelessWidget {
           VideoContent(videoItem: videoItem, crossAxisCount: crossAxisCount)
         ],
       ),
-        ),
-      ),
     );
   }
 }
@@ -196,123 +186,91 @@ class VideoContent extends StatelessWidget {
   const VideoContent(
       {Key? key, required this.videoItem, required this.crossAxisCount})
       : super(key: key);
+
+  Widget _buildBadge(String text, String type, [double fs = 12]) {
+    return PBadge(
+      text: text,
+      stack: 'normal',
+      size: 'small',
+      type: type,
+      fs: fs,
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
-    return Expanded(
+    return Padding(
-      flex: crossAxisCount == 1 ? 0 : 1,
-      child: Padding(
       padding: crossAxisCount == 1
           ? const EdgeInsets.fromLTRB(9, 9, 9, 4)
           : const EdgeInsets.fromLTRB(5, 8, 5, 4),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
-          // mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
-            Row(
+          Text(
-              children: [
-                Expanded(
-                  child: Text(
             videoItem.title,
             maxLines: 2,
             overflow: TextOverflow.ellipsis,
           ),
-                ),
-                if (videoItem.goto == 'av' && crossAxisCount == 1) ...[
-                  const SizedBox(width: 10),
-                  VideoPopupMenu(
-                    size: 32,
-                    iconSize: 18,
-                    videoItem: videoItem,
-                  ),
-                ],
-              ],
-            ),
           if (crossAxisCount > 1) ...[
             const SizedBox(height: 2),
-              VideoStat(
+            VideoStat(videoItem: videoItem, crossAxisCount: crossAxisCount),
-                videoItem: videoItem,
-                crossAxisCount: crossAxisCount,
-              ),
           ],
           if (crossAxisCount == 1) const SizedBox(height: 4),
           Row(
             children: [
-                if (videoItem.goto == 'bangumi') ...[
+              if (videoItem.goto == 'bangumi')
-                  PBadge(
+                _buildBadge(videoItem.bangumiBadge, 'line', 9),
-                    text: videoItem.bangumiBadge,
+              if (videoItem.rcmdReason?.content != null &&
-                    stack: 'normal',
+                  videoItem.rcmdReason.content != '')
-                    size: 'small',
+                _buildBadge(videoItem.rcmdReason.content, 'color'),
-                    type: 'line',
+              if (videoItem.goto == 'picture') _buildBadge('动态', 'line', 9),
-                    fs: 9,
+              if (videoItem.isFollowed == 1) _buildBadge('已关注', 'color'),
-                  )
-                ],
-                if (videoItem.rcmdReason != null &&
-                    videoItem.rcmdReason.content != '') ...[
-                  PBadge(
-                    text: videoItem.rcmdReason.content,
-                    stack: 'normal',
-                    size: 'small',
-                    type: 'color',
-                  )
-                ],
-                if (videoItem.goto == 'picture') ...[
-                  const PBadge(
-                    text: '动态',
-                    stack: 'normal',
-                    size: 'small',
-                    type: 'line',
-                    fs: 9,
-                  )
-                ],
-                if (videoItem.isFollowed == 1) ...[
-                  const PBadge(
-                    text: '已关注',
-                    stack: 'normal',
-                    size: 'small',
-                    type: 'color',
-                  )
-                ],
               Expanded(
                 flex: crossAxisCount == 1 ? 0 : 1,
                 child: Text(
                   videoItem.owner.name,
                   maxLines: 1,
                   style: TextStyle(
-                      fontSize:
+                    fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
-                          Theme.of(context).textTheme.labelMedium!.fontSize,
                     color: Theme.of(context).colorScheme.outline,
                   ),
                 ),
               ),
               if (crossAxisCount == 1) ...[
-                  Text(
+                const SizedBox(width: 10),
-                    ' • ',
-                    style: TextStyle(
-                      fontSize:
-                          Theme.of(context).textTheme.labelMedium!.fontSize,
-                      color: Theme.of(context).colorScheme.outline,
-                    ),
-                  ),
                 VideoStat(
                   videoItem: videoItem,
                   crossAxisCount: crossAxisCount,
                 ),
                 const Spacer(),
               ],
-                if (videoItem.goto == 'av' && crossAxisCount != 1) ...[
+              if (videoItem.goto == 'av')
-                  VideoPopupMenu(
+                SizedBox(
-                    size: 24,
+                  width: 24,
-                    iconSize: 14,
+                  height: 24,
-                    videoItem: videoItem,
+                  child: IconButton(
+                    onPressed: () {
+                      feedBack();
+                      showModalBottomSheet(
+                        context: context,
+                        useRootNavigator: true,
+                        isScrollControlled: true,
+                        builder: (context) {
+                          return MorePanel(videoItem: videoItem);
+                        },
+                      );
+                    },
+                    icon: Icon(
+                      Icons.more_vert_outlined,
+                      color: Theme.of(context).colorScheme.outline,
+                      size: 14,
                     ),
-                ] else ...[
+                  ),
-                  const SizedBox(height: 24)
+                )
-                ]
             ],
           ),
         ],
       ),
-      ),
     );
   }
 }
@@ -331,15 +289,9 @@ class VideoStat extends StatelessWidget {
   Widget build(BuildContext context) {
     return Row(
       children: [
-        StatView(
+        StatView(theme: 'gray', view: videoItem.stat.view),
-          theme: 'gray',
-          view: videoItem.stat.view,
-        ),
         const SizedBox(width: 8),
-        StatDanMu(
+        StatDanMu(theme: 'gray', danmu: videoItem.stat.danmu),
-          theme: 'gray',
-          danmu: videoItem.stat.danmu,
-        ),
         if (videoItem is RecVideoItemModel) ...<Widget>[
           crossAxisCount > 1 ? const Spacer() : const SizedBox(width: 8),
           RichText(
@@ -358,69 +310,39 @@ class VideoStat extends StatelessWidget {
   }
 }
 
-class VideoPopupMenu extends StatelessWidget {
+class MorePanel extends StatelessWidget {
-  final double? size;
-  final double? iconSize;
   final dynamic videoItem;
+  const MorePanel({super.key, required this.videoItem});
 
-  const VideoPopupMenu({
+  Future<dynamic> menuActionHandler(String type) async {
-    Key? key,
+    switch (type) {
-    required this.size,
+      case 'block':
-    required this.iconSize,
+        blockUser();
-    required this.videoItem,
+        break;
-  }) : super(key: key);
+      case 'watchLater':
-
+        var res = await UserHttp.toViewLater(bvid: videoItem.bvid as String);
-  @override
-  Widget build(BuildContext context) {
-    return 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,
-        // constraints: const BoxConstraints(maxHeight: 35),
-        onSelected: (String type) {},
-        itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
-          PopupMenuItem<String>(
-            onTap: () async {
-              var res =
-                  await UserHttp.toViewLater(bvid: videoItem.bvid as String);
         SmartDialog.showToast(res['msg']);
-            },
+        Get.back();
-            value: 'pause',
+        break;
-            height: 40,
+      default:
-            child: const Row(
+    }
-              children: [
+  }
-                Icon(Icons.watch_later_outlined, size: 16),
+
-                SizedBox(width: 6),
+  void blockUser() async {
-                Text('稍后再看', style: TextStyle(fontSize: 13))
-              ],
-            ),
-          ),
-          const PopupMenuDivider(),
-          PopupMenuItem<String>(
-            onTap: () async {
     SmartDialog.show(
       useSystem: true,
       animationType: SmartAnimationType.centerFade_otherSlide,
       builder: (BuildContext context) {
         return AlertDialog(
           title: const Text('提示'),
-                    content: Text(
+          content: Text('确定拉黑:${videoItem.owner.name}(${videoItem.owner.mid})?'
-                        '确定拉黑:${videoItem.owner.name}(${videoItem.owner.mid})?'
               '\n\n注：被拉黑的Up可以在隐私设置-黑名单管理中解除'),
           actions: [
             TextButton(
               onPressed: () => SmartDialog.dismiss(),
               child: Text(
                 '点错了',
-                          style: TextStyle(
+                style: TextStyle(color: Theme.of(context).colorScheme.outline),
-                              color: Theme.of(context).colorScheme.outline),
               ),
             ),
             TextButton(
@@ -439,18 +361,47 @@ class VideoPopupMenu extends StatelessWidget {
         );
       },
     );
-            },
+  }
-            value: 'pause',
+
-            height: 40,
+  @override
-            child: Row(
+  Widget build(BuildContext context) {
+    return Container(
+      padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
         children: [
-                const Icon(Icons.block, size: 16),
+          InkWell(
-                const SizedBox(width: 6),
+            onTap: () => Get.back(),
-                Text('拉黑：${videoItem.owner.name}',
+            child: Container(
-                    style: const TextStyle(fontSize: 13))
+              height: 35,
-              ],
+              padding: const EdgeInsets.only(bottom: 2),
+              child: Center(
+                child: Container(
+                  width: 32,
+                  height: 3,
+                  decoration: BoxDecoration(
+                      color: Theme.of(context).colorScheme.outline,
+                      borderRadius: const BorderRadius.all(Radius.circular(3))),
                 ),
               ),
+            ),
+          ),
+          ListTile(
+            onTap: () async => await menuActionHandler('block'),
+            minLeadingWidth: 0,
+            leading: const Icon(Icons.block, size: 19),
+            title: Text(
+              '拉黑up主 「${videoItem.owner.name}」',
+              style: Theme.of(context).textTheme.titleSmall,
+            ),
+          ),
+          ListTile(
+            onTap: () async => await menuActionHandler('watchLater'),
+            minLeadingWidth: 0,
+            leading: const Icon(Icons.watch_later_outlined, size: 19),
+            title:
+                Text('添加至稍后再看', style: Theme.of(context).textTheme.titleSmall),
+          ),
         ],
       ),
     );

lib/pages/home/view.dart

@@ -214,24 +214,8 @@ class UserInfoWidget extends StatelessWidget {
   final VoidCallback? callback;
   final HomeController? ctr;
 
-  @override
+  Widget buildLoggedInWidget(context) {
-  Widget build(BuildContext context) {
+    return Stack(
-    return Row(
-      children: [
-        SearchBar(ctr: ctr),
-        if (userLogin.value) ...[
-          const SizedBox(width: 4),
-          ClipRect(
-            child: IconButton(
-              onPressed: () => Get.toNamed('/whisper'),
-              icon: const Icon(Icons.notifications_none),
-            ),
-          )
-        ],
-        const SizedBox(width: 8),
-        Obx(
-          () => userLogin.value
-              ? Stack(
       children: [
         NetworkImgLayer(
           type: 'avatar',
@@ -255,7 +239,27 @@ class UserInfoWidget extends StatelessWidget {
           ),
         )
       ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        SearchBar(ctr: ctr),
+        if (userLogin.value) ...[
+          const SizedBox(width: 4),
+          ClipRect(
+            child: IconButton(
+              onPressed: () => Get.toNamed('/whisper'),
+              icon: const Icon(Icons.notifications_none),
+            ),
           )
+        ],
+        const SizedBox(width: 8),
+        Obx(
+          () => userLogin.value
+              ? buildLoggedInWidget(context)
               : DefaultUser(callback: () => callback!()),
         ),
       ],
@@ -402,34 +406,31 @@ class SearchBar extends StatelessWidget {
           color: colorScheme.onSecondaryContainer.withOpacity(0.05),
           child: InkWell(
             splashColor: colorScheme.primaryContainer.withOpacity(0.3),
-            onTap: () => Get.toNamed(
+            onTap: () => Get.toNamed('/search',
-              '/search',
+                parameters: {'hintText': ctr!.defaultSearch.value}),
-              parameters: {'hintText': ctr!.defaultSearch.value},
+            child: Padding(
-            ),
+              padding: const EdgeInsets.symmetric(horizontal: 14),
               child: Row(
                 children: [
-                const SizedBox(width: 14),
                   Icon(
                     Icons.search_outlined,
                     color: colorScheme.onSecondaryContainer,
                   ),
                   const SizedBox(width: 10),
                   Obx(
-                  () => Expanded(
+                    () => Text(
-                    child: Text(
                       ctr!.defaultSearch.value,
                       maxLines: 1,
                       overflow: TextOverflow.ellipsis,
                       style: TextStyle(color: colorScheme.outline),
                     ),
                   ),
-                ),
-                const SizedBox(width: 15),
                 ],
               ),
             ),
           ),
         ),
+      ),
     );
   }
 }

lib/pages/rcmd/view.dart

@@ -5,9 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/skeleton/video_card_v.dart';
-import 'package:pilipala/common/widgets/animated_dialog.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
-import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/common/widgets/video_card_v.dart';
 import 'package:pilipala/utils/main_stream.dart';
 
@@ -118,16 +116,6 @@ class _RcmdPageState extends State<RcmdPage>
     );
   }
 
-  OverlayEntry _createPopupDialog(videoItem) {
-    return OverlayEntry(
-      builder: (context) => AnimatedDialog(
-        closeFn: _rcmdController.popupDialog?.remove,
-        child: OverlayPop(
-            videoItem: videoItem, closeFn: _rcmdController.popupDialog?.remove),
-      ),
-    );
-  }
-
   Widget contentGrid(ctr, videoList) {
     // double maxWidth = Get.size.width;
     // int baseWidth = 500;
@@ -158,14 +146,6 @@ class _RcmdPageState extends State<RcmdPage>
               ? VideoCardV(
                   videoItem: videoList[index],
                   crossAxisCount: crossAxisCount,
-                  longPress: () {
-                    _rcmdController.popupDialog =
-                        _createPopupDialog(videoList[index]);
-                    Overlay.of(context).insert(_rcmdController.popupDialog!);
-                  },
-                  longPressEnd: () {
-                    _rcmdController.popupDialog?.remove();
-                  },
                 )
               : const VideoCardVSkeleton();
         },

lib/pages/video/detail/introduction/widgets/intro_detail.dart

@@ -23,6 +23,8 @@ class IntroDetail extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
             const SizedBox(height: 4),
+            Row(
+              children: [
                 GestureDetector(
                   onTap: () {
                     Clipboard.setData(ClipboardData(text: videoDetail!.bvid!));
@@ -31,9 +33,25 @@ class IntroDetail extends StatelessWidget {
                   child: Text(
                     videoDetail!.bvid!,
                     style: TextStyle(
-                    fontSize: 13, color: Theme.of(context).colorScheme.primary),
+                        fontSize: 13,
+                        color: Theme.of(context).colorScheme.primary),
                   ),
                 ),
+                const SizedBox(width: 10),
+                GestureDetector(
+                  onTap: () {
+                    Clipboard.setData(ClipboardData(text: videoDetail!.bvid!));
+                    SmartDialog.showToast('已复制');
+                  },
+                  child: Text(
+                    videoDetail!.aid!.toString(),
+                    style: TextStyle(
+                        fontSize: 13,
+                        color: Theme.of(context).colorScheme.primary),
+                  ),
+                )
+              ],
+            ),
             const SizedBox(height: 4),
             Text.rich(
               style: const TextStyle(height: 1.4),