Modernizes example app.

Author: kzaher

Example/Example1_CustomizationUsingTableViewDelegate.swift

@@ -67,10 +67,10 @@ class CustomizationUsingTableViewDelegate : UIViewController {
         ]
 
         Observable.just(sections)
-            .bindTo(tableView.rx_itemsWithDataSource(dataSource))
+            .bindTo(tableView.rx.items(dataSource: dataSource))
             .addDisposableTo(disposeBag)
 
-        tableView.rx_setDelegate(self)
+        tableView.rx.setDelegate(self)
             .addDisposableTo(disposeBag)
 
         self.dataSource = dataSource
@@ -83,7 +83,7 @@ extension CustomizationUsingTableViewDelegate : UITableViewDelegate {
         // you can also fetch item
         guard let item = dataSource?.itemAtIndexPath(indexPath),
         // .. or section and customize what you like
-            _ = dataSource?.sectionAtIndex(indexPath.section)
+            let _ = dataSource?.sectionAtIndex(indexPath.section)
             else {
             return 0.0
         }

Example/Example2_RandomizedSectionsAnimation.swift

@@ -35,7 +35,7 @@ class ViewController: UIViewController {
         let initialRandomizedSections = Randomizer(rng: PseudoRandomGenerator(4, 3), sections: initialValue())
 
         let ticks = Observable<Int>.interval(1, scheduler: MainScheduler.instance).map { _ in () }
-        let randomSections = Observable.of(ticks, refreshButton.rx_tap.asObservable())
+        let randomSections = Observable.of(ticks, refreshButton.rx.tap.asObservable())
                 .merge()
                 .scan(initialRandomizedSections) { a, _ in
                     return a.randomize()
@@ -51,11 +51,11 @@ class ViewController: UIViewController {
         skinTableViewDataSource(reloadDataSource)
 
         randomSections
-            .bindTo(animatedTableView.rx_itemsWithDataSource(tvAnimatedDataSource))
+            .bindTo(animatedTableView.rx.items(dataSource: tvAnimatedDataSource))
             .addDisposableTo(disposeBag)
 
         randomSections
-            .bindTo(tableView.rx_itemsWithDataSource(reloadDataSource))
+            .bindTo(tableView.rx.items(dataSource: reloadDataSource))
             .addDisposableTo(disposeBag)
 
         // Collection view logic works, but when clicking fast because of internal bugs
@@ -74,28 +74,28 @@ class ViewController: UIViewController {
             skinCollectionViewDataSource(cvAnimatedDataSource)
 
             randomSections
-                .bindTo(animatedCollectionView.rx_itemsWithDataSource(cvAnimatedDataSource))
+                .bindTo(animatedCollectionView.rx.items(dataSource: cvAnimatedDataSource))
                 .addDisposableTo(disposeBag)
         }
         else {
             let cvReloadDataSource = RxCollectionViewSectionedReloadDataSource<NumberSection>()
             skinCollectionViewDataSource(cvReloadDataSource)
             randomSections
-                .bindTo(animatedCollectionView.rx_itemsWithDataSource(cvReloadDataSource))
+                .bindTo(animatedCollectionView.rx.items(dataSource: cvReloadDataSource))
                 .addDisposableTo(disposeBag)
         }
 
         // touches
 
         Observable.of(
-            tableView.rx_modelSelected(IntItem.self),
-            animatedTableView.rx_modelSelected(IntItem.self),
-            animatedCollectionView.rx_modelSelected(IntItem.self)
+            tableView.rx.modelSelected(IntItem.self),
+            animatedTableView.rx.modelSelected(IntItem.self),
+            animatedCollectionView.rx.modelSelected(IntItem.self)
         )
             .merge()
-            .subscribeNext { item in
+            .subscribe(onNext: { item in
                 print("Let me guess, it's .... It's \(item), isn't it? Yeah, I've got it.")
-            }
+            })
             .addDisposableTo(disposeBag)
     }
 }

Example/Example3_TableViewEditing.swift

@@ -29,14 +29,14 @@ class EditingExampleViewController: UIViewController {
 
         let initialState = SectionedTableViewState(sections: sections)
         let add3ItemsAddStart = Observable.of((), (), ())
-        let addCommand = Observable.of(addButton.rx_tap.asObservable(), add3ItemsAddStart)
+        let addCommand = Observable.of(addButton.rx.tap.asObservable(), add3ItemsAddStart)
             .merge()
             .map(TableViewEditingCommand.addRandomItem)
 
-        let deleteCommand = tableView.rx_itemDeleted.asObservable()
+        let deleteCommand = tableView.rx.itemDeleted.asObservable()
             .map(TableViewEditingCommand.DeleteItem)
 
-        let movedCommand = tableView.rx_itemMoved
+        let movedCommand = tableView.rx.itemMoved
             .map(TableViewEditingCommand.MoveItem)
 
         skinTableViewDataSource(dataSource: dataSource)
@@ -50,7 +50,7 @@ class EditingExampleViewController: UIViewController {
                 $0.sections
             }
             .shareReplay(1)
-            .bindTo(tableView.rx_itemsWithDataSource(dataSource))
+            .bindTo(tableView.rx.items(dataSource: dataSource))
             .addDisposableTo(disposeBag)
     }
 
@@ -95,7 +95,7 @@ enum TableViewEditingCommand {
 // This is the part
 
 struct SectionedTableViewState {
-    private var sections: [NumberSection]
+    fileprivate var sections: [NumberSection]
 
     init(sections: [NumberSection]) {
         self.sections = sections

Example/Example4_DifferentSectionAndItemTypes.swift

@@ -34,7 +34,7 @@ class MultipleSectionModelViewController: UIViewController {
         skinTableViewDataSource(dataSource)
 
         Observable.just(sections)
-            .bindTo(tableView.rx_itemsWithDataSource(dataSource))
+            .bindTo(tableView.rx.items(dataSource: dataSource))
             .addDisposableTo(disposeBag)
     }
 

Example/Views/UIKitExtensions.swift

@@ -16,7 +16,7 @@ protocol ReusableView: class {
 
 extension ReusableView {
     static var reuseIdentifier: String {
-        return String(self)
+        return String(describing: self)
     }
 }
 
@@ -25,7 +25,7 @@ extension UITableViewCell: ReusableView {
 
 extension UITableView {
 
-    func dequeueReusableCell<T: UITableViewCell where T: ReusableView>(forIndexPath indexPath: IndexPath) -> T {
+    func dequeueReusableCell<T: UITableViewCell>(forIndexPath indexPath: IndexPath) -> T where T: ReusableView {
         guard let cell = dequeueReusableCell(withIdentifier: T.reuseIdentifier, for: indexPath) as? T else {
             fatalError("Could not dequeue cell with identifier: \(T.reuseIdentifier)")
         }