flutter_package / modal_bottom_sheet

Go to a project
Toggle navigation Toggle navigation pinning
Jaime Blasco
8df3d8e5 1 parent 6e339240

Format and fix analyzer hints

Inline Side-by-side
Showing 17 changed files with 148 additions and 74 deletions
@@ -53,8 +53,7 @@ class CupertinoSharePage extends StatelessWidget { @@ -53,8 +53,7 @@ class CupertinoSharePage extends StatelessWidget {
53 expand: true, 53 expand: true,
54 context: context, 54 context: context,
55 backgroundColor: Colors.transparent, 55 backgroundColor: Colors.transparent,
56 - builder: (context) =>  
57 - PhotoShareBottomSheet(), 56 + builder: (context) => PhotoShareBottomSheet(),
58 ); 57 );
59 }, 58 },
60 ), 59 ),
@@ -73,10 +72,7 @@ class CupertinoSharePage extends StatelessWidget { @@ -73,10 +72,7 @@ class CupertinoSharePage extends StatelessWidget {
73 } 72 }
74 73
75 class PhotoShareBottomSheet extends StatelessWidget { 74 class PhotoShareBottomSheet extends StatelessWidget {
76 -  
77 -  
78 - const PhotoShareBottomSheet({Key key})  
79 - : super(key: key); 75 + const PhotoShareBottomSheet({Key key}) : super(key: key);
80 76
81 @override 77 @override
82 Widget build(BuildContext context) { 78 Widget build(BuildContext context) {
@@ -92,7 +88,7 @@ class PhotoShareBottomSheet extends StatelessWidget { @@ -92,7 +88,7 @@ class PhotoShareBottomSheet extends StatelessWidget {
92 appBar: appBar(context), 88 appBar: appBar(context),
93 body: CustomScrollView( 89 body: CustomScrollView(
94 physics: ClampingScrollPhysics(), 90 physics: ClampingScrollPhysics(),
95 - controller: ModalScrollController.of(context), 91 + controller: ModalScrollController.of(context),
96 slivers: <Widget>[ 92 slivers: <Widget>[
97 SliverSafeArea( 93 SliverSafeArea(
98 bottom: false, 94 bottom: false,
@@ -95,7 +95,6 @@ class MyHomePage extends StatefulWidget { @@ -95,7 +95,6 @@ class MyHomePage extends StatefulWidget {
95 class _MyHomePageState extends State<MyHomePage> { 95 class _MyHomePageState extends State<MyHomePage> {
96 @override 96 @override
97 Widget build(BuildContext context) { 97 Widget build(BuildContext context) {
98 - print(MediaQuery.of(context).size.height);  
99 return Material( 98 return Material(
100 child: Scaffold( 99 child: Scaffold(
101 body: CupertinoPageScaffold( 100 body: CupertinoPageScaffold(
@@ -202,8 +201,7 @@ class _MyHomePageState extends State<MyHomePage> { @@ -202,8 +201,7 @@ class _MyHomePageState extends State<MyHomePage> {
202 expand: true, 201 expand: true,
203 context: context, 202 context: context,
204 backgroundColor: Colors.transparent, 203 backgroundColor: Colors.transparent,
205 - builder: (context) =>  
206 - ComplexModal(), 204 + builder: (context) => ComplexModal(),
207 )), 205 )),
208 ListTile( 206 ListTile(
209 title: Text('Modal with WillPopScope'), 207 title: Text('Modal with WillPopScope'),
@@ -211,26 +209,22 @@ class _MyHomePageState extends State<MyHomePage> { @@ -211,26 +209,22 @@ class _MyHomePageState extends State<MyHomePage> {
211 expand: true, 209 expand: true,
212 context: context, 210 context: context,
213 backgroundColor: Colors.transparent, 211 backgroundColor: Colors.transparent,
214 - builder: (context) =>  
215 - ModalWillScope(), 212 + builder: (context) => ModalWillScope(),
216 )), 213 )),
217 ListTile( 214 ListTile(
218 title: Text('Modal with Nested Scroll'), 215 title: Text('Modal with Nested Scroll'),
219 onTap: () => showCupertinoModalBottomSheet( 216 onTap: () => showCupertinoModalBottomSheet(
220 expand: true, 217 expand: true,
221 context: context, 218 context: context,
222 - builder: (context) =>  
223 - NestedScrollModal(), 219 + builder: (context) => NestedScrollModal(),
224 )), 220 )),
225 ListTile( 221 ListTile(
226 title: Text('Modal with PageView'), 222 title: Text('Modal with PageView'),
227 onTap: () => showBarModalBottomSheet( 223 onTap: () => showBarModalBottomSheet(
228 - expand: true,  
229 - context: context,  
230 - builder: (context, scrollController) =>  
231 - ModalWithPageView(  
232 - scrollController: scrollController),  
233 - )), 224 + expand: true,
  225 + context: context,
  226 + builder: (context) => ModalWithPageView(),
  227 + )),
234 SizedBox( 228 SizedBox(
235 height: 60, 229 height: 60,
236 ) 230 )
@@ -32,7 +32,6 @@ class ComplexModal extends StatelessWidget { @@ -32,7 +32,6 @@ class ComplexModal extends StatelessWidget {
32 ), 32 ),
33 ], 33 ],
34 )); 34 ));
35 - print('hello');  
36 return shouldClose; 35 return shouldClose;
37 }, 36 },
38 child: Navigator( 37 child: Navigator(
@@ -2,8 +2,6 @@ import 'package:flutter/cupertino.dart'; @@ -2,8 +2,6 @@ import 'package:flutter/cupertino.dart';
2 import 'package:flutter/material.dart'; 2 import 'package:flutter/material.dart';
3 3
4 class ModalFit extends StatelessWidget { 4 class ModalFit extends StatelessWidget {
5 -  
6 -  
7 const ModalFit({Key key}) : super(key: key); 5 const ModalFit({Key key}) : super(key: key);
8 6
9 @override 7 @override
@@ -2,8 +2,6 @@ import 'package:flutter/cupertino.dart'; @@ -2,8 +2,6 @@ import 'package:flutter/cupertino.dart';
2 import 'package:flutter/material.dart'; 2 import 'package:flutter/material.dart';
3 3
4 class ModalWillScope extends StatelessWidget { 4 class ModalWillScope extends StatelessWidget {
5 -  
6 -  
7 const ModalWillScope({Key key}) : super(key: key); 5 const ModalWillScope({Key key}) : super(key: key);
8 6
9 @override 7 @override
@@ -33,7 +31,6 @@ class ModalWillScope extends StatelessWidget { @@ -33,7 +31,6 @@ class ModalWillScope extends StatelessWidget {
33 ), 31 ),
34 ], 32 ],
35 )); 33 ));
36 - print('hello');  
37 return shouldClose; 34 return shouldClose;
38 }, 35 },
39 child: CupertinoPageScaffold( 36 child: CupertinoPageScaffold(
@@ -3,13 +3,10 @@ import 'package:flutter/material.dart'; @@ -3,13 +3,10 @@ import 'package:flutter/material.dart';
3 import 'package:modal_bottom_sheet/modal_bottom_sheet.dart'; 3 import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
4 4
5 class ModalWithNavigator extends StatelessWidget { 5 class ModalWithNavigator extends StatelessWidget {
6 -  
7 -  
8 const ModalWithNavigator({Key key}) : super(key: key); 6 const ModalWithNavigator({Key key}) : super(key: key);
9 7
10 @override 8 @override
11 Widget build(BuildContext context) { 9 Widget build(BuildContext context) {
12 -  
13 return Material( 10 return Material(
14 child: Navigator( 11 child: Navigator(
15 onGenerateRoute: (_) => MaterialPageRoute( 12 onGenerateRoute: (_) => MaterialPageRoute(
@@ -29,22 +26,26 @@ class ModalWithNavigator extends StatelessWidget { @@ -29,22 +26,26 @@ class ModalWithNavigator extends StatelessWidget {
29 (index) => ListTile( 26 (index) => ListTile(
30 title: Text('Item'), 27 title: Text('Item'),
31 onTap: () { 28 onTap: () {
32 - Navigator.of(context).pushAndRemoveUntil(MaterialPageRoute(  
33 - builder: (context) => CupertinoPageScaffold(  
34 - navigationBar: CupertinoNavigationBar(  
35 - middle: Text('New Page'),  
36 - ),  
37 - child: Stack(  
38 - fit: StackFit.expand,  
39 - children: <Widget>[  
40 - MaterialButton(  
41 - onPressed: () => Navigator.of(context).pop(),  
42 - child: Text('touch here'),  
43 - )  
44 - ],  
45 - )  
46 - )  
47 - ), ModalRoute.withName('/')); 29 + Navigator.of(context).pushAndRemoveUntil(
  30 + MaterialPageRoute(
  31 + builder: (context) =>
  32 + CupertinoPageScaffold(
  33 + navigationBar:
  34 + CupertinoNavigationBar(
  35 + middle: Text('New Page'),
  36 + ),
  37 + child: Stack(
  38 + fit: StackFit.expand,
  39 + children: <Widget>[
  40 + MaterialButton(
  41 + onPressed: () =>
  42 + Navigator.of(context)
  43 + .pop(),
  44 + child: Text('touch here'),
  45 + )
  46 + ],
  47 + ))),
  48 + ModalRoute.withName('/'));
48 }, 49 },
49 )), 50 )),
50 ).toList(), 51 ).toList(),
@@ -5,7 +5,6 @@ import 'package:modal_bottom_sheet/modal_bottom_sheet.dart'; @@ -5,7 +5,6 @@ import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
5 class NestedScrollModal extends StatelessWidget { 5 class NestedScrollModal extends StatelessWidget {
6 const NestedScrollModal({Key key}) : super(key: key); 6 const NestedScrollModal({Key key}) : super(key: key);
7 7
8 -  
9 @override 8 @override
10 Widget build(BuildContext context) { 9 Widget build(BuildContext context) {
11 return NestedScrollView( 10 return NestedScrollView(
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
  2 +import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
2 3
3 class ModalWithPageView extends StatelessWidget { 4 class ModalWithPageView extends StatelessWidget {
4 - final ScrollController scrollController;  
5 -  
6 - const ModalWithPageView({Key key, this.scrollController}) : super(key: key); 5 + const ModalWithPageView({Key key}) : super(key: key);
7 6
8 @override 7 @override
9 Widget build(BuildContext context) { 8 Widget build(BuildContext context) {
10 return Material( 9 return Material(
11 child: Scaffold( 10 child: Scaffold(
12 - appBar: AppBar(  
13 - leading: Container(), title: Text('Modal With Page View')), 11 + appBar:
  12 + AppBar(leading: Container(), title: Text('Modal With Page View')),
14 body: SafeArea( 13 body: SafeArea(
15 bottom: false, 14 bottom: false,
16 child: PageView( 15 child: PageView(
17 - children: List.generate(2, (index) => ListView(  
18 - shrinkWrap: true,  
19 - controller: scrollController,  
20 - children: ListTile.divideTiles(  
21 - context: context,  
22 - tiles: List.generate(  
23 - 100,  
24 - (index) => ListTile(  
25 - title: Text('Item'), 16 + children: List.generate(
  17 + 2,
  18 + (index) => ListView(
  19 + shrinkWrap: true,
  20 + controller: ModalScrollController.of(context),
  21 + children: ListTile.divideTiles(
  22 + context: context,
  23 + tiles: List.generate(
  24 + 100,
  25 + (index) => ListTile(
  26 + title: Text('Item'),
  27 + )),
  28 + ).toList(),
26 )), 29 )),
27 - ).toList(),  
28 - )),  
29 ), 30 ),
30 ), 31 ),
31 ), 32 ),
@@ -7,7 +7,6 @@ class ModalWithScroll extends StatelessWidget { @@ -7,7 +7,6 @@ class ModalWithScroll extends StatelessWidget {
7 7
8 @override 8 @override
9 Widget build(BuildContext context) { 9 Widget build(BuildContext context) {
10 -  
11 return Material( 10 return Material(
12 child: CupertinoPageScaffold( 11 child: CupertinoPageScaffold(
13 navigationBar: CupertinoNavigationBar( 12 navigationBar: CupertinoNavigationBar(
  1 +PODS:
  2 + - FlutterMacOS (1.0.0)
  3 + - url_launcher (0.0.1)
  4 + - url_launcher_macos (0.0.1):
  5 + - FlutterMacOS
  6 +
  7 +DEPENDENCIES:
  8 + - FlutterMacOS (from `Flutter/ephemeral/.symlinks/flutter/darwin-x64`)
  9 + - url_launcher (from `Flutter/ephemeral/.symlinks/plugins/url_launcher/macos`)
  10 + - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
  11 +
  12 +EXTERNAL SOURCES:
  13 + FlutterMacOS:
  14 + :path: Flutter/ephemeral/.symlinks/flutter/darwin-x64
  15 + url_launcher:
  16 + :path: Flutter/ephemeral/.symlinks/plugins/url_launcher/macos
  17 + url_launcher_macos:
  18 + :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
  19 +
  20 +SPEC CHECKSUMS:
  21 + FlutterMacOS: 15bea8a44d2fa024068daa0140371c020b4b6ff9
  22 + url_launcher: af78307ef9bafff91273b34f1c6c0c86a0004fd7
  23 + url_launcher_macos: 45af3d61de06997666568a7149c1be98b41c95d4
  24 +
  25 +PODFILE CHECKSUM: d8ba9b3e9e93c62c74a660b46c6fcb09f03991a7
  26 +
  27 +COCOAPODS: 1.8.4
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
28 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; 28 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
29 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; }; 29 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; };
30 33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 30 33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  31 + 7750D706F7F4EF7A4673CFC3 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F36D136272EAF3C8E9406E8 /* Pods_Runner.framework */; };
31 D73912F022F37F9E000D13A0 /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; }; 32 D73912F022F37F9E000D13A0 /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; };
32 D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 33 D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
33 /* End PBXBuildFile section */ 34 /* End PBXBuildFile section */
@@ -58,9 +59,11 @@ @@ -58,9 +59,11 @@
58 /* End PBXCopyFilesBuildPhase section */ 59 /* End PBXCopyFilesBuildPhase section */
59 60
60 /* Begin PBXFileReference section */ 61 /* Begin PBXFileReference section */
  62 + 1601E62CD620826356A7224C /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
  63 + 31540D3B1454E3935C2255AE /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
61 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; }; 64 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
62 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; }; 65 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
63 - 33CC10ED2044A3C60003C045 /* example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "example.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 66 + 33CC10ED2044A3C60003C045 /* example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example.app; sourceTree = BUILT_PRODUCTS_DIR; };
64 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 67 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
65 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; }; 68 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
66 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; }; 69 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -73,7 +76,9 @@ @@ -73,7 +76,9 @@
73 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; }; 76 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
74 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; }; 77 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
75 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; }; 78 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
  79 + 6F36D136272EAF3C8E9406E8 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
76 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; }; 80 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
  81 + 8C45A9FE6302E0520D92F872 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
77 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; }; 82 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
78 D73912EF22F37F9E000D13A0 /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/ephemeral/App.framework; sourceTree = SOURCE_ROOT; }; 83 D73912EF22F37F9E000D13A0 /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/ephemeral/App.framework; sourceTree = SOURCE_ROOT; };
79 /* End PBXFileReference section */ 84 /* End PBXFileReference section */
@@ -85,6 +90,7 @@ @@ -85,6 +90,7 @@
85 files = ( 90 files = (
86 D73912F022F37F9E000D13A0 /* App.framework in Frameworks */, 91 D73912F022F37F9E000D13A0 /* App.framework in Frameworks */,
87 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */, 92 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */,
  93 + 7750D706F7F4EF7A4673CFC3 /* Pods_Runner.framework in Frameworks */,
88 ); 94 );
89 runOnlyForDeploymentPostprocessing = 0; 95 runOnlyForDeploymentPostprocessing = 0;
90 }; 96 };
@@ -109,6 +115,7 @@ @@ -109,6 +115,7 @@
109 33CEB47122A05771004F2AC0 /* Flutter */, 115 33CEB47122A05771004F2AC0 /* Flutter */,
110 33CC10EE2044A3C60003C045 /* Products */, 116 33CC10EE2044A3C60003C045 /* Products */,
111 D73912EC22F37F3D000D13A0 /* Frameworks */, 117 D73912EC22F37F3D000D13A0 /* Frameworks */,
  118 + 9350091802CFC393284BD46E /* Pods */,
112 ); 119 );
113 sourceTree = "<group>"; 120 sourceTree = "<group>";
114 }; 121 };
@@ -157,9 +164,21 @@ @@ -157,9 +164,21 @@
157 path = Runner; 164 path = Runner;
158 sourceTree = "<group>"; 165 sourceTree = "<group>";
159 }; 166 };
  167 + 9350091802CFC393284BD46E /* Pods */ = {
  168 + isa = PBXGroup;
  169 + children = (
  170 + 1601E62CD620826356A7224C /* Pods-Runner.debug.xcconfig */,
  171 + 8C45A9FE6302E0520D92F872 /* Pods-Runner.release.xcconfig */,
  172 + 31540D3B1454E3935C2255AE /* Pods-Runner.profile.xcconfig */,
  173 + );
  174 + name = Pods;
  175 + path = Pods;
  176 + sourceTree = "<group>";
  177 + };
160 D73912EC22F37F3D000D13A0 /* Frameworks */ = { 178 D73912EC22F37F3D000D13A0 /* Frameworks */ = {
161 isa = PBXGroup; 179 isa = PBXGroup;
162 children = ( 180 children = (
  181 + 6F36D136272EAF3C8E9406E8 /* Pods_Runner.framework */,
163 ); 182 );
164 name = Frameworks; 183 name = Frameworks;
165 sourceTree = "<group>"; 184 sourceTree = "<group>";
@@ -171,11 +190,13 @@ @@ -171,11 +190,13 @@
171 isa = PBXNativeTarget; 190 isa = PBXNativeTarget;
172 buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; 191 buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
173 buildPhases = ( 192 buildPhases = (
  193 + 84BD7313E5046A1EFFEE4684 /* [CP] Check Pods Manifest.lock */,
174 33CC10E92044A3C60003C045 /* Sources */, 194 33CC10E92044A3C60003C045 /* Sources */,
175 33CC10EA2044A3C60003C045 /* Frameworks */, 195 33CC10EA2044A3C60003C045 /* Frameworks */,
176 33CC10EB2044A3C60003C045 /* Resources */, 196 33CC10EB2044A3C60003C045 /* Resources */,
177 33CC110E2044A8840003C045 /* Bundle Framework */, 197 33CC110E2044A8840003C045 /* Bundle Framework */,
178 3399D490228B24CF009A79C7 /* ShellScript */, 198 3399D490228B24CF009A79C7 /* ShellScript */,
  199 + 3F31035F17BB50E98F3B6DB3 /* [CP] Embed Pods Frameworks */,
179 ); 200 );
180 buildRules = ( 201 buildRules = (
181 ); 202 );
@@ -282,6 +303,43 @@ @@ -282,6 +303,43 @@
282 shellPath = /bin/sh; 303 shellPath = /bin/sh;
283 shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh\ntouch Flutter/ephemeral/tripwire\n"; 304 shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh\ntouch Flutter/ephemeral/tripwire\n";
284 }; 305 };
  306 + 3F31035F17BB50E98F3B6DB3 /* [CP] Embed Pods Frameworks */ = {
  307 + isa = PBXShellScriptBuildPhase;
  308 + buildActionMask = 2147483647;
  309 + files = (
  310 + );
  311 + inputFileListPaths = (
  312 + );
  313 + name = "[CP] Embed Pods Frameworks";
  314 + outputFileListPaths = (
  315 + );
  316 + runOnlyForDeploymentPostprocessing = 0;
  317 + shellPath = /bin/sh;
  318 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
  319 + showEnvVarsInLog = 0;
  320 + };
  321 + 84BD7313E5046A1EFFEE4684 /* [CP] Check Pods Manifest.lock */ = {
  322 + isa = PBXShellScriptBuildPhase;
  323 + buildActionMask = 2147483647;
  324 + files = (
  325 + );
  326 + inputFileListPaths = (
  327 + );
  328 + inputPaths = (
  329 + "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
  330 + "${PODS_ROOT}/Manifest.lock",
  331 + );
  332 + name = "[CP] Check Pods Manifest.lock";
  333 + outputFileListPaths = (
  334 + );
  335 + outputPaths = (
  336 + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
  337 + );
  338 + runOnlyForDeploymentPostprocessing = 0;
  339 + shellPath = /bin/sh;
  340 + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
  341 + showEnvVarsInLog = 0;
  342 + };
285 /* End PBXShellScriptBuildPhase section */ 343 /* End PBXShellScriptBuildPhase section */
286 344
287 /* Begin PBXSourcesBuildPhase section */ 345 /* Begin PBXSourcesBuildPhase section */
@@ -4,4 +4,7 @@ @@ -4,4 +4,7 @@
4 <FileRef 4 <FileRef
5 location = "group:Runner.xcodeproj"> 5 location = "group:Runner.xcodeproj">
6 </FileRef> 6 </FileRef>
  7 + <FileRef
  8 + location = "group:Pods/Pods.xcodeproj">
  9 + </FileRef>
7 </Workspace> 10 </Workspace>
@@ -4,4 +4,4 @@ export 'src/material_with_modal_page_route.dart'; @@ -4,4 +4,4 @@ export 'src/material_with_modal_page_route.dart';
4 export 'src/bottom_sheets/cupertino_bottom_sheet.dart'; 4 export 'src/bottom_sheets/cupertino_bottom_sheet.dart';
5 export 'src/bottom_sheets/material_bottom_sheet.dart'; 5 export 'src/bottom_sheets/material_bottom_sheet.dart';
6 export 'src/bottom_sheets/bar_bottom_sheet.dart'; 6 export 'src/bottom_sheets/bar_bottom_sheet.dart';
7 -export 'src/utils/modal_scroll_controller.dart';  
  7 +export 'src/utils/modal_scroll_controller.dart';
@@ -262,6 +262,7 @@ class _ModalBottomSheetState extends State<ModalBottomSheet> @@ -262,6 +262,7 @@ class _ModalBottomSheetState extends State<ModalBottomSheet>
262 //Check if scrollController is used 262 //Check if scrollController is used
263 if (!_scrollController.hasClients) return; 263 if (!_scrollController.hasClients) return;
264 //Check if there is more than 1 attached ScrollController e.g. swiping page in PageView 264 //Check if there is more than 1 attached ScrollController e.g. swiping page in PageView
  265 + // ignore: invalid_use_of_protected_member
265 if (_scrollController.positions.length > 1) return; 266 if (_scrollController.positions.length > 1) return;
266 267
267 if (_scrollController != 268 if (_scrollController !=
@@ -291,7 +292,7 @@ class _ModalBottomSheetState extends State<ModalBottomSheet> @@ -291,7 +292,7 @@ class _ModalBottomSheetState extends State<ModalBottomSheet>
291 292
292 // Otherwise the calculate the velocity with a VelocityTracker 293 // Otherwise the calculate the velocity with a VelocityTracker
293 if (_velocityTracker == null) { 294 if (_velocityTracker == null) {
294 - final pointerKind = defaultPointerDeviceKind(context); 295 + //final pointerKind = defaultPointerDeviceKind(context);
295 _velocityTracker = VelocityTracker(); 296 _velocityTracker = VelocityTracker();
296 _startTime = DateTime.now(); 297 _startTime = DateTime.now();
297 } 298 }
@@ -78,7 +78,7 @@ class _ModalBottomSheetState<T> extends State<_ModalBottomSheet<T>> { @@ -78,7 +78,7 @@ class _ModalBottomSheetState<T> extends State<_ModalBottomSheet<T>> {
78 Widget build(BuildContext context) { 78 Widget build(BuildContext context) {
79 assert(debugCheckHasMediaQuery(context)); 79 assert(debugCheckHasMediaQuery(context));
80 final scrollController = PrimaryScrollController.of(context) ?? 80 final scrollController = PrimaryScrollController.of(context) ??
81 - (_scrollController ??= ScrollController()); 81 + (_scrollController ??= ScrollController());
82 return ModalScrollController( 82 return ModalScrollController(
83 controller: scrollController, 83 controller: scrollController,
84 child: Builder( 84 child: Builder(
@@ -49,12 +49,13 @@ class BarBottomSheet extends StatelessWidget { @@ -49,12 +49,13 @@ class BarBottomSheet extends StatelessWidget {
49 flex: 1, 49 flex: 1,
50 fit: FlexFit.loose, 50 fit: FlexFit.loose,
51 child: Material( 51 child: Material(
52 - shape: shape ?? RoundedRectangleBorder(  
53 - side: BorderSide(),  
54 - borderRadius: BorderRadius.only(  
55 - topLeft: _default_bar_top_radius,  
56 - topRight: _default_bar_top_radius),  
57 - ), 52 + shape: shape ??
  53 + RoundedRectangleBorder(
  54 + side: BorderSide(),
  55 + borderRadius: BorderRadius.only(
  56 + topLeft: _default_bar_top_radius,
  57 + topRight: _default_bar_top_radius),
  58 + ),
58 clipBehavior: clipBehavior ?? Clip.hardEdge, 59 clipBehavior: clipBehavior ?? Clip.hardEdge,
59 elevation: elevation ?? 2, 60 elevation: elevation ?? 2,
60 child: SizedBox( 61 child: SizedBox(
@@ -39,7 +39,7 @@ class ModalScrollController extends InheritedWidget { @@ -39,7 +39,7 @@ class ModalScrollController extends InheritedWidget {
39 /// Returns null if there is no [ScrollController] associated with the given 39 /// Returns null if there is no [ScrollController] associated with the given
40 /// context. 40 /// context.
41 static ScrollController of(BuildContext context) { 41 static ScrollController of(BuildContext context) {
42 - final ModalScrollController result = 42 + final result =
43 context.dependOnInheritedWidgetOfExactType<ModalScrollController>(); 43 context.dependOnInheritedWidgetOfExactType<ModalScrollController>();
44 return result?.controller; 44 return result?.controller;
45 } 45 }