Renamed MessageData to MessageKind

zhongwuzw · zhongwuzw · commit 39986f04589e · 2018-04-16T11:57:50.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,6 +47,9 @@ classes that are responsible for sizing the `MessagesCollectionViewCell` types p
 
 ### Changed
 
+- **Breaking Change** Renamed `MessageData` enum to `MessageKind` and changed `MessageType`'s `data` property name to `kind`.
+ [#658](https://github.com/MessageKit/MessageKit/658) by [@zhongwuzw](https://github.com/zhongwuzw).
+
 - **Breaking Change** Changed the `messageFooterView(for:in)` and `messageHeaderView(for:in)` methods of
 `MessagesDisplayDelegate` by removing the `message` parameter.
 [#615](https://github.com/MessageKit/MessageKit/pull/615) by [@SD10](https://github.com/sd10).
diff --git a/Example/Sources/MockMessage.swift b/Example/Sources/MockMessage.swift
@@ -58,40 +58,40 @@ internal struct MockMessage: MessageType {
     var messageId: String
     var sender: Sender
     var sentDate: Date
-    var data: MessageData
+    var kind: MessageKind
 
-    private init(data: MessageData, sender: Sender, messageId: String, date: Date) {
-        self.data = data
+    private init(kind: MessageKind, sender: Sender, messageId: String, date: Date) {
+        self.kind = kind
         self.sender = sender
         self.messageId = messageId
         self.sentDate = date
     }
 
     init(text: String, sender: Sender, messageId: String, date: Date) {
-        self.init(data: .text(text), sender: sender, messageId: messageId, date: date)
+        self.init(kind: .text(text), sender: sender, messageId: messageId, date: date)
     }
 
     init(attributedText: NSAttributedString, sender: Sender, messageId: String, date: Date) {
-        self.init(data: .attributedText(attributedText), sender: sender, messageId: messageId, date: date)
+        self.init(kind: .attributedText(attributedText), sender: sender, messageId: messageId, date: date)
     }
 
     init(image: UIImage, sender: Sender, messageId: String, date: Date) {
         let mediaItem = MockMediaItem(image: image)
-        self.init(data: .photo(mediaItem), sender: sender, messageId: messageId, date: date)
+        self.init(kind: .photo(mediaItem), sender: sender, messageId: messageId, date: date)
     }
 
     init(thumbnail: UIImage, sender: Sender, messageId: String, date: Date) {
         let mediaItem = MockMediaItem(image: thumbnail)
-        self.init(data: .video(mediaItem), sender: sender, messageId: messageId, date: date)
+        self.init(kind: .video(mediaItem), sender: sender, messageId: messageId, date: date)
     }
 
     init(location: CLLocation, sender: Sender, messageId: String, date: Date) {
         let locationItem = MockLocationItem(location: location)
-        self.init(data: .location(locationItem), sender: sender, messageId: messageId, date: date)
+        self.init(kind: .location(locationItem), sender: sender, messageId: messageId, date: date)
     }
 
     init(emoji: String, sender: Sender, messageId: String, date: Date) {
-        self.init(data: .emoji(emoji), sender: sender, messageId: messageId, date: date)
+        self.init(kind: .emoji(emoji), sender: sender, messageId: messageId, date: date)
     }
 
 }
diff --git a/MessageKit.xcodeproj/project.pbxproj b/MessageKit.xcodeproj/project.pbxproj
@@ -59,7 +59,7 @@
 		B7A03F2A1F866895006AEF79 /* MessageStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7A03F1F1F866895006AEF79 /* MessageStyle.swift */; };
 		B7A03F2C1F866895006AEF79 /* DetectorType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7A03F211F866895006AEF79 /* DetectorType.swift */; };
 		B7A03F2D1F866895006AEF79 /* LabelAlignment.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7A03F221F866895006AEF79 /* LabelAlignment.swift */; };
-		B7A03F2E1F866895006AEF79 /* MessageData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7A03F231F866895006AEF79 /* MessageData.swift */; };
+		B7A03F2E1F866895006AEF79 /* MessageKind.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7A03F231F866895006AEF79 /* MessageKind.swift */; };
 		B7A03F331F866940006AEF79 /* MessageDateHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7A03F301F866940006AEF79 /* MessageDateHeaderView.swift */; };
 		B7A03F3A1F866946006AEF79 /* TextMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7A03F361F866946006AEF79 /* TextMessageCell.swift */; };
 		B7A03F3C1F866946006AEF79 /* LocationMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7A03F381F866946006AEF79 /* LocationMessageCell.swift */; };
@@ -167,7 +167,7 @@
 		B7A03F1F1F866895006AEF79 /* MessageStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageStyle.swift; sourceTree = "<group>"; };
 		B7A03F211F866895006AEF79 /* DetectorType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetectorType.swift; sourceTree = "<group>"; };
 		B7A03F221F866895006AEF79 /* LabelAlignment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LabelAlignment.swift; sourceTree = "<group>"; };
-		B7A03F231F866895006AEF79 /* MessageData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageData.swift; sourceTree = "<group>"; };
+		B7A03F231F866895006AEF79 /* MessageKind.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageKind.swift; sourceTree = "<group>"; };
 		B7A03F301F866940006AEF79 /* MessageDateHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageDateHeaderView.swift; sourceTree = "<group>"; };
 		B7A03F361F866946006AEF79 /* TextMessageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextMessageCell.swift; sourceTree = "<group>"; };
 		B7A03F381F866946006AEF79 /* LocationMessageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocationMessageCell.swift; sourceTree = "<group>"; };
@@ -389,7 +389,7 @@
 				B7A03F211F866895006AEF79 /* DetectorType.swift */,
 				B7A03F221F866895006AEF79 /* LabelAlignment.swift */,
 				B7A03F1D1F866895006AEF79 /* LocationMessageSnapshotOptions.swift */,
-				B7A03F231F866895006AEF79 /* MessageData.swift */,
+				B7A03F231F866895006AEF79 /* MessageKind.swift */,
 				1FF377A320087C82004FD648 /* MessageKitError.swift */,
 				B7A03F1B1F866895006AEF79 /* MessageKitDateFormatter.swift */,
 				B7A03F1F1F866895006AEF79 /* MessageStyle.swift */,
@@ -619,7 +619,7 @@
 				B7A03F3D1F866946006AEF79 /* MediaMessageCell.swift in Sources */,
 				1FE783A220662905007FA024 /* TextMessageSizeCalculator.swift in Sources */,
 				B7A03F331F866940006AEF79 /* MessageDateHeaderView.swift in Sources */,
-				B7A03F2E1F866895006AEF79 /* MessageData.swift in Sources */,
+				B7A03F2E1F866895006AEF79 /* MessageKind.swift in Sources */,
 				B7A03F7B1F866B85006AEF79 /* MessageCollectionViewCell.swift in Sources */,
 				B7A03F6B1F8669EB006AEF79 /* UIColor+Extensions.swift in Sources */,
 				B7A03F5E1F8669CA006AEF79 /* MessagesLayoutDelegate.swift in Sources */,
@@ -641,7 +641,6 @@
 				B7A03F2A1F866895006AEF79 /* MessageStyle.swift in Sources */,
 				B7A03F4D1F86694F006AEF79 /* MessagesCollectionView.swift in Sources */,
 				0EF0888C206F7E83007F2F58 /* CellSizeCalculator.swift in Sources */,
-				B7A03F351F866940006AEF79 /* MessageHeaderView.swift in Sources */,
 				1FE783A4206629A5007FA024 /* MediaMessageSizeCalculator.swift in Sources */,
 				B7A03F731F866A06006AEF79 /* MessageKit+Availability.swift in Sources */,
 				1FE7839E20662835007FA024 /* MessageSizeCalculator.swift in Sources */,
diff --git a/Sources/Controllers/MessagesViewController.swift b/Sources/Controllers/MessagesViewController.swift
@@ -174,7 +174,7 @@ UICollectionViewDelegateFlowLayout, UICollectionViewDataSource {
 
         let message = messagesDataSource.messageForItem(at: indexPath, in: messagesCollectionView)
 
-        switch message.data {
+        switch message.kind {
         case .text, .attributedText, .emoji:
             let cell = messagesCollectionView.dequeueReusableCell(TextMessageCell.self, for: indexPath)
             cell.configure(with: message, at: indexPath, and: messagesCollectionView)
@@ -244,7 +244,7 @@ UICollectionViewDelegateFlowLayout, UICollectionViewDataSource {
         guard let messagesDataSource = messagesCollectionView.messagesDataSource else { return false }
         let message = messagesDataSource.messageForItem(at: indexPath, in: messagesCollectionView)
 
-        switch message.data {
+        switch message.kind {
         case .text, .attributedText, .emoji, .photo:
             selectedIndexPathForMenu = indexPath
             return true
@@ -264,7 +264,7 @@ UICollectionViewDelegateFlowLayout, UICollectionViewDataSource {
         let pasteBoard = UIPasteboard.general
         let message = messagesDataSource.messageForItem(at: indexPath, in: messagesCollectionView)
 
-        switch message.data {
+        switch message.kind {
         case .text(let text), .emoji(let text):
             pasteBoard.string = text
         case .attributedText(let attributedText):
diff --git a/Sources/Layout/LocationMessageSizeCalculator.swift b/Sources/Layout/LocationMessageSizeCalculator.swift
@@ -27,7 +27,7 @@ import Foundation
 open class LocationMessageSizeCalculator: MessageSizeCalculator {
 
     open override func messageContainerSize(for message: MessageType) -> CGSize {
-        switch message.data {
+        switch message.kind {
         case .location(let item):
             let maxWidth = messageContainerMaxWidth(for: message)
             if maxWidth < item.size.width {
@@ -37,7 +37,7 @@ open class LocationMessageSizeCalculator: MessageSizeCalculator {
             }
             return item.size
         default:
-            fatalError("messageContainerSize received unhandled MessageDataType: \(message.data)")
+            fatalError("messageContainerSize received unhandled MessageDataType: \(message.kind)")
         }
     }
 }
diff --git a/Sources/Layout/MediaMessageSizeCalculator.swift b/Sources/Layout/MediaMessageSizeCalculator.swift
@@ -36,13 +36,13 @@ open class MediaMessageSizeCalculator: MessageSizeCalculator {
             }
             return item.size
         }
-        switch message.data {
+        switch message.kind {
         case .photo(let item):
             return sizeForMediaItem(maxWidth, item)
         case .video(let item):
             return sizeForMediaItem(maxWidth, item)
         default:
-            fatalError("messageContainerSize received unhandled MessageDataType: \(message.data)")
+            fatalError("messageContainerSize received unhandled MessageDataType: \(message.kind)")
         }
     }
 }
diff --git a/Sources/Layout/MessagesCollectionViewFlowLayout.swift b/Sources/Layout/MessagesCollectionViewFlowLayout.swift
@@ -133,7 +133,7 @@ open class MessagesCollectionViewFlowLayout: UICollectionViewFlowLayout {
 
     open func cellSizeCalculatorForItem(at indexPath: IndexPath) -> CellSizeCalculator {
         let message = messagesDataSource.messageForItem(at: indexPath, in: messagesCollectionView)
-        switch message.data {
+        switch message.kind {
         case .text:
             return textMessageSizeCalculator
         case .attributedText:
@@ -147,7 +147,7 @@ open class MessagesCollectionViewFlowLayout: UICollectionViewFlowLayout {
         case .location:
             return locationMessageSizeCalculator
         case .custom:
-            fatalError("Must return a CellSizeCalculator for MessageData.custom(Any?)")
+            fatalError("Must return a CellSizeCalculator for MessageKind.custom(Any?)")
         }
     }
 
diff --git a/Sources/Layout/TextMessageSizeCalculator.swift b/Sources/Layout/TextMessageSizeCalculator.swift
@@ -49,13 +49,13 @@ open class TextMessageSizeCalculator: MessageSizeCalculator {
         var messageContainerSize: CGSize
         let attributedText: NSAttributedString
 
-        switch message.data {
+        switch message.kind {
         case .attributedText(let text):
             attributedText = text
         case .text(let text), .emoji(let text):
             attributedText = NSAttributedString(string: text, attributes: [.font: messageLabelFont])
         default:
-            fatalError("messageContainerSize received unhandled MessageDataType: \(message.data)")
+            fatalError("messageContainerSize received unhandled MessageDataType: \(message.kind)")
         }
 
         messageContainerSize = labelSize(for: attributedText, considering: maxWidth)
@@ -78,7 +78,7 @@ open class TextMessageSizeCalculator: MessageSizeCalculator {
         attributes.messageLabelInsets = messageLabelInsets(for: message)
         attributes.messageLabelFont = messageLabelFont
 
-        switch message.data {
+        switch message.kind {
         case .attributedText(let text):
             guard !text.string.isEmpty else { return }
             guard let font = text.attribute(.font, at: 0, effectiveRange: nil) as? UIFont else { return }
diff --git a/Sources/Models/MessageKind.swift b/Sources/Models/MessageKind.swift
@@ -24,15 +24,15 @@
 
 import Foundation
 
-/// An enum representing the kind of message and its underlying data.
-public enum MessageData {
+/// An enum representing the kind of message and its underlying kind.
+public enum MessageKind {
 
     /// A standard text message.
     ///
     /// - Note: The font used for this message will be the value of the
     /// `messageLabelFont` property in the `MessagesCollectionViewFlowLayout` object.
     ///
-    /// Using `MessageData.attributedText(NSAttributedString)` doesn't require you
+    /// Using `MessageKind.attributedText(NSAttributedString)` doesn't require you
     /// to set this property and results in higher performance.
     case text(String)
     
diff --git a/Sources/Models/MessageKitError.swift b/Sources/Models/MessageKitError.swift
@@ -33,6 +33,6 @@ internal enum MessageKitError {
     internal static let unrecognizedCheckingResult = "Received an unrecognized NSTextCheckingResult.CheckingType"
     internal static let couldNotLoadAssetsBundle = "MessageKit: Could not load the assets bundle"
     internal static let couldNotCreateAssetsPath = "MessageKit: Could not create path to the assets bundle."
-    internal static let customDataUnresolvedCell = "Did not return a cell for MessageData.custom(Any)."
-    internal static let customDataUnresolvedSize = "Did not return a size for MessageData.custom(Any)."
+    internal static let customDataUnresolvedCell = "Did not return a cell for MessageKind.custom(Any)."
+    internal static let customDataUnresolvedSize = "Did not return a size for MessageKind.custom(Any)."
 }
diff --git a/Sources/Protocols/MessageType.swift b/Sources/Protocols/MessageType.swift
@@ -37,7 +37,7 @@ public protocol MessageType {
     /// The date the message was sent.
     var sentDate: Date { get }
 
-    /// The kind of message and its underlying data.
-    var data: MessageData { get }
+    /// The kind of message and its underlying kind.
+    var kind: MessageKind { get }
 
 }
diff --git a/Sources/Protocols/MessagesDisplayDelegate.swift b/Sources/Protocols/MessagesDisplayDelegate.swift
@@ -50,7 +50,7 @@ public protocol MessagesDisplayDelegate: AnyObject {
     ///
     /// - Note:
     ///   The default value is `UIColor.clear` for emoji messages.
-    ///   For all other `MessageData` cases, the color depends on the `Sender`.
+    ///   For all other `MessageKind` cases, the color depends on the `Sender`.
     ///
     ///   Current sender: Green
     ///
@@ -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` to which the color will apply.
+    ///   - message: A `MessageType` with a `MessageKind` 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.
     ///
@@ -104,7 +104,7 @@ public protocol MessagesDisplayDelegate: AnyObject {
     /// Specifies the `DetectorType`s to check for the `MessageType`'s text against.
     ///
     /// - Parameters:
-    ///   - message: A `MessageType` with a `MessageData` case of `.text` or `.attributedText` to which the detectors will apply.
+    ///   - message: A `MessageType` with a `MessageKind` case of `.text` or `.attributedText` to which the detectors will apply.
     ///   - indexPath: The `IndexPath` of the cell.
     ///   - messagesCollectionView: The `MessagesCollectionView` in which this cell will be displayed.
     ///
@@ -116,7 +116,7 @@ public protocol MessagesDisplayDelegate: AnyObject {
     ///
     /// - Parameters:
     ///   - detector: The `DetectorType` for the applied attributes.
-    ///   - message: A `MessageType` with a `MessageData` case of `.text` or `.attributedText` to which the detectors will apply.
+    ///   - message: A `MessageType` with a `MessageKind` case of `.text` or `.attributedText` to which the detectors will apply.
     ///   - indexPath: The `IndexPath` of the cell.
     func detectorAttributes(for detector: DetectorType, and message: MessageType, at indexPath: IndexPath) -> [NSAttributedStringKey: Any]
 
@@ -125,7 +125,7 @@ public protocol MessagesDisplayDelegate: AnyObject {
     /// Used to configure a `LocationMessageSnapshotOptions` instance to customize the map image on the given location message.
     ///
     /// - Parameters:
-    ///   - message: A `MessageType` with a `MessageData` case of `.location`.
+    ///   - message: A `MessageType` with a `MessageKind` case of `.location`.
     ///   - indexPath: The `IndexPath` of the cell.
     ///   - messagesCollectionView: The `MessagesCollectionView` requesting the information.
     /// - Returns: The LocationMessageSnapshotOptions instance with the options to customize map style.
@@ -134,7 +134,7 @@ public protocol MessagesDisplayDelegate: AnyObject {
     /// Used to configure the annoation view of the map image on the given location message.
     ///
     /// - Parameters:
-    ///   - message: A `MessageType` with a `MessageData` case of `.location`.
+    ///   - message: A `MessageType` with a `MessageKind` case of `.location`.
     ///   - indexPath: The `IndexPath` of the cell.
     ///   - messagesCollectionView: The `MessagesCollectionView` requesting the information.
     /// - Returns: The `MKAnnotationView` to use as the annotation view.
@@ -144,7 +144,7 @@ public protocol MessagesDisplayDelegate: AnyObject {
     /// The animation block is called with the `UIImageView` to be animated.
     ///
     /// - Parameters:
-    ///   - message: A `MessageType` with a `MessageData` case of `.location`.
+    ///   - message: A `MessageType` with a `MessageKind` case of `.location`.
     ///   - indexPath: The `IndexPath` of the cell.
     ///   - messagesCollectionView: The `MessagesCollectionView` requesting the information.
     /// - Returns: The animation block to use to apply the location image.
@@ -173,7 +173,7 @@ public extension MessagesDisplayDelegate {
 
     func backgroundColor(for message: MessageType, at  indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> UIColor {
 
-        switch message.data {
+        switch message.kind {
         case .emoji:
             return .clear
         default:
diff --git a/Sources/Views/Cells/LocationMessageCell.swift b/Sources/Views/Cells/LocationMessageCell.swift
@@ -64,7 +64,7 @@ open class LocationMessageCell: MessageContentCell {
         let annotationView = displayDelegate.annotationViewForLocation(message: message, at: indexPath, in: messagesCollectionView)
         let animationBlock = displayDelegate.animationBlockForLocation(message: message, at: indexPath, in: messagesCollectionView)
 
-        guard case let .location(locationItem) = message.data else { fatalError("") }
+        guard case let .location(locationItem) = message.kind else { fatalError("") }
 
         activityIndicator.startAnimating()
 
diff --git a/Sources/Views/Cells/MediaMessageCell.swift b/Sources/Views/Cells/MediaMessageCell.swift
@@ -63,7 +63,7 @@ open class MediaMessageCell: MessageContentCell {
             fatalError(MessageKitError.nilMessagesDisplayDelegate)
         }
 
-        switch message.data {
+        switch message.kind {
         case .photo(let mediaItem):
             imageView.image = mediaItem.image ?? mediaItem.placeholderImage
             playButtonView.isHidden = true
diff --git a/Sources/Views/Cells/TextMessageCell.swift b/Sources/Views/Cells/TextMessageCell.swift
@@ -76,7 +76,7 @@ open class TextMessageCell: MessageContentCell {
                 let attributes = displayDelegate.detectorAttributes(for: detector, and: message, at: indexPath)
                 messageLabel.setAttributes(attributes, detector: detector)
             }
-            switch message.data {
+            switch message.kind {
             case .text(let text), .emoji(let text):
                 let textColor = displayDelegate.textColor(for: message, at: indexPath, in: messagesCollectionView)
                 messageLabel.text = text
diff --git a/Tests/Mocks/MockMessage.swift b/Tests/Mocks/MockMessage.swift

Original file line number	Diff line number	Diff line change
`@@ -58,40 +58,40 @@ internal struct MockMessage: MessageType {`
`58`	`58`	`var messageId: String`
`59`	`59`	`var sender: Sender`
`60`	`60`	`var sentDate: Date`
`61`		`- var data: MessageData`
	`61`	`+ var kind: MessageKind`
`62`	`62`
`63`		`- private init(data: MessageData, sender: Sender, messageId: String, date: Date) {`
`64`		`- self.data = data`
	`63`	`+ private init(kind: MessageKind, sender: Sender, messageId: String, date: Date) {`
	`64`	`+ self.kind = kind`
`65`	`65`	`self.sender = sender`
`66`	`66`	`self.messageId = messageId`
`67`	`67`	`self.sentDate = date`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`init(text: String, sender: Sender, messageId: String, date: Date) {`
`71`		`- self.init(data: .text(text), sender: sender, messageId: messageId, date: date)`
	`71`	`+ self.init(kind: .text(text), sender: sender, messageId: messageId, date: date)`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`init(attributedText: NSAttributedString, sender: Sender, messageId: String, date: Date) {`
`75`		`- self.init(data: .attributedText(attributedText), sender: sender, messageId: messageId, date: date)`
	`75`	`+ self.init(kind: .attributedText(attributedText), sender: sender, messageId: messageId, date: date)`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`init(image: UIImage, sender: Sender, messageId: String, date: Date) {`
`79`	`79`	`let mediaItem = MockMediaItem(image: image)`
`80`		`- self.init(data: .photo(mediaItem), sender: sender, messageId: messageId, date: date)`
	`80`	`+ self.init(kind: .photo(mediaItem), sender: sender, messageId: messageId, date: date)`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`init(thumbnail: UIImage, sender: Sender, messageId: String, date: Date) {`
`84`	`84`	`let mediaItem = MockMediaItem(image: thumbnail)`
`85`		`- self.init(data: .video(mediaItem), sender: sender, messageId: messageId, date: date)`
	`85`	`+ self.init(kind: .video(mediaItem), sender: sender, messageId: messageId, date: date)`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`init(location: CLLocation, sender: Sender, messageId: String, date: Date) {`
`89`	`89`	`let locationItem = MockLocationItem(location: location)`
`90`		`- self.init(data: .location(locationItem), sender: sender, messageId: messageId, date: date)`
	`90`	`+ self.init(kind: .location(locationItem), sender: sender, messageId: messageId, date: date)`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`init(emoji: String, sender: Sender, messageId: String, date: Date) {`
`94`		`- self.init(data: .emoji(emoji), sender: sender, messageId: messageId, date: date)`
	`94`	`+ self.init(kind: .emoji(emoji), sender: sender, messageId: messageId, date: date)`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import Foundation`
`27`	`27`	`open class LocationMessageSizeCalculator: MessageSizeCalculator {`
`28`	`28`
`29`	`29`	`open override func messageContainerSize(for message: MessageType) -> CGSize {`
`30`		`- switch message.data {`
	`30`	`+ switch message.kind {`
`31`	`31`	`case .location(let item):`
`32`	`32`	`let maxWidth = messageContainerMaxWidth(for: message)`
`33`	`33`	`if maxWidth < item.size.width {`
`@@ -37,7 +37,7 @@ open class LocationMessageSizeCalculator: MessageSizeCalculator {`
`37`	`37`	`}`
`38`	`38`	`return item.size`
`39`	`39`	`default:`
`40`		`- fatalError("messageContainerSize received unhandled MessageDataType: \(message.data)")`
	`40`	`+ fatalError("messageContainerSize received unhandled MessageDataType: \(message.kind)")`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,13 @@ open class MediaMessageSizeCalculator: MessageSizeCalculator {`
`36`	`36`	`}`
`37`	`37`	`return item.size`
`38`	`38`	`}`
`39`		`- switch message.data {`
	`39`	`+ switch message.kind {`
`40`	`40`	`case .photo(let item):`
`41`	`41`	`return sizeForMediaItem(maxWidth, item)`
`42`	`42`	`case .video(let item):`
`43`	`43`	`return sizeForMediaItem(maxWidth, item)`
`44`	`44`	`default:`
`45`		`- fatalError("messageContainerSize received unhandled MessageDataType: \(message.data)")`
	`45`	`+ fatalError("messageContainerSize received unhandled MessageDataType: \(message.kind)")`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ internal enum MessageKitError {`
`33`	`33`	`internal static let unrecognizedCheckingResult = "Received an unrecognized NSTextCheckingResult.CheckingType"`
`34`	`34`	`internal static let couldNotLoadAssetsBundle = "MessageKit: Could not load the assets bundle"`
`35`	`35`	`internal static let couldNotCreateAssetsPath = "MessageKit: Could not create path to the assets bundle."`
`36`		`- internal static let customDataUnresolvedCell = "Did not return a cell for MessageData.custom(Any)."`
`37`		`- internal static let customDataUnresolvedSize = "Did not return a size for MessageData.custom(Any)."`
	`36`	`+ internal static let customDataUnresolvedCell = "Did not return a cell for MessageKind.custom(Any)."`
	`37`	`+ internal static let customDataUnresolvedSize = "Did not return a size for MessageKind.custom(Any)."`
`38`	`38`	`}`