feat: 5min time window for chat bubble grouping - WPB-20517

wire-ios/Wire-iOS Tests/ConversationMessageCell/ConversationMessageSectionControllerTests.swift

@@ -40,7 +40,7 @@ final class ConversationMessageSectionControllerTests: XCTestCase {
         userSession = UserSessionMock(mockUser: mockSelfUser)
         context = ConversationMessageContext(
             isSameSenderAsPrevious: false,
-            isTimestampInSameMinuteAsPreviousMessage: false,
+            isGroupedWithPreviousMessage: false,
             isFirstMessageOfTheDay: false,
             isFirstUnreadMessage: false,
             isLastMessage: false,
@@ -121,7 +121,7 @@ final class ConversationMessageSectionControllerTests: XCTestCase {
         let message = MockMessageFactory.textMessage(withText: "Welcome to Dub Dub")
         let context = ConversationMessageContext(
             isSameSenderAsPrevious: true,
-            isTimestampInSameMinuteAsPreviousMessage: true
+            isGroupedWithPreviousMessage: true
         )
 
         // WHEN
@@ -161,7 +161,7 @@ final class ConversationMessageSectionControllerTests: XCTestCase {
         let message = MockMessageFactory.textMessage(withText: "Hello")
         let context = ConversationMessageContext(
             isSameSenderAsPrevious: true,
-            isTimestampInSameMinuteAsPreviousMessage: false
+            isGroupedWithPreviousMessage: false
         )
         // WHEN
         let section = makeSUT(message: message, context: context)
@@ -181,7 +181,7 @@ final class ConversationMessageSectionControllerTests: XCTestCase {
         let message = MockMessageFactory.textMessage(withText: "Hello")
         let context = ConversationMessageContext(
             isSameSenderAsPrevious: true,
-            isTimestampInSameMinuteAsPreviousMessage: false
+            isGroupedWithPreviousMessage: false
         )
         // WHEN
         let section = makeSUT(message: message, context: context)

wire-ios/Wire-iOS Tests/ConversationMessageCell/ConversationMessageSnapshotTestCase.swift

@@ -24,7 +24,7 @@ import XCTest
 private extension ConversationMessageContext {
     static let defaultContext = ConversationMessageContext(
         isSameSenderAsPrevious: false,
-        isTimestampInSameMinuteAsPreviousMessage: false,
+        isGroupedWithPreviousMessage: false,
         isFirstMessageOfTheDay: false,
         isFirstUnreadMessage: false,
         isLastMessage: false,

wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/Cells/ConfigurationMessageCell/ConversationMessageSectionController.swift

@@ -22,7 +22,7 @@
 
 struct ConversationMessageContext: Equatable {
     var isSameSenderAsPrevious: Bool = false
-    var isTimestampInSameMinuteAsPreviousMessage: Bool = false
+    var isGroupedWithPreviousMessage: Bool = false
     var isFirstMessageOfTheDay: Bool = false
     var isFirstUnreadMessage: Bool = false
     var isLastMessage: Bool = false
@@ -562,8 +562,8 @@
             return true
         }
 
-        // This message is from the same sender but in a different minute.
-        if !context.isTimestampInSameMinuteAsPreviousMessage {
+        // This message is from the same sender but is not visually grouped with the previous message.
+        if !context.isGroupedWithPreviousMessage {
             return true
         }
 
@@ -625,7 +625,7 @@
             let observer = UserChangeInfo.add(observer: self, for: sender, in: userSession)!
             changeObservers.append(observer)
         }
 
         if let users = message.systemMessageData?.users {
             for user in users where user.remoteIdentifier != (message.senderUser as? ZMUser)?.remoteIdentifier {
                 if let observer = UserChangeInfo.add(observer: self, for: user, in: userSession) {

wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationTableViewDataSource.swift

@@ -766,20 +766,24 @@ extension ConversationTableViewDataSource {
         messages: [ZMMessage]
     ) -> ConversationMessageContext {
 
-        let isTimestampInSameMinuteAsPreviousMessage: Bool
+        let isGroupedWithPreviousMessage: Bool
 
         let previousMessage = messageBeforeMessage(at: index, messages: messages)
 
         if let currentMessage = message.serverTimestamp, let prevMessage = previousMessage?.serverTimestamp {
-            isTimestampInSameMinuteAsPreviousMessage = currentMessage.isInSameMinute(asDate: prevMessage)
+            if isChatBubbleSimpleEnabled {
+                isGroupedWithPreviousMessage = currentMessage.isWithin(minutes: 5, fromDate: prevMessage)
+            } else {
+                isGroupedWithPreviousMessage = currentMessage.isInSameMinute(asDate: prevMessage)
+            }
         } else {
-            isTimestampInSameMinuteAsPreviousMessage = false
+            isGroupedWithPreviousMessage = false
         }
 
         let isLastMessage = (index == 0) && !hasNewerMessagesToLoad
         return ConversationMessageContext(
             isSameSenderAsPrevious: isPreviousSenderSame(forMessage: message, at: index, messages: messages),
-            isTimestampInSameMinuteAsPreviousMessage: isTimestampInSameMinuteAsPreviousMessage,
+            isGroupedWithPreviousMessage: isGroupedWithPreviousMessage,
             isFirstMessageOfTheDay: isFirstMessageOfTheDay(for: message, at: index, messages: messages),
             isFirstUnreadMessage: message.nonce == firstUnreadMessageNonce,
             isLastMessage: isLastMessage,
@@ -986,6 +990,10 @@ extension Date {
         return components == otherComponents
     }
 
+    func isWithin(minutes: Double, fromDate date: Date) -> Bool {
+        date.addingTimeInterval(minutes * 60) > self
+    }
+
 }
 
 extension ZMConversationMessage {