Improved heterogeneous sections example.

Author: kzaher

Example/MultipleSectionModelViewController.swift

@@ -12,28 +12,21 @@ import RxCocoa
 import RxSwift
 
 enum MultipleSectionModel {
-    case ImageProvidableSection(title: String, items: [ImageSectionItem])
-    case ToggleableSection(title: String, items: [ToggleableSectionItem])
-    case StepperableSection(title: String, items: [StepperSectionItem])
+    case ImageProvidableSection(title: String, items: [SectionItem])
+    case ToggleableSection(title: String, items: [SectionItem])
+    case StepperableSection(title: String, items: [SectionItem])
 }
 
-extension MultipleSectionModel {
-    var title: String {
-        switch self {
-        case .ImageProvidableSection(title: let title, items: _):
-            return title
-        case .StepperableSection(title: let title, items: _):
-            return title
-        case .ToggleableSection(title: let title, items: _):
-            return title
-        }
-    }
+enum SectionItem {
+    case ImageSectionItem(image: UIImage, title: String)
+    case ToggleableSectionItem(title: String, enabled: Bool)
+    case StepperSectionItem(title: String)
 }
 
 extension MultipleSectionModel: SectionModelType {
-    typealias Item = Any
+    typealias Item = SectionItem
 
-    var items: [Item] {
+    var items: [SectionItem] {
         switch  self {
         case .ImageProvidableSection(title: _, items: let items):
             return items.map {$0}
@@ -49,20 +42,6 @@ extension MultipleSectionModel: SectionModelType {
     }
 }
 
-struct ImageSectionItem {
-    let image: UIImage
-    let title: String
-}
-
-struct ToggleableSectionItem {
-    let title: String
-    let enabled: Bool
-}
-
-struct StepperSectionItem {
-    let title: String
-}
-
 class MultipleSectionModelViewController: UIViewController {
 
     @IBOutlet weak var tableView: UITableView!
@@ -73,11 +52,11 @@ class MultipleSectionModelViewController: UIViewController {
 
         let sections: [MultipleSectionModel] = [
             .ImageProvidableSection(title: "Section 1",
-                items: [ImageSectionItem(image: UIImage(named: "settings")!, title: "General")]),
+                items: [.ImageSectionItem(image: UIImage(named: "settings")!, title: "General")]),
             .ToggleableSection(title: "Section 2",
-                items: [ToggleableSectionItem(title: "On", enabled: true)]),
+                items: [.ToggleableSectionItem(title: "On", enabled: true)]),
             .StepperableSection(title: "Section 3",
-                items: [StepperSectionItem(title: "1")])
+                items: [.StepperSectionItem(title: "1")])
         ]
 
         let dataSource = RxTableViewSectionedReloadDataSource<MultipleSectionModel>()
@@ -90,25 +69,22 @@ class MultipleSectionModelViewController: UIViewController {
 
     func skinTableViewDataSource(dataSource: RxTableViewSectionedReloadDataSource<MultipleSectionModel>) {
         dataSource.configureCell = { (dataSource, table, idxPath, _) in
-            switch dataSource.sectionAtIndex(idxPath.section) {
-            case .ImageProvidableSection(title: _, items: let items):
-                let item = items[idxPath.row]
+            switch dataSource.itemAtIndexPath(idxPath) {
+            case let .ImageSectionItem(image, title):
                 let cell: ImageTitleTableViewCell = table.dequeueReusableCell(forIndexPath: idxPath)
-                cell.titleLabel.text = item.title
-                cell.cellImageView.image = item.image
+                cell.titleLabel.text = title
+                cell.cellImageView.image = image
 
                 return cell
-            case .StepperableSection(title: _, items: let items):
-                let item = items[idxPath.row]
+            case let .StepperSectionItem(title):
                 let cell: TitleSteperTableViewCell = table.dequeueReusableCell(forIndexPath: idxPath)
-                cell.titleLabel.text = item.title
+                cell.titleLabel.text = title
 
                 return cell
-            case .ToggleableSection(title: _, items: let items):
-                let item = items[idxPath.row]
+            case let .ToggleableSectionItem(title, enabled):
                 let cell: TitleSwitchTableViewCell = table.dequeueReusableCell(forIndexPath: idxPath)
-                cell.switchControl.on = item.enabled
-                cell.titleLabel.text = item.title
+                cell.switchControl.on = enabled
+                cell.titleLabel.text = title
 
                 return cell
             }
@@ -122,3 +98,16 @@ class MultipleSectionModelViewController: UIViewController {
     }
 
 }
+
+extension MultipleSectionModel {
+    var title: String {
+        switch self {
+        case .ImageProvidableSection(title: let title, items: _):
+            return title
+        case .StepperableSection(title: let title, items: _):
+            return title
+        case .ToggleableSection(title: let title, items: _):
+            return title
+        }
+    }
+}