Showing
1 changed file
with
13 additions
and
13 deletions
| @@ -72,8 +72,8 @@ Future<T> showCupertinoModalBottomSheet<T>({ | @@ -72,8 +72,8 @@ Future<T> showCupertinoModalBottomSheet<T>({ | ||
| 72 | Color barrierColor, | 72 | Color barrierColor, |
| 73 | bool expand = false, | 73 | bool expand = false, |
| 74 | AnimationController secondAnimation, | 74 | AnimationController secondAnimation, |
| 75 | - Curve routeAnimationCurve, | ||
| 76 | - Curve modalAnimationCurve, | 75 | + Curve animationCurve, |
| 76 | + Curve previousRouteAnimationCurve, | ||
| 77 | bool useRootNavigator = false, | 77 | bool useRootNavigator = false, |
| 78 | bool bounce = true, | 78 | bool bounce = true, |
| 79 | bool isDismissible, | 79 | bool isDismissible, |
| @@ -109,14 +109,14 @@ Future<T> showCupertinoModalBottomSheet<T>({ | @@ -109,14 +109,14 @@ Future<T> showCupertinoModalBottomSheet<T>({ | ||
| 109 | isDismissible: isDismissible ?? expand == false ? true : false, | 109 | isDismissible: isDismissible ?? expand == false ? true : false, |
| 110 | modalBarrierColor: barrierColor ?? Colors.black12, | 110 | modalBarrierColor: barrierColor ?? Colors.black12, |
| 111 | enableDrag: enableDrag, | 111 | enableDrag: enableDrag, |
| 112 | - routeAnimationCurve: routeAnimationCurve, | ||
| 113 | - modalAnimationCurve: modalAnimationCurve, | 112 | + animationCurve: animationCurve, |
| 113 | + previousRouteAnimationCurve: previousRouteAnimationCurve, | ||
| 114 | )); | 114 | )); |
| 115 | return result; | 115 | return result; |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> { | 118 | class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> { |
| 119 | - final Curve modalAnimationCurve; | 119 | + final Curve previousRouteAnimationCurve; |
| 120 | 120 | ||
| 121 | CupertinoModalBottomSheetRoute({ | 121 | CupertinoModalBottomSheetRoute({ |
| 122 | ScrollWidgetBuilder builder, | 122 | ScrollWidgetBuilder builder, |
| @@ -126,14 +126,14 @@ class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> { | @@ -126,14 +126,14 @@ class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> { | ||
| 126 | ShapeBorder shape, | 126 | ShapeBorder shape, |
| 127 | Clip clipBehavior, | 127 | Clip clipBehavior, |
| 128 | AnimationController secondAnimationController, | 128 | AnimationController secondAnimationController, |
| 129 | - Curve routeAnimationCurve, | 129 | + Curve animationCurve, |
| 130 | Color modalBarrierColor, | 130 | Color modalBarrierColor, |
| 131 | bool bounce = true, | 131 | bool bounce = true, |
| 132 | bool isDismissible = true, | 132 | bool isDismissible = true, |
| 133 | bool enableDrag = true, | 133 | bool enableDrag = true, |
| 134 | @required bool expanded, | 134 | @required bool expanded, |
| 135 | RouteSettings settings, | 135 | RouteSettings settings, |
| 136 | - this.modalAnimationCurve, | 136 | + this.previousRouteAnimationCurve, |
| 137 | }) : assert(expanded != null), | 137 | }) : assert(expanded != null), |
| 138 | assert(isDismissible != null), | 138 | assert(isDismissible != null), |
| 139 | assert(enableDrag != null), | 139 | assert(enableDrag != null), |
| @@ -148,7 +148,7 @@ class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> { | @@ -148,7 +148,7 @@ class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> { | ||
| 148 | enableDrag: enableDrag, | 148 | enableDrag: enableDrag, |
| 149 | expanded: expanded, | 149 | expanded: expanded, |
| 150 | settings: settings, | 150 | settings: settings, |
| 151 | - animationCurve: routeAnimationCurve, | 151 | + animationCurve: animationCurve, |
| 152 | ); | 152 | ); |
| 153 | 153 | ||
| 154 | @override | 154 | @override |
| @@ -183,7 +183,7 @@ class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> { | @@ -183,7 +183,7 @@ class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> { | ||
| 183 | return _CupertinoModalTransition( | 183 | return _CupertinoModalTransition( |
| 184 | secondaryAnimation: secondaryAnimation, | 184 | secondaryAnimation: secondaryAnimation, |
| 185 | body: child, | 185 | body: child, |
| 186 | - animationCurve: modalAnimationCurve, | 186 | + animationCurve: previousRouteAnimationCurve, |
| 187 | ); | 187 | ); |
| 188 | } | 188 | } |
| 189 | } | 189 | } |
| @@ -277,8 +277,8 @@ class CupertinoScaffold extends StatefulWidget { | @@ -277,8 +277,8 @@ class CupertinoScaffold extends StatefulWidget { | ||
| 277 | static Future<T> showCupertinoModalBottomSheet<T>({ | 277 | static Future<T> showCupertinoModalBottomSheet<T>({ |
| 278 | @required BuildContext context, | 278 | @required BuildContext context, |
| 279 | @required ScrollWidgetBuilder builder, | 279 | @required ScrollWidgetBuilder builder, |
| 280 | - Curve routeAnimationCurve, | ||
| 281 | - Curve modalAnimationCurve, | 280 | + Curve animationCurve, |
| 281 | + Curve previousRouteAnimationCurve, | ||
| 282 | Color backgroundColor, | 282 | Color backgroundColor, |
| 283 | Color barrierColor, | 283 | Color barrierColor, |
| 284 | bool expand = false, | 284 | bool expand = false, |
| @@ -313,8 +313,8 @@ class CupertinoScaffold extends StatefulWidget { | @@ -313,8 +313,8 @@ class CupertinoScaffold extends StatefulWidget { | ||
| 313 | isDismissible: isDismissible ?? expand == false ? true : false, | 313 | isDismissible: isDismissible ?? expand == false ? true : false, |
| 314 | modalBarrierColor: barrierColor ?? Colors.black12, | 314 | modalBarrierColor: barrierColor ?? Colors.black12, |
| 315 | enableDrag: enableDrag, | 315 | enableDrag: enableDrag, |
| 316 | - routeAnimationCurve: routeAnimationCurve, | ||
| 317 | - modalAnimationCurve: modalAnimationCurve, | 316 | + animationCurve: animationCurve, |
| 317 | + previousRouteAnimationCurve: previousRouteAnimationCurve, | ||
| 318 | )); | 318 | )); |
| 319 | return result; | 319 | return result; |
| 320 | } | 320 | } |
-
Please register or login to post a comment