Update to 1.5.6

Add events delegate

README.md

@@ -6,7 +6,7 @@ Preview GIF is loading `3mb`. Please, wait.
 
 <img src="https://github.com/IvanVorobei/SPStorkController/blob/master/Resources/Preview.gif" width="500">
 
-You can download example [from AppStore](https://itunes.apple.com/app/id1446635818). Also in the app you can donate me a cup of coffee. If you want to buy source code of the app shown on the GIF above, please go to [xcode-shop.com](https://xcode-shop.com). Price: $200.
+You can download example [from AppStore](https://itunes.apple.com/app/id1446635818) or see [video preview](https://xcode-shop.com/assets/preview/debts.mov). If you want to buy source code of the full app (plus app for Apple Watch), please go to [xcode-shop.com](https://xcode-shop.com). Price: $200 only GitHub users!
 
 <img src="https://github.com/IvanVorobei/SPStorkController/blob/master/Resources/Shop.svg"/>
 
@@ -120,6 +120,11 @@ transitionDelegate.showIndicator = true
 transitionDelegate.indicatorColor = UIColor.white
 ```
 
+- Parameter `hideIndicatorWhenScroll` shows or hides indicator when scrolling. Default is `false`:
+```swift
+transitionDelegate.hideIndicatorWhenScroll = true
+```
+
 - Parameter `cornerRadius` for customize corner radius of controller's view. Default is `10`:
 ```swift
 transitionDelegate.cornerRadius = 10
@@ -140,6 +145,7 @@ You may want to add a navigation bar to your modal controller. Since it became i
 
 ```swift
 import UIKit
+import SPFakeBar
 
 class ModalController: UIViewController {
     
@@ -163,10 +169,10 @@ You only need to add a navigation bar to the main view, it will automatically la
 
 <img src="https://github.com/IvanVorobei/SPStorkController/blob/master/Resources/Navigation%20Bar.jpg"/>
 
-To use `SPFakeBarView` you need to install [SparrowKit](https://github.com/IvanVorobei/SparrowKit) pod: 
+To use `SPFakeBarView` you need to install [SPFakeBar](https://github.com/IvanVorobei/SPFakeBar) pod: 
 
 ```ruby
-pod 'SparrowKit'
+pod 'SPFakeBar'
 ```
 
 ### Working with UIScrollView
@@ -192,6 +198,14 @@ tableView.scrollIndicatorInsets.top = self.navBar.height
 
 Please, also use `SPStorkController.scrollViewDidScroll` function in scroll delegate for more interactiveness with your collection or table view.
 
+### Delegate
+
+You can check events by implement `SPStorkControllerDelegate` and set delegate for `transitionDelegate`:
+
+```swift
+transitionDelegate.storkDelegate = self
+```
+
 ### Modal presentation of different controller
 
 If you want to present modal controller on SPStorkController, please set:
@@ -211,13 +225,6 @@ Project [SPPermission](https://github.com/IvanVorobei/SPPermission) for managing
 
 <img src="https://github.com/IvanVorobei/SPPermission/blob/master/Resources/Preview.gif" width="500">
 
-### SparrowKit
-`SPStorkController` was formerly a part of [SparrowKit](https://github.com/IvanVorobei/SparrowKit) library. In the library you can find many useful extensions & classes. To install via CocoaPods use:
-
-```ruby
-pod 'SparrowKit'
-```
-
 ## License
 `SPStorkController` is released under the MIT license. Check `LICENSE.md` for details.
 

SPStorkController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "SPStorkController"
-  s.version       = "1.5.2"
+  s.version       = "1.5.6"
   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/Protocols/SPStorkControllerDelegate.swift

@@ -0,0 +1,29 @@
+// The MIT License (MIT)
+// Copyright © 2017 Ivan Vorobei (hello@ivanvorobei.by)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import UIKit
+
+@objc public protocol SPStorkControllerDelegate: class {
+    
+    @objc optional func didDismissStorkBySwipe()
+    
+    @objc optional func didDismissStorkByTap()
+}

Source/SPStorkController/SPStorkController.swift

@@ -35,7 +35,9 @@ public struct SPStorkController {
                     presentationController.setIndicator(style: scrollView.isTracking ? .line : .arrow)
                     if translation >= presentationController.translateForDismiss * 0.4 {
                         if !scrollView.isTracking && !scrollView.isDragging {
-                            presentationController.presentedViewController.dismiss(animated: true, completion: nil)
+                            presentationController.presentedViewController.dismiss(animated: true, completion: {
+                                presentationController.storkDelegate?.didDismissStorkBySwipe?()
+                            })
                             return
                         }
                     }
@@ -46,6 +48,12 @@ public struct SPStorkController {
                     presentationController.setIndicator(style: .arrow)
                     presentationController.scrollViewDidScroll(0)
                 }
+                
+                if translation < -15 {
+                    presentationController.setIndicator(visible: false)
+                } else {
+                    presentationController.setIndicator(visible: true)
+                }
             }
         }
     }

Source/SPStorkController/TransitioningDelegate/SPStorkDismissingAnimationController.swift

@@ -29,8 +29,10 @@ final class SPStorkDismissingAnimationController: NSObject, UIViewControllerAnim
             return
         }
 
+        let finalFrameForPresentedView = transitionContext.finalFrame(for: presentedViewController)
+        
         let containerView = transitionContext.containerView
-        let offscreenFrame = CGRect(x: 0, y: containerView.bounds.height, width: containerView.bounds.width, height: containerView.bounds.height)
+        let offscreenFrame = CGRect(x: 0, y: containerView.bounds.height, width: finalFrameForPresentedView.width, height: finalFrameForPresentedView.height)
         
         UIView.animate(
             withDuration: transitionDuration(using: transitionContext),

Source/SPStorkController/TransitioningDelegate/SPStorkPresentationController.swift

@@ -27,10 +27,12 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
     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 hideIndicatorWhenScroll: Bool = false
     var customHeight: CGFloat? = nil
     var translateForDismiss: CGFloat = 200
     
     var transitioningDelegate: SPStorkTransitioningDelegate?
+    weak var storkDelegate: SPStorkControllerDelegate?
     
     var pan: UIPanGestureRecognizer?
     var tap: UITapGestureRecognizer?
@@ -64,14 +66,20 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
     
     override var frameOfPresentedViewInContainerView: CGRect {
         guard let containerView = containerView else { return .zero }
-        
         var customHeight = self.customHeight ?? containerView.bounds.height
         if customHeight > containerView.bounds.height {
             customHeight = containerView.bounds.height
             print("SPStorkController - Custom height change to default value. Your height more maximum value")
         }
         let additionTranslate = containerView.bounds.height - customHeight
-        let yOffset: CGFloat = self.topSpace + 13 + additionTranslate
+        let yOffset: CGFloat = {
+            if customHeight < containerView.bounds.height {
+                return additionTranslate
+            } else {
+                return self.topSpace + 13 + additionTranslate
+            }
+        }()
+        
         return CGRect(x: 0, y: yOffset, width: containerView.bounds.width, height: containerView.bounds.height - yOffset)
     }
     
@@ -186,7 +194,9 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
     @objc func dismissAction() {
         self.presentingViewController.view.endEditing(true)
         self.presentedViewController.view.endEditing(true)
-        self.presentedViewController.dismiss(animated: true, completion: nil)
+        self.presentedViewController.dismiss(animated: true, completion: {
+            self.storkDelegate?.didDismissStorkByTap?()
+        })
     }
     
     override func dismissalTransitionWillBegin() {
@@ -258,6 +268,7 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
         self.backgroundView.removeFromSuperview()
         self.snapshotView?.removeFromSuperview()
         self.snapshotViewContainer.removeFromSuperview()
+        self.indicatorView.removeFromSuperview()
         
         let offscreenFrame = CGRect(x: 0, y: containerView.bounds.height, width: containerView.bounds.width, height: containerView.bounds.height)
         presentedViewController.view.frame = offscreenFrame
@@ -290,7 +301,9 @@ extension SPStorkPresentationController {
             self.workGester = false
             let translation = gestureRecognizer.translation(in: presentedView).y
             if translation >= self.translateForDismiss {
-                self.presentedViewController.dismiss(animated: true, completion: nil)
+                self.presentedViewController.dismiss(animated: true, completion: {
+                    self.storkDelegate?.didDismissStorkBySwipe?()
+                })
             } else {
                 self.indicatorView.style = .arrow
                 UIView.animate(
@@ -325,6 +338,17 @@ extension SPStorkPresentationController {
         self.indicatorView.style = style
     }
     
+    func setIndicator(visible: Bool) {
+        guard self.hideIndicatorWhenScroll else { return }
+        let newAlpha: CGFloat = visible ? 1 : 0
+        if self.indicatorView.alpha == newAlpha {
+            return
+        }
+        UIView.animate(withDuration: 0.15, animations: {
+            self.indicatorView.alpha = newAlpha
+        })
+    }
+    
     private func updatePresentedViewForTranslation(inVerticalDirection translation: CGFloat) {
         if self.startDismissing { return }
         

Source/SPStorkController/TransitioningDelegate/SPStorkTransitioningDelegate.swift

@@ -27,9 +27,11 @@ public final class SPStorkTransitioningDelegate: NSObject, UIViewControllerTrans
     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 hideIndicatorWhenScroll: Bool = false
     public var customHeight: CGFloat? = nil
     public var translateForDismiss: CGFloat = 200
     public var cornerRadius: CGFloat = 10
+    public weak var storkDelegate: SPStorkControllerDelegate? = nil
     
     public func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
         let controller = SPStorkPresentationController(presentedViewController: presented, presenting: presenting)
@@ -37,10 +39,12 @@ public final class SPStorkTransitioningDelegate: NSObject, UIViewControllerTrans
         controller.tapAroundToDismissEnabled = self.tapAroundToDismissEnabled
         controller.showIndicator = self.showIndicator
         controller.indicatorColor = self.indicatorColor
+        controller.hideIndicatorWhenScroll = self.hideIndicatorWhenScroll
         controller.customHeight = self.customHeight
         controller.translateForDismiss = self.translateForDismiss
         controller.cornerRadius = self.cornerRadius
         controller.transitioningDelegate = self
+        controller.storkDelegate = self.storkDelegate
         return controller
     }