Updated to 2.0

Author: ivanvorobei

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,22 +6,10 @@ labels: bug
 assignees: ivanvorobei
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Smartphone (please complete the following information):**
+**Summary**
  - iOS Version [e.g. 14.5.1]
  - Framework Version [e.g. 3.0.8]
  - Installed via [e.g. SPM, Cocoapods, Manually]
-
-**Additional context**
-Add any other context about the problem here.
+ 
+**Describe the bug**
+A clear and concise description of what the bug is.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -12,9 +12,3 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/question.md

@@ -2,7 +2,7 @@
 name: Question
 about: Something is not clear with the project
 title: ''
-labels: ''
+labels: 'question'
 assignees: ivanvorobei
 
 ---

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,5 +3,5 @@
 
 ## Checklist
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-- [ ] Testing in compability platforms
-- [ ] Installed correct via Swift Package Manager and Cocoapods
+- [] Testing in compability platforms
+- [] Installed correct via `Swift Package Manager` and `Cocoapods`

CONTRIBUTING.md

@@ -23,6 +23,10 @@ Here you find all which using in project:
 - // MARK: - Init
 - // MARK: - Lifecycle
 - // MARK: - Layout
-- // MARK: - Helpers
+- // MARK: - Public
+- // MARK: - Private
+- // MARK: - Internal
+- // MARK: - Models
+- // MARK: - Ovveride
 
 If you can't find valid, add new to codestyle agreements please. Other can be use if class is large and need struct it even without adding to codestyle agreements.

Example Apps/SPDiffable.xcodeproj/project.xcworkspace/xcuserdata/ivanvorobei.xcuserdatad/UserInterfaceState.xcuserstate

@@ -38,7 +38,7 @@ class RootController: DiffableTableController {
         case checkmark = "checkmark"
         case customCellProvider = "customCellProvider"
 
-        var identifier: String {
+        var id: String {
             return rawValue
         }
     }
@@ -48,7 +48,7 @@ class RootController: DiffableTableController {
         var content: [SPDiffableSection] = []
 
         let accessorySection = SPDiffableSection(
-            identifier: Section.accessory.identifier,
+            id: Section.accessory.id,
             header: SPDiffableTextHeaderFooter(text: "Accessory"),
             footer: SPDiffableTextHeaderFooter(text: "Getting default value before show. After changes in elements you can check prints in console."),
             items: [
@@ -66,7 +66,7 @@ class RootController: DiffableTableController {
         content.append(accessorySection)
 
         let basicSection = SPDiffableSection(
-            identifier: Section.basic.identifier,
+            id: Section.basic.id,
             header: SPDiffableTextHeaderFooter(text: "Presenter"),
             footer: SPDiffableTextHeaderFooter(text: "Push in navigation processing by table controller. Sometimes you need manually deselect cell."),
             items: [
@@ -90,13 +90,13 @@ class RootController: DiffableTableController {
 
         if stepperValue != 0 {
             accessorySection.items.append(
-                SPDiffableTableRow(identifier: stepperValueIdentifier, text: "Stepper Value", detail: "\(Int(stepperValue))")
+                SPDiffableTableRow(id: stepperValueIdentifier, text: "Stepper Value", detail: "\(Int(stepperValue))")
             )
         }
 
         if #available(iOS 14, *) {
             let sideBarSections = SPDiffableSection(
-                identifier: Section.sidebar.identifier,
+                id: Section.sidebar.id,
                 footer: SPDiffableTextHeaderFooter(text: "Example of new Side Bar."),
                 items: [
                     SPDiffableTableRow(text: "Present Side Bar", accessoryType: .disclosureIndicator, selectionStyle: .default, action: { [weak self] model, indexPath in
@@ -112,7 +112,7 @@ class RootController: DiffableTableController {
         }
 
         let checkmarkSections = SPDiffableSection(
-            identifier: Section.checkmark.identifier,
+            id: Section.checkmark.id,
             footer: SPDiffableTextHeaderFooter(text: "Example how usage search by models and change checkmark without reload table."),
             items: [
                 SPDiffableTableRow(text: "Chekmarks", accessoryType: .disclosureIndicator, selectionStyle: .default, action: { [weak self] model, indexPath in
@@ -124,7 +124,7 @@ class RootController: DiffableTableController {
         content.append(checkmarkSections)
 
         let cellProviderSection = SPDiffableSection(
-            identifier: Section.customCellProvider.identifier,
+            id: Section.customCellProvider.id,
             footer: SPDiffableTextHeaderFooter(text: "Also you can add more providers for specific controller, and use default and custom specially for some contorllers."),
             items: [
                 SPDiffableTableRow(text: "Custom Cell Provider", accessoryType: .disclosureIndicator, selectionStyle: .default, action: { [weak self] model, indexPath in

Example Apps/iOS Example/Controllers/RootController.swift

@@ -41,7 +41,7 @@ class SidebarController: SPDiffableSideBarController {
         var content: [SPDiffableSection] = []
         content.append(
             SPDiffableSection(
-                identifier: Section.tabs.rawValue,
+                id: Section.tabs.rawValue,
                 items: [
                     SPDiffableSideBarItem(title: "Listen Now", image: UIImage(systemName: "play.circle"), action: { _, _ in }),
                     SPDiffableSideBarItem(title: "Browse", image: UIImage(systemName: "square.grid.2x2"), action: { _, _ in }),
@@ -60,7 +60,7 @@ class SidebarController: SPDiffableSideBarController {
         )
         content.append(
             SPDiffableSection(
-                identifier: Section.library.rawValue,
+                id: Section.library.rawValue,
                 header: SPDiffableSideBarHeader(text: "Library", accessories: [.outlineDisclosure()]),
                 items: [
                     SPDiffableSideBarItem(title: "Recently Added", image: UIImage(systemName: "clock"), action: { _, _ in }),
@@ -73,7 +73,7 @@ class SidebarController: SPDiffableSideBarController {
         )
         content.append(
             SPDiffableSection(
-                identifier: Section.playlists.rawValue,
+                id: Section.playlists.rawValue,
                 header: SPDiffableSideBarHeader(text: "Playlists", accessories: [.outlineDisclosure()]),
                 items: [
                     SPDiffableSideBarItem(title: "All Playlists", image: UIImage(systemName: "music.note.list"), action: { _, _ in }),

Example Apps/iOS Example/Controllers/SideBarController.swift

@@ -1,23 +1,8 @@
 # SPDiffable
 
-<a href="https://opensource.ivanvorobei.by/spdiffable/preview">
-    <img align="left" src="https://cdn.ivanvorobei.by/github/spdiffable/example-app-preview-double.png" width="450"/>
-</a>
 
 Apple's diffable API requerid models for each object type. If you want use it in many place, you pass many time to implemenet and get over duplicates codes. This project help you do it elegant with shared models and special cell providers for one-usage models.
 
-[![https://opensource.ivanvorobei.by/spdiffable/preview](https://github.com/ivanvorobei/Readme/blob/main/Buttons/video-preview.svg)](https://opensource.ivanvorobei.by/spdiffable/preview)
-
-You can make sidebar, apply changes and make settings screen without making any cells or models.
-
-If you like the project, don't forget to `put star ★`<br>Check out my other libraries:
-
-<p float="left">
-    <a href="https://opensource.ivanvorobei.by">
-        <img src="https://github.com/ivanvorobei/Readme/blob/main/Buttons/more-libraries.svg">
-    </a>
-</p>
-
 ## Navigate
 
 - [Installation](#installation)
@@ -33,15 +18,11 @@ If you like the project, don't forget to `put star ★`<br>Check out my other li
     - [Example](#ready-use)
     - [List classes](#ready-use-classes)
     - [Wrapper](#wrapper)
-- [Сontribution](#сontribution)
-- [Other Projects](#other-projects)
 - [Russian Community](#russian-community)
 
 ## Installation
 
-Ready for use on iOS 13+. Works with Swift 5+. Required Xcode 12.0 and higher.
-
-<img align="right" src="https://cdn.ivanvorobei.by/github/spdiffable/spm-install-preview.png" width="550"/>
+Ready for use on iOS 13+.
 
 ### Swift Package Manager
 
@@ -51,13 +32,13 @@ Once you have your Swift package set up, adding as a dependency is as easy as ad
 
 ```swift
 dependencies: [
-    .package(url: "https://github.com/ivanvorobei/SPDiffable.git", .upToNextMajor(from: "1.6.0"))
+    .package(url: "https://github.com/ivanvorobei/SPDiffable.git", .upToNextMajor(from: "2.0.0"))
 ]
 ```
 
 ### CocoaPods:
 
-[CocoaPods](https://cocoapods.org) is a dependency manager for Cocoa projects. For usage and installation instructions, visit their website. To integrate using CocoaPods, specify it in your `Podfile`:
+[CocoaPods](https://cocoapods.org) is a dependency manager. For usage and installation instructions, visit their website. To integrate using CocoaPods, specify it in your `Podfile`:
 
 ```ruby
 pod 'SPDiffable'
@@ -115,7 +96,7 @@ class DiffableTableController: SPDiffableTableController {
 }
 ```
 
-Now ready model and convert it to views. Time to add content. Read next section.
+Now ready model and convert it to views. Time to add content.
 
 #### Apply Content
 
@@ -126,7 +107,7 @@ Create content:
 
 var content: [SPDiffableSection] {
     let section = SPDiffableSection(
-        identifier: "example section",
+        id: "example section",
         header: SPDiffableTextHeaderFooter(text: "Header"),
         footer: SPDiffableTextHeaderFooter(text: "Footer"),
         items: [
@@ -228,7 +209,7 @@ Content it array of `SPDiffableSection`. For menu model need use model `SPDiffab
 
 ```swift
 SPDiffableSection(
-    identifier: Section.library.rawValue,
+    id: Section.library.rawValue,
     header: SPDiffableSideBarHeader(text: "Library", accessories: [.outlineDisclosure()]),
     items: [
         SPDiffableSideBarItem(title: "Recently Added", image: UIImage(systemName: "clock"), action: { _ in }),
@@ -246,7 +227,7 @@ You can save time and count lines of code using ready-use classes. In project av
 
 ```swift
 let section = SPDiffableSection(
-    identifier: "example section",
+    id: "example section",
     header: SPDiffableTextHeaderFooter(text: "Header"),
     footer: SPDiffableTextHeaderFooter(text: "Footer"),
     items: [
@@ -312,41 +293,14 @@ Provided only models, becouse for most items using list registration and no need
 In project you can find class `SPDiffableWrapperItem`. Using it, when you don't want create custom item model for you diffable struct. You can pass any your model and uwrap it later in cell provider.
 
 ```swift
-let item = SPDiffableWrapperItem(identifier: "uniq-identifier", model: LocationRowModel(city: "Minsk"))
+let item = SPDiffableWrapperItem(id: "uniq-identifier", model: LocationRowModel(city: "Minsk"))
 ```
 
-## Сontribution
-
-My English is very bad. You can see this once you read the documentation. I would really like to have clean and nice documentation. If you see gramatical errors and can help fix the Readme, please contact me hello@ivanvorobei.by or make a Pull Request. Thank you in advance!
-
-## Other Projects
-
-I love being helpful. Here I have provided a list of libraries that I keep up to date. For see `video previews` of libraries without install open [opensource.ivanvorobei.by](https://opensource.ivanvorobei.by) website.<br>
-I have libraries with native interface and managing permissions. Also available pack of useful extensions for boost your development process.
-
-<p float="left">
-    <a href="https://opensource.ivanvorobei.by">
-        <img src="https://github.com/ivanvorobei/Readme/blob/main/Buttons/more-libraries.svg">
-    </a>
-        <a href="https://xcodeshop.ivanvorobei.by">
-        <img src="https://github.com/ivanvorobei/Readme/blob/main/Buttons/xcode-shop.svg">
-    </a>
-</p>
-
 ## Russian Community
 
-Подписывайся в телеграмм-канал, если хочешь получать уведомления о новых туториалах.<br>
-Со сложными и непонятными задачами помогут в чате.
-
-<p float="left">
-    <a href="https://tutorials.ivanvorobei.by/telegram/channel">
-        <img src="https://github.com/ivanvorobei/Readme/blob/main/Buttons/open-telegram-channel.svg">
-    </a>
-    <a href="https://tutorials.ivanvorobei.by/telegram/chat">
-        <img src="https://github.com/ivanvorobei/Readme/blob/main/Buttons/russian-community-chat.svg">
-    </a>
-</p>
+Я веду [телеграм-канал](https://sparrowcode.by/telegram), там публикую новости и туториалы.<br>
+С проблемой помогут [в чате](https://sparrowcode.by/telegram/chat).
 
-Видео-туториалы выклыдываю на [YouTube](https://tutorials.ivanvorobei.by/youtube):
+Видео-туториалы выклыдываю на [YouTube](https://ivanvorobei.by/youtube):
 
-[![Tutorials on YouTube](https://cdn.ivanvorobei.by/github/readme/youtube-preview.jpg)](https://tutorials.ivanvorobei.by/youtube)
+[![Tutorials on YouTube](https://cdn.ivanvorobei.by/github/readme/youtube-preview.jpg)](https://ivanvorobei.by/youtube)

Readme.md

@@ -1,8 +1,8 @@
 Pod::Spec.new do |s|
 
   s.name = 'SPDiffable'
-  s.version = '1.6.8'
-  s.summary = 'Extenshion of Diffable API which allow not duplicate code and use less models.'
+  s.version = '2.0.0'
+  s.summary = 'Extension of Diffable API which allow not duplicate code and use less models. Included example for SideBar.'
   s.homepage = 'https://github.com/ivanvorobei/SPDiffable'
   s.source = { :git => 'https://github.com/ivanvorobei/SPDiffable.git', :tag => s.version }
   s.license = { :type => 'MIT', :file => "LICENSE" }

SPDiffable.podspec

@@ -33,10 +33,10 @@ open class SPDiffableSideBarButton: SPDiffableActionableItem {
     open var image: UIImage?
     open var accessories: [UICellAccessory]
 
-    public init(identifier: SPDiffableItem.Identifier? = nil, title: String, image: UIImage?, accessories: [UICellAccessory] = [], action: @escaping Action) {
+    public init(id: SPDiffableItem.Identifier? = nil, title: String, image: UIImage?, accessories: [UICellAccessory] = [], action: @escaping Action) {
         self.title = title
         self.image = image
         self.accessories = accessories
-        super.init(identifier: identifier ?? title, action: action)
+        super.init(id: id ?? title, action: action)
     }
 }

Sources/SPDiffable/Collection/Models/SPDiffableSideBarButton.swift

@@ -30,9 +30,9 @@ open class SPDiffableSideBarHeader: SPDiffableItem {
     open var text: String
     open var accessories: [UICellAccessory]
 
-    public init(identifier: SPDiffableItem.Identifier? = nil, text: String, accessories: [UICellAccessory] = []) {
+    public init(id: SPDiffableItem.Identifier? = nil, text: String, accessories: [UICellAccessory] = []) {
         self.text = text
         self.accessories = accessories
-        super.init(identifier: identifier ?? text)
+        super.init(id: id ?? text)
     }
 }

Sources/SPDiffable/Collection/Models/SPDiffableSideBarHeader.swift

@@ -33,10 +33,10 @@ open class SPDiffableSideBarItem: SPDiffableActionableItem {
     open var image: UIImage?
     open var accessories: [UICellAccessory]
 
-    public init(identifier: SPDiffableItem.Identifier? = nil, title: String, image: UIImage?, accessories: [UICellAccessory] = [], action: @escaping Action) {
+    public init(id: SPDiffableItem.Identifier? = nil, title: String, image: UIImage?, accessories: [UICellAccessory] = [], action: @escaping Action) {
         self.title = title
         self.image = image
         self.accessories = accessories
-        super.init(identifier: identifier ?? title, action: action)
+        super.init(id: id ?? title, action: action)
     }
 }

Sources/SPDiffable/Collection/Models/SPDiffableSideBarItem.swift

@@ -34,6 +34,15 @@ open class SPDiffableCollectionController: UICollectionViewController {
 
     open weak var diffableDelegate: SPDiffableCollectionDelegate?
 
+    // MARK: - Lifecycle
+    
+    open override func viewDidLoad() {
+        super.viewDidLoad()
+        collectionView.delaysContentTouches = false
+    }
+    
+    // MARK: - Init
+    
     /**
      SPDiffable: Init `diffableDataSource` and apply content to data source without animation.