Merge pull request #14 from bierbaumtim/master

Expose Curve for animating the route and the modal

Merge pull request #14 from bierbaumtim/master
Expose Curve for animating the route and the modal
Jaime Blasco · GitHub
Commit 7a0e9b7ae2b514c22d9573f3ea3d1e7233e4c1d8 7a0e9b7a 2 parents f3ab7d4f 69df5d2c
Showing 5 changed files with 48 additions and 9 deletions
lib/src/bottom_sheet.dart
lib/src/bottom_sheet_route.dart
lib/src/bottom_sheets/bar_bottom_sheet.dart
lib/src/bottom_sheets/cupertino_bottom_sheet.dart
lib/src/bottom_sheets/material_bottom_sheet.dart
--- a/lib/src/bottom_sheet.dart
View file @7a0e9b7
+++ b/lib/src/bottom_sheet.dart
View file @7a0e9b7
@@ -38,6 +38,7 @@ class ModalBottomSheet extends StatefulWidget {
   const ModalBottomSheet({
     Key key,
     this.animationController,
+    this.animationCurve,
     this.enableDrag = true,
     this.containerBuilder,
     this.bounce = true,
@@ -58,6 +59,11 @@ class ModalBottomSheet extends StatefulWidget {
   /// is not just a passive observer.
   final AnimationController animationController;
+  /// The curve used by the animation showing and dismissing the bottom sheet.
+  /// 
+  /// If no curve is provided it falls back to `Curves.easeOutSine`.
+  final Curve animationCurve;
+
   /// Allows the bottom sheet to  go beyond the top bound of the content,
   /// but then bounce the content back to the edge of
   /// the top bound.
@@ -276,7 +282,7 @@ class _ModalBottomSheetState extends State<ModalBottomSheet>
   Widget build(BuildContext context) {
     final bounceAnimation = CurvedAnimation(
       parent: _bounceDragController,
-      curve: Curves.easeOutSine,
+      curve: widget.animationCurve ?? Curves.easeOutSine,
     );
     var child = widget.builder(context, _scrollController);
--- a/lib/src/bottom_sheet_route.dart
View file @7a0e9b7
+++ b/lib/src/bottom_sheet_route.dart
View file @7a0e9b7
@@ -17,6 +17,7 @@ class _ModalBottomSheet<T> extends StatefulWidget {
     this.scrollController,
     this.expanded = false,
     this.enableDrag = true,
+    this.animationCurve,
   })  : assert(expanded != null),
         assert(enableDrag != null),
         super(key: key);
@@ -26,6 +27,7 @@ class _ModalBottomSheet<T> extends StatefulWidget {
   final bool bounce;
   final bool enableDrag;
   final AnimationController secondAnimationController;
+  final Curve animationCurve;
   final ScrollController scrollController;
   @override
@@ -97,6 +99,7 @@ class _ModalBottomSheetState<T> extends State<_ModalBottomSheet<T>> {
             builder: widget.route.builder,
             enableDrag: widget.enableDrag,
             bounce: widget.bounce,
+            animationCurve: widget.animationCurve,
           ),
         );
       },
@@ -116,6 +119,7 @@ class ModalBottomSheetRoute<T> extends PopupRoute<T> {
     this.enableDrag = true,
     @required this.expanded,
     this.bounce = false,
+    this.animationCurve,
     RouteSettings settings,
   })  : assert(expanded != null),
         assert(isDismissible != null),
@@ -132,6 +136,7 @@ class ModalBottomSheetRoute<T> extends PopupRoute<T> {
   final ScrollController scrollController;
   final AnimationController secondAnimationController;
+  final Curve animationCurve;
   @override
   Duration get transitionDuration => _bottomSheetDuration;
@@ -172,6 +177,7 @@ class ModalBottomSheetRoute<T> extends PopupRoute<T> {
         scrollController: scrollController,
         bounce: bounce,
         enableDrag: enableDrag,
+        animationCurve: animationCurve,
       ),
     );
     return bottomSheet;
@@ -195,8 +201,8 @@ class ModalBottomSheetRoute<T> extends PopupRoute<T> {
 }
 /// Shows a modal material design bottom sheet.
-Future<T> showCustomModalBottomSheet<T>(
-    {@required BuildContext context,
+Future<T> showCustomModalBottomSheet<T>({
+  @required BuildContext context,
   @required ScrollWidgetBuilder builder,
   @required WidgetWithChildBuilder containerWidget,
   Color backgroundColor,
@@ -207,10 +213,12 @@ Future<T> showCustomModalBottomSheet<T>(
   bool bounce = false,
   bool expand = false,
   AnimationController secondAnimation,
+  Curve animationCurve,
   bool useRootNavigator = false,
   bool isDismissible = true,
   bool enableDrag = true,
-    ScrollController scrollController}) async {
+  ScrollController scrollController,
+}) async {
   assert(context != null);
   assert(builder != null);
   assert(containerWidget != null);
@@ -231,6 +239,7 @@ Future<T> showCustomModalBottomSheet<T>(
     isDismissible: isDismissible,
     modalBarrierColor: barrierColor,
     enableDrag: enableDrag,
+    animationCurve: animationCurve,
   ));
   return result;
 }
--- a/lib/src/bottom_sheets/bar_bottom_sheet.dart
View file @7a0e9b7
+++ b/lib/src/bottom_sheets/bar_bottom_sheet.dart
View file @7a0e9b7
@@ -66,6 +66,7 @@ Future<T> showBarModalBottomSheet<T>({
   bool bounce = true,
   bool expand = false,
   AnimationController secondAnimation,
+  Curve animationCurve,
   bool useRootNavigator = false,
   bool isDismissible = true,
   bool enableDrag = true,
@@ -91,6 +92,7 @@ Future<T> showBarModalBottomSheet<T>({
     isDismissible: isDismissible,
     modalBarrierColor: barrierColor,
     enableDrag: enableDrag,
+    animationCurve: animationCurve,
   ));
   return result;
 }
--- a/lib/src/bottom_sheets/cupertino_bottom_sheet.dart
View file @7a0e9b7
+++ b/lib/src/bottom_sheets/cupertino_bottom_sheet.dart
View file @7a0e9b7
@@ -72,6 +72,8 @@ Future<T> showCupertinoModalBottomSheet<T>({
   Color barrierColor,
   bool expand = false,
   AnimationController secondAnimation,
+  Curve animationCurve,
+  Curve previousRouteAnimationCurve,
   bool useRootNavigator = false,
   bool bounce = true,
   bool isDismissible,
@@ -107,11 +109,15 @@ Future<T> showCupertinoModalBottomSheet<T>({
     isDismissible: isDismissible ?? expand == false ? true : false,
     modalBarrierColor: barrierColor ?? Colors.black12,
     enableDrag: enableDrag,
+    animationCurve: animationCurve,
+    previousRouteAnimationCurve: previousRouteAnimationCurve,
   ));
   return result;
 }
 class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> {
+  final Curve previousRouteAnimationCurve;
+
   CupertinoModalBottomSheetRoute({
     ScrollWidgetBuilder builder,
     WidgetWithChildBuilder containerBuilder,
@@ -120,12 +126,14 @@ class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> {
     ShapeBorder shape,
     Clip clipBehavior,
     AnimationController secondAnimationController,
+    Curve animationCurve,
     Color modalBarrierColor,
     bool bounce = true,
     bool isDismissible = true,
     bool enableDrag = true,
     @required bool expanded,
     RouteSettings settings,
+    this.previousRouteAnimationCurve,
   })  : assert(expanded != null),
         assert(isDismissible != null),
         assert(enableDrag != null),
@@ -140,6 +148,7 @@ class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> {
           enableDrag: enableDrag,
           expanded: expanded,
           settings: settings,
+          animationCurve: animationCurve,
         );
   @override
@@ -172,18 +181,25 @@ class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> {
   Widget getPreviousRouteTransition(BuildContext context,
       Animation<double> secondaryAnimation, Widget child) {
     return _CupertinoModalTransition(
-        secondaryAnimation: secondaryAnimation, body: child);
+      secondaryAnimation: secondaryAnimation,
+      body: child,
+      animationCurve: previousRouteAnimationCurve,
+    );
   }
 }
 class _CupertinoModalTransition extends StatelessWidget {
   final Animation<double> secondaryAnimation;
+  final Curve animationCurve;
   final Widget body;
-  const _CupertinoModalTransition(
-      {Key key, @required this.secondaryAnimation, @required this.body})
-      : super(key: key);
+  const _CupertinoModalTransition({
+    Key key,
+    @required this.secondaryAnimation,
+    @required this.body,
+    this.animationCurve,
+  }) : super(key: key);
   @override
   Widget build(BuildContext context) {
@@ -196,7 +212,7 @@ class _CupertinoModalTransition extends StatelessWidget {
     final curvedAnimation = CurvedAnimation(
       parent: secondaryAnimation,
-      curve: Curves.easeOut,
+      curve: animationCurve ?? Curves.easeOut,
     );
     return AnnotatedRegion<SystemUiOverlayStyle>(
@@ -261,6 +277,8 @@ class CupertinoScaffold extends StatefulWidget {
   static Future<T> showCupertinoModalBottomSheet<T>({
     @required BuildContext context,
     @required ScrollWidgetBuilder builder,
+    Curve animationCurve,
+    Curve previousRouteAnimationCurve,
     Color backgroundColor,
     Color barrierColor,
     bool expand = false,
@@ -295,6 +313,8 @@ class CupertinoScaffold extends StatefulWidget {
       isDismissible: isDismissible ?? expand == false ? true : false,
       modalBarrierColor: barrierColor ?? Colors.black12,
       enableDrag: enableDrag,
+      animationCurve: animationCurve,
+      previousRouteAnimationCurve: previousRouteAnimationCurve,
     ));
     return result;
   }
--- a/lib/src/bottom_sheets/material_bottom_sheet.dart
View file @7a0e9b7
+++ b/lib/src/bottom_sheets/material_bottom_sheet.dart
View file @7a0e9b7
@@ -14,6 +14,7 @@ Future<T> showMaterialModalBottomSheet<T>({
   bool bounce = false,
   bool expand = false,
   AnimationController secondAnimation,
+  Curve animationCurve,
   bool useRootNavigator = false,
   bool isDismissible = true,
   bool enableDrag = true,
@@ -44,6 +45,7 @@ Future<T> showMaterialModalBottomSheet<T>({
     isDismissible: isDismissible,
     modalBarrierColor: barrierColor,
     enableDrag: enableDrag,
+    animationCurve: animationCurve,
   ));
   return result;
 }