Change order in default cell providers. Reorder files struct. Update readme.

Author: ivanvorobei

Example/Controllers/DiffableTableController.swift

@@ -13,7 +13,7 @@ class DiffableTableController: SPDiffableTableController, SPDiffableTableMediato
     override func viewDidLoad() {
         super.viewDidLoad()
         diffableDataSource?.mediator = self
-        setCellProviders(SPDiffableTableCellProviders.default, sections: content)
+        setCellProviders([SPDiffableTableCellProviders.default], sections: content)
     }
 
     var content: [SPDiffableSection] {

Example/Controllers/SideBarController.swift

@@ -5,7 +5,7 @@ class SidebarController: SPDiffableSideBarController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        setCellProviders(SPDiffableCollectionCellProviders.sideBar, sections: content)
+        setCellProviders([SPDiffableCollectionCellProviders.sideBar], sections: content)
     }
 
     enum Section: String {

Readme.md

@@ -183,7 +183,7 @@ In class available ready-use cell providers for menu item and header section. Fo
 ```swift
 override func viewDidLoad() {
     super.viewDidLoad()
-    setCellProviders(SPDiffableCollectionCellProviders.sideBar, sections: content)
+    setCellProviders([SPDiffableCollectionCellProviders.sideBar], sections: content)
 }
 ```
 
@@ -228,7 +228,7 @@ let section = SPDiffableSection(
 You init cell model and pass action, choose selection style and other. As you see, model describe native table cell. Next, you need set cell provider, but it also already available, for get it call `SPDiffableTableController.defaultCellProvider`.
 
 ```swift
-setCellProviders(SPDiffableTableCellProviders.default, sections: [section])
+setCellProviders([SPDiffableTableCellProviders.default], sections: [section])
 ```
 
 Now project's models automatically converting to cell. No need any additional work. That all code. 

SPDiffable.xcodeproj/project.pbxproj

@@ -162,11 +162,29 @@
 			path = App;
 			sourceTree = "<group>";
 		};
+		F483DE6624F6780E00B5B727 /* CellProvider */ = {
+			isa = PBXGroup;
+			children = (
+				OBJ_14 /* Models */,
+				F4920A6824F447D6007F7EE9 /* SPDiffableTableCellProviders.swift */,
+				F4920A6B24F44834007F7EE9 /* SPDiffableCollectionCellProviders.swift */,
+			);
+			path = CellProvider;
+			sourceTree = "<group>";
+		};
+		F483DE6724F67A0000B5B727 /* DataSource */ = {
+			isa = PBXGroup;
+			children = (
+				OBJ_37 /* SPDiffableTableMediator.swift */,
+				OBJ_36 /* SPDiffableTableDataSource.swift */,
+				OBJ_11 /* SPDiffableCollectionDataSource.swift */,
+			);
+			path = DataSource;
+			sourceTree = "<group>";
+		};
 		OBJ_14 /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				OBJ_23 /* Table */,
-				OBJ_15 /* Collection */,
 				OBJ_19 /* SPDiffableItem.swift */,
 				F4920A6324F3BFFA007F7EE9 /* SPDiffableWrapperItem.swift */,
 				OBJ_20 /* SPDiffableSection.swift */,
@@ -176,17 +194,17 @@
 			path = Models;
 			sourceTree = "<group>";
 		};
-		OBJ_15 /* Collection */ = {
+		OBJ_15 /* Models */ = {
 			isa = PBXGroup;
 			children = (
 				OBJ_16 /* SPDiffableSideBarButton.swift */,
 				OBJ_17 /* SPDiffableSideBarHeader.swift */,
 				OBJ_18 /* SPDiffableSideBarItem.swift */,
 			);
-			path = Collection;
+			path = Models;
 			sourceTree = "<group>";
 		};
-		OBJ_23 /* Table */ = {
+		OBJ_23 /* Models */ = {
 			isa = PBXGroup;
 			children = (
 				OBJ_24 /* SPDiffableTableRow.swift */,
@@ -195,17 +213,15 @@
 				OBJ_27 /* SPDiffableTableRowSubtitle.swift */,
 				OBJ_28 /* SPDiffableTableRowSwitch.swift */,
 			);
-			path = Table;
+			path = Models;
 			sourceTree = "<group>";
 		};
 		OBJ_29 /* Table */ = {
 			isa = PBXGroup;
 			children = (
+				OBJ_23 /* Models */,
 				OBJ_30 /* Cells */,
 				OBJ_35 /* SPDiffableTableController.swift */,
-				OBJ_36 /* SPDiffableTableDataSource.swift */,
-				OBJ_37 /* SPDiffableTableMediator.swift */,
-				F4920A6824F447D6007F7EE9 /* SPDiffableTableCellProviders.swift */,
 			);
 			path = Table;
 			sourceTree = "<group>";
@@ -273,8 +289,9 @@
 		OBJ_8 /* SPDiffable */ = {
 			isa = PBXGroup;
 			children = (
+				F483DE6724F67A0000B5B727 /* DataSource */,
+				F483DE6624F6780E00B5B727 /* CellProvider */,
 				OBJ_9 /* Collection */,
-				OBJ_14 /* Models */,
 				OBJ_29 /* Table */,
 			);
 			name = SPDiffable;
@@ -284,9 +301,8 @@
 		OBJ_9 /* Collection */ = {
 			isa = PBXGroup;
 			children = (
-				F4920A6B24F44834007F7EE9 /* SPDiffableCollectionCellProviders.swift */,
+				OBJ_15 /* Models */,
 				OBJ_10 /* SPDiffableCollectionController.swift */,
-				OBJ_11 /* SPDiffableCollectionDataSource.swift */,
 				OBJ_12 /* SPDiffableSideBarButtonCollectionViewListCell.swift */,
 				OBJ_13 /* SPDiffableSideBarController.swift */,
 			);

…s/SPDiffable/Models/SPDiffableItem.swift …CellProvider/Models/SPDiffableItem.swiftSources/SPDiffable/Models/SPDiffableItem.swift renamed to Sources/SPDiffable/CellProvider/Models/SPDiffableItem.swift Sources/SPDiffable/Models/SPDiffableItem.swift renamed to Sources/SPDiffable/CellProvider/Models/SPDiffableItem.swift

@@ -0,0 +1,67 @@
+import UIKit
+
+public enum SPDiffableCollectionCellProviders {
+    
+    /**
+     Defaults cell provider, which can help you doing side bar faster.
+     You can do your providers and ise its with more flexible.
+     */
+    @available(iOS 14, *)
+    public static var sideBar: SPDiffableCollectionCellProvider {
+        let cellProvider: SPDiffableCollectionCellProvider = { (collectionView, indexPath, item) -> UICollectionViewCell? in
+            let providers = [sideBarItem, sideBarButton, sideBarHeader]
+            for provider in providers {
+                if let cell = provider(collectionView, indexPath, item) {
+                    return cell
+                }
+            }
+            return nil
+        }
+        return cellProvider
+    }
+    
+    @available(iOS 14, *)
+    public static var sideBarItem: SPDiffableCollectionCellProvider {
+        let cellProvider: SPDiffableCollectionCellProvider = { (collectionView, indexPath, item) -> UICollectionViewCell? in
+            guard let item = item as? SPDiffableSideBarItem else { return nil }
+            let cellRegistration = UICollectionView.CellRegistration<UICollectionViewListCell, SPDiffableSideBarItem> { (cell, indexPath, item) in
+                var content = UIListContentConfiguration.sidebarCell()
+                content.text = item.title
+                content.image = item.image
+                cell.contentConfiguration = content
+                cell.accessories = item.accessories
+            }
+            return collectionView.dequeueConfiguredReusableCell(using: cellRegistration, for: indexPath, item: item)
+        }
+        return cellProvider
+    }
+    
+    @available(iOS 14, *)
+    public static var sideBarButton: SPDiffableCollectionCellProvider {
+        let cellProvider: SPDiffableCollectionCellProvider = { (collectionView, indexPath, item) -> UICollectionViewCell? in
+            guard let item = item as? SPDiffableSideBarButton else { return nil }
+            let cellRegistration = UICollectionView.CellRegistration<SPDiffableSideBarButtonCollectionViewListCell, SPDiffableSideBarButton> { (cell, indexPath, item) in
+                cell.updateWithItem(item)
+                cell.accessories = item.accessories
+            }
+            return collectionView.dequeueConfiguredReusableCell(using: cellRegistration, for: indexPath, item: item)
+        }
+        return cellProvider
+    }
+    
+    @available(iOS 14, *)
+    public static var sideBarHeader: SPDiffableCollectionCellProvider {
+        let cellProvider: SPDiffableCollectionCellProvider = { (collectionView, indexPath, item) -> UICollectionViewCell? in
+            guard let item = item as? SPDiffableSideBarHeader else { return nil }
+            let cellRegistration = UICollectionView.CellRegistration<UICollectionViewListCell, SPDiffableSideBarHeader> { (cell, indexPath, item) in
+                var content = UIListContentConfiguration.sidebarHeader()
+                content.text = item.text
+                content.image = nil
+                cell.contentConfiguration = content
+                cell.accessories = item.accessories
+            }
+            return collectionView.dequeueConfiguredReusableCell(using: cellRegistration, for: indexPath, item: item)
+        }
+        return cellProvider
+    }
+}