-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* add separated section + example * add init using custom view for separated section + more examples * fix typos * add isEqualToDiffable implementation to separated cell
- Loading branch information
1 parent
e855400
commit 09c633a
Showing
13 changed files
with
703 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| // | ||
| // SeparatedSection.swift | ||
| // DataSource | ||
| // | ||
| // Created by Michael Heinzl on 11.09.18. | ||
| // Copyright © 2018 aaa - all about apps GmbH. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| public struct Transition { | ||
| public let from: Any? | ||
| public let to: Any? | ||
|
|
||
| public init(from: Any?, to: Any?) { | ||
| self.from = from | ||
| self.to = to | ||
| } | ||
|
|
||
| public var isFirst: Bool { | ||
| return from == nil && to != nil | ||
| } | ||
|
|
||
| public var isLast: Bool { | ||
| return from != nil && to == nil | ||
| } | ||
|
|
||
| } | ||
|
|
||
| open class SeparatedSection: Section { | ||
|
|
||
| public typealias StyleConfigureClosure = (Transition) -> SeparatorStyle | ||
| public typealias ViewConfigureClosure = (Transition) -> UIView? | ||
|
|
||
| let styleConfigureClosure: StyleConfigureClosure? | ||
| let viewConfigureClosure: ViewConfigureClosure? | ||
|
|
||
| public static let defaultStyleConfigureClosure: StyleConfigureClosure = { (transition) in | ||
| if transition.isFirst || transition.isLast { | ||
| return SeparatorStyle(leftInset: 0.0) | ||
| } else { | ||
| return SeparatorStyle(leftInset: 16.0) | ||
| } | ||
| } | ||
|
|
||
| // inits using SeparatorStyle configure closure | ||
|
|
||
| public init(_ content: Any?, rows: [RowType], visibleRows: [RowType]?, identifier: String?, styleConfigureClosure: @escaping StyleConfigureClosure = SeparatedSection.defaultStyleConfigureClosure) { | ||
| self.styleConfigureClosure = styleConfigureClosure | ||
| self.viewConfigureClosure = nil | ||
| super.init(content, rows: rows, visibleRows: visibleRows, identifier: identifier) | ||
| } | ||
|
|
||
| public convenience init(_ content: Any? = nil, items: [Any], rowIdentifier: String? = nil, sectionIdentifier: String? = nil, styleConfigureClosure: @escaping StyleConfigureClosure = SeparatedSection.defaultStyleConfigureClosure) { | ||
| let rows = items.map { Row($0, identifier: rowIdentifier) as RowType } | ||
| self.init(content, rows: rows, visibleRows: rows, identifier: sectionIdentifier, styleConfigureClosure: styleConfigureClosure) | ||
| } | ||
|
|
||
| // inits using UIView configure closure | ||
|
|
||
| public init(_ content: Any?, rows: [RowType], visibleRows: [RowType]?, identifier: String?, viewConfigureClosure: @escaping ViewConfigureClosure) { | ||
| self.styleConfigureClosure = nil | ||
| self.viewConfigureClosure = viewConfigureClosure | ||
| super.init(content, rows: rows, visibleRows: visibleRows, identifier: identifier) | ||
| } | ||
|
|
||
| public convenience init(_ content: Any? = nil, items: [Any], rowIdentifier: String? = nil, sectionIdentifier: String? = nil, viewConfigureClosure: @escaping ViewConfigureClosure) { | ||
| let rows = items.map { Row($0, identifier: rowIdentifier) as RowType } | ||
| self.init(content, rows: rows, visibleRows: rows, identifier: sectionIdentifier, viewConfigureClosure: viewConfigureClosure) | ||
| } | ||
|
|
||
| override public func updateVisibility(sectionIndex: Int, dataSource: DataSource) { | ||
| guard !rows.isEmpty else { | ||
| self.visibleRows = [] | ||
| return | ||
| } | ||
| var visibleRows = [RowType]() | ||
|
|
||
| var separatorViewModel = separatorLineViewModel(diffIdentifier: "separator-\(rows[0].diffableItem?.diffIdentifier ?? "")-first", | ||
| transition: Transition(from: nil, to: rows.first!.item)) | ||
| visibleRows.append(separatorViewModel.row) | ||
|
|
||
| for (rowIndex, row) in rows.enumerated() { | ||
| let cellDescriptor = dataSource.cellDescriptors[row.identifier] | ||
| let indexPath = IndexPath(row: rowIndex, section: sectionIndex) | ||
| let isHidden = cellDescriptor?.isHiddenClosure?(row, indexPath) ?? dataSource.isRowHidden?(row, indexPath) ?? false | ||
|
|
||
| if !isHidden { | ||
| visibleRows.append(row) | ||
|
|
||
| let separatorId: String | ||
| // Use diffIdentifier of row and identifier of section for diffIdentifier of separator | ||
| // this prevents unintentional reordering of rows | ||
| if let diffableRow = row.item as? Diffable { | ||
| separatorId = "separator-\(identifier)-\(diffableRow.diffIdentifier)" | ||
| } else { | ||
| separatorId = "separator-\(UUID().uuidString)" | ||
| } | ||
|
|
||
| let nextRow: RowType? | ||
| if rows.indices.contains(rowIndex + 1) { | ||
| nextRow = rows[rowIndex + 1] | ||
| } else { | ||
| nextRow = nil | ||
| } | ||
|
|
||
| separatorViewModel = separatorLineViewModel(diffIdentifier: separatorId, | ||
| transition: Transition(from: row.item, to: nextRow?.item)) | ||
| visibleRows.append(separatorViewModel.row) | ||
| } | ||
| } | ||
|
|
||
| self.visibleRows = visibleRows | ||
| } | ||
|
|
||
| private func separatorLineViewModel(diffIdentifier: String, transition: Transition) -> SeparatorLineViewModel { | ||
| if let styleConfigureClosure = styleConfigureClosure { | ||
| return SeparatorLineViewModel(diffIdentifier: diffIdentifier, style: styleConfigureClosure(transition)) | ||
| } else if let viewConfigureClosure = viewConfigureClosure { | ||
| return SeparatorLineViewModel(diffIdentifier: diffIdentifier, customView: viewConfigureClosure(transition)) | ||
| } else { | ||
| return SeparatorLineViewModel(diffIdentifier: diffIdentifier, style: SeparatedSection.defaultStyleConfigureClosure(transition)) | ||
| } | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.