Voice master

Sources/Controllers/MessagesViewController+DataSource.swift

@@ -81,6 +81,11 @@ extension MessagesViewController: UICollectionViewDataSource {
             messagesDataSource.configCell(cell, for: message, at: indexPath)
             cell.configure(with: message, at: indexPath, and: messagesCollectionView)
             return cell
+        case .audio(_):
+            let cell = messagesCollectionView.dequeueReusableCell(VoiceMessageCell.self, for: indexPath)
+            messagesDataSource.configCell(cell, for: message, at: indexPath)
+            cell.configure(with: message, at: indexPath, and: messagesCollectionView)
+            return cell
         case .gif, .sticker:
             let cell = messagesCollectionView.dequeueReusableCell(GifMessageCell.self, for: indexPath)
             messagesDataSource.configCell(cell, for: message, at: indexPath)

Sources/Controllers/MessagesViewController+Delegate.swift

@@ -69,7 +69,7 @@ extension MessagesViewController: UICollectionViewDelegateFlowLayout {
         let message = messagesDataSource.messageForItem(at: indexPath, in: messagesCollectionView)
 
         switch message.data {
-        case .text, .attributedText, .emoji, .photo, .attachment, .gif, .sticker:
+        case .text, .attributedText, .emoji, .photo, .attachment, .audio, .gif, .sticker:
             selectedIndexPathForMenu = indexPath
             return true
         default:

Sources/Controllers/MessagesViewController.swift

@@ -150,6 +150,7 @@ open class MessagesViewController: UIViewController {
         messagesCollectionView.register(LocationMessageCell.self)
         messagesCollectionView.register(PhotoMessageCell.self)
         messagesCollectionView.register(DocumentMessageCell.self)
+        messagesCollectionView.register(VoiceMessageCell.self)
         messagesCollectionView.register(GifMessageCell.self)
 
         messagesCollectionView.register(MessageFooterView.self, forSupplementaryViewOfKind: UICollectionElementKindSectionFooter)

Sources/Extensions/UIView+Extensions.swift

@@ -54,6 +54,28 @@ extension UIView {
         ]
         NSLayoutConstraint.activate(constraints)
     }
+    func rightInSuperview(_ rightConstant: CGFloat = 0) {
+        guard let superview = self.superview else {
+            return
+        }
+        translatesAutoresizingMaskIntoConstraints = false
+        let constraints: [NSLayoutConstraint] = [
+            rightAnchor.constraint(equalTo: superview.rightAnchor,constant: rightConstant),
+            centerYAnchor.constraint(equalTo: superview.centerYAnchor)
+        ]
+        NSLayoutConstraint.activate(constraints)
+    }
+    func leftInSuperview(_ leftConstant: CGFloat = 0) {
+        guard let superview = self.superview else {
+            return
+        }
+        translatesAutoresizingMaskIntoConstraints = false
+        let constraints: [NSLayoutConstraint] = [
+            leftAnchor.constraint(equalTo: superview.leftAnchor,constant: leftConstant),
+            centerYAnchor.constraint(equalTo: superview.centerYAnchor)
+        ]
+        NSLayoutConstraint.activate(constraints)
+    }
 
     func constraint(equalTo size: CGSize) {
         guard superview != nil else { return }

Sources/Layout/MessageIntermediateLayoutAttributes.swift

@@ -61,11 +61,11 @@ final class MessageIntermediateLayoutAttributes {
         case .cellBottom:
             origin.y = cellFrame.height - avatarSize.height
         case .messageTop:
-            origin.y = messageContainerFrame.minY
+            origin.y = messageContainerBaseViewFrame.minY
         case .messageBottom:
-            origin.y = messageContainerFrame.maxY - avatarSize.height
+            origin.y = messageContainerBaseViewFrame.maxY - avatarSize.height
         case .messageCenter:
-            origin.y = messageContainerFrame.midY - (avatarSize.height/2)
+            origin.y = messageContainerBaseViewFrame.midY - (avatarSize.height/2)
         }
 
         return CGRect(origin: origin, size: avatarSize)
@@ -81,24 +81,50 @@ final class MessageIntermediateLayoutAttributes {
         guard accessoryViewSize != .zero else { return .zero }
 
         var origin: CGPoint = .zero
-        origin.y = messageContainerFrame.origin.y + messageContainerSize.height * 0.5 -
+        origin.y = messageContainerBaseViewFrame.origin.y + messageContainerSize.height * 0.5 -
             accessoryViewSize.height * 0.5
 
         switch avatarPosition.horizontal {
         case .cellLeading:
-            origin.x = messageContainerFrame.maxX + accessoryViewPadding.left
+            origin.x = messageContainerBaseViewFrame.maxX + accessoryViewPadding.left + accessoryViewSize.width
         case .cellTrailing:
-            origin.x = messageContainerFrame.minX - accessoryViewPadding.right - accessoryViewSize.width
+            origin.x = messageContainerBaseViewFrame.minX - accessoryViewPadding.right - accessoryViewSize.width - voiceTimeViewSize.width
         case .natural:
             fatalError(MessageKitError.avatarPositionUnresolved)
         }
 
         return CGRect(origin: origin, size: accessoryViewSize)
 
+    }()
+    // messageContainerBaseViewFrame
+    var messageContainerBaseViewSize: CGSize = .zero
+
+    var messageContainerBaseViewMaxWidth: CGFloat = 0
+    var messageContainerBaseViewPadding: UIEdgeInsets = .zero
+
+    lazy var messageContainerBaseViewFrame: CGRect = {
+
+        guard messageContainerBaseViewSize != .zero else { return .zero }
+
+        var origin: CGPoint = .zero
+        origin.y = topLabelSize.height + messageContainerBaseViewPadding.top + topLabelVerticalPadding
+
+        switch avatarPosition.horizontal {
+        case .cellLeading:
+            origin.x = avatarSize.width + messageContainerPadding.left
+        case .cellTrailing:
+            origin.x = cellFrame.width - avatarSize.width - messageContainerBaseViewSize.width - messageContainerBaseViewPadding.right
+        case .natural:
+            fatalError(MessageKitError.avatarPositionUnresolved)
+        }
+
+        return CGRect(origin: origin, size: messageContainerBaseViewSize)
+
     }()
 
     // MessageContainerView
     var messageContainerSize: CGSize = .zero
+
     var messageContainerMaxWidth: CGFloat = 0
     var messageContainerPadding: UIEdgeInsets = .zero
     var messageLabelInsets: UIEdgeInsets = .zero
@@ -123,6 +149,28 @@ final class MessageIntermediateLayoutAttributes {
 
     }()
 
+    var voiceTimeViewSize: CGSize = .zero
+    var voiceTimeViewPadding: UIEdgeInsets = .zero
+    lazy var voiceTimeViewframe: CGRect = {
+
+        guard voiceTimeViewSize != .zero else { return .zero }
+
+        var origin: CGPoint = .zero
+        origin.y = messageContainerFrame.origin.y + messageContainerSize.height * 0.5 -
+            voiceTimeViewSize.height * 0.5
+
+        switch avatarPosition.horizontal {
+        case .cellLeading:
+            origin.x = messageContainerFrame.maxX + voiceTimeViewPadding.left
+        case .cellTrailing:
+            origin.x = messageContainerFrame.minX - voiceTimeViewPadding.right - voiceTimeViewSize.width
+        case .natural:
+            fatalError(MessageKitError.avatarPositionUnresolved)
+        }
+
+        return CGRect(origin: origin, size: voiceTimeViewSize)
+    }()
+
     // Cell Top Label
     var topLabelAlignment: LabelAlignment = .cellLeading(.zero)
     var topLabelSize: CGSize = .zero
@@ -144,9 +192,9 @@ final class MessageIntermediateLayoutAttributes {
         case .cellTrailing:
             origin.x = cellFrame.width - topLabelSize.width - topLabelPadding.right
         case .messageLeading:
-            origin.x = messageContainerFrame.minX + topLabelPadding.left
+            origin.x = messageContainerBaseViewFrame.minX + topLabelPadding.left
         case .messageTrailing:
-            origin.x = messageContainerFrame.maxX - topLabelSize.width - topLabelPadding.right
+            origin.x = messageContainerBaseViewFrame.maxX - topLabelSize.width - topLabelPadding.right
         }
 
         return CGRect(origin: origin, size: topLabelSize)
@@ -164,7 +212,7 @@ final class MessageIntermediateLayoutAttributes {
 
         var origin: CGPoint = .zero
 
-        origin.y = messageContainerFrame.maxY + messageContainerPadding.bottom + bottomLabelPadding.top
+        origin.y = messageContainerBaseViewFrame.maxY + messageContainerPadding.bottom + bottomLabelPadding.top
 
         switch bottomLabelAlignment {
         case .cellLeading:
@@ -174,9 +222,9 @@ final class MessageIntermediateLayoutAttributes {
         case .cellTrailing:
             origin.x = cellFrame.width - bottomLabelSize.width - bottomLabelPadding.right
         case .messageLeading:
-            origin.x = messageContainerFrame.minX + bottomLabelPadding.left
+            origin.x = messageContainerBaseViewFrame.minX + bottomLabelPadding.left
         case .messageTrailing:
-            origin.x = messageContainerFrame.maxX - bottomLabelSize.width - bottomLabelPadding.right
+            origin.x = messageContainerBaseViewFrame.maxX - bottomLabelSize.width - bottomLabelPadding.right
         }
 
         return CGRect(origin: origin, size: bottomLabelSize)

Sources/Layout/MessagesCollectionViewFlowLayout.swift

@@ -237,16 +237,27 @@ fileprivate extension MessagesCollectionViewFlowLayout {
         attributes.avatarPosition = avatarPosition(for: attributes)
         attributes.avatarSize = avatarSize(for: attributes)
         attributes.messageContainerPadding = messageContainerPadding(for: attributes)
+
+        attributes.messageContainerBaseViewPadding = messageContainerPadding(for: attributes)
+
         attributes.messageLabelInsets = messageLabelInsets(for: attributes)
 
         // AccessoryView
         attributes.accessoryViewSize = accessoryViewSize(for: attributes)
         attributes.accessoryViewPadding = accessoryViewPadding(for: attributes)
 
+        // voiceTimeView
+        attributes.voiceTimeViewSize = voiceTimeViewSize(for: attributes)
+        attributes.voiceTimeViewPadding = voiceTimeViewPadding(for: attributes)
+
         // MessageContainerView
         attributes.messageContainerMaxWidth = messageContainerMaxWidth(for: attributes)
         attributes.messageContainerSize = messageContainerSize(for: attributes)
 
+        // messageContainerBaseViewFrame
+        attributes.messageContainerBaseViewMaxWidth = messageContainerMaxWidth(for: attributes)
+        attributes.messageContainerBaseViewSize = messageContainerSize(for: attributes, voiceReplyWidth: 40)
+
         // Cell Bottom Label
         attributes.bottomLabelAlignment = cellBottomLabelAlignment(for: attributes)
         attributes.bottomLabelMaxWidth = cellBottomLabelMaxWidth(for: attributes)
@@ -274,7 +285,9 @@ fileprivate extension MessagesCollectionViewFlowLayout {
 
         intermediateAttributes.cellFrame = attributes.frame
 
+        attributes.messageContainerBaseViewFrame = intermediateAttributes.messageContainerBaseViewFrame
         attributes.messageContainerFrame = intermediateAttributes.messageContainerFrame
+        attributes.voiceTimeViewframe = intermediateAttributes.voiceTimeViewframe
         attributes.topLabelFrame = intermediateAttributes.topLabelFrame
         attributes.bottomLabelFrame = intermediateAttributes.bottomLabelFrame
         attributes.avatarFrame = intermediateAttributes.avatarFrame
@@ -409,6 +422,9 @@ private extension MessagesCollectionViewFlowLayout {
         switch attributes.message.data {
         case .text, .attributedText:
             return baseMaxWidth - attributes.messageLabelHorizontalInsets
+        case .audio:
+            //czy: add voiceTimeLabel size 
+            return baseMaxWidth - attributes.messageLabelHorizontalInsets
         default:
             return baseMaxWidth
         }
@@ -420,7 +436,7 @@ private extension MessagesCollectionViewFlowLayout {
     ///
     /// - Parameters:
     ///   - attributes: The `MessageIntermediateLayoutAttributes` to consider when calculating the `MessageContainerView` size.
-    func messageContainerSize(for attributes: MessageIntermediateLayoutAttributes) -> CGSize {
+    func messageContainerSize(for attributes: MessageIntermediateLayoutAttributes, voiceReplyWidth: CGFloat = 0) -> CGSize {
 
         let message = attributes.message
         let indexPath = attributes.indexPath
@@ -461,6 +477,16 @@ private extension MessagesCollectionViewFlowLayout {
             let width = messagesLayoutDelegate.widthForLocation(message: message, at: indexPath, with: maxWidth, in: messagesCollectionView)
             let height = messagesLayoutDelegate.heightForLocation(message: message, at: indexPath, with: maxWidth, in: messagesCollectionView)
             messageContainerSize = CGSize(width: width, height: height)
+        case .audio(let data):
+
+            //计算宽度或者固定宽度
+            let minWidth: CGFloat = 60
+            let maxWidth: CGFloat = screenWidth() > 320 ? 240 : 200
+            let proportion:CGFloat = CGFloat(Double(data.duration)/60.0)
+            let width: CGFloat = minWidth + proportion * maxWidth * 2/5.0
+            let height: CGFloat = 35
+            messageContainerSize = CGSize(width: width, height: height)
+            messageContainerSize.width = max(messageContainerSize.width, replyWithLabelInsets) + voiceReplyWidth
         }
 
         messageContainerSize.height += messagesLayoutDelegate.replyViewHeight(at: indexPath,
@@ -641,6 +667,16 @@ fileprivate extension MessagesCollectionViewFlowLayout {
     ///   - attributes: The `MessageIntermediateLayoutAttributes` containing the `MessageType` object.
     func accessoryViewPadding(for attributes: MessageIntermediateLayoutAttributes) -> UIEdgeInsets {
         return messagesLayoutDelegate.accessoryViewPadding(for: attributes.message, at: attributes.indexPath, in: messagesCollectionView)
+
+    }
+
+    func voiceTimeViewSize(for attributes: MessageIntermediateLayoutAttributes) -> CGSize {
+        return messagesLayoutDelegate.voiceTimeViewSize(for: attributes.message, at: attributes.indexPath, in: messagesCollectionView)
+    }
+
+    func voiceTimeViewPadding(for attributes: MessageIntermediateLayoutAttributes) -> UIEdgeInsets {
+        return messagesLayoutDelegate.voiceTimeViewPadding(for: attributes.message, at: attributes.indexPath, in: messagesCollectionView)
+
     }
 }
 

Sources/Layout/MessagesCollectionViewLayoutAttributes.swift

@@ -34,7 +34,9 @@ final class MessagesCollectionViewLayoutAttributes: UICollectionViewLayoutAttrib
     var accessoryViewFrame: CGRect = .zero
 
     var messageLabelFont: UIFont = UIFont.preferredFont(forTextStyle: .body)
+    var messageContainerBaseViewFrame: CGRect = .zero
     var messageContainerFrame: CGRect = .zero
+    var voiceTimeViewframe: CGRect = .zero
     var messageLabelInsets: UIEdgeInsets = .zero
 
     var topLabelFrame: CGRect = .zero
@@ -48,6 +50,8 @@ final class MessagesCollectionViewLayoutAttributes: UICollectionViewLayoutAttrib
         copy.avatarFrame = avatarFrame
         copy.accessoryViewFrame = accessoryViewFrame
         copy.messageContainerFrame = messageContainerFrame
+        copy.messageContainerBaseViewFrame = messageContainerBaseViewFrame
+        copy.voiceTimeViewframe = voiceTimeViewframe
         copy.messageLabelFont = messageLabelFont
         copy.messageLabelInsets = messageLabelInsets
         copy.topLabelFrame = topLabelFrame

Sources/Models/MessageData.swift

@@ -58,11 +58,12 @@ public enum MessageData {
     /// An emoji message.
     case emoji(String)
 
+
     case attachment(data: ChatAttachment)
 
     // MARK: - Not supported yet
 
-//    case audio(Data)
+    case audio(data: ChatAttachment)
 //
 //    case system(String)
 //    
@@ -89,6 +90,8 @@ public enum MessageData {
             return "Location"
         case .emoji(_):
             return "Emoji"
+        case .audio(_):
+            return "Voice"
         case .attachment(let data):
             if data.type == .Email {
                 return "Email"

Sources/Protocols/MessagesLayoutDelegate.swift

@@ -55,6 +55,8 @@ public protocol MessagesLayoutDelegate: AnyObject {
     /// The default value returned by this method is zero.
     func accessoryViewPadding(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> UIEdgeInsets
 
+    func voiceTimeViewPadding(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> UIEdgeInsets
+
     /// Specifies the vertical and horizontal alignment for the `EdisonProfileView` in a `MessageCollectionViewCell`.
     ///
     /// - Parameters:
@@ -114,6 +116,8 @@ public protocol MessagesLayoutDelegate: AnyObject {
     /// The default value returned by this method is a size of `0 x 0`.
     func accessoryViewSize(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> CGSize
 
+    func voiceTimeViewSize(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> CGSize
+
     /// Specifies the size to use for a `MessageHeaderView`.
     ///
     /// - Parameters:
@@ -242,6 +246,10 @@ public extension MessagesLayoutDelegate {
         return .zero
     }
 
+    func voiceTimeViewPadding(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> UIEdgeInsets {
+        return .zero
+    }
+
     func cellTopLabelAlignment(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> LabelAlignment {
         guard let dataSource = messagesCollectionView.messagesDataSource else {
             fatalError(MessageKitError.nilMessagesDataSource)
@@ -267,6 +275,9 @@ public extension MessagesLayoutDelegate {
     func accessoryViewSize(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> CGSize {
         return .zero
     }
+    func voiceTimeViewSize(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> CGSize {
+        return .zero
+    }
 
     func headerViewSize(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> CGSize {
         return .zero

Sources/Views/Cells/DocumentMessageCell.swift

@@ -24,7 +24,7 @@ class DocumentMessageCell: MediaMessageCell {
         let mailAcctId = chatAcct.mailAcctId
 
         XMPPAdapter.downloadData(accountId: downloadInfo.accountId,
-                                 chatMsgId: downloadInfo.messageId) { (messageId, filePath) in
+                                 chatMsgId: downloadInfo.messageId) { (messageId, filePath, _) in
             guard let path = filePath else {
                 return
             }

Sources/Views/Cells/GifMessageCell.swift

@@ -37,7 +37,7 @@ class GifMessageCell: MediaMessageCell {
         }
 
         XMPPAdapter.downloadData(accountId: downloadInfo.accountId,
-                                 chatMsgId: downloadInfo.messageId) { [weak self] (msgId, filePath) in
+                                 chatMsgId: downloadInfo.messageId) { [weak self] (msgId, filePath, _) in
             EDOMainthread {
                 defer {
                     finishedAndDoNotRetry?(false)

Sources/Views/Cells/MediaMessageCell.swift

@@ -108,6 +108,7 @@ open class MediaMessageCell: MessageCollectionViewCell {
                     downloadData(for: DownloadInfo(accountId: chatMsg.accountId, messageId: chatMsg.msgId))
                 }
             }
+
         case .gif(let downloadInfo), .sticker(let downloadInfo):
             if let message: ChatMessage = EmailDAL.getChatMessage(accountId: downloadInfo.accountId,
                                                                   msgId: downloadInfo.messageId),