GitHub/MessageKit
1
0
Fork 0
mirror of https://github.com/MessageKit/MessageKit.git synced 2026-02-06 19:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #225 from MessageKit/fb/reuse_identifier_simplicity_boilerplate_removal

Browse Source 
Simplify Cell/Header/Footer Class Registration
This commit is contained in:
Frederic Barthelemy
2017-10-03 18:38:17 -07:00
committed by GitHub
parent 8368847c60 d3423639f3
commit efab11c658
10 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MessageKit.xcodeproj/project.pbxproj
+4
View File
@@ -8,6 +8,7 @@
/* Begin PBXBuildFile section */
171D5AB91F36712B0053DF69 /* InputTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 171D5AB81F36712B0053DF69 /* InputTextView.swift */; };
2EB618EF1F8462CA007FBA0E /* UICollectionView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EB618EE1F8462CA007FBA0E /* UICollectionView+Extensions.swift */; };
372F6AEB1F36C15600B57FBD /* AvatarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372F6AEA1F36C15600B57FBD /* AvatarView.swift */; };
372F6AEF1F36C61000B57FBD /* AvatarViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372F6AEE1F36C61000B57FBD /* AvatarViewTests.swift */; };
376AD1821F4258D80083072A /* TestMessageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 376AD1811F4258D80083072A /* TestMessageModel.swift */; };
@@ -74,6 +75,7 @@
/* Begin PBXFileReference section */
171D5AB81F36712B0053DF69 /* InputTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InputTextView.swift; sourceTree = "<group>"; };
2EB618EE1F8462CA007FBA0E /* UICollectionView+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UICollectionView+Extensions.swift"; sourceTree = "<group>"; };
372F6AEA1F36C15600B57FBD /* AvatarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AvatarView.swift; sourceTree = "<group>"; };
372F6AEE1F36C61000B57FBD /* AvatarViewTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AvatarViewTests.swift; sourceTree = "<group>"; };
376AD1811F4258D80083072A /* TestMessageModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestMessageModel.swift; sourceTree = "<group>"; };
@@ -240,6 +242,7 @@
B0147C821F5BE9220035B36E /* Bundle+Extensions.swift */,
B0AA1F521F44388900BAE583 /* NSAttributedString+Extensions.swift */,
B09643851F286C9E004D0129 /* String+Extensions.swift */,
2EB618EE1F8462CA007FBA0E /* UICollectionView+Extensions.swift */,
B096438F1F289142004D0129 /* UIColor+Extensions.swift */,
38C867991F50EA1000811974 /* UIView+Extensions.swift */,
);
@@ -472,6 +475,7 @@
B09643861F286C9E004D0129 /* String+Extensions.swift in Sources */,
B015E81F1F259D8E007EDFB6 /* MessageInputBarDelegate.swift in Sources */,
B01280F31F4E8798004BCD3E /* MessageLabelDelegate.swift in Sources */,
2EB618EF1F8462CA007FBA0E /* UICollectionView+Extensions.swift in Sources */,
B0147C981F61AF930035B36E /* LabelAlignment.swift in Sources */,
376AD1881F4259D20083072A /* TestMessagesViewControllerModel.swift in Sources */,
B0655A2A1F23D77200542A83 /* Sender.swift in Sources */,
Sources/LocationMessageCell.swift
+1
View File
@@ -26,6 +26,7 @@ import UIKit
import MapKit
open class LocationMessageCell: MessageCollectionViewCell<UIImageView> {
open override class func reuseIdentifier() -> String { return "messagekit.cell.location" }
// MARK: - Properties
Sources/MediaMessageCell.swift
+1
View File
@@ -25,6 +25,7 @@
import UIKit
open class MediaMessageCell: MessageCollectionViewCell<UIImageView> {
open override class func reuseIdentifier() -> String { return "messagekit.cell.mediamessage" }
// MARK: - Properties
Sources/MessageCollectionViewCell.swift
+2 -1
View File
@@ -24,7 +24,8 @@
import UIKit
open class MessageCollectionViewCell<ContentView: UIView>: UICollectionViewCell {
open class MessageCollectionViewCell<ContentView: UIView>: UICollectionViewCell, CollectionViewReusable {
open class func reuseIdentifier() -> String { return "messagekit.cell.base-cell" }
// MARK: - Properties
Sources/MessageDateHeaderView.swift
+1
View File
@@ -25,6 +25,7 @@
import UIKit
open class MessageDateHeaderView: MessageHeaderView {
open override class func reuseIdentifier() -> String { return "messagekit.header.date" }
// MARK: - Properties
Sources/MessageFooterView.swift
+2 -1
View File
@@ -24,7 +24,8 @@
import UIKit
open class MessageFooterView: UICollectionReusableView {
open class MessageFooterView: UICollectionReusableView, CollectionViewReusable {
open class func reuseIdentifier() -> String { return "messagekit.footer.base" }
// MARK: - Initializers
Sources/MessageHeaderView.swift
+2 -3
View File
@@ -24,12 +24,11 @@
import UIKit
open class MessageHeaderView: UICollectionReusableView {
open class MessageHeaderView: UICollectionReusableView, CollectionViewReusable {
open class func reuseIdentifier() -> String { return "messagekit.header.base" }
// MARK: - Properties
static let identifier = "MessageHeaderView"
public override init(frame: CGRect) {
super.init(frame: frame)
}
Sources/MessagesViewController.swift
+9 -28
View File
@@ -106,26 +106,13 @@ open class MessagesViewController: UIViewController {
private func registerReusableViews() {
messagesCollectionView.register(TextMessageCell.self,
forCellWithReuseIdentifier: "TextMessageCell")
messagesCollectionView.register(TextMessageCell.self)
messagesCollectionView.register(MediaMessageCell.self)
messagesCollectionView.register(LocationMessageCell.self)
messagesCollectionView.register(MediaMessageCell.self,
forCellWithReuseIdentifier: "MediaMessageCell")
messagesCollectionView.register(LocationMessageCell.self,
forCellWithReuseIdentifier: "LocationMessageCell")
messagesCollectionView.register(MessageFooterView.self,
forSupplementaryViewOfKind: UICollectionElementKindSectionFooter,
withReuseIdentifier: "MessageFooterView")
messagesCollectionView.register(MessageHeaderView.self,
forSupplementaryViewOfKind: UICollectionElementKindSectionHeader,
withReuseIdentifier: "MessageHeaderView")
messagesCollectionView.register(MessageDateHeaderView.self,
forSupplementaryViewOfKind: UICollectionElementKindSectionHeader,
withReuseIdentifier: "MessageDateHeaderView")
messagesCollectionView.register(MessageFooterView.self, forSupplementaryViewOfKind: UICollectionElementKindSectionFooter)
messagesCollectionView.register(MessageHeaderView.self, forSupplementaryViewOfKind: UICollectionElementKindSectionHeader)
messagesCollectionView.register(MessageDateHeaderView.self, forSupplementaryViewOfKind: UICollectionElementKindSectionHeader)
}
@@ -185,21 +172,15 @@ extension MessagesViewController: UICollectionViewDataSource {
switch message.data {
case .text, .attributedText:
guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "TextMessageCell", for: indexPath) as? TextMessageCell else {
fatalError("Unable to dequeue TextMessageCell")
}
let cell = collectionView.dequeueReusableCell(TextMessageCell.self, for: indexPath)
cell.configure(with: message, at: indexPath, and: messagesCollectionView)
return cell
case .photo, .video:
guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "MediaMessageCell", for: indexPath) as? MediaMessageCell else {
fatalError("Unable to dequeue MediaMessageCell")
}
let cell = collectionView.dequeueReusableCell(MediaMessageCell.self, for: indexPath)
cell.configure(with: message, at: indexPath, and: messagesCollectionView)
return cell
case .location:
guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "LocationMessageCell", for: indexPath) as? LocationMessageCell else {
fatalError("Unable to dequeue LocationMessageCell")
}
let cell = collectionView.dequeueReusableCell(LocationMessageCell.self, for: indexPath)
cell.configure(with: message, at: indexPath, and: messagesCollectionView)
return cell
}
Sources/TextMessageCell.swift
+1
View File
@@ -25,6 +25,7 @@
import UIKit
open class TextMessageCell: MessageCollectionViewCell<MessageLabel> {
open override class func reuseIdentifier() -> String { return "messagekit.cell.text" }
// MARK: - Properties
Sources/UICollectionView+Extensions.swift
+36
View File
@@ -0,0 +1,36 @@
//
// UICollectionView+Extensions.swift
// MessageKit
//
// Created by Frederic Barthelemy on 10/3/17.
// Copyright © 2017 MessageKit. All rights reserved.
//
import Foundation
/// Optional Cell Protocol to Simplify registration/cell type loading in a generic way
protocol CollectionViewReusable: class {
static func reuseIdentifier() -> String
}
extension UICollectionView {
/// Registers a particular cell using its reuse-identifier
func register<CellType: UICollectionViewCell & CollectionViewReusable>(_ cellClass: CellType.Type) {
register(cellClass, forCellWithReuseIdentifier: CellType.reuseIdentifier())
}
/// Registers a reusable view for a specific SectionKind
func register<ViewType: UICollectionReusableView & CollectionViewReusable>(_ headerFooterClass: ViewType.Type, forSupplementaryViewOfKind kind: String) {
register(headerFooterClass,
forSupplementaryViewOfKind: kind,
withReuseIdentifier: ViewType.reuseIdentifier())
}
/// Generically dequeues a cell of the correct type allowing you to avoid scattering your code with guard-let-else-fatal
func dequeueReusableCell<CellType: UICollectionViewCell & CollectionViewReusable>(_ cellClass: CellType.Type, for indexPath: IndexPath) -> CellType {
guard let cell = dequeueReusableCell(withReuseIdentifier: cellClass.reuseIdentifier(), for: indexPath) as? CellType else {
fatalError("Unable to dequeue \(String(describing: cellClass)) with reuseId of \(cellClass.reuseIdentifier())")
}
return cell
}
}