Update Example & reuse identifiers

tapanprakasht · Sep 15, 2017 · 100b8d1 · 100b8d1
1 parent 468f07b
commit 100b8d1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/Example/Sources/ConversationViewController.swift b/Example/Sources/ConversationViewController.swift
@@ -185,19 +185,19 @@ extension ConversationViewController: MessagesLayoutDelegate {
 
 extension ConversationViewController: MessageCellDelegate {
 
-    func didTapAvatar(in cell: MessageCollectionViewCell) {
+    func didTapAvatar<T: UIView>(in cell: MessageCollectionViewCell<T>) {
         print("Avatar tapped")
     }
 
-    func didTapMessage(in cell: MessageCollectionViewCell) {
+    func didTapMessage<T: UIView>(in cell: MessageCollectionViewCell<T>) {
         print("Message tapped")
     }
 
-    func didTapTopLabel(in cell: MessageCollectionViewCell) {
+    func didTapTopLabel<T: UIView>(in cell: MessageCollectionViewCell<T>) {
         print("Top label tapped")
     }
 
-    func didTapBottomLabel(in cell: MessageCollectionViewCell) {
+    func didTapBottomLabel<T: UIView>(in cell: MessageCollectionViewCell<T>) {
         print("Bottom label tapped")
     }
 

diff --git a/Sources/MessageCollectionViewCell.swift b/Sources/MessageCollectionViewCell.swift
@@ -101,14 +101,6 @@ open class MessageCollectionViewCell<ContentView: UIView>: UICollectionViewCell
         cellBottomLabel.attributedText = nil
     }
 
-    func setAvatar(_ avatar: Avatar) {
-
-    }
-
-    func setCellLabels(bottomText: NSAttributedString, topText: NSAttributedString) {
-
-    }
-
     public func configure(with message: MessageType) {
         // Provide in subclass
     }

diff --git a/Sources/MessagesViewController.swift b/Sources/MessagesViewController.swift
@@ -91,8 +91,8 @@ open class MessagesViewController: UIViewController {
 	}
 
     private func registerReusableViews() {
-        messagesCollectionView.register(MessageCollectionViewCell.self,
-                                        forCellWithReuseIdentifier: "MessageCell")
+        messagesCollectionView.register(TextMessageCell.self,
+                                        forCellWithReuseIdentifier: "TextMessageCell")
 
         messagesCollectionView.register(MessageFooterView.self,
                                         forSupplementaryViewOfKind: UICollectionElementKindSectionFooter,
@@ -202,9 +202,9 @@ extension MessagesViewController: UICollectionViewDataSource {
 
                 let messageColor = displayDelegate.backgroundColor(for: message, at: indexPath, in: messagesCollectionView)
                 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.messageContainerView.messageColor = messageColor
                 cell.messageContainerView.style = messageStyle
 
@@ -218,7 +218,10 @@ extension MessagesViewController: UICollectionViewDataSource {
 
         switch message.data {
         case .text, .attributedText:
-            guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "MessageCell", for: indexPath) as? TextMessageCell else { return UICollectionViewCell() }
+            guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "TextMessageCell", for: indexPath) as? TextMessageCell else { return UICollectionViewCell() }
+            let textColor = messagesCollectionView.messagesDisplayDelegate?.textColor(for: message, at: indexPath, in: messagesCollectionView)
+            cell.messageContentView.textColor = textColor
+            cell.configure(with: message)
             configure(cell)
             return cell
         }