Only apply textColor for .text case of MessageData

cwalo · cwalo · commit f48cd5685121 · 2018-04-05T13:00:25.000-05:00
diff --git a/Sources/Protocols/MessagesDisplayDelegate.swift b/Sources/Protocols/MessagesDisplayDelegate.swift
@@ -89,7 +89,7 @@ public protocol MessagesDisplayDelegate: AnyObject {
     /// Specifies the color of the text for a `TextMessageCell`.
     ///
     /// - Parameters:
-    ///   - message: A `MessageType` with a `MessageData` case of `.text` or `.attributedText` to which the color will apply.
+    ///   - message: A `MessageType` with a `MessageData` case of `.text` to which the color will apply.
     ///   - indexPath: The `IndexPath` of the cell.
     ///   - messagesCollectionView: The `MessagesCollectionView` in which this cell will be displayed.
     ///
diff --git a/Sources/Views/Cells/TextMessageCell.swift b/Sources/Views/Cells/TextMessageCell.swift
@@ -80,13 +80,12 @@ open class TextMessageCell: MessageContentCell {
             switch message.data {
             case .text(let text), .emoji(let text):
                 messageLabel.text = text
+                messageLabel.textColor = textColor
             case .attributedText(let text):
                 messageLabel.attributedText = text
             default:
                 break
             }
-            // Needs to be set after the attributedText because it takes precedence
-            messageLabel.textColor = textColor
         }
     }
     

Original file line number	Diff line number	Diff line change
`@@ -80,13 +80,12 @@ open class TextMessageCell: MessageContentCell {`
`80`	`80`	`switch message.data {`
`81`	`81`	`case .text(let text), .emoji(let text):`
`82`	`82`	`messageLabel.text = text`
	`83`	`+ messageLabel.textColor = textColor`
`83`	`84`	`case .attributedText(let text):`
`84`	`85`	`messageLabel.attributedText = text`
`85`	`86`	`default:`
`86`	`87`	`break`
`87`	`88`	`}`
`88`		`- // Needs to be set after the attributedText because it takes precedence`
`89`		`- messageLabel.textColor = textColor`
`90`	`89`	`}`
`91`	`90`	`}`
`92`	`91`