Merge branch 'master' of github.com:Yalantis/Persei into feature/UICollectionView_example

# Conflicts:
#	Persei/Source/Core/StickyHeaderView.swift

Author: Unknown

.swift-version

@@ -280,6 +280,7 @@
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -397,11 +398,12 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -445,10 +447,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

Example/Example.xcodeproj/project.pbxproj

@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
     spec.name = "Persei"
-    spec.version = '3.1.1'
-
+    spec.version = '4.0.0'
+    spec.swift_version = '5.0'
     spec.homepage = "https://github.com/Yalantis/Persei"
     spec.summary = "Animated top menu for UITableView / UICollectionView / UIScrollView in Swift!"
     spec.screenshot = "https://raw.githubusercontent.com/Yalantis/Persei/master/Assets/animation.gif"
@@ -10,8 +10,8 @@ Pod::Spec.new do |spec|
     spec.license = { :type => "MIT", :file => "LICENSE" }
     spec.social_media_url = "https://twitter.com/yalantis"
 
-    spec.platform = :ios, '9.0'
-    spec.ios.deployment_target = '9.0'
+    spec.platform = :ios, '11.0'
+    spec.ios.deployment_target = '11.0'
 
     spec.source = { :git => "https://github.com/Yalantis/Persei.git", :tag => spec.version }
 

Persei.podspec

@@ -260,11 +260,12 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -312,10 +313,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";

Persei.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@ private let DefaultContentHeight: CGFloat = 64
 open class StickyHeaderView: UIView {
 
     // MARK: - Init
+    
     func commonInit() {
         translatesAutoresizingMaskIntoConstraints = false
 
@@ -35,6 +36,7 @@ open class StickyHeaderView: UIView {
     }
 
     // MARK: - View lifecycle
+    
     open override func willMove(toSuperview newSuperview: UIView?) {
         super.willMove(toSuperview: newSuperview)
 
@@ -55,7 +57,7 @@ open class StickyHeaderView: UIView {
             view.addObserver(self, forKeyPath: #keyPath(UIScrollView.contentOffset), options: [.initial, .new], context: &ContentOffsetContext)
             view.panGestureRecognizer.addTarget(self, action: #selector(StickyHeaderView.handlePan))
             view.sendSubviewToBack(self)
-					
+            
             if needRevealed && !insetsApplied {
                 addInsets()
             } else if insetsApplied {
@@ -113,9 +115,17 @@ open class StickyHeaderView: UIView {
     }
 
     // MARK: - ScrollView
-    private var scrollView: UIScrollView { return superview as! UIScrollView }
+
+    private var scrollView: UIScrollView {
+        guard
+            let scrollView = superview as? UIScrollView
+            else { fatalError("superview is not UIScrollView") }
+        
+        return scrollView
+    }
 
     // MARK: - KVO
+    
     open override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
         if context == &ContentOffsetContext {
             didScroll()
@@ -171,6 +181,7 @@ open class StickyHeaderView: UIView {
     }
 
     // MARK: - Applyied Insets
+    
     private var appliedInsets: UIEdgeInsets = .zero
     private var insetsApplied: Bool {
         return appliedInsets != .zero
@@ -195,6 +206,7 @@ open class StickyHeaderView: UIView {
     }
 
     // MARK: - ContentHeight
+    
     @IBInspectable open var contentHeight: CGFloat = DefaultContentHeight {
         didSet {
             if superview != nil {
@@ -204,9 +216,11 @@ open class StickyHeaderView: UIView {
     }
 
     // MARK: - Threshold
+    
     @IBInspectable open var threshold: CGFloat = 0.3
 
     // MARK: - Content Offset Hanlding
+    
     private func applyContentContainerTransform(_ progress: CGFloat) {
         var transform = CATransform3DIdentity
         transform.m34 = -1 / 500
@@ -245,6 +259,7 @@ open class StickyHeaderView: UIView {
     }
 
     // MARK: - Layout
+    
     open override func layoutSubviews() {
         super.layoutSubviews()
 
@@ -275,13 +290,9 @@ open class StickyHeaderView: UIView {
     }
 
     open override func sizeThatFits(_: CGSize) -> CGSize {
-        var height: CGFloat = 0
-        if revealed {
-            height = appliedInsets.top - scrollView.normalizedContentOffset.y
-        } else {
-            height = scrollView.normalizedContentOffset.y * -1
-        }
-
+        let revealedHeight: CGFloat = appliedInsets.top - scrollView.normalizedContentOffset.y
+        let collapsedHeight: CGFloat = scrollView.normalizedContentOffset.y * -1
+        let height: CGFloat = revealed ? revealedHeight : collapsedHeight
         let output = CGSize(width: scrollView.bounds.width, height: max(height, 0))
 
         return output

Persei/Source/Core/StickyHeaderView.swift

@@ -19,7 +19,8 @@ Check this [project on Behance](https://www.behance.net/gallery/20411445/Mobile-
 | 1.x | 1.1 |
 | 2.x | 2.0 |
 | 3.x | 3.0 |
-| **4.x** | **3.1** |
+| 4.x | 3.1|
+| **5.x** | **4.0** |
 
 ## Installation
 
@@ -28,13 +29,13 @@ Check this [project on Behance](https://www.behance.net/gallery/20411445/Mobile-
 ```ruby
 use_frameworks!
 
-pod 'Persei', '~> 3.0'
+pod 'Persei', '~> 4.0'
 ```
 
 ### [Carthage](http://github.com/Carthage/Carthage)
 
 ```ruby
-github "Yalantis/Persei" ~> 3.0
+github "Yalantis/Persei" ~> 4.0
 ```
 
 ### Manual Installation