Showing
2 changed files
with
45 additions
and
53 deletions
| @@ -6,11 +6,11 @@ class ModalWithNavigator extends StatelessWidget { | @@ -6,11 +6,11 @@ class ModalWithNavigator extends StatelessWidget { | ||
| 6 | const ModalWithNavigator({Key key}) : super(key: key); | 6 | const ModalWithNavigator({Key key}) : super(key: key); |
| 7 | 7 | ||
| 8 | @override | 8 | @override |
| 9 | - Widget build(BuildContext context) { | 9 | + Widget build(BuildContext rootContext) { |
| 10 | return Material( | 10 | return Material( |
| 11 | child: Navigator( | 11 | child: Navigator( |
| 12 | onGenerateRoute: (_) => MaterialPageRoute( | 12 | onGenerateRoute: (_) => MaterialPageRoute( |
| 13 | - builder: (context) => Builder( | 13 | + builder: (context2) => Builder( |
| 14 | builder: (context) => CupertinoPageScaffold( | 14 | builder: (context) => CupertinoPageScaffold( |
| 15 | navigationBar: CupertinoNavigationBar( | 15 | navigationBar: CupertinoNavigationBar( |
| 16 | leading: Container(), middle: Text('Modal Page')), | 16 | leading: Container(), middle: Text('Modal Page')), |
| @@ -26,12 +26,10 @@ class ModalWithNavigator extends StatelessWidget { | @@ -26,12 +26,10 @@ class ModalWithNavigator extends StatelessWidget { | ||
| 26 | (index) => ListTile( | 26 | (index) => ListTile( |
| 27 | title: Text('Item'), | 27 | title: Text('Item'), |
| 28 | onTap: () { | 28 | onTap: () { |
| 29 | - Navigator.of(context).pushAndRemoveUntil( | 29 | + Navigator.of(context).push( |
| 30 | MaterialPageRoute( | 30 | MaterialPageRoute( |
| 31 | - builder: (context) => | ||
| 32 | - CupertinoPageScaffold( | ||
| 33 | - navigationBar: | ||
| 34 | - CupertinoNavigationBar( | 31 | + builder: (context) => CupertinoPageScaffold( |
| 32 | + navigationBar: CupertinoNavigationBar( | ||
| 35 | middle: Text('New Page'), | 33 | middle: Text('New Page'), |
| 36 | ), | 34 | ), |
| 37 | child: Stack( | 35 | child: Stack( |
| @@ -39,13 +37,14 @@ class ModalWithNavigator extends StatelessWidget { | @@ -39,13 +37,14 @@ class ModalWithNavigator extends StatelessWidget { | ||
| 39 | children: <Widget>[ | 37 | children: <Widget>[ |
| 40 | MaterialButton( | 38 | MaterialButton( |
| 41 | onPressed: () => | 39 | onPressed: () => |
| 42 | - Navigator.of(context) | ||
| 43 | - .pop(), | 40 | + Navigator.of(rootContext).pop(), |
| 44 | child: Text('touch here'), | 41 | child: Text('touch here'), |
| 45 | ) | 42 | ) |
| 46 | ], | 43 | ], |
| 47 | - ))), | ||
| 48 | - ModalRoute.withName('/')); | 44 | + ), |
| 45 | + ), | ||
| 46 | + ), | ||
| 47 | + ); | ||
| 49 | }, | 48 | }, |
| 50 | )), | 49 | )), |
| 51 | ).toList(), | 50 | ).toList(), |
| @@ -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" | 10 | + version: "2.5.0-nullsafety.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" | 17 | + version: "2.1.0-nullsafety.2" |
| 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.2" | 24 | + version: "1.1.0-nullsafety.4" |
| 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" | 31 | + version: "1.2.0-nullsafety.2" |
| 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" | 38 | + version: "1.1.0-nullsafety.2" |
| 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.2" | 45 | + version: "1.15.0-nullsafety.4" |
| 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.1.0-nullsafety" | 59 | + version: "1.2.0-nullsafety.2" |
| 60 | flutter: | 60 | flutter: |
| 61 | dependency: "direct main" | 61 | dependency: "direct main" |
| 62 | description: flutter | 62 | description: flutter |
| @@ -72,55 +72,48 @@ packages: | @@ -72,55 +72,48 @@ packages: | ||
| 72 | description: flutter | 72 | description: flutter |
| 73 | source: sdk | 73 | source: sdk |
| 74 | version: "0.0.0" | 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.3-nullsafety.2" | ||
| 75 | matcher: | 82 | matcher: |
| 76 | dependency: transitive | 83 | dependency: transitive |
| 77 | description: | 84 | description: |
| 78 | name: matcher | 85 | name: matcher |
| 79 | url: "https://pub.dartlang.org" | 86 | url: "https://pub.dartlang.org" |
| 80 | source: hosted | 87 | source: hosted |
| 81 | - version: "0.12.10-nullsafety" | 88 | + version: "0.12.10-nullsafety.2" |
| 82 | meta: | 89 | meta: |
| 83 | dependency: transitive | 90 | dependency: transitive |
| 84 | description: | 91 | description: |
| 85 | name: meta | 92 | name: meta |
| 86 | url: "https://pub.dartlang.org" | 93 | url: "https://pub.dartlang.org" |
| 87 | source: hosted | 94 | source: hosted |
| 88 | - version: "1.3.0-nullsafety.2" | 95 | + version: "1.3.0-nullsafety.5" |
| 89 | modal_bottom_sheet: | 96 | modal_bottom_sheet: |
| 90 | dependency: "direct main" | 97 | dependency: "direct main" |
| 91 | description: | 98 | description: |
| 92 | path: ".." | 99 | path: ".." |
| 93 | relative: true | 100 | relative: true |
| 94 | source: path | 101 | source: path |
| 95 | - version: "1.0.0-dev" | 102 | + version: "1.1.0-dev" |
| 96 | path: | 103 | path: |
| 97 | dependency: transitive | 104 | dependency: transitive |
| 98 | description: | 105 | description: |
| 99 | name: path | 106 | name: path |
| 100 | url: "https://pub.dartlang.org" | 107 | url: "https://pub.dartlang.org" |
| 101 | source: hosted | 108 | source: hosted |
| 102 | - version: "1.8.0-nullsafety" | ||
| 103 | - platform_detect: | ||
| 104 | - dependency: transitive | ||
| 105 | - description: | ||
| 106 | - name: platform_detect | ||
| 107 | - url: "https://pub.dartlang.org" | ||
| 108 | - source: hosted | ||
| 109 | - version: "1.4.0" | 109 | + version: "1.8.0-nullsafety.2" |
| 110 | plugin_platform_interface: | 110 | plugin_platform_interface: |
| 111 | dependency: transitive | 111 | dependency: transitive |
| 112 | description: | 112 | description: |
| 113 | name: plugin_platform_interface | 113 | name: plugin_platform_interface |
| 114 | url: "https://pub.dartlang.org" | 114 | url: "https://pub.dartlang.org" |
| 115 | source: hosted | 115 | source: hosted |
| 116 | - version: "1.0.2" | ||
| 117 | - pub_semver: | ||
| 118 | - dependency: transitive | ||
| 119 | - description: | ||
| 120 | - name: pub_semver | ||
| 121 | - url: "https://pub.dartlang.org" | ||
| 122 | - source: hosted | ||
| 123 | - version: "1.4.4" | 116 | + version: "1.0.3" |
| 124 | sky_engine: | 117 | sky_engine: |
| 125 | dependency: transitive | 118 | dependency: transitive |
| 126 | description: flutter | 119 | description: flutter |
| @@ -132,98 +125,98 @@ packages: | @@ -132,98 +125,98 @@ packages: | ||
| 132 | name: source_span | 125 | name: source_span |
| 133 | url: "https://pub.dartlang.org" | 126 | url: "https://pub.dartlang.org" |
| 134 | source: hosted | 127 | source: hosted |
| 135 | - version: "1.8.0-nullsafety" | 128 | + version: "1.8.0-nullsafety.3" |
| 136 | stack_trace: | 129 | stack_trace: |
| 137 | dependency: transitive | 130 | dependency: transitive |
| 138 | description: | 131 | description: |
| 139 | name: stack_trace | 132 | name: stack_trace |
| 140 | url: "https://pub.dartlang.org" | 133 | url: "https://pub.dartlang.org" |
| 141 | source: hosted | 134 | source: hosted |
| 142 | - version: "1.10.0-nullsafety" | 135 | + version: "1.10.0-nullsafety.5" |
| 143 | stream_channel: | 136 | stream_channel: |
| 144 | dependency: transitive | 137 | dependency: transitive |
| 145 | description: | 138 | description: |
| 146 | name: stream_channel | 139 | name: stream_channel |
| 147 | url: "https://pub.dartlang.org" | 140 | url: "https://pub.dartlang.org" |
| 148 | source: hosted | 141 | source: hosted |
| 149 | - version: "2.1.0-nullsafety" | 142 | + version: "2.1.0-nullsafety.2" |
| 150 | string_scanner: | 143 | string_scanner: |
| 151 | dependency: transitive | 144 | dependency: transitive |
| 152 | description: | 145 | description: |
| 153 | name: string_scanner | 146 | name: string_scanner |
| 154 | url: "https://pub.dartlang.org" | 147 | url: "https://pub.dartlang.org" |
| 155 | source: hosted | 148 | source: hosted |
| 156 | - version: "1.1.0-nullsafety" | 149 | + version: "1.1.0-nullsafety.2" |
| 157 | term_glyph: | 150 | term_glyph: |
| 158 | dependency: transitive | 151 | dependency: transitive |
| 159 | description: | 152 | description: |
| 160 | name: term_glyph | 153 | name: term_glyph |
| 161 | url: "https://pub.dartlang.org" | 154 | url: "https://pub.dartlang.org" |
| 162 | source: hosted | 155 | source: hosted |
| 163 | - version: "1.2.0-nullsafety" | 156 | + version: "1.2.0-nullsafety.2" |
| 164 | test_api: | 157 | test_api: |
| 165 | dependency: transitive | 158 | dependency: transitive |
| 166 | description: | 159 | description: |
| 167 | name: test_api | 160 | name: test_api |
| 168 | url: "https://pub.dartlang.org" | 161 | url: "https://pub.dartlang.org" |
| 169 | source: hosted | 162 | source: hosted |
| 170 | - version: "0.2.19-nullsafety" | 163 | + version: "0.2.19-nullsafety.4" |
| 171 | typed_data: | 164 | typed_data: |
| 172 | dependency: transitive | 165 | dependency: transitive |
| 173 | description: | 166 | description: |
| 174 | name: typed_data | 167 | name: typed_data |
| 175 | url: "https://pub.dartlang.org" | 168 | url: "https://pub.dartlang.org" |
| 176 | source: hosted | 169 | source: hosted |
| 177 | - version: "1.3.0-nullsafety.2" | 170 | + version: "1.3.0-nullsafety.4" |
| 178 | url_launcher: | 171 | url_launcher: |
| 179 | dependency: "direct main" | 172 | dependency: "direct main" |
| 180 | description: | 173 | description: |
| 181 | name: url_launcher | 174 | name: url_launcher |
| 182 | url: "https://pub.dartlang.org" | 175 | url: "https://pub.dartlang.org" |
| 183 | source: hosted | 176 | source: hosted |
| 184 | - version: "5.6.0" | 177 | + version: "5.7.10" |
| 185 | url_launcher_linux: | 178 | url_launcher_linux: |
| 186 | dependency: transitive | 179 | dependency: transitive |
| 187 | description: | 180 | description: |
| 188 | name: url_launcher_linux | 181 | name: url_launcher_linux |
| 189 | url: "https://pub.dartlang.org" | 182 | url: "https://pub.dartlang.org" |
| 190 | source: hosted | 183 | source: hosted |
| 191 | - version: "0.0.1+1" | 184 | + version: "0.0.1+4" |
| 192 | url_launcher_macos: | 185 | url_launcher_macos: |
| 193 | dependency: transitive | 186 | dependency: transitive |
| 194 | description: | 187 | description: |
| 195 | name: url_launcher_macos | 188 | name: url_launcher_macos |
| 196 | url: "https://pub.dartlang.org" | 189 | url: "https://pub.dartlang.org" |
| 197 | source: hosted | 190 | source: hosted |
| 198 | - version: "0.0.1+8" | 191 | + version: "0.0.1+9" |
| 199 | url_launcher_platform_interface: | 192 | url_launcher_platform_interface: |
| 200 | dependency: transitive | 193 | dependency: transitive |
| 201 | description: | 194 | description: |
| 202 | name: url_launcher_platform_interface | 195 | name: url_launcher_platform_interface |
| 203 | url: "https://pub.dartlang.org" | 196 | url: "https://pub.dartlang.org" |
| 204 | source: hosted | 197 | source: hosted |
| 205 | - version: "1.0.8" | 198 | + version: "1.0.9" |
| 206 | url_launcher_web: | 199 | url_launcher_web: |
| 207 | dependency: transitive | 200 | dependency: transitive |
| 208 | description: | 201 | description: |
| 209 | name: url_launcher_web | 202 | name: url_launcher_web |
| 210 | url: "https://pub.dartlang.org" | 203 | url: "https://pub.dartlang.org" |
| 211 | source: hosted | 204 | source: hosted |
| 212 | - version: "0.1.3+2" | 205 | + version: "0.1.5+1" |
| 213 | url_launcher_windows: | 206 | url_launcher_windows: |
| 214 | dependency: transitive | 207 | dependency: transitive |
| 215 | description: | 208 | description: |
| 216 | name: url_launcher_windows | 209 | name: url_launcher_windows |
| 217 | url: "https://pub.dartlang.org" | 210 | url: "https://pub.dartlang.org" |
| 218 | source: hosted | 211 | source: hosted |
| 219 | - version: "0.0.1+1" | 212 | + version: "0.0.1+3" |
| 220 | vector_math: | 213 | vector_math: |
| 221 | dependency: transitive | 214 | dependency: transitive |
| 222 | description: | 215 | description: |
| 223 | name: vector_math | 216 | name: vector_math |
| 224 | url: "https://pub.dartlang.org" | 217 | url: "https://pub.dartlang.org" |
| 225 | source: hosted | 218 | source: hosted |
| 226 | - version: "2.1.0-nullsafety.2" | 219 | + version: "2.1.0-nullsafety.4" |
| 227 | sdks: | 220 | sdks: |
| 228 | - dart: ">=2.10.0-0.0.dev <2.10.0" | ||
| 229 | - flutter: ">=1.12.13+hotfix.5 <2.0.0" | 221 | + dart: ">=2.11.0-0.0 <2.12.0" |
| 222 | + flutter: ">=1.22.0 <2.0.0" |
-
Please register or login to post a comment