Skip to content

⚒️🎨 Migrate to ModalBottomSheet Composable #6008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 15 commits into from
Apr 5, 2026
Merged

⚒️🎨 Migrate to ModalBottomSheet Composable #6008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
61f08a7
style: Migrate conversation list actions to ModalBottomSheet Composable
AndyScherzinger Mar 27, 2026
652923f
style: Migrate scope dialog to ModalBottomSheet Composable
AndyScherzinger Mar 28, 2026
5a1f27f
style: Migrate user status dialog to ModalBottomSheet Composable
AndyScherzinger Mar 28, 2026
cd85e6d
style(scope): make scope list scrollable
AndyScherzinger Mar 28, 2026
b0fd620
ci(lint): Remove unused resources
AndyScherzinger Mar 28, 2026
4e8a2f9
ci(codacy): Split Composable and move previews to own file
AndyScherzinger Mar 29, 2026
271b380
fix(conv-list): refresh list when archiving/unarchiving a conversation
AndyScherzinger Apr 4, 2026
5227ede
fix: Move state to view model, ensure scrolling is possible
AndyScherzinger Apr 4, 2026
dc85a89
fix: Have a state for the account chooser dialog and for the status b…
AndyScherzinger Apr 5, 2026
0321dac
fix: Have a state for the item visibility bottom sheet
AndyScherzinger Apr 5, 2026
46c0a5f
feat: Move to coroutines
AndyScherzinger Apr 5, 2026
c44087c
fix(detekt): Have max 15 functions
AndyScherzinger Apr 5, 2026
3ec4024
feat: Migrate reactions to ModalBottomSheet
AndyScherzinger Apr 5, 2026
cef48e7
ci(lint): Lower score to 88
AndyScherzinger Apr 5, 2026
937eb95
chore: Move reaction bottom sheet to chat package
AndyScherzinger Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions app/src/main/java/com/nextcloud/talk/adapters/ReactionItemClickListener.kt
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions app/src/main/java/com/nextcloud/talk/adapters/ReactionsAdapter.kt
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions app/src/main/java/com/nextcloud/talk/adapters/ReactionsViewHolder.kt
View file
Open in desktop

This file was deleted.

56 changes: 56 additions & 0 deletions app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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
}
37 changes: 21 additions & 16 deletions app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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() }
)
}
}
}
}
}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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() &&
Expand Down
Loading
Loading