bump swift version to 4.2, fix delegate proxy

.swift-version

@@ -1 +1 @@
-4.0
+4.2

Example/InfiniteLayout.xcodeproj/project.pbxproj

@@ -324,7 +324,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-InfiniteLayout_Example/Pods-InfiniteLayout_Example-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-InfiniteLayout_Example/Pods-InfiniteLayout_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/CocoaProxy/CocoaProxy.framework",
 				"${BUILT_PRODUCTS_DIR}/Differentiator/Differentiator.framework",
 				"${BUILT_PRODUCTS_DIR}/InfiniteLayout/InfiniteLayout.framework",
@@ -343,7 +343,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-InfiniteLayout_Example/Pods-InfiniteLayout_Example-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-InfiniteLayout_Example/Pods-InfiniteLayout_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		BB5E5FB53E7C451064DBC9A2 /* [CP] Check Pods Manifest.lock */ = {

Example/InfiniteLayout/CustomViewController.swift

@@ -12,6 +12,7 @@ import InfiniteLayout
 class CustomViewController: UIViewController {
     
     @IBOutlet weak var infiniteCollectionView: InfiniteCollectionView!
+    
 }
 
 extension CustomViewController: UICollectionViewDataSource {

Example/Podfile.lock

@@ -1,12 +1,12 @@
 PODS:
   - CocoaProxy (0.1.1)
   - Differentiator (3.0.2)
-  - InfiniteLayout (0.2.3.1):
+  - InfiniteLayout (0.2.3.4):
     - CocoaProxy (~> 0)
-    - InfiniteLayout/Core (= 0.2.3.1)
-  - InfiniteLayout/Core (0.2.3.1):
+    - InfiniteLayout/Core (= 0.2.3.4)
+  - InfiniteLayout/Core (0.2.3.4):
     - CocoaProxy (~> 0)
-  - InfiniteLayout/Rx (0.2.3.1):
+  - InfiniteLayout/Rx (0.2.3.4):
     - CocoaProxy (~> 0)
     - InfiniteLayout/Core (~> 0)
     - RxCocoa (~> 4)
@@ -39,11 +39,11 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   CocoaProxy: 35ab81e24325b33834cffe45a3d1fd48ca67ef3a
   Differentiator: a87be69eba49ec4ab460c7671143ee3a9eececfd
-  InfiniteLayout: 17bbab705aa4d941fa82a7e9b658c96d13ce91a3
+  InfiniteLayout: 0a2d22c0d7c12051468b1bd1763875285f2e6815
   RxCocoa: cc1fec49cdc8fabe645964de7c51c099a36c2aa8
   RxDataSources: cb7c31e652a87ebb919da45f716bbb87b3765f6b
   RxSwift: 4219941c1244c88002901bd87a69d3aea9ae71f0
 
 PODFILE CHECKSUM: 3501aeed91e62112dd38178a52f26b204b97c8c0
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.1

InfiniteLayout.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'InfiniteLayout'
-  s.version          = '0.2.3.2'
+  s.version          = '0.3'
   s.summary          = 'Horizontal and Vertical infinite scrolling feature for UICollectionView with Paging, NSProxy delegate, Reactive extension'
 
 # This description is used to generate tags and improve search results.

InfiniteLayout/Classes/InfiniteCollectionView.swift

@@ -134,7 +134,7 @@ extension InfiniteCollectionView: UICollectionViewDataSource {
     }
     
     private var multiplier: Int {
-        return InfiniteDataSources.multiplier(estimatedItemSize: self.infiniteLayout.itemSize)
+        return InfiniteDataSources.multiplier(estimatedItemSize: self.infiniteLayout.itemSize, enabled: self.infiniteLayout.isEnabled)
     }
     
     public func section(from infiniteSection: Int) -> Int {
@@ -202,5 +202,6 @@ extension InfiniteCollectionView: UICollectionViewDelegate {
         if isItemPagingEnabled {
             self.infiniteLayout.centerCollectionView(withVelocity: velocity, targetContentOffset: targetContentOffset)
         }
+        self.delegateProxy.delegate?.scrollViewWillEndDragging?(scrollView, withVelocity: velocity, targetContentOffset: targetContentOffset)
     }
 }

InfiniteLayout/Classes/InfiniteDataSource.swift

@@ -17,7 +17,10 @@ class InfiniteDataSources {
         return IndexPath(item: infiniteIndexPath.item % numberOfItems, section: self.section(from: infiniteIndexPath.section, numberOfSections: numberOfSections))
     }
     
-    static func multiplier(estimatedItemSize: CGSize) -> Int {
+    static func multiplier(estimatedItemSize: CGSize, enabled: Bool) -> Int {
+        guard enabled else {
+            return 1
+        }
         let min = Swift.min(estimatedItemSize.width, estimatedItemSize.height)
         let count = ceil(InfiniteLayout.minimumContentSize / min)
         return Int(count)

InfiniteLayout/Classes/InfiniteLayout.swift

@@ -15,7 +15,20 @@ open class InfiniteLayout: UICollectionViewFlowLayout {
     
     private var contentSize: CGSize = .zero
     
-    private (set) var isEnabled: Bool = false
+    private var hasValidLayout: Bool = false
+    
+    @IBInspectable public var isEnabled: Bool = true {
+        didSet {
+            self.invalidateLayout()
+        }
+    }
+    
+    public var currentPage: CGPoint {
+        guard let collectionView = self.collectionView else {
+            return .zero
+        }
+        return self.page(for: collectionView.contentOffset)
+    }
         
     open override func shouldInvalidateLayout(forBoundsChange newBounds: CGRect) -> Bool {
         return true
@@ -42,8 +55,8 @@ open class InfiniteLayout: UICollectionViewFlowLayout {
     override open func prepare() {
         let collectionViewContentSize = super.collectionViewContentSize
         self.contentSize = CGSize(width: collectionViewContentSize.width, height: collectionViewContentSize.height)
-        self.isEnabled = {
-            guard let collectionView = self.collectionView, collectionView.bounds != .zero else {
+        self.hasValidLayout = {
+            guard let collectionView = self.collectionView, collectionView.bounds != .zero, self.isEnabled else {
                 return false
             }
             return (scrollDirection == .horizontal ? self.contentSize.width : self.contentSize.height) >=
@@ -53,15 +66,22 @@ open class InfiniteLayout: UICollectionViewFlowLayout {
     }
     
     override open var collectionViewContentSize: CGSize {
-        guard isEnabled else {
-            return super.collectionViewContentSize
+        guard hasValidLayout else {
+            return self.contentSize
         }
         return CGSize(width: scrollDirection == .horizontal ? self.contentSize.width * multiplier : self.contentSize.width,
                       height: scrollDirection == .vertical ? self.contentSize.height * multiplier : self.contentSize.height)
     }
     
+    open override func layoutAttributesForItem(at indexPath: IndexPath) -> UICollectionViewLayoutAttributes? {
+        guard let attributes = super.layoutAttributesForItem(at: indexPath) else {
+            return nil
+        }
+        return self.layoutAttributes(from: attributes, page: currentPage)
+    }
+    
     override open func layoutAttributesForElements(in rect: CGRect) -> [UICollectionViewLayoutAttributes]? {
-        guard isEnabled else {
+        guard hasValidLayout else {
             return super.layoutAttributesForElements(in: rect)
         }
         let page = self.page(for: rect.origin)
@@ -143,7 +163,7 @@ open class InfiniteLayout: UICollectionViewFlowLayout {
     }
     
     public func loopCollectionViewIfNeeded() {
-        guard let collectionView = self.collectionView, self.isEnabled else {
+        guard let collectionView = self.collectionView, self.hasValidLayout else {
             return
         }
         let page = self.pageIndex(from: self.page(for: collectionView.contentOffset))
@@ -233,7 +253,7 @@ open class InfiniteLayout: UICollectionViewFlowLayout {
     }
     
     public func centerCollectionView(withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
-        guard let collectionView = self.collectionView, self.isEnabled else {
+        guard let collectionView = self.collectionView, self.hasValidLayout else {
             return
         }
         let newTarget = CGPoint(x: self.scrollDirection == .horizontal ? collectionView.contentOffset.x + velocity.x * velocityMultiplier : targetContentOffset.pointee.x,
@@ -247,7 +267,7 @@ open class InfiniteLayout: UICollectionViewFlowLayout {
     }
     
     public func centerCollectionViewIfNeeded(indexPath: IndexPath? = nil) {
-        guard let collectionView = self.collectionView, self.isEnabled else {
+        guard let collectionView = self.collectionView, self.hasValidLayout else {
             return
         }
         guard let preferredAttributes = self.preferredVisibleLayoutAttributes(indexPath: indexPath),

InfiniteLayout/Rx/RxInfiniteCollectionViewDataSource.swift

@@ -9,6 +9,8 @@ import UIKit
 import RxDataSources
 
 open class RxInfiniteCollectionViewSectionedReloadDataSource<S: SectionModelType>: RxCollectionViewSectionedReloadDataSource<S> {
+    
+    public var isEnabled: Bool = true
 
     open override subscript(section: Int) -> S {
         let section = InfiniteDataSources.section(from: section, numberOfSections: sectionModels.count)
@@ -33,7 +35,7 @@ open class RxInfiniteCollectionViewSectionedReloadDataSource<S: SectionModelType
         guard let layout = collectionView.collectionViewLayout as? UICollectionViewFlowLayout else {
             fatalError()
         }
-        return InfiniteDataSources.multiplier(estimatedItemSize: layout.itemSize)
+        return InfiniteDataSources.multiplier(estimatedItemSize: layout.itemSize, enabled: isEnabled)
     }
     
     open override func numberOfSections(in collectionView: UICollectionView) -> Int {
@@ -54,6 +56,8 @@ open class RxInfiniteCollectionViewSectionedReloadDataSource<S: SectionModelType
 
 open class RxInfiniteCollectionViewSectionedAnimatedDataSource<S: AnimatableSectionModelType>: RxCollectionViewSectionedAnimatedDataSource<S> {
     
+    public var isEnabled: Bool = true
+    
     open override subscript(section: Int) -> S {
         let section = InfiniteDataSources.section(from: section, numberOfSections: sectionModels.count)
         return self.sectionModels[section]
@@ -77,7 +81,7 @@ open class RxInfiniteCollectionViewSectionedAnimatedDataSource<S: AnimatableSect
         guard let layout = collectionView.collectionViewLayout as? UICollectionViewFlowLayout else {
             fatalError()
         }
-        return InfiniteDataSources.multiplier(estimatedItemSize: layout.itemSize)
+        return InfiniteDataSources.multiplier(estimatedItemSize: layout.itemSize, enabled: isEnabled)
     }
     
     open override func numberOfSections(in collectionView: UICollectionView) -> Int {