Update to 1.7.7

Fix memory leak when use UINavigationController

Example/stork-controller/Frameworks/SPStorkController/SPStorkController.swift

@@ -23,7 +23,7 @@ import UIKit
 
 public enum SPStorkController {
     
-    static public func scrollViewDidScroll(_ scrollView: UIScrollView, indicatorInset: CGFloat? = nil) {
+    static public func scrollViewDidScroll(_ scrollView: UIScrollView) {
         if let controller = self.controller(for: scrollView) {
             if let presentationController = self.presentationController(for: controller) {
                 let translation = -(scrollView.contentOffset.y + scrollView.contentInset.top)
@@ -35,32 +35,9 @@ public enum SPStorkController {
                     presentationController.setIndicator(style: scrollView.isTracking ? .line : .arrow)
                     if translation >= presentationController.translateForDismiss * 0.4 {
                         if !scrollView.isTracking && !scrollView.isDragging {
-                            
-                            let dismiss = {
-                                presentationController.presentedViewController.dismiss(animated: true, completion: {
-                                    presentationController.storkDelegate?.didDismissStorkBySwipe?()
-                                })
-                            }
-                            
-                            guard let confirmDelegate = presentationController.confirmDelegate else {
-                                dismiss()
-                                return
-                            }
-                            
-                            if presentationController.workConfirmation { return }
-                            
-                            if confirmDelegate.needConfirm {
-                                presentationController.workConfirmation = true
-                                confirmDelegate.confirm({ (isConfirmed) in
-                                    presentationController.workConfirmation = false
-                                    if isConfirmed {
-                                        dismiss()
-                                    }
-                                })
-                            } else {
-                                dismiss()
-                            }
-                            
+                            self.dismissWithConfirmation(controller: controller, completion: {
+                                presentationController.storkDelegate?.didDismissStorkBySwipe?()
+                            })
                             return
                         }
                     }
@@ -81,6 +58,14 @@ public enum SPStorkController {
         }
     }
     
+    static public func dismissWithConfirmation(controller: UIViewController, completion: (()->())?) {
+        if let controller = self.presentationController(for: controller) {
+            controller.dismissWithConfirmation(prepare: nil, completion: {
+                completion?()
+            })
+        }
+    }
+    
     static public var topScrollIndicatorInset: CGFloat {
         return 6
     }
@@ -98,6 +83,8 @@ public enum SPStorkController {
     }
     
     static private func presentationController(for controller: UIViewController) -> SPStorkPresentationController? {
+        guard controller.modalPresentationStyle == .custom else { return nil }
+        
         if let presentationController = controller.presentationController as? SPStorkPresentationController {
             return presentationController
         }
@@ -105,7 +92,6 @@ public enum SPStorkController {
         if let presentationController = controller.parent?.presentationController as? SPStorkPresentationController {
             return presentationController
         }
-        
         return nil
     }
     

Example/stork-controller/Frameworks/SPStorkController/TransitioningDelegate/SPStorkPresentationController.swift

@@ -50,7 +50,7 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
     private var snapshotViewTopConstraint: NSLayoutConstraint?
     private var snapshotViewWidthConstraint: NSLayoutConstraint?
     private var snapshotViewAspectRatioConstraint: NSLayoutConstraint?
-
+    
     var workConfirmation: Bool = false
     private var workGester: Bool = false
     private var startDismissing: Bool = false
@@ -105,24 +105,42 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
         
         guard let containerView = self.containerView, let presentedView = self.presentedView, let window = containerView.window  else { return }
         
+        let closeTitle = NSLocalizedString("Close", comment: "Close")
+        
         if self.showIndicator {
             self.indicatorView.color = self.indicatorColor
-            let tap = UITapGestureRecognizer.init(target: self, action: #selector(self.dismissAction))
+            let tap = UITapGestureRecognizer.init(target: self, action: #selector(self.tapIndicator))
             tap.cancelsTouchesInView = false
             self.indicatorView.addGestureRecognizer(tap)
+            self.indicatorView.accessibilityLabel = closeTitle
             presentedView.addSubview(self.indicatorView)
             self.indicatorView.translatesAutoresizingMaskIntoConstraints = false
             self.indicatorView.widthAnchor.constraint(equalToConstant: 36).isActive = true
             self.indicatorView.heightAnchor.constraint(equalToConstant: 13).isActive = true
             self.indicatorView.centerXAnchor.constraint(equalTo: presentedView.centerXAnchor).isActive = true
             self.indicatorView.topAnchor.constraint(equalTo: presentedView.topAnchor, constant: 12).isActive = true
+
+            if UIAccessibility.isVoiceOverRunning {
+                let accessibleIndicatorOverlayButton = UIButton(type: .custom)
+                accessibleIndicatorOverlayButton.addTarget(self, action: #selector(self.tapIndicator), for: .touchUpInside)
+                accessibleIndicatorOverlayButton.accessibilityLabel = closeTitle
+                presentedView.addSubview(accessibleIndicatorOverlayButton)
+                accessibleIndicatorOverlayButton.translatesAutoresizingMaskIntoConstraints = false
+                NSLayoutConstraint.activate([
+                    accessibleIndicatorOverlayButton.leadingAnchor.constraint(equalTo: presentedView.leadingAnchor),
+                    accessibleIndicatorOverlayButton.trailingAnchor.constraint(equalTo: presentedView.trailingAnchor),
+                    accessibleIndicatorOverlayButton.topAnchor.constraint(equalTo: presentedView.topAnchor),
+                    accessibleIndicatorOverlayButton.bottomAnchor.constraint(equalTo: self.indicatorView.bottomAnchor),
+                ])
+            }
         }
         self.updateLayoutIndicator()
         self.indicatorView.style = .arrow
         self.gradeView.alpha = 0
-        
+
+        self.closeButton.accessibilityLabel = closeTitle
         if self.showCloseButton {
-            self.closeButton.addTarget(self, action: #selector(self.dismissAction), for: .touchUpInside)
+            self.closeButton.addTarget(self, action: #selector(self.tapCloseButton), for: .touchUpInside)
             presentedView.addSubview(self.closeButton)
         }
         self.updateLayoutCloseButton()
@@ -209,7 +227,7 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
         self.updateSnapshotAspectRatio()
         
         if self.tapAroundToDismissEnabled {
-            self.tap = UITapGestureRecognizer.init(target: self, action: #selector(self.dismissAction))
+            self.tap = UITapGestureRecognizer.init(target: self, action: #selector(self.tapArround))
             self.tap?.cancelsTouchesInView = false
             self.snapshotViewContainer.addGestureRecognizer(self.tap!)
         }
@@ -223,21 +241,13 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
         }
     }
     
-    @objc func dismissAction() {
-        self.presentingViewController.view.endEditing(true)
-        self.presentedViewController.view.endEditing(true)
-        self.presentedViewController.dismiss(animated: true, completion: {
-            self.storkDelegate?.didDismissStorkByTap?()
-        })
-    }
-    
     override func dismissalTransitionWillBegin() {
         super.dismissalTransitionWillBegin()
         guard let containerView = containerView else { return }
         self.startDismissing = true
         
         let initialFrame: CGRect = presentingViewController.isPresentedAsStork ? presentingViewController.view.frame : containerView.bounds
-
+        
         let initialTransform = CGAffineTransform.identity
             .translatedBy(x: 0, y: -initialFrame.origin.y)
             .translatedBy(x: 0, y: self.topSpace)
@@ -314,6 +324,56 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
 
 extension SPStorkPresentationController {
     
+    @objc func tapIndicator() {
+        self.dismissWithConfirmation(prepare: nil, completion: {
+            self.storkDelegate?.didDismissStorkByTap?()
+        })
+    }
+    
+    @objc func tapArround() {
+        self.dismissWithConfirmation(prepare: nil, completion: {
+            self.storkDelegate?.didDismissStorkByTap?()
+        })
+    }
+    
+    @objc func tapCloseButton() {
+        self.dismissWithConfirmation(prepare: nil, completion: {
+            self.storkDelegate?.didDismissStorkByTap?()
+        })
+    }
+    
+    public func dismissWithConfirmation(prepare: (()->())?, completion: (()->())?) {
+        
+        let dismiss = {
+            self.presentingViewController.view.endEditing(true)
+            self.presentedViewController.view.endEditing(true)
+            self.presentedViewController.dismiss(animated: true, completion: {
+                completion?()
+            })
+        }
+        
+        guard let confirmDelegate = self.confirmDelegate else {
+            dismiss()
+            return
+        }
+        
+        if self.workConfirmation { return }
+        
+        if confirmDelegate.needConfirm {
+            prepare?()
+            self.workConfirmation = true
+            confirmDelegate.confirm({ (isConfirmed) in
+                self.workConfirmation = false
+                self.afterReleaseDismissing = false
+                if isConfirmed {
+                    dismiss()
+                }
+            })
+        } else {
+            dismiss()
+        }
+    }
+    
     @objc func handlePan(gestureRecognizer: UIPanGestureRecognizer) {
         guard gestureRecognizer.isEqual(self.pan), self.swipeToDismissEnabled else { return }
         
@@ -337,7 +397,7 @@ extension SPStorkPresentationController {
             self.workGester = false
             let translation = gestureRecognizer.translation(in: presentedView).y
             
-            let returnToDefault = {
+            let toDefault = {
                 self.indicatorView.style = .arrow
                 UIView.animate(
                     withDuration: 0.6,
@@ -352,36 +412,12 @@ extension SPStorkPresentationController {
                 })
             }
             
-            let dismissBySwipe = {
-                self.presentedViewController.dismiss(animated: true, completion: {
+            if translation >= self.translateForDismiss {
+                self.dismissWithConfirmation(prepare: toDefault, completion: {
                     self.storkDelegate?.didDismissStorkBySwipe?()
                 })
-            }
-            
-            if translation >= self.translateForDismiss {
-                
-                guard let confirmDelegate = self.confirmDelegate else {
-                    dismissBySwipe()
-                    return
-                }
-                
-                if self.workConfirmation { return }
-                
-                if confirmDelegate.needConfirm {
-                    returnToDefault()
-                    self.workConfirmation = true
-                    confirmDelegate.confirm({ (isConfirmed) in
-                        self.workConfirmation = false
-                        self.afterReleaseDismissing = false
-                        if isConfirmed {
-                            dismissBySwipe()
-                        }
-                    })
-                } else {
-                    dismissBySwipe()
-                }
             } else {
-                returnToDefault()
+                toDefault()
             }
         default:
             break
@@ -432,7 +468,7 @@ extension SPStorkPresentationController {
         
         let elasticThreshold: CGFloat = 120
         let translationFactor: CGFloat = 1 / 2
-
+        
         if translation >= 0 {
             let translationForModal: CGFloat = {
                 if translation >= elasticThreshold {

Example/stork-controller/Frameworks/SparrowKit/Extension/SPUIViewExtenshion.swift

@@ -21,6 +21,21 @@
 
 import UIKit
 
+extension UIView {
+    
+    var isDarkMode: Bool {
+        if #available(iOS 12.0, *) {
+            if self.traitCollection.userInterfaceStyle == .dark {
+                return true
+            } else {
+                return false
+            }
+        } else {
+            return false
+        }
+    }
+}
+
 extension UIView {
     
     var viewController: UIViewController? {

Example/stork-controller/Frameworks/SparrowKit/Notification/SPLocalNotification.swift

@@ -63,7 +63,7 @@ struct SPLocalNotification {
         
         if let category = self.category {
             if #available(iOS 12.0, *) {
-                let notificationCategory = UNNotificationCategory(identifier: category.identifier, actions: [], intentIdentifiers: [], hiddenPreviewsBodyPlaceholder: nil, categorySummaryFormat: category.summary, options: [])
+                let notificationCategory = UNNotificationCategory(identifier: category.identifier, actions: category.actions, intentIdentifiers: [], hiddenPreviewsBodyPlaceholder: nil, categorySummaryFormat: category.summary, options: [])
                 UNUserNotificationCenter.current().setNotificationCategories([notificationCategory])
                 content.categoryIdentifier = notificationCategory.identifier
             }
@@ -81,6 +81,7 @@ struct SPLocalNotificationCategory {
     
     var identifier: String
     var summary: String
+    var actions: [UNNotificationAction] = []
     
     static var countSymbol: String {
         return "%u"

Example/stork-controller/Frameworks/SparrowKit/UI/Other/SPFooterButtonsView.swift

@@ -24,8 +24,9 @@ import UIKit
 class SPFooterActionsView: SPView {
     
     var sectionLabels = SPSectionLabelsView()
-    private var buttons: [SPFooterActionButton] = []
-    private var separators: [SPSeparatorView] = []
+    
+    var buttons: [SPFooterActionButton] = []
+    var separators: [SPSeparatorView] = []
     
     override func commonInit() {
         super.commonInit()

Example/stork-controller/ModalTableViewController.swift

@@ -49,7 +49,7 @@ class ModalTableViewController: UIViewController {
     }
     
     @objc func dismissAction() {
-        self.dismiss()
+        SPStorkController.dismissWithConfirmation(controller: self, completion: nil)
     }
 }
 
@@ -86,7 +86,6 @@ extension ModalTableViewController: SPStorkControllerConfirmDelegate {
     }
     
     func confirm(_ completion: @escaping (Bool) -> ()) {
-        print("confirm")
         let alertController = UIAlertController(title: "Need dismiss?", message: "It test confirm option for SPStorkController", preferredStyle: .actionSheet)
         alertController.addDestructiveAction(title: "Confirm", complection: {
             completion(true)

Example/stork-controller/ModalViewController.swift

@@ -20,7 +20,7 @@ class ModalViewController: UIViewController {
     }
     
     @objc func dismissAction() {
-        self.dismiss()
+        SPStorkController.dismissWithConfirmation(controller: self, completion: nil)
     }
     
     override func viewWillAppear(_ animated: Bool) {

README.md

@@ -17,20 +17,24 @@ If you like the project, do not forget to `put star ★` and follow me on GitHub
 
 - [Requirements](#requirements)
 - [Installation](#installation)
+    - [CocoaPods](#cocoapods)
+    - [Carthage](#carthage)
+    - [Swift Package Manager](#swift-package-manager)
+    - [Manually](#manually)
 - [Quick Start](#quick-start)
 - [Usage](#usage)
     - [Light StatusBar](#light-statusbar)
     - [Custom Height](#custom-height)
     - [Close Button](#close-button)
-    - [Indicator](#indicator)
+    - [Arrow Indicator](#arrow-indicator)
     - [Dismissing](#dismissing)
     - [Corner Radius](#corner-radius)
     - [Haptic](#haptic)
     - [Snapshots](#snapshots)
-    - [Add Navigation Bar](#add-navigation-bar)
+    - [Navigation Bar](#navigation-bar)
     - [Working with UIScrollView](#working-with-uiscrollview)
     - [UITableView & UICollectionView](#working-with-uitableview--uicollectionview)
-    - [Confirm](#confirm)
+    - [Confirm before dismiss](#confirm-before-dismiss)
     - [Delegate](#delegate)
     - [Storyboard](#storyboard)
 - [Sheets in iOS 13](#sheets-in-ios-13)
@@ -148,7 +152,7 @@ Property `showCloseButton` added circle button with dismiss action. Default is `
 transitionDelegate.showCloseButton = false
 ```
 
-### Indicator
+### Arrow Indicator
 
 On the top of controller you can add arrow indicator with animatable states. It simple configure.
 Property `showIndicator` shows or hides top arrow indicator. Default is `true`:
@@ -216,7 +220,13 @@ SPStorkController.updatePresentingController(modal: controller)
 
 and pass the controller, which is modal and uses `SPStorkTransitioningDelegate`.
 
-### Add Navigation Bar
+If the parent controller scrollings and you try to show `SPStorkController`, you will see how it froze, and in a second its final position is updated. I recommend before present `SPStorkController`  stop scrolling force:
+
+```swift 
+scrollView.setContentOffset(self.contentOffset, animated: false)
+```
+
+### Navigation Bar
 
 You may want to add a navigation bar to your modal controller. Since it became impossible to change or customize the native controller in swift 4 (I couldn’t even find a way to change the height of the bar), I had to recreate navigation bar from the ground up. Visually it looks real, but it doesn’t execute the necessary functions:
 
@@ -275,9 +285,9 @@ tableView.scrollIndicatorInsets.top = self.navBar.height
 
 Please, also use `SPStorkController.scrollViewDidScroll` function in scroll delegate for more interactiveness with your collection or table view.
 
-### Confirm
+### Confirm before dismiss
 
-For confirm closing by swipe, use `SPStorkControllerConfirmDelegate`. Implenet protocol:
+For confirm closing by swipe, tap around, close button and indicator use `SPStorkControllerConfirmDelegate`. Implenet protocol:
 
 ```swift
 @objc public protocol SPStorkControllerConfirmDelegate: class {
@@ -288,7 +298,15 @@ For confirm closing by swipe, use `SPStorkControllerConfirmDelegate`. Implenet p
 }
 ```
 
-and set `confirmDelegate` property to object, which protocol impleneted. Function `confirm` call if `needConfirm` set to `true` and controller try closing by swipe. Pass `isConfirmed` with result. Best options use `UIAlertController` with `.actionSheet` style for confirmation.
+and set `confirmDelegate` property to object, which protocol impleneted. Function `confirm` call if `needConfirm` return true. Pass `isConfirmed` with result. Best options use `UIAlertController` with `.actionSheet` style for confirmation.
+
+If you use custom buttons, in the target use this code:
+
+```swift
+SPStorkController.dismissWithConfirmation(controller: self, completion: nil)
+```
+
+It call `confirm` func and check result of confirmation. See example project for more details.
 
 ### Delegate
 
@@ -341,14 +359,6 @@ controller.modalPresentationStyle = .custom
 
 It’s needed for correct presentation and dismissal of all modal controllers.
 
-### Stop scroll
-
-`SPStorkController` use snapshots. If the parent controller scrollings and you try to show `SPStorkController`, you will see how it froze, and in a second its final position is updated. I recommend to stop scrolling force:
-
-```swift 
-scrollView.setContentOffset(self.contentOffset, animated: false)
-```
-
 ## Sheets in iOS 13
 
 Apple present in `WWDC 2019` new modal presentation style - `Sheets`. It ready use Support interactive dismiss and work with navigations bars. Available since iOS 13. I will add more information when I study this in more detail. You can see presentation [here](https://developer.apple.com/videos/play/wwdc2019/224/).

SPStorkController.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name          = "SPStorkController"
-  s.version       = "1.7.1"
+  s.version       = "1.7.7"
   s.summary       = "Very similar to the controllers displayed in Apple Music, Podcasts and Mail Apple's applications."
   s.homepage      = "https://github.com/IvanVorobei/SPStorkController"
   s.source        = { :git => "https://github.com/IvanVorobei/SPStorkController.git", :tag => s.version }

Source/SPStorkController/SPStorkController.swift

@@ -23,7 +23,7 @@ import UIKit
 
 public enum SPStorkController {
     
-    static public func scrollViewDidScroll(_ scrollView: UIScrollView, indicatorInset: CGFloat? = nil) {
+    static public func scrollViewDidScroll(_ scrollView: UIScrollView) {
         if let controller = self.controller(for: scrollView) {
             if let presentationController = self.presentationController(for: controller) {
                 let translation = -(scrollView.contentOffset.y + scrollView.contentInset.top)
@@ -35,32 +35,9 @@ public enum SPStorkController {
                     presentationController.setIndicator(style: scrollView.isTracking ? .line : .arrow)
                     if translation >= presentationController.translateForDismiss * 0.4 {
                         if !scrollView.isTracking && !scrollView.isDragging {
-                            
-                            let dismiss = {
-                                presentationController.presentedViewController.dismiss(animated: true, completion: {
-                                    presentationController.storkDelegate?.didDismissStorkBySwipe?()
-                                })
-                            }
-                            
-                            guard let confirmDelegate = presentationController.confirmDelegate else {
-                                dismiss()
-                                return
-                            }
-                            
-                            if presentationController.workConfirmation { return }
-                            
-                            if confirmDelegate.needConfirm {
-                                presentationController.workConfirmation = true
-                                confirmDelegate.confirm({ (isConfirmed) in
-                                    presentationController.workConfirmation = false
-                                    if isConfirmed {
-                                        dismiss()
-                                    }
-                                })
-                            } else {
-                                dismiss()
-                            }
-                            
+                            self.dismissWithConfirmation(controller: controller, completion: {
+                                presentationController.storkDelegate?.didDismissStorkBySwipe?()
+                            })
                             return
                         }
                     }
@@ -81,6 +58,14 @@ public enum SPStorkController {
         }
     }
     
+    static public func dismissWithConfirmation(controller: UIViewController, completion: (()->())?) {
+        if let controller = self.presentationController(for: controller) {
+            controller.dismissWithConfirmation(prepare: nil, completion: {
+                completion?()
+            })
+        }
+    }
+    
     static public var topScrollIndicatorInset: CGFloat {
         return 6
     }
@@ -98,6 +83,8 @@ public enum SPStorkController {
     }
     
     static private func presentationController(for controller: UIViewController) -> SPStorkPresentationController? {
+        guard controller.modalPresentationStyle == .custom else { return nil }
+        
         if let presentationController = controller.presentationController as? SPStorkPresentationController {
             return presentationController
         }
@@ -105,7 +92,6 @@ public enum SPStorkController {
         if let presentationController = controller.parent?.presentationController as? SPStorkPresentationController {
             return presentationController
         }
-        
         return nil
     }
     

Source/SPStorkController/TransitioningDelegate/SPStorkPresentationController.swift

@@ -50,7 +50,7 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
     private var snapshotViewTopConstraint: NSLayoutConstraint?
     private var snapshotViewWidthConstraint: NSLayoutConstraint?
     private var snapshotViewAspectRatioConstraint: NSLayoutConstraint?
-
+    
     var workConfirmation: Bool = false
     private var workGester: Bool = false
     private var startDismissing: Bool = false
@@ -105,24 +105,42 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
         
         guard let containerView = self.containerView, let presentedView = self.presentedView, let window = containerView.window  else { return }
         
+        let closeTitle = NSLocalizedString("Close", comment: "Close")
+        
         if self.showIndicator {
             self.indicatorView.color = self.indicatorColor
-            let tap = UITapGestureRecognizer.init(target: self, action: #selector(self.dismissAction))
+            let tap = UITapGestureRecognizer.init(target: self, action: #selector(self.tapIndicator))
             tap.cancelsTouchesInView = false
             self.indicatorView.addGestureRecognizer(tap)
+            self.indicatorView.accessibilityLabel = closeTitle
             presentedView.addSubview(self.indicatorView)
             self.indicatorView.translatesAutoresizingMaskIntoConstraints = false
             self.indicatorView.widthAnchor.constraint(equalToConstant: 36).isActive = true
             self.indicatorView.heightAnchor.constraint(equalToConstant: 13).isActive = true
             self.indicatorView.centerXAnchor.constraint(equalTo: presentedView.centerXAnchor).isActive = true
             self.indicatorView.topAnchor.constraint(equalTo: presentedView.topAnchor, constant: 12).isActive = true
+
+            if UIAccessibility.isVoiceOverRunning {
+                let accessibleIndicatorOverlayButton = UIButton(type: .custom)
+                accessibleIndicatorOverlayButton.addTarget(self, action: #selector(self.tapIndicator), for: .touchUpInside)
+                accessibleIndicatorOverlayButton.accessibilityLabel = closeTitle
+                presentedView.addSubview(accessibleIndicatorOverlayButton)
+                accessibleIndicatorOverlayButton.translatesAutoresizingMaskIntoConstraints = false
+                NSLayoutConstraint.activate([
+                    accessibleIndicatorOverlayButton.leadingAnchor.constraint(equalTo: presentedView.leadingAnchor),
+                    accessibleIndicatorOverlayButton.trailingAnchor.constraint(equalTo: presentedView.trailingAnchor),
+                    accessibleIndicatorOverlayButton.topAnchor.constraint(equalTo: presentedView.topAnchor),
+                    accessibleIndicatorOverlayButton.bottomAnchor.constraint(equalTo: self.indicatorView.bottomAnchor),
+                ])
+            }
         }
         self.updateLayoutIndicator()
         self.indicatorView.style = .arrow
         self.gradeView.alpha = 0
-        
+
+        self.closeButton.accessibilityLabel = closeTitle
         if self.showCloseButton {
-            self.closeButton.addTarget(self, action: #selector(self.dismissAction), for: .touchUpInside)
+            self.closeButton.addTarget(self, action: #selector(self.tapCloseButton), for: .touchUpInside)
             presentedView.addSubview(self.closeButton)
         }
         self.updateLayoutCloseButton()
@@ -209,7 +227,7 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
         self.updateSnapshotAspectRatio()
         
         if self.tapAroundToDismissEnabled {
-            self.tap = UITapGestureRecognizer.init(target: self, action: #selector(self.dismissAction))
+            self.tap = UITapGestureRecognizer.init(target: self, action: #selector(self.tapArround))
             self.tap?.cancelsTouchesInView = false
             self.snapshotViewContainer.addGestureRecognizer(self.tap!)
         }
@@ -223,21 +241,13 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
         }
     }
     
-    @objc func dismissAction() {
-        self.presentingViewController.view.endEditing(true)
-        self.presentedViewController.view.endEditing(true)
-        self.presentedViewController.dismiss(animated: true, completion: {
-            self.storkDelegate?.didDismissStorkByTap?()
-        })
-    }
-    
     override func dismissalTransitionWillBegin() {
         super.dismissalTransitionWillBegin()
         guard let containerView = containerView else { return }
         self.startDismissing = true
         
         let initialFrame: CGRect = presentingViewController.isPresentedAsStork ? presentingViewController.view.frame : containerView.bounds
-
+        
         let initialTransform = CGAffineTransform.identity
             .translatedBy(x: 0, y: -initialFrame.origin.y)
             .translatedBy(x: 0, y: self.topSpace)
@@ -314,6 +324,56 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
 
 extension SPStorkPresentationController {
     
+    @objc func tapIndicator() {
+        self.dismissWithConfirmation(prepare: nil, completion: {
+            self.storkDelegate?.didDismissStorkByTap?()
+        })
+    }
+    
+    @objc func tapArround() {
+        self.dismissWithConfirmation(prepare: nil, completion: {
+            self.storkDelegate?.didDismissStorkByTap?()
+        })
+    }
+    
+    @objc func tapCloseButton() {
+        self.dismissWithConfirmation(prepare: nil, completion: {
+            self.storkDelegate?.didDismissStorkByTap?()
+        })
+    }
+    
+    public func dismissWithConfirmation(prepare: (()->())?, completion: (()->())?) {
+        
+        let dismiss = {
+            self.presentingViewController.view.endEditing(true)
+            self.presentedViewController.view.endEditing(true)
+            self.presentedViewController.dismiss(animated: true, completion: {
+                completion?()
+            })
+        }
+        
+        guard let confirmDelegate = self.confirmDelegate else {
+            dismiss()
+            return
+        }
+        
+        if self.workConfirmation { return }
+        
+        if confirmDelegate.needConfirm {
+            prepare?()
+            self.workConfirmation = true
+            confirmDelegate.confirm({ (isConfirmed) in
+                self.workConfirmation = false
+                self.afterReleaseDismissing = false
+                if isConfirmed {
+                    dismiss()
+                }
+            })
+        } else {
+            dismiss()
+        }
+    }
+    
     @objc func handlePan(gestureRecognizer: UIPanGestureRecognizer) {
         guard gestureRecognizer.isEqual(self.pan), self.swipeToDismissEnabled else { return }
         
@@ -337,7 +397,7 @@ extension SPStorkPresentationController {
             self.workGester = false
             let translation = gestureRecognizer.translation(in: presentedView).y
             
-            let returnToDefault = {
+            let toDefault = {
                 self.indicatorView.style = .arrow
                 UIView.animate(
                     withDuration: 0.6,
@@ -352,36 +412,12 @@ extension SPStorkPresentationController {
                 })
             }
             
-            let dismissBySwipe = {
-                self.presentedViewController.dismiss(animated: true, completion: {
+            if translation >= self.translateForDismiss {
+                self.dismissWithConfirmation(prepare: toDefault, completion: {
                     self.storkDelegate?.didDismissStorkBySwipe?()
                 })
-            }
-            
-            if translation >= self.translateForDismiss {
-                
-                guard let confirmDelegate = self.confirmDelegate else {
-                    dismissBySwipe()
-                    return
-                }
-                
-                if self.workConfirmation { return }
-                
-                if confirmDelegate.needConfirm {
-                    returnToDefault()
-                    self.workConfirmation = true
-                    confirmDelegate.confirm({ (isConfirmed) in
-                        self.workConfirmation = false
-                        self.afterReleaseDismissing = false
-                        if isConfirmed {
-                            dismissBySwipe()
-                        }
-                    })
-                } else {
-                    dismissBySwipe()
-                }
             } else {
-                returnToDefault()
+                toDefault()
             }
         default:
             break
@@ -432,7 +468,7 @@ extension SPStorkPresentationController {
         
         let elasticThreshold: CGFloat = 120
         let translationFactor: CGFloat = 1 / 2
-
+        
         if translation >= 0 {
             let translationForModal: CGFloat = {
                 if translation >= elasticThreshold {