opt: item

opt: util

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

lib/pages/fav_detail/controller.dart

@@ -4,6 +4,7 @@ import 'package:PiliPlus/models/user/fav_detail.dart';
 import 'package:PiliPlus/models/user/fav_folder.dart';
 import 'package:PiliPlus/pages/common/multi_select_controller.dart';
 import 'package:PiliPlus/utils/extension.dart';
+import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:flutter/material.dart';
@@ -153,7 +154,7 @@ class FavDetailController
           if (element.bvid != list.first.bvid) {
             SmartDialog.showToast('已跳过不支持播放的视频');
           }
-          Utils.toViewPage(
+          PageUtils.toVideoPage(
             'bvid=${element.bvid}&cid=${element.cid}',
             arguments: {
               'videoItem': element,

lib/pages/fav_detail/view.dart

@@ -7,6 +7,8 @@ import 'package:PiliPlus/models/user/fav_folder.dart';
 import 'package:PiliPlus/pages/fav_detail/fav_sort_page.dart';
 import 'package:PiliPlus/pages/fav_search/view.dart' show SearchType;
 import 'package:PiliPlus/utils/extension.dart';
+import 'package:PiliPlus/utils/page_utils.dart';
+import 'package:PiliPlus/utils/request_utils.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -136,7 +138,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
                                   VisualDensity(horizontal: -2, vertical: -2),
                             ),
                             onPressed: () {
-                              Utils.onCopyOrMove<FavDetailData,
+                              RequestUtils.onCopyOrMove<FavDetailData,
                                   FavDetailItemData>(
                                 context: context,
                                 isCopy: true,
@@ -160,7 +162,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
                                   VisualDensity(horizontal: -2, vertical: -2),
                             ),
                             onPressed: () {
-                              Utils.onCopyOrMove<FavDetailData,
+                              RequestUtils.onCopyOrMove<FavDetailData,
                                   FavDetailItemData>(
                                 context: context,
                                 isCopy: false,
@@ -279,9 +281,10 @@ class _FavDetailPageState extends State<FavDetailPage> {
                                         },
                                         child: Text('排序'),
                                       ),
-                                      if (!Utils.isDefault(_favDetailController
-                                              .item.value.attr ??
-                                          0))
+                                      if (!Utils.isDefaultFav(
+                                          _favDetailController
+                                                  .item.value.attr ??
+                                              0))
                                         PopupMenuItem(
                                           onTap: () {
                                             showConfirmDialog(
@@ -397,7 +400,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
                                               .item.value.attr !=
                                           null)
                                         Text(
-                                          '共${_favDetailController.item.value.mediaCount}条视频 · ${Utils.isPublicText(_favDetailController.item.value.attr ?? 0)}',
+                                          '共${_favDetailController.item.value.mediaCount}条视频 · ${Utils.isPublicFavText(_favDetailController.item.value.attr ?? 0)}',
                                           style: TextStyle(
                                               fontSize: Theme.of(context)
                                                   .textTheme
@@ -430,7 +433,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
   Widget _buildBody(LoadingState<List<FavDetailItemData>?> loadingState) {
     return switch (loadingState) {
       Loading() => SliverGrid(
-          gridDelegate: Grid.videoCardHDelegate(context, minHeight: 110),
+          gridDelegate: Grid.videoCardHDelegate(context),
           delegate: SliverChildBuilderDelegate(
             (context, index) {
               return const VideoCardHSkeleton();
@@ -444,7 +447,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
                 bottom: MediaQuery.of(context).padding.bottom + 85,
               ),
               sliver: SliverGrid(
-                gridDelegate: Grid.videoCardHDelegate(context, minHeight: 110),
+                gridDelegate: Grid.videoCardHDelegate(context),
                 delegate: SliverChildBuilderDelegate(
                   (context, index) {
                     if (index == loadingState.response!.length) {
@@ -475,7 +478,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
                                     )
                                 : null,
                             onViewFav: () {
-                              Utils.toViewPage(
+                              PageUtils.toVideoPage(
                                 'bvid=${item.bvid}&cid=${item.cid}',
                                 arguments: {
                                   'videoItem': item,

lib/pages/fav_detail/widget/fav_video_card.dart

@@ -3,6 +3,7 @@ import 'package:PiliPlus/common/widgets/image_save.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
 import 'package:PiliPlus/models/user/fav_detail.dart';
 import 'package:PiliPlus/utils/extension.dart';
+import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
@@ -50,7 +51,7 @@ class FavVideoCardH extends StatelessWidget {
                 videoItem.cid = await SearchHttp.ab2c(bvid: bvid);
                 dynamic seasonId = videoItem.ogv!['season_id'];
                 epId = videoItem.epId;
-                Utils.viewBangumi(seasonId: seasonId, epId: epId);
+                PageUtils.viewBangumi(seasonId: seasonId, epId: epId);
                 return;
               } else if (videoItem.page == 0 || videoItem.page! > 1) {
                 var result = await VideoHttp.videoIntro(bvid: bvid);
@@ -85,53 +86,44 @@ class FavVideoCardH extends StatelessWidget {
           horizontal: StyleString.safeSpace,
           vertical: 5,
         ),
-        child: LayoutBuilder(
-          builder: (context, boxConstraints) {
-            double width =
-                (boxConstraints.maxWidth - StyleString.cardSpace * 6) / 2;
-            return SizedBox(
-              height: width / StyleString.aspectRatio,
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.start,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  AspectRatio(
-                    aspectRatio: StyleString.aspectRatio,
-                    child: LayoutBuilder(
-                      builder: (context, boxConstraints) {
-                        double maxWidth = boxConstraints.maxWidth;
-                        double maxHeight = boxConstraints.maxHeight;
-                        return Stack(
-                          children: [
-                            NetworkImgLayer(
-                              src: videoItem.pic,
-                              width: maxWidth,
-                              height: maxHeight,
-                            ),
-                            PBadge(
-                              text: Utils.timeFormat(videoItem.duration),
-                              right: 6.0,
-                              bottom: 6.0,
-                              type: 'gray',
-                            ),
-                            PBadge(
-                              text: videoItem.ogv?['type_name'],
-                              top: 6.0,
-                              right: 6.0,
-                              bottom: null,
-                              left: null,
-                            ),
-                          ],
-                        );
-                      },
-                    ),
-                  ),
-                  const SizedBox(width: 10),
-                  videoContent(context),
-                ],
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            AspectRatio(
+              aspectRatio: StyleString.aspectRatio,
+              child: LayoutBuilder(
+                builder: (context, boxConstraints) {
+                  double maxWidth = boxConstraints.maxWidth;
+                  double maxHeight = boxConstraints.maxHeight;
+                  return Stack(
+                    children: [
+                      NetworkImgLayer(
+                        src: videoItem.pic,
+                        width: maxWidth,
+                        height: maxHeight,
+                      ),
+                      PBadge(
+                        text: Utils.timeFormat(videoItem.duration),
+                        right: 6.0,
+                        bottom: 6.0,
+                        type: 'gray',
+                      ),
+                      PBadge(
+                        text: videoItem.ogv?['type_name'],
+                        top: 6.0,
+                        right: 6.0,
+                        bottom: null,
+                        left: null,
+                      ),
+                    ],
+                  );
+                },
               ),
-            );
-          },
+            ),
+            const SizedBox(width: 10),
+            videoContent(context),
+          ],
         ),
       ),
     );
@@ -144,55 +136,43 @@ class FavVideoCardH extends StatelessWidget {
           Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Text(
-                videoItem.title,
-                textAlign: TextAlign.start,
-                style: const TextStyle(
-                  letterSpacing: 0.3,
+              Expanded(
+                child: Text(
+                  videoItem.title,
+                  textAlign: TextAlign.start,
+                  style: const TextStyle(
+                    letterSpacing: 0.3,
+                  ),
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis,
                 ),
-                maxLines: 2,
+              ),
+              Text(
+                '${Utils.dateFormat(videoItem.favTime)} ${videoItem.owner.name}',
+                maxLines: 1,
                 overflow: TextOverflow.ellipsis,
-              ),
-              if (videoItem.ogv != null)
-                Text(
-                  videoItem.desc!,
-                  style: TextStyle(
-                    fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
-                    color: Theme.of(context).colorScheme.outline,
-                  ),
-                ),
-              const Spacer(),
-              Text(
-                Utils.dateFormat(videoItem.favTime),
                 style: TextStyle(
-                    fontSize: 11, color: Theme.of(context).colorScheme.outline),
+                  height: 1,
+                  fontSize: 12,
+                  color: Theme.of(context).colorScheme.outline,
+                ),
               ),
-              if (!videoItem.owner.name.isNullOrEmpty)
-                Text(
-                  videoItem.owner.name!,
-                  style: TextStyle(
-                    fontSize: 12,
-                    color: Theme.of(context).colorScheme.outline,
+              const SizedBox(height: 3),
+              Row(
+                children: [
+                  StatView(
+                    context: context,
+                    theme: 'gray',
+                    value: videoItem.stat.viewStr,
                   ),
-                ),
-              Padding(
-                padding: const EdgeInsets.only(top: 2),
-                child: Row(
-                  children: [
-                    StatView(
-                      context: context,
-                      theme: 'gray',
-                      value: videoItem.stat.viewStr,
-                    ),
-                    const SizedBox(width: 8),
-                    StatDanMu(
-                      context: context,
-                      theme: 'gray',
-                      value: videoItem.stat.danmuStr,
-                    ),
-                    const Spacer(),
-                  ],
-                ),
+                  const SizedBox(width: 8),
+                  StatDanMu(
+                    context: context,
+                    theme: 'gray',
+                    value: videoItem.stat.danmuStr,
+                  ),
+                  const Spacer(),
+                ],
               ),
             ],
           ),
@@ -204,7 +184,7 @@ class FavVideoCardH extends StatelessWidget {
                 context: context,
                 icon: Icons.clear,
                 tooltip: '取消收藏',
-                iconColor: Theme.of(context).colorScheme.onSurfaceVariant,
+                iconColor: Theme.of(context).colorScheme.outline,
                 bgColor: Colors.transparent,
                 onPressed: () {
                   showDialog(