flutter_package / modal_bottom_sheet

Go to a project
Toggle navigation Toggle navigation pinning
Jaime Blasco
Committed by GitHub
2e9afcec 1 parent 42da8b01

fix: deprecate duplicated name (#323)

Inline Side-by-side
Showing 9 changed files with 28 additions and 21 deletions
@@ -99,7 +99,7 @@ Future<T?> showAvatarModalBottomSheet<T>({ @@ -99,7 +99,7 @@ Future<T?> showAvatarModalBottomSheet<T>({
99 assert(debugCheckHasMediaQuery(context)); 99 assert(debugCheckHasMediaQuery(context));
100 assert(debugCheckHasMaterialLocalizations(context)); 100 assert(debugCheckHasMaterialLocalizations(context));
101 final result = await Navigator.of(context, rootNavigator: useRootNavigator) 101 final result = await Navigator.of(context, rootNavigator: useRootNavigator)
102 - .push(modal_bottom_sheet.ModalBottomSheetRoute<T>( 102 + .push(modal_bottom_sheet.ModalSheetRoute<T>(
103 builder: builder, 103 builder: builder,
104 containerBuilder: (_, animation, child) => AvatarBottomSheet( 104 containerBuilder: (_, animation, child) => AvatarBottomSheet(
105 child: child, 105 child: child,
1 -platform :osx, '10.11' 1 +platform :osx, '10.14'
2 2
3 # CocoaPods analytics sends network stats synchronously affecting flutter build latency. 3 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
4 ENV['COCOAPODS_DISABLE_STATS'] = 'true' 4 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -14,9 +14,9 @@ EXTERNAL SOURCES: @@ -14,9 +14,9 @@ EXTERNAL SOURCES:
14 :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos 14 :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
15 15
16 SPEC CHECKSUMS: 16 SPEC CHECKSUMS:
17 - FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424  
18 - url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3 17 + FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
  18 + url_launcher_macos: c04e4fa86382d4f94f6b38f14625708be3ae52e2
19 19
20 -PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c 20 +PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
21 21
22 COCOAPODS: 1.11.3 22 COCOAPODS: 1.11.3
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 archiveVersion = 1; 3 archiveVersion = 1;
4 classes = { 4 classes = {
5 }; 5 };
6 - objectVersion = 51; 6 + objectVersion = 54;
7 objects = { 7 objects = {
8 8
9 /* Begin PBXAggregateTarget section */ 9 /* Begin PBXAggregateTarget section */
@@ -278,6 +278,7 @@ @@ -278,6 +278,7 @@
278 }; 278 };
279 3399D490228B24CF009A79C7 /* ShellScript */ = { 279 3399D490228B24CF009A79C7 /* ShellScript */ = {
280 isa = PBXShellScriptBuildPhase; 280 isa = PBXShellScriptBuildPhase;
  281 + alwaysOutOfDate = 1;
281 buildActionMask = 2147483647; 282 buildActionMask = 2147483647;
282 files = ( 283 files = (
283 ); 284 );
@@ -404,7 +405,7 @@ @@ -404,7 +405,7 @@
404 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; 405 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
405 GCC_WARN_UNUSED_FUNCTION = YES; 406 GCC_WARN_UNUSED_FUNCTION = YES;
406 GCC_WARN_UNUSED_VARIABLE = YES; 407 GCC_WARN_UNUSED_VARIABLE = YES;
407 - MACOSX_DEPLOYMENT_TARGET = 10.11; 408 + MACOSX_DEPLOYMENT_TARGET = 10.14;
408 MTL_ENABLE_DEBUG_INFO = NO; 409 MTL_ENABLE_DEBUG_INFO = NO;
409 SDKROOT = macosx; 410 SDKROOT = macosx;
410 SWIFT_COMPILATION_MODE = wholemodule; 411 SWIFT_COMPILATION_MODE = wholemodule;
@@ -483,7 +484,7 @@ @@ -483,7 +484,7 @@
483 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; 484 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
484 GCC_WARN_UNUSED_FUNCTION = YES; 485 GCC_WARN_UNUSED_FUNCTION = YES;
485 GCC_WARN_UNUSED_VARIABLE = YES; 486 GCC_WARN_UNUSED_VARIABLE = YES;
486 - MACOSX_DEPLOYMENT_TARGET = 10.11; 487 + MACOSX_DEPLOYMENT_TARGET = 10.14;
487 MTL_ENABLE_DEBUG_INFO = YES; 488 MTL_ENABLE_DEBUG_INFO = YES;
488 ONLY_ACTIVE_ARCH = YES; 489 ONLY_ACTIVE_ARCH = YES;
489 SDKROOT = macosx; 490 SDKROOT = macosx;
@@ -530,7 +531,7 @@ @@ -530,7 +531,7 @@
530 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; 531 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
531 GCC_WARN_UNUSED_FUNCTION = YES; 532 GCC_WARN_UNUSED_FUNCTION = YES;
532 GCC_WARN_UNUSED_VARIABLE = YES; 533 GCC_WARN_UNUSED_VARIABLE = YES;
533 - MACOSX_DEPLOYMENT_TARGET = 10.11; 534 + MACOSX_DEPLOYMENT_TARGET = 10.14;
534 MTL_ENABLE_DEBUG_INFO = NO; 535 MTL_ENABLE_DEBUG_INFO = NO;
535 SDKROOT = macosx; 536 SDKROOT = macosx;
536 SWIFT_COMPILATION_MODE = wholemodule; 537 SWIFT_COMPILATION_MODE = wholemodule;
@@ -19,7 +19,7 @@ class _ModalBottomSheet<T> extends StatefulWidget { @@ -19,7 +19,7 @@ class _ModalBottomSheet<T> extends StatefulWidget {
19 }) : super(key: key); 19 }) : super(key: key);
20 20
21 final double? closeProgressThreshold; 21 final double? closeProgressThreshold;
22 - final ModalBottomSheetRoute<T> route; 22 + final ModalSheetRoute<T> route;
23 final bool expanded; 23 final bool expanded;
24 final bool bounce; 24 final bool bounce;
25 final bool enableDrag; 25 final bool enableDrag;
@@ -122,8 +122,14 @@ class _ModalBottomSheetState<T> extends State<_ModalBottomSheet<T>> { @@ -122,8 +122,14 @@ class _ModalBottomSheetState<T> extends State<_ModalBottomSheet<T>> {
122 } 122 }
123 } 123 }
124 124
125 -class ModalBottomSheetRoute<T> extends PageRoute<T> {  
126 - ModalBottomSheetRoute({ 125 +@Deprecated(
  126 + 'ModalBottomSheetRoute has been introduced in Flutter 3.7, to avoid name '
  127 + 'conflicts, this class has been renamed to ModalSheetRoute in this '
  128 + 'packages. ModalBottomSheetRoute will be removed in the next major version.')
  129 +typedef ModalBottomSheetRoute<T> = ModalSheetRoute<T>;
  130 +
  131 +class ModalSheetRoute<T> extends PageRoute<T> {
  132 + ModalSheetRoute({
127 this.closeProgressThreshold, 133 this.closeProgressThreshold,
128 this.containerBuilder, 134 this.containerBuilder,
129 required this.builder, 135 required this.builder,
@@ -211,11 +217,11 @@ class ModalBottomSheetRoute<T> extends PageRoute<T> { @@ -211,11 +217,11 @@ class ModalBottomSheetRoute<T> extends PageRoute<T> {
211 217
212 @override 218 @override
213 bool canTransitionTo(TransitionRoute<dynamic> nextRoute) => 219 bool canTransitionTo(TransitionRoute<dynamic> nextRoute) =>
214 - nextRoute is ModalBottomSheetRoute; 220 + nextRoute is ModalSheetRoute;
215 221
216 @override 222 @override
217 bool canTransitionFrom(TransitionRoute<dynamic> previousRoute) => 223 bool canTransitionFrom(TransitionRoute<dynamic> previousRoute) =>
218 - previousRoute is ModalBottomSheetRoute || previousRoute is PageRoute; 224 + previousRoute is ModalSheetRoute || previousRoute is PageRoute;
219 225
220 Widget getPreviousRouteTransition( 226 Widget getPreviousRouteTransition(
221 BuildContext context, 227 BuildContext context,
@@ -257,7 +263,7 @@ Future<T?> showCustomModalBottomSheet<T>({ @@ -257,7 +263,7 @@ Future<T?> showCustomModalBottomSheet<T>({
257 : ''; 263 : '';
258 264
259 final result = await Navigator.of(context, rootNavigator: useRootNavigator) 265 final result = await Navigator.of(context, rootNavigator: useRootNavigator)
260 - .push(ModalBottomSheetRoute<T>( 266 + .push(ModalSheetRoute<T>(
261 builder: builder, 267 builder: builder,
262 bounce: bounce, 268 bounce: bounce,
263 containerBuilder: containerWidget, 269 containerBuilder: containerWidget,
@@ -98,7 +98,7 @@ Future<T?> showBarModalBottomSheet<T>({ @@ -98,7 +98,7 @@ Future<T?> showBarModalBottomSheet<T>({
98 assert(debugCheckHasMediaQuery(context)); 98 assert(debugCheckHasMediaQuery(context));
99 assert(debugCheckHasMaterialLocalizations(context)); 99 assert(debugCheckHasMaterialLocalizations(context));
100 final result = await Navigator.of(context, rootNavigator: useRootNavigator) 100 final result = await Navigator.of(context, rootNavigator: useRootNavigator)
101 - .push(modal_bottom_sheet.ModalBottomSheetRoute<T>( 101 + .push(modal_bottom_sheet.ModalSheetRoute<T>(
102 builder: builder, 102 builder: builder,
103 bounce: bounce, 103 bounce: bounce,
104 closeProgressThreshold: closeProgressThreshold, 104 closeProgressThreshold: closeProgressThreshold,
@@ -144,7 +144,7 @@ Future<T?> showCupertinoModalBottomSheet<T>({ @@ -144,7 +144,7 @@ Future<T?> showCupertinoModalBottomSheet<T>({
144 return result; 144 return result;
145 } 145 }
146 146
147 -class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> { 147 +class CupertinoModalBottomSheetRoute<T> extends ModalSheetRoute<T> {
148 final Radius topRadius; 148 final Radius topRadius;
149 149
150 final Curve? previousRouteAnimationCurve; 150 final Curve? previousRouteAnimationCurve;
@@ -26,7 +26,7 @@ Future<T?> showMaterialModalBottomSheet<T>({ @@ -26,7 +26,7 @@ Future<T?> showMaterialModalBottomSheet<T>({
26 assert(debugCheckHasMediaQuery(context)); 26 assert(debugCheckHasMediaQuery(context));
27 assert(debugCheckHasMaterialLocalizations(context)); 27 assert(debugCheckHasMaterialLocalizations(context));
28 final result = await Navigator.of(context, rootNavigator: useRootNavigator) 28 final result = await Navigator.of(context, rootNavigator: useRootNavigator)
29 - .push(modal_bottom_sheet.ModalBottomSheetRoute<T>( 29 + .push(modal_bottom_sheet.ModalSheetRoute<T>(
30 builder: builder, 30 builder: builder,
31 closeProgressThreshold: closeProgressThreshold, 31 closeProgressThreshold: closeProgressThreshold,
32 containerBuilder: _materialContainerBuilder( 32 containerBuilder: _materialContainerBuilder(
@@ -19,7 +19,7 @@ class MaterialWithModalsPageRoute<T> extends MaterialPageRoute<T> { @@ -19,7 +19,7 @@ class MaterialWithModalsPageRoute<T> extends MaterialPageRoute<T> {
19 builder: builder, 19 builder: builder,
20 maintainState: maintainState); 20 maintainState: maintainState);
21 21
22 - modal_bottom_sheet.ModalBottomSheetRoute? _nextModalRoute; 22 + modal_bottom_sheet.ModalSheetRoute? _nextModalRoute;
23 23
24 @override 24 @override
25 bool canTransitionTo(TransitionRoute<dynamic> nextRoute) { 25 bool canTransitionTo(TransitionRoute<dynamic> nextRoute) {
@@ -28,12 +28,12 @@ class MaterialWithModalsPageRoute<T> extends MaterialPageRoute<T> { @@ -28,12 +28,12 @@ class MaterialWithModalsPageRoute<T> extends MaterialPageRoute<T> {
28 (nextRoute is CupertinoPageRoute && !nextRoute.fullscreenDialog) || 28 (nextRoute is CupertinoPageRoute && !nextRoute.fullscreenDialog) ||
29 (nextRoute is MaterialWithModalsPageRoute && 29 (nextRoute is MaterialWithModalsPageRoute &&
30 !nextRoute.fullscreenDialog) || 30 !nextRoute.fullscreenDialog) ||
31 - (nextRoute is modal_bottom_sheet.ModalBottomSheetRoute); 31 + (nextRoute is modal_bottom_sheet.ModalSheetRoute);
32 } 32 }
33 33
34 @override 34 @override
35 void didChangeNext(Route? nextRoute) { 35 void didChangeNext(Route? nextRoute) {
36 - if (nextRoute is modal_bottom_sheet.ModalBottomSheetRoute) { 36 + if (nextRoute is modal_bottom_sheet.ModalSheetRoute) {
37 _nextModalRoute = nextRoute; 37 _nextModalRoute = nextRoute;
38 } 38 }
39 39