Update SPStorkController.podspec

for update translation for scroll when presentng controller

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

@@ -28,6 +28,7 @@ public struct SPStorkController {
             if let presentationController = controller.presentationController as? SPStorkPresentationController {
                 let translation = -(scrollView.contentOffset.y + scrollView.contentInset.top)
                 if translation >= 0 {
+                    if controller.isBeingPresented { return }
                     scrollView.subviews.forEach {
                         $0.transform = CGAffineTransform(translationX: 0, y: -translation)
                     }

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

@@ -23,11 +23,13 @@ import UIKit
 
 class SPStorkPresentationController: UIPresentationController, UIGestureRecognizerDelegate {
     
-    var isSwipeToDismissEnabled: Bool = true
-    var isTapAroundToDismissEnabled: Bool = true
+    var swipeToDismissEnabled: Bool = true
+    var tapAroundToDismissEnabled: Bool = true
     var showIndicator: Bool = true
     var indicatorColor: UIColor = UIColor.init(red: 202/255, green: 201/255, blue: 207/255, alpha: 1)
     var customHeight: CGFloat? = nil
+    var translateForDismiss: CGFloat = 240
+    
     var transitioningDelegate: SPStorkTransitioningDelegate?
     
     var pan: UIPanGestureRecognizer?
@@ -84,7 +86,7 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
         
         if self.showIndicator {
             self.indicatorView.color = self.indicatorColor
-            let tap = UITapGestureRecognizer.init(target: self, action: #selector(self.handleTap))
+            let tap = UITapGestureRecognizer.init(target: self, action: #selector(self.dismissAction))
             tap.cancelsTouchesInView = false
             self.indicatorView.addGestureRecognizer(tap)
             presentedView.addSubview(self.indicatorView)
@@ -169,13 +171,13 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
         self.snapshotViewContainer.centerXAnchor.constraint(equalTo: containerView.centerXAnchor).isActive = true
         self.updateSnapshotAspectRatio()
         
-        if self.isTapAroundToDismissEnabled {
-            self.tap = UITapGestureRecognizer.init(target: self, action: #selector(self.handleTap))
+        if self.tapAroundToDismissEnabled {
+            self.tap = UITapGestureRecognizer.init(target: self, action: #selector(self.dismissAction))
             self.tap?.cancelsTouchesInView = false
             self.snapshotViewContainer.addGestureRecognizer(self.tap!)
         }
         
-        if self.isSwipeToDismissEnabled {
+        if self.swipeToDismissEnabled {
             self.pan = UIPanGestureRecognizer(target: self, action: #selector(self.handlePan))
             self.pan!.delegate = self
             self.pan!.maximumNumberOfTouches = 1
@@ -184,7 +186,9 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
         }
     }
     
-    @objc func handleTap() {
+    @objc func dismissAction() {
+        self.presentingViewController.view.endEditing(true)
+        self.presentedViewController.view.endEditing(true)
         self.presentedViewController.dismiss(animated: true, completion: nil)
     }
     
@@ -266,7 +270,7 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
 extension SPStorkPresentationController {
     
     @objc func handlePan(gestureRecognizer: UIPanGestureRecognizer) {
-        guard gestureRecognizer.isEqual(pan), self.isSwipeToDismissEnabled else { return }
+        guard gestureRecognizer.isEqual(self.pan), self.swipeToDismissEnabled else { return }
         
         switch gestureRecognizer.state {
         case .began:
@@ -278,7 +282,7 @@ extension SPStorkPresentationController {
             gestureRecognizer.setTranslation(CGPoint(x: 0, y: 0), in: containerView)
         case .changed:
             self.workGester = true
-            if self.isSwipeToDismissEnabled {
+            if self.swipeToDismissEnabled {
                 let translation = gestureRecognizer.translation(in: presentedView)
                 self.updatePresentedViewForTranslation(inVerticalDirection: translation.y)
             } else {
@@ -287,7 +291,7 @@ extension SPStorkPresentationController {
         case .ended:
             self.workGester = false
             let translation = gestureRecognizer.translation(in: presentedView).y
-            if translation >= 240 {
+            if translation >= self.translateForDismiss {
                 presentedViewController.dismiss(animated: true, completion: nil)
             } else {
                 self.indicatorView.style = .arrow

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

@@ -31,10 +31,16 @@ final class SPStorkPresentingAnimationController: NSObject, UIViewControllerAnim
         
         let containerView = transitionContext.containerView
         containerView.addSubview(presentedViewController.view)
-        presentedViewController.view.frame = CGRect(x: 0, y: containerView.bounds.height, width: containerView.bounds.width, height: containerView.bounds.height)
+        
+        //presentedViewController.view.frame = CGRect(x: 0, y: containerView.bounds.height, width: containerView.bounds.width, height: containerView.bounds.height)
         
         let finalFrameForPresentedView = transitionContext.finalFrame(for: presentedViewController)
         
+        // NEW FRAMING: Testing now. Maybe correct. If remove it lines, init frame of controller will be equal container (not stork)
+        presentedViewController.view.frame = finalFrameForPresentedView
+        presentedViewController.view.frame.origin.y = containerView.bounds.height
+        // END NEW.
+        
         UIView.animate(
             withDuration: transitionDuration(using: transitionContext),
             delay: 0,

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

@@ -23,19 +23,21 @@ import UIKit
 
 public final class SPStorkTransitioningDelegate: NSObject, UIViewControllerTransitioningDelegate {
     
-    public var isSwipeToDismissEnabled: Bool = true
-    public var isTapAroundToDismissEnabled: Bool = true
+    public var swipeToDismissEnabled: Bool = true
+    public var tapAroundToDismissEnabled: Bool = true
     public var showIndicator: Bool = true
     public var indicatorColor: UIColor = UIColor.init(red: 202/255, green: 201/255, blue: 207/255, alpha: 1)
     public var customHeight: CGFloat? = nil
+    public var translateForDismiss: CGFloat = 240
     
     public func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
         let controller = SPStorkPresentationController(presentedViewController: presented, presenting: presenting)
-        controller.isSwipeToDismissEnabled = self.isSwipeToDismissEnabled
-        controller.isTapAroundToDismissEnabled = self.isTapAroundToDismissEnabled
+        controller.swipeToDismissEnabled = self.swipeToDismissEnabled
+        controller.tapAroundToDismissEnabled = self.tapAroundToDismissEnabled
         controller.showIndicator = self.showIndicator
         controller.indicatorColor = self.indicatorColor
         controller.customHeight = self.customHeight
+        controller.translateForDismiss = self.translateForDismiss
         controller.transitioningDelegate = self
         return controller
     }

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

@@ -29,10 +29,12 @@ extension UIViewController {
             && presentingViewController != nil
     }
     
-    public func presentAsStork(_ controller: UIViewController, complection: (() -> Void)? = nil) {
+    public func presentAsStork(_ controller: UIViewController, height: CGFloat? = nil, complection: (() -> Void)? = nil) {
         let transitionDelegate = SPStorkTransitioningDelegate()
+        transitionDelegate.customHeight = height
         controller.transitioningDelegate = transitionDelegate
         controller.modalPresentationStyle = .custom
+        controller.modalPresentationCapturesStatusBarAppearance = true
         self.present(controller, animated: true, completion: complection)
     }
 }

Example/stork-controller/Frameworks/SparrowKit/UI/Buttons/SPButton.swift

@@ -59,4 +59,16 @@ public class SPButton: UIButton {
             self.round()
         }
     }
+    
+    public func set(enable: Bool, animatable: Bool) {
+        self.isEnabled = enable
+        if animatable {
+            SPAnimation.animate(0.3, animations: {
+                self.alpha = enable ? 1 : 0.6
+            })
+        } else {
+            self.alpha = enable ? 1 : 0.6
+        }
+        
+    }
 }

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

@@ -54,11 +54,11 @@ public class SPFakeBarView: UIView {
         }
     }
     
-    public var closeButton: closeButtonPlace = .none {
+    public var closeButtonPossition: CloseButtonPosition = .none {
         didSet {
             self.leftButton.titleLabel?.font = UIFont.system(type: .Regular, size: 17)
             self.rightButton.titleLabel?.font = UIFont.system(type: .Regular, size: 17)
-            switch self.closeButton {
+            switch self.closeButtonPossition {
             case .left:
                 self.leftButton.titleLabel?.font = UIFont.system(type: .DemiBold, size: 17)
             case .right:
@@ -145,7 +145,7 @@ public class SPFakeBarView: UIView {
         self.rightButton.trailingAnchor.constraint(equalTo: self.trailingAnchor).isActive = true
         self.rightButton.bottomAnchor.constraint(equalTo: self.bottomAnchor, constant: -12).isActive = true
         
-        self.closeButton = .none
+        self.closeButtonPossition = .none
         
         self.setContraints()
         self.updateStyle()
@@ -215,7 +215,7 @@ public class SPFakeBarView: UIView {
         self.updateConstraints()
     }
     
-    public enum closeButtonPlace {
+    public enum CloseButtonPosition {
         case left
         case right
         case none

README.md

@@ -63,6 +63,10 @@ controller.transitioningDelegate = SPStorkTransitioningDelegate()
 
 You will get an error about weak property.
 
+### Need help
+
+Please, see [this issue](https://github.com/IvanVorobei/SPStorkController/issues/30). Bug with work table. Need help for fix it and update project. 
+
 ### Video Tutorial
 
 You can see how to use `SPStorkController` and how to customize it [in this video](https://youtu.be/wOTNGswT2-0). For English speakers I’ve added subtitles, don’t forget to turn them on:

SPStorkController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "SPStorkController"
-  s.version       = "1.4.4"
+  s.version       = "1.4.5"
   s.summary       = "Modal controller as mail or Apple music application"
   s.homepage      = "https://github.com/IvanVorobei/SPStorkController"
   s.source        = { :git => "https://github.com/IvanVorobei/SPStorkController.git", :tag => s.version }

Source/SPStorkController/SPStorkController.swift

@@ -28,6 +28,7 @@ public struct SPStorkController {
             if let presentationController = controller.presentationController as? SPStorkPresentationController {
                 let translation = -(scrollView.contentOffset.y + scrollView.contentInset.top)
                 if translation >= 0 {
+                    if controller.isBeingPresented { return }
                     scrollView.subviews.forEach {
                         $0.transform = CGAffineTransform(translationX: 0, y: -translation)
                     }