浏览代码

use modal_bottom_sheet package for file info bottom sheet

ashilkn 2 年之前
父节点
当前提交
bd96b44976
共有 3 个文件被更改,包括 22 次插入21 次删除
  1. 2 2
      lib/ui/viewer/file/fading_bottom_bar.dart
  2. 19 19
      pubspec.lock
  3. 1 0
      pubspec.yaml

+ 2 - 2
lib/ui/viewer/file/fading_bottom_bar.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
+import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
 import 'package:page_transition/page_transition.dart';
 import 'package:page_transition/page_transition.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/models/file.dart';
 import 'package:photos/models/file.dart';
@@ -242,9 +243,8 @@ class FadingBottomBarState extends State<FadingBottomBar> {
   }
   }
 
 
   Future<void> _displayInfo(File file) async {
   Future<void> _displayInfo(File file) async {
-    return showModalBottomSheet<void>(
+    return showMaterialModalBottomSheet(
       context: context,
       context: context,
-      isScrollControlled: true,
       builder: (BuildContext context) {
       builder: (BuildContext context) {
         return FileInfoWidget(file);
         return FileInfoWidget(file);
       },
       },

+ 19 - 19
pubspec.lock

@@ -35,7 +35,7 @@ packages:
       name: async
       name: async
       url: "https://pub.dartlang.org"
       url: "https://pub.dartlang.org"
     source: hosted
     source: hosted
-    version: "2.8.2"
+    version: "2.9.0"
   background_fetch:
   background_fetch:
     dependency: "direct main"
     dependency: "direct main"
     description:
     description:
@@ -84,14 +84,7 @@ packages:
       name: characters
       name: characters
       url: "https://pub.dartlang.org"
       url: "https://pub.dartlang.org"
     source: hosted
     source: hosted
-    version: "1.2.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.1"
+    version: "1.2.1"
   chewie:
   chewie:
     dependency: "direct main"
     dependency: "direct main"
     description:
     description:
@@ -105,7 +98,7 @@ packages:
       name: clock
       name: clock
       url: "https://pub.dartlang.org"
       url: "https://pub.dartlang.org"
     source: hosted
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   collection:
   collection:
     dependency: "direct main"
     dependency: "direct main"
     description:
     description:
@@ -287,7 +280,7 @@ packages:
       name: fake_async
       name: fake_async
       url: "https://pub.dartlang.org"
       url: "https://pub.dartlang.org"
     source: hosted
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   fast_base58:
   fast_base58:
     dependency: "direct main"
     dependency: "direct main"
     description:
     description:
@@ -713,14 +706,14 @@ packages:
       name: matcher
       name: matcher
       url: "https://pub.dartlang.org"
       url: "https://pub.dartlang.org"
     source: hosted
     source: hosted
-    version: "0.12.11"
+    version: "0.12.12"
   material_color_utilities:
   material_color_utilities:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: material_color_utilities
       name: material_color_utilities
       url: "https://pub.dartlang.org"
       url: "https://pub.dartlang.org"
     source: hosted
     source: hosted
-    version: "0.1.4"
+    version: "0.1.5"
   media_extension:
   media_extension:
     dependency: "direct main"
     dependency: "direct main"
     description:
     description:
@@ -736,7 +729,7 @@ packages:
       name: meta
       name: meta
       url: "https://pub.dartlang.org"
       url: "https://pub.dartlang.org"
     source: hosted
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   mime:
   mime:
     dependency: transitive
     dependency: transitive
     description:
     description:
@@ -744,6 +737,13 @@ packages:
       url: "https://pub.dartlang.org"
       url: "https://pub.dartlang.org"
     source: hosted
     source: hosted
     version: "1.0.2"
     version: "1.0.2"
+  modal_bottom_sheet:
+    dependency: "direct main"
+    description:
+      name: modal_bottom_sheet
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.2"
   motionphoto:
   motionphoto:
     dependency: "direct main"
     dependency: "direct main"
     description:
     description:
@@ -843,7 +843,7 @@ packages:
       name: path
       name: path
       url: "https://pub.dartlang.org"
       url: "https://pub.dartlang.org"
     source: hosted
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   path_drawing:
   path_drawing:
     dependency: transitive
     dependency: transitive
     description:
     description:
@@ -1128,7 +1128,7 @@ packages:
       name: source_span
       name: source_span
       url: "https://pub.dartlang.org"
       url: "https://pub.dartlang.org"
     source: hosted
     source: hosted
-    version: "1.8.2"
+    version: "1.9.0"
   sprintf:
   sprintf:
     dependency: transitive
     dependency: transitive
     description:
     description:
@@ -1184,7 +1184,7 @@ packages:
       name: string_scanner
       name: string_scanner
       url: "https://pub.dartlang.org"
       url: "https://pub.dartlang.org"
     source: hosted
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   syncfusion_flutter_core:
   syncfusion_flutter_core:
     dependency: "direct main"
     dependency: "direct main"
     description:
     description:
@@ -1212,14 +1212,14 @@ packages:
       name: term_glyph
       name: term_glyph
       url: "https://pub.dartlang.org"
       url: "https://pub.dartlang.org"
     source: hosted
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
   test_api:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: test_api
       name: test_api
       url: "https://pub.dartlang.org"
       url: "https://pub.dartlang.org"
     source: hosted
     source: hosted
-    version: "0.4.9"
+    version: "0.4.12"
   timezone:
   timezone:
     dependency: transitive
     dependency: transitive
     description:
     description:

+ 1 - 0
pubspec.yaml

@@ -79,6 +79,7 @@ dependencies:
   lottie: ^1.2.2
   lottie: ^1.2.2
   media_extension:
   media_extension:
     git: "https://github.com/ente-io/media_extension.git"
     git: "https://github.com/ente-io/media_extension.git"
+  modal_bottom_sheet: ^2.1.2
   motionphoto:
   motionphoto:
     git: "https://github.com/ente-io/motionphoto.git"
     git: "https://github.com/ente-io/motionphoto.git"
   move_to_background: ^1.0.2
   move_to_background: ^1.0.2