Merge pull request #6008 from nextcloud/style/noid/convListModalBottomSheet

⚒️🎨 Migrate to ModalBottomSheet Composable

Author: AndyScherzinger

app/src/main/java/com/nextcloud/talk/adapters/ReactionItemClickListener.kt

@@ -22,6 +22,7 @@ import com.nextcloud.talk.models.json.participants.TalkBanOverall
 import com.nextcloud.talk.models.json.profile.ProfileOverall
 import com.nextcloud.talk.models.json.reactions.ReactionsOverall
 import com.nextcloud.talk.models.json.status.StatusOverall
+import com.nextcloud.talk.models.json.status.predefined.PredefinedStatusOverall
 import com.nextcloud.talk.models.json.testNotification.TestNotificationOverall
 import com.nextcloud.talk.models.json.threads.ThreadOverall
 import com.nextcloud.talk.models.json.threads.ThreadsOverall
@@ -333,6 +334,48 @@ interface NcApiCoroutines {
     @GET
     suspend fun status(@Header("Authorization") authorization: String, @Url url: String): StatusOverall
 
+    @FormUrlEncoded
+    @PUT
+    suspend fun setStatusType(
+        @Header("Authorization") authorization: String,
+        @Url url: String,
+        @Field("statusType") statusType: String
+    ): GenericOverall
+
+    @GET
+    suspend fun getPredefinedStatuses(
+        @Header("Authorization") authorization: String,
+        @Url url: String
+    ): PredefinedStatusOverall
+
+    @GET
+    suspend fun backupStatus(@Header("Authorization") authorization: String, @Url url: String): StatusOverall
+
+    @DELETE
+    suspend fun statusDeleteMessage(@Header("Authorization") authorization: String, @Url url: String): GenericOverall
+
+    @FormUrlEncoded
+    @PUT
+    suspend fun setPredefinedStatusMessage(
+        @Header("Authorization") authorization: String,
+        @Url url: String,
+        @Field("messageId") messageId: String,
+        @Field("clearAt") clearAt: Long?
+    ): GenericOverall
+
+    @FormUrlEncoded
+    @PUT
+    suspend fun setCustomStatusMessage(
+        @Header("Authorization") authorization: String,
+        @Url url: String,
+        @Field("statusIcon") statusIcon: String?,
+        @Field("message") message: String,
+        @Field("clearAt") clearAt: Long?
+    ): GenericOverall
+
+    @DELETE
+    suspend fun revertStatus(@Header("Authorization") authorization: String, @Url url: String): GenericOverall
+
     @FormUrlEncoded
     @POST
     suspend fun pinMessage(
@@ -404,4 +447,17 @@ interface NcApiCoroutines {
         @Url url: String,
         @Query("reaction") reaction: String?
     ): ReactionsOverall
+
+    // Url is: /api/{apiVersion}/chat/{token}/read
+    @FormUrlEncoded
+    @POST
+    suspend fun setChatReadMarker(
+        @Header("Authorization") authorization: String,
+        @Url url: String,
+        @Field("lastReadMessage") lastReadMessage: Int?
+    ): GenericOverall
+
+    // Url is: /api/{apiVersion}/chat/{token}/read
+    @DELETE
+    suspend fun markRoomAsUnread(@Header("Authorization") authorization: String, @Url url: String): GenericOverall
 }

app/src/main/java/com/nextcloud/talk/adapters/ReactionsAdapter.kt

@@ -68,6 +68,7 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.ComposeView
 import androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -159,7 +160,7 @@ import com.nextcloud.talk.ui.dialog.FileAttachmentPreviewFragment
 import com.nextcloud.talk.ui.dialog.GetPinnedOptionsDialog
 import com.nextcloud.talk.ui.dialog.MessageActionsDialog
 import com.nextcloud.talk.ui.dialog.SaveToStorageDialogFragment
-import com.nextcloud.talk.ui.dialog.ShowReactionsDialog
+import com.nextcloud.talk.chat.ui.ShowReactionsModalBottomSheet
 import com.nextcloud.talk.ui.dialog.TempMessageActionsDialog
 import com.nextcloud.talk.ui.theme.LocalMessageUtils
 import com.nextcloud.talk.ui.theme.LocalOpenGraphFetcher
@@ -630,6 +631,24 @@ class ChatActivity :
                         listState = listState
                     )
                 }
+
+                val reactionsSheetMessageId by chatViewModel.reactionsSheetMessageId.collectAsStateWithLifecycle()
+                val reactionsSheetMessage by produceState<ChatMessage?>(null, reactionsSheetMessageId) {
+                    value = reactionsSheetMessageId?.let { id -> chatViewModel.getMessageById(id).first() }
+                }
+                reactionsSheetMessage?.let { msg ->
+                    conversationUser?.let { user ->
+                        ShowReactionsModalBottomSheet(
+                            chatMessage = msg,
+                            user = user,
+                            roomToken = roomToken,
+                            hasReactPermission = participantPermissions.hasReactPermission(),
+                            ncApiCoroutines = ncApiCoroutines,
+                            onDeleteReaction = { emoji -> chatViewModel.deleteReaction(roomToken, msg, emoji) },
+                            onDismiss = { chatViewModel.dismissReactionsSheet() }
+                        )
+                    }
+                }
             }
         }
     }
@@ -724,10 +743,7 @@ class ChatActivity :
     }
 
     private fun openReactionsDialog(messageId: Int) {
-        lifecycleScope.launch {
-            val chatMessage = chatViewModel.getMessageById(messageId.toLong()).first()
-            onLongClickReactions(chatMessage)
-        }
+        chatViewModel.showReactionsSheet(messageId.toLong())
     }
 
     private fun getMessageInputFragment(): MessageInputFragment {
@@ -3237,17 +3253,6 @@ class ChatActivity :
         openThread(chatMessage.jsonMessageId.toLong())
     }
 
-    fun onLongClickReactions(chatMessage: ChatMessage) {
-        ShowReactionsDialog(
-            this,
-            roomToken,
-            chatMessage,
-            conversationUser,
-            participantPermissions.hasReactPermission(),
-            ncApiCoroutines
-        ).show()
-    }
-
     fun onMessageClick(message: ChatMessage) {
         val now = SystemClock.elapsedRealtime()
         if (now - lastMessageClickTime < ViewConfiguration.getDoubleTapTimeout() &&