Update SPStorkController.podspec

Also update example project

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,7 +35,7 @@ public enum SPStorkController {
                     presentationController.setIndicator(style: scrollView.isTracking ? .line : .arrow)
                     if translation >= presentationController.translateForDismiss * 0.4 {
                         if !scrollView.isTracking && !scrollView.isDragging {
-                            presentationController.dismissWithConfirmation(prepare: nil, completion: {
+                            self.dismissWithConfirmation(controller: controller, completion: {
                                 presentationController.storkDelegate?.didDismissStorkBySwipe?()
                             })
                             return
@@ -58,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
     }

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

@@ -105,22 +105,40 @@ 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.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.tapCloseButton), for: .touchUpInside)
             presentedView.addSubview(self.closeButton)

Example/stork-controller/ModalTableViewController.swift

@@ -49,11 +49,7 @@ class ModalTableViewController: UIViewController {
     }
     
     @objc func dismissAction() {
-        if let storkPresentationController = self.presentationController as? SPStorkPresentationController {
-            storkPresentationController.dismissWithConfirmation(prepare: nil, completion: {
-                print("Custom completion for confirmation. Confirmation is optional.")
-            })
-        }
+        SPStorkController.dismissWithConfirmation(controller: self, completion: nil)
     }
 }
 

Example/stork-controller/ModalViewController.swift

@@ -20,11 +20,7 @@ class ModalViewController: UIViewController {
     }
     
     @objc func dismissAction() {
-        if let storkPresentationController = self.presentationController as? SPStorkPresentationController {
-            storkPresentationController.dismissWithConfirmation(prepare: nil, completion: {
-                print("Custom completion for confirmation. Confirmation is optional.")
-            })
-        }
+        SPStorkController.dismissWithConfirmation(controller: self, completion: nil)
     }
     
     override func viewWillAppear(_ animated: Bool) {

README.md

@@ -277,7 +277,7 @@ Please, also use `SPStorkController.scrollViewDidScroll` function in scroll dele
 
 ### Confirm
 
-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 +288,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
 

SPStorkController.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name          = "SPStorkController"
-  s.version       = "1.7.2"
+  s.version       = "1.7.6"
   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,7 +35,7 @@ public enum SPStorkController {
                     presentationController.setIndicator(style: scrollView.isTracking ? .line : .arrow)
                     if translation >= presentationController.translateForDismiss * 0.4 {
                         if !scrollView.isTracking && !scrollView.isDragging {
-                            presentationController.dismissWithConfirmation(prepare: nil, completion: {
+                            self.dismissWithConfirmation(controller: controller, completion: {
                                 presentationController.storkDelegate?.didDismissStorkBySwipe?()
                             })
                             return
@@ -58,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
     }

Source/SPStorkController/TransitioningDelegate/SPStorkPresentationController.swift

@@ -105,22 +105,40 @@ 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.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.tapCloseButton), for: .touchUpInside)
             presentedView.addSubview(self.closeButton)