Merge pull request #30 from lm2343635/master

Support RxSwift 6+

.swift-version

@@ -1 +0,0 @@
-5.0

.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

Example/InfiniteLayout.xcodeproj/project.pbxproj

@@ -326,7 +326,6 @@
 			);
 			inputPaths = (
 				"${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",
 				"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
@@ -336,7 +335,6 @@
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaProxy.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Differentiator.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/InfiniteLayout.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",

Example/InfiniteLayout/RxBaseCollectionViewController.swift

@@ -29,10 +29,6 @@ class RxBaseCollectionViewController: UIViewController {
         infiniteCollectionView.rx.modelCentered(Int.self)
             .asDriver()
             .drive(onNext: { current in
-                guard let current = current else {
-                    print("centered: none")
-                    return
-                }
                 print("centered: \(current + 1)")
             }).disposed(by: disposeBag)
         

Example/Podfile.lock

@@ -1,35 +1,32 @@
 PODS:
-  - CocoaProxy (0.1.1)
-  - Differentiator (4.0.1)
-  - InfiniteLayout (0.4.1):
-    - CocoaProxy (~> 0)
-    - InfiniteLayout/Core (= 0.4.1)
-  - InfiniteLayout/Core (0.4.1):
-    - CocoaProxy (~> 0)
-  - InfiniteLayout/Rx (0.4.1):
-    - CocoaProxy (~> 0)
-    - InfiniteLayout/Core (~> 0)
-    - RxCocoa (~> 5)
-    - RxDataSources (~> 4)
-    - RxSwift (~> 5)
-  - RxCocoa (5.0.0):
-    - RxRelay (~> 5)
-    - RxSwift (~> 5)
-  - RxDataSources (4.0.1):
-    - Differentiator (~> 4.0)
-    - RxCocoa (~> 5.0)
-    - RxSwift (~> 5.0)
-  - RxRelay (5.0.0):
-    - RxSwift (~> 5)
-  - RxSwift (5.0.0)
+  - Differentiator (5.0.0)
+  - InfiniteLayout (0.5):
+    - InfiniteLayout/Core (= 0.5)
+  - InfiniteLayout/CocoaProxy (0.5)
+  - InfiniteLayout/Core (0.5):
+    - InfiniteLayout/CocoaProxy
+  - InfiniteLayout/Rx (0.5):
+    - InfiniteLayout/Core
+    - RxCocoa (~> 6)
+    - RxDataSources (~> 5)
+    - RxSwift (~> 6)
+  - RxCocoa (6.2.0):
+    - RxRelay (= 6.2.0)
+    - RxSwift (= 6.2.0)
+  - RxDataSources (5.0.0):
+    - Differentiator (~> 5.0)
+    - RxCocoa (~> 6.0)
+    - RxSwift (~> 6.0)
+  - RxRelay (6.2.0):
+    - RxSwift (= 6.2.0)
+  - RxSwift (6.2.0)
 
 DEPENDENCIES:
   - InfiniteLayout (from `../`)
   - InfiniteLayout/Rx (from `../`)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
-    - CocoaProxy
+  trunk:
     - Differentiator
     - RxCocoa
     - RxDataSources
@@ -41,14 +38,13 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  CocoaProxy: 35ab81e24325b33834cffe45a3d1fd48ca67ef3a
-  Differentiator: 886080237d9f87f322641dedbc5be257061b0602
-  InfiniteLayout: 458eadbcb94afc3d777141990fbfe7a804a35609
-  RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
-  RxDataSources: efee07fa4de48477eca0a4611e6d11e2da9c1114
-  RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
-  RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
+  Differentiator: e8497ceab83c1b10ca233716d547b9af21b9344d
+  InfiniteLayout: 2c55b0fc14b6a9d924fbe13c0e2d88b1cbf5423d
+  RxCocoa: 4baf94bb35f2c0ab31bc0cb9f1900155f646ba42
+  RxDataSources: aa47cc1ed6c500fa0dfecac5c979b723542d79cf
+  RxRelay: e72dbfd157807478401ef1982e1c61c945c94b2f
+  RxSwift: d356ab7bee873611322f134c5f9ef379fa183d8f
 
 PODFILE CHECKSUM: 0dc7a9b37f9b7c5d5266beaab9e94861b80aa80f
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.10.1

InfiniteLayout.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'InfiniteLayout'
-  s.version          = '0.4.1'
+  s.version          = '0.5'
   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.
@@ -28,7 +28,7 @@ Horizontal and Vertical infinite scrolling feature for UICollectionView with Pag
   s.source           = { :git => 'https://github.com/arnauddorgans/InfiniteLayout.git', :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/arnauddorgans'
 
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
   s.tvos.deployment_target = '9.0'
   
 #s.xcconfig = { 'SWIFT_OBJC_BRIDGING_HEADER' => '${POD_ROOT}/InfiniteLayout/BridgeHeader.h' }
@@ -39,19 +39,23 @@ Horizontal and Vertical infinite scrolling feature for UICollectionView with Pag
 
   # s.public_header_files = 'Pod/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
-  s.dependency 'CocoaProxy', '~> 0'
+  s.swift_versions = ['5.0', '5.1']
+
 
   s.default_subspec = 'Core'
-
     s.subspec 'Core' do |core|
-        core.source_files = 'InfiniteLayout/Classes/**/*'
+        core.source_files = 'Sources/InfiniteLayout/**/*'
+        core.dependency 'InfiniteLayout/CocoaProxy'
+        core.exclude_files = '**/*/SPMBridge.swift'
+    end
+    s.subspec 'CocoaProxy' do |core|
+        core.source_files = 'Sources/CocoaProxy/**/*'
     end
-
     s.subspec 'Rx' do |rx|
-        rx.dependency 'InfiniteLayout/Core', '~> 0'
-        rx.dependency 'RxSwift', '~> 5'
-        rx.dependency 'RxCocoa', '~> 5'
-        rx.dependency 'RxDataSources', '~> 4'
-        rx.source_files = 'InfiniteLayout/Rx/**/*'
+        rx.dependency 'InfiniteLayout/Core'
+        rx.dependency 'RxSwift', '~> 6'
+        rx.dependency 'RxCocoa', '~> 6'
+        rx.dependency 'RxDataSources', '~> 5'
+        rx.source_files = 'Sources/Rx/**/*'
     end
 end

Package.swift

@@ -0,0 +1,37 @@
+// swift-tools-version:5.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "InfiniteLayout",
+    platforms: [.iOS(.v9), .tvOS(.v9)],
+    products: [
+        .library(
+            name: "InfiniteLayout",
+            targets: ["InfiniteLayout"]),
+        .library(
+            name: "RxInfiniteLayout",
+            targets: ["RxInfiniteLayout"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.0.0")),
+        .package(url: "https://github.com/RxSwiftCommunity/RxDataSources.git", .upToNextMajor(from: "5.0.0")),
+    ],
+    targets: [
+        .target(
+            name: "CocoaProxy",
+            dependencies: [],
+            publicHeadersPath: "./"
+        ),
+        .target(
+            name: "InfiniteLayout",
+            dependencies: ["CocoaProxy"]
+        ),
+        .target(
+            name: "RxInfiniteLayout",
+            dependencies: ["InfiniteLayout", "RxSwift", "RxCocoa", "RxDataSources"],
+            path: "Sources/Rx"
+        ),
+    ]
+)

README.md

@@ -1,9 +1,10 @@
 # InfiniteLayout
 
 [![CI Status](http://img.shields.io/travis/arnauddorgans/InfiniteLayout.svg?style=flat)](https://travis-ci.org/arnauddorgans/InfiniteLayout)
-[![Version](https://img.shields.io/cocoapods/v/InfiniteLayout.svg?style=flat)](http://cocoapods.org/pods/InfiniteLayout)
 [![License](https://img.shields.io/cocoapods/l/InfiniteLayout.svg?style=flat)](http://cocoapods.org/pods/InfiniteLayout)
 [![Platform](https://img.shields.io/cocoapods/p/InfiniteLayout.svg?style=flat)](http://cocoapods.org/pods/InfiniteLayout)
+[![Version](https://img.shields.io/cocoapods/v/InfiniteLayout.svg?style=flat)](http://cocoapods.org/pods/InfiniteLayout)
+[![Swift Package Manager compatible](https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)
 
 <img src="https://github.com/arnauddorgans/InfiniteLayout/raw/master/horizontal.gif" width="250" height="540"><img src="https://github.com/arnauddorgans/InfiniteLayout/raw/master/vertical.gif" width="250" height="540"><img src="https://github.com/arnauddorgans/InfiniteLayout/raw/master/custom.gif" width="250" height="540">
 
@@ -12,10 +13,10 @@
 
 To run the example project, clone the repo, and run `pod install` from the Example directory first.
 
-## Requirements
-
 ## Installation
 
+### [CocoaPods](https://guides.cocoapods.org/using/using-cocoapods.html)
+
 InfiniteLayout is available through [CocoaPods](http://cocoapods.org). To install
 it, simply add the following line to your Podfile:
 
@@ -23,6 +24,27 @@ it, simply add the following line to your Podfile:
 pod 'InfiniteLayout'
 ```
 
+
+### [Swift Package Manager](https://github.com/apple/swift-package-manager)
+
+Create a `Package.swift` file.
+
+```swift
+// swift-tools-version:5.0
+
+import PackageDescription
+
+let package = Package(
+  name: "InfiniteLayoutTestProject",
+  dependencies: [
+    .package(url: "https://github.com/arnauddorgans/InfiniteLayout.git", from: "0.4.2")
+  ],
+  targets: [
+    .target(name: "InfiniteLayoutTestProject", dependencies: ["InfiniteLayout"])
+  ]
+)
+```
+
 ## Usage
 
 ```swift
@@ -85,7 +107,7 @@ self.infiniteCollectionView.preferredCenteredIndexPath = nil // center the close
 InfiniteCollectionView provide an **infiniteDelegate** protocol used to get the centered IndexPath, usefull if you want to use an InfiniteCollectionView like a Picker.
 
 ```swift
-func infiniteCollectionView(_ infiniteCollectionView: InfiniteCollectionView, didChangeCenteredIndexPath centeredIndexPath: IndexPath?)
+func infiniteCollectionView(_ infiniteCollectionView: InfiniteCollectionView, didChangeCenteredIndexPath from: IndexPath?, to: IndexPath?)
 ```
 
 ### Rx

Sources/CocoaProxy/CocoaProxy.h

@@ -0,0 +1,20 @@
+//
+//  CocoaProxy.h
+//  CocoaProxy
+//
+//  Created by Arnaud Dorgans on 27/12/2017.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface CocoaProxy : NSProxy
+
+- (instancetype _Nonnull)init;
+- (instancetype _Nonnull)initWithProxies:(nonnull NSArray<id<NSObject>>*)proxies;
+
+- (NSArray<id<NSObject>> *_Nonnull)proxiesForSelector:(SEL _Nonnull )aSelector;
+
+@property (nonatomic, strong) NSArray<id<NSObject>>* _Nonnull proxies;
+@property (nonatomic, copy) BOOL (^ _Nullable proxyFilter)(id<NSObject> _Nonnull proxy, SEL _Nonnull selector);
+
+@end

Sources/CocoaProxy/CocoaProxy.m

@@ -0,0 +1,80 @@
+//
+//  CocoaProxy.m
+//  CocoaProxy
+//
+//  Created by Arnaud Dorgans on 27/12/2017.
+//
+
+#import "CocoaProxy.h"
+
+@interface CocoaProxy () { }
+
+@property (nonatomic, strong) NSPointerArray *pointerArray;
+
+@end
+
+@implementation CocoaProxy
+
+- (instancetype _Nonnull)initWithProxies:(nonnull NSArray<NSObject*>*)proxies {
+    [self setProxies: proxies];
+    return self;
+}
+
+- (instancetype _Nonnull)init {
+    return [self initWithProxies: @[]];
+}
+
+- (BOOL)respondsToSelector:(SEL)aSelector
+{
+    return ([self methodSignatureForSelector: aSelector] != nil);
+}
+
+- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector
+{
+    for (NSObject* proxy in [self proxiesForSelector: aSelector]) {
+        if ([proxy respondsToSelector: aSelector]) {
+            return [proxy methodSignatureForSelector: aSelector];
+        }
+    }
+    return nil;
+}
+
+- (NSArray<id<NSObject>> *_Nonnull)proxiesForSelector:(SEL _Nonnull )aSelector
+{
+    if (self.proxyFilter) {
+        NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id  _Nullable evaluatedObject, NSDictionary<NSString *,id> * _Nullable bindings) {
+            return self.proxyFilter(evaluatedObject, aSelector);
+        }];
+        return [self.proxies filteredArrayUsingPredicate: predicate];
+    }
+    return self.proxies;
+}
+
+- (void)forwardInvocation:(NSInvocation *)invocation
+{
+    for (NSObject* proxy in [self proxiesForSelector: invocation.selector]) {
+        [self invokeInvocation: invocation onProxy: proxy];
+    }
+}
+
+- (BOOL)invokeInvocation:(NSInvocation *)invocation onProxy:(id<NSObject>)proxy
+{
+    if ([proxy respondsToSelector: invocation.selector]) {
+        [invocation invokeWithTarget: proxy];
+        return YES;
+    }
+    return NO;
+}
+
+- (void)setProxies:(NSArray<id<NSObject>> *)proxies {
+    self.pointerArray = [NSPointerArray weakObjectsPointerArray];
+    for (NSObject* proxy in proxies) {
+        [self.pointerArray addPointer: (void *)proxy];
+    }
+}
+
+- (NSArray<id<NSObject>> *)proxies {
+    return self.pointerArray.allObjects;
+}
+
+@end

Sources/InfiniteLayout/InfiniteCollectionView.swift

@@ -8,8 +8,8 @@
 import UIKit
 
 @objc public protocol InfiniteCollectionViewDelegate {
-    
-    @objc optional func infiniteCollectionView(_ infiniteCollectionView: InfiniteCollectionView, didChangeCenteredIndexPath centeredIndexPath: IndexPath?)
+
+    @objc optional func infiniteCollectionView(_ infiniteCollectionView: InfiniteCollectionView, didChangeCenteredIndexPath from: IndexPath?, to: IndexPath?)
 }
 
 open class InfiniteCollectionView: UICollectionView {
@@ -22,7 +22,7 @@ open class InfiniteCollectionView: UICollectionView {
     open private(set) var centeredIndexPath: IndexPath?
     open var preferredCenteredIndexPath: IndexPath? = IndexPath(item: 0, section: 0)
     
-    var forwardDelegate: Bool { return true }
+    open var forwardDelegate: Bool { return true }
     var _contentSize: CGSize?
     
     override open weak var delegate: UICollectionViewDelegate? {
@@ -170,8 +170,9 @@ extension InfiniteCollectionView: UICollectionViewDelegate {
         
         let preferredVisibleIndexPath = infiniteLayout.preferredVisibleLayoutAttributes()?.indexPath
         if self.centeredIndexPath != preferredVisibleIndexPath {
+            let previousCenteredIndexPath = self.centeredIndexPath
             self.centeredIndexPath = preferredVisibleIndexPath
-            self.infiniteDelegate?.infiniteCollectionView?(self, didChangeCenteredIndexPath: preferredVisibleIndexPath)
+            self.infiniteDelegate?.infiniteCollectionView?(self, didChangeCenteredIndexPath: previousCenteredIndexPath, to: self.centeredIndexPath)
         }
     }
     

Sources/InfiniteLayout/InfiniteCollectionViewProxy.swift

@@ -6,7 +6,6 @@
 //
 
 import UIKit
-import CocoaProxy
 
 class InfiniteCollectionViewProxy<T: NSObjectProtocol>: CocoaProxy {
     

Sources/InfiniteLayout/InfiniteDataSource.swift

@@ -7,17 +7,17 @@
 
 import UIKit
 
-class InfiniteDataSources {
-    
-    static func section(from infiniteSection: Int, numberOfSections: Int) -> Int {
+open class InfiniteDataSources {
+    public static var originCount: Int = 0
+    public static func section(from infiniteSection: Int, numberOfSections: Int) -> Int {
         return infiniteSection % numberOfSections
     }
-    
-    static func indexPath(from infiniteIndexPath: IndexPath, numberOfSections: Int, numberOfItems: Int) -> IndexPath {
+
+    public static func indexPath(from infiniteIndexPath: IndexPath, numberOfSections: Int, numberOfItems: Int) -> IndexPath {
         return IndexPath(item: infiniteIndexPath.item % numberOfItems, section: self.section(from: infiniteIndexPath.section, numberOfSections: numberOfSections))
     }
-    
-    static func multiplier(estimatedItemSize: CGSize, enabled: Bool) -> Int {
+
+    public static func multiplier(estimatedItemSize: CGSize, enabled: Bool) -> Int {
         guard enabled else {
             return 1
         }
@@ -25,12 +25,13 @@ class InfiniteDataSources {
         let count = ceil(InfiniteLayout.minimumContentSize / min)
         return Int(count)
     }
-    
-    static func numberOfSections(numberOfSections: Int, multiplier: Int) -> Int {
+
+    public static func numberOfSections(numberOfSections: Int, multiplier: Int) -> Int {
         return numberOfSections > 1 ? numberOfSections * multiplier : numberOfSections
     }
     
-    static func numberOfItemsInSection(numberOfItemsInSection: Int, numberOfSections: Int, multiplier: Int) -> Int {
+    public static func numberOfItemsInSection(numberOfItemsInSection: Int, numberOfSections: Int, multiplier: Int) -> Int {
+        originCount = numberOfItemsInSection
         return numberOfSections > 1 ? numberOfItemsInSection : numberOfItemsInSection * multiplier
     }
 }

Sources/InfiniteLayout/SPMBridge.swift

@@ -0,0 +1,8 @@
+//
+//  InfiniteCollectionView.swift
+//  InfiniteLayout
+//
+//  Created by Arnaud Dorgans on 05/09/2019.
+//
+
+@_exported import CocoaProxy

Sources/Rx/InfiniteCollectionView+Rx.swift

@@ -5,6 +5,10 @@
 //  Created by Arnaud Dorgans on 03/01/2018.
 //
 
+#if canImport(InfiniteLayout)
+import InfiniteLayout
+#endif
+
 import UIKit
 import RxSwift
 import RxCocoa
@@ -38,16 +42,34 @@ extension Reactive where Base: InfiniteCollectionView {
     }
     
     public var itemCentered: ControlEvent<IndexPath?> {
-        let source = infiniteDelegate.sentMessage(#selector(InfiniteCollectionViewDelegate.infiniteCollectionView(_:didChangeCenteredIndexPath:)))
+        let source = infiniteDelegate.sentMessage(#selector(InfiniteCollectionViewDelegate.infiniteCollectionView(_:didChangeCenteredIndexPath:to:)))
             .map { $0.last as? IndexPath }
         return ControlEvent(events: source)
     }
-    
-    public func modelCentered<T>(_ type: T.Type) -> ControlEvent<T?> {
-        let source = itemCentered
-            .map { indexPath -> T? in
-                return try indexPath.flatMap { try self.model(at: $0) }
+
+    public func modelCentered<T>(_ type: T.Type) -> ControlEvent<T> {
+        let source: Observable<T> = itemCentered.flatMap { [weak view = self.base as InfiniteCollectionView] indexPath -> Observable<T> in
+            guard let view = view, var indexPath = indexPath else {
+                return Observable.empty()
             }
+
+            indexPath.row %= InfiniteDataSources.originCount
+            return Observable.just(try view.rx.model(at: indexPath))
+        }
+        return ControlEvent(events: source)
+    }
+
+    public func modelSelected<T>(_ modelType: T.Type) -> ControlEvent<T> {
+        let source: Observable<T> = itemSelected.flatMap { [weak view = self.base as InfiniteCollectionView] indexPath -> Observable<T> in
+            guard let view = view else {
+                return Observable.empty()
+            }
+
+            var indexPath = indexPath
+            indexPath.row %= InfiniteDataSources.originCount
+            return Observable.just(try view.rx.model(at: indexPath))
+        }
+
         return ControlEvent(events: source)
     }
 }

Sources/Rx/RxInfiniteCollectionView.swift

@@ -5,6 +5,10 @@
 //  Created by Arnaud Dorgans on 03/01/2018.
 //
 
+#if canImport(InfiniteLayout)
+import InfiniteLayout
+#endif
+
 import UIKit
 import RxSwift
 import RxCocoa
@@ -13,7 +17,7 @@ open class RxInfiniteCollectionView: InfiniteCollectionView {
     
     let disposeBag = DisposeBag()
 
-    override var forwardDelegate: Bool {
+    override open var forwardDelegate: Bool {
         return false
     }
     

Sources/Rx/RxInfiniteCollectionViewDataSource.swift

@@ -5,6 +5,10 @@
 //  Created by Arnaud Dorgans on 03/01/2018.
 //
 
+#if canImport(InfiniteLayout)
+import InfiniteLayout
+#endif
+
 import UIKit
 import RxDataSources