refactor: MessageSizeCalculator methods with indexPath argument

martinpucik · martinpucik · commit cd4f75b56112 · 2022-03-04T12:24:04.000+01:00
BREAKING CHANGE:
`func messageContainerMaxWidth(for message: MessageType) -&gt; CGFloat` now has IndexPath argument `func messageContainerMaxWidth(for message: MessageType, at indexPath: IndexPath) -&gt; CGFloat
`func messageContainerSize(for message: MessageType) -&gt; CGSize` now has IndexPath argument `func messageContainerSize(for message: MessageType, at indexPath: IndexPath) -&gt; CGSize`
diff --git a/Sources/Layout/AudioMessageSizeCalculator.swift b/Sources/Layout/AudioMessageSizeCalculator.swift
@@ -27,10 +27,10 @@ import UIKit
 
 open class AudioMessageSizeCalculator: MessageSizeCalculator {
 
-    open override func messageContainerSize(for message: MessageType) -> CGSize {
+    open override func messageContainerSize(for message: MessageType, at indexPath: IndexPath) -> CGSize {
         switch message.kind {
         case .audio(let item):
-            let maxWidth = messageContainerMaxWidth(for: message)
+            let maxWidth = messageContainerMaxWidth(for: message, at: indexPath)
             if maxWidth < item.size.width {
                 // Maintain the ratio if width is too great
                 let height = maxWidth * item.size.height / item.size.width
diff --git a/Sources/Layout/ContactMessageSizeCalculator.swift b/Sources/Layout/ContactMessageSizeCalculator.swift
@@ -37,14 +37,14 @@ open class ContactMessageSizeCalculator: MessageSizeCalculator {
         return isFromCurrentSender ? outgoingMessageNameLabelInsets : incomingMessageNameLabelInsets
     }
     
-    open override func messageContainerMaxWidth(for message: MessageType) -> CGFloat {
-        let maxWidth = super.messageContainerMaxWidth(for: message)
+    open override func messageContainerMaxWidth(for message: MessageType, at indexPath: IndexPath) -> CGFloat {
+        let maxWidth = super.messageContainerMaxWidth(for: message, at: indexPath)
         let textInsets = contactLabelInsets(for: message)
         return maxWidth - textInsets.horizontal
     }
     
-    open override func messageContainerSize(for message: MessageType) -> CGSize {
-        let maxWidth = messageContainerMaxWidth(for: message)
+    open override func messageContainerSize(for message: MessageType, at indexPath: IndexPath) -> CGSize {
+        let maxWidth = messageContainerMaxWidth(for: message, at: indexPath)
         
         var messageContainerSize: CGSize
         let attributedText: NSAttributedString
diff --git a/Sources/Layout/LinkPreviewMessageSizeCalculator.swift b/Sources/Layout/LinkPreviewMessageSizeCalculator.swift
@@ -46,23 +46,23 @@ open class LinkPreviewMessageSizeCalculator: TextMessageSizeCalculator {
         super.init(layout: layout)
     }
 
-    open override func messageContainerMaxWidth(for message: MessageType) -> CGFloat {
+    open override func messageContainerMaxWidth(for message: MessageType, at indexPath: IndexPath) -> CGFloat {
         switch message.kind {
         case .linkPreview:
-            let maxWidth = super.messageContainerMaxWidth(for: message)
+            let maxWidth = super.messageContainerMaxWidth(for: message, at: indexPath)
             return max(maxWidth, (layout?.collectionView?.bounds.width ?? 0) * 0.75)
         default:
-            return super.messageContainerMaxWidth(for: message)
+            return super.messageContainerMaxWidth(for: message, at: indexPath)
         }
     }
 
-    open override func messageContainerSize(for message: MessageType) -> CGSize {
+    open override func messageContainerSize(for message: MessageType, at indexPath: IndexPath) -> CGSize {
         guard case MessageKind.linkPreview(let linkItem) = message.kind else {
             fatalError("messageContainerSize received unhandled MessageDataType: \(message.kind)")
         }
 
-        var containerSize = super.messageContainerSize(for: message)
-        containerSize.width = max(containerSize.width, messageContainerMaxWidth(for: message))
+        var containerSize = super.messageContainerSize(for: message, at: indexPath)
+        containerSize.width = max(containerSize.width, messageContainerMaxWidth(for: message, at: indexPath))
 
         let labelInsets: UIEdgeInsets = messageLabelInsets(for: message)
 
diff --git a/Sources/Layout/LocationMessageSizeCalculator.swift b/Sources/Layout/LocationMessageSizeCalculator.swift
@@ -27,10 +27,10 @@ import UIKit
 
 open class LocationMessageSizeCalculator: MessageSizeCalculator {
 
-    open override func messageContainerSize(for message: MessageType) -> CGSize {
+    open override func messageContainerSize(for message: MessageType, at indexPath: IndexPath) -> CGSize {
         switch message.kind {
         case .location(let item):
-            let maxWidth = messageContainerMaxWidth(for: message)
+            let maxWidth = messageContainerMaxWidth(for: message, at: indexPath)
             if maxWidth < item.size.width {
                 // Maintain the ratio if width is too great
                 let height = maxWidth * item.size.height / item.size.width
diff --git a/Sources/Layout/MediaMessageSizeCalculator.swift b/Sources/Layout/MediaMessageSizeCalculator.swift
@@ -27,8 +27,8 @@ import UIKit
 
 open class MediaMessageSizeCalculator: MessageSizeCalculator {
 
-    open override func messageContainerSize(for message: MessageType) -> CGSize {
-        let maxWidth = messageContainerMaxWidth(for: message)
+    open override func messageContainerSize(for message: MessageType, at indexPath: IndexPath) -> CGSize {
+        let maxWidth = messageContainerMaxWidth(for: message, at: indexPath)
         let sizeForMediaItem = { (maxWidth: CGFloat, item: MediaItem) -> CGSize in
             if maxWidth < item.size.width {
                 // Maintain the ratio if width is too great
diff --git a/Sources/Layout/MessageSizeCalculator.swift b/Sources/Layout/MessageSizeCalculator.swift
@@ -72,12 +72,12 @@ open class MessageSizeCalculator: CellSizeCalculator {
         let indexPath = attributes.indexPath
         let message = dataSource.messageForItem(at: indexPath, in: messagesLayout.messagesCollectionView)
 
-        attributes.avatarSize = avatarSize(for: message)
+        attributes.avatarSize = avatarSize(for: message, at: indexPath)
         attributes.avatarPosition = avatarPosition(for: message)
         attributes.avatarLeadingTrailingPadding = avatarLeadingTrailingPadding
 
         attributes.messageContainerPadding = messageContainerPadding(for: message)
-        attributes.messageContainerSize = messageContainerSize(for: message)
+        attributes.messageContainerSize = messageContainerSize(for: message, at: indexPath)
         attributes.cellTopLabelSize = cellTopLabelSize(for: message, at: indexPath)
         attributes.cellTopLabelAlignment = cellTopLabelAlignment(for: message)
         attributes.cellBottomLabelSize = cellBottomLabelSize(for: message, at: indexPath)
@@ -103,13 +103,13 @@ open class MessageSizeCalculator: CellSizeCalculator {
 
     open func cellContentHeight(for message: MessageType, at indexPath: IndexPath) -> CGFloat {
 
-        let messageContainerHeight = messageContainerSize(for: message).height
+        let messageContainerHeight = messageContainerSize(for: message, at: indexPath).height
         let cellBottomLabelHeight = cellBottomLabelSize(for: message, at: indexPath).height
         let messageBottomLabelHeight = messageBottomLabelSize(for: message, at: indexPath).height
         let cellTopLabelHeight = cellTopLabelSize(for: message, at: indexPath).height
         let messageTopLabelHeight = messageTopLabelSize(for: message, at: indexPath).height
         let messageVerticalPadding = messageContainerPadding(for: message).vertical
-        let avatarHeight = avatarSize(for: message).height
+        let avatarHeight = avatarSize(for: message, at: indexPath).height
         let avatarVerticalPosition = avatarPosition(for: message).vertical
         let accessoryViewHeight = accessoryViewSize(for: message).height
 
@@ -163,7 +163,7 @@ open class MessageSizeCalculator: CellSizeCalculator {
         return position
     }
 
-    open func avatarSize(for message: MessageType) -> CGSize {
+    open func avatarSize(for message: MessageType, at indexPath: IndexPath) -> CGSize {
         let dataSource = messagesLayout.messagesDataSource
         let isFromCurrentSender = dataSource.isFromCurrentSender(message: message)
         return isFromCurrentSender ? outgoingAvatarSize : incomingAvatarSize
@@ -282,13 +282,13 @@ open class MessageSizeCalculator: CellSizeCalculator {
         return isFromCurrentSender ? outgoingMessagePadding : incomingMessagePadding
     }
 
-    open func messageContainerSize(for message: MessageType) -> CGSize {
+    open func messageContainerSize(for message: MessageType, at indexPath: IndexPath) -> CGSize {
         // Returns .zero by default
         return .zero
     }
 
-    open func messageContainerMaxWidth(for message: MessageType) -> CGFloat {
-        let avatarWidth = avatarSize(for: message).width
+    open func messageContainerMaxWidth(for message: MessageType, at indexPath: IndexPath) -> CGFloat {
+        let avatarWidth: CGFloat = avatarSize(for: message, at: indexPath).width
         let messagePadding = messageContainerPadding(for: message)
         let accessoryWidth = accessoryViewSize(for: message).width
         let accessoryPadding = accessoryViewPadding(for: message)
diff --git a/Sources/Layout/TextMessageSizeCalculator.swift b/Sources/Layout/TextMessageSizeCalculator.swift
@@ -38,14 +38,14 @@ open class TextMessageSizeCalculator: MessageSizeCalculator {
         return isFromCurrentSender ? outgoingMessageLabelInsets : incomingMessageLabelInsets
     }
 
-    open override func messageContainerMaxWidth(for message: MessageType) -> CGFloat {
-        let maxWidth = super.messageContainerMaxWidth(for: message)
+    open override func messageContainerMaxWidth(for message: MessageType, at indexPath: IndexPath) -> CGFloat {
+        let maxWidth = super.messageContainerMaxWidth(for: message, at: indexPath)
         let textInsets = messageLabelInsets(for: message)
         return maxWidth - textInsets.horizontal
     }
 
-    open override func messageContainerSize(for message: MessageType) -> CGSize {
-        let maxWidth = messageContainerMaxWidth(for: message)
+    open override func messageContainerSize(for message: MessageType, at indexPath: IndexPath) -> CGSize {
+        let maxWidth = messageContainerMaxWidth(for: message, at: indexPath)
 
         var messageContainerSize: CGSize
         let attributedText: NSAttributedString
