mod: show fullscreen action item

Closes #367 Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
2026-05-30 23:58:13 +08:00 · 2025-03-05 21:49:57 +08:00
parent dc1451c3af
commit fac3c19d3f
8 changed files with 559 additions and 394 deletions
--- a/lib/pages/video/detail/introduction/controller.dart
+++ b/lib/pages/video/detail/introduction/controller.dart
@@ -861,4 +861,24 @@ class VideoIntroController extends GetxController
    }
    return res;
  }
+
+  // 收藏
+  showFavBottomSheet(BuildContext context, {type = 'tap'}) {
+    if (userInfo == null) {
+      SmartDialog.showToast('账号未登录');
+      return;
+    }
+    // 快速收藏 &
+    // 点按 收藏至默认文件夹
+    // 长按选择文件夹
+    if (enableQuickFav) {
+      if (type == 'tap') {
+        actionFavVideo(type: 'default');
+      } else {
+        Utils.showFavBottomSheet(context: context, ctr: this);
+      }
+    } else if (type != 'longPress') {
+      Utils.showFavBottomSheet(context: context, ctr: this);
+    }
+  }
 }
--- a/lib/pages/video/detail/introduction/view.dart
+++ b/lib/pages/video/detail/introduction/view.dart
@@ -232,26 +232,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
    }
  }

-  // 收藏
-  showFavBottomSheet({type = 'tap'}) {
-    if (videoIntroController.userInfo == null) {
-      SmartDialog.showToast('账号未登录');
-      return;
-    }
-    // 快速收藏 &
-    // 点按 收藏至默认文件夹
-    // 长按选择文件夹
-    if (videoIntroController.enableQuickFav) {
-      if (type == 'tap') {
-        videoIntroController.actionFavVideo(type: 'default');
-      } else {
-        Utils.showFavBottomSheet(context: context, ctr: videoIntroController);
-      }
-    } else if (type != 'longPress') {
-      Utils.showFavBottomSheet(context: context, ctr: videoIntroController);
-    }
-  }
-
  // 视频介绍
  showIntroDetail() {
    if (widget.loadingStatus) {
@@ -857,7 +837,8 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
    );
  }

-  Widget actionGrid(BuildContext context, videoIntroController) {
+  Widget actionGrid(
+      BuildContext context, VideoIntroController videoIntroController) {
    return LayoutBuilder(
        builder: (BuildContext context, BoxConstraints constraints) {
      return Container(
@@ -896,14 +877,15 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
            ),
            Obx(
              () => ActionItem(
-                  icon: const Icon(FontAwesomeIcons.thumbsDown),
-                  selectIcon: const Icon(FontAwesomeIcons.solidThumbsDown),
-                  onTap: () =>
-                      handleState(videoIntroController.actionDislikeVideo),
-                  selectStatus: videoIntroController.hasDislike.value,
-                  loadingStatus: widget.loadingStatus,
-                  semanticsLabel: '点踩',
-                  text: "点踩"),
+                icon: const Icon(FontAwesomeIcons.thumbsDown),
+                selectIcon: const Icon(FontAwesomeIcons.solidThumbsDown),
+                onTap: () =>
+                    handleState(videoIntroController.actionDislikeVideo),
+                selectStatus: videoIntroController.hasDislike.value,
+                loadingStatus: widget.loadingStatus,
+                semanticsLabel: '点踩',
+                text: "点踩",
+              ),
            ),
            // ActionItem(
            //     icon: const Icon(FontAwesomeIcons.clock),
@@ -931,8 +913,9 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                key: _favKey,
                icon: const Icon(FontAwesomeIcons.star),
                selectIcon: const Icon(FontAwesomeIcons.solidStar),
-                onTap: () => showFavBottomSheet(),
-                onLongPress: () => showFavBottomSheet(type: 'longPress'),
+                onTap: () => videoIntroController.showFavBottomSheet(context),
+                onLongPress: () => videoIntroController
+                    .showFavBottomSheet(context, type: 'longPress'),
                selectStatus: videoIntroController.hasFav.value,
                loadingStatus: widget.loadingStatus,
                semanticsLabel: '收藏',
@@ -943,31 +926,37 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
              ),
            ),
            ActionItem(
-                icon: const Icon(FontAwesomeIcons.comment),
-                onTap: () => videoDetailCtr.tabCtr
-                    .animateTo(videoDetailCtr.tabCtr.index == 1 ? 0 : 1),
-                selectStatus: false,
-                loadingStatus: widget.loadingStatus,
-                semanticsLabel: '评论',
-                text: !widget.loadingStatus
-                    ? Utils.numFormat(videoDetail.stat!.reply!)
-                    : '评论'),
+              icon: const Icon(FontAwesomeIcons.comment),
+              onTap: () => videoDetailCtr.tabCtr
+                  .animateTo(videoDetailCtr.tabCtr.index == 1 ? 0 : 1),
+              selectStatus: false,
+              loadingStatus: widget.loadingStatus,
+              semanticsLabel: '评论',
+              text: !widget.loadingStatus
+                  ? Utils.numFormat(videoDetail.stat!.reply!)
+                  : '评论',
+            ),
            ActionItem(
-                icon: const Icon(FontAwesomeIcons.shareFromSquare),
-                onTap: () => videoIntroController.actionShareVideo(),
-                selectStatus: false,
-                loadingStatus: widget.loadingStatus,
-                semanticsLabel: '分享',
-                text: !widget.loadingStatus
-                    ? Utils.numFormat(videoDetail.stat!.share!)
-                    : '分享'),
+              icon: const Icon(FontAwesomeIcons.shareFromSquare),
+              onTap: () => videoIntroController.actionShareVideo(),
+              selectStatus: false,
+              loadingStatus: widget.loadingStatus,
+              semanticsLabel: '分享',
+              text: !widget.loadingStatus
+                  ? Utils.numFormat(videoDetail.stat!.share!)
+                  : '分享',
+            ),
          ],
        ),
      );
    });
  }

-  Widget actionRow(BuildContext context, videoIntroController, videoDetailCtr) {
+  Widget actionRow(
+    BuildContext context,
+    VideoIntroController videoIntroController,
+    VideoDetailController videoDetailCtr,
+  ) {
    return Row(children: <Widget>[
      Obx(
        () => ActionRowItem(
@@ -994,8 +983,9 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
      Obx(
        () => ActionRowItem(
          icon: const Icon(FontAwesomeIcons.heart),
-          onTap: () => showFavBottomSheet(),
-          onLongPress: () => showFavBottomSheet(type: 'longPress'),
+          onTap: () => videoIntroController.showFavBottomSheet(context),
+          onLongPress: () => videoIntroController.showFavBottomSheet(context,
+              type: 'longPress'),
          selectStatus: videoIntroController.hasFav.value,
          loadingStatus: widget.loadingStatus,
          text: !widget.loadingStatus
--- a/lib/pages/video/detail/introduction/widgets/action_item.dart
+++ b/lib/pages/video/detail/introduction/widgets/action_item.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:PiliPlus/utils/feed_back.dart';

 class ActionItem extends StatefulWidget {
-  final Icon? icon;
+  final Icon icon;
  final Icon? selectIcon;
  final Function? onTap;
  final Function? onLongPress;
@@ -16,10 +16,11 @@ class ActionItem extends StatefulWidget {
  final bool needAnim;
  final bool hasOneThree;
  final Function? callBack;
+  final bool? expand;

  const ActionItem({
    super.key,
-    this.icon,
+    required this.icon,
    this.selectIcon,
    this.onTap,
    this.onLongPress,
@@ -30,6 +31,7 @@ class ActionItem extends StatefulWidget {
    this.hasOneThree = false,
    this.callBack,
    required this.semanticsLabel,
+    this.expand,
  });

  @override
@@ -113,8 +115,10 @@ class ActionItemState extends State<ActionItem> with TickerProviderStateMixin {

  @override
  Widget build(BuildContext context) {
-    return Expanded(
-      child: Semantics(
+    return widget.expand == false ? _buildItem : Expanded(child: _buildItem);
+  }
+
+  Widget get _buildItem => Semantics(
        label: (widget.text ?? "") +
            (widget.selectStatus ? "已" : "") +
            widget.semanticsLabel,
@@ -155,42 +159,42 @@ class ActionItemState extends State<ActionItem> with TickerProviderStateMixin {
                  Icon(
                    widget.selectStatus
                        ? widget.selectIcon!.icon!
-                        : widget.icon!.icon!,
+                        : widget.icon.icon,
                    size: 18,
                    color: widget.selectStatus
                        ? Theme.of(context).colorScheme.primary
-                        : Theme.of(context).colorScheme.outline,
+                        : widget.icon.color ??
+                            Theme.of(context).colorScheme.outline,
                  ),
                ],
              ),
-              AnimatedOpacity(
-                opacity: widget.loadingStatus! ? 0 : 1,
-                duration: const Duration(milliseconds: 200),
-                child: AnimatedSwitcher(
-                  duration: const Duration(milliseconds: 300),
-                  transitionBuilder:
-                      (Widget child, Animation<double> animation) {
-                    return ScaleTransition(scale: animation, child: child);
-                  },
-                  child: Text(
-                    widget.text ?? '',
-                    key: ValueKey<String>(widget.text ?? ''),
-                    style: TextStyle(
-                        color: widget.selectStatus
-                            ? Theme.of(context).colorScheme.primary
-                            : Theme.of(context).colorScheme.outline,
-                        fontSize:
-                            Theme.of(context).textTheme.labelSmall!.fontSize),
-                    semanticsLabel: "",
+              if (widget.text != null)
+                AnimatedOpacity(
+                  opacity: widget.loadingStatus! ? 0 : 1,
+                  duration: const Duration(milliseconds: 200),
+                  child: AnimatedSwitcher(
+                    duration: const Duration(milliseconds: 300),
+                    transitionBuilder:
+                        (Widget child, Animation<double> animation) {
+                      return ScaleTransition(scale: animation, child: child);
+                    },
+                    child: Text(
+                      widget.text!,
+                      key: ValueKey<String>(widget.text ?? ''),
+                      style: TextStyle(
+                          color: widget.selectStatus
+                              ? Theme.of(context).colorScheme.primary
+                              : Theme.of(context).colorScheme.outline,
+                          fontSize:
+                              Theme.of(context).textTheme.labelSmall!.fontSize),
+                      semanticsLabel: "",
+                    ),
                  ),
                ),
-              ),
            ],
          ),
        ),
-      ),
-    );
-  }
+      );
 }

 class _ArcPainter extends CustomPainter {