mod: use DraggableScrollableSheet

lib/pages/follow/widgets/follow_item.dart

@@ -1,4 +1,3 @@
-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';
@@ -48,24 +47,27 @@ class FollowItem extends StatelessWidget {
               height: 34,
               child: TextButton(
                 onPressed: () async {
-                  await showFlexibleBottomSheet(
+                  await showModalBottomSheet(
-                    bottomSheetBorderRadius: const BorderRadius.only(
+                    context: context,
-                      topLeft: Radius.circular(16),
+                    useSafeArea: true,
-                      topRight: Radius.circular(16),
+                    isScrollControlled: true,
-                    ),
+                    builder: (BuildContext context) {
-                    minHeight: 1,
+                      return DraggableScrollableSheet(
-                    initHeight: 1,
+                        initialChildSize: 0.6,
-                    maxHeight: 1,
+                        minChildSize: 0,
-                    context: Get.context!,
+                        maxChildSize: 1,
+                        snap: true,
+                        expand: false,
+                        snapSizes: const [0.6],
                         builder: (BuildContext context,
-                        ScrollController scrollController, double offset) {
+                            ScrollController scrollController) {
                           return GroupPanel(
                             mid: item.mid!,
                             scrollController: scrollController,
                           );
                         },
-                    anchors: [1],
+                      );
-                    isSafeArea: true,
+                    },
                   );
                 },
                 style: TextButton.styleFrom(

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

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:bottom_sheet/bottom_sheet.dart';
+// import 'package:bottom_sheet/bottom_sheet.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
@@ -531,25 +531,31 @@ class VideoIntroController extends GetxController {
   }
 
   // 设置关注分组
-  void setFollowGroup() {
+  void setFollowGroup() async {
-    showFlexibleBottomSheet(
+    final mediaQueryData = MediaQuery.of(Get.context!);
-      bottomSheetBorderRadius: const BorderRadius.only(
+    final contentHeight = mediaQueryData.size.height - kToolbarHeight;
-        topLeft: Radius.circular(16),
+    final double initialChildSize =
-        topRight: Radius.circular(16),
+        (contentHeight - Get.width * 9 / 16) / contentHeight;
-      ),
+    await showModalBottomSheet(
-      minHeight: 0.6,
-      initHeight: 0.6,
-      maxHeight: 1,
       context: Get.context!,
-      builder: (BuildContext context, ScrollController scrollController,
+      useSafeArea: true,
-          double offset) {
+      isScrollControlled: true,
+      builder: (BuildContext context) {
+        return DraggableScrollableSheet(
+          initialChildSize: initialChildSize,
+          minChildSize: 0,
+          maxChildSize: 1,
+          snap: true,
+          expand: false,
+          snapSizes: [initialChildSize],
+          builder: (BuildContext context, ScrollController scrollController) {
             return GroupPanel(
               mid: videoDetail.value.owner!.mid!,
               scrollController: scrollController,
             );
           },
-      anchors: [0.6, 1],
+        );
-      isSafeArea: true,
+      },
     );
   }
 

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

@@ -1,4 +1,4 @@
-import 'package:bottom_sheet/bottom_sheet.dart';
+// import 'package:bottom_sheet/bottom_sheet.dart';
 import 'package:expandable/expandable.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -199,25 +199,35 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
     }
   }
 
-  void _showFavPanel() {
+  void _showFavPanel() async {
-    showFlexibleBottomSheet(
+    final mediaQueryData = MediaQuery.of(context);
-      bottomSheetBorderRadius: const BorderRadius.only(
+    final contentHeight = mediaQueryData.size.height - kToolbarHeight;
-        topLeft: Radius.circular(16),
+    final double initialChildSize =
-        topRight: Radius.circular(16),
+        (contentHeight - Get.width * 9 / 16) / contentHeight;
+    await showModalBottomSheet(
+      context: Get.context!,
+      useSafeArea: true,
+      isScrollControlled: true,
+      transitionAnimationController: AnimationController(
+        duration: const Duration(milliseconds: 200),
+        vsync: this,
       ),
-      minHeight: 0.6,
+      builder: (BuildContext context) {
-      initHeight: 0.6,
+        return DraggableScrollableSheet(
-      maxHeight: 1,
+          initialChildSize: initialChildSize,
-      context: context,
+          minChildSize: 0,
-      builder: (BuildContext context, ScrollController scrollController,
+          maxChildSize: 1,
-          double offset) {
+          snap: true,
+          expand: false,
+          snapSizes: [initialChildSize],
+          builder: (BuildContext context, ScrollController scrollController) {
             return FavPanel(
               ctr: videoIntroController,
               scrollController: scrollController,
             );
           },
-      anchors: [0.6, 1],
+        );
-      isSafeArea: true,
+      },
     );
   }
 

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

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
@@ -32,8 +31,14 @@ class _FavPanelState extends State<FavPanel> {
         AppBar(
           centerTitle: false,
           elevation: 0,
-          automaticallyImplyLeading: false,
+          shape: const RoundedRectangleBorder(
-          leadingWidth: 0,
+            borderRadius: BorderRadius.vertical(
+              top: Radius.circular(20),
+            ),
+          ),
+          leading: IconButton(
+              onPressed: () => Get.back(),
+              icon: const Icon(Icons.close_outlined)),
           title: Text(
             '选择收藏夹',
             style: Theme.of(context)
@@ -92,7 +97,7 @@ class _FavPanelState extends State<FavPanel> {
                   }
                 } else {
                   // 骨架屏
-                  return const Text('请求中');
+                  return const Center(child: Text('请求中'));
                 }
               },
             ),

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

@@ -59,10 +59,19 @@ class _GroupPanelState extends State<GroupPanel> {
         AppBar(
           centerTitle: false,
           elevation: 0,
+          shape: const RoundedRectangleBorder(
+            borderRadius: BorderRadius.vertical(
+              top: Radius.circular(20),
+            ),
+          ),
           leading: IconButton(
               onPressed: () => Get.back(),
               icon: const Icon(Icons.close_outlined)),
-          title: Text('设置关注分组', style: Theme.of(context).textTheme.titleMedium),
+          title: Text('设置关注分组',
+              style: Theme.of(context)
+                  .textTheme
+                  .titleMedium!
+                  .copyWith(fontWeight: FontWeight.bold)),
         ),
         Expanded(
           child: Material(
@@ -115,7 +124,7 @@ class _GroupPanelState extends State<GroupPanel> {
                   }
                 } else {
                   // 骨架屏
-                  return const Text('请求中');
+                  return const Center(child: Text('请求中'));
                 }
               },
             ),

pubspec.lock

@@ -113,22 +113,6 @@ 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"
   brotli:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -146,7 +146,6 @@ dependencies:
   lottie: ^3.1.2
   # 二维码
   qr_flutter: ^4.1.0
-  bottom_sheet: ^4.0.4
   web_socket_channel: ^2.4.5
   brotli: ^0.6.0
   # 文本语法高亮