Make MessageCollectionViewCell generic over its content

tapanprakasht · Sep 15, 2017 · 2328326 · 2328326
1 parent e2e0894
commit 2328326
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 31 deletions.
diff --git a/Sources/MessageCellDelegate.swift b/Sources/MessageCellDelegate.swift
@@ -26,24 +26,24 @@ import Foundation
 
 public protocol MessageCellDelegate: class, MessageLabelDelegate {
 
-    func didTapMessage(in cell: MessageCollectionViewCell)
+    func didTapMessage<T: UIView>(in cell: MessageCollectionViewCell<T>)
 
-    func didTapAvatar(in cell: MessageCollectionViewCell)
+    func didTapAvatar<T: UIView>(in cell: MessageCollectionViewCell<T>)
 
-    func didTapBottomLabel(in cell: MessageCollectionViewCell)
+    func didTapBottomLabel<T: UIView>(in cell: MessageCollectionViewCell<T>)
 
-    func didTapTopLabel(in cell: MessageCollectionViewCell)
+    func didTapTopLabel<T: UIView>(in cell: MessageCollectionViewCell<T>)
 
 }
 
 public extension MessageCellDelegate {
 
-    func didTapMessage(in cell: MessageCollectionViewCell) {}
+    func didTapMessage<T: UIView>(in cell: MessageCollectionViewCell<T>) {}
 
-    func didTapAvatar(in cell: MessageCollectionViewCell) {}
+    func didTapAvatar<T: UIView>(in cell: MessageCollectionViewCell<T>) {}
 
-    func didTapBottomLabel(in cell: MessageCollectionViewCell) {}
+    func didTapBottomLabel<T: UIView>(in cell: MessageCollectionViewCell<T>) {}
 
-    func didTapTopLabel(in cell: MessageCollectionViewCell) {}
+    func didTapTopLabel<T: UIView>(in cell: MessageCollectionViewCell<T>) {}
 
 }
diff --git a/Sources/MessageCollectionViewCell.swift b/Sources/MessageCollectionViewCell.swift
@@ -24,7 +24,7 @@
 
 import UIKit
 
-open class MessageCollectionViewCell: UICollectionViewCell {
+open class MessageCollectionViewCell<ContentView: UIView>: UICollectionViewCell {
 
     // MARK: - Properties
 
@@ -38,19 +38,17 @@ open class MessageCollectionViewCell: UICollectionViewCell {
         return topLabel
     }()
 
-    open var messageLabel: MessageLabel = MessageLabel()
+    open var messageContentView = ContentView()
 
     open var cellBottomLabel: MessageLabel = {
         let bottomLabel = MessageLabel()
         bottomLabel.enabledDetectors = []
         return bottomLabel
     }()
 
-    open weak var delegate: MessageCellDelegate? {
-        didSet {
-            messageLabel.delegate = delegate
-        }
-    }
+    open weak var delegate: MessageCellDelegate?
+
+    var messageTapGesture: UITapGestureRecognizer?
 
     // MARK: - Initializer
 
@@ -71,7 +69,7 @@ open class MessageCollectionViewCell: UICollectionViewCell {
 
         contentView.addSubview(cellTopLabel)
         contentView.addSubview(messageContainerView)
-        messageContainerView.addSubview(messageLabel)
+        messageContainerView.addSubview(messageContentView)
         contentView.addSubview(avatarView)
         contentView.addSubview(cellBottomLabel)
 
@@ -85,8 +83,8 @@ open class MessageCollectionViewCell: UICollectionViewCell {
         avatarView.frame = attributes.avatarFrame
 
         messageContainerView.frame = attributes.messageContainerFrame
-        messageLabel.frame = CGRect(origin: .zero, size: attributes.messageContainerFrame.size)
-        messageLabel.textInsets = attributes.messageLabelInsets
+        messageContentView.frame = CGRect(origin: .zero, size: attributes.messageContainerFrame.size)
+        //messageContentView.textInsets = attributes.messageLabelInsets
 
         cellTopLabel.frame = attributes.cellTopLabelFrame
         cellTopLabel.textInsets = attributes.cellTopLabelInsets
@@ -97,34 +95,25 @@ open class MessageCollectionViewCell: UICollectionViewCell {
     }
 
     override open func prepareForReuse() {
-        messageLabel.text = nil
-        messageLabel.attributedText = nil
         cellTopLabel.text = nil
         cellTopLabel.attributedText = nil
         cellBottomLabel.text = nil
         cellBottomLabel.attributedText = nil
     }
 
     public func configure(with message: MessageType) {
-
-        switch message.data {
-        case .text(let text):
-            messageLabel.text = text
-        case .attributedText(let text):
-            messageLabel.attributedText = text
-        }
-
+        // Provide in subclass
     }
 
-    private func setupGestureRecognizers() {
+    func setupGestureRecognizers() {
 
         let avatarTapGesture = UITapGestureRecognizer(target: self, action: #selector(didTapAvatar))
         avatarView.addGestureRecognizer(avatarTapGesture)
         avatarView.isUserInteractionEnabled = true
 
         let messageTapGesture = UITapGestureRecognizer(target: self, action: #selector(didTapMessage))
         messageContainerView.addGestureRecognizer(messageTapGesture)
-        messageTapGesture.delegate = messageLabel
+        self.messageTapGesture = messageTapGesture
 
         let topLabelTapGesture = UITapGestureRecognizer(target: self, action: #selector(didTapTopLabel))
         cellTopLabel.addGestureRecognizer(topLabelTapGesture)

diff --git a/Sources/MessagesViewController.swift b/Sources/MessagesViewController.swift
@@ -195,7 +195,7 @@ extension MessagesViewController: UICollectionViewDataSource {
             let messageStyle = displayDelegate.messageStyle(for: message, at: indexPath, in: messagesCollectionView)
             let textColor = displayDelegate.textColor(for: message, at: indexPath, in: messagesCollectionView)
 
-            cell.messageLabel.textColor = textColor
+            //cell.messageLabel.textColor = textColor
             cell.messageContainerView.messageColor = messageColor
             cell.messageContainerView.style = messageStyle