feat: time and status grouping same minute fix #764 (#792)

* Add messageGroupingMode

* Add TimeAndStatusPosition.none

Author: nicolasbraun

packages/flutter_chat_core/lib/src/utils/typedefs.dart

@@ -16,11 +16,13 @@ typedef UserID = String;
 enum MessageStatus { delivered, error, seen, sending, sent }
 
 /// Defines the position of the timestamp and status indicator relative to the message content.
-enum TimeAndStatusPosition { start, end, inline }
+enum TimeAndStatusPosition { start, end, inline, none }
 
 /// Signature for a callback function that resolves a [User] object from a [UserID].
 typedef ResolveUserCallback = Future<User?> Function(UserID id);
 
+enum MessagesGroupingMode { timeDifference, sameMinute }
+
 /// Signature for a function that builds a single chat list item widget.
 /// Used by [ChatAnimatedList] and [ChatAnimatedListReversed].
 typedef ChatItem =
@@ -29,6 +31,7 @@ typedef ChatItem =
       Message message,
       int index,
       Animation<double> animation, {
+      MessagesGroupingMode? messagesGroupingMode,
       int? messageGroupingTimeoutInSeconds,
       bool? isRemoved,
     });

packages/flutter_chat_ui/lib/src/chat.dart

@@ -176,6 +176,7 @@ class _ChatState extends State<Chat> with WidgetsBindingObserver {
     Message message,
     int index,
     Animation<double> animation, {
+    MessagesGroupingMode? messagesGroupingMode,
     int? messageGroupingTimeoutInSeconds,
     bool? isRemoved,
   }) {
@@ -184,6 +185,7 @@ class _ChatState extends State<Chat> with WidgetsBindingObserver {
       message: message,
       index: index,
       animation: animation,
+      messagesGroupingMode: messagesGroupingMode,
       messageGroupingTimeoutInSeconds: messageGroupingTimeoutInSeconds,
       isRemoved: isRemoved,
     );

packages/flutter_chat_ui/lib/src/chat_animated_list/chat_animated_list.dart

@@ -103,6 +103,9 @@ class ChatAnimatedList extends StatefulWidget {
   /// A value of 0.2 means pagination will trigger when scrolled to 20% from the top.
   final double? paginationThreshold;
 
+  /// The mode to use for grouping messages.
+  final MessagesGroupingMode? messagesGroupingMode;
+
   /// Timeout in seconds for grouping consecutive messages from the same author.
   final int? messageGroupingTimeoutInSeconds;
 
@@ -154,6 +157,7 @@ class ChatAnimatedList extends StatefulWidget {
     // Modify this value at your own risk. If you increase it and experience
     // unstable pagination jumps, revert to a smaller value like 0.01.
     this.paginationThreshold = 0.01,
+    this.messagesGroupingMode,
     this.messageGroupingTimeoutInSeconds,
     this.physics,
   });

packages/flutter_chat_ui/lib/src/chat_animated_list/chat_animated_list_reversed.dart

@@ -62,6 +62,9 @@ class ChatAnimatedListReversed extends StatelessWidget {
   /// Defaults to 0.2. See note below.
   final double? paginationThreshold;
 
+  /// The mode to use for grouping messages.
+  final MessagesGroupingMode? messagesGroupingMode;
+
   /// Timeout in seconds for grouping consecutive messages from the same author.
   final int? messageGroupingTimeoutInSeconds;
 
@@ -94,6 +97,7 @@ class ChatAnimatedListReversed extends StatelessWidget {
     // because new items are added at the bottom (index 0). The default of 0.2
     // triggers pagination when 20% from the visual top is reached.
     this.paginationThreshold = 0.2,
+    this.messagesGroupingMode,
     this.messageGroupingTimeoutInSeconds,
     this.physics,
   });

packages/flutter_chat_ui/lib/src/chat_message/chat_message_internal.dart

@@ -23,7 +23,11 @@ class ChatMessageInternal extends StatefulWidget {
   /// Animation provided by the parent [SliverAnimatedList].
   final Animation<double> animation;
 
+  /// The mode to use for grouping messages.
+  final MessagesGroupingMode? messagesGroupingMode;
+
   /// Timeout in seconds for grouping messages from the same author.
+  /// when [messagesGroupingMode] is [MessagingGroupingMode.timeDifference].
   final int? messageGroupingTimeoutInSeconds;
 
   /// Flag indicating if this item is being animated out (removed).
@@ -35,6 +39,7 @@ class ChatMessageInternal extends StatefulWidget {
     required this.message,
     required this.index,
     required this.animation,
+    this.messagesGroupingMode = MessagesGroupingMode.timeDifference,
     this.messageGroupingTimeoutInSeconds,
     this.isRemoved,
   });
@@ -146,15 +151,19 @@ class _ChatMessageInternalState extends State<ChatMessageInternal> {
       final isGroupedWithNext =
           nextMessage != null &&
           nextMessage.authorId == currentMessage.authorId &&
-          nextMessageDate.difference(currentMessageDate).inSeconds <
-              timeoutInSeconds;
+          (widget.messagesGroupingMode == MessagesGroupingMode.timeDifference
+              ? nextMessageDate.difference(currentMessageDate).inSeconds <
+                  timeoutInSeconds
+              : nextMessageDate.minute == currentMessageDate.minute);
 
       // Check if message is part of a group with previous message
       final isGroupedWithPrevious =
           previousMessage != null &&
           previousMessage.authorId == currentMessage.authorId &&
-          currentMessageDate.difference(previousMessageDate).inSeconds <
-              timeoutInSeconds;
+          (widget.messagesGroupingMode == MessagesGroupingMode.timeDifference
+              ? currentMessageDate.difference(previousMessageDate).inSeconds <
+                  timeoutInSeconds
+              : currentMessageDate.minute == previousMessageDate.minute);
 
       // If not grouped with either message, return null
       if (!isGroupedWithNext && !isGroupedWithPrevious) {

packages/flutter_chat_ui/lib/src/simple_text_message.dart

@@ -218,6 +218,8 @@ class SimpleTextMessage extends StatelessWidget {
             ),
           ],
         );
+      case TimeAndStatusPosition.none:
+        return textContent;
     }
   }
 

packages/flyer_chat_file_message/lib/src/flyer_chat_file_message.dart

@@ -225,6 +225,8 @@ class FlyerChatFileMessage extends StatelessWidget {
             ),
           ],
         );
+      case TimeAndStatusPosition.none:
+        return fileContent;
     }
   }
 

packages/flyer_chat_text_message/lib/src/flyer_chat_text_message.dart

@@ -226,6 +226,8 @@ class FlyerChatTextMessage extends StatelessWidget {
             ),
           ],
         );
+      case TimeAndStatusPosition.none:
+        return textContent;
     }
   }
 

packages/flyer_chat_text_stream_message/lib/src/flyer_chat_text_stream_message.dart

@@ -429,6 +429,8 @@ class _FlyerChatTextStreamMessageState extends State<FlyerChatTextStreamMessage>
             ),
           ],
         );
+      case TimeAndStatusPosition.none:
+        return textContent;
     }
   }