add handling to automatically set messages as read

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

Author: mahibi

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

@@ -640,7 +640,9 @@ class ChatActivity :
                 GetNewChatView(
                     chatItems = chatItems,
                     conversationThreadId = conversationThreadId,
-                    onLoadMore = { loadMoreMessagesCompose() }
+                    onLoadMore = { loadMoreMessagesCompose() },
+                    advanceLocalLastReadMessageIfNeeded = { advanceLocalLastReadMessageIfNeeded(it) },
+                    updateRemoteLastReadMessageIfNeeded = { updateRemoteLastReadMessageIfNeeded() }
                 )
             }
         }
@@ -670,7 +672,7 @@ class ChatActivity :
                 // With Jetpack Compose the flow will be used directly in the UI instead to clear and add everything.
                 adapter!!.clear()
                 adapter!!.addToEnd(chatMessages, false)
-                advanceLocalLastReadMessageIfNeeded()
+                advanceLocalLastReadMessageIfNeededChatKit()
             } else {
                 Log.e(TAG, "adapter was null")
             }
@@ -1576,7 +1578,7 @@ class ChatActivity :
                 super.onScrollStateChanged(recyclerView, newState)
 
                 if (newState == AbsListView.OnScrollListener.SCROLL_STATE_IDLE) {
-                    advanceLocalLastReadMessageIfNeeded()
+                    advanceLocalLastReadMessageIfNeededChatKit()
                     updateRemoteLastReadMessageIfNeeded()
                     if (isScrolledToBottom()) {
                         binding.unreadMessagesPopup.visibility = View.GONE
@@ -2892,18 +2894,23 @@ class ChatActivity :
         adapter = null
     }
 
-    private fun advanceLocalLastReadMessageIfNeeded() {
+    @Deprecated("old implementation for ChatKit")
+    private fun advanceLocalLastReadMessageIfNeededChatKit() {
         val position = layoutManager?.findFirstVisibleItemPosition()
         position?.let {
             // Casting could fail if it's not a chatMessage. It should not matter as the function is triggered often
             // enough. If it's a problem, either improve or wait for migration to Jetpack Compose.
             val message = adapter?.items?.getOrNull(it)?.item as? ChatMessage
             message?.jsonMessageId?.let { messageId ->
-                chatViewModel.advanceLocalLastReadMessageIfNeeded(messageId)
+                advanceLocalLastReadMessageIfNeeded(messageId)
             }
         }
     }
 
+    private fun advanceLocalLastReadMessageIfNeeded(messageId: Int) {
+        chatViewModel.advanceLocalLastReadMessageIfNeeded(messageId)
+    }
+
     private fun updateRemoteLastReadMessageIfNeeded() {
         val url = ApiUtils.getUrlForChatReadMarker(
             ApiUtils.getChatApiVersion(spreedCapabilities, intArrayOf(ApiUtils.API_V1)),

app/src/main/java/com/nextcloud/talk/ui/chat/ChatView.kt

@@ -28,7 +28,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.KeyboardArrowDown
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -41,6 +40,7 @@ import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
@@ -52,7 +52,6 @@ import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.nextcloud.talk.R
-import com.nextcloud.talk.chat.UnreadMessagesPopup
 import com.nextcloud.talk.chat.data.model.ChatMessage
 import com.nextcloud.talk.chat.viewmodels.ChatViewModel
 import com.nextcloud.talk.data.user.model.User
@@ -74,7 +73,9 @@ private val AUTHOR_TEXT_SIZE = 12.sp
 fun GetNewChatView(
     chatItems: List<ChatViewModel.ChatItem>,
     conversationThreadId: Long? = null,
-    onLoadMore: (() -> Unit?)?
+    onLoadMore: (() -> Unit?)?,
+    advanceLocalLastReadMessageIfNeeded: ((Int) -> Unit?)?,
+    updateRemoteLastReadMessageIfNeeded: (() -> Unit?)?
 ) {
     val listState = rememberLazyListState()
     val showUnreadPopup = remember { mutableStateOf(false) }
@@ -104,6 +105,8 @@ fun GetNewChatView(
     // Show floating scroll-to-newest button when not at newest
     val showScrollToNewest by remember { derivedStateOf { !isAtNewest } }
 
+    val latestChatItems by rememberUpdatedState(chatItems)
+
     // Track newest message and show unread popup
     LaunchedEffect(chatItems) {
         if (chatItems.isEmpty()) return@LaunchedEffect
@@ -165,8 +168,7 @@ fun GetNewChatView(
     val stickyDateHeaderText by remember(listState, chatItems) {
         derivedStateOf {
             chatItems.getOrNull(
-                listState.layoutInfo.visibleItemsInfo
-                    .lastOrNull()?.index ?: 0
+                listState.layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: 0
             )?.let { item ->
                 when (item) {
                     is ChatViewModel.ChatItem.MessageItem ->
@@ -185,6 +187,7 @@ fun GetNewChatView(
         // Only listen to scroll if user is away from newest messages. This ensures the stickyHeader is not shown on
         // every new received message when being at the bottom of the list (because this triggers a scroll).
         if (!isNearNewest) {
+            updateRemoteLastReadMessageIfNeeded?.invoke()
             snapshotFlow { listState.isScrollInProgress }
                 .collectLatest { scrolling ->
                     if (scrolling) {
@@ -199,6 +202,20 @@ fun GetNewChatView(
         }
     }
 
+    LaunchedEffect(isAtNewest) {
+        if (!isAtNewest) return@LaunchedEffect
+
+        latestChatItems
+            .getOrNull(listState.firstVisibleItemIndex)
+            ?.let { item ->
+                // It might not always be a chat message. Not calling advanceLocalLastReadMessageIfNeeded should not
+                // matter. This should be triggered often enough so it's okay when it's true the next times.
+                if (item is ChatViewModel.ChatItem.MessageItem) {
+                    advanceLocalLastReadMessageIfNeeded?.invoke(item.message.jsonMessageId)
+                }
+            }
+    }
+
     val stickyDateHeaderAlpha by animateFloatAsState(
         targetValue = if (stickyDateHeader && stickyDateHeaderText.isNotEmpty()) 1f else 0f,
         animationSpec = tween(durationMillis = if (stickyDateHeader) 500 else 1000),