Merge branch 'swift-4.2' into 'master'

Swift 4.2 See merge request helper-ios/RMRPullToRefresh!5
Merge branch 'master' into swift-4.2
2018-10-15 16:12:22 +03:00 · 2018-10-15 20:06:08 +07:00 · 2018-10-15 19:55:17 +07:00 · 2018-09-21 10:21:28 +07:00 · 2018-09-21 10:20:00 +07:00 · 2018-09-20 18:11:23 +07:00
15 changed files with 305 additions and 274 deletions
--- a/Classes/Default/RMRPullToRefreshBaseMessageView.swift
+++ b/Classes/Default/RMRPullToRefreshBaseMessageView.swift
@ -39,10 +39,10 @@ class RMRPullToRefreshBaseMessageView: RMRPullToRefreshBaseView {
        messageView.addSubview(label)
        label.translatesAutoresizingMaskIntoConstraints = false
        
-        for attribute in [NSLayoutAttribute.top, NSLayoutAttribute.right, NSLayoutAttribute.left, NSLayoutAttribute.bottom] {
+        for attribute in [NSLayoutConstraint.Attribute.top, NSLayoutConstraint.Attribute.right, NSLayoutConstraint.Attribute.left, NSLayoutConstraint.Attribute.bottom] {
            messageView.addConstraint(NSLayoutConstraint(item: label,
                                                    attribute: attribute,
-                                                    relatedBy: NSLayoutRelation.equal,
+                                                    relatedBy: NSLayoutConstraint.Relation.equal,
                                                       toItem: messageView,
                                                    attribute: attribute,
                                                   multiplier: 1,
@ -58,18 +58,18 @@ class RMRPullToRefreshBaseMessageView: RMRPullToRefreshBaseView {
        messageView.translatesAutoresizingMaskIntoConstraints = false
        
        let heightConstraint = NSLayoutConstraint(item: messageView,
-                                                  attribute: NSLayoutAttribute.height,
-                                                  relatedBy: NSLayoutRelation.equal,
+                                                  attribute: NSLayoutConstraint.Attribute.height,
+                                                  relatedBy: NSLayoutConstraint.Relation.equal,
                                                  toItem: nil,
-                                                  attribute: NSLayoutAttribute.notAnAttribute,
+                                                  attribute: NSLayoutConstraint.Attribute.notAnAttribute,
                                                  multiplier: 1,
                                                  constant: 30)
        
        let widthConstraint = NSLayoutConstraint(item: messageView,
-                                                 attribute: NSLayoutAttribute.width,
-                                                 relatedBy: NSLayoutRelation.equal,
+                                                 attribute: NSLayoutConstraint.Attribute.width,
+                                                 relatedBy: NSLayoutConstraint.Relation.equal,
                                                 toItem: nil,
-                                                 attribute: NSLayoutAttribute.notAnAttribute,
+                                                 attribute: NSLayoutConstraint.Attribute.notAnAttribute,
                                                 multiplier: 1,
                                                 constant: 150)
        
@ -77,7 +77,7 @@ class RMRPullToRefreshBaseMessageView: RMRPullToRefreshBaseView {
        
        let verticalConstraint = NSLayoutConstraint(item: messageView,
                                                    attribute: .centerY,
-                                                    relatedBy: NSLayoutRelation.equal,
+                                                    relatedBy: NSLayoutConstraint.Relation.equal,
                                                    toItem: self,
                                                    attribute: .centerY,
                                                    multiplier: 1,
@ -85,7 +85,7 @@ class RMRPullToRefreshBaseMessageView: RMRPullToRefreshBaseView {
        
        let leftConstraint = NSLayoutConstraint(item: messageView,
                                                attribute: .left,
-                                                relatedBy: NSLayoutRelation.equal,
+                                                relatedBy: NSLayoutConstraint.Relation.equal,
                                                toItem: self,
                                                attribute: .right,
                                                multiplier: 1,
--- a/Classes/Default/RMRPullToRefreshBaseView.swift
+++ b/Classes/Default/RMRPullToRefreshBaseView.swift
@ -45,18 +45,18 @@ class RMRPullToRefreshBaseView: RMRPullToRefreshView {
    func configureConstraints() {
        logoImageView.translatesAutoresizingMaskIntoConstraints = false
        let heightConstraint = NSLayoutConstraint(item: logoImageView,
-                                                  attribute: NSLayoutAttribute.height,
-                                                  relatedBy: NSLayoutRelation.equal,
+                                                  attribute: NSLayoutConstraint.Attribute.height,
+                                                  relatedBy: NSLayoutConstraint.Relation.equal,
                                                  toItem: nil,
-                                                  attribute: NSLayoutAttribute.notAnAttribute,
+                                                  attribute: NSLayoutConstraint.Attribute.notAnAttribute,
                                                  multiplier: 1,
                                                  constant: 50)
        
        let widthConstraint = NSLayoutConstraint(item: logoImageView,
-                                                 attribute: NSLayoutAttribute.width,
-                                                 relatedBy: NSLayoutRelation.equal,
+                                                 attribute: NSLayoutConstraint.Attribute.width,
+                                                 relatedBy: NSLayoutConstraint.Relation.equal,
                                                 toItem: nil,
-                                                 attribute: NSLayoutAttribute.notAnAttribute,
+                                                 attribute: NSLayoutConstraint.Attribute.notAnAttribute,
                                                 multiplier: 1,
                                                 constant: 50)
        
@ -64,7 +64,7 @@ class RMRPullToRefreshBaseView: RMRPullToRefreshView {
        
        let verticalConstraint = NSLayoutConstraint(item: logoImageView,
                                                    attribute: .centerY,
-                                                    relatedBy: NSLayoutRelation.equal,
+                                                    relatedBy: NSLayoutConstraint.Relation.equal,
                                                    toItem: self,
                                                    attribute: .centerY,
                                                    multiplier: 1,
@ -72,7 +72,7 @@ class RMRPullToRefreshBaseView: RMRPullToRefreshView {
        
        let horizontalConstraint = NSLayoutConstraint(item: logoImageView,
                                                      attribute: .centerX,
-                                                      relatedBy: NSLayoutRelation.equal,
+                                                      relatedBy: NSLayoutConstraint.Relation.equal,
                                                      toItem: self,
                                                      attribute: .centerX,
                                                      multiplier: 1,
--- a/Classes/RMRPullToRefresh.swift
+++ b/Classes/RMRPullToRefresh.swift
@ -10,7 +10,7 @@ import UIKit

 open class RMRPullToRefresh: NSObject {

-    fileprivate var сontroller: RMRPullToRefreshController?
+    private var сontroller: RMRPullToRefreshController?
    
    open var height : CGFloat = RMRPullToRefreshConstants.DefaultHeight {
        didSet {
@ -46,14 +46,6 @@ open class RMRPullToRefresh: NSObject {
        self.сontroller = controller
    }
    
-    /// Метод нужно вызывать в deinit экрана, в котором используется pull-to-refresh.
-    ///
-    /// Это временное решение для избежания краша из-за KVO-наблюдателей на scroll view
-    /// (при уничтожении скролла и экрана, в котором он лежит).
-    open func unsubscribeFromBindings() {
-        сontroller?.unsubscribeFromScrollViewEvents()
-    }
-    
    open func configureView(_ view :RMRPullToRefreshView, state:RMRPullToRefreshState, result:RMRPullToRefreshResultType) {
        сontroller?.configureView(view, state: state, result: result)
    }
--- a/Classes/RMRPullToRefreshConstants.swift
+++ b/Classes/RMRPullToRefreshConstants.swift
@ -27,14 +27,6 @@ public enum RMRPullToRefreshResultType: Int {

 public struct RMRPullToRefreshConstants {
    
-    struct KeyPaths {
-        static let ContentOffset = "contentOffset"
-        static let ContentSize = "contentSize"
-        static let ContentInset = "contentInset"
-        static let PanState = "pan.state"
-        static let Frame = "frame"
-    }
-    
    static let DefaultHeight = CGFloat(90.0)
    static let DefaultBackgroundColor = UIColor.white
 }
--- a/Classes/RMRPullToRefreshContainerView.swift
+++ b/Classes/RMRPullToRefreshContainerView.swift
@ -25,10 +25,10 @@ open class RMRPullToRefreshContainerView: UIView {
        if let view = obtainView(state, result: result) {
            view.translatesAutoresizingMaskIntoConstraints = false
            addSubview(view)
-            addConstraint(constraint(self, subview: view, attribute: NSLayoutAttribute.left))
-            addConstraint(constraint(self, subview: view, attribute: NSLayoutAttribute.top))
-            addConstraint(constraint(self, subview: view, attribute: NSLayoutAttribute.right))
-            addConstraint(constraint(self, subview: view, attribute: NSLayoutAttribute.bottom))
+            addConstraint(constraint(self, subview: view, attribute: NSLayoutConstraint.Attribute.left))
+            addConstraint(constraint(self, subview: view, attribute: NSLayoutConstraint.Attribute.top))
+            addConstraint(constraint(self, subview: view, attribute: NSLayoutConstraint.Attribute.right))
+            addConstraint(constraint(self, subview: view, attribute: NSLayoutConstraint.Attribute.bottom))
            view.layoutIfNeeded()
            self.currentView = view
        }
@ -84,7 +84,7 @@ open class RMRPullToRefreshContainerView: UIView {
    
    // MARK: - Constraint
    
-    func constraint(_ superview: UIView, subview: UIView, attribute: NSLayoutAttribute) -> NSLayoutConstraint {
-        return NSLayoutConstraint(item: subview, attribute: attribute, relatedBy: NSLayoutRelation.equal, toItem: superview, attribute: attribute, multiplier: 1, constant: 0)
+    func constraint(_ superview: UIView, subview: UIView, attribute: NSLayoutConstraint.Attribute) -> NSLayoutConstraint {
+        return NSLayoutConstraint(item: subview, attribute: attribute, relatedBy: NSLayoutConstraint.Relation.equal, toItem: superview, attribute: attribute, multiplier: 1, constant: 0)
    }
 }
--- a/Classes/RMRPullToRefreshController.swift
+++ b/Classes/RMRPullToRefreshController.swift
@ -7,28 +7,8 @@
 //

 import UIKit
-fileprivate func < <T : Comparable>(lhs: T?, rhs: T?) -> Bool {
-  switch (lhs, rhs) {
-  case let (l?, r?):
-    return l < r
-  case (nil, _?):
-    return true
-  default:
-    return false
-  }
-}

-fileprivate func > <T : Comparable>(lhs: T?, rhs: T?) -> Bool {
-  switch (lhs, rhs) {
-  case let (l?, r?):
-    return l > r
-  default:
-    return rhs < lhs
-  }
-}
-
-
-open class RMRPullToRefreshController: NSObject {
+open class RMRPullToRefreshController {

    // MARK: - Vars
    
@ -41,7 +21,6 @@ open class RMRPullToRefreshController: NSObject {
    var backgroundViewTopConstraint: NSLayoutConstraint?
    
    var stopped = true
-    var subscribing = false
    
    var actionHandler: (() -> Void)!
    
@ -60,11 +39,16 @@ open class RMRPullToRefreshController: NSObject {
    
    open var hideWhenError: Bool = true
    
+    // MARK: - Observation
+    
+    private var contentOffsetObservation: NSKeyValueObservation?
+    private var contentSizeObservation: NSKeyValueObservation?
+    private var panStateObservation: NSKeyValueObservation?
+    
    // MARK: - Init
    
    init(scrollView: UIScrollView, position:RMRPullToRefreshPosition, actionHandler: @escaping () -> Void) {
-
-        super.init()        
+ 
        self.scrollView = scrollView
        self.actionHandler = actionHandler
        self.position = position
@ -77,30 +61,36 @@ open class RMRPullToRefreshController: NSObject {
        self.subscribeOnScrollViewEvents()
    }
    
-    fileprivate func configureBackgroundView(_ backgroundView: UIView) {
+    private func configureBackgroundView(_ backgroundView: UIView) {
        backgroundView.translatesAutoresizingMaskIntoConstraints = false
        scrollView?.addSubview(backgroundView)
        addBackgroundViewConstraints(backgroundView)
    }
    
-    fileprivate func addBackgroundViewConstraints(_ backgroundView: UIView) {
-        // Constraints
-        self.backgroundViewHeightConstraint = NSLayoutConstraint(item: backgroundView, attribute: NSLayoutAttribute.height, relatedBy: NSLayoutRelation.equal, toItem: nil, attribute: NSLayoutAttribute.notAnAttribute, multiplier: 1, constant: 0)
-        backgroundView.addConstraint(self.backgroundViewHeightConstraint!)
+    private func addBackgroundViewConstraints(_ backgroundView: UIView) {
+        guard let scrollView = scrollView, let position = position else {
+            return
+        }
+    
+        let backgroundViewHeightConstraint = backgroundView.heightAnchor.constraint(equalToConstant: 0)
+        backgroundViewHeightConstraint.isActive = true
+        self.backgroundViewHeightConstraint = backgroundViewHeightConstraint
        
-        scrollView?.addConstraint(NSLayoutConstraint(item: backgroundView, attribute: NSLayoutAttribute.width, relatedBy: NSLayoutRelation.equal, toItem: scrollView, attribute: NSLayoutAttribute.width, multiplier: 1, constant: 0))
+        backgroundView.widthAnchor.constraint(equalTo: scrollView.widthAnchor).isActive = true
        
-        if position == .top {
-            scrollView?.addConstraint(NSLayoutConstraint(item: backgroundView, attribute: NSLayoutAttribute.bottom, relatedBy: NSLayoutRelation.equal, toItem: scrollView, attribute: NSLayoutAttribute.top, multiplier: 1, constant: 0))
-        } else if position == .bottom, let scrollView = self.scrollView {
+        switch position {
+        case .top:
+            backgroundView.bottomAnchor.constraint(equalTo: scrollView.topAnchor).isActive = true
+        case .bottom:
            let constant = max(scrollView.contentSize.height, scrollView.bounds.height)
-            self.backgroundViewTopConstraint = NSLayoutConstraint(item: backgroundView, attribute: NSLayoutAttribute.top, relatedBy: NSLayoutRelation.equal, toItem: scrollView, attribute: NSLayoutAttribute.top, multiplier: 1, constant: constant)
-            scrollView.addConstraint(self.backgroundViewTopConstraint!)
+            let backgroundViewTopConstraint = backgroundView.topAnchor.constraint(
+                equalTo: scrollView.bottomAnchor, constant: constant)
+            backgroundViewTopConstraint.isActive = true
+            self.backgroundViewTopConstraint = backgroundViewTopConstraint
        }
    }
    
-    fileprivate func configureHeight() {
-        
+    private func configureHeight() {
        if let scrollView = self.scrollView {
            self.originalTopInset = scrollView.contentInset.top
            self.originalBottomInset = scrollView.contentInset.bottom
@ -166,9 +156,14 @@ open class RMRPullToRefreshController: NSObject {
                    }
                }
                self?.contentSizeWhenStartLoading = nil
-                self?.perform(#selector(self?.resetBackgroundViewHeightConstraint), with: nil, afterDelay: afterDelay)
+                
+                DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + afterDelay) {
+                    self?.resetBackgroundViewHeightConstraint()
+                }
+            }
+            DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + afterDelay) {
+                self?.stopAllAnimations()
            }
-            self?.perform(#selector(self?.stopAllAnimations), with: nil, afterDelay: afterDelay)
        })
    }
    
@ -223,23 +218,23 @@ open class RMRPullToRefreshController: NSObject {
        containerView.startLoadingAnimation(startProgress)
    }
    
-    @objc fileprivate func stopAllAnimations() {
+    @objc private func stopAllAnimations() {
        if shouldHideWhenStopLoading() {
            stopped = true
        }
        containerView.stopAllAnimations(shouldHideWhenStopLoading())
    }
    
-    @objc fileprivate func forceStopAllAnimations() {
+    @objc private func forceStopAllAnimations() {
        stopped = true
        containerView.stopAllAnimations(true)
    }
    
-    @objc fileprivate func resetBackgroundViewHeightConstraint() {
+    @objc private func resetBackgroundViewHeightConstraint() {
        backgroundViewHeightConstraint?.constant = 0
    }
    
-    fileprivate func scrollViewDidChangePanState(_ scrollView: UIScrollView, panState: UIGestureRecognizerState) {
+    private func scrollViewDidChangePanState(_ scrollView: UIScrollView, panState: UIGestureRecognizer.State) {
        if panState == .ended || panState == .cancelled || panState == .failed {
            
            if state == .loading || (shouldHideWhenStopLoading() && !stopped) {
@ -270,7 +265,7 @@ open class RMRPullToRefreshController: NSObject {
        }
    }
    
-    fileprivate func scrollViewDidChangeContentSize(_ scrollView: UIScrollView, contentSize: CGSize) {
+    private func scrollViewDidChangeContentSize(_ scrollView: UIScrollView, contentSize: CGSize) {
        updateContainerFrame()
        if position == .bottom {
            self.backgroundViewTopConstraint?.constant = max(scrollView.contentSize.height, scrollView.bounds.height)
@ -280,13 +275,13 @@ open class RMRPullToRefreshController: NSObject {
        }
    }
    
-    fileprivate func scrollViewDidScroll(_ scrollView: UIScrollView, contentOffset: CGPoint) {
+    private func scrollViewDidScroll(_ scrollView: UIScrollView, contentOffset: CGPoint) {
        
        if state == .loading {
            if scrollView.contentOffset.y >= 0  {
                scrollView.contentInset = UIEdgeInsets.zero
            } else {
-                scrollView.contentInset = UIEdgeInsetsMake(min(-scrollView.contentOffset.y, originalTopInset+height),0,0,0)
+                scrollView.contentInset = UIEdgeInsets.init(top: min(-scrollView.contentOffset.y, originalTopInset+height),left: 0,bottom: 0,right: 0)
            }
        }
        
@ -312,15 +307,17 @@ open class RMRPullToRefreshController: NSObject {
        }
    }
    
-    fileprivate func configureBackgroundHeightConstraint(_ contentOffsetY: CGFloat, contentInset: UIEdgeInsets) {
+    private func configureBackgroundHeightConstraint(_ contentOffsetY: CGFloat, contentInset: UIEdgeInsets) {
        var constant = CGFloat(-1.0)
        if position == .top {
            constant = contentOffsetY + contentInset.top
        } else {
            constant = contentOffsetY + contentInset.bottom
        }
-        if constant > 0 && constant > backgroundViewHeightConstraint?.constant {
-            backgroundViewHeightConstraint?.constant = constant
+        if let backgroundViewHeightConstraint = backgroundViewHeightConstraint,
+            constant > 0,
+            constant > backgroundViewHeightConstraint.constant {
+            backgroundViewHeightConstraint.constant = constant
        }
    }
    
@ -360,7 +357,7 @@ open class RMRPullToRefreshController: NSObject {
        changingContentInset = true
        UIView.animate(withDuration: 0.3,
            delay: 0.0,
-            options: UIViewAnimationOptions.beginFromCurrentState,
+            options: UIView.AnimationOptions.beginFromCurrentState,
            animations: {  [weak self]() -> Void in
                self?.scrollView?.contentInset = contentInset
            }, completion: {  [weak self](finished) -> Void in
@ -391,41 +388,34 @@ open class RMRPullToRefreshController: NSObject {
    // MARK: - KVO

    open func subscribeOnScrollViewEvents() {
-        if !subscribing, let scrollView = self.scrollView {
-            scrollView.addObserver(self, forKeyPath: RMRPullToRefreshConstants.KeyPaths.ContentOffset, options: .new, context: nil)
-            scrollView.addObserver(self, forKeyPath: RMRPullToRefreshConstants.KeyPaths.ContentSize, options: .new, context: nil)
-            scrollView.addObserver(self, forKeyPath: RMRPullToRefreshConstants.KeyPaths.PanState, options: .new, context: nil)
-            subscribing = true
+        guard let scrollView = scrollView else {
+            return
+        }
+        
+        self.contentOffsetObservation = scrollView.observe(
+            \.contentOffset,
+            options: [.new]) { [weak self] (scrollView, change) in
+                guard let newContentOffset = change.newValue else { return }
+                self?.scrollViewDidScroll(scrollView, contentOffset: newContentOffset)
+        }
+        
+        self.contentSizeObservation = scrollView.observe(
+            \.contentSize,
+            options: [.new]) { [weak self] (scrollView, change) in
+                guard let newContentSize = change.newValue else { return }
+                self?.scrollViewDidChangeContentSize(scrollView, contentSize: newContentSize)
+        }
+        
+        self.panStateObservation = scrollView.panGestureRecognizer.observe(
+            \.state,
+            options: [.new]) { [weak self] panGestureRecognizer, _ in
+                self?.scrollViewDidChangePanState(scrollView, panState: panGestureRecognizer.state)
        }
    }
    
    open func unsubscribeFromScrollViewEvents() {
-        if subscribing, let scrollView = self.containerView.superview {
-            scrollView.removeObserver(self, forKeyPath: RMRPullToRefreshConstants.KeyPaths.ContentOffset)
-            scrollView.removeObserver(self, forKeyPath: RMRPullToRefreshConstants.KeyPaths.ContentSize)
-            scrollView.removeObserver(self, forKeyPath: RMRPullToRefreshConstants.KeyPaths.PanState)
-            subscribing = false
-        }
+        contentOffsetObservation?.invalidate()
+        contentSizeObservation?.invalidate()
+        panStateObservation?.invalidate()
    }
-    
-    override open func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
-        if keyPath == RMRPullToRefreshConstants.KeyPaths.ContentOffset {
-            if let newContentOffset = (change?[NSKeyValueChangeKey.newKey] as? NSValue)?.cgPointValue, let scrollView = self.scrollView {
-                scrollViewDidScroll(scrollView, contentOffset:newContentOffset)
-            }
-        } else if keyPath == RMRPullToRefreshConstants.KeyPaths.ContentSize {
-            if let newContentSize = (change?[NSKeyValueChangeKey.newKey] as? NSValue)?.cgSizeValue, let scrollView = self.scrollView {
-                if checkContentSize(scrollView) {
-                    scrollViewDidChangeContentSize(scrollView, contentSize: newContentSize)
-                }
-            }
-        } else if keyPath == RMRPullToRefreshConstants.KeyPaths.PanState {
-            if let rawValue = change?[NSKeyValueChangeKey.newKey] as? Int {
-                if let state = UIGestureRecognizerState(rawValue: rawValue), let scrollView = self.scrollView {
-                    scrollViewDidChangePanState(scrollView, panState: state)
-                }
-            }
-        }
-    }
-    
 }
--- a/Example/Podfile
+++ b/Example/Podfile
@ -1,8 +1,11 @@
 source 'https://github.com/CocoaPods/Specs.git'

+platform :ios, '9.0'
 use_frameworks!

-target 'RMRPullToRefreshExample' do
-    project 'RMRPullToRefreshExample.xcodeproj'
-	pod 'RMRPullToRefresh’, :path => "../"
+project 'RMRPullToRefreshExample.xcodeproj'
+workspace 'RMRPullToRefreshExample.xcworkspace'
+
+target :RMRPullToRefreshExample do
+	pod 'RMRPullToRefresh', :path => "../"
 end
--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@ -0,0 +1,16 @@
+PODS:
+  - RMRPullToRefresh (0.5.0)
+
+DEPENDENCIES:
+  - RMRPullToRefresh (from `../`)
+
+EXTERNAL SOURCES:
+  RMRPullToRefresh:
+    :path: ../
+
+SPEC CHECKSUMS:
+  RMRPullToRefresh: 6c25f48af80d0e5d72b89ef5d6ea0dfcc21e5444
+
+PODFILE CHECKSUM: 6bf08c33e827c034420f4dcfc61024a8ba7eab2f
+
+COCOAPODS: 1.3.1
--- a/Example/RMRPullToRefresh/AppDelegate.swift
+++ b/Example/RMRPullToRefresh/AppDelegate.swift
@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
    var window: UIWindow?


-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
        // Override point for customization after application launch.
        return true
    }
--- a/Example/RMRPullToRefresh/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Example/RMRPullToRefresh/Assets.xcassets/AppIcon.appiconset/Contents.json
@ -1,5 +1,15 @@
 {
  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
    {
      "idiom" : "iphone",
      "size" : "29x29",
@ -29,6 +39,11 @@
      "idiom" : "iphone",
      "size" : "60x60",
      "scale" : "3x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
    }
  ],
  "info" : {
--- a/Example/RMRPullToRefresh/Base.lproj/Main.storyboard
+++ b/Example/RMRPullToRefresh/Base.lproj/Main.storyboard
@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="9wl-A7-LQ4">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="9wl-A7-LQ4">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <scenes>
        <!--Navigation Controller-->
@ -10,9 +14,9 @@
            <objects>
                <navigationController id="9wl-A7-LQ4" sceneMemberID="viewController">
                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="yyl-ZQ-eby">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                        <autoresizingMask key="autoresizingMask"/>
-                        <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                    </navigationBar>
                    <connections>
                        <segue destination="oE2-vv-go7" kind="relationship" relationship="rootViewController" id="7GL-Am-OfG"/>
@ -20,79 +24,79 @@
                </navigationController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="jEm-VL-aI5" userLabel="First Responder" sceneMemberID="firstResponder"/>
            </objects>
-            <point key="canvasLocation" x="-363" y="324"/>
+            <point key="canvasLocation" x="-503" y="323"/>
        </scene>
        <!--Table View Controller-->
        <scene sceneID="xmD-iM-370">
            <objects>
                <tableViewController id="oE2-vv-go7" customClass="TableViewController" customModule="RMRPullToRefreshExample" customModuleProvider="target" sceneMemberID="viewController">
                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="C22-ld-kpl">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <sections>
                            <tableViewSection headerTitle="Perekrestok" id="OAd-tH-sE5">
                                <cells>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="Qw1-Fc-VoV" detailTextLabel="nOn-mL-Lrw" imageView="6OD-og-tgv" style="IBUITableViewCellStyleValue1" id="Ig2-F0-5fB">
-                                        <rect key="frame" x="0.0" y="113.5" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Ig2-F0-5fB" id="f8z-M3-Z4V">
-                                            <rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Perekrestok" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Qw1-Fc-VoV">
-                                                    <rect key="frame" x="74" y="12" width="86.5" height="19.5"/>
+                                                    <rect key="frame" x="75" y="12" width="86.5" height="19.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Top" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="nOn-mL-Lrw">
-                                                    <rect key="frame" x="537.5" y="12" width="27.5" height="19.5"/>
+                                                    <rect key="frame" x="313" y="12" width="27" height="19.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="perekrestok" id="6OD-og-tgv">
-                                                    <rect key="frame" x="15" y="0.0" width="44" height="43.5"/>
+                                                    <rect key="frame" x="16" y="0.0" width="44" height="43.5"/>
                                                    <autoresizingMask key="autoresizingMask"/>
                                                </imageView>
                                            </subviews>
                                        </tableViewCellContentView>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                        <connections>
                                            <segue destination="BYZ-38-t0r" kind="show" identifier="perekrestok_top" id="TFF-yS-c1s"/>
                                        </connections>
                                    </tableViewCell>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="3b8-Kd-0Uw" detailTextLabel="U1K-Un-yBw" imageView="a26-Gq-xeL" style="IBUITableViewCellStyleValue1" id="EN2-bQ-yTK">
-                                        <rect key="frame" x="0.0" y="157.5" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="99.5" width="375" height="44"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EN2-bQ-yTK" id="YBm-bQ-aP7">
-                                            <rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Perekrestok" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3b8-Kd-0Uw">
-                                                    <rect key="frame" x="74" y="12" width="86.5" height="19.5"/>
+                                                    <rect key="frame" x="75" y="12" width="86.5" height="19.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Bottom" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="U1K-Un-yBw">
-                                                    <rect key="frame" x="512" y="12" width="53" height="19.5"/>
+                                                    <rect key="frame" x="287" y="12" width="53" height="19.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="perekrestok" id="a26-Gq-xeL">
-                                                    <rect key="frame" x="15" y="0.0" width="44" height="43.5"/>
+                                                    <rect key="frame" x="16" y="0.0" width="44" height="43.5"/>
                                                    <autoresizingMask key="autoresizingMask"/>
                                                </imageView>
                                            </subviews>
                                        </tableViewCellContentView>
-                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                        <connections>
                                            <segue destination="BYZ-38-t0r" kind="show" identifier="perekrestok_bottom" id="RNW-CJ-jxH"/>
                                        </connections>
@ -102,28 +106,28 @@
                            <tableViewSection headerTitle="Beeline" id="Bp3-dz-9Zb">
                                <cells>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="HlT-ZI-pLV" detailTextLabel="Sne-Dt-pmd" imageView="IEL-Td-m6Q" style="IBUITableViewCellStyleValue1" id="t3C-cF-xlh">
-                                        <rect key="frame" x="0.0" y="251.5" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="199.5" width="375" height="44"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="t3C-cF-xlh" id="5E2-Ik-tgT">
-                                            <rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Beeline" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HlT-ZI-pLV">
-                                                    <rect key="frame" x="74" y="12" width="53.5" height="19.5"/>
+                                                    <rect key="frame" x="75" y="12" width="53.5" height="19.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Top" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Sne-Dt-pmd">
-                                                    <rect key="frame" x="537.5" y="12" width="27.5" height="19.5"/>
+                                                    <rect key="frame" x="313" y="12" width="27" height="19.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="beeline" id="IEL-Td-m6Q">
-                                                    <rect key="frame" x="15" y="0.0" width="44" height="43.5"/>
+                                                    <rect key="frame" x="16" y="0.0" width="44" height="43.5"/>
                                                    <autoresizingMask key="autoresizingMask"/>
                                                </imageView>
                                            </subviews>
@ -133,28 +137,28 @@
                                        </connections>
                                    </tableViewCell>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="uHd-tI-cbh" detailTextLabel="Nfu-Qc-1Gp" imageView="NLI-8k-jWy" style="IBUITableViewCellStyleValue1" id="Qxr-CU-ozv">
-                                        <rect key="frame" x="0.0" y="295.5" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="243.5" width="375" height="44"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Qxr-CU-ozv" id="LDM-NR-x0D">
-                                            <rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Beeline" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="uHd-tI-cbh">
-                                                    <rect key="frame" x="74" y="12" width="53.5" height="19.5"/>
+                                                    <rect key="frame" x="75" y="12" width="53.5" height="19.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Bottom" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Nfu-Qc-1Gp">
-                                                    <rect key="frame" x="512" y="12" width="53" height="19.5"/>
+                                                    <rect key="frame" x="287" y="12" width="53" height="19.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="beeline" id="NLI-8k-jWy">
-                                                    <rect key="frame" x="15" y="0.0" width="44" height="43.5"/>
+                                                    <rect key="frame" x="16" y="0.0" width="44" height="43.5"/>
                                                    <autoresizingMask key="autoresizingMask"/>
                                                </imageView>
                                            </subviews>
@ -168,28 +172,28 @@
                            <tableViewSection headerTitle="Default" id="YNv-qE-Ndq">
                                <cells>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="Hod-kU-jvC" detailTextLabel="MHK-Eb-EhW" imageView="LAe-1f-zZu" style="IBUITableViewCellStyleValue1" id="uGe-5R-mhz">
-                                        <rect key="frame" x="0.0" y="389.5" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="343.5" width="375" height="44"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uGe-5R-mhz" id="h7j-2o-NcK">
-                                            <rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Redmadrobot" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Hod-kU-jvC">
-                                                    <rect key="frame" x="74" y="12" width="99" height="19.5"/>
+                                                    <rect key="frame" x="75" y="12" width="99" height="19.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Top" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MHK-Eb-EhW">
-                                                    <rect key="frame" x="537.5" y="12" width="27.5" height="19.5"/>
+                                                    <rect key="frame" x="313" y="12" width="27" height="19.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="redmadlogo-1" id="LAe-1f-zZu">
-                                                    <rect key="frame" x="15" y="0.0" width="44" height="43.5"/>
+                                                    <rect key="frame" x="16" y="0.0" width="44" height="43.5"/>
                                                    <autoresizingMask key="autoresizingMask"/>
                                                </imageView>
                                            </subviews>
@ -199,28 +203,28 @@
                                        </connections>
                                    </tableViewCell>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="PEJ-1c-whb" detailTextLabel="cmt-br-dNG" imageView="1iM-wK-6Uf" style="IBUITableViewCellStyleValue1" id="Mlu-1N-6jM">
-                                        <rect key="frame" x="0.0" y="433.5" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="387.5" width="375" height="44"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Mlu-1N-6jM" id="Xfk-9c-f5n">
-                                            <rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Redmadrobot" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="PEJ-1c-whb">
-                                                    <rect key="frame" x="74" y="12" width="99" height="19.5"/>
+                                                    <rect key="frame" x="75" y="12" width="99" height="19.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Bottom" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="cmt-br-dNG">
-                                                    <rect key="frame" x="512" y="12" width="53" height="19.5"/>
+                                                    <rect key="frame" x="287" y="12" width="53" height="19.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="redmadlogo-1" id="1iM-wK-6Uf">
-                                                    <rect key="frame" x="15" y="0.0" width="44" height="43.5"/>
+                                                    <rect key="frame" x="16" y="0.0" width="44" height="43.5"/>
                                                    <autoresizingMask key="autoresizingMask"/>
                                                </imageView>
                                            </subviews>
@ -241,7 +245,7 @@
                </tableViewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="2e9-Jk-9A8" userLabel="First Responder" sceneMemberID="firstResponder"/>
            </objects>
-            <point key="canvasLocation" x="269" y="324"/>
+            <point key="canvasLocation" x="143" y="323"/>
        </scene>
        <!--View Controller-->
        <scene sceneID="tne-QT-ifu">
@ -252,26 +256,26 @@
                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="qa0-J0-SDd">
-                                <rect key="frame" x="0.0" y="64" width="600" height="536"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <color key="separatorColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="separatorColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="pxY-0R-2l7" style="IBUITableViewCellStyleDefault" id="RzC-n2-Iry">
-                                        <rect key="frame" x="0.0" y="28" width="600" height="44"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="pxY-0R-2l7" style="IBUITableViewCellStyleDefault" id="RzC-n2-Iry">
+                                        <rect key="frame" x="0.0" y="28" width="375" height="44"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="RzC-n2-Iry" id="QD1-aM-jfC">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="pxY-0R-2l7">
-                                                    <rect key="frame" x="15" y="0.0" width="570" height="44"/>
+                                                    <rect key="frame" x="15" y="0.0" width="345" height="44"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                            </subviews>
@ -284,7 +288,7 @@
                                </connections>
                            </tableView>
                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <constraints>
                            <constraint firstItem="qa0-J0-SDd" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" constant="64" id="6Du-Fj-JAv"/>
                            <constraint firstItem="qa0-J0-SDd" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="ONC-Bk-CbX"/>
@ -311,7 +315,7 @@
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
            </objects>
-            <point key="canvasLocation" x="1011" y="324"/>
+            <point key="canvasLocation" x="1111" y="323"/>
        </scene>
    </scenes>
    <resources>
--- a/Example/RMRPullToRefresh/TableViewController.swift
+++ b/Example/RMRPullToRefresh/TableViewController.swift
@ -8,9 +8,8 @@

 import UIKit

-class TableViewController: UITableViewController {
+final class TableViewController: UITableViewController {

-    
    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
        super.prepare(for: segue, sender: sender)
        
--- a/Example/RMRPullToRefresh/ViewController.swift
+++ b/Example/RMRPullToRefresh/ViewController.swift
@ -18,20 +18,48 @@ public enum ExampleType: Int {
    case redmadrobotBottom
 }

-class ViewController: UIViewController, UITableViewDataSource, UITableViewDelegate, UIActionSheetDelegate {
+final class ViewController: UIViewController {

-    @IBOutlet weak var tableView: UITableView!
+    // MARK: - Public properties
    
    var exampleType: ExampleType = .beelineBottom
    
-    var pullToRefresh: RMRPullToRefresh?
+    // MARK: - Private properites
    
-    let formatter = DateFormatter()
+    private var pullToRefresh: RMRPullToRefresh?
+    private let formatter = DateFormatter()
+    private var items: [String] = []
+    private var count = 2
+    private var result = RMRPullToRefreshResultType.success
    
-    var items: [String] = []
-    var count = 2
+    // MARK: - IBOutlets
    
-    var result = RMRPullToRefreshResultType.success
+    @IBOutlet weak var tableView: UITableView!
+    
+    // MARK: - IBActions
+    
+    @IBAction func settings(_ sender: AnyObject) {
+        let alertController = UIAlertController(title: "Result type", message: nil, preferredStyle: .actionSheet)
+        
+        let successAction = UIAlertAction(title: "Success", style: .default) { _ in
+            self.result = .noUpdates
+        }
+        alertController.addAction(successAction)
+        
+        let noUpdatesAction = UIAlertAction(title: "No updates", style: .default) { _ in
+            self.result = .noUpdates
+        }
+        alertController.addAction(noUpdatesAction)
+        
+        let errorAction = UIAlertAction(title: "Error", style: .default) { _ in
+            self.result = .error
+        }
+        alertController.addAction(errorAction)
+        
+        present(alertController, animated: true, completion: nil)
+    }
+    
+    // MARK: - UIViewController
    
    override func viewDidLoad() {
        super.viewDidLoad()
@ -44,10 +72,9 @@ class ViewController: UIViewController, UITableViewDataSource, UITableViewDelega
    
    // MARK: - Pull to Refresh
    
-    func configurePullToRefresh() {
-        
-        pullToRefresh = RMRPullToRefresh(scrollView: tableView, position: position()) { [weak self] _ in
-            DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Double(Int64(5.0 * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC), execute: {
+    private func configurePullToRefresh() {
+        pullToRefresh = RMRPullToRefresh(scrollView: tableView, position: position()) { [weak self] in
+            DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 5, execute: {
                if self?.result == .success {
                    self?.loadMore()
                }
@ -57,36 +84,35 @@ class ViewController: UIViewController, UITableViewDataSource, UITableViewDelega
            })
        }
        
-        if exampleType == .perekrestokTop || exampleType == .perekrestokBottom {
+        switch exampleType {
+        case .perekrestokTop, .perekrestokBottom:
            perekrestok()
-        } else if exampleType == .beelineTop || exampleType == .beelineBottom {
+        case .beelineTop, .beelineBottom:
            beeline()
-        } else if exampleType == .redmadrobotTop || exampleType == .redmadrobotBottom {
+        case .redmadrobotTop, .redmadrobotBottom:
            redmadrobot()
        }
        
-        pullToRefresh?.setHideDelay(5.0, result: .success)
-        
-        pullToRefresh?.hideWhenError = false
+        //pullToRefresh?.setHideDelay(5.0, result: .success)
+        //pullToRefresh?.hideWhenError = false
    }
    
    // MARK: - Build example values
    
-    func perekrestok() {
-        
+    private func perekrestok() {
        if let pullToRefreshView = PerekrestokView.XIB_VIEW() {
            pullToRefresh?.configureView(pullToRefreshView, state: .dragging, result: .success)
            pullToRefresh?.configureView(pullToRefreshView, state: .loading, result: .success)
        }
        pullToRefresh?.height = 90.0
-        pullToRefresh?.backgroundColor = UIColor(red: 16.0/255.0,
-                                                 green: 192.0/255.0,
-                                                 blue: 119.0/255.0,
-                                                 alpha: 1.0)
+        pullToRefresh?.backgroundColor = UIColor(
+            red: 16.0/255.0,
+            green: 192.0/255.0,
+            blue: 119.0/255.0,
+            alpha: 1.0)
    }
    
-    func beeline() {
-        
+    private func beeline() {
        if let pullToRefreshView = BeelineView.XIB_VIEW() {
            pullToRefresh?.configureView(pullToRefreshView, state: .dragging, result: .success)
            pullToRefresh?.configureView(pullToRefreshView, state: .loading, result: .success)
@ -95,11 +121,11 @@ class ViewController: UIViewController, UITableViewDataSource, UITableViewDelega
        pullToRefresh?.backgroundColor = UIColor.white
    }
    
-    func redmadrobot() {
+    private func redmadrobot() {
        pullToRefresh?.setupDefaultSettings()
    }
    
-    func position() -> RMRPullToRefreshPosition {
+    private func position() -> RMRPullToRefreshPosition {
        if exampleType == .perekrestokTop || exampleType == .beelineTop || exampleType == .redmadrobotTop {
            return .top
        }
@ -108,49 +134,29 @@ class ViewController: UIViewController, UITableViewDataSource, UITableViewDelega
    
    // MARK: - Configure
    
-    func someConfiguring() {
+    private func someConfiguring() {
        formatter.dateStyle = DateFormatter.Style.long
        formatter.timeStyle = .medium
    }
    
-    // MARK: - Action
-    
-    
-    @IBAction func settings(_ sender: AnyObject) {
-        UIActionSheet(title: "Result type", delegate: self, cancelButtonTitle: nil, destructiveButtonTitle: nil, otherButtonTitles: ".Success", ".NoUpdates", ".Error").show(in: self.view)
-    }
-    
-    // MARK: - UIActionSheetDelegate
-    
-    func actionSheet(_ actionSheet: UIActionSheet, clickedButtonAt buttonIndex: Int) {
-        switch buttonIndex {
-        case 0:
-            self.result = .success
-        case 1:
-            self.result = .noUpdates
-        case 2:
-            self.result = .error
-        default:
-            break;
-        }
-    }
-    
    // MARK: - Test data
    
-    func loadData() {
+    private func loadData() {
        for _ in 0...count {
            items.append(formatter.string(from: Date()))
        }
    }
    
-    func loadMore() {
+    private func loadMore() {
        for _ in 0...20 {
            self.items.append(formatter.string(from: Date(timeIntervalSinceNow: 20)))
        }
        self.tableView.reloadData()
    }
-    
-    // MARK: - TableView
+}
+
+// MARK: - UITableViewDataSource
+extension ViewController: UITableViewDataSource {
    
    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
        let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath)
@ -166,4 +172,3 @@ class ViewController: UIViewController, UITableViewDataSource, UITableViewDelega
        return 1;
    }
 }
-
--- a/Example/RMRPullToRefreshExample.xcodeproj/project.pbxproj
+++ b/Example/RMRPullToRefreshExample.xcodeproj/project.pbxproj
@ -132,7 +132,6 @@
 				89CB12311C9DA07B00048E46 /* Frameworks */,
 				89CB12321C9DA07B00048E46 /* Resources */,
 				2BE863C51DEA329C1234F1B0 /* [CP] Embed Pods Frameworks */,
-				C137BE069515EFF1A69455DF /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@ -150,12 +149,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = "Merkulov Ilya";
 				TargetAttributes = {
 					89CB12331C9DA07B00048E46 = {
 						CreatedOnToolsVersion = 7.2.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0920;
 					};
 				};
 			};
@ -199,13 +198,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RMRPullToRefreshExample-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		2BE863C51DEA329C1234F1B0 /* [CP] Embed Pods Frameworks */ = {
@ -214,30 +216,18 @@
 			files = (
 			);
 			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-RMRPullToRefreshExample/Pods-RMRPullToRefreshExample-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/RMRPullToRefresh/RMRPullToRefresh.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RMRPullToRefresh.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RMRPullToRefreshExample/Pods-RMRPullToRefreshExample-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		C137BE069515EFF1A69455DF /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RMRPullToRefreshExample/Pods-RMRPullToRefreshExample-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@ -283,13 +273,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@ -311,7 +311,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@ -327,13 +327,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@ -349,9 +359,10 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@ -361,12 +372,14 @@
 			baseConfigurationReference = 51A8D36C5CCC1E18D2666CD6 /* Pods-RMRPullToRefreshExample.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = GMD7EK7S94;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = RMRPullToRefresh/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.redmadrobot.RMRPullToRefresh;
 				PRODUCT_NAME = RMRPullToRefreshExample;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@ -375,12 +388,14 @@
 			baseConfigurationReference = 9373B01A0C7A0314295D05D2 /* Pods-RMRPullToRefreshExample.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = GMD7EK7S94;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = RMRPullToRefresh/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.redmadrobot.RMRPullToRefresh;
 				PRODUCT_NAME = RMRPullToRefreshExample;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
--- a/RMRPullToRefresh.podspec
+++ b/RMRPullToRefresh.podspec
@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
  spec.name         = "RMRPullToRefresh"
-  spec.version      = "0.5.0"
-  spec.platform     = :ios, "8.0"
+  spec.version      = "0.8.0"
+  spec.platform     = :ios, "9.0"
  spec.license      = { :type => "MIT", :file => "LICENSE" }
  spec.summary      = "A pull to refresh control for UIScrollView (UITableView and UICollectionView)"
  spec.homepage     = "http://redmadrobot.com/"
  spec.author       = "Ilya Merkulov"
  spec.source       = { :git => "https://git.redmadrobot.com/helper-ios/RMRPullToRefresh.git", :tag => spec.version }
  spec.source_files = "Classes/*.{swift}", "Classes/Default/*.{swift}"
-  spec.resources = ['Images/*.png']
+  spec.resources    = ['Images/*.png']
 end
Author	SHA1	Message	Date
Evgenii Elchev	26aa5dda8c	Merge branch 'swift-4.2' into 'master' Swift 4.2 See merge request helper-ios/RMRPullToRefresh!5	2018-10-15 16:12:22 +03:00
Evgenii Elchev	756991bc98	Merge branch 'master' into swift-4.2 # Conflicts: # Classes/RMRPullToRefreshController.swift # Example/RMRPullToRefresh/Base.lproj/Main.storyboard # Example/RMRPullToRefresh/ViewController.swift # Example/RMRPullToRefreshExample.xcodeproj/project.pbxproj # RMRPullToRefresh.podspec	2018-10-15 20:06:08 +07:00
Evgenii Elchev	99d4e48ed1	Поднял версию пода	2018-10-15 19:55:17 +07:00
Jon Fir	ba0dfe1489	Поднял версию pod`а	2018-09-21 10:21:28 +07:00
Jon Fir	baa205e053	Устранены предупреждения	2018-09-21 10:20:00 +07:00
Jon Fir	4abdd96604	Перевел на swift 4.2	2018-09-20 18:11:23 +07:00
Jon Fir	e1ab80365e	Выполнен переход на swift 4.2	2018-09-20 16:13:13 +07:00
Mikhail Konovalov	36174af0e8	Поднял версию в подспеке	2018-01-11 13:03:23 +03:00
Mikhail Konovalov	99fa1ae686	Поправил создание констрейнтов	2018-01-11 13:00:36 +03:00
Mikhail Konovalov	db5402288b	Поднял версию iOS до 9	2018-01-11 13:00:22 +03:00
Mikhail Konovalov	43b8834736	Fileprivate на private	2018-01-11 12:40:23 +03:00
Mikhail Konovalov	59de97d267	Фикс утечки памяти	2018-01-11 12:40:04 +03:00
Mikhail Konovalov	397f6d33b2	Закомментировал задержку скрытия pull to refresh и отображение в случае ошибки	2018-01-11 12:04:41 +03:00
Mikhail Konovalov	788a5ae73c	Обновил работу с KVO	2018-01-11 12:03:56 +03:00
Mikhail Konovalov	a59d153dbe	Поправил форматирование	2018-01-11 11:34:25 +03:00
Mikhail Konovalov	303ac129e6	Мигрировал на Swift 4, поправил предупреждения	2018-01-11 11:25:41 +03:00
Mikhail Konovalov	7c13b59323	Поправил предупреждения cocoapods	2018-01-11 11:15:22 +03:00