flutter_package / modal_bottom_sheet

Go to a project
Toggle navigation Toggle navigation pinning
Jaime Blasco
Committed by GitHub
08c080f6 2 parents ab1dc56e 164b32d8

Merge pull request #226 from jamesblasco/fix_will_pop_scope 

fix: will pop scope and deprecated methods
Inline Side-by-side
Showing 6 changed files with 101 additions and 67 deletions
@@ -15,10 +15,12 @@ @@ -15,10 +15,12 @@
15 *.iws 15 *.iws
16 .idea/ 16 .idea/
17 17
18 -# The .vscode folder contains launch configuration and tasks you configure in  
19 -# VS Code which you may wish to be included in version control, so this line  
20 -# is commented out by default.  
21 -#.vscode/ 18 +# Visual Studio Code related
  19 +.classpath
  20 +.project
  21 +.settings/
  22 +.vscode/*
  23 +
22 24
23 # Flutter/Dart/Pub related 25 # Flutter/Dart/Pub related
24 **/doc/api/ 26 **/doc/api/
@@ -7,42 +7,42 @@ packages: @@ -7,42 +7,42 @@ packages:
7 name: async 7 name: async
8 url: "https://pub.dartlang.org" 8 url: "https://pub.dartlang.org"
9 source: hosted 9 source: hosted
10 - version: "2.5.0-nullsafety.3" 10 + version: "2.8.2"
11 boolean_selector: 11 boolean_selector:
12 dependency: transitive 12 dependency: transitive
13 description: 13 description:
14 name: boolean_selector 14 name: boolean_selector
15 url: "https://pub.dartlang.org" 15 url: "https://pub.dartlang.org"
16 source: hosted 16 source: hosted
17 - version: "2.1.0-nullsafety.3" 17 + version: "2.1.0"
18 characters: 18 characters:
19 dependency: transitive 19 dependency: transitive
20 description: 20 description:
21 name: characters 21 name: characters
22 url: "https://pub.dartlang.org" 22 url: "https://pub.dartlang.org"
23 source: hosted 23 source: hosted
24 - version: "1.1.0-nullsafety.5" 24 + version: "1.2.0"
25 charcode: 25 charcode:
26 dependency: transitive 26 dependency: transitive
27 description: 27 description:
28 name: charcode 28 name: charcode
29 url: "https://pub.dartlang.org" 29 url: "https://pub.dartlang.org"
30 source: hosted 30 source: hosted
31 - version: "1.2.0-nullsafety.3" 31 + version: "1.3.1"
32 clock: 32 clock:
33 dependency: transitive 33 dependency: transitive
34 description: 34 description:
35 name: clock 35 name: clock
36 url: "https://pub.dartlang.org" 36 url: "https://pub.dartlang.org"
37 source: hosted 37 source: hosted
38 - version: "1.1.0-nullsafety.3" 38 + version: "1.1.0"
39 collection: 39 collection:
40 dependency: transitive 40 dependency: transitive
41 description: 41 description:
42 name: collection 42 name: collection
43 url: "https://pub.dartlang.org" 43 url: "https://pub.dartlang.org"
44 source: hosted 44 source: hosted
45 - version: "1.15.0-nullsafety.5" 45 + version: "1.15.0"
46 cupertino_icons: 46 cupertino_icons:
47 dependency: "direct main" 47 dependency: "direct main"
48 description: 48 description:
@@ -56,7 +56,7 @@ packages: @@ -56,7 +56,7 @@ packages:
56 name: fake_async 56 name: fake_async
57 url: "https://pub.dartlang.org" 57 url: "https://pub.dartlang.org"
58 source: hosted 58 source: hosted
59 - version: "1.2.0-nullsafety.3" 59 + version: "1.2.0"
60 flutter: 60 flutter:
61 dependency: "direct main" 61 dependency: "direct main"
62 description: flutter 62 description: flutter
@@ -67,20 +67,39 @@ packages: @@ -67,20 +67,39 @@ packages:
67 description: flutter 67 description: flutter
68 source: sdk 68 source: sdk
69 version: "0.0.0" 69 version: "0.0.0"
  70 + flutter_web_plugins:
  71 + dependency: transitive
  72 + description: flutter
  73 + source: sdk
  74 + version: "0.0.0"
  75 + js:
  76 + dependency: transitive
  77 + description:
  78 + name: js
  79 + url: "https://pub.dartlang.org"
  80 + source: hosted
  81 + version: "0.6.4"
70 matcher: 82 matcher:
71 dependency: transitive 83 dependency: transitive
72 description: 84 description:
73 name: matcher 85 name: matcher
74 url: "https://pub.dartlang.org" 86 url: "https://pub.dartlang.org"
75 source: hosted 87 source: hosted
76 - version: "0.12.10-nullsafety.3" 88 + version: "0.12.11"
  89 + material_color_utilities:
  90 + dependency: transitive
  91 + description:
  92 + name: material_color_utilities
  93 + url: "https://pub.dartlang.org"
  94 + source: hosted
  95 + version: "0.1.4"
77 meta: 96 meta:
78 dependency: transitive 97 dependency: transitive
79 description: 98 description:
80 name: meta 99 name: meta
81 url: "https://pub.dartlang.org" 100 url: "https://pub.dartlang.org"
82 source: hosted 101 source: hosted
83 - version: "1.3.0-nullsafety.6" 102 + version: "1.7.0"
84 modal_bottom_sheet: 103 modal_bottom_sheet:
85 dependency: "direct main" 104 dependency: "direct main"
86 description: 105 description:
@@ -94,14 +113,14 @@ packages: @@ -94,14 +113,14 @@ packages:
94 name: path 113 name: path
95 url: "https://pub.dartlang.org" 114 url: "https://pub.dartlang.org"
96 source: hosted 115 source: hosted
97 - version: "1.8.0-nullsafety.3" 116 + version: "1.8.1"
98 plugin_platform_interface: 117 plugin_platform_interface:
99 dependency: transitive 118 dependency: transitive
100 description: 119 description:
101 name: plugin_platform_interface 120 name: plugin_platform_interface
102 url: "https://pub.dartlang.org" 121 url: "https://pub.dartlang.org"
103 source: hosted 122 source: hosted
104 - version: "1.1.0-nullsafety.1" 123 + version: "2.1.2"
105 sky_engine: 124 sky_engine:
106 dependency: transitive 125 dependency: transitive
107 description: flutter 126 description: flutter
@@ -113,91 +132,105 @@ packages: @@ -113,91 +132,105 @@ packages:
113 name: source_span 132 name: source_span
114 url: "https://pub.dartlang.org" 133 url: "https://pub.dartlang.org"
115 source: hosted 134 source: hosted
116 - version: "1.8.0-nullsafety.4" 135 + version: "1.8.2"
117 stack_trace: 136 stack_trace:
118 dependency: transitive 137 dependency: transitive
119 description: 138 description:
120 name: stack_trace 139 name: stack_trace
121 url: "https://pub.dartlang.org" 140 url: "https://pub.dartlang.org"
122 source: hosted 141 source: hosted
123 - version: "1.10.0-nullsafety.6" 142 + version: "1.10.0"
124 stream_channel: 143 stream_channel:
125 dependency: transitive 144 dependency: transitive
126 description: 145 description:
127 name: stream_channel 146 name: stream_channel
128 url: "https://pub.dartlang.org" 147 url: "https://pub.dartlang.org"
129 source: hosted 148 source: hosted
130 - version: "2.1.0-nullsafety.3" 149 + version: "2.1.0"
131 string_scanner: 150 string_scanner:
132 dependency: transitive 151 dependency: transitive
133 description: 152 description:
134 name: string_scanner 153 name: string_scanner
135 url: "https://pub.dartlang.org" 154 url: "https://pub.dartlang.org"
136 source: hosted 155 source: hosted
137 - version: "1.1.0-nullsafety.3" 156 + version: "1.1.0"
138 term_glyph: 157 term_glyph:
139 dependency: transitive 158 dependency: transitive
140 description: 159 description:
141 name: term_glyph 160 name: term_glyph
142 url: "https://pub.dartlang.org" 161 url: "https://pub.dartlang.org"
143 source: hosted 162 source: hosted
144 - version: "1.2.0-nullsafety.3" 163 + version: "1.2.0"
145 test_api: 164 test_api:
146 dependency: transitive 165 dependency: transitive
147 description: 166 description:
148 name: test_api 167 name: test_api
149 url: "https://pub.dartlang.org" 168 url: "https://pub.dartlang.org"
150 source: hosted 169 source: hosted
151 - version: "0.2.19-nullsafety.6"  
152 - typed_data: 170 + version: "0.4.9"
  171 + url_launcher:
  172 + dependency: "direct main"
  173 + description:
  174 + name: url_launcher
  175 + url: "https://pub.dartlang.org"
  176 + source: hosted
  177 + version: "6.0.20"
  178 + url_launcher_android:
153 dependency: transitive 179 dependency: transitive
154 description: 180 description:
155 - name: typed_data 181 + name: url_launcher_android
156 url: "https://pub.dartlang.org" 182 url: "https://pub.dartlang.org"
157 source: hosted 183 source: hosted
158 - version: "1.3.0-nullsafety.5"  
159 - url_launcher:  
160 - dependency: "direct main" 184 + version: "6.0.15"
  185 + url_launcher_ios:
  186 + dependency: transitive
161 description: 187 description:
162 - name: url_launcher 188 + name: url_launcher_ios
163 url: "https://pub.dartlang.org" 189 url: "https://pub.dartlang.org"
164 source: hosted 190 source: hosted
165 - version: "6.0.0-nullsafety.1" 191 + version: "6.0.15"
166 url_launcher_linux: 192 url_launcher_linux:
167 dependency: transitive 193 dependency: transitive
168 description: 194 description:
169 name: url_launcher_linux 195 name: url_launcher_linux
170 url: "https://pub.dartlang.org" 196 url: "https://pub.dartlang.org"
171 source: hosted 197 source: hosted
172 - version: "0.1.0-nullsafety.1" 198 + version: "3.0.0"
173 url_launcher_macos: 199 url_launcher_macos:
174 dependency: transitive 200 dependency: transitive
175 description: 201 description:
176 name: url_launcher_macos 202 name: url_launcher_macos
177 url: "https://pub.dartlang.org" 203 url: "https://pub.dartlang.org"
178 source: hosted 204 source: hosted
179 - version: "0.1.0-nullsafety.1" 205 + version: "3.0.0"
180 url_launcher_platform_interface: 206 url_launcher_platform_interface:
181 dependency: transitive 207 dependency: transitive
182 description: 208 description:
183 name: url_launcher_platform_interface 209 name: url_launcher_platform_interface
184 url: "https://pub.dartlang.org" 210 url: "https://pub.dartlang.org"
185 source: hosted 211 source: hosted
186 - version: "2.0.0-nullsafety.1" 212 + version: "2.0.5"
  213 + url_launcher_web:
  214 + dependency: transitive
  215 + description:
  216 + name: url_launcher_web
  217 + url: "https://pub.dartlang.org"
  218 + source: hosted
  219 + version: "2.0.9"
187 url_launcher_windows: 220 url_launcher_windows:
188 dependency: transitive 221 dependency: transitive
189 description: 222 description:
190 name: url_launcher_windows 223 name: url_launcher_windows
191 url: "https://pub.dartlang.org" 224 url: "https://pub.dartlang.org"
192 source: hosted 225 source: hosted
193 - version: "0.1.0-nullsafety.1" 226 + version: "3.0.0"
194 vector_math: 227 vector_math:
195 dependency: transitive 228 dependency: transitive
196 description: 229 description:
197 name: vector_math 230 name: vector_math
198 url: "https://pub.dartlang.org" 231 url: "https://pub.dartlang.org"
199 source: hosted 232 source: hosted
200 - version: "2.1.0-nullsafety.5" 233 + version: "2.1.2"
201 sdks: 234 sdks:
202 - dart: ">=2.12.0-29.10.beta <3.0.0"  
203 - flutter: ">=1.12.13+hotfix.5 <2.0.0" 235 + dart: ">=2.16.0-100.0.dev <3.0.0"
  236 + flutter: ">=2.10.0"
@@ -19,7 +19,7 @@ environment: @@ -19,7 +19,7 @@ environment:
19 dependencies: 19 dependencies:
20 flutter: 20 flutter:
21 sdk: flutter 21 sdk: flutter
22 - url_launcher: 6.0.0-nullsafety.1 22 + url_launcher: ^6.0.20
23 modal_bottom_sheet: 23 modal_bottom_sheet:
24 path: '../' 24 path: '../'
25 25
@@ -232,7 +232,7 @@ class _ModalBottomSheetState extends State<ModalBottomSheet> @@ -232,7 +232,7 @@ class _ModalBottomSheetState extends State<ModalBottomSheet>
232 _bounceDragController.reverse(); 232 _bounceDragController.reverse();
233 233
234 var canClose = true; 234 var canClose = true;
235 - if (widget.shouldClose != null && hasReachedWillPopThreshold) { 235 + if (widget.shouldClose != null) {
236 _cancelClose(); 236 _cancelClose();
237 canClose = await shouldClose(); 237 canClose = await shouldClose();
238 } 238 }
@@ -298,9 +298,8 @@ class _ModalBottomSheetState extends State<ModalBottomSheet> @@ -298,9 +298,8 @@ class _ModalBottomSheetState extends State<ModalBottomSheet>
298 298
299 // Otherwise the calculate the velocity with a VelocityTracker 299 // Otherwise the calculate the velocity with a VelocityTracker
300 if (_velocityTracker == null) { 300 if (_velocityTracker == null) {
301 - //final pointerKind = defaultPointerDeviceKind(context);  
302 - // ignore: deprecated_member_use  
303 - _velocityTracker = VelocityTracker(); 301 + final pointerKind = defaultPointerDeviceKind(context);
  302 + _velocityTracker = VelocityTracker.withKind(pointerKind);
304 _startTime = DateTime.now(); 303 _startTime = DateTime.now();
305 } 304 }
306 305
@@ -7,49 +7,49 @@ packages: @@ -7,49 +7,49 @@ packages:
7 name: async 7 name: async
8 url: "https://pub.dartlang.org" 8 url: "https://pub.dartlang.org"
9 source: hosted 9 source: hosted
10 - version: "2.5.0-nullsafety.3" 10 + version: "2.8.2"
11 boolean_selector: 11 boolean_selector:
12 dependency: transitive 12 dependency: transitive
13 description: 13 description:
14 name: boolean_selector 14 name: boolean_selector
15 url: "https://pub.dartlang.org" 15 url: "https://pub.dartlang.org"
16 source: hosted 16 source: hosted
17 - version: "2.1.0-nullsafety.3" 17 + version: "2.1.0"
18 characters: 18 characters:
19 dependency: transitive 19 dependency: transitive
20 description: 20 description:
21 name: characters 21 name: characters
22 url: "https://pub.dartlang.org" 22 url: "https://pub.dartlang.org"
23 source: hosted 23 source: hosted
24 - version: "1.1.0-nullsafety.5" 24 + version: "1.2.0"
25 charcode: 25 charcode:
26 dependency: transitive 26 dependency: transitive
27 description: 27 description:
28 name: charcode 28 name: charcode
29 url: "https://pub.dartlang.org" 29 url: "https://pub.dartlang.org"
30 source: hosted 30 source: hosted
31 - version: "1.2.0-nullsafety.3" 31 + version: "1.3.1"
32 clock: 32 clock:
33 dependency: transitive 33 dependency: transitive
34 description: 34 description:
35 name: clock 35 name: clock
36 url: "https://pub.dartlang.org" 36 url: "https://pub.dartlang.org"
37 source: hosted 37 source: hosted
38 - version: "1.1.0-nullsafety.3" 38 + version: "1.1.0"
39 collection: 39 collection:
40 dependency: transitive 40 dependency: transitive
41 description: 41 description:
42 name: collection 42 name: collection
43 url: "https://pub.dartlang.org" 43 url: "https://pub.dartlang.org"
44 source: hosted 44 source: hosted
45 - version: "1.15.0-nullsafety.5" 45 + version: "1.15.0"
46 fake_async: 46 fake_async:
47 dependency: transitive 47 dependency: transitive
48 description: 48 description:
49 name: fake_async 49 name: fake_async
50 url: "https://pub.dartlang.org" 50 url: "https://pub.dartlang.org"
51 source: hosted 51 source: hosted
52 - version: "1.2.0-nullsafety.3" 52 + version: "1.2.0"
53 flutter: 53 flutter:
54 dependency: "direct main" 54 dependency: "direct main"
55 description: flutter 55 description: flutter
@@ -66,21 +66,28 @@ packages: @@ -66,21 +66,28 @@ packages:
66 name: matcher 66 name: matcher
67 url: "https://pub.dartlang.org" 67 url: "https://pub.dartlang.org"
68 source: hosted 68 source: hosted
69 - version: "0.12.10-nullsafety.3" 69 + version: "0.12.11"
  70 + material_color_utilities:
  71 + dependency: transitive
  72 + description:
  73 + name: material_color_utilities
  74 + url: "https://pub.dartlang.org"
  75 + source: hosted
  76 + version: "0.1.4"
70 meta: 77 meta:
71 dependency: transitive 78 dependency: transitive
72 description: 79 description:
73 name: meta 80 name: meta
74 url: "https://pub.dartlang.org" 81 url: "https://pub.dartlang.org"
75 source: hosted 82 source: hosted
76 - version: "1.3.0-nullsafety.6" 83 + version: "1.7.0"
77 path: 84 path:
78 dependency: transitive 85 dependency: transitive
79 description: 86 description:
80 name: path 87 name: path
81 url: "https://pub.dartlang.org" 88 url: "https://pub.dartlang.org"
82 source: hosted 89 source: hosted
83 - version: "1.8.0-nullsafety.3" 90 + version: "1.8.1"
84 pedantic: 91 pedantic:
85 dependency: "direct dev" 92 dependency: "direct dev"
86 description: 93 description:
@@ -99,56 +106,49 @@ packages: @@ -99,56 +106,49 @@ packages:
99 name: source_span 106 name: source_span
100 url: "https://pub.dartlang.org" 107 url: "https://pub.dartlang.org"
101 source: hosted 108 source: hosted
102 - version: "1.8.0-nullsafety.4" 109 + version: "1.8.2"
103 stack_trace: 110 stack_trace:
104 dependency: transitive 111 dependency: transitive
105 description: 112 description:
106 name: stack_trace 113 name: stack_trace
107 url: "https://pub.dartlang.org" 114 url: "https://pub.dartlang.org"
108 source: hosted 115 source: hosted
109 - version: "1.10.0-nullsafety.6" 116 + version: "1.10.0"
110 stream_channel: 117 stream_channel:
111 dependency: transitive 118 dependency: transitive
112 description: 119 description:
113 name: stream_channel 120 name: stream_channel
114 url: "https://pub.dartlang.org" 121 url: "https://pub.dartlang.org"
115 source: hosted 122 source: hosted
116 - version: "2.1.0-nullsafety.3" 123 + version: "2.1.0"
117 string_scanner: 124 string_scanner:
118 dependency: transitive 125 dependency: transitive
119 description: 126 description:
120 name: string_scanner 127 name: string_scanner
121 url: "https://pub.dartlang.org" 128 url: "https://pub.dartlang.org"
122 source: hosted 129 source: hosted
123 - version: "1.1.0-nullsafety.3" 130 + version: "1.1.0"
124 term_glyph: 131 term_glyph:
125 dependency: transitive 132 dependency: transitive
126 description: 133 description:
127 name: term_glyph 134 name: term_glyph
128 url: "https://pub.dartlang.org" 135 url: "https://pub.dartlang.org"
129 source: hosted 136 source: hosted
130 - version: "1.2.0-nullsafety.3" 137 + version: "1.2.0"
131 test_api: 138 test_api:
132 dependency: transitive 139 dependency: transitive
133 description: 140 description:
134 name: test_api 141 name: test_api
135 url: "https://pub.dartlang.org" 142 url: "https://pub.dartlang.org"
136 source: hosted 143 source: hosted
137 - version: "0.2.19-nullsafety.6"  
138 - typed_data:  
139 - dependency: transitive  
140 - description:  
141 - name: typed_data  
142 - url: "https://pub.dartlang.org"  
143 - source: hosted  
144 - version: "1.3.0-nullsafety.5" 144 + version: "0.4.9"
145 vector_math: 145 vector_math:
146 dependency: transitive 146 dependency: transitive
147 description: 147 description:
148 name: vector_math 148 name: vector_math
149 url: "https://pub.dartlang.org" 149 url: "https://pub.dartlang.org"
150 source: hosted 150 source: hosted
151 - version: "2.1.0-nullsafety.5" 151 + version: "2.1.2"
152 sdks: 152 sdks:
153 - dart: ">=2.12.0-29.10.beta <3.0.0"  
154 - flutter: ">=1.12.0 <2.0.0" 153 + dart: ">=2.14.0 <3.0.0"
  154 + flutter: ">=2.0.0"
@@ -5,7 +5,7 @@ homepage: 'https://github.com/jamesblasco/modal_bottom_sheet' @@ -5,7 +5,7 @@ homepage: 'https://github.com/jamesblasco/modal_bottom_sheet'
5 5
6 environment: 6 environment:
7 sdk: ">=2.12.0-29.10.beta <3.0.0" 7 sdk: ">=2.12.0-29.10.beta <3.0.0"
8 - flutter: ">=1.12.0 <2.0.0" 8 + flutter: ">=2.0.0"
9 9
10 dependencies: 10 dependencies:
11 flutter: 11 flutter: