Skip to content

Commit 2fcab4d

Browse files
ivanvorobeiivanvorobei
committed
Fix default cell provider
1 parent 5138bac commit 2fcab4d

7 files changed

Lines changed: 104 additions & 18 deletions

File tree

‎Example iOS/App/AppDelegate.swift‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
// The MIT License (MIT)
2+
// Copyright © 2020 Ivan Vorobei (varabeis@icloud.com)
3+
//
4+
// Permission is hereby granted, free of charge, to any person obtaining a copy
5+
// of this software and associated documentation files (the "Software"), to deal
6+
// in the Software without restriction, including without limitation the rights
7+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
// copies of the Software, and to permit persons to whom the Software is
9+
// furnished to do so, subject to the following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included in all
12+
// copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
// SOFTWARE.
21+
122
import UIKit
223

324
@UIApplicationMain

‎Example iOS/Controllers/DiffableTableController.swift‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
// The MIT License (MIT)
2+
// Copyright © 2020 Ivan Vorobei (varabeis@icloud.com)
3+
//
4+
// Permission is hereby granted, free of charge, to any person obtaining a copy
5+
// of this software and associated documentation files (the "Software"), to deal
6+
// in the Software without restriction, including without limitation the rights
7+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
// copies of the Software, and to permit persons to whom the Software is
9+
// furnished to do so, subject to the following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included in all
12+
// copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
// SOFTWARE.
21+
122
import UIKit
223

324
@available(iOS 13.0, *)
@@ -14,7 +35,7 @@ class DiffableTableController: SPDiffableTableController, SPDiffableTableMediato
1435
override func viewDidLoad() {
1536
super.viewDidLoad()
1637
diffableDataSource?.mediator = self
17-
setCellProviders([SPDiffableTableCellProviders.default], sections: content)
38+
setCellProviders(SPDiffableTableCellProviders.default, sections: content)
1839
}
1940

2041
var content: [SPDiffableSection] {

‎Example iOS/Controllers/RootController.swift‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
// The MIT License (MIT)
2+
// Copyright © 2020 Ivan Vorobei (varabeis@icloud.com)
3+
//
4+
// Permission is hereby granted, free of charge, to any person obtaining a copy
5+
// of this software and associated documentation files (the "Software"), to deal
6+
// in the Software without restriction, including without limitation the rights
7+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
// copies of the Software, and to permit persons to whom the Software is
9+
// furnished to do so, subject to the following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included in all
12+
// copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
// SOFTWARE.
21+
122
import UIKit
223

324
@available(iOS 13.0, *)

‎Example iOS/Controllers/SideBarController.swift‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
// The MIT License (MIT)
2+
// Copyright © 2020 Ivan Vorobei (varabeis@icloud.com)
3+
//
4+
// Permission is hereby granted, free of charge, to any person obtaining a copy
5+
// of this software and associated documentation files (the "Software"), to deal
6+
// in the Software without restriction, including without limitation the rights
7+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
// copies of the Software, and to permit persons to whom the Software is
9+
// furnished to do so, subject to the following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included in all
12+
// copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
// SOFTWARE.
21+
122
import UIKit
223

324
@available(iOS 14, *)

‎Readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ override func viewDidLoad() {
115115
setCellProviders([locationCellProvider], sections: content)
116116
}
117117
```
118-
In project available models for like `SPDiffableTableRow` and other with ready-use properties. Also you can use default cell provider if using project's models. For get it call `SPDiffableTableController.defaultCellProvider`.
118+
In project available models for like `SPDiffableTableRow` and other with ready-use properties. Also you can use default cell provider if using project's models. For get it call `SPDiffableTableCellProviders.default`.
119119

120120
### Apply Content
121121

‎SPDiffable.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@
9696
F4920A6824F447D6007F7EE9 /* SPDiffableTableCellProviders.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPDiffableTableCellProviders.swift; sourceTree = "<group>"; };
9797
F4920A6B24F44834007F7EE9 /* SPDiffableCollectionCellProviders.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPDiffableCollectionCellProviders.swift; sourceTree = "<group>"; };
9898
F4977BC6252E079A00B20771 /* Example iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Example iOS.entitlements"; sourceTree = "<group>"; };
99+
F4D6FB12256646FC0046A328 /* FUNDING.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = FUNDING.yml; sourceTree = "<group>"; };
100+
F4D6FB16256646FD0046A328 /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
99101
OBJ_10 /* SPDiffableCollectionController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPDiffableCollectionController.swift; sourceTree = "<group>"; };
100102
OBJ_11 /* SPDiffableCollectionDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPDiffableCollectionDataSource.swift; sourceTree = "<group>"; };
101103
OBJ_12 /* SPDiffableSideBarButtonCollectionViewListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPDiffableSideBarButtonCollectionViewListCell.swift; sourceTree = "<group>"; };
@@ -195,6 +197,14 @@
195197
path = DataSource;
196198
sourceTree = "<group>";
197199
};
200+
F4D6FB11256646FC0046A328 /* .github */ = {
201+
isa = PBXGroup;
202+
children = (
203+
F4D6FB12256646FC0046A328 /* FUNDING.yml */,
204+
);
205+
path = .github;
206+
sourceTree = "<group>";
207+
};
198208
OBJ_14 /* Models */ = {
199209
isa = PBXGroup;
200210
children = (
@@ -263,13 +273,15 @@
263273
OBJ_5 = {
264274
isa = PBXGroup;
265275
children = (
276+
F4D6FB11256646FC0046A328 /* .github */,
277+
OBJ_46 /* LICENSE */,
278+
OBJ_47 /* README.md */,
279+
F4D6FB16256646FD0046A328 /* .gitignore */,
280+
OBJ_45 /* SPDiffable.podspec */,
266281
OBJ_6 /* Package.swift */,
267282
OBJ_7 /* Sources */,
268283
F47A41CF24EB222C0054DBB2 /* Example iOS */,
269284
OBJ_42 /* Products */,
270-
OBJ_45 /* SPDiffable.podspec */,
271-
OBJ_46 /* LICENSE */,
272-
OBJ_47 /* README.md */,
273285
);
274286
sourceTree = "<group>";
275287
};

‎Sources/SPDiffable/CellProvider/SPDiffableTableCellProviders.swift‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,13 @@ import UIKit
2525
public enum SPDiffableTableCellProviders {
2626

2727
/**
28-
Return cell provider, which process for all project models cells.
28+
Return cell providers, which process for project models cells.
2929
No need additional configure.
3030

3131
For change style of cells requerid register new cell provider.
3232
*/
33-
#warning("Redo to array")
34-
public static var `default`: SPDiffableTableCellProvider {
35-
let providers = [rowDetail, rowSubtitle, self.switch, stepper]
36-
let cellProvider: SPDiffableTableCellProvider = { (tableView, indexPath, item) -> UITableViewCell? in
37-
for provider in providers {
38-
if let cell = provider(tableView, indexPath, item) {
39-
return cell
40-
}
41-
}
42-
return nil
43-
}
44-
return cellProvider
33+
public static var `default`: [SPDiffableTableCellProvider] {
34+
return [rowDetail, rowSubtitle, self.switch, stepper]
4535
}
4636

4737
public static var rowDetail: SPDiffableTableCellProvider {

0 commit comments

Comments
 (0)