diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index bc94516..df19876 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"permission_handler_apple","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\permission_handler_apple-9.0.7\\\\","native_build":true,"dependencies":[]},{"name":"photo_gallery","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\photo_gallery-1.1.1\\\\","native_build":true,"dependencies":[]},{"name":"video_player_avfoundation","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\video_player_avfoundation-2.3.8\\\\","native_build":true,"dependencies":[]},{"name":"video_thumbnail","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\video_thumbnail-0.5.3\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"permission_handler_android","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\permission_handler_android-10.2.0\\\\","native_build":true,"dependencies":[]},{"name":"photo_gallery","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\photo_gallery-1.1.1\\\\","native_build":true,"dependencies":[]},{"name":"video_player_android","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\video_player_android-2.3.10\\\\","native_build":true,"dependencies":[]},{"name":"video_thumbnail","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\video_thumbnail-0.5.3\\\\","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[{"name":"permission_handler_windows","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\permission_handler_windows-0.1.2\\\\","native_build":true,"dependencies":[]}],"web":[{"name":"video_player_web","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\video_player_web-2.0.13\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"permission_handler","dependencies":["permission_handler_android","permission_handler_apple","permission_handler_windows"]},{"name":"permission_handler_android","dependencies":[]},{"name":"permission_handler_apple","dependencies":[]},{"name":"permission_handler_windows","dependencies":[]},{"name":"photo_gallery","dependencies":[]},{"name":"video_player","dependencies":["video_player_android","video_player_avfoundation","video_player_web"]},{"name":"video_player_android","dependencies":[]},{"name":"video_player_avfoundation","dependencies":[]},{"name":"video_player_web","dependencies":[]},{"name":"video_thumbnail","dependencies":[]}],"date_created":"2023-01-02 13:18:01.553448","version":"3.3.10"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"permission_handler_apple","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\permission_handler_apple-9.0.7\\\\","native_build":true,"dependencies":[]},{"name":"photo_gallery","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\photo_gallery-1.1.1\\\\","native_build":true,"dependencies":[]},{"name":"video_player_avfoundation","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\video_player_avfoundation-2.3.8\\\\","native_build":true,"dependencies":[]},{"name":"video_thumbnail","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\video_thumbnail-0.5.3\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"permission_handler_android","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\permission_handler_android-10.2.0\\\\","native_build":true,"dependencies":[]},{"name":"photo_gallery","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\photo_gallery-1.1.1\\\\","native_build":true,"dependencies":[]},{"name":"video_player_android","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\video_player_android-2.3.10\\\\","native_build":true,"dependencies":[]},{"name":"video_thumbnail","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\video_thumbnail-0.5.3\\\\","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[{"name":"permission_handler_windows","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\permission_handler_windows-0.1.2\\\\","native_build":true,"dependencies":[]}],"web":[{"name":"video_player_web","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\video_player_web-2.0.13\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"permission_handler","dependencies":["permission_handler_android","permission_handler_apple","permission_handler_windows"]},{"name":"permission_handler_android","dependencies":[]},{"name":"permission_handler_apple","dependencies":[]},{"name":"permission_handler_windows","dependencies":[]},{"name":"photo_gallery","dependencies":[]},{"name":"video_player","dependencies":["video_player_android","video_player_avfoundation","video_player_web"]},{"name":"video_player_android","dependencies":[]},{"name":"video_player_avfoundation","dependencies":[]},{"name":"video_player_web","dependencies":[]},{"name":"video_thumbnail","dependencies":[]}],"date_created":"2023-01-02 13:50:49.099596","version":"3.3.10"} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index a326d5d..c73d277 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,4 +65,8 @@ ## 0.1.6 -* multiple hero with same id issue handled \ No newline at end of file +* multiple hero with same id issue handled + +## 0.1.7 + +* BottomSheetLayout doesn't ruin its child view anymore \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 83648bc..0ffc202 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -141,7 +141,7 @@ packages: path: ".." relative: true source: path - version: "0.1.6" + version: "0.1.7" get: dependency: transitive description: diff --git a/lib/views/bottom_sheet.dart b/lib/views/bottom_sheet.dart index 0aade3e..bbb5580 100644 --- a/lib/views/bottom_sheet.dart +++ b/lib/views/bottom_sheet.dart @@ -89,56 +89,66 @@ class _BottomSheetLayoutState extends State { @override Widget build(BuildContext context) { - return GetBuilder(builder: (controller) { - return BottomSheetBar( - willPopScope: true, - color: Colors.transparent, - locked: - (controller.sheetController.isExpanded && !controller.appBarTapping) + return Stack( + children: [ + widget.child, + GetBuilder(builder: (controller) { + return BottomSheetBar( + willPopScope: true, + color: Colors.transparent, + locked: (controller.sheetController.isExpanded && + !controller.appBarTapping) ? true : false, - controller: controller.sheetController, - expandedBuilder: (scrollController) { - check(); - return controller.sheetController.isExpanded - ? GalleryPickerView( - onSelect: widget.onSelect, - config: widget.config, - sheetController: bottomSheetBarController, - heroBuilder: widget.heroBuilder, - multipleMediaBuilder: widget.multipleMediaBuilder, - singleMedia: widget.singleMedia, - initSelectedMedia: widget.initSelectedMedia, - extraRecentMedia: widget.extraRecentMedia, - startWithRecent: widget.startWithRecent, - ) - : Container( - width: MediaQuery.of(context).size.width, - height: MediaQuery.of(context).size.height, - color: Colors.transparent, - ); - }, - body: widget.child, - collapsed: GetBuilder( - builder: (controller) => ViewCollapsed( - picker: GalleryPickerView( - onSelect: widget.onSelect, - config: widget.config, - sheetController: bottomSheetBarController, - heroBuilder: widget.heroBuilder, - singleMedia: widget.singleMedia, - multipleMediaBuilder: widget.multipleMediaBuilder, - initSelectedMedia: widget.initSelectedMedia, - extraRecentMedia: widget.extraRecentMedia, - startWithRecent: widget.startWithRecent, - ), - viewPicker: controller.isClosing ? false : viewCollapsedPicker, - onBuild: (context) { - collapsedContext = context; - }), - ), - ); - }); + controller: controller.sheetController, + expandedBuilder: (scrollController) { + check(); + return controller.sheetController.isExpanded + ? GalleryPickerView( + onSelect: widget.onSelect, + config: widget.config, + sheetController: bottomSheetBarController, + heroBuilder: widget.heroBuilder, + multipleMediaBuilder: widget.multipleMediaBuilder, + singleMedia: widget.singleMedia, + initSelectedMedia: widget.initSelectedMedia, + extraRecentMedia: widget.extraRecentMedia, + startWithRecent: widget.startWithRecent, + ) + : Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height, + color: Colors.transparent, + ); + }, + body: SizedBox( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height, + ), + collapsed: GetBuilder( + builder: (controller) => ViewCollapsed( + picker: GalleryPickerView( + onSelect: widget.onSelect, + config: widget.config, + sheetController: bottomSheetBarController, + heroBuilder: widget.heroBuilder, + singleMedia: widget.singleMedia, + multipleMediaBuilder: widget.multipleMediaBuilder, + initSelectedMedia: widget.initSelectedMedia, + isCollapsedSheet: true, + extraRecentMedia: widget.extraRecentMedia, + startWithRecent: widget.startWithRecent, + ), + viewPicker: + controller.isClosing ? false : viewCollapsedPicker, + onBuild: (context) { + collapsedContext = context; + }), + ), + ); + }), + ], + ); } } diff --git a/pubspec.yaml b/pubspec.yaml index be239bf..d15bdab 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: gallery_picker description: Gallery Picker is a flutter package that will allow you to pick media file(s), manage and navigate inside your gallery with modern tools and views. -version: 0.1.6 +version: 0.1.7 homepage: https://github.com/FlutterWay/gallery_picker environment: