From eb94c3319c7678fd771bd8b5a198355bf3c51302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Cmit=20Duran?= Date: Sun, 7 Jul 2024 16:47:16 +0200 Subject: [PATCH 1/2] added closeProgressThreshold to WoltBottomSheetType --- lib/src/modal_type/wolt_bottom_sheet_type.dart | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/src/modal_type/wolt_bottom_sheet_type.dart b/lib/src/modal_type/wolt_bottom_sheet_type.dart index c086208d..7e602631 100644 --- a/lib/src/modal_type/wolt_bottom_sheet_type.dart +++ b/lib/src/modal_type/wolt_bottom_sheet_type.dart @@ -20,6 +20,7 @@ class WoltBottomSheetType extends WoltModalType { Duration reverseTransitionDuration = _defaultExitDuration, minFlingVelocity = 700.0, bool? barrierDismissible, + closeProgressThreshold = 0.5, }) : super( shapeBorder: shapeBorder, forceMaxHeight: forceMaxHeight, @@ -29,6 +30,7 @@ class WoltBottomSheetType extends WoltModalType { minFlingVelocity: minFlingVelocity, showDragHandle: showDragHandle, barrierDismissible: barrierDismissible, + closeProgressThreshold: closeProgressThreshold, ); static const Duration _defaultEnterDuration = Duration(milliseconds: 350); @@ -179,6 +181,7 @@ class WoltBottomSheetType extends WoltModalType { WoltModalDismissDirection? dismissDirection, double? minFlingVelocity, bool? barrierDismissible, + double? closeProgressThreshold, }) { return WoltBottomSheetType( shapeBorder: shapeBorder ?? this.shapeBorder, @@ -190,6 +193,8 @@ class WoltBottomSheetType extends WoltModalType { dismissDirection: dismissDirection ?? this.dismissDirection, minFlingVelocity: minFlingVelocity ?? this.minFlingVelocity, barrierDismissible: barrierDismissible ?? this.barrierDismissible, + closeProgressThreshold: + closeProgressThreshold ?? this.closeProgressThreshold, ); } } From 4b00b8d03161209838156266b36f28876d8012e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Cmit=20Duran?= Date: Sun, 7 Jul 2024 21:42:10 +0200 Subject: [PATCH 2/2] added closeProgressThreshold to WoltSideSheetType --- lib/src/modal_type/wolt_bottom_sheet_type.dart | 8 ++++---- lib/src/modal_type/wolt_side_sheet_type.dart | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/src/modal_type/wolt_bottom_sheet_type.dart b/lib/src/modal_type/wolt_bottom_sheet_type.dart index 7e602631..63e39e0a 100644 --- a/lib/src/modal_type/wolt_bottom_sheet_type.dart +++ b/lib/src/modal_type/wolt_bottom_sheet_type.dart @@ -19,8 +19,8 @@ class WoltBottomSheetType extends WoltModalType { Duration transitionDuration = _defaultEnterDuration, Duration reverseTransitionDuration = _defaultExitDuration, minFlingVelocity = 700.0, - bool? barrierDismissible, closeProgressThreshold = 0.5, + bool? barrierDismissible, }) : super( shapeBorder: shapeBorder, forceMaxHeight: forceMaxHeight, @@ -28,9 +28,9 @@ class WoltBottomSheetType extends WoltModalType { reverseTransitionDuration: reverseTransitionDuration, dismissDirection: dismissDirection, minFlingVelocity: minFlingVelocity, + closeProgressThreshold: closeProgressThreshold, showDragHandle: showDragHandle, barrierDismissible: barrierDismissible, - closeProgressThreshold: closeProgressThreshold, ); static const Duration _defaultEnterDuration = Duration(milliseconds: 350); @@ -180,8 +180,8 @@ class WoltBottomSheetType extends WoltModalType { Duration? reverseTransitionDuration, WoltModalDismissDirection? dismissDirection, double? minFlingVelocity, - bool? barrierDismissible, double? closeProgressThreshold, + bool? barrierDismissible, }) { return WoltBottomSheetType( shapeBorder: shapeBorder ?? this.shapeBorder, @@ -192,9 +192,9 @@ class WoltBottomSheetType extends WoltModalType { reverseTransitionDuration ?? this.reverseTransitionDuration, dismissDirection: dismissDirection ?? this.dismissDirection, minFlingVelocity: minFlingVelocity ?? this.minFlingVelocity, - barrierDismissible: barrierDismissible ?? this.barrierDismissible, closeProgressThreshold: closeProgressThreshold ?? this.closeProgressThreshold, + barrierDismissible: barrierDismissible ?? this.barrierDismissible, ); } } diff --git a/lib/src/modal_type/wolt_side_sheet_type.dart b/lib/src/modal_type/wolt_side_sheet_type.dart index b31dc6b4..25b224fc 100644 --- a/lib/src/modal_type/wolt_side_sheet_type.dart +++ b/lib/src/modal_type/wolt_side_sheet_type.dart @@ -15,6 +15,7 @@ class WoltSideSheetType extends WoltModalType { WoltModalDismissDirection? dismissDirection = WoltModalDismissDirection.endToStart, double minFlingVelocity = 365.0, + double closeProgressThreshold = 0.5, bool? barrierDismissible, }) : super( shapeBorder: shapeBorder, @@ -24,6 +25,7 @@ class WoltSideSheetType extends WoltModalType { reverseTransitionDuration: reverseTransitionDuration, dismissDirection: dismissDirection, minFlingVelocity: minFlingVelocity, + closeProgressThreshold: closeProgressThreshold, barrierDismissible: barrierDismissible, ); @@ -189,6 +191,7 @@ class WoltSideSheetType extends WoltModalType { Duration? reverseTransitionDuration, WoltModalDismissDirection? dismissDirection, double? minFlingVelocity, + double? closeProgressThreshold, bool? barrierDismissible, }) { return WoltSideSheetType( @@ -199,6 +202,8 @@ class WoltSideSheetType extends WoltModalType { reverseTransitionDuration ?? this.reverseTransitionDuration, dismissDirection: dismissDirection ?? this.dismissDirection, minFlingVelocity: minFlingVelocity ?? this.minFlingVelocity, + closeProgressThreshold: + closeProgressThreshold ?? this.closeProgressThreshold, barrierDismissible: barrierDismissible ?? this.barrierDismissible, ); }