Make closures private properties required to init

Author: sergdort

Example/Example5_UIPickerView.swift

@@ -19,15 +19,38 @@ final class ReactivePickerViewControllerExample: UIViewController {
 
     let disposeBag = DisposeBag()
 
-    private let stringPickerAdapter = RxPickerViewStringAdapter<[String]>(components: [])
-    private let attributedStringPickerAdapter = RxPickerViewAttributedStringAdapter<[String]>(components: [])
-    private let viewPickerAdapter = RxPickerViewViewAdapter<[String]>(components: [])
+    private let stringPickerAdapter = RxPickerViewStringAdapter<[String]>(components: [],
+                                                                          numberOfComponents: { _ in 1 },
+                                                                          numberOfRowsInComponent: { (_, _, items, _) -> Int in
+                                                                            return items.count
+                                                                          },
+                                                                          titleForRow: { (_, _, items, row, _) -> String? in
+                                                                                return items[row]
+                                                                          })
+    private let attributedStringPickerAdapter = RxPickerViewAttributedStringAdapter<[String]>(components: [],
+                                                                                              numberOfComponents: { _ in 1 },
+                                                                                              numberOfRowsInComponent: { (_, _, items, _) -> Int in
+                                                                                                return items.count
+    }) { (_, _, items, row, _) -> NSAttributedString? in
+        return NSAttributedString(string: items[row],
+                                  attributes: [
+                                    NSForegroundColorAttributeName: UIColor.purple,
+                                    NSUnderlineStyleAttributeName: NSUnderlineStyle.styleDouble.rawValue,
+                                    NSTextEffectAttributeName: NSTextEffectLetterpressStyle
+            ])
+    }
+    private let viewPickerAdapter = RxPickerViewViewAdapter<[String]>(components: [],
+                                                                      numberOfComponents: { _ in 1 },
+                                                                      numberOfRowsInComponent: { (_, _, items, _) -> Int in
+                                                                        return items.count
+    }) { (_, _, _, row, _, view) -> UIView in
+        let componentView = view ?? UIView()
+        componentView.backgroundColor = row % 2 == 0 ? UIColor.red : UIColor.blue
+        return componentView
+    }
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        setupStringPickerAdapter()
-        setupAttributedStringPickerAdapter()
-        setupViewPickerAdapter()
 
         Observable.just(["One", "Two", "Tree"])
             .bind(to: firstPickerView.rx.items(adapter: stringPickerAdapter))
@@ -41,54 +64,4 @@ final class ReactivePickerViewControllerExample: UIViewController {
             .bind(to: thirdPickerView.rx.items(adapter: viewPickerAdapter))
             .disposed(by: disposeBag)
     }
-    
-    func setupStringPickerAdapter() {
-        stringPickerAdapter.numberOfComponentsProvider = { _ in
-            return 1
-        }
-        
-        stringPickerAdapter.numberOfRowsInComponentProvider = { _, _, components, _ in
-            return components.count
-        }
-        
-        stringPickerAdapter.titleForRowProvider = { _, _, components, row, _ in
-            return components[row]
-        }
-    }
-    
-    func setupAttributedStringPickerAdapter() {
-        attributedStringPickerAdapter.numberOfComponentsProvider = { _ in
-            return 1
-        }
-        
-        attributedStringPickerAdapter.numberOfRowsInComponentProvider = { _, _, components, _ in
-            return components.count
-        }
-        
-        attributedStringPickerAdapter.attributedTitleForRowProvider = {_, _, components, row, _ in
-            let string = components[row]
-            return NSAttributedString(string: string,
-                                      attributes: [
-                                        NSForegroundColorAttributeName: UIColor.purple,
-                                        NSUnderlineStyleAttributeName: NSUnderlineStyle.styleDouble.rawValue,
-                                        NSTextEffectAttributeName: NSTextEffectLetterpressStyle
-                                    ])
-        }
-    }
-    
-    func setupViewPickerAdapter() {
-        viewPickerAdapter.numberOfComponentsProvider = { _ in
-            return 1
-        }
-        
-        viewPickerAdapter.numberOfRowsInComponentProvider = { _, _, components, _ in
-            return components.count
-        }
-        
-        viewPickerAdapter.viewForRowProvider = { _, _, components, row, _, view in
-            let componentView = view ?? UIView()
-            componentView.backgroundColor = row % 2 == 0 ? UIColor.red : UIColor.blue
-            return componentView
-        }
-    }
 }

Sources/DataSources+Rx/RxPickerViewAdapter.swift

@@ -13,101 +13,101 @@ import UIKit
     import RxCocoa
 #endif
 
-public protocol RxPickerViewDataSourceType {
-    associatedtype Element
-    
-    func pickerView(_ pickerView: UIPickerView, observedEvent: Event<Element>)
-}
-
-open class RxPickerViewDataSource<T>: NSObject, UIPickerViewDataSource {
-    public typealias NumberOfComponentsProvider = (RxPickerViewDataSource, UIPickerView, T) -> Int
-    public typealias NumberOfRowsInComponentProvider = (RxPickerViewDataSource, UIPickerView, T, Int) -> Int
-    
-    fileprivate var components: T
-    
-    init(components: T) {
-        self.components = components
-        super.init()
-    }
-    
-    public var numberOfComponentsProvider: NumberOfComponentsProvider!
-    public var numberOfRowsInComponentProvider: NumberOfRowsInComponentProvider!
-    
-    //MARK: UIPickerViewDataSource
-    
-    public func numberOfComponents(in pickerView: UIPickerView) -> Int {
-        return numberOfComponentsProvider(self, pickerView, components)
-    }
-
-    public func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
-        return numberOfRowsInComponentProvider(self, pickerView, components, component)
-    }
-}
-
-extension RxPickerViewDataSource: RxPickerViewDataSourceType {
-    public func pickerView(_ pickerView: UIPickerView, observedEvent: Event<T>) {
-        UIBindingObserver(UIElement: self) { (dataSource, components) in
-            dataSource.components = components
-            pickerView.reloadAllComponents()
-        }.on(observedEvent)
-    }
-}
-
 open class RxPickerViewStringAdapter<T>: RxPickerViewDataSource<T>, UIPickerViewDelegate {
-    public typealias TitleForRowProvider = (RxPickerViewStringAdapter<T>, UIPickerView, T,Int, Int) -> String?
+    public typealias TitleForRow = (RxPickerViewStringAdapter<T>, UIPickerView, T,Int, Int) -> String?
 
-    public var titleForRowProvider: TitleForRowProvider! = nil
+    private let titleForRow: TitleForRow
 
-    public override init(components: T) {
-        super.init(components: components)
+    public init(components: T,
+                numberOfComponents: @escaping NumberOfComponents,
+                numberOfRowsInComponent: @escaping NumberOfRowsInComponent,
+                titleForRow: @escaping TitleForRow) {
+        self.titleForRow = titleForRow
+        super.init(components: components,
+                   numberOfComponents: numberOfComponents,
+                   numberOfRowsInComponent: numberOfRowsInComponent)
     }
 
     open func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
-        return titleForRowProvider(self, pickerView, components, row, component)
+        return titleForRow(self, pickerView, components, row, component)
     }
 }
 
 open class RxPickerViewAttributedStringAdapter<T>: RxPickerViewDataSource<T>, UIPickerViewDelegate {
-    public typealias AttributedTitleForRowProvider = (RxPickerViewAttributedStringAdapter<T>, UIPickerView, T, Int, Int) -> NSAttributedString?
+    public typealias AttributedTitleForRow = (RxPickerViewAttributedStringAdapter<T>, UIPickerView, T, Int, Int) -> NSAttributedString?
 
-    public var attributedTitleForRowProvider: AttributedTitleForRowProvider! = nil
+    private let attributedTitleForRow: AttributedTitleForRow
 
-    public override init(components: T) {
-        super.init(components: components)
+    public init(components: T,
+                numberOfComponents: @escaping NumberOfComponents,
+                numberOfRowsInComponent: @escaping NumberOfRowsInComponent,
+                attributedTitleForRow: @escaping AttributedTitleForRow) {
+        self.attributedTitleForRow = attributedTitleForRow
+        super.init(components: components,
+                   numberOfComponents: numberOfComponents,
+                   numberOfRowsInComponent: numberOfRowsInComponent)
     }
 
     open func pickerView(_ pickerView: UIPickerView, attributedTitleForRow row: Int, forComponent component: Int) -> NSAttributedString? {
-        return attributedTitleForRowProvider(self, pickerView, components, row, component)
+        return attributedTitleForRow(self, pickerView, components, row, component)
     }
 }
 
 open class RxPickerViewViewAdapter<T>: RxPickerViewDataSource<T>, UIPickerViewDelegate {
-    public typealias ViewForRowProvider = (RxPickerViewViewAdapter<T>, UIPickerView, T, Int, Int, UIView?) -> UIView
+    public typealias ViewForRow = (RxPickerViewViewAdapter<T>, UIPickerView, T, Int, Int, UIView?) -> UIView
 
-    public var viewForRowProvider: ViewForRowProvider!
+    private let viewForRow: ViewForRow
 
-    public override init(components: T) {
-        super.init(components: components)
+    public init(components: T,
+                numberOfComponents: @escaping NumberOfComponents,
+                numberOfRowsInComponent: @escaping NumberOfRowsInComponent,
+                viewForRow: @escaping ViewForRow) {
+        self.viewForRow = viewForRow
+        super.init(components: components,
+                   numberOfComponents: numberOfComponents,
+                   numberOfRowsInComponent: numberOfRowsInComponent)
     }
 
     open func pickerView(_ pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusing view: UIView?) -> UIView {
-        return viewForRowProvider(self, pickerView, components, row, component, view)
+        return viewForRow(self, pickerView, components, row, component, view)
     }
 }
 
-extension Reactive where Base: UIPickerView {
-    public func items<O: ObservableType,
-                         Adapter: RxPickerViewDataSourceType & UIPickerViewDataSource & UIPickerViewDelegate>(adapter: Adapter)
-        -> (_ source: O)
-        -> Disposable where O.E == Adapter.Element {
-            return { source in
-                self.base.delegate = adapter
-                self.base.dataSource = adapter
-                return source.subscribe{ [weak pickerView = self.base] (event) in
-                    guard let pickerView = pickerView else { return }
-                    adapter.pickerView(pickerView, observedEvent: event)
-                }
-            }
+
+open class RxPickerViewDataSource<T>: NSObject, UIPickerViewDataSource {
+    public typealias NumberOfComponents = (RxPickerViewDataSource, UIPickerView, T) -> Int
+    public typealias NumberOfRowsInComponent = (RxPickerViewDataSource, UIPickerView, T, Int) -> Int
+    
+    fileprivate var components: T
+    
+    init(components: T,
+         numberOfComponents: @escaping NumberOfComponents,
+         numberOfRowsInComponent: @escaping NumberOfRowsInComponent) {
+        self.components = components
+        self.numberOfComponents = numberOfComponents
+        self.numberOfRowsInComponent = numberOfRowsInComponent
+        super.init()
+    }
+    
+    private let numberOfComponents: NumberOfComponents
+    private let numberOfRowsInComponent: NumberOfRowsInComponent
+    
+    //MARK: UIPickerViewDataSource
+    
+    public func numberOfComponents(in pickerView: UIPickerView) -> Int {
+        return numberOfComponents(self, pickerView, components)
+    }
+    
+    public func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
+        return numberOfRowsInComponent(self, pickerView, components, component)
     }
 }
 
+extension RxPickerViewDataSource: RxPickerViewDataSourceType {
+    public func pickerView(_ pickerView: UIPickerView, observedEvent: Event<T>) {
+        UIBindingObserver(UIElement: self) { (dataSource, components) in
+            dataSource.components = components
+            pickerView.reloadAllComponents()
+            }.on(observedEvent)
+    }
+}