Update to 1.6

Update duration animation for show / hide indicator view when scrolling.

README.md

@@ -109,6 +109,10 @@ transitionDelegate.translateForDismiss = 100
 ```swift
 transitionDelegate.tapAroundToDismissEnabled = true
 ```
+- Parameter `showCloseButton` added circle button with dismiss action. Default is `false`:
+```swift
+transitionDelegate.showCloseButton = false
+```
 
 - Parameter `showIndicator` shows or hides top arrow indicator. Default is `true`:
 ```swift

SPStorkController.podspec

@@ -1,6 +1,7 @@
 Pod::Spec.new do |s|
+
   s.name          = "SPStorkController"
-  s.version       = "1.5.6"
+  s.version       = "1.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 }
@@ -8,11 +9,11 @@ Pod::Spec.new do |s|
   
   s.author        = { "Ivan Vorobei" => "hello@ivanvorobei.by" }
   
-  s.swift_version = '4.2'
+  s.swift_version = '4.2', '5.0'
   s.platform      = :ios
+  s.ios.framework  = 'UIKit'
   s.ios.deployment_target = "10.0"
 
   s.source_files  = "Source/SPStorkController/**/*.swift"
-end
-
 
+end

Source/SPStorkController/CodeDraw/SPStorkCodeDraw.swift

@@ -0,0 +1,88 @@
+import UIKit
+
+class SPStorkCodeDraw : NSObject {
+    
+    private struct Cache {
+        static let gradient: CGGradient = CGGradient(colorsSpace: nil, colors: [UIColor.red.cgColor, UIColor.red.cgColor] as CFArray, locations: [0, 1])!
+    }
+    
+    @objc dynamic class var gradient: CGGradient { return Cache.gradient }
+    
+    @objc dynamic class func drawClose(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 100, height: 100), resizing: ResizingBehavior = .aspectFit, color: UIColor = UIColor(red: 0.000, green: 0.000, blue: 0.000, alpha: 1.000)) {
+        
+        let context = UIGraphicsGetCurrentContext()!
+        
+        context.saveGState()
+        let resizedFrame: CGRect = resizing.apply(rect: CGRect(x: 0, y: 0, width: 100, height: 100), target: targetFrame)
+        context.translateBy(x: resizedFrame.minX, y: resizedFrame.minY)
+        context.scaleBy(x: resizedFrame.width / 100, y: resizedFrame.height / 100)
+        
+        let bezierPath = UIBezierPath()
+        bezierPath.move(to: CGPoint(x: 92.02, y: 22.92))
+        bezierPath.addLine(to: CGPoint(x: 64.42, y: 50.52))
+        bezierPath.addLine(to: CGPoint(x: 92.02, y: 78.13))
+        bezierPath.addCurve(to: CGPoint(x: 92.02, y: 92.99), controlPoint1: CGPoint(x: 96.13, y: 82.23), controlPoint2: CGPoint(x: 96.13, y: 88.89))
+        bezierPath.addCurve(to: CGPoint(x: 84.59, y: 96.07), controlPoint1: CGPoint(x: 89.97, y: 95.05), controlPoint2: CGPoint(x: 87.28, y: 96.07))
+        bezierPath.addCurve(to: CGPoint(x: 77.16, y: 92.99), controlPoint1: CGPoint(x: 81.9, y: 96.07), controlPoint2: CGPoint(x: 79.22, y: 95.05))
+        bezierPath.addLine(to: CGPoint(x: 49.55, y: 65.38))
+        bezierPath.addLine(to: CGPoint(x: 21.95, y: 92.99))
+        bezierPath.addCurve(to: CGPoint(x: 14.51, y: 96.07), controlPoint1: CGPoint(x: 19.89, y: 95.05), controlPoint2: CGPoint(x: 17.2, y: 96.07))
+        bezierPath.addCurve(to: CGPoint(x: 7.08, y: 92.99), controlPoint1: CGPoint(x: 11.82, y: 96.07), controlPoint2: CGPoint(x: 9.13, y: 95.05))
+        bezierPath.addCurve(to: CGPoint(x: 7.08, y: 78.13), controlPoint1: CGPoint(x: 2.97, y: 88.89), controlPoint2: CGPoint(x: 2.97, y: 82.23))
+        bezierPath.addLine(to: CGPoint(x: 34.69, y: 50.52))
+        bezierPath.addLine(to: CGPoint(x: 7.08, y: 22.92))
+        bezierPath.addCurve(to: CGPoint(x: 7.08, y: 8.04), controlPoint1: CGPoint(x: 2.97, y: 18.8), controlPoint2: CGPoint(x: 2.97, y: 12.15))
+        bezierPath.addCurve(to: CGPoint(x: 21.94, y: 8.04), controlPoint1: CGPoint(x: 11.18, y: 3.94), controlPoint2: CGPoint(x: 17.84, y: 3.94))
+        bezierPath.addLine(to: CGPoint(x: 49.55, y: 35.65))
+        bezierPath.addLine(to: CGPoint(x: 77.16, y: 8.04))
+        bezierPath.addCurve(to: CGPoint(x: 92.02, y: 8.04), controlPoint1: CGPoint(x: 81.26, y: 3.94), controlPoint2: CGPoint(x: 87.92, y: 3.94))
+        bezierPath.addCurve(to: CGPoint(x: 92.02, y: 22.92), controlPoint1: CGPoint(x: 96.13, y: 12.15), controlPoint2: CGPoint(x: 96.13, y: 18.8))
+        bezierPath.close()
+        color.setFill()
+        bezierPath.fill()
+        
+        context.restoreGState()
+        
+    }
+    
+    @objc(StyleKitNameResizingBehavior)
+    enum ResizingBehavior: Int {
+        case aspectFit
+        case aspectFill
+        case stretch
+        case center
+        
+        func apply(rect: CGRect, target: CGRect) -> CGRect {
+            if rect == target || target == CGRect.zero {
+                return rect
+            }
+            
+            var scales = CGSize.zero
+            scales.width = abs(target.width / rect.width)
+            scales.height = abs(target.height / rect.height)
+            
+            switch self {
+            case .aspectFit:
+                scales.width = min(scales.width, scales.height)
+                scales.height = scales.width
+            case .aspectFill:
+                scales.width = max(scales.width, scales.height)
+                scales.height = scales.width
+            case .stretch:
+                break
+            case .center:
+                scales.width = 1
+                scales.height = 1
+            }
+            
+            var result = rect.standardized
+            result.size.width *= scales.width
+            result.size.height *= scales.height
+            result.origin.x = target.minX + (target.width - result.width) / 2
+            result.origin.y = target.minY + (target.height - result.height) / 2
+            return result
+        }
+    }
+    
+    private override init() {}
+}

Source/SPStorkController/Extenshion/SPStorkViewControllerExtenshion.swift

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

Source/SPStorkController/TransitioningDelegate/SPStorkPresentationController.swift

@@ -25,6 +25,7 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
     
     var swipeToDismissEnabled: Bool = true
     var tapAroundToDismissEnabled: Bool = true
+    var showCloseButton: Bool = false
     var showIndicator: Bool = true
     var indicatorColor: UIColor = UIColor.init(red: 202/255, green: 201/255, blue: 207/255, alpha: 1)
     var hideIndicatorWhenScroll: Bool = false
@@ -37,6 +38,7 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
     var pan: UIPanGestureRecognizer?
     var tap: UITapGestureRecognizer?
     
+    private var closeButton = SPStorkCloseButton()
     private var indicatorView = SPStorkIndicatorView()
     private var gradeView: UIView = UIView()
     private let snapshotViewContainer = UIView()
@@ -66,21 +68,18 @@ 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 = {
-            if customHeight < containerView.bounds.height {
-                return additionTranslate
-            } else {
-                return self.topSpace + 13 + additionTranslate
-            }
-        }()
+        let baseY: CGFloat = self.topSpace + 13
+        let maxHeight: CGFloat = containerView.bounds.height - baseY
+        var height: CGFloat = maxHeight
         
-        return CGRect(x: 0, y: yOffset, width: containerView.bounds.width, height: containerView.bounds.height - yOffset)
+        if let customHeight = self.customHeight {
+            if customHeight < maxHeight {
+                height = customHeight
+            } else {
+                print("SPStorkController - Custom height change to default value. Your height more maximum value")
+            }
+        }
+        return CGRect(x: 0, y: containerView.bounds.height - height, width: containerView.bounds.width, height: height)
     }
     
     override func presentationTransitionWillBegin() {
@@ -99,6 +98,12 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
         self.indicatorView.style = .arrow
         self.gradeView.alpha = 0
         
+        if self.showCloseButton {
+            self.closeButton.addTarget(self, action: #selector(self.dismissAction), for: .touchUpInside)
+            presentedView.addSubview(self.closeButton)
+        }
+        self.updateLayoutCloseButton()
+        
         let initialFrame: CGRect = presentingViewController.isPresentedAsStork ? presentingViewController.view.frame : containerView.bounds
         
         containerView.insertSubview(self.snapshotViewContainer, belowSubview: presentedViewController.view)
@@ -269,6 +274,7 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
         self.snapshotView?.removeFromSuperview()
         self.snapshotViewContainer.removeFromSuperview()
         self.indicatorView.removeFromSuperview()
+        self.closeButton.removeFromSuperview()
         
         let offscreenFrame = CGRect(x: 0, y: containerView.bounds.height, width: containerView.bounds.width, height: containerView.bounds.height)
         presentedViewController.view.frame = offscreenFrame
@@ -344,7 +350,7 @@ extension SPStorkPresentationController {
         if self.indicatorView.alpha == newAlpha {
             return
         }
-        UIView.animate(withDuration: 0.15, animations: {
+        UIView.animate(withDuration: 0.18, animations: {
             self.indicatorView.alpha = newAlpha
         })
     }
@@ -396,6 +402,7 @@ extension SPStorkPresentationController {
         super.viewWillTransition(to: size, with: coordinator)
         coordinator.animate(alongsideTransition: { contex in
             self.updateLayoutIndicator()
+            self.updateLayoutCloseButton()
         }, completion: { [weak self] _ in
             self?.updateSnapshotAspectRatio()
             self?.updateSnapshot()
@@ -410,6 +417,12 @@ extension SPStorkPresentationController {
         self.indicatorView.center.x = presentedView.frame.width / 2
     }
     
+    private func updateLayoutCloseButton() {
+        guard let presentedView = self.presentedView else { return }
+        self.closeButton.sizeToFit()
+        self.closeButton.layout(bottomX: presentedView.frame.width - 19, y: 19)
+    }
+    
     private func updateSnapshot() {
         guard let currentSnapshotView = presentingViewController.view.snapshotView(afterScreenUpdates: true) else { return }
         self.snapshotView?.removeFromSuperview()

Source/SPStorkController/TransitioningDelegate/SPStorkTransitioningDelegate.swift

@@ -25,6 +25,7 @@ public final class SPStorkTransitioningDelegate: NSObject, UIViewControllerTrans
     
     public var swipeToDismissEnabled: Bool = true
     public var tapAroundToDismissEnabled: Bool = true
+    public var showCloseButton: Bool = false
     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
@@ -37,6 +38,7 @@ public final class SPStorkTransitioningDelegate: NSObject, UIViewControllerTrans
         let controller = SPStorkPresentationController(presentedViewController: presented, presenting: presenting)
         controller.swipeToDismissEnabled = self.swipeToDismissEnabled
         controller.tapAroundToDismissEnabled = self.tapAroundToDismissEnabled
+        controller.showCloseButton = self.showCloseButton
         controller.showIndicator = self.showIndicator
         controller.indicatorColor = self.indicatorColor
         controller.hideIndicatorWhenScroll = self.hideIndicatorWhenScroll

Source/SPStorkController/Views/SPStorkCloseButton.swift

@@ -0,0 +1,78 @@
+// 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
+
+open class SPStorkCloseButton: UIButton {
+    
+    let iconView = SPStorkCloseView()
+    
+    var widthIconFactor: CGFloat = 1
+    var heightIconFactor: CGFloat = 1
+    
+    var color = UIColor.blue {
+        didSet {
+            self.iconView.color = self.color
+        }
+    }
+    
+    override open var isHighlighted: Bool {
+        didSet {
+            self.iconView.color = self.color.withAlphaComponent(self.isHighlighted ? 0.7 : 1)
+        }
+    }
+    
+    init() {
+        super.init(frame: .zero)
+        self.commonInit()
+    }
+    
+    required public init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    private func commonInit() {
+        self.iconView.isUserInteractionEnabled = false
+        self.addSubview(self.iconView)
+        self.backgroundColor = UIColor.init(red: 239 / 255.0, green: 239 / 255.0, blue: 244 / 255.0, alpha: 1)
+        self.color = UIColor.init(red: 142 / 255.0, green: 142 / 255.0, blue: 147 / 255.0, alpha: 1)
+        self.widthIconFactor = 0.36
+        self.heightIconFactor = 0.36
+    }
+    
+    func layout(bottomX: CGFloat, y: CGFloat) {
+        self.sizeToFit()
+        self.frame.origin.x = bottomX - self.frame.width
+        self.frame.origin.y = y
+    }
+    
+    override open func layoutSubviews() {
+        super.layoutSubviews()
+        self.layer.cornerRadius = self.frame.width / 2
+        self.iconView.frame = CGRect.init(x: 0, y: 0, width: self.frame.width * self.widthIconFactor, height: self.frame.height * self.heightIconFactor)
+        self.iconView.center = CGPoint.init(x: self.frame.width / 2, y: self.frame.height / 2)
+    }
+    
+    override open func sizeToFit() {
+        super.sizeToFit()
+        self.frame = CGRect.init(x: self.frame.origin.x, y: self.frame.origin.y, width: 30, height: 30)
+    }
+}

Source/SPStorkController/Views/SPStorkCloseView.swift

@@ -0,0 +1,50 @@
+// 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
+
+open class SPStorkCloseView: UIView {
+    
+    var color = UIColor.blue {
+        didSet {
+            self.setNeedsDisplay()
+        }
+    }
+    
+    init() {
+        super.init(frame: CGRect.zero)
+        self.commonInit()
+    }
+    
+    private func commonInit() {
+        self.backgroundColor = UIColor.clear
+    }
+    
+    required public init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override open func draw(_ rect: CGRect) {
+        super.draw(rect)
+        SPStorkCodeDraw.drawClose(frame: rect, resizing: .aspectFit, color: self.color)
+    }
+}
+