opt: fav follow bottomSheet

lib/pages/follow/widgets/follow_item.dart

@@ -1,3 +1,4 @@
+import 'package:bottom_sheet/bottom_sheet.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
@@ -47,9 +48,21 @@ class FollowItem extends StatelessWidget {
               height: 34,
               child: TextButton(
                 onPressed: () async {
-                  await Get.bottomSheet(
+                  await showFlexibleBottomSheet(
-                    GroupPanel(mid: item.mid!),
+                    bottomSheetColor: Colors.transparent,
-                    isScrollControlled: true,
+                    minHeight: 1,
+                    initHeight: 1,
+                    maxHeight: 1,
+                    context: Get.context!,
+                    builder: (BuildContext context,
+                        ScrollController scrollController, double offset) {
+                      return GroupPanel(
+                        mid: item.mid!,
+                        scrollController: scrollController,
+                      );
+                    },
+                    anchors: [1],
+                    isSafeArea: true,
                   );
                 },
                 style: TextButton.styleFrom(

lib/pages/video/detail/introduction/controller.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:bottom_sheet/bottom_sheet.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -517,9 +518,21 @@ class VideoIntroController extends GetxController {
 
   // 设置关注分组
   void setFollowGroup() {
-    Get.bottomSheet(
+    showFlexibleBottomSheet(
-      GroupPanel(mid: videoDetail.value.owner!.mid!),
+      bottomSheetColor: Colors.transparent,
-      isScrollControlled: true,
+      minHeight: 0.6,
+      initHeight: 0.6,
+      maxHeight: 1,
+      context: Get.context!,
+      builder: (BuildContext context, ScrollController scrollController,
+          double offset) {
+        return GroupPanel(
+          mid: videoDetail.value.owner!.mid!,
+          scrollController: scrollController,
+        );
+      },
+      anchors: [0.6, 1],
+      isSafeArea: true,
     );
   }
 

lib/pages/video/detail/introduction/view.dart

@@ -1,3 +1,6 @@
+import 'dart:ffi';
+
+import 'package:bottom_sheet/bottom_sheet.dart';
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:expandable/expandable.dart';
 import 'package:flutter/services.dart';
@@ -215,37 +218,35 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
         if (!videoIntroController.hasFav.value) {
           videoIntroController.actionFavVideo(type: 'default');
         } else {
-          showModalBottomSheet(
+          _showFavPanel();
-            context: context,
-            useRootNavigator: true,
-            isScrollControlled: true,
-            builder: (BuildContext context) {
-              return FavPanel(ctr: videoIntroController);
-            },
-          );
         }
       } else {
-        showModalBottomSheet(
+        _showFavPanel();
-          context: context,
-          useRootNavigator: true,
-          isScrollControlled: true,
-          builder: (BuildContext context) {
-            return FavPanel(ctr: videoIntroController);
-          },
-        );
       }
     } else if (type != 'longPress') {
-      showModalBottomSheet(
+      _showFavPanel();
-        context: context,
-        useRootNavigator: true,
-        isScrollControlled: true,
-        builder: (BuildContext context) {
-          return FavPanel(ctr: videoIntroController);
-        },
-      );
     }
   }
 
+  void _showFavPanel() {
+    showFlexibleBottomSheet(
+      bottomSheetColor: Colors.transparent,
+      minHeight: 0.6,
+      initHeight: 0.6,
+      maxHeight: 1,
+      context: context,
+      builder: (BuildContext context, ScrollController scrollController,
+          double offset) {
+        return FavPanel(
+          ctr: videoIntroController,
+          scrollController: scrollController,
+        );
+      },
+      anchors: [0.6, 1],
+      isSafeArea: true,
+    );
+  }
+
   // 视频介绍
   showIntroDetail() {
     feedBack();

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

@@ -6,8 +6,9 @@ import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
 
 class FavPanel extends StatefulWidget {
-  const FavPanel({super.key, this.ctr});
+  const FavPanel({super.key, this.ctr, this.scrollController});
   final dynamic ctr;
+  final ScrollController? scrollController;
 
   @override
   State<FavPanel> createState() => _FavPanelState();
@@ -15,31 +16,39 @@ class FavPanel extends StatefulWidget {
 
 class _FavPanelState extends State<FavPanel> {
   final Box<dynamic> localCache = GStrorage.localCache;
-  late double sheetHeight;
   late Future _futureBuilderFuture;
 
   @override
   void initState() {
     super.initState();
-    sheetHeight = localCache.get('sheetHeight');
     _futureBuilderFuture = widget.ctr!.queryVideoInFolder();
   }
 
   @override
   Widget build(BuildContext context) {
     return Container(
-      height: sheetHeight,
+      clipBehavior: Clip.hardEdge,
+      decoration: BoxDecoration(
         color: Theme.of(context).colorScheme.surface,
+        borderRadius: const BorderRadius.only(
+          topLeft: Radius.circular(16),
+          topRight: Radius.circular(16),
+        ),
+      ),
       child: Column(
         children: [
           AppBar(
             centerTitle: false,
             elevation: 0,
-            leading: IconButton(
+            automaticallyImplyLeading: false,
-                onPressed: () => Get.back(),
+            leadingWidth: 0,
-                icon: const Icon(Icons.close_outlined)),
+            title: Text(
-            title:
+              '选择收藏夹',
-                Text('添加到收藏夹', style: Theme.of(context).textTheme.titleMedium),
+              style: Theme.of(context)
+                  .textTheme
+                  .titleMedium!
+                  .copyWith(fontWeight: FontWeight.bold),
+            ),
           ),
           Expanded(
             child: Material(
@@ -51,22 +60,22 @@ class _FavPanelState extends State<FavPanel> {
                     if (data['status']) {
                       return Obx(
                         () => ListView.builder(
+                          controller: widget.scrollController,
                           itemCount:
                               widget.ctr!.favFolderData.value.list!.length,
                           itemBuilder: (context, index) {
+                            final item =
+                                widget.ctr!.favFolderData.value.list![index];
                             return ListTile(
-                              onTap: () => widget.ctr!.onChoose(
+                              onTap: () => widget.ctr!
-                                  widget.ctr!.favFolderData.value.list![index]
+                                  .onChoose(item.favState != 1, index),
-                                          .favState !=
-                                      1,
-                                  index),
                               dense: true,
                               leading: const Icon(Icons.folder_outlined),
                               minLeadingWidth: 0,
                               title: Text(widget.ctr!.favFolderData.value
                                   .list![index].title!),
                               subtitle: Text(
-                                '${widget.ctr!.favFolderData.value.list![index].mediaCount}个内容',
+                                '${item.mediaCount}个内容 ',
                               ),
                               trailing: Transform.scale(
                                 scale: 0.9,
@@ -132,7 +141,7 @@ class _FavPanelState extends State<FavPanel> {
                     backgroundColor:
                         Theme.of(context).colorScheme.primary, // 设置按钮背景色
                   ),
-                  child: const Text('完成'),
+                  child: const Text('确认选择'),
                 ),
               ],
             ),

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

@@ -10,7 +10,8 @@ import 'package:pilipala/utils/storage.dart';
 
 class GroupPanel extends StatefulWidget {
   final int? mid;
-  const GroupPanel({super.key, this.mid});
+  final ScrollController scrollController;
+  const GroupPanel({super.key, this.mid, required this.scrollController});
 
   @override
   State<GroupPanel> createState() => _GroupPanelState();
@@ -18,7 +19,6 @@ class GroupPanel extends StatefulWidget {
 
 class _GroupPanelState extends State<GroupPanel> {
   final Box<dynamic> localCache = GStrorage.localCache;
-  late double sheetHeight;
   late Future _futureBuilderFuture;
   late List<MemberTagItemModel> tagsList;
   bool showDefault = true;
@@ -26,7 +26,6 @@ class _GroupPanelState extends State<GroupPanel> {
   @override
   void initState() {
     super.initState();
-    sheetHeight = localCache.get('sheetHeight');
     _futureBuilderFuture = MemberHttp.followUpTags();
   }
 
@@ -56,8 +55,14 @@ class _GroupPanelState extends State<GroupPanel> {
   @override
   Widget build(BuildContext context) {
     return Container(
-      height: sheetHeight,
+      clipBehavior: Clip.hardEdge,
+      decoration: BoxDecoration(
         color: Theme.of(context).colorScheme.surface,
+        borderRadius: const BorderRadius.only(
+          topLeft: Radius.circular(16),
+          topRight: Radius.circular(16),
+        ),
+      ),
       child: Column(
         children: <Widget>[
           AppBar(
@@ -79,6 +84,7 @@ class _GroupPanelState extends State<GroupPanel> {
                     if (data['status']) {
                       tagsList = data['data'];
                       return ListView.builder(
+                        controller: widget.scrollController,
                         itemCount: data['data'].length,
                         itemBuilder: (context, index) {
                           return ListTile(

pubspec.lock

@@ -113,6 +113,22 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.1"
+  bottom_inset_observer:
+    dependency: transitive
+    description:
+      name: bottom_inset_observer
+      sha256: cbfb01e0e07cc4922052701786d5e607765a6f54e1844f41061abf8744519a7d
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.1.0"
+  bottom_sheet:
+    dependency: "direct main"
+    description:
+      name: bottom_sheet
+      sha256: efd28f52357d23e1c01eaeb45466b407f1e29318305bd6d10baf814fda18bd7e
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "4.0.4"
   build:
     dependency: transitive
     description:

pubspec.yaml

@@ -146,6 +146,7 @@ dependencies:
   lottie: ^3.1.2
   # 二维码
   qr_flutter: ^4.1.0
+  bottom_sheet: ^4.0.4
 
 dev_dependencies:
   flutter_test: