TouchInstinct
/
Chatto
305
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allows the decorator to override item ids (#143)

This commit is contained in:
Diego Sánchez 2016-06-01 12:30:53 +01:00
parent 6e55f5e052
commit 592c8ee142
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Chatto/Source/Chat Items/ChatItemCompanion.swift
View File

@ -28,20 +28,25 @@ public protocol ChatItemsDecoratorProtocol {
func decorateItems(chatItems: [ChatItemProtocol]) -> [DecoratedChatItem]
}
public struct DecoratedChatItem {
public struct DecoratedChatItem: UniqueIdentificable {
public let uid: String
public let chatItem: ChatItemProtocol
public let decorationAttributes: ChatItemDecorationAttributesProtocol?
public init(chatItem: ChatItemProtocol, decorationAttributes: ChatItemDecorationAttributesProtocol?) {
self.init(uid: chatItem.uid, chatItem: chatItem, decorationAttributes: decorationAttributes)
}
public init(uid: String, chatItem: ChatItemProtocol, decorationAttributes: ChatItemDecorationAttributesProtocol?) {
self.uid = uid
self.chatItem = chatItem
self.decorationAttributes = decorationAttributes
}
}
public struct ChatItemCompanion: UniqueIdentificable {
public let uid: String
public let chatItem: ChatItemProtocol
public let presenter: ChatItemPresenterProtocol
public var decorationAttributes: ChatItemDecorationAttributesProtocol?
public var uid: String {
return self.chatItem.uid
}
}

6
Chatto/Source/ChatController/BaseChatViewController+Changes.swift
View File

@ -201,7 +201,7 @@ extension BaseChatViewController: ChatDataSourceDelegateProtocol {
private func createModelUpdates(newItems newItems: [ChatItemProtocol], oldItems: ChatItemCompanionCollection, collectionViewWidth: CGFloat) -> (changes: CollectionChanges, updateModelClosure: () -> Void) {
let newDecoratedItems = self.chatItemsDecorator?.decorateItems(newItems) ?? newItems.map { DecoratedChatItem(chatItem: $0, decorationAttributes: nil) }
let changes = Chatto.generateChanges(oldCollection: oldItems.map { $0.chatItem }, newCollection: newDecoratedItems.map { $0.chatItem })
let changes = Chatto.generateChanges(oldCollection: oldItems.lazy.map { $0 }, newCollection: newDecoratedItems.lazy.map { $0 })
let itemCompanionCollection = self.createCompanionCollection(fromChatItems: newDecoratedItems, previousCompanionCollection: oldItems)
let layoutModel = self.createLayoutModel(itemCompanionCollection, collectionViewWidth: collectionViewWidth)
let updateModelClosure : () -> Void = { [weak self] in
@ -220,12 +220,12 @@ extension BaseChatViewController: ChatDataSourceDelegateProtocol {
// Oherwise updateVisibleCells may try to update existing cell with a new presenter which is working with a different type of cell
// Optimization: reuse presenter if it's the same instance.
if let oldChatItemCompanion = oldItems[chatItem.uid] where oldChatItemCompanion.chatItem === chatItem {
if let oldChatItemCompanion = oldItems[decoratedChatItem.uid] where oldChatItemCompanion.chatItem === chatItem {
presenter = oldChatItemCompanion.presenter
} else {
presenter = self.createPresenterForChatItem(decoratedChatItem.chatItem)
}
return ChatItemCompanion(chatItem: decoratedChatItem.chatItem, presenter: presenter, decorationAttributes: decoratedChatItem.decorationAttributes)
return ChatItemCompanion(uid: decoratedChatItem.uid, chatItem: decoratedChatItem.chatItem, presenter: presenter, decorationAttributes: decoratedChatItem.decorationAttributes)
})
}