add api - (void)hw_dismissAnimated:(BOOL)animated completion:(void (^)(void))completion.

now can dismiss directly.

Author: wangcongling

Demo/PanControllerExample/Base/HWBaseViewController.m

@@ -28,6 +28,14 @@ - (void)viewDidLoad {
     self.textfield.placeholder = @"Please type something.";
     self.textfield.delegate = self;
     [self.view addSubview:self.textfield];
+    
+    UIButton *closeButton = [UIButton buttonWithType:UIButtonTypeCustom];
+    [closeButton setTitle:@"Tap Me To Dismiss Directly" forState:UIControlStateNormal];
+    [closeButton setTitleColor:[UIColor redColor] forState:UIControlStateNormal];
+    closeButton.titleLabel.font = [UIFont boldSystemFontOfSize:18];
+    closeButton.frame = CGRectMake(20, 122, 300, 30);
+    [closeButton addTarget:self action:@selector(didTapCloseButton) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:closeButton];
 }
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField {
@@ -40,6 +48,12 @@ - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
     [self.view endEditing:YES];
 }
 
+- (void)didTapCloseButton {
+    [self hw_dismissAnimated:YES completion:^{
+        
+    }];
+}
+
 #pragma mark - HWPanModalPresentable
 
 - (PanModalHeight)shortFormHeight {
@@ -82,4 +96,8 @@ - (BOOL)shouldEnableAppearanceTransition {
     return NO;
 }
 
+- (NSTimeInterval)dismissalDuration {
+    return 1.0;
+}
+
 @end

HWPanModal.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'HWPanModal'
-  s.version          = '0.9.1'
+  s.version          = '0.9.2'
   s.summary          = 'HWPanModal is used to present controller and drag to dismiss.'
 
 # This description is used to generate tags and improve search results.

Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - HWPanModal (0.8.7)
+  - HWPanModal (0.8.9)
   - Masonry (1.1.0)
   - MJRefresh (3.3.1)
   - SnapKit (5.0.1)
@@ -11,7 +11,7 @@ DEPENDENCIES:
   - SnapKit (~> 5.0.0)
 
 SPEC REPOS:
-  cocoapods:
+  https://github.com/CocoaPods/Specs.git:
     - Masonry
     - MJRefresh
     - SnapKit
@@ -21,11 +21,11 @@ EXTERNAL SOURCES:
     :path: "./"
 
 SPEC CHECKSUMS:
-  HWPanModal: 611e15ece3ce63e22130d005dfc665338df059cb
+  HWPanModal: 259f6916c706b3f63003a325ad1bdfbe913b0fdc
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MJRefresh: eeda70fbf0ad277f3178cef1cd0c3532591d6237
   SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
 
 PODFILE CHECKSUM: 3046bfffa65a16097d4e0ee1bb220fa9859f7067
 
-COCOAPODS: 1.10.2
+COCOAPODS: 1.11.2

README-CN.md

@@ -113,7 +113,7 @@ Special Thanks to JetBrains! I use AppCode IDE to develop my open source project
 ### [CocoaPods](https://guides.cocoapods.org/using/using-cocoapods.html)
 
 ```ruby
-pod 'HWPanModal', '~> 0.6.0'
+pod 'HWPanModal', '~> 0.9.2'
 ```
 
 ## 如何使用

README.md

@@ -124,7 +124,7 @@ The different is `HWPanModalContentView` is just a view, and support some animat
 ### [CocoaPods](https://guides.cocoapods.org/using/using-cocoapods.html)
 
 ```ruby
-pod 'HWPanModal', '~> 0.8.9'
+pod 'HWPanModal', '~> 0.9.2'
 ```
 
 ## How to use

Sources/Controller/HWPanModalPresentationController.h

@@ -25,6 +25,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)setScrollableContentOffset:(CGPoint)offset animated:(BOOL)animated;
 
+- (void)dismissAnimated:(BOOL)animated completion:(void (^)(void))completion;
+
 @end
 
 NS_ASSUME_NONNULL_END

Sources/Controller/HWPanModalPresentationController.m

@@ -399,12 +399,21 @@ - (void)adjustPresentableYPos:(CGFloat)yPos {
 }
 
 - (void)dismiss:(BOOL)isInteractive mode:(PanModalInteractiveMode)mode {
-	self.presentedViewController.hw_panModalPresentationDelegate.interactive = isInteractive;
-	self.presentedViewController.hw_panModalPresentationDelegate.interactiveMode = mode;
-	[self.presentable panModalWillDismiss];
-	[self.presentedViewController dismissViewControllerAnimated:YES completion:^{
-		[self.presentable panModalDidDismissed];
-	}];
+    [self dismiss:isInteractive mode:mode animated:YES completion:nil];
+}
+
+- (void)dismiss:(BOOL)isInteractive mode:(PanModalInteractiveMode)mode animated:(BOOL)animated completion:(void (^)(void))completion {
+    self.presentedViewController.hw_panModalPresentationDelegate.interactive = isInteractive;
+    self.presentedViewController.hw_panModalPresentationDelegate.interactiveMode = mode;
+    [self.presentable panModalWillDismiss];
+    [self.presentedViewController dismissViewControllerAnimated:animated completion:^{
+        if (completion) completion();
+        [self.presentable panModalDidDismissed];
+    }];
+}
+
+- (void)dismissAnimated:(BOOL)animated completion:(nonnull void (^)(void))completion {
+    [self dismiss:NO mode:PanModalInteractiveModeNone animated:animated completion:completion];
 }
 
 - (void)presentableTransitionToState:(PresentationState)state {

Sources/Presentable/HWPanModalPresentationUpdateProtocol.h

@@ -55,4 +55,9 @@
  */
 - (void)hw_panModalUpdateUserHitBehavior NS_SWIFT_NAME(panModalUpdateUserHitBehavior());
 
+/**
+ * call this method to dismiss your presented VC directly
+ */
+- (void)hw_dismissAnimated:(BOOL)animated completion:(void (^)(void))completion NS_SWIFT_NAME(dismissAnimated(animated:completion:));
+
 @end

Sources/Presentable/UIViewController+Presentation.m

@@ -46,6 +46,11 @@ - (void)hw_panModalUpdateUserHitBehavior {
     [self.hw_presentedVC updateUserHitBehavior];
 }
 
+- (void)hw_dismissAnimated:(BOOL)animated completion:(void (^)(void))completion{
+    if (!self.hw_presentedVC) return;
+    [self.hw_presentedVC dismissAnimated:animated completion:completion];
+}
+
 - (HWDimmedView *)hw_dimmedView {
     return self.hw_presentedVC.backgroundView;
 }

Sources/View/PanModal/HWPanModalContentView.m

@@ -56,6 +56,10 @@ - (void)hw_panModalSetContentOffset:(CGPoint)offset animated:(BOOL)animated {
     [self.containerView setScrollableContentOffset:offset animated:animated];
 }
 
+- (void)hw_dismissAnimated:(BOOL)animated completion:(void (^)(void))completion {
+    [self dismissAnimated:animated completion:completion];
+}
+
 - (HWDimmedView *)hw_dimmedView {
     return self.containerView.backgroundView;
 }