Update to 1.6.5

Fix bug with size `presentedView` when present other controller.

.gitignore

@@ -1 +1,38 @@
+# Mac OS X
 .DS_Store
+
+# Xcode
+## Build generated
+build/
+DerivedData
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+
+## Other
+*.xccheckout
+*.moved-aside
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+.build/
+
+# Carthage
+Carthage/Build

Example/stork-controller/AppDelegate.swift

@@ -7,6 +7,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        
+        let navigationController = UINavigationController(rootViewController: Controller())
+        self.launch(rootViewController: navigationController)
+        
         return true
     }
 
@@ -32,6 +36,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
 
+    func launch(rootViewController: UIViewController) {
+        let frame = UIScreen.main.bounds
+        self.window = UIWindow(frame: frame)
+        self.window!.rootViewController = rootViewController
+        self.window!.makeKeyAndVisible()
+    }
 
 }
 

Example/stork-controller/Base.lproj/Main.storyboard

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-</document>

Example/stork-controller/Controller.swift

@@ -0,0 +1,43 @@
+import UIKit
+
+class Controller: UIViewController {
+    
+    var presentControllerButton = UIButton.init(type: UIButton.ButtonType.system)
+    var presentTableControllerButton = UIButton.init(type: UIButton.ButtonType.system)
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        self.view.backgroundColor = UIColor.white
+        
+        self.presentControllerButton.setTitle("Show ViewController", for: .normal)
+        self.presentControllerButton.addTarget(self, action: #selector(self.presentModalViewController), for: .touchUpInside)
+        self.presentControllerButton.sizeToFit()
+        self.presentControllerButton.center.x = self.view.frame.width  / 2
+        self.presentControllerButton.center.y = self.view.frame.height / 4 * 3
+        self.view.addSubview(self.presentControllerButton)
+        
+        self.presentTableControllerButton.setTitle("Show TableController", for: .normal)
+        self.presentTableControllerButton.addTarget(self, action: #selector(self.presentModalTableViewController), for: .touchUpInside)
+        self.presentTableControllerButton.sizeToFit()
+        self.presentTableControllerButton.center.x = self.view.frame.width  / 2
+        self.presentTableControllerButton.frame.origin.y = self.presentControllerButton.frame.bottomY + 10
+        self.view.addSubview(self.presentTableControllerButton)
+    }
+    
+    @objc func presentModalViewController() {
+        let modal = ModalViewController()
+        let transitionDelegate = SPStorkTransitioningDelegate()
+        modal.transitioningDelegate = transitionDelegate
+        modal.modalPresentationStyle = .custom
+        self.present(modal, animated: true, completion: nil)
+    }
+    
+    @objc func presentModalTableViewController() {
+        let modal = ModalTableViewController()
+        let transitionDelegate = SPStorkTransitioningDelegate()
+        modal.transitioningDelegate = transitionDelegate
+        modal.modalPresentationStyle = .custom
+        self.present(modal, animated: true, completion: nil)
+    }
+}

Example/stork-controller/Frameworks/SPFakeBar/SPFakeBarNavigationStyle.swift

@@ -21,12 +21,10 @@
 
 import UIKit
 
-extension UICollectionView {
+public enum SPFakeBarNavigationStyle {
     
-    var currentIndexCellPath: IndexPath? {
-        let visibleRect = CGRect(origin: self.contentOffset, size: self.bounds.size)
-        let visiblePoint = CGPoint.init(x: visibleRect.midX, y: visibleRect.midY)
-        let visibleIndexPath = self.indexPathForItem(at: visiblePoint)
-        return visibleIndexPath
-    }
+    case large
+    case small
+    case stork
+    case noContent
 }

Example/stork-controller/Frameworks/SPFakeBar/SPFakeBarView.swift

@@ -21,19 +21,18 @@
 
 import UIKit
 
-public class SPFakeBarView: UIView {
+open class SPFakeBarView: UIView {
     
-    var style: SPNavigationTitleStyle = . small {
+    public var style: SPFakeBarNavigationStyle = .small {
         didSet {
             self.updateStyle()
         }
     }
     
     private var settedHeight: CGFloat = 0
-    
-    var height: CGFloat {
+    public var height: CGFloat {
         get {
-            return (self.settedHeight) + (self.addStatusBarHeight ? UIViewController.statusBarHeight : 0)
+            return (self.settedHeight) + (self.addStatusBarHeight ? UIApplication.shared.statusBarFrame.height : 0)
         }
         set {
             self.settedHeight = newValue
@@ -42,39 +41,60 @@ public class SPFakeBarView: UIView {
         
     }
     
-    var addStatusBarHeight: Bool = true {
+    public var addStatusBarHeight: Bool = true {
         didSet {
             self.updateHeight()
         }
     }
     
-    var elementsColor: UIColor = UINavigationController.elementsColor {
+    public var elementsColor: UIColor = SPFakeBarView.navigationElementsColor {
         didSet {
-            self.leftButton.setTitleColor(self.elementsColor)
-            self.rightButton.setTitleColor(self.elementsColor)
+            self.leftButton.setTitleColor(self.elementsColor, for: .normal)
+            self.leftButton.setTitleColor(self.elementsColor.withAlphaComponent(0.7), for: .highlighted)
+            self.rightButton.setTitleColor(self.elementsColor, for: .normal)
+            self.rightButton.setTitleColor(self.elementsColor.withAlphaComponent(0.7), for: .highlighted)
         }
     }
     
-    var titleLabel = UILabel.init()
-    var subtitleLabel = UILabel.init()
-    var leftButton = UIButton.init()
-    var rightButton = UIButton.init()
+    public var closeButtonPossition: CloseButtonPosition = .none {
+        didSet {
+            self.leftButton.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .regular)
+            self.rightButton.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .regular)
+            switch self.closeButtonPossition {
+            case .left:
+                self.leftButton.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .semibold)
+            case .right:
+                self.rightButton.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .semibold)
+            case .none:
+                break
+            }
+        }
+    }
+    
+    public var titleLabel = UILabel.init()
+    public var subtitleLabel = UILabel.init()
+    public var leftButton = UIButton.init()
+    public var rightButton = UIButton.init()
+    
+    public let separatorView = UIView()
+    public let blurView: UIVisualEffectView = {
+        let effect = UIBlurEffect(style: .extraLight)
+        return UIVisualEffectView.init(effect: effect)
+    }()
     
     private var titleBottomConstraint: NSLayoutConstraint?
     private var heightConstraint: NSLayoutConstraint?
     private var topConstraint: NSLayoutConstraint?
     private var leadingConstraint: NSLayoutConstraint?
     private var trailingConstraint: NSLayoutConstraint?
-    private let blurView = UIVisualEffectView.init(style: .extraLight)
-    private let separatorView = UIView()
     
-    init(style: SPNavigationTitleStyle) {
+    public init(style: SPFakeBarNavigationStyle) {
         super.init(frame: CGRect.zero)
         self.style = style
         self.commonInit()
     }
     
-    required init?(coder aDecoder: NSCoder) {
+    required public init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
         self.style = .small
         self.commonInit()
@@ -91,7 +111,7 @@ public class SPFakeBarView: UIView {
         self.blurView.bottomAnchor.constraint(equalTo: self.bottomAnchor).isActive = true
         
         self.addSubview(self.separatorView)
-        self.separatorView.backgroundColor = UIColor.init(hex: "BFBFBF")
+        self.separatorView.backgroundColor = UIColor.init(red: 191 / 255.0, green: 191 / 255.0, blue: 191 / 255.0, alpha: 1)
         self.separatorView.translatesAutoresizingMaskIntoConstraints = false
         self.separatorView.leadingAnchor.constraint(equalTo: self.leadingAnchor).isActive = true
         self.separatorView.trailingAnchor.constraint(equalTo: self.trailingAnchor).isActive = true
@@ -106,36 +126,40 @@ public class SPFakeBarView: UIView {
         self.titleBottomConstraint?.isActive = true
         
         self.addSubview(self.subtitleLabel)
-        self.subtitleLabel.textColor = UIColor.init(hex: "8E8E92")
-        self.subtitleLabel.font = UIFont.system(type: .DemiBold, size: 13)
+        self.subtitleLabel.textColor = UIColor.init(red: 142 / 255.0, green: 142 / 255.0, blue: 146 / 255.0, alpha: 1)
+        self.subtitleLabel.font = UIFont.systemFont(ofSize: 13, weight: .semibold)
         self.subtitleLabel.translatesAutoresizingMaskIntoConstraints = false
         self.subtitleLabel.leadingAnchor.constraint(equalTo: self.leadingAnchor, constant: 16).isActive = true
         self.subtitleLabel.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: -16).isActive = true
         self.subtitleLabel.bottomAnchor.constraint(equalTo: self.titleLabel.topAnchor, constant: 0).isActive = true
         
-        self.leftButton.setTitleColor(self.elementsColor)
+        self.leftButton.setTitleColor(self.elementsColor, for: .normal)
+        self.leftButton.setTitleColor(self.elementsColor.withAlphaComponent(0.7), for: .highlighted)
         self.leftButton.titleLabel?.textAlignment = .left
-        self.leftButton.titleLabel?.font = UIFont.system(type: .DemiBold, size: 16)
+        self.leftButton.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .semibold)
         self.leftButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 17, bottom: 0, right: 0)
         self.addSubview(self.leftButton)
         self.leftButton.translatesAutoresizingMaskIntoConstraints = false
         self.leftButton.leadingAnchor.constraint(equalTo: self.leadingAnchor).isActive = true
         self.leftButton.bottomAnchor.constraint(equalTo: self.bottomAnchor, constant: -12).isActive = true
         
-        self.rightButton.setTitleColor(self.elementsColor)
+        self.rightButton.setTitleColor(self.elementsColor, for: .normal)
+        self.rightButton.setTitleColor(self.elementsColor.withAlphaComponent(0.7), for: .highlighted)
         self.rightButton.titleLabel?.textAlignment = .right
-        self.rightButton.titleLabel?.font = UIFont.system(type: .DemiBold, size: 17)
+        self.rightButton.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .semibold)
         self.rightButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 16)
         self.addSubview(self.rightButton)
         self.rightButton.translatesAutoresizingMaskIntoConstraints = false
         self.rightButton.trailingAnchor.constraint(equalTo: self.trailingAnchor).isActive = true
         self.rightButton.bottomAnchor.constraint(equalTo: self.bottomAnchor, constant: -12).isActive = true
         
+        self.closeButtonPossition = .none
+        
         self.setContraints()
         self.updateStyle()
     }
     
-    public override func layoutSubviews() {
+    override open func layoutSubviews() {
         super.layoutSubviews()
         self.setContraints()
     }
@@ -161,7 +185,7 @@ public class SPFakeBarView: UIView {
     private func updateStyle() {
         switch self.style {
         case .small:
-            if UIViewController.statusBarHeight == 44 {
+            if UIApplication.shared.statusBarFrame.height == 44 {
                 self.height = 88 - 44
                 self.titleBottomConstraint?.constant = -12
             } else {
@@ -169,26 +193,29 @@ public class SPFakeBarView: UIView {
                 self.titleBottomConstraint?.constant = -12
             }
             self.addStatusBarHeight = true
-            self.titleLabel.font = UIFont.system(type: .DemiBold, size: 17)
-            self.titleLabel.setCenteringAlignment()
+            self.titleLabel.font = UIFont.systemFont(ofSize: 17, weight: .semibold)
+            self.titleLabel.textAlignment = .center
         case .stork:
             self.height = 66
             self.titleBottomConstraint?.constant = -12
             self.addStatusBarHeight = false
-            self.titleLabel.font = UIFont.system(type: .DemiBold, size: 17)
-            self.titleLabel.setCenteringAlignment()
+            self.titleLabel.font = UIFont.systemFont(ofSize: 17, weight: .semibold)
+            self.titleLabel.textAlignment = .center
         case .large:
-            if UIViewController.statusBarHeight == 44 {
+            if UIApplication.shared.statusBarFrame.height == 44 {
                 self.height = 140 - 44
                 self.titleBottomConstraint?.constant = -8
             } else {
-                self.height = 112 - 20
+                self.height = 116 - 20
                 self.titleBottomConstraint?.constant = -4
             }
             self.addStatusBarHeight = true
-            self.titleLabel.font = UIFont.system(type: .Bold, size: 34)
+            self.titleLabel.font = UIFont.systemFont(ofSize: 34, weight: .bold)
             self.titleLabel.textAlignment = .left
             break
+        case .noContent:
+            self.height = 0
+            self.addStatusBarHeight = true
         }
         
         self.updateConstraints()
@@ -198,5 +225,26 @@ public class SPFakeBarView: UIView {
         self.heightConstraint?.constant = self.height
         self.updateConstraints()
     }
+    
+    public enum CloseButtonPosition {
+        case left
+        case right
+        case none
+    }
 }
 
+extension SPFakeBarView {
+    
+    static var navigationElementsColor: UIColor {
+        get {
+            if UINavigationBar.appearance().tintColor != nil {
+                return UINavigationBar.appearance().tintColor
+            } else {
+                return UIColor.init(red: 0 / 255.0, green: 122 / 255.0, blue: 255 / 255.0, alpha: 1)
+            }
+        }
+        set {
+            UINavigationBar.appearance().tintColor = newValue
+        }
+    }
+}

Example/stork-controller/Frameworks/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() {}
+}

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

@@ -0,0 +1,51 @@
+// 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
+
+extension UIViewController {
+    
+    public var isPresentedAsStork: Bool {
+        return transitioningDelegate is SPStorkTransitioningDelegate
+            && modalPresentationStyle == .custom
+            && presentingViewController != 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, showCloseButton: Bool, complection: (() -> Void)? = nil) {
+        let transitionDelegate = SPStorkTransitioningDelegate()
+        transitionDelegate.customHeight = height
+        transitionDelegate.showCloseButton = showCloseButton
+        transitionDelegate.showIndicator = showIndicator
+        controller.transitioningDelegate = transitionDelegate
+        controller.modalPresentationStyle = .custom
+        controller.modalPresentationCapturesStatusBarAppearance = true
+        self.present(controller, animated: true, completion: complection)
+    }
+}

Example/stork-controller/Frameworks/SPStorkController/Models/SPStorkHaptic.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
+
+public enum SPStorkHapticMoments {
+    
+    case willPresent
+    case willDismiss
+    case willDismissIfRelease
+}

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

@@ -21,20 +21,9 @@
 
 import UIKit
 
-public struct SPBadge {
+@objc public protocol SPStorkControllerDelegate: class {
     
-    static func reset() {
-        UIApplication.shared.applicationIconBadgeNumber = 0
-    }
+    @objc optional func didDismissStorkBySwipe()
     
-    static var number: Int {
-        get {
-            return UIApplication.shared.applicationIconBadgeNumber
-        }
-        set {
-            UIApplication.shared.applicationIconBadgeNumber = newValue
-        }
-    }
-    
-    private init() {}
+    @objc optional func didDismissStorkByTap()
 }

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

@@ -23,24 +23,57 @@ import UIKit
 
 public struct SPStorkController {
     
-    static func scrollViewDidScroll(_ scrollView: UIScrollView) {
+    static public func scrollViewDidScroll(_ scrollView: UIScrollView) {
         if let controller = self.controller(for: scrollView) {
             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)
                     }
+                    presentationController.setIndicator(style: scrollView.isTracking ? .line : .arrow)
+                    if translation >= presentationController.translateForDismiss * 0.4 {
+                        if !scrollView.isTracking && !scrollView.isDragging {
+                            presentationController.presentedViewController.dismiss(animated: true, completion: {
+                                presentationController.storkDelegate?.didDismissStorkBySwipe?()
+                            })
+                            return
+                        }
+                    }
                     if presentationController.pan?.state != UIGestureRecognizer.State.changed {
-                        presentationController.scrollViewDidScroll(translation)
+                        presentationController.scrollViewDidScroll(translation * 2)
                     }
                 } else {
+                    presentationController.setIndicator(style: .arrow)
                     presentationController.scrollViewDidScroll(0)
                 }
+                
+                if translation < -5 {
+                    presentationController.setIndicator(visible: false, forse: (translation < -50))
+                } else {
+                    presentationController.setIndicator(visible: true, forse: false)
+                }
             }
         }
     }
     
+    static public var topScrollIndicatorInset: CGFloat {
+        return 6
+    }
+    
+    static public func updatePresentingController(parent controller: UIViewController) {
+        if let presentationController = controller.presentedViewController?.presentationController as? SPStorkPresentationController {
+            presentationController.updatePresentingController()
+        }
+    }
+    
+    static public func updatePresentingController(modal controller: UIViewController) {
+        if let presentationController = controller.presentationController as? SPStorkPresentationController {
+            presentationController.updatePresentingController()
+        }
+    }
+    
     static private func controller(for view: UIView) -> UIViewController? {
         var nextResponder = view.next
         while nextResponder != nil && !(nextResponder! is UIViewController) {
@@ -51,12 +84,3 @@ public struct SPStorkController {
     
     private init() {}
 }
-
-extension UIViewController {
-    
-    var isPresentedAsStork: Bool {
-        return transitioningDelegate is SPStorkTransitioningDelegate
-            && modalPresentationStyle == .custom
-            && presentingViewController != nil
-    }
-}

Example/stork-controller/Frameworks/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),

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

@@ -23,11 +23,23 @@ import UIKit
 
 class SPStorkPresentationController: UIPresentationController, UIGestureRecognizerDelegate {
     
-    var isSwipeToDismissEnabled: Bool = true
+    var swipeToDismissEnabled: Bool = true
+    var tapAroundToDismissEnabled: Bool = true
+    var showCloseButton: Bool = false
     var showIndicator: Bool = true
-    var transitioningDelegate: SPStorkTransitioningDelegate?
-    var pan: UIPanGestureRecognizer?
+    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 hapticMoments: [SPStorkHapticMoments] = [.willDismissIfRelease]
     
+    var transitioningDelegate: SPStorkTransitioningDelegate?
+    weak var storkDelegate: SPStorkControllerDelegate?
+    
+    var pan: UIPanGestureRecognizer?
+    var tap: UITapGestureRecognizer?
+    
+    private var closeButton = SPStorkCloseButton()
     private var indicatorView = SPStorkIndicatorView()
     private var gradeView: UIView = UIView()
     private let snapshotViewContainer = UIView()
@@ -37,51 +49,75 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
     private var snapshotViewTopConstraint: NSLayoutConstraint?
     private var snapshotViewWidthConstraint: NSLayoutConstraint?
     private var snapshotViewAspectRatioConstraint: NSLayoutConstraint?
+    
     private var workGester: Bool = false
     private var startDismissing: Bool = false
+    private var afterReleaseDismissing: Bool = false
     
     private var topSpace: CGFloat {
         let statusBarHeight: CGFloat = UIApplication.shared.statusBarFrame.height
         return (statusBarHeight < 25) ? 30 : statusBarHeight
     }
     
-    private var alpha: CGFloat {
-        return 0.51
-    }
-    
-    private var cornerRadius: CGFloat {
-        return 10
-    }
+    private let alpha: CGFloat =  0.51
+    var cornerRadius: CGFloat = 10
     
     private var scaleForPresentingView: CGFloat {
         guard let containerView = containerView else { return 0 }
-        let factor = 1 - (topSpace * 2 / containerView.frame.height)
+        let factor = 1 - ((self.cornerRadius + 3) * 2 / containerView.frame.width)
         return factor
     }
     
+    private var feedbackGenerator: UIImpactFeedbackGenerator = UIImpactFeedbackGenerator(style: .light)
+    
     override var frameOfPresentedViewInContainerView: CGRect {
         guard let containerView = containerView else { return .zero }
-        let yOffset: CGFloat = topSpace + 13
-        return CGRect(x: 0, y: yOffset, width: containerView.bounds.width, height: containerView.bounds.height - yOffset)
+        let baseY: CGFloat = self.topSpace + 13
+        let maxHeight: CGFloat = containerView.bounds.height - baseY
+        var height: CGFloat = maxHeight
+        
+        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() {
         super.presentationTransitionWillBegin()
         
+        if !self.hapticMoments.isEmpty {
+            self.feedbackGenerator.prepare()
+        }
+        
         guard let containerView = self.containerView, let presentedView = self.presentedView, let window = containerView.window  else { return }
         
         if self.showIndicator {
+            self.indicatorView.color = self.indicatorColor
+            let tap = UITapGestureRecognizer.init(target: self, action: #selector(self.dismissAction))
+            tap.cancelsTouchesInView = false
+            self.indicatorView.addGestureRecognizer(tap)
             presentedView.addSubview(self.indicatorView)
         }
         self.updateLayoutIndicator()
         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)
         self.snapshotViewContainer.frame = initialFrame
         self.updateSnapshot()
+        self.snapshotView?.layer.cornerRadius = 0
         self.backgroundView.backgroundColor = UIColor.black
         self.backgroundView.translatesAutoresizingMaskIntoConstraints = false
         containerView.insertSubview(self.backgroundView, belowSubview: self.snapshotViewContainer)
@@ -116,8 +152,9 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
             containerView.insertSubview(snapshotView, aboveSubview: self.backgroundView)
             snapshotView.frame = initialFrame
             snapshotView.transform = transformForSnapshotView
-            snapshotView.alpha = self.alpha
+            snapshotView.alpha = 1 - self.alpha
             snapshotView.layer.cornerRadius = self.cornerRadius
+            snapshotView.contentMode = .top
             snapshotView.layer.masksToBounds = true
             rootSnapshotView = snapshotView
             
@@ -140,19 +177,30 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
                 rootSnapshotView?.removeFromSuperview()
                 rootSnapshotRoundedView?.removeFromSuperview()
         })
+        
+        if self.hapticMoments.contains(.willPresent) {
+            self.feedbackGenerator.impactOccurred()
+        }
     }
     
     override func presentationTransitionDidEnd(_ completed: Bool) {
         super.presentationTransitionDidEnd(completed)
         guard let containerView = containerView else { return }
+        self.updateSnapshot()
         self.presentedViewController.view.frame = self.frameOfPresentedViewInContainerView
         self.snapshotViewContainer.transform = .identity
         self.snapshotViewContainer.translatesAutoresizingMaskIntoConstraints = false
         self.snapshotViewContainer.centerXAnchor.constraint(equalTo: containerView.centerXAnchor).isActive = true
         self.updateSnapshotAspectRatio()
         
-        if self.isSwipeToDismissEnabled {
-            self.pan = UIPanGestureRecognizer(target: self, action: #selector(handlePan))
+        if self.tapAroundToDismissEnabled {
+            self.tap = UITapGestureRecognizer.init(target: self, action: #selector(self.dismissAction))
+            self.tap?.cancelsTouchesInView = false
+            self.snapshotViewContainer.addGestureRecognizer(self.tap!)
+        }
+        
+        if self.swipeToDismissEnabled {
+            self.pan = UIPanGestureRecognizer(target: self, action: #selector(self.handlePan))
             self.pan!.delegate = self
             self.pan!.maximumNumberOfTouches = 1
             self.pan!.cancelsTouchesInView = false
@@ -160,6 +208,14 @@ 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 }
@@ -195,6 +251,7 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
             containerView.insertSubview(snapshotView, aboveSubview: backgroundView)
             snapshotView.frame = initialFrame
             snapshotView.transform = initialTransform
+            snapshotView.contentMode = .top
             rootSnapshotView = snapshotView
             snapshotView.layer.cornerRadius = self.cornerRadius
             snapshotView.layer.masksToBounds = true
@@ -202,7 +259,7 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
             let snapshotRoundedView = UIView()
             snapshotRoundedView.layer.cornerRadius = self.cornerRadius
             snapshotRoundedView.layer.masksToBounds = true
-            snapshotRoundedView.backgroundColor = UIColor.black.withAlphaComponent(1 - self.alpha)
+            snapshotRoundedView.backgroundColor = UIColor.black.withAlphaComponent(self.alpha)
             containerView.insertSubview(snapshotRoundedView, aboveSubview: snapshotView)
             snapshotRoundedView.frame = initialFrame
             snapshotRoundedView.transform = initialTransform
@@ -215,6 +272,9 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
                 self.snapshotView?.transform = .identity
                 self.snapshotViewContainer.transform = finalTransform
                 self.gradeView.alpha = 0
+                if self.hapticMoments.contains(.willDismiss) {
+                    self.feedbackGenerator.impactOccurred()
+                }
             }, completion: { _ in
                 rootSnapshotView?.removeFromSuperview()
                 rootSnapshotRoundedView?.removeFromSuperview()
@@ -228,6 +288,8 @@ class SPStorkPresentationController: UIPresentationController, UIGestureRecogniz
         self.backgroundView.removeFromSuperview()
         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
@@ -238,18 +300,20 @@ 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:
             self.workGester = true
             self.indicatorView.style = .line
             self.presentingViewController.view.layer.removeAllAnimations()
+            self.presentingViewController.view.endEditing(true)
+            self.presentedViewController.view.endEditing(true)
             gestureRecognizer.setTranslation(CGPoint(x: 0, y: 0), in: containerView)
         case .changed:
             self.workGester = true
-            if self.isSwipeToDismissEnabled {
-                let translation = gestureRecognizer.translation(in: presentedView)
+            let translation = gestureRecognizer.translation(in: presentedView)
+            if self.swipeToDismissEnabled {
                 self.updatePresentedViewForTranslation(inVerticalDirection: translation.y)
             } else {
                 gestureRecognizer.setTranslation(.zero, in: presentedView)
@@ -257,8 +321,10 @@ extension SPStorkPresentationController {
         case .ended:
             self.workGester = false
             let translation = gestureRecognizer.translation(in: presentedView).y
-            if translation >= 240 {
-                presentedViewController.dismiss(animated: true, completion: nil)
+            if translation >= self.translateForDismiss {
+                self.presentedViewController.dismiss(animated: true, completion: {
+                    self.storkDelegate?.didDismissStorkBySwipe?()
+                })
             } else {
                 self.indicatorView.style = .arrow
                 UIView.animate(
@@ -270,6 +336,7 @@ extension SPStorkPresentationController {
                     animations: {
                         self.snapshotView?.transform = .identity
                         self.presentedView?.transform = .identity
+                        self.gradeView.alpha = self.alpha
                 })
             }
         default:
@@ -277,18 +344,51 @@ extension SPStorkPresentationController {
         }
     }
     
+    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+        if let gester = gestureRecognizer as? UIPanGestureRecognizer {
+            let velocity = gester.velocity(in: self.presentedViewController.view)
+            return abs(velocity.y) > abs(velocity.x)
+        }
+        return true
+    }
+    
     func scrollViewDidScroll(_ translation: CGFloat) {
         if !self.workGester {
             self.updatePresentedViewForTranslation(inVerticalDirection: translation)
         }
     }
     
+    func updatePresentingController() {
+        if self.startDismissing { return }
+        self.updateSnapshot()
+    }
+    
+    func setIndicator(style: SPStorkIndicatorView.Style) {
+        self.indicatorView.style = style
+    }
+    
+    func setIndicator(visible: Bool, forse: Bool) {
+        guard self.hideIndicatorWhenScroll else { return }
+        let newAlpha: CGFloat = visible ? 1 : 0
+        if forse {
+            self.indicatorView.layer.removeAllAnimations()
+            self.indicatorView.alpha = newAlpha
+            return
+        }
+        if self.indicatorView.alpha == newAlpha {
+            return
+        }
+        UIView.animate(withDuration: 0.18, animations: {
+            self.indicatorView.alpha = newAlpha
+        })
+    }
+    
     private func updatePresentedViewForTranslation(inVerticalDirection translation: CGFloat) {
         if self.startDismissing { return }
         
         let elasticThreshold: CGFloat = 120
         let translationFactor: CGFloat = 1 / 2
-        
+
         if translation >= 0 {
             let translationForModal: CGFloat = {
                 if translation >= elasticThreshold {
@@ -302,10 +402,21 @@ extension SPStorkPresentationController {
             
             self.presentedView?.transform = CGAffineTransform(translationX: 0, y: translationForModal)
             
-            if !self.presentingViewController.isPresentedAsStork {
-                let factor = 1 + (translationForModal / 6000)
-                self.snapshotView?.transform = CGAffineTransform.init(scaleX: factor, y: factor)
-                self.gradeView.alpha = self.alpha - ((factor - 1) * 15)
+            let scaleFactor = 1 + (translationForModal / 5000)
+            self.snapshotView?.transform = CGAffineTransform.init(scaleX: scaleFactor, y: scaleFactor)
+            let gradeFactor = 1 + (translationForModal / 7000)
+            self.gradeView.alpha = self.alpha - ((gradeFactor - 1) * 15)
+        } else {
+            self.presentedView?.transform = CGAffineTransform.identity
+        }
+        
+        if self.swipeToDismissEnabled {
+            let afterRealseDismissing = (translation >= self.translateForDismiss)
+            if afterRealseDismissing != self.afterReleaseDismissing {
+                self.afterReleaseDismissing = afterRealseDismissing
+                if self.hapticMoments.contains(.willDismissIfRelease) {
+                    self.feedbackGenerator.impactOccurred()
+                }
             }
         }
     }
@@ -329,6 +440,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()
@@ -343,12 +455,23 @@ 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()
         self.snapshotViewContainer.addSubview(currentSnapshotView)
         self.constraints(view: currentSnapshotView, to: self.snapshotViewContainer)
         self.snapshotView = currentSnapshotView
+        self.snapshotView?.layer.cornerRadius = self.cornerRadius
+        self.snapshotView?.layer.masksToBounds = true
+        if #available(iOS 11.0, *) {
+            snapshotView?.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
+        }
         self.gradeView.removeFromSuperview()
         self.gradeView.backgroundColor = UIColor.black
         self.snapshotView!.addSubview(self.gradeView)

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

@@ -25,15 +25,14 @@ final class SPStorkPresentingAnimationController: NSObject, UIViewControllerAnim
 
     func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
         
-        guard let presentedViewController = transitionContext.viewController(forKey: .to) else {
-            return
-        }
+        guard let presentedViewController = transitionContext.viewController(forKey: .to) else { return }
         
         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)
-        
+
         let finalFrameForPresentedView = transitionContext.finalFrame(for: presentedViewController)
+        presentedViewController.view.frame = finalFrameForPresentedView
+        presentedViewController.view.frame.origin.y = containerView.bounds.height
         
         UIView.animate(
             withDuration: transitionDuration(using: transitionContext),

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

@@ -23,12 +23,32 @@ import UIKit
 
 public final class SPStorkTransitioningDelegate: NSObject, UIViewControllerTransitioningDelegate {
     
-    var isSwipeToDismissEnabled: Bool = true
-    var showIndicator: Bool = true
+    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
+    public var customHeight: CGFloat? = nil
+    public var translateForDismiss: CGFloat = 200
+    public var cornerRadius: CGFloat = 10
+    public var hapticMoments: [SPStorkHapticMoments] = [.willDismissIfRelease]
+    public weak var storkDelegate: SPStorkControllerDelegate? = nil
     
     public func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
         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
+        controller.customHeight = self.customHeight
+        controller.translateForDismiss = self.translateForDismiss
+        controller.cornerRadius = self.cornerRadius
+        controller.hapticMoments = self.hapticMoments
         controller.transitioningDelegate = self
+        controller.storkDelegate = self.storkDelegate
         return controller
     }
     

Example/stork-controller/Frameworks/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)
+    }
+}

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

@@ -21,26 +21,30 @@
 
 import UIKit
 
-class SPEmptyProposeLabel: UILabel {
+open class SPStorkCloseView: UIView {
+    
+    var color = UIColor.blue {
+        didSet {
+            self.setNeedsDisplay()
+        }
+    }
     
     init() {
         super.init(frame: CGRect.zero)
         self.commonInit()
     }
     
-    init(title: String) {
-        super.init(frame: CGRect.zero)
-        self.text = title
-        self.commonInit()
-    }
-    
     private func commonInit() {
-        self.setCenteringAlignment()
-        self.font = UIFont.system(type: .Regular, size: 14)
-        self.textColor = SPNativeStyleKit.Colors.gray
+        self.backgroundColor = UIColor.clear
     }
     
-    required init?(coder aDecoder: NSCoder) {
+    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)
+    }
 }
+

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

@@ -21,7 +21,7 @@
 
 import UIKit
 
-class SPStorkIndicatorView: UIView {
+open class SPStorkIndicatorView: UIView {
     
     var style: Style = .line {
         didSet {
@@ -42,6 +42,13 @@ class SPStorkIndicatorView: UIView {
         }
     }
     
+    var color: UIColor = UIColor.init(red: 202/255, green: 201/255, blue: 207/255, alpha: 1) {
+        didSet {
+            self.leftView.backgroundColor = self.color
+            self.rightView.backgroundColor = self.color
+        }
+    }
+    
     private var leftView: UIView = UIView()
     private var rightView: UIView = UIView()
     
@@ -50,15 +57,14 @@ class SPStorkIndicatorView: UIView {
         self.backgroundColor = UIColor.clear
         self.addSubview(self.leftView)
         self.addSubview(self.rightView)
-        self.leftView.backgroundColor = UIColor.init(red: 202/255, green: 201/255, blue: 207/255, alpha: 1)
-        self.rightView.backgroundColor = UIColor.init(red: 202/255, green: 201/255, blue: 207/255, alpha: 1)
+        self.color = UIColor.init(red: 202/255, green: 201/255, blue: 207/255, alpha: 1)
     }
     
-    required init?(coder aDecoder: NSCoder) {
+    required public init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
-    override func sizeToFit() {
+    override open func sizeToFit() {
         super.sizeToFit()
         self.frame = CGRect.init(x: self.frame.origin.x, y: self.frame.origin.y, width: 36, height: 13)
         

Example/stork-controller/Frameworks/Sparrow/ui/views/collection/view/SPImagesLineCollectionView.swift

@@ -1,91 +0,0 @@
-// 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
-
-class SPImagesLineCollectionView: SPCollectionView {
-    
-    fileprivate let imageCellIdentificator: String = "imageCellIdentificator"
-    
-    var links: [String] = []
-    var images: [UIImage] = []
-    
-    var mode: Mode = .links {
-        didSet {
-            self.reloadData()
-        }
-    }
-    
-    override init() {
-        super.init()
-        self.layout.scrollDirection = .horizontal
-        self.dataSource = self
-        
-        self.register(SPImageCollectionViewCell.self, forCellWithReuseIdentifier: self.imageCellIdentificator)
-        
-        self.layout.cellSideRatio = 1
-        self.layout.heightFactor = 1
-        self.layout.minItemSpace = 10
-        self.layout.maxItemSpace = 10
-    }
-    
-    required public init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    enum Mode {
-        case links
-        case images
-    }
-}
-
-extension SPImagesLineCollectionView: UICollectionViewDataSource {
-    
-    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        
-        switch self.mode {
-        case .links:
-            return self.links.count
-        case .images:
-            return self.images.count
-        }
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let cell = dequeueReusableCell(withReuseIdentifier: self.imageCellIdentificator, for: indexPath) as! SPImageCollectionViewCell
-        
-        switch self.mode {
-        case .links:
-            let link = self.links[indexPath.row]
-            if let image = self.fromCahce(link: link) {
-                cell.view.setImage(image: image, animatable: false)
-            } else {
-                cell.view.setImage(link: link) { (image) in
-                    self.toCache(link: link, image: image)
-                }
-            }
-        case .images:
-            cell.view.setImage(image: self.images[indexPath.row], animatable: false)
-        }
-        
-        return cell
-    }
-}

Example/stork-controller/Frameworks/Sparrow/ui/views/table/SPEmptyProposeView.swift

@@ -1,109 +0,0 @@
-// 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
-
-class SPEmptyProposeView: UIView {
-    
-    let imageView = SPDownloadingImageView()
-    let label = UILabel()
-    let button = UIButton.init(type: UIButton.ButtonType.system)
-    
-    init() {
-        super.init(frame: CGRect.zero)
-        self.label.text = "Description"
-        self.button.setTitle("Button", for: UIControl.State.normal)
-        self.commonInit()
-    }
-    
-    init(image: UIImage, text: String, buttonTitle: String, buttonTarget: @escaping ()->()) {
-        super.init(frame: CGRect.zero)
-        self.imageView.setImage(image: image, animatable: false)
-        self.label.text = text
-        self.button.setTitle(buttonTitle)
-        self.button.target {
-            buttonTarget()
-        }
-        self.commonInit()
-    }
-    
-    private func commonInit() {
-        self.backgroundColor = UIColor.clear
-        
-        self.imageView.contentMode = .scaleAspectFit
-        self.addSubview(self.imageView)
-        
-        self.label.numberOfLines = 0
-        self.label.setCenteringAlignment()
-        self.label.font = UIFont.system(type: .Regular, size: 13)
-        self.label.textColor = SPNativeStyleKit.Colors.gray
-        self.addSubview(self.label)
-        
-        self.addSubview(self.button)
-        self.button.titleLabel?.font = UIFont.system(type: .Medium, size: 15)
-    }
-    
-    required init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    override func layoutSubviews() {
-        self.button.sizeToFit()
-        self.button.setXCenteringFromSuperview()
-        
-        self.label.setWidth(self.frame.width)
-        self.label.sizeToFit()
-        self.label.setXCenteringFromSuperview()
-        
-        var imageHeight: CGFloat = 90
-        
-        self.imageView.frame = CGRect.init(
-            x: 0, y: 0,
-            width: self.frame.width,
-            height: imageHeight
-        )
-        
-        let spaceBetwenImageAndTitle: CGFloat = 20
-        let spaceBetwenTitleAndButton: CGFloat = 10
-        var allHeight: CGFloat = self.imageView.frame.height + spaceBetwenImageAndTitle + self.label.frame.height + spaceBetwenTitleAndButton + self.button.frame.height
-        
-        if self.frame.height < allHeight {
-            imageHeight.setIfMore(when: self.frame.height - spaceBetwenImageAndTitle + self.label.frame.height + spaceBetwenTitleAndButton + self.button.frame.height)
-            if imageHeight < 0 {
-                imageHeight.setIfFewer(when: 0)
-                self.imageView.isHidden = true
-            } else {
-                self.imageView.frame = CGRect.init(
-                    x: 0, y: 0,
-                    width: self.frame.width,
-                    height: imageHeight
-                )
-                self.imageView.isHidden = false
-            }
-        }
-        
-        allHeight = self.imageView.frame.height + spaceBetwenImageAndTitle + self.label.frame.height + spaceBetwenTitleAndButton + self.button.frame.height
-        
-        self.imageView.frame.origin.y = (self.frame.height - allHeight) / 2
-        self.label.frame.origin.y = self.imageView.frame.bottomYPosition + spaceBetwenImageAndTitle
-        self.button.frame.origin.y = self.label.frame.bottomYPosition + spaceBetwenTitleAndButton
-    }
-}

Example/stork-controller/Frameworks/Sparrow/ui/views/table/cell/SPCollectionImagesTableViewCell.swift

@@ -1,155 +0,0 @@
-// 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
-
-class SPCollectionImagesTableViewCell: SPTableViewCell {
-    
-    let titleLabel = UILabel()
-    let subtitleLabel = UILabel()
-    let collectionView = SPImagesLineCollectionView()
-    
-    var topSpace: CGFloat = 11 {
-        didSet {
-            self.titleLabelTopConstraint.constant = self.topSpace
-            self.updateConstraints()
-        }
-    }
-    
-    var collectionHeight: CGFloat = 63 {
-        didSet {
-            self.collectionHeightConstraint.constant = self.collectionHeight
-            self.updateConstraints()
-        }
-    }
-    
-    //constraints
-    private var collectionTopConstraint: NSLayoutConstraint!
-    private var collectionHeightConstraint: NSLayoutConstraint!
-    private var titleLabelTopConstraint: NSLayoutConstraint!
-    
-    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
-        super.init(style: style, reuseIdentifier: reuseIdentifier)
-        self.commonInit()
-    }
-    
-    required init?(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-        self.commonInit()
-    }
-    
-    private func commonInit() {
-        let marginGuide = contentView.layoutMarginsGuide
-        
-        self.titleLabel.numberOfLines = 0
-        self.titleLabel.font = UIFont.system(type: UIFont.BoldType.Medium, size: 21)
-        self.titleLabel.textAlignment = .left
-        self.titleLabel.textColor = UIColor.black
-        self.contentView.addSubview(self.titleLabel)
-        self.titleLabel.translatesAutoresizingMaskIntoConstraints = false
-        self.titleLabel.leadingAnchor.constraint(equalTo:
-            marginGuide.leadingAnchor, constant: 0).isActive = true
-        self.titleLabel.trailingAnchor.constraint(equalTo:
-            marginGuide.trailingAnchor).isActive = true
-        self.titleLabelTopConstraint = self.titleLabel.topAnchor.constraint(equalTo:
-            marginGuide.topAnchor, constant: 0)
-        self.titleLabelTopConstraint.isActive = true
-        
-        self.subtitleLabel.numberOfLines = 3
-        self.subtitleLabel.font = UIFont.system(type: UIFont.BoldType.Regular, size: 15)
-        self.subtitleLabel.textAlignment = .left
-        self.subtitleLabel.textColor = SPNativeStyleKit.Colors.gray
-        self.contentView.addSubview(self.subtitleLabel)
-        self.subtitleLabel.translatesAutoresizingMaskIntoConstraints = false
-        self.subtitleLabel.leadingAnchor.constraint(equalTo:
-            self.titleLabel.leadingAnchor).isActive = true
-        self.subtitleLabel.trailingAnchor.constraint(equalTo:
-            marginGuide.trailingAnchor).isActive = true
-        self.subtitleLabel.topAnchor.constraint(equalTo:
-            titleLabel.bottomAnchor, constant: 3).isActive = true
-        
-        self.collectionView.backgroundColor = UIColor.clear
-        self.collectionView.showsHorizontalScrollIndicator = false
-        self.collectionView.translatesAutoresizingMaskIntoConstraints = false
-        self.contentView.addSubview(self.collectionView)
-        self.collectionView.leadingAnchor.constraint(equalTo:
-            self.leadingAnchor).isActive = true
-        self.collectionView.trailingAnchor.constraint(equalTo:
-            self.trailingAnchor).isActive = true
-        self.collectionHeightConstraint = self.collectionView.heightAnchor.constraint(equalToConstant: 63)
-        self.collectionHeightConstraint.isActive = true
-        self.collectionTopConstraint = self.collectionView.topAnchor.constraint(equalTo:
-            subtitleLabel.bottomAnchor, constant: 10)
-        self.collectionTopConstraint.isActive = true
-        self.collectionView.bottomAnchor.constraint(equalTo:
-            marginGuide.bottomAnchor, constant: -7).isActive = true
-    }
-    
-    override func prepareForReuse() {
-        super.prepareForReuse()
-        self.collectionView.reloadData()
-        self.accessoryType = .none
-    }
-    
-    override func layoutSubviews() {
-        super.layoutSubviews()
-        self.collectionView.contentInset.left = self.contentView.layoutMargins.left
-        self.collectionView.contentInset.right = self.contentView.layoutMargins.right
-        self.accessoryView?.center.y = self.titleLabel.frame.bottomYPosition + self.subtitleLabel.frame.height / 2
-        if self.accessoryView?.frame.origin.y ?? 0 < 5 {
-            self.accessoryView?.center.y = self.frame.height / 2
-        }
-    }
-    
-    override func setHighlighted(_ highlighted: Bool, animated: Bool) {
-        var backgroundColor = SPNativeStyleKit.Colors.customGray
-        if let cell = self.collectionView.cellForItem(at: IndexPath.init(row: 0, section: 0)) as? SPImageCollectionViewCell {
-            if let color = cell.view.gradeView.backgroundColor {
-                backgroundColor = color
-            }
-        }
-        
-        super.setHighlighted(highlighted, animated: animated)
-        
-        for cell in self.collectionView.visibleCells {
-            if let imageCell = cell as? SPImageCollectionViewCell {
-                imageCell.view.gradeView.backgroundColor = backgroundColor
-            }
-        }
-    }
-    
-    override func setSelected(_ selected: Bool, animated: Bool) {
-        var backgroundColor = SPNativeStyleKit.Colors.customGray
-        if let cell = self.collectionView.cellForItem(at: IndexPath.init(row: 0, section: 0)) as? SPImageCollectionViewCell {
-            if let color = cell.view.gradeView.backgroundColor {
-                backgroundColor = color
-            }
-        }
-        
-        super.setSelected(selected, animated: animated)
-        
-        for cell in self.collectionView.visibleCells {
-            if let imageCell = cell as? SPImageCollectionViewCell {
-                imageCell.view.gradeView.backgroundColor = backgroundColor
-            }
-        }
-    }
-}

Example/stork-controller/Frameworks/SparrowKit/Animation/SPAnimation.swift

@@ -21,7 +21,7 @@
 
 import UIKit
 
-public class SPAnimation {
+enum SPAnimation {
     
     static func animate(_ duration: TimeInterval,
                         animations: (() -> Void)!,
@@ -47,7 +47,7 @@ public class SPAnimation {
                                        withComplection completion: (() -> Void)! = {}) {
         
         var optionsWithRepeatition = options
-        optionsWithRepeatition.insert([.autoreverse, .repeat])
+        optionsWithRepeatition.insert([.autoreverse, .repeat, .allowUserInteraction])
         
         self.animate(
             duration,

Example/stork-controller/Frameworks/SparrowKit/Animation/SPAnimationAlpha.swift

@@ -21,11 +21,11 @@
 
 import UIKit
 
-public class SPAnimationAlpha {
+class SPAnimationAlpha {
     
-    fileprivate static let durationListAnimation: TimeInterval = 0.45
-    fileprivate static let coefLenthForTransition: CGFloat = 2.8
-    fileprivate static let delayPerItem: TimeInterval = 0.09
+    static let durationListAnimation: TimeInterval = 0.45
+    static let coefLenthForTransition: CGFloat = 2.8
+    static let delayPerItem: TimeInterval = 0.09
 
     static func hideList(_ duration: TimeInterval = durationListAnimation,
                          views: [UIView],

Example/stork-controller/Frameworks/SparrowKit/Animation/SPAnimationSpring.swift

@@ -21,10 +21,10 @@
 
 import UIKit
 
-public class SPAnimationSpring {
+class SPAnimationSpring {
     
-    fileprivate static let spring: CGFloat = 1
-    fileprivate static let velocity: CGFloat = 1
+    static let spring: CGFloat = 1
+    static let velocity: CGFloat = 1
     
     static func animate(_ duration: TimeInterval,
                         animations: (() -> Void)!,

Example/stork-controller/Frameworks/SparrowKit/Animation/SPAnimationUpward.swift

@@ -21,11 +21,11 @@
 
 import UIKit
 
-public class SPAnimationUpward {
+class SPAnimationUpward {
     
-    fileprivate static let durationListAnimation: TimeInterval = 0.45
-    fileprivate static let coefLenthForTransition: CGFloat = 2.8
-    fileprivate static let delayPerItem: TimeInterval = 0.09
+    static let durationListAnimation: TimeInterval = 0.45
+    static let coefLenthForTransition: CGFloat = 2.8
+    static let delayPerItem: TimeInterval = 0.09
     
     static func hide(_ duration: TimeInterval,
                    view: UIView,

Example/stork-controller/Frameworks/SparrowKit/App/SPApp.swift

@@ -20,6 +20,7 @@
 // SOFTWARE.
 
 import UIKit
+import StoreKit
 
 struct SPApp {
     
@@ -35,6 +36,14 @@ struct SPApp {
         return UIApplication.shared.keyWindow?.rootViewController
     }
     
+    static var safeArea: UIEdgeInsets {
+        if #available(iOS 11.0, *) {
+            return UIApplication.shared.keyWindow?.safeArea ?? UIEdgeInsets.zero
+        } else {
+            return UIEdgeInsets.zero
+        }
+    }
+    
     static func set(rootController: UIViewController, animatable: Bool = true) {
         
         rootController.view.frame = UIScreen.main.bounds
@@ -56,5 +65,12 @@ struct SPApp {
         }
     }
     
+    static func set(elementsColor: UIColor) {
+        UINavigationController.elementsColor = elementsColor
+        UIAlertController.elementsColor = elementsColor
+        UITabBarController.elementsColor = elementsColor
+        UITabBar.appearance().tintColor = elementsColor
+    }
+    
     private init() {}
 }

Example/stork-controller/Frameworks/SparrowKit/App/SPAppBadge.swift

@@ -21,25 +21,24 @@
 
 import UIKit
 
-struct SPLaunch {
+extension SPApp {
     
-    static func run() {
-        self.count += 1
-    }
-    
-    static var count: Int {
-        get {
-            return UserDefaults.standard.value(forKey: "SPLaunchCount") as? Int ?? 0
+    struct Badge {
+        
+        static var number: Int {
+            get {
+                return UIApplication.shared.applicationIconBadgeNumber
+            }
+            set {
+                UIApplication.shared.applicationIconBadgeNumber = newValue
+            }
         }
-        set {
-            UserDefaults.standard.set(newValue, forKey: "SPLaunchCount")
+        
+        static func reset() {
+            UIApplication.shared.applicationIconBadgeNumber = 0
         }
+        
+        private init() {}
     }
-    
-    static var isFirstOpen: Bool {
-        return (self.count == 1) || (self.count == 0)
-    }
-    
-    
-    private init() {}
 }
+

Example/stork-controller/Frameworks/SparrowKit/App/SPAppLaunch.swift

@@ -21,42 +21,30 @@
 
 import UIKit
 
-public class SPButton: UIButton {
+extension SPApp {
     
-    var gradientView: SPGradientView? {
-        didSet {
-            self.gradientView?.isUserInteractionEnabled = false
-            if self.gradientView?.superview == nil {
-                if self.gradientView != nil {
-                    self.insertSubview(self.gradientView!, at: 0)
-                }
+    struct Launch {
+        
+        static func run() {
+            self.count += 1
+            if (UserDefaults.standard.object(forKey: "SPDateFirstLaunch") as? Date) == nil {
+                UserDefaults.standard.set(Date(), forKey: "SPDateFirstLaunch")
             }
         }
-    }
-    
-    var round: Bool = false {
-        didSet {
-            self.layoutSubviews()
+        
+        static var count: Int {
+            get { return UserDefaults.standard.value(forKey: "SPLaunchCount") as? Int ?? 0 }
+            set { UserDefaults.standard.set(newValue, forKey: "SPLaunchCount") }
         }
-    }
-    
-    init() {
-        super.init(frame: CGRect.zero)
-        self.commonInit()
-    }
-    
-    required init?(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-        self.commonInit()
-    }
-    
-    internal func commonInit() {}
-    
-    override public func layoutSubviews() {
-        super.layoutSubviews()
-        self.gradientView?.setEqualsBoundsFromSuperview()
-        if self.round {
-            self.round()
+        
+        static var isFirstLaunch: Bool {
+            return (self.count == 1) || (self.count == 0)
         }
+        
+        static var dateFirstLaunch: Date {
+            return ((UserDefaults.standard.object(forKey: "SPDateFirstLaunch") as? Date) ?? Date())
+        }
+        
+        private init() {}
     }
 }

Example/stork-controller/Frameworks/SparrowKit/App/SPAppOpener.swift

@@ -0,0 +1,86 @@
+// 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
+import SafariServices
+
+extension SPApp {
+    
+    static func open(app: SPSystemApp) {
+        switch app {
+        case SPSystemApp.photos:
+            guard let settingsUrl = URL(string: "photos-redirect://") else {
+                return
+            }
+            
+            if UIApplication.shared.canOpenURL(settingsUrl) {
+                if #available(iOS 10.0, *) {
+                    UIApplication.shared.open(settingsUrl, completionHandler: { (success) in
+                        print("SPApp - Photos opened: \(success)")
+                    })
+                } else {
+                    UIApplication.shared.openURL(settingsUrl as URL)
+                }
+            } else {
+                print("SPApp - Photos not opened")
+            }
+        case SPSystemApp.setting:
+            DispatchQueue.main.async {
+                guard let settingsUrl = URL(string: UIApplication.openSettingsURLString) else {
+                    return
+                }
+                
+                if UIApplication.shared.canOpenURL(settingsUrl) {
+                    if #available(iOS 10.0, *) {
+                        UIApplication.shared.open(settingsUrl, completionHandler: { (success) in
+                            print("SPApp - Settings opened: \(success)")
+                        })
+                    } else {
+                        UIApplication.shared.openURL(settingsUrl as URL)
+                    }
+                } else {
+                    print("SPApp - Settings not opened")
+                }
+            }
+        }
+    }
+    
+    static func open(link: String, redirect: Bool) {
+        
+        guard let url = URL(string: link) else {
+            print("SPOpener - can not create URL")
+            return
+        }
+        
+        if redirect {
+            UIApplication.shared.open(url, options: convertToUIApplicationOpenExternalURLOptionsKeyDictionary([:]), completionHandler: nil)
+        } else {
+            if let rootController = SPApp.rootController {
+                let safariController = SFSafariViewController.init(url: url)
+                rootController.present(safariController, animated: true, completion: nil)
+            }
+        }
+    }
+}
+
+fileprivate func convertToUIApplicationOpenExternalURLOptionsKeyDictionary(_ input: [String: Any]) -> [UIApplication.OpenExternalURLOptionsKey: Any] {
+    return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIApplication.OpenExternalURLOptionsKey(rawValue: key), value)})
+}

Example/stork-controller/Frameworks/SparrowKit/AppStore/SPAppStore.swift

@@ -28,8 +28,8 @@ struct SPAppStore {
         return "https://itunes.apple.com/by/app/id" + appID
     }
     
-    static func open(appID: String) {
-        if let url = URL(string: "itms-apps://itunes.apple.com/app/id\(appID)"),
+    static func open(app id: String) {
+        if let url = URL(string: "itms-apps://itunes.apple.com/app/id\(id)"),
             UIApplication.shared.canOpenURL(url) {
             if #available(iOS 10.0, *) {
                 UIApplication.shared.open(url, options: convertToUIApplicationOpenExternalURLOptionsKeyDictionary([:]), completionHandler: nil)
@@ -56,6 +56,12 @@ struct SPAppStore {
         }
     }
     
+    static func requestReview() {
+        if #available(iOS 10.3, *) {
+            SKStoreReviewController.requestReview()
+        }
+    }
+    
     static func isUpdateAvailable(completion: @escaping (Bool)->()) {
         
         guard let info = Bundle.main.infoDictionary,
@@ -128,7 +134,6 @@ extension String {
     }
 }
 
-// Helper function inserted by Swift 4.2 migrator.
 fileprivate func convertToUIApplicationOpenExternalURLOptionsKeyDictionary(_ input: [String: Any]) -> [UIApplication.OpenExternalURLOptionsKey: Any] {
 	return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIApplication.OpenExternalURLOptionsKey(rawValue: key), value)})
 }

Example/stork-controller/Frameworks/SparrowKit/Audio/SPAudio.swift

@@ -22,21 +22,20 @@
 import UIKit
 import AVFoundation
 
-public struct SPAudio {
+struct SPAudio {
     
     static func notStopBackgroundMusic() {
         do {
             try AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category(rawValue: convertFromAVAudioSessionCategory(AVAudioSession.Category.ambient)), mode: AVAudioSession.Mode.default)
             try AVAudioSession.sharedInstance().setActive(true)
         } catch {
-            
+            print("SPAudio - notStopBackgroundMusic, error")
         }
     }
     
     private init() {}
 }
 
-// Helper function inserted by Swift 4.2 migrator.
 fileprivate func convertFromAVAudioSessionCategory(_ input: AVAudioSession.Category) -> String {
 	return input.rawValue
 }

Example/stork-controller/Frameworks/SparrowKit/Audio/SPAudioPlayer.swift

@@ -22,7 +22,7 @@
 import UIKit
 import AVFoundation
 
-public class SPAudioPlayer: NSObject, AVAudioPlayerDelegate {
+class SPAudioPlayer: NSObject, AVAudioPlayerDelegate {
     
     fileprivate var player: AVAudioPlayer = AVAudioPlayer()
     fileprivate var endPlayingComplection: (()->())? = nil
@@ -51,7 +51,7 @@ public class SPAudioPlayer: NSObject, AVAudioPlayerDelegate {
         player.stop()
     }
     
-    public func audioPlayerDidFinishPlaying(_ player: AVAudioPlayer, successfully flag: Bool) {
+    func audioPlayerDidFinishPlaying(_ player: AVAudioPlayer, successfully flag: Bool) {
         self.endPlayingComplection?()
     }
 }

Example/stork-controller/Frameworks/SparrowKit/Code Draw/SPCodeAudioIconPack.swift

@@ -23,9 +23,9 @@ import UIKit
 
 extension SPCodeDraw {
     
-    public class AudioIconPack : NSObject {
+    class AudioIconPack : NSObject {
         
-        @objc dynamic public class func drawPlay(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 200, height: 200), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 0.000, green: 0.000, blue: 0.000, alpha: 1.000)) {
+        @objc dynamic class func drawPlay(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 200, height: 200), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 0.000, green: 0.000, blue: 0.000, alpha: 1.000)) {
 
             let context = UIGraphicsGetCurrentContext()!
             
@@ -53,7 +53,7 @@ extension SPCodeDraw {
             context.restoreGState()
         }
         
-        @objc dynamic public class func drawPause(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 200, height: 200), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 0.000, green: 0.000, blue: 0.000, alpha: 1.000)) {
+        @objc dynamic class func drawPause(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 200, height: 200), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 0.000, green: 0.000, blue: 0.000, alpha: 1.000)) {
 
             let context = UIGraphicsGetCurrentContext()!
             
@@ -90,7 +90,7 @@ extension SPCodeDraw {
             context.restoreGState()
         }
         
-        @objc dynamic public class func drawStop(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 200, height: 200), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 0.000, green: 0.000, blue: 0.000, alpha: 1.000)) {
+        @objc dynamic class func drawStop(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 200, height: 200), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 0.000, green: 0.000, blue: 0.000, alpha: 1.000)) {
             
             let context = UIGraphicsGetCurrentContext()!
             
@@ -118,13 +118,13 @@ extension SPCodeDraw {
         }
 
         @objc(StyleKitNameResizingBehavior)
-        public enum ResizingBehavior: Int {
+        enum ResizingBehavior: Int {
             case aspectFit /// The content is proportionally resized to fit into the target rectangle.
             case aspectFill /// The content is proportionally resized to completely fill the target rectangle.
             case stretch /// The content is stretched to match the entire target rectangle.
             case center /// The content is centered in the target rectangle, but it is NOT resized.
             
-            public func apply(rect: CGRect, target: CGRect) -> CGRect {
+            func apply(rect: CGRect, target: CGRect) -> CGRect {
                 if rect == target || target == CGRect.zero {
                     return rect
                 }

Example/stork-controller/Frameworks/SparrowKit/Code Draw/SPCodeDraw.swift

@@ -21,4 +21,4 @@
 
 import UIKit
 
-struct SPCodeDraw { private init(){} }
+struct SPCodeDraw { private init() {} }

Example/stork-controller/Frameworks/SparrowKit/Code Draw/SPCodeSocialIconPack.swift

@@ -23,9 +23,9 @@ import UIKit
 
 extension SPCodeDraw {
     
-    public class SocialIconPack : NSObject {
+    class SocialIconPack : NSObject {
         
-        @objc dynamic public class func drawInstagram(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 40, height: 40), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 1.000, green: 1.000, blue: 1.000, alpha: 1.000)) {
+        @objc dynamic class func drawInstagram(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 40, height: 40), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 1.000, green: 1.000, blue: 1.000, alpha: 1.000)) {
 
             let context = UIGraphicsGetCurrentContext()!
             
@@ -115,7 +115,7 @@ extension SPCodeDraw {
             
         }
         
-        @objc dynamic public class func drawVK(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 40, height: 40), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 1.000, green: 1.000, blue: 1.000, alpha: 1.000)) {
+        @objc dynamic class func drawVK(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 40, height: 40), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 1.000, green: 1.000, blue: 1.000, alpha: 1.000)) {
             //// General Declarations
             let context = UIGraphicsGetCurrentContext()!
             
@@ -167,7 +167,7 @@ extension SPCodeDraw {
             context.restoreGState()
         }
         
-        @objc dynamic public class func drawWhatsapp(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 40, height: 40), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 1.000, green: 1.000, blue: 1.000, alpha: 1.000)) {
+        @objc dynamic class func drawWhatsapp(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 40, height: 40), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 1.000, green: 1.000, blue: 1.000, alpha: 1.000)) {
             //// General Declarations
             let context = UIGraphicsGetCurrentContext()!
             
@@ -237,7 +237,7 @@ extension SPCodeDraw {
             
         }
         
-        @objc dynamic public class func drawTelegram(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 40, height: 40), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 1.000, green: 1.000, blue: 1.000, alpha: 1.000)) {
+        @objc dynamic class func drawTelegram(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 40, height: 40), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 1.000, green: 1.000, blue: 1.000, alpha: 1.000)) {
             //// General Declarations
             let context = UIGraphicsGetCurrentContext()!
             
@@ -313,7 +313,7 @@ extension SPCodeDraw {
             
         }
         
-        @objc dynamic public class func drawFacebook(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 41, height: 40), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 1.000, green: 1.000, blue: 1.000, alpha: 1.000)) {
+        @objc dynamic class func drawFacebook(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 41, height: 40), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 1.000, green: 1.000, blue: 1.000, alpha: 1.000)) {
             //// General Declarations
             let context = UIGraphicsGetCurrentContext()!
             
@@ -352,7 +352,7 @@ extension SPCodeDraw {
             
         }
         
-        @objc dynamic public class func drawViber(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 41, height: 40), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 1.000, green: 1.000, blue: 1.000, alpha: 1.000)) {
+        @objc dynamic class func drawViber(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 41, height: 40), resizing: ResizingBehavior = .aspectFit, fillColor: UIColor = UIColor(red: 1.000, green: 1.000, blue: 1.000, alpha: 1.000)) {
             //// General Declarations
             let context = UIGraphicsGetCurrentContext()!
             
@@ -443,13 +443,13 @@ extension SPCodeDraw {
         }
         
         @objc(SocialIconStyleKitResizingBehavior)
-        public enum ResizingBehavior: Int {
+        enum ResizingBehavior: Int {
             case aspectFit /// The content is proportionally resized to fit into the target rectangle.
             case aspectFill /// The content is proportionally resized to completely fill the target rectangle.
             case stretch /// The content is stretched to match the entire target rectangle.
             case center /// The content is centered in the target rectangle, but it is NOT resized.
             
-            public func apply(rect: CGRect, target: CGRect) -> CGRect {
+            func apply(rect: CGRect, target: CGRect) -> CGRect {
                 if rect == target || target == CGRect.zero {
                     return rect
                 }

Example/stork-controller/Frameworks/SparrowKit/Code Draw/SPCodeSystemIconPack.swift

@@ -23,15 +23,15 @@ import UIKit
 
 extension SPCodeDraw {
     
-    public class SystemIconPack : NSObject {
+    class SystemIconPack : 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 public class var gradient: CGGradient { return Cache.gradient }
+        @objc dynamic class var gradient: CGGradient { return Cache.gradient }
 
-        @objc dynamic public class func drawFavorite(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 100, height: 100), resizing: ResizingBehavior = .aspectFit, color: UIColor = UIColor(red: 0.000, green: 0.478, blue: 1.000, alpha: 1.000)) {
+        @objc dynamic class func drawFavorite(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 100, height: 100), resizing: ResizingBehavior = .aspectFit, color: UIColor = UIColor(red: 0.000, green: 0.478, blue: 1.000, alpha: 1.000)) {
 
             let context = UIGraphicsGetCurrentContext()!
             
@@ -80,7 +80,7 @@ extension SPCodeDraw {
             context.restoreGState()
         }
         
-        @objc dynamic public class func drawFavoriteFill(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 100, height: 100), resizing: ResizingBehavior = .aspectFit, color: UIColor = UIColor(red: 0.000, green: 0.478, blue: 1.000, alpha: 1.000)) {
+        @objc dynamic class func drawFavoriteFill(frame targetFrame: CGRect = CGRect(x: 0, y: 0, width: 100, height: 100), resizing: ResizingBehavior = .aspectFit, color: UIColor = UIColor(red: 0.000, green: 0.478, blue: 1.000, alpha: 1.000)) {
             
             let context = UIGraphicsGetCurrentContext()!
 
@@ -113,7 +113,7 @@ extension SPCodeDraw {
             context.restoreGState()
         }
         
-        @objc dynamic public class func drawShare(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)) {
+        @objc dynamic class func drawShare(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()!
 
@@ -154,7 +154,7 @@ extension SPCodeDraw {
             context.restoreGState()
         }
         
-        @objc dynamic public 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)) {
+        @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()!
 
@@ -192,13 +192,13 @@ extension SPCodeDraw {
         }
         
         @objc(StyleKitNameResizingBehavior)
-        public enum ResizingBehavior: Int {
+        enum ResizingBehavior: Int {
             case aspectFit /// The content is proportionally resized to fit into the target rectangle.
             case aspectFill /// The content is proportionally resized to completely fill the target rectangle.
             case stretch /// The content is stretched to match the entire target rectangle.
             case center /// The content is centered in the target rectangle, but it is NOT resized.
             
-            public func apply(rect: CGRect, target: CGRect) -> CGRect {
+            func apply(rect: CGRect, target: CGRect) -> CGRect {
                 if rect == target || target == CGRect.zero {
                     return rect
                 }

Example/stork-controller/Frameworks/SparrowKit/Constraints/SPConstraints.swift

@@ -21,17 +21,21 @@
 
 import UIKit
 
-public struct SPConstraints {
+struct SPConstraints {
     
-    static func setEqualSize(_ view: UIView, superVuew: UIView) {
-        view.translatesAutoresizingMaskIntoConstraints = false
-        NSLayoutConstraint.activate([
-            view.topAnchor.constraint(equalTo: superVuew.topAnchor),
-            view.leftAnchor.constraint(equalTo: superVuew.leftAnchor),
-            view.rightAnchor.constraint(equalTo: superVuew.rightAnchor),
-            view.bottomAnchor.constraint(equalTo: superVuew.bottomAnchor)
-        ])
+    static func setEqualSizeSuperview(for view: UIView) {
+        if let superView = view.superview {
+            view.translatesAutoresizingMaskIntoConstraints = false
+            NSLayoutConstraint.activate([
+                view.topAnchor.constraint(equalTo: superView.topAnchor),
+                view.leftAnchor.constraint(equalTo: superView.leftAnchor),
+                view.rightAnchor.constraint(equalTo: superView.rightAnchor),
+                view.bottomAnchor.constraint(equalTo: superView.bottomAnchor)
+            ])
+        }
     }
+    
+    private init() {}
 }
 
 

Example/stork-controller/Frameworks/SparrowKit/Delay/SPDelay.swift

@@ -21,7 +21,7 @@
 
 import Foundation
 
-public func delay(_ delay:Double, closure:@escaping ()->()) {
+func delay(_ delay:Double, closure: @escaping ()->()) {
     let when = DispatchTime.now() + delay
     DispatchQueue.main.asyncAfter(deadline: when) {
         closure()

Example/stork-controller/Frameworks/SparrowKit/Device/SPDevice.swift

@@ -23,11 +23,11 @@ import UIKit
 
 struct SPDevice {
     
-    static var isIphone: Bool {
+    static var iphone: Bool {
         return UIDevice.current.userInterfaceIdiom == .phone
     }
     
-    static var isIpad: Bool {
+    static var ipad: Bool {
         return UIDevice.current.userInterfaceIdiom == .pad
     }
     

Example/stork-controller/Frameworks/SparrowKit/Downloader/SPDownloader.swift

@@ -30,6 +30,7 @@ struct SPDownloader {
             }
             return
         }
+        
         URLSession.shared.dataTask(with: url) { (data, response, error) in
             guard
                 let httpURLResponse = response as? HTTPURLResponse, httpURLResponse.statusCode == 200,
@@ -47,6 +48,8 @@ struct SPDownloader {
             }
             }.resume()
     }
+    
+    private init() {}
 }
 
 

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

@@ -43,7 +43,7 @@ extension Array where Element: Equatable {
 extension Array where Element: Hashable {
     
     func after(item: Element) -> Element? {
-        if let index = self.index(of: item), index + 1 < self.count { return self[index + 1] }
+        if let index = self.firstIndex(of: item), index + 1 < self.count { return self[index + 1] }
         return nil
     }
 }

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

@@ -0,0 +1,51 @@
+// 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
+
+extension CGRect {
+    
+    var bottomX: CGFloat {
+        get { return self.origin.x + self.width }
+        set { self.origin.x = newValue - self.width }
+    }
+    
+    var bottomY: CGFloat {
+        get { return self.origin.y + self.height }
+        set { self.origin.y = newValue - self.height }
+    }
+    
+    var minSide: CGFloat {
+        return min(self.width, self.height)
+    }
+    
+    mutating func set(width: CGFloat) {
+        self = CGRect.init(x: self.origin.x, y: self.origin.y, width: width, height: self.height)
+    }
+    
+    mutating func set(height: CGFloat) {
+        self = CGRect.init(x: self.origin.x, y: self.origin.y, width: self.width, height: height)
+    }
+    
+    mutating func set(width: CGFloat, height: CGFloat) {
+        self = CGRect.init(x: self.origin.x, y: self.origin.y, width: width, height: height)
+    }
+}

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

@@ -0,0 +1,42 @@
+// 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 Foundation
+
+extension Date {
+    
+    func format(mask: String) -> String {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = mask
+        return dateFormatter.string(from: self)
+    }
+    
+    static func create(from value: String) -> Date? {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "dd.MM.yyyy HH:mm"
+        let date = formatter.date(from: value)
+        return date
+    }
+    
+    func add(days: Int) -> Date {
+        return Calendar.current.date(byAdding: .day, value: days, to: self) ?? self
+    }
+}

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

@@ -23,13 +23,13 @@ import Foundation
 
 extension Strideable {
     
-    public mutating func setIfMore(when value: Self) {
+    mutating func setIfMore(when value: Self) {
         if self > value {
             self = value
         }
     }
     
-    public mutating func setIfFewer(when value: Self) {
+    mutating func setIfFewer(when value: Self) {
         if self < value {
             self = value
         }

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

@@ -24,6 +24,10 @@ import UIKit
 
 extension String {
     
+    var digits: String {
+        return components(separatedBy: CharacterSet.decimalDigits.inverted).joined()
+    }
+    
     mutating func dropLast(substring: String) {
         if self.hasSuffix(substring) {
             self = String(dropLast(substring.count))
@@ -66,7 +70,32 @@ extension String {
         return false
     }
     
+    var isEmptyContent: Bool {
+        return (self.removeAllSpaces() == "")
+    }
+    
+    var words: [String] {
+        return components(separatedBy: .punctuationCharacters).joined().components(separatedBy: .whitespaces)
+    }
+    
+    func removePrefix(_ prefix: String) -> String {
+        guard self.hasPrefix(prefix) else { return self }
+        return String(self.dropFirst(prefix.count))
+    }
+    
     mutating func replace(_ replacingString: String, with newString: String) {
         self = self.replacingOccurrences(of: replacingString, with: newString)
     }
+    
+    func replace(_ replacingString: String, with newString: String) -> String {
+        return self.replacingOccurrences(of: replacingString, with: newString)
+    }
+    
+    func slice(from: String, to: String) -> String? {
+        return (range(of: from)?.upperBound).flatMap { substringFrom in
+            (range(of: to, range: substringFrom..<endIndex)?.lowerBound).map { substringTo in
+                String(self[substringFrom..<substringTo])
+            }
+        }
+    }
 }

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

@@ -32,20 +32,19 @@ extension UIAlertController {
         }
     }
     
-    public static func show(title: String, message: String, buttonTitle: String, cancelButtonTitle: String? = nil, complection: @escaping ()->() = {}, on viewController: UIViewController) {
+    static func show(title: String, message: String, buttonTitle: String, cancelButtonTitle: String? = nil, complection: @escaping ()->() = {}, on viewController: UIViewController) {
         let ac = UIAlertController(
             title: title,
             message: message,
             preferredStyle: .alert
         )
         
-        if cancelButtonTitle != nil {
-            ac.addAction(UIAlertAction.init(
-                title: cancelButtonTitle!,
-                style: UIAlertAction.Style.cancel,
-                handler: nil)
-            )
-        }
+        guard cancelButtonTitle != nil else { return }
+        ac.addAction(UIAlertAction.init(
+            title: cancelButtonTitle!,
+            style: UIAlertAction.Style.cancel,
+            handler: nil)
+        )
         
         ac.addAction(UIAlertAction.init(
             title: buttonTitle,
@@ -57,17 +56,15 @@ extension UIAlertController {
         viewController.present(ac, animated: true, completion: nil)
     }
     
-    public static func сonfirm(title: String? = nil, message: String, buttonTitle: String, cancelButtonTitle: String, isDestructive: Bool = false, complection: @escaping (Bool)->(), on viewController: UIViewController) {
+    static func сonfirm(title: String? = nil, message: String, buttonTitle: String, cancelButtonTitle: String, isDestructive: Bool = false, complection: @escaping (Bool)->(), on viewController: UIViewController) {
         let ac = UIAlertController(
             title: title,
             message: message,
             preferredStyle: .actionSheet
         )
         
-        var style = UIAlertAction.Style.default
-        if isDestructive {
-            style = .destructive
-        }
+        let style = isDestructive ? .destructive : UIAlertAction.Style.default
+
         ac.addAction(UIAlertAction.init(
             title: buttonTitle,
             style: style,
@@ -76,11 +73,10 @@ extension UIAlertController {
         }))
         ac.addAction(UIAlertAction.init(
             title: cancelButtonTitle,
-            style: UIAlertAction.Style.default,
+            style: UIAlertAction.Style.cancel,
             handler: { (action) in
                 complection(false)
         }))
-        
         viewController.present(ac, animated: true, completion: nil)
     }
 }
@@ -100,4 +96,11 @@ extension UIAlertController {
         }
         self.addAction(action)
     }
+    
+    func addCancelAction(title: String, complection: @escaping ()->() = {}) {
+        let action = UIAlertAction(title: title, style: .cancel) { (action) in
+            complection()
+        }
+        self.addAction(action)
+    }
 }

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

@@ -60,8 +60,11 @@ extension UIButton {
 
 extension UIButton {
     
-    func setTitle(_ title: String) {
+    func setTitle(_ title: String, color: UIColor? = nil) {
         self.setTitle(title, for: .normal)
+        if let color = color {
+            self.setTitleColor(color)
+        }
     }
     
     func setTitleColor(_ color: UIColor) {
@@ -69,6 +72,11 @@ extension UIButton {
         self.setTitleColor(color.withAlphaComponent(0.7), for: .highlighted)
     }
     
+    func setImage(_ image: UIImage) {
+        self.setImage(image, for: .normal)
+        self.imageView?.contentMode = .scaleAspectFit
+    }
+    
     func removeAllTargets() {
         self.removeTarget(nil, action: nil, for: .allEvents)
     }
@@ -98,11 +106,11 @@ extension UIButton {
     }
     
     func setAnimatableText(_ text: String, withComplection completion: (() -> Void)! = {}) {
-        SPAnimation.animate(0.2, animations: {
+        SPAnimation.animate(0.3, animations: {
             self.titleLabel?.alpha = 0
         }, withComplection: {
             self.setTitle(text, for: .normal)
-            SPAnimation.animate(0.2, animations: {
+            SPAnimation.animate(0.3, animations: {
                 self.titleLabel?.alpha = 1
             }, withComplection: {   
                 completion()
@@ -111,7 +119,7 @@ extension UIButton {
     }
     
     func hideContent(completion: (() -> Void)! = {}) {
-        SPAnimation.animate(0.2, animations: {
+        SPAnimation.animate(0.25, animations: {
             self.titleLabel?.alpha = 0
         }, withComplection: {
              completion()
@@ -119,7 +127,7 @@ extension UIButton {
     }
     
     func showContent(completion: (() -> Void)! = {}) {
-        SPAnimation.animate(0.2, animations: {
+        SPAnimation.animate(0.25, animations: {
             self.titleLabel?.alpha = 1
         }, withComplection: {
             completion()

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

@@ -0,0 +1,56 @@
+// 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
+
+extension UICollectionView {
+    
+    var currentIndexCellPath: IndexPath? {
+        let visibleRect = CGRect(origin: self.contentOffset, size: self.bounds.size)
+        let visiblePoint = CGPoint.init(x: visibleRect.midX, y: visibleRect.midY)
+        let visibleIndexPath = self.indexPathForItem(at: visiblePoint)
+        return visibleIndexPath
+    }
+    
+    func lastRow(indexPath: IndexPath) -> Int {
+        return self.numberOfItems(inSection: indexPath.section) - 1
+    }
+    
+    func isLastRow(indexPath: IndexPath) -> Bool {
+        return indexPath.row == self.lastRow(indexPath: indexPath)
+    }
+    
+    func reloadData(animated: Bool, complection: @escaping ()->() = {}) {
+        if animated {
+            UIView.transition(
+                with: self,
+                duration: 0.3,
+                options: [.transitionCrossDissolve, UIView.AnimationOptions.beginFromCurrentState],
+                animations: {
+                    self.reloadData()
+            }, completion: {(state) in
+                complection()
+            })
+        } else {
+            self.reloadData()
+        }
+    }
+}

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

@@ -21,7 +21,7 @@
 
 import UIKit
 
-public extension UIColor {
+extension UIColor {
     
     convenience init(hex: String) {
         var red:   CGFloat = 0.0

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

@@ -0,0 +1,61 @@
+// 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
+
+extension UIFont {
+    
+    static func system(weight: FontWeight, size: CGFloat) -> UIFont {
+        return UIFont.systemFont(ofSize: size, weight: self.weight(for: weight))
+    }
+    
+    private static func weight(for weight: FontWeight) -> UIFont.Weight {
+        switch weight {
+        case .ultraLight:
+            return UIFont.Weight.ultraLight
+        case .light:
+            return UIFont.Weight.light
+        case .medium:
+            return UIFont.Weight.medium
+        case .regular:
+            return UIFont.Weight.regular
+        case .bold:
+            return UIFont.Weight.bold
+        case .demiBold:
+            return UIFont.Weight.semibold
+        case .heavy:
+            return UIFont.Weight.heavy
+        default:
+            return UIFont.Weight.regular
+        }
+    }
+    
+    enum FontWeight {
+        case regular
+        case medium
+        case light
+        case ultraLight
+        case heavy
+        case bold
+        case demiBold
+        case none
+    }
+}

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

@@ -21,9 +21,9 @@
 
 import UIKit
 
-public extension UIImage {
+extension UIImage {
     
-    public func resize(width: CGFloat) -> UIImage {
+    func resize(width: CGFloat) -> UIImage {
         let scale = width / self.size.width
         let newHeight = self.size.height * scale
         UIGraphicsBeginImageContext(CGSize(width: width, height: newHeight))
@@ -32,4 +32,12 @@ public extension UIImage {
         UIGraphicsEndImageContext()
         return newImage!
     }
+    
+    var alwaysOriginal: UIImage {
+        return self.withRenderingMode(.alwaysOriginal)
+    }
+    
+    var alwaysTemplate: UIImage {
+        return self.withRenderingMode(.alwaysTemplate)
+    }
 }

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

@@ -23,13 +23,13 @@ import UIKit
 
 extension UIImageView {
     
-    public func setNative() {
+    func setNative() {
         self.layer.borderWidth = 0.5
-        self.layer.borderColor = SPNativeStyleKit.Colors.midGray.cgColor
+        self.layer.borderColor = SPNativeColors.midGray.cgColor
         self.layer.masksToBounds = true
     }
     
-    public func downloadedFrom(url: URL, contentMode mode: UIView.ContentMode = .scaleAspectFit, withComplection complection: @escaping (UIImage?) -> () = {_ in }) {
+    func downloadedFrom(url: URL, contentMode mode: UIView.ContentMode = .scaleAspectFit, withComplection complection: @escaping (UIImage?) -> () = {_ in }) {
         DispatchQueue.main.async {
             self.contentMode = mode
         }
@@ -47,7 +47,7 @@ extension UIImageView {
             }.resume()
     }
     
-    public func downloadedFrom(link: String, contentMode mode: UIView.ContentMode = .scaleAspectFit, withComplection complection: @escaping (UIImage?) -> () = {_ in }) {
+    func downloadedFrom(link: String, contentMode mode: UIView.ContentMode = .scaleAspectFit, withComplection complection: @escaping (UIImage?) -> () = {_ in }) {
         guard let url = URL(string: link) else { return }
         downloadedFrom(url: url, contentMode: mode, withComplection: complection)
     }

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

@@ -21,7 +21,7 @@
 
 import UIKit
 
-public extension UILabel {
+extension UILabel {
     
     func setShadowOffsetForLetters(blurRadius: CGFloat = 0, widthOffset: CGFloat = 0, heightOffset: CGFloat, opacity: CGFloat) {
         self.layer.shadowRadius = blurRadius
@@ -42,7 +42,7 @@ public extension UILabel {
         self.setShadowOffsetForLetters(blurRadius: 0, widthOffset: 0, heightOffset: 0, opacity: 0)
     }
     
-    func setCenteringAlignment() {
+    func setCenterAlignment() {
         self.textAlignment = .center
         self.baselineAdjustment = .alignCenters
     }
@@ -53,4 +53,41 @@ public extension UILabel {
             attributedText = NSAttributedString(string: textString, attributes: attrs)
         }
     }
+    
+    func setLineSpacing(_ lineSpacing: CGFloat = 0.0, lineHeightMultiple: CGFloat = 0.0) {
+        
+        guard let labelText = self.text else { return }
+        
+        let paragraphStyle = NSMutableParagraphStyle()
+        paragraphStyle.lineSpacing = lineSpacing
+        paragraphStyle.lineHeightMultiple = lineHeightMultiple
+        
+        let attributedString:NSMutableAttributedString
+        if let labelattributedText = self.attributedText {
+            attributedString = NSMutableAttributedString(attributedString: labelattributedText)
+        } else {
+            attributedString = NSMutableAttributedString(string: labelText)
+        }
+        
+        attributedString.addAttribute(NSAttributedString.Key.paragraphStyle, value:paragraphStyle, range:NSMakeRange(0, attributedString.length))
+        
+        self.attributedText = attributedString
+    }
+    
+    func setFormat(text: String, positions: [(start: Int, length: Int)], hithiglightFont: UIFont, higlightColor: UIColor) {
+        
+        let title = NSMutableAttributedString.init(string: text)
+        
+        for position in positions {
+            title.addAttributes(
+                [
+                    NSAttributedString.Key.foregroundColor : higlightColor,
+                    NSAttributedString.Key.font : hithiglightFont
+                ],
+                range: NSRange.init(location: position.start, length: position.length)
+            )
+        }
+        
+        self.attributedText = title
+    }
 }

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

@@ -28,7 +28,7 @@ extension UINavigationController {
             if UINavigationBar.appearance().tintColor != nil {
                 return UINavigationBar.appearance().tintColor
             } else {
-                return SPNativeStyleKit.Colors.blue
+                return SPNativeColors.blue
             }
         }
         set {

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

@@ -23,6 +23,19 @@ import UIKit
 
 extension UITabBarController {
     
+    static var elementsColor: UIColor {
+        get {
+            if UITabBar.appearance().tintColor != nil {
+                return UITabBar.appearance().tintColor
+            } else {
+                return SPNativeColors.blue
+            }
+        }
+        set {
+            UINavigationBar.appearance().tintColor = newValue
+        }
+    }
+    
     func addTabBarItem(title: String, image: UIImage, selectedImage: UIImage? = nil, controller: UIViewController) {
         
         let tabBarItem = UITabBarItem(

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

@@ -23,7 +23,7 @@ import UIKit
 
 extension UITableViewCell {
     
-    public var accessoryView: UIView? {
+    var accessoryView: UIView? {
         return subviews.compactMap { $0 as? UIButton }.first
     }
     
@@ -33,12 +33,12 @@ extension UITableViewCell {
         }
         set {
             let backgroundView = UIView()
-            backgroundView.backgroundColor = SPNativeStyleKit.Colors.customGray
+            backgroundView.backgroundColor = SPNativeColors.customGray
             self.selectedBackgroundView = backgroundView
         }
     }
     
-    public func highlight() {
+    func highlight() {
         self.setHighlighted(true, animated: false)
         self.setHighlighted(false, animated: true)
     }

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

@@ -55,12 +55,10 @@ extension UIViewController {
 extension UIViewController {
     
     func save(image: UIImage) {
-        if SPPermission.isAllow(.photoLibrary) {
+        if PHPhotoLibrary.authorizationStatus() == PHAuthorizationStatus.authorized {
             UIImageWriteToSavedPhotosAlbum(image, self, #selector(self.image(_:didFinishSavingWithError:contextInfo:)), nil)
         } else {
-            SPPermission.request(.photoLibrary) {
-                UIImageWriteToSavedPhotosAlbum(image, self, #selector(self.image(_:didFinishSavingWithError:contextInfo:)), nil)
-            }
+            print("Saving image error. Not allowed permission")
         }
     }
     
@@ -137,6 +135,10 @@ extension UIViewController {
             if #available(iOS 11.0, *) {
                 self.navigationItem.largeTitleDisplayMode = .never
             }
+        case .noContent:
+            if #available(iOS 11.0, *) {
+                self.navigationItem.largeTitleDisplayMode = .never
+            }
         }        
     }
 }

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

@@ -21,48 +21,32 @@
 
 import UIKit
 
-public extension UIView {
+extension UIView {
     
-    var viewController: UIViewController? {
+    var controller: UIViewController? {
         get {
             if let nextResponder = self.next as? UIViewController { return nextResponder }
-            else if let nextResponder = self.next as? UIView { return nextResponder.viewController }
+            else if let nextResponder = self.next as? UIView { return nextResponder.controller }
             else { return nil }
         }
     }
 }
 
-public extension UIView {
+extension UIView {
     
-    var topSafeArea: CGFloat {
-        var topSafeArea: CGFloat = 0
+    var safeArea: UIEdgeInsets {
         if #available(iOS 11.0, *) {
-            topSafeArea = self.safeAreaInsets.top
+            return self.safeAreaInsets
+        } else{
+            return UIEdgeInsets.zero
         }
-        return topSafeArea
     }
     
-    var bottomSafeArea: CGFloat {
-        var bottomSafeArea: CGFloat = 0
-        if #available(iOS 11.0, *) {
-            bottomSafeArea = self.safeAreaInsets.bottom
-        }
-        return bottomSafeArea
+    func setBounds(_ view: UIView, withWidthFactor widthFactor: CGFloat = 1, maxWidth: CGFloat? = nil, withHeightFactor heightFactor: CGFloat = 1, maxHeight: CGFloat? = nil, withCentering: Bool = false) {
+        self.setBounds(view.bounds, withWidthFactor: widthFactor, maxWidth: maxWidth, withHeightFactor: heightFactor, maxHeight: maxHeight, withCentering: withCentering)
     }
     
-    func setHeight(_ height: CGFloat) {
-        self.frame = CGRect.init(x: self.frame.origin.x, y: self.frame.origin.y, width: self.frame.width, height: height)
-    }
-    
-    func setWidth(_ width: CGFloat) {
-        self.frame = CGRect.init(x: self.frame.origin.x, y: self.frame.origin.y, width: width, height: self.frame.height)
-    }
-    
-    func setEqualsFrameFromBounds(_ view: UIView, withWidthFactor widthFactor: CGFloat = 1, maxWidth: CGFloat? = nil, withHeightFactor heightFactor: CGFloat = 1, maxHeight: CGFloat? = nil, withCentering: Bool = false) {
-        self.setEqualsFrameFromBounds(view.bounds, withWidthFactor: widthFactor, maxWidth: maxWidth, withHeightFactor: heightFactor, maxHeight: maxHeight, withCentering: withCentering)
-    }
-    
-    func setEqualsFrameFromBounds(_ bounds: CGRect, withWidthFactor widthFactor: CGFloat = 1, maxWidth: CGFloat? = nil, withHeightFactor heightFactor: CGFloat = 1, maxHeight: CGFloat? = nil, withCentering: Bool = false) {
+    func setBounds(_ bounds: CGRect, withWidthFactor widthFactor: CGFloat = 1, maxWidth: CGFloat? = nil, withHeightFactor heightFactor: CGFloat = 1, maxHeight: CGFloat? = nil, withCentering: Bool = false) {
         
         var width = bounds.width * widthFactor
         if maxWidth != nil { width.setIfMore(when: maxWidth!) }
@@ -78,14 +62,14 @@ public extension UIView {
         }
     }
     
-    func setEqualsBoundsFromSuperview(customWidth: CGFloat? = nil, customHeight: CGFloat? = nil) {
+    func setSuperviewBounds(customWidth: CGFloat? = nil, customHeight: CGFloat? = nil) {
         if self.superview == nil { return }
         self.frame = CGRect.init(origin: CGPoint.zero, size: self.superview!.frame.size)
         if customWidth != nil {
-            self.frame = CGRect.init(origin: CGPoint.zero, size: CGSize.init(width: customWidth!, height: self.frame.height))
+            self.frame = CGRect.init(origin: CGPoint.zero, size: CGSize.init(width: customWidth!, height: self.superview!.frame.height))
         }
         if customHeight != nil {
-            self.frame = CGRect.init(origin: CGPoint.zero, size: CGSize.init(width: self.frame.width, height: customHeight!))
+            self.frame = CGRect.init(origin: CGPoint.zero, size: CGSize.init(width: self.superview!.frame.width, height: customHeight!))
         }
     }
     
@@ -111,23 +95,23 @@ public extension UIView {
         )
     }
     
-    func setYCenteringFromSuperview() {
+    func setYCenter() {
         self.center.y = (self.superview?.frame.height ?? 0) / 2
     }
     
-    func setXCenteringFromSuperview() {
+    func setXCenter() {
         self.center.x = (self.superview?.frame.width ?? 0) / 2
     }
     
-    func setToCenterInSuperview() {
+    func setToCenter() {
         self.center = CGPoint.init(x: ((self.superview?.frame.width) ?? 0) / 2, y: ((self.superview?.frame.height) ?? 0) / 2)
     }
 }
 
-public extension UIView {
+extension UIView {
     
     func setParalax(amountFactor: CGFloat) {
-        let amount = self.frame.minSideSize * amountFactor
+        let amount = self.frame.minSide * amountFactor
         self.setParalax(amount: amount)
     }
     
@@ -147,13 +131,13 @@ public extension UIView {
     }
 }
 
-public extension UIView {
+extension UIView {
     
     func addGrade(alpha: CGFloat, color: UIColor = UIColor.black) -> UIView {
         let gradeView = UIView.init()
         gradeView.alpha = 0
         self.addSubview(gradeView)
-        SPConstraints.setEqualSize(gradeView, superVuew: self)
+        SPConstraints.setEqualSizeSuperview(for: gradeView)
         gradeView.alpha = alpha
         gradeView.backgroundColor = color
         return gradeView
@@ -177,14 +161,14 @@ extension UIView {
         let xTranslation = (self.frame.width - shadowWidth) / 2 + (self.frame.width * xTranslationFactor)
         let yTranslation = (self.frame.height - shadowHeight) / 2 + (self.frame.height * yTranslationFactor)
         
-        let cornerRadius = self.frame.minSideSize * cornerRadiusFactor
+        let cornerRadius = self.frame.minSide * cornerRadiusFactor
         
         let shadowPath = UIBezierPath.init(
             roundedRect: CGRect.init(x: xTranslation, y: yTranslation, width: shadowWidth, height: shadowHeight),
             cornerRadius: cornerRadius
         )
         
-        let blurRadius = self.frame.minSideSize * blurRadiusFactor
+        let blurRadius = self.frame.minSide * blurRadiusFactor
         
         self.layer.shadowColor = UIColor.black.cgColor
         self.layer.shadowOffset = CGSize.zero
@@ -280,6 +264,6 @@ extension UIView {
     }
     
     func round() {
-        self.layer.cornerRadius = self.frame.minSideSize / 2
+        self.layer.cornerRadius = self.frame.minSide / 2
     }
 }

Example/stork-controller/Frameworks/SparrowKit/Layout/SPLayout.swift

@@ -21,22 +21,34 @@
 
 import UIKit
 
-class SPLayout {
+struct SPLayout {
     
-    static func sizeWith(widthFactor: CGFloat, maxWidth: CGFloat, heightFactor: CGFloat, maxHeight: CGFloat, relativeSideFactor: CGFloat, from relativeSize: CGSize) -> CGSize {
+    static func sizeWith(widthFactor: CGFloat, maxWidth: CGFloat?, heightFactor: CGFloat, maxHeight: CGFloat?, relativeSideFactor: CGFloat?, from size: CGSize) -> CGSize {
         
-        var widthArea = relativeSize.width * widthFactor
-        var heightArea = relativeSize.height * heightFactor
+        var widthArea = size.width * widthFactor
+        var heightArea = size.height * heightFactor
         
-        widthArea.setIfMore(when: maxWidth)
-        heightArea.setIfMore(when: maxHeight)
+        if let maxWidth = maxWidth {
+            widthArea.setIfMore(when: maxWidth)
+        }
+        
+        if let maxHeight = maxHeight {
+            heightArea.setIfMore(when: maxHeight)
+        }
         
         var prepareWidth = widthArea
-        var prepareHeight = widthArea / relativeSideFactor
-        if prepareHeight > heightArea {
-            prepareHeight = heightArea
-            prepareWidth = heightArea * relativeSideFactor
+        var prepareHeight = heightArea
+        
+        if let relativeSideFactor = relativeSideFactor {
+            prepareHeight = widthArea / relativeSideFactor
+            if prepareHeight > heightArea {
+                prepareHeight = heightArea
+                prepareWidth = heightArea * relativeSideFactor
+            }
         }
+        
         return CGSize.init(width: prepareWidth, height: prepareHeight)
     }
+    
+    private init() {}
 }

Example/stork-controller/Frameworks/SparrowKit/Local Authentication/SPLocalAuthentication.swift

@@ -0,0 +1,60 @@
+// 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
+import LocalAuthentication
+
+struct SPLocalAuthentication {
+    
+    static var isEnable: Bool {
+        let context = LAContext()
+        var error: NSError?
+        if context.canEvaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, error: &error) {
+            return true
+        } else {
+            if context.canEvaluatePolicy(.deviceOwnerAuthentication, error: &error) {
+                return true
+            } else {
+                return false
+            }
+        }
+    }
+    
+    static func request(reason: String, complecton: @escaping (Bool)->()) {
+        let context = LAContext()
+        var error: NSError?
+        if context.canEvaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, error: &error) {
+            context.evaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, localizedReason: reason) { success, error in
+                DispatchQueue.main.async { complecton(success) }
+            }
+        } else {
+            if context.canEvaluatePolicy(.deviceOwnerAuthentication, error: &error) {
+                context.evaluatePolicy(.deviceOwnerAuthentication, localizedReason: reason) { success, error in
+                    DispatchQueue.main.async { complecton(success) }
+                }
+            } else {
+                complecton(false)
+            }
+        }
+    }
+    
+    private init() {}
+}

Example/stork-controller/Frameworks/SparrowKit/Mail/SPMail.swift

@@ -28,7 +28,7 @@ struct SPMail {
         return MFMailComposeViewController.canSendMail()
     }
     
-    static func openMailApp(to email: String, subject: String? = nil, body: String? = nil) {
+    static func openApp(to email: String, subject: String? = nil, body: String? = nil) {
         let parametrs = "mailto:\(email)?subject=\(subject ?? "")&body=\(body ?? "")".addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)
         
         if parametrs != nil {
@@ -40,7 +40,7 @@ struct SPMail {
         }
     }
     
-    static func mailDialog(to email: String, subject: String? = nil, body: String? = nil, on viewController: UIViewController) {
+    static func dialog(to email: String, subject: String? = nil, body: String? = nil, on viewController: UIViewController) {
         let mailVC = MFMailComposeViewController()
         mailVC.mailComposeDelegate = SPMailSingltone.sharedInstance
 
@@ -69,7 +69,6 @@ struct SPMail {
     private init() {}
 }
 
-// Helper function inserted by Swift 4.2 migrator.
 fileprivate func convertToUIApplicationOpenExternalURLOptionsKeyDictionary(_ input: [String: Any]) -> [UIApplication.OpenExternalURLOptionsKey: Any] {
 	return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIApplication.OpenExternalURLOptionsKey(rawValue: key), value)})
 }

Example/stork-controller/Frameworks/SparrowKit/Native/SPNativeColors.swift

@@ -0,0 +1,41 @@
+// 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
+
+enum SPNativeColors {
+    
+    static let red = UIColor.init(hex: "FF3B30")
+    static let orange = UIColor.init(hex: "FF9500")
+    static let yellow = UIColor.init(hex: "FFCC00")
+    static let green = UIColor.init(hex: "4CD964")
+    static let tealBlue = UIColor.init(hex: "5AC8FA")
+    static let blue = UIColor.init(hex: "007AFF")
+    static let purple = UIColor.init(hex: "5856D6")
+    static let pink = UIColor.init(hex: "FF2D55")
+    static let white = UIColor.init(hex: "FFFFFF")
+    static let customGray = UIColor.init(hex: "EFEFF4")
+    static let lightGray = UIColor.init(hex: "E5E5EA")
+    static let lightGray2 = UIColor.init(hex: "D1D1D6")
+    static let midGray = UIColor.init(hex: "C7C7CC")
+    static let gray = UIColor.init(hex: "8E8E93")
+    static let black = UIColor.init(hex: "000000")
+}

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

@@ -0,0 +1,88 @@
+// 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
+import UserNotifications
+
+struct SPLocalNotification {
+    
+    var identificator: String? = nil
+    var text: String
+    var title: String? = nil
+    var badge: Int = 0
+    var timeInterval: TimeInterval
+    var soundEnabled: Bool = true
+    var category: SPLocalNotificationCategory? = nil
+    
+    init(after timeInterval: TimeInterval, text: String) {
+        self.text = text
+        self.timeInterval = timeInterval
+    }
+    
+    func add() {
+        let identificator = self.identificator ?? "\(self.timeInterval)\(self.text)\(Int.random(min: 0, max: 1000))"
+        
+        let notification = UNNotificationRequest(
+            identifier: identificator,
+            content: self.content,
+            trigger: self.trigger
+        )
+        
+        let center = UNUserNotificationCenter.current()
+        center.add(notification) { (error) in
+            if let error = error {
+                print("SPLocalNotification - \(error)")
+            }
+        }
+    }
+    
+    private var content: UNMutableNotificationContent {
+        let content = UNMutableNotificationContent()
+        content.body = self.text
+        content.title = self.title ?? ""
+        content.badge = NSNumber(value: UIApplication.shared.applicationIconBadgeNumber + self.badge)
+        content.sound = self.soundEnabled ? UNNotificationSound.default : nil
+        
+        if let category = self.category {
+            if #available(iOS 12.0, *) {
+                let notificationCategory = UNNotificationCategory(identifier: category.identifier, actions: [], intentIdentifiers: [], hiddenPreviewsBodyPlaceholder: nil, categorySummaryFormat: category.summary, options: [])
+                UNUserNotificationCenter.current().setNotificationCategories([notificationCategory])
+                content.categoryIdentifier = notificationCategory.identifier
+            }
+        }
+        
+        return content
+    }
+    
+    private var trigger: UNTimeIntervalNotificationTrigger {
+        return UNTimeIntervalNotificationTrigger(timeInterval: self.timeInterval, repeats: false)
+    }
+}
+
+struct SPLocalNotificationCategory {
+    
+    var identifier: String
+    var summary: String
+    
+    var countSymbol: String {
+        return "%u"
+    }
+}

Example/stork-controller/Frameworks/SparrowKit/Random/SPRandom.swift

@@ -21,8 +21,9 @@
 
 import UIKit
 
-public extension String {
-    public static func random(count: Int) -> String {
+extension String {
+    
+    static func random(count: Int) -> String {
         let strings = [
             "В доме кардинала от меня не было тайн; не раз видел я, как он усердно перелистывает старинные книги и жадно роется в пыли фамильных рукописей. Когда я как-то упрекнул его за бесполезные бессонные ночи, после которых он впадал в болезненное уныние, он взглянул на меня с горькой улыбкой и раскрыл передо мною историю города Рима. В этой книге, в двадцатой главе жизнеописания папы Александра Шестого, я прочел следующие строки, навсегда оставшиеся в моей памяти",
             "По этому поводу между отцом и сыном завязался спор. Цезарь считал, что достаточно применить одно из тех средств, которые он всегда держал наготове для своих ближайших друзей, а именно: пресловутый ключ, которым то одного, то другого просили отпереть некий шкаф. На ключе был крохотный железный шип – недосмотр слесаря. Каждый, кто трудился над тугим замком, накалывал себе палец и на другой день умирал. Был еще перстень с львиной головой, который Цезарь надевал, когда хотел пожать руку той или иной особе. Лев впивался в кожу этих избранных рук, и через сутки наступала смерть.",
@@ -33,58 +34,47 @@ public extension String {
     }
 }
 
-public extension Bool {
-    public static func random() -> Bool {
-        return arc4random_uniform(2) == 0
-    }
-}
-
-public extension Int {
-    public static func random(_ n: Int) -> Int {
-        return Int(arc4random_uniform(UInt32(n)))
+extension Int {
+    
+    static func random() -> Int {
+        return Int.random(in: 0...Int.max)
     }
     
-    public static func random(min: Int, max: Int) -> Int {
-        return Int(arc4random_uniform(UInt32(max - min - 1))) + min
+    static func random(min: Int, max: Int) -> Int {
+        return Int.random(in: min...max)
     }
 }
 
-public extension Double {
-    public static func random() -> Double {
-        return Double(arc4random()) / 0xFFFFFFFF
+extension Double {
+    
+    static func random() -> Double {
+        return Double.random(in: 0...Double.greatestFiniteMagnitude)
     }
     
-    public static func random(min: Double, max: Double) -> Double {
-        return Double.random() * (max - min) + min
+    static func random(min: Double, max: Double) -> Double {
+        return Double.random(in: min...max)
     }
 }
 
-public extension Float {
-    public static func random() -> Float {
-        return Float(arc4random()) / 0xFFFFFFFF
+extension Float {
+    
+    static func random() -> Float {
+        return Float.random(in: 0...Float.greatestFiniteMagnitude)
     }
     
-    public static func random(min: Float, max: Float) -> Float {
-        return Float.random() * (max - min) + min
+    static func random(min: Float, max: Float) -> Float {
+        return Float.random(in: min...max)
     }
 }
 
-public extension CGFloat {
-    public static func random() -> CGFloat {
-        return CGFloat(Float(arc4random()) / 0xFFFFFFFF)
+extension CGFloat {
+    
+    static func random() -> CGFloat {
+        return CGFloat.random(in: 0...CGFloat.greatestFiniteMagnitude)
     }
     
-    public static func random(min: CGFloat, max: CGFloat) -> CGFloat {
-        return CGFloat.random() * (max - min) + min
-    }
-}
-
-public extension Collection {
-    /// Return a copy of `self` with its elements shuffled
-    func shuffle() -> [Iterator.Element] {
-        var list = Array(self)
-        list.shuffleInPlace()
-        return list
+    static func random(min: CGFloat, max: CGFloat) -> CGFloat {
+        return CGFloat.random(in: min...max)
     }
 }
 
@@ -95,10 +85,10 @@ extension Collection where Index == Int {
     }
 }
 
-public extension MutableCollection where Index == Int {
-    /// Shuffle the elements of `self` in-place.
+extension MutableCollection where Index == Int {
+    
     mutating func shuffleInPlace() {
-        // empty and single-element collections don't shuffle
+        
         if count < 2 { return }
         
         for i in startIndex ..< endIndex - 1 {

Example/stork-controller/Frameworks/SparrowKit/Shadow/SPShadowDeep.swift

@@ -27,13 +27,13 @@ extension SPShadow {
         
         private init() {}
         
-        public static func setFor(label: UILabel) {
+        static func setFor(label: UILabel) {
             var offset = label.frame.height * 0.03
             offset.setIfMore(when: 1)
             label.setShadowOffsetForLetters(heightOffset: offset, opacity: 0.35)
         }
         
-        public static func setFor(view: UIView) {
+        static func setFor(view: UIView) {
             
             let xTranslationFactor: CGFloat = 0
             let yTranslationFactor: CGFloat = 0.18
@@ -66,7 +66,7 @@ extension SPShadow {
                 yTranslation = view.frame.height + maxBottomSpace - shadowHeight
             }
             
-            var blurRadius = view.frame.minSideSize * blurRadiusFactor
+            var blurRadius = view.frame.minSide * blurRadiusFactor
             blurRadius.setIfMore(when: 10)
             blurRadius.setIfFewer(when: 7)
             

Example/stork-controller/Frameworks/SparrowKit/Share/SPShare.swift

@@ -21,9 +21,9 @@
 
 import UIKit
 
-public struct SPShare {
+struct SPShare {
     
-    public struct Native {
+    struct Native {
         
         static func share(text: String? = nil, fileNames: [String] = [], images: [UIImage] = [], complection: ((_ isSharing: Bool)->())? = nil, sourceView: UIView, on viewController: UIViewController) {
             

Example/stork-controller/Frameworks/SparrowKit/Social/Instagram/SPInstagram.swift

@@ -24,11 +24,7 @@ import UIKit
 class SPInstagram {
     
     static var isSetApp: Bool {
-        if UIApplication.shared.canOpenURL(URL(string: "instagram://user?username=test")!) {
-            return true
-        } else {
-            return false
-        }
+        return UIApplication.shared.canOpenURL(URL(string: "instagram://user?username=test")!)
     }
     
     static func openPost(id: String) {
@@ -38,7 +34,7 @@ class SPInstagram {
         if UIApplication.shared.canOpenURL(instagramUrl!) {
             UIApplication.shared.open(instagramUrl!, options: convertToUIApplicationOpenExternalURLOptionsKeyDictionary([:]), completionHandler: nil)
         } else {
-            SPOpener.Link.redirectToBrowserAndOpen(link: safariURL)
+            SPApp.open(link: safariURL.absoluteString, redirect: true)
         }
     }
     
@@ -49,14 +45,13 @@ class SPInstagram {
         if UIApplication.shared.canOpenURL(instagramUrl!) {
             UIApplication.shared.open(instagramUrl!, options: convertToUIApplicationOpenExternalURLOptionsKeyDictionary([:]), completionHandler: nil)
         } else {
-            SPOpener.Link.redirectToBrowserAndOpen(link: safariURL)
+            SPApp.open(link: safariURL.absoluteString, redirect: true)
         }
     }
     
     private init() {}
 }
 
-// Helper function inserted by Swift 4.2 migrator.
 fileprivate func convertToUIApplicationOpenExternalURLOptionsKeyDictionary(_ input: [String: Any]) -> [UIApplication.OpenExternalURLOptionsKey: Any] {
 	return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIApplication.OpenExternalURLOptionsKey(rawValue: key), value)})
 }

Example/stork-controller/Frameworks/SparrowKit/Social/Telegram/SPTelegram.swift

@@ -24,11 +24,7 @@ import UIKit
 class SPTelegram {
     
     static var isSetApp: Bool {
-        if UIApplication.shared.canOpenURL(URL(string: "tg://msg?text=test")!) {
-            return true
-        } else {
-            return false
-        }
+        return UIApplication.shared.canOpenURL(URL(string: "tg://msg?text=test")!)
     }
     
     static func share(text: String, complection: @escaping (_ isOpened: Bool)->() = {_ in }) {
@@ -47,7 +43,31 @@ class SPTelegram {
     
     static func joinChannel(id: String) {
         let url = "https://t.me/joinchat/\(id)"
-        SPOpener.Link.redirectToBrowserAndOpen(link: url)
+        SPApp.open(link: url, redirect: true)
+    }
+    
+    static func joinChat(id: String) {
+        
+        let openInBrowser = {
+            let url = "https://t.me/joinchat/\(id)"
+            SPApp.open(link: url, redirect: true)
+        }
+        
+        if SPTelegram.isSetApp {
+            let urlStringEncoded = id.addingPercentEncoding( withAllowedCharacters: .urlHostAllowed)
+            let urlOptional = URL(string: "tg://join?invite=\(urlStringEncoded ?? "")")
+            if let url = urlOptional {
+                if UIApplication.shared.canOpenURL(url) {
+                    UIApplication.shared.open(url, options: convertToUIApplicationOpenExternalURLOptionsKeyDictionary([:]), completionHandler: nil)
+                } else {
+                    openInBrowser()
+                }
+            } else {
+                openInBrowser()
+            }
+        } else {
+            openInBrowser()
+        }
     }
     
     static func openBot(username: String) {
@@ -56,13 +76,12 @@ class SPTelegram {
             username.removeFirst()
         }
         let url = "https://telegram.me/\(username)"
-        SPOpener.Link.redirectToBrowserAndOpen(link: url)
+        SPApp.open(link: url, redirect: true)
     }
     
     private init() {}
 }
 
-// Helper function inserted by Swift 4.2 migrator.
 fileprivate func convertToUIApplicationOpenExternalURLOptionsKeyDictionary(_ input: [String: Any]) -> [UIApplication.OpenExternalURLOptionsKey: Any] {
-	return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIApplication.OpenExternalURLOptionsKey(rawValue: key), value)})
+    return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIApplication.OpenExternalURLOptionsKey(rawValue: key), value)})
 }

Example/stork-controller/Frameworks/SparrowKit/Social/Twitter/SPTwitter.swift

@@ -24,11 +24,7 @@ import UIKit
 class SPTwitter {
     
     static var isSetApp: Bool {
-        if UIApplication.shared.canOpenURL(URL(string: "twitter://post?message=test")!) {
-            return true
-        } else {
-            return false
-        }
+        return UIApplication.shared.canOpenURL(URL(string: "twitter://post?message=test")!)
     }
     
     static func share(text: String, complection: @escaping (_ isOpened: Bool)->() = {_ in }) {
@@ -48,7 +44,6 @@ class SPTwitter {
     private init() {}
 }
 
-// Helper function inserted by Swift 4.2 migrator.
 fileprivate func convertToUIApplicationOpenExternalURLOptionsKeyDictionary(_ input: [String: Any]) -> [UIApplication.OpenExternalURLOptionsKey: Any] {
 	return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIApplication.OpenExternalURLOptionsKey(rawValue: key), value)})
 }

Example/stork-controller/Frameworks/SparrowKit/Social/Viber/SPViber.swift

@@ -24,11 +24,7 @@ import UIKit
 class SPViber {
     
     static var isSetApp: Bool {
-        if UIApplication.shared.canOpenURL(URL(string: "viber://forward?text=test")!) {
-            return true
-        } else {
-            return false
-        }
+        return UIApplication.shared.canOpenURL(URL(string: "viber://forward?text=test")!)
     }
     
     static func share(text: String, complection: @escaping (_ isOpened: Bool)->() = {_ in }) {
@@ -48,9 +44,6 @@ class SPViber {
     private init() {}
 }
 
-
-
-// Helper function inserted by Swift 4.2 migrator.
 fileprivate func convertToUIApplicationOpenExternalURLOptionsKeyDictionary(_ input: [String: Any]) -> [UIApplication.OpenExternalURLOptionsKey: Any] {
 	return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIApplication.OpenExternalURLOptionsKey(rawValue: key), value)})
 }

Example/stork-controller/Frameworks/SparrowKit/Social/Whatsapp/SPWhatsApp.swift

@@ -24,11 +24,7 @@ import UIKit
 class SPWhatsApp {
     
     static var isSetApp: Bool {
-        if UIApplication.shared.canOpenURL(URL(string: "whatsapp://send?text=test")!) {
-            return true
-        } else {
-            return false
-        }
+        return UIApplication.shared.canOpenURL(URL(string: "whatsapp://send?text=test")!)
     }
     
     static func share(text: String, complection: @escaping (_ isOpened: Bool)->() = {_ in }) {
@@ -48,7 +44,6 @@ class SPWhatsApp {
     private init() {}
 }
 
-// Helper function inserted by Swift 4.2 migrator.
 fileprivate func convertToUIApplicationOpenExternalURLOptionsKeyDictionary(_ input: [String: Any]) -> [UIApplication.OpenExternalURLOptionsKey: Any] {
 	return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIApplication.OpenExternalURLOptionsKey(rawValue: key), value)})
 }

Example/stork-controller/Frameworks/SparrowKit/Types/SPTypes.swift

@@ -0,0 +1,76 @@
+// 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
+
+enum SPStatusBar {
+    case dark
+    case light
+}
+
+enum SPSystemIcon {
+    case share
+    case close
+    case favorite
+    case favorite_fill
+}
+
+enum SPSocialNetwork {
+    case whatsapp
+    case telegram
+    case vk
+    case facebook
+    case viber
+}
+
+enum SPOauthState {
+    case succsess
+    case unvalidLogin
+    case invalidLogin
+    case unvalidPassword
+    case invalidPassword
+    case needTwoFactor
+    case error
+}
+
+enum SPSeparatorInsetStyle {
+    case beforeImage
+    case all
+    case none
+    case auto
+}
+
+enum SPNavigationTitleStyle {
+    case large
+    case small
+    case stork
+    case noContent
+}
+
+enum SPSystemApp {
+    case photos
+    case setting
+}
+
+enum SPSelectionType {
+    case select
+    case unselect
+}

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

@@ -32,28 +32,28 @@ class SPAppStoreActionButton: SPDownloadingButton {
             switch self.style {
             case .base:
                 self.backgroundColor = self.secondColor
-                self.titleLabel?.font = UIFont.system(type: .Bold, size: 14)
+                self.titleLabel?.font = UIFont.system(weight: .bold, size: 14)
                 self.contentEdgeInsets = UIEdgeInsets.init(top: 6, left: 15, bottom: 6, right: 15)
                 break
             case .main:
                 self.backgroundColor = self.baseColor
                 self.layer.borderWidth = 0
                 self.setTitleColor(UIColor.white)
-                self.titleLabel?.font = UIFont.system(type: .Bold, size: 14)
+                self.titleLabel?.font = UIFont.system(weight: .bold, size: 14)
                 self.contentEdgeInsets = UIEdgeInsets.init(top: 6, left: 15, bottom: 6, right: 15)
                 break
             case .buyInStore:
                 self.backgroundColor = self.baseColor
                 self.layer.borderWidth = 0
                 self.setTitleColor(UIColor.white)
-                self.titleLabel?.font = UIFont.system(type: .Bold, size: 14)
+                self.titleLabel?.font = UIFont.system(weight: .bold, size: 14)
                 self.contentEdgeInsets = UIEdgeInsets.init(top: 8, left: 15, bottom: 8, right: 15)
                 break
             case .line:
                 self.backgroundColor = UIColor.clear
                 self.layer.borderWidth = 1
                 self.layer.borderColor = self.baseColor.cgColor
-                self.titleLabel?.font = UIFont.system(type: .Medium, size: 14)
+                self.titleLabel?.font = UIFont.system(weight: .medium, size: 14)
                 self.contentEdgeInsets = UIEdgeInsets.init(top: 6, left: 15, bottom: 6, right: 15)
                 break
             }

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

@@ -23,34 +23,34 @@ import UIKit
 
 class SPAppleMusicButton: SPButton {
     
-    var mode: Mode = .unselect {
+    var type: SPSelectionType = .unselect {
         didSet {
-            self.updateStyle(animated: false)
+            self.updateType(animated: false)
         }
     }
     
     var selectColor: UIColor = UIColor.init(hex: "FD2D55") {
         didSet {
-            self.updateStyle(animated: false)
+            self.updateType(animated: false)
         }
     }
     
     var baseColor: UIColor = UIColor.init(hex: "F8F7FC") {
         didSet {
-            self.updateStyle(animated: false)
+            self.updateType(animated: false)
         }
     }
     
     override func commonInit() {
         super.commonInit()
         self.layer.cornerRadius = 8
-        self.titleLabel?.font = UIFont.system(type: .DemiBold, size: 15)
+        self.titleLabel?.font = UIFont.system(weight: .demiBold, size: 15)
         self.contentEdgeInsets = UIEdgeInsets.init(top: 12, left: 27, bottom: 12, right: 27)
-        self.mode = .unselect
+        self.type = .unselect
     }
     
-    private func updateStyle(animated: Bool) {
-        switch self.mode {
+    private func updateType(animated: Bool) {
+        switch self.type {
         case .select:
             self.backgroundColor = self.selectColor
             self.setTitleColor(UIColor.white)
@@ -61,10 +61,5 @@ class SPAppleMusicButton: SPButton {
             break
         }
     }
-    
-    enum Mode {
-        case select
-        case unselect
-    }
 }
 

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

@@ -0,0 +1,93 @@
+// 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
+
+class SPAppleMusicSectionButtonsView: SPView {
+    
+    let topSeparatorView = SPSeparatorView()
+    let bottomSeparatorView = SPSeparatorView()
+    let leftButton = SPAppleMusicButton()
+    let rightButton = SPAppleMusicButton()
+    
+    var sectionHeight: CGFloat = 92 {
+        didSet { self.layoutSubviews() }
+    }
+    
+    var buttonsSpace: CGFloat = 18 {
+        didSet { self.layoutSubviews() }
+    }
+    
+    var selectColor: UIColor = UIColor.init(hex: "FD2D55") {
+        didSet {
+            self.leftButton.selectColor = selectColor
+            self.rightButton.selectColor = selectColor
+        }
+    }
+    
+    var baseColor: UIColor = UIColor.init(hex: "F8F7FC") {
+        didSet {
+            self.leftButton.baseColor = baseColor
+            self.rightButton.baseColor = baseColor
+        }
+    }
+    
+    override func commonInit() {
+        super.commonInit()
+        self.addSubview(self.topSeparatorView)
+        self.addSubview(self.bottomSeparatorView)
+        
+        for button in [self.leftButton, self.rightButton] {
+            button.type = .unselect
+            button.setTitle("Title")
+            self.addSubview(button)
+        }
+    }
+    
+    func layout(origin: CGPoint, width: CGFloat) {
+        self.frame.origin = origin
+        self.frame.set(width: width, height: sectionHeight)
+        self.layoutSubviews()
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        self.topSeparatorView.frame.origin = .zero
+        self.topSeparatorView.frame.set(width: self.frame.width)
+        
+        self.bottomSeparatorView.frame.origin.x = 0
+        self.bottomSeparatorView.frame.bottomY = self.frame.height
+        self.bottomSeparatorView.frame.set(width: self.frame.width)
+        
+        let buttonWidth = (self.frame.width - self.buttonsSpace) / 2
+        
+        self.leftButton.sizeToFit()
+        self.leftButton.frame.set(width: buttonWidth)
+        self.leftButton.frame.origin.x = 0
+        self.leftButton.center.y = self.frame.height / 2
+        
+        self.rightButton.sizeToFit()
+        self.rightButton.frame.set(width: buttonWidth)
+        self.rightButton.frame.bottomX = self.frame.width
+        self.rightButton.center.y = self.frame.height / 2
+    }
+}

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

@@ -0,0 +1,98 @@
+// 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
+
+class SPButton: UIButton {
+    
+    override func imageRect(forContentRect contentRect: CGRect) -> CGRect {
+        if self.title(for: .normal) != nil {
+            let inset: CGFloat = 6
+            let sideSize = self.frame.height - inset * 2
+            let titleFrame = self.titleRect(forContentRect: contentRect)
+            return CGRect.init(x: titleFrame.origin.x - sideSize - 6, y: 0, width: sideSize, height: self.frame.height)
+        } else {
+            return super.imageRect(forContentRect: contentRect)
+        }
+    }
+    
+    override var isHighlighted: Bool {
+        didSet {
+            if self.isHighlighted {
+                self.imageView?.alpha = 0.7
+            } else {
+                self.imageView?.alpha = 1
+            }
+        }
+    }
+    
+    var gradientView: SPGradientView? {
+        didSet {
+            self.gradientView?.isUserInteractionEnabled = false
+            if self.gradientView?.superview == nil {
+                if self.gradientView != nil {
+                    if self.imageView != nil {
+                        self.insertSubview(self.gradientView!, belowSubview: self.imageView!)
+                    }
+                }
+            }
+        }
+    }
+    
+    var rounded: Bool = false {
+        didSet {
+            self.layoutSubviews()
+        }
+    }
+    
+    init() {
+        super.init(frame: CGRect.zero)
+        self.commonInit()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+        self.commonInit()
+    }
+    
+    internal func commonInit() {
+        self.adjustsImageWhenHighlighted = false
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        self.gradientView?.setSuperviewBounds()
+        if self.rounded {
+            self.round()
+        }
+    }
+    
+    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/Buttons/SPCircleCloseButton.swift

@@ -0,0 +1,52 @@
+// 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
+
+class SPCircleCloseButton: SPSystemIconButton {
+    
+    var side: CGFloat = 30
+    
+    override init() {
+        super.init(type: .close)
+        self.rounded = true
+        self.backgroundColor = SPNativeColors.customGray
+        self.color = SPNativeColors.gray
+        self.widthIconFactor = 0.36
+        self.heightIconFactor = 0.36
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func layout(bottomX: CGFloat, y: CGFloat) {
+        self.sizeToFit()
+        self.frame.bottomX = bottomX
+        self.frame.origin.y = y
+    }
+    
+    override func sizeToFit() {
+        super.sizeToFit()
+        self.frame.set(width: self.side)
+        self.frame.set(height: self.side)
+    }
+}

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

@@ -59,7 +59,7 @@ class SPDotButton: SPButton {
     
     override func commonInit() {
         super.commonInit()
-        self.backgroundColor = UIColor.black.withAlphaComponent(0.2)
+        self.backgroundColor = UIColor.black.withAlphaComponent(0.5)
         for _ in 0...2 {
             let dotView = UIView()
             dotView.isUserInteractionEnabled = false
@@ -71,8 +71,8 @@ class SPDotButton: SPButton {
     
     override func sizeToFit() {
         super.sizeToFit()
-        self.setWidth(self.customSideSize)
-        self.setHeight(self.customSideSize)
+        self.frame.set(width: self.customSideSize)
+        self.frame.set(height: self.customSideSize)
         self.layoutSubviews()
     }
     
@@ -87,9 +87,9 @@ class SPDotButton: SPButton {
         var currentXPosition: CGFloat = insest
         
         for dotView in self.dotsView {
-            dotView.setWidth(sideSize)
-            dotView.setHeight(sideSize)
-            dotView.setYCenteringFromSuperview()
+            dotView.frame.set(width: sideSize)
+            dotView.frame.set(height: sideSize)
+            dotView.setYCenter()
             dotView.frame.origin.x = currentXPosition
             dotView.round()
             currentXPosition += (sideSize + space)

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

@@ -24,7 +24,6 @@ import UIKit
 class SPDownloadingButton: SPButton {
     
     let activityIndicatorView = UIActivityIndicatorView.init()
-    var isFrameRounded: Bool = false
     
     func startLoading() {
         self.activityIndicatorView.alpha = 0
@@ -39,7 +38,10 @@ class SPDownloadingButton: SPButton {
         })
     }
     
-    func stopLoading() {
+    func stopLoading(newText: String? = nil) {
+        if let newText = newText {
+            self.setTitle(newText)
+        }
         SPAnimation.animate(0.2, animations: {
             self.activityIndicatorView.alpha = 0
         }, withComplection: {
@@ -53,10 +55,6 @@ class SPDownloadingButton: SPButton {
     override func layoutSubviews() {
         super.layoutSubviews()
         self.activityIndicatorView.center = CGPoint.init(x: self.frame.width / 2, y: self.frame.height / 2)
-        
-        if self.isFrameRounded {
-            self.round()
-        }
     }
 }
 

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

@@ -44,9 +44,9 @@ class SPNativeLargeButton: SPDownloadingButton {
     
     override func commonInit() {
         super.commonInit()
-        self.titleLabel?.font = UIFont.system(type: UIFont.BoldType.DemiBold, size: 16)
+        self.titleLabel?.font = UIFont.system(weight: UIFont.FontWeight.demiBold, size: 16)
         self.setTitleColor(UIColor.white)
-        self.backgroundColor = SPNativeStyleKit.Colors.blue
+        self.backgroundColor = SPNativeColors.blue
         self.layer.masksToBounds = true
         self.layer.cornerRadius = 8
         self.contentEdgeInsets = UIEdgeInsets.init(top: 15, left: 15, bottom: 15, right: 15)
@@ -58,13 +58,13 @@ class SPNativeLargeButton: SPDownloadingButton {
             let sideSpace: CGFloat = superview.frame.width * 0.112
             var width = superview.frame.width - sideSpace * 2
             width.setIfMore(when: 335)
-            self.setWidth(width)
+            self.frame.set(width: width)
         }
     }
     
     override func layoutSubviews() {
         super.layoutSubviews()
-        self.gradientView?.setEqualsBoundsFromSuperview()
+        self.gradientView?.setSuperviewBounds()
         self.gradientView?.layer.cornerRadius = self.layer.cornerRadius
         self.gradientView?.gradientLayer.cornerRadius = self.layer.cornerRadius
     }

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

@@ -39,7 +39,7 @@ class SPPlayCircleButton: UIButton {
         }
     }
     
-    var iconColor = SPNativeStyleKit.Colors.white {
+    var iconColor = SPNativeColors.white {
         didSet {
             self.iconView.color = self.iconColor
         }
@@ -52,7 +52,7 @@ class SPPlayCircleButton: UIButton {
         self.addSubview(self.iconView)
         self.iconView.isUserInteractionEnabled = false
         self.setTitle("", for: .normal)
-        self.backgroundColor = SPNativeStyleKit.Colors.blue
+        self.backgroundColor = SPNativeColors.blue
         self.audioState = .play
     }
     
@@ -62,7 +62,7 @@ class SPPlayCircleButton: UIButton {
     
     override func layoutSubviews() {
         super.layoutSubviews()
-        self.iconView.setEqualsFrameFromBounds(self, withWidthFactor: 0.45, withHeightFactor: 0.45, withCentering: true)
+        self.iconView.setBounds(self, withWidthFactor: 0.45, withHeightFactor: 0.45, withCentering: true)
         self.round()
     }
     

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

@@ -75,13 +75,13 @@ class SPSocialButton: UIButton {
     fileprivate func commonInit() {
         self.iconView.isUserInteractionEnabled = false
         self.addSubview(self.iconView)
-        self.backgroundColor = SPNativeStyleKit.Colors.blue
-        self.iconView.color = SPNativeStyleKit.Colors.white
+        self.backgroundColor = SPNativeColors.blue
+        self.iconView.color = SPNativeColors.white
     }
     
     override func layoutSubviews() {
         super.layoutSubviews()
-        self.iconView.setEqualsFrameFromBounds(self, withWidthFactor: self.widthIconFactor, withHeightFactor: self.heightIconFactor, withCentering: true)
+        self.iconView.setBounds(self, withWidthFactor: self.widthIconFactor, withHeightFactor: self.heightIconFactor, withCentering: true)
         self.round()
     }
 }

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

@@ -21,19 +21,20 @@
 
 import UIKit
 
-class SPSystemIconButton: UIButton {
+class SPSystemIconButton: SPButton {
     
     let iconView = SPSystemIconView.init()
+    
     var widthIconFactor: CGFloat = 1
     var heightIconFactor: CGFloat = 1
     
-    var type: SPSystemIconType {
+    var icon: SPSystemIcon {
         didSet {
-            self.iconView.type = self.type
+            self.iconView.icon = self.icon
         }
     }
     
-    var color = SPNativeStyleKit.Colors.blue {
+    var color = SPNativeColors.blue {
         didSet {
             self.iconView.color = self.color
         }
@@ -49,17 +50,17 @@ class SPSystemIconButton: UIButton {
         }
     }
     
-    init() {
-        self.type = .share
-        super.init(frame: CGRect.zero)
+    override init() {
+        self.icon = .share
+        super.init()
         self.commonInit()
     }
     
-    init(type: SPSystemIconType) {
-        self.type = type
-        super.init(frame: CGRect.zero)
-        self.iconView.type = self.type
-        self.type = type
+    init(type: SPSystemIcon) {
+        self.icon = type
+        super.init()
+        self.iconView.icon = self.icon
+        self.icon = type
         self.commonInit()
     }
     
@@ -67,14 +68,14 @@ class SPSystemIconButton: UIButton {
         fatalError("init(coder:) has not been implemented")
     }
     
-    fileprivate func commonInit() {
+    override func commonInit() {
+        super.commonInit()
         self.iconView.isUserInteractionEnabled = false
         self.addSubview(self.iconView)
     }
     
     override func layoutSubviews() {
         super.layoutSubviews()
-        self.iconView.setEqualsFrameFromBounds(self, withWidthFactor: self.widthIconFactor, withHeightFactor: self.heightIconFactor, withCentering: true)
+        self.iconView.setBounds(self, withWidthFactor: self.widthIconFactor, withHeightFactor: self.heightIconFactor, withCentering: true)
     }
-    
 }

Example/stork-controller/Frameworks/SparrowKit/UI/Code Draw/SPAudioIconView.swift

@@ -29,7 +29,7 @@ class SPAudioIconView: UIView {
         }
     }
     
-    var color = SPNativeStyleKit.Colors.white {
+    var color = SPNativeColors.white {
         didSet {
             self.setNeedsDisplay()
         }

Example/stork-controller/Frameworks/SparrowKit/UI/Code Draw/SPGolubevIconView.swift

@@ -29,7 +29,7 @@ class SPGolubevIconView: UIView {
         }
     }
     
-    var whiteColor = SPNativeStyleKit.Colors.white {
+    var whiteColor = SPNativeColors.white {
         didSet {
             self.setNeedsDisplay()
         }
@@ -103,10 +103,13 @@ class SPGolubevIconView: UIView {
         case .headphones:
             SPCodeDraw.GolubevIconPack.drawHeadphones(frame: rect, resizing: .aspectFit, white: self.whiteColor, light: self.lightColor, medium: self.mediumColor, dark: self.darkColor)
             break
+        case .windmill:
+            SPCodeDraw.GolubevIconPack.drawWindmill(frame: rect, resizing: .aspectFit, white: self.whiteColor, light: self.lightColor, medium: self.mediumColor, dark: self.darkColor)
+            break
         }
     }
     
-    public enum IconType {
+    enum IconType {
         case camera
         case photoLibrary
         case ball
@@ -116,6 +119,7 @@ class SPGolubevIconView: UIView {
         case documents
         case compass
         case headphones
+        case windmill
     }
 }
 

Example/stork-controller/Frameworks/SparrowKit/UI/Code Draw/SPSocialIconView.swift

@@ -29,7 +29,7 @@ class SPSocialIconView: UIView {
         }
     }
     
-    var color = SPNativeStyleKit.Colors.blue {
+    var color = SPNativeColors.blue {
         didSet {
             self.setNeedsDisplay()
         }

Example/stork-controller/Frameworks/SparrowKit/UI/Code Draw/SPSystemIconView.swift

@@ -23,26 +23,26 @@ import UIKit
 
 class SPSystemIconView: UIView {
     
-    var type: SPSystemIconType {
+    var icon: SPSystemIcon {
         didSet {
             self.setNeedsDisplay()
         }
     }
     
-    var color = SPNativeStyleKit.Colors.blue {
+    var color = SPNativeColors.blue {
         didSet {
             self.setNeedsDisplay()
         }
     }
     
     init() {
-        self.type = .share
+        self.icon = .share
         super.init(frame: CGRect.zero)
         self.commonInit()
     }
     
-    init(type: SPSystemIconType) {
-        self.type = type
+    init(type: SPSystemIcon) {
+        self.icon = type
         super.init(frame: CGRect.zero)
         self.commonInit()
     }
@@ -57,7 +57,7 @@ class SPSystemIconView: UIView {
     
     override func draw(_ rect: CGRect) {
         super.draw(rect)
-        switch type {
+        switch icon {
         case .share:
             SPCodeDraw.SystemIconPack.drawShare(frame: rect, resizing: .aspectFit, color: self.color)
             break

Example/stork-controller/Frameworks/SparrowKit/UI/Collections/Cells/SPCollectionViewCell.swift

@@ -21,7 +21,7 @@
 
 import UIKit
 
-public class SPCollectionViewCell: UICollectionViewCell {
+class SPCollectionViewCell: UICollectionViewCell {
     
     var currentIndexPath: IndexPath?
     
@@ -37,7 +37,7 @@ public class SPCollectionViewCell: UICollectionViewCell {
     
     internal func commonInit() {}
     
-    public override func prepareForReuse() {
+    override func prepareForReuse() {
         super.prepareForReuse()
         self.currentIndexPath = nil
     }