chore(fc): attempt to group separators together between items

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationViewModel.kt

@@ -760,13 +760,7 @@ class ConversationViewModel @Inject constructor(
             var unreadSeparatorInserted = false
 
             data.insertSeparators { before: ChatItem.Message?, after: ChatItem.Message? ->
-                val beforeDate = before?.relativeDate
-                val afterDate = after?.relativeDate
-
-                // if the date changes between two items, add a date separator
-                if (beforeDate != afterDate) {
-                    return@insertSeparators beforeDate?.let { ChatItem.Date(before.date) }
-                }
+                val separators = mutableListOf<ChatItem.Separator>()
 
                 if (
                     stateFlow.value.startAtUnread &&
@@ -776,11 +770,22 @@ class ConversationViewModel @Inject constructor(
                 ) {
                     unreadSeparatorInserted = true
                     val unreadCount = stateFlow.value.unreadCount ?: return@insertSeparators null
-                    return@insertSeparators ChatItem.UnreadSeparator(unreadCount)
+                    separators.add(ChatItem.UnreadSeparator(unreadCount))
+                }
+
+                val beforeDate = before?.relativeDate
+                val afterDate = after?.relativeDate
+
+                // if the date changes between two items, add a date separator
+                if (beforeDate != afterDate) {
+                    beforeDate?.let { separators.add(ChatItem.Date(before.date)) }
                 }
 
-                // No separator in other cases
-                null
+                if (separators.isNotEmpty()) {
+                    ChatItem.Separators(separators)
+                } else {
+                    null
+                }
             }
         }.cachedIn(viewModelScope)
 

ui/components/src/main/kotlin/com/getcode/ui/components/chat/MessageList.kt

@@ -19,6 +19,7 @@ import androidx.compose.runtime.snapshots.Snapshot
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.util.fastForEach
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.itemContentType
@@ -92,9 +93,10 @@ fun MessageList(
             key = messages.itemKey { item -> item.key },
             contentType = messages.itemContentType { item ->
                 when (item) {
-                    is ChatItem.Date -> "separators"
+                    is ChatItem.Date -> "date"
                     is ChatItem.Message -> "messages"
                     is ChatItem.UnreadSeparator -> "unread_divider"
+                    is ChatItem.Separators -> "separators"
                 }
             }
         ) { index ->
@@ -179,6 +181,31 @@ fun MessageList(
                     }
                 }
 
+                is ChatItem.Separators -> {
+                    item.separators.fastForEach { separator ->
+                        when (separator) {
+                            is ChatItem.Date -> {
+                                DateBubble(
+                                    modifier = Modifier
+                                        .padding(vertical = CodeTheme.dimens.grid.x2),
+                                    date = separator.dateString
+                                )
+                            }
+
+                            is ChatItem.UnreadSeparator -> {
+                                if (separator.count > 0) {
+                                    UnreadSeparator(
+                                        modifier = Modifier
+                                            .fillParentMaxWidth()
+                                            .padding(vertical = CodeTheme.dimens.grid.x2),
+                                        count = separator.count
+                                    )
+                                }
+                            }
+                        }
+                    }
+                }
+
                 else -> Unit
             }
         }
@@ -277,7 +304,7 @@ private fun HandleStartAtUnread(
             .collect { loadState ->
                 if (loadState.refresh is LoadState.NotLoading && messages.itemCount > 0) {
                     val separatorIndex = messages.itemSnapshotList
-                        .indexOfFirst { it is ChatItem.UnreadSeparator }
+                        .indexOfFirst { it is ChatItem.UnreadSeparator || (it is ChatItem.Separators && it.separators.any { it is ChatItem.UnreadSeparator }) }
 
                     if (separatorIndex > 0 && !hasSetAtUnread) {
                         val previousItemIndex = separatorIndex - 1

ui/components/src/main/kotlin/com/getcode/ui/components/chat/utils/ChatItem.kt

@@ -45,13 +45,18 @@ sealed class ChatItem(open val key: Any) {
         val relativeDate: String = date.formatDateRelatively()
     }
 
+    sealed interface Separator
+
     @Stable
-    data class UnreadSeparator(val count: Int) : ChatItem("unread")
+    data class UnreadSeparator(val count: Int) : ChatItem("unread"), Separator
 
     @Stable
-    data class Date(val date: Instant) : ChatItem(date) {
+    data class Date(val date: Instant) : ChatItem(date), Separator {
         val dateString: String = date.formatDateRelatively()
 
         override val key: Any = date.toEpochMilliseconds()
     }
+
+    @Stable
+    data class Separators(val separators: List<Separator>): ChatItem(separators.hashCode())
 }