introducing a new type CellBinder.RegistrationMethod

Art-Lav · Sep 13, 2018 · a3008a9 · a3008a9
1 parent ef494bd
commit a3008a9
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 18 deletions.
diff --git a/DataSourceKit/CellBinder.swift b/DataSourceKit/CellBinder.swift
@@ -9,15 +9,24 @@
 import Foundation
 
 public struct CellBinder {
-    public let nib: UINib?
-    public let cellType: AnyClass?
+
+    public enum RegistrationMethod {
+        case nib(UINib)
+        case `class`(AnyClass)
+        case none
+    }
+
+    public let registrationMethod: RegistrationMethod
     public let reuseIdentifier: String
 
     internal let configureCell: (Any) -> Void
 
-    public init<Cell>(cellType: Cell.Type, nib: UINib?, reuseIdentifier: String, configureCell: @escaping (Cell) -> Void) {
-        self.nib = nib
-        self.cellType = cellType as? AnyClass
+    public init<Cell>(cellType: Cell.Type, reuseIdentifier: String, configureCell: @escaping (Cell) -> Void) {
+        self.init(cellType: cellType, registrationMethod: .class(cellType as! AnyClass), reuseIdentifier: reuseIdentifier, configureCell: configureCell)
+    }
+
+    public init<Cell>(cellType: Cell.Type, registrationMethod: RegistrationMethod, reuseIdentifier: String, configureCell: @escaping (Cell) -> Void) {
+        self.registrationMethod = registrationMethod
         self.reuseIdentifier = reuseIdentifier
         self.configureCell = { cell in
             guard let cell = cell as? Cell else {
@@ -27,4 +36,9 @@ public struct CellBinder {
             configureCell(cell)
         }
     }
+
+    @available(*, deprecated, message:  "Use `init<Cell>(cellType: Cell.Type, registrationMethod: RegistrationMethod, reuseIdentifier: String, configureCell: @escaping (Cell) -> Void)` instead")
+    public init<Cell>(cellType: Cell.Type, nib: UINib?, reuseIdentifier: String, configureCell: @escaping (Cell) -> Void) {
+        fatalError("This method is deprecated, Use `init<Cell>(cellType: Cell.Type, registrationMethod: RegistrationMethod, reuseIdentifier: String, configureCell: @escaping (Cell) -> Void)` instead")
+    }
 }
diff --git a/DataSourceKit/CollectionViewDataSource.swift b/DataSourceKit/CollectionViewDataSource.swift
@@ -26,11 +26,13 @@ public class CollectionViewDataSource<CellDeclaration>: NSObject, UICollectionVi
     public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cellBinder = binderFromDeclaration(cellDeclarations[indexPath.item])
         if !registeredReuseIdentifiers.contains(cellBinder.reuseIdentifier) {
-
-            if let nib = cellBinder.nib {
+            switch cellBinder.registrationMethod {
+            case let .nib(nib):
                 collectionView.register(nib, forCellWithReuseIdentifier: cellBinder.reuseIdentifier)
-            } else {
-                collectionView.register(cellBinder.cellType, forCellWithReuseIdentifier: cellBinder.reuseIdentifier)
+            case let .class(cellClass):
+                collectionView.register(cellClass, forCellWithReuseIdentifier: cellBinder.reuseIdentifier)
+            case .none:
+                break
             }
             registeredReuseIdentifiers.append(cellBinder.reuseIdentifier)
         }

diff --git a/DataSourceKit/TableViewDataSource.swift b/DataSourceKit/TableViewDataSource.swift
@@ -26,17 +26,18 @@ public class TableViewDataSource<CellDeclaration>: NSObject, UITableViewDataSour
     public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cellBinder = binderFromDeclaration(cellDeclarations[indexPath.item])
         if !registeredReuseIdentifiers.contains(cellBinder.reuseIdentifier) {
-            if let nib = cellBinder.nib {
+            switch cellBinder.registrationMethod {
+            case let .nib(nib):
                 tableView.register(nib, forCellReuseIdentifier: cellBinder.reuseIdentifier)
-            } else {
-                tableView.register(cellBinder.cellType, forCellReuseIdentifier: cellBinder.reuseIdentifier)
+            case let .class(cellClass):
+                tableView.register(cellClass, forCellReuseIdentifier: cellBinder.reuseIdentifier)
+            case .none:
+                break
             }
             registeredReuseIdentifiers.append(cellBinder.reuseIdentifier)
         }
-
         let cell = tableView.dequeueReusableCell(withIdentifier: cellBinder.reuseIdentifier, for: indexPath)
         cellBinder.configureCell(cell)
-
         return cell
     }
 }
diff --git a/Demo/Cell/RelatedVenueCell.swift b/Demo/Cell/RelatedVenueCell.swift
@@ -28,7 +28,7 @@ extension RelatedVenueCell: BindableCell {
     static func makeBinder(value venue: Venue) -> CellBinder {
         return CellBinder(
             cellType: RelatedVenueCell.self,
-            nib: UINib(nibName: "RelatedVenueCell", bundle: nil),
+            registrationMethod: .nib(UINib(nibName: "RelatedVenueCell", bundle: nil)),
             reuseIdentifier: "RelatedVenue",
             configureCell: { cell in
                 cell.photoImageView.image = venue.photo

diff --git a/Demo/Cell/ReviewCell.swift b/Demo/Cell/ReviewCell.swift
@@ -19,7 +19,7 @@ extension ReviewCell: BindableCell {
     static func makeBinder(value review: Review) -> CellBinder {
         return CellBinder(
             cellType: ReviewCell.self,
-            nib: UINib(nibName: "ReviewCell", bundle: nil),
+            registrationMethod: .nib(UINib(nibName: "ReviewCell", bundle: nil)),
             reuseIdentifier: "Review",
             configureCell: { cell in
                 cell.authorImageView.image = review.authorImage

diff --git a/Demo/Cell/SectionHeaderCell.swift b/Demo/Cell/SectionHeaderCell.swift
@@ -17,7 +17,7 @@ extension SectionHeaderCell: BindableCell {
     static func makeBinder(value title: String) -> CellBinder {
         return CellBinder(
             cellType: SectionHeaderCell.self,
-            nib: UINib(nibName: "SectionHeaderCell", bundle: nil),
+            registrationMethod: .nib(UINib(nibName: "SectionHeaderCell", bundle: nil)),
             reuseIdentifier: "SectionHeader",
             configureCell: { cell in
                 cell.titleLabel.text = title

diff --git a/Demo/Cell/VenueOutlineCell.swift b/Demo/Cell/VenueOutlineCell.swift
@@ -18,7 +18,7 @@ extension VenueOutlineCell: BindableCell {
     static func makeBinder(value venue: Venue) -> CellBinder {
         return CellBinder(
             cellType: VenueOutlineCell.self,
-            nib: UINib(nibName: "VenueOutlineCell", bundle: nil),
+            registrationMethod: .nib(UINib(nibName: "VenueOutlineCell", bundle: nil)),
             reuseIdentifier: "VenueOutline",
             configureCell: { cell in
                 cell.photoImageView.image = venue.photo