Fix back navigation when opening group settings from the chat list.
This commit is contained in:
parent
ba76a8323e
commit
5f67c9363e
@ -561,6 +561,7 @@ class MainActivity :
|
||||
|
||||
val scope = rememberCoroutineScope()
|
||||
BackHandler(paneExpansionState.currentAnchor == detailOnlyAnchor) {
|
||||
mainNavigationViewModel.goTo(MainNavigationDetailLocation.Empty)
|
||||
scope.launch {
|
||||
paneExpansionState.animateTo(listOnlyAnchor)
|
||||
}
|
||||
|
||||
@ -20,7 +20,7 @@ object ConversationSettingsNavigator {
|
||||
recipient: Recipient
|
||||
) {
|
||||
if (activity is MainNavigationChatDetailRouter) {
|
||||
activity.goToChatDetail(MainNavigationDetailLocation.Chats.ConversationSettings(recipient.id))
|
||||
activity.goToChatDetail(MainNavigationDetailLocation.Chats.ConversationSettings(recipient.id, isContentRoot = true))
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -90,7 +90,10 @@ sealed interface MainNavigationDetailLocation : Parcelable {
|
||||
}
|
||||
|
||||
@Serializable
|
||||
data class ConversationSettings(val recipientId: RecipientId) : Chats {
|
||||
data class ConversationSettings(
|
||||
val recipientId: RecipientId,
|
||||
override val isContentRoot: Boolean = false
|
||||
) : Chats {
|
||||
@Transient
|
||||
@IgnoredOnParcel
|
||||
override val controllerKey: RecipientId = recipientId
|
||||
|
||||
Loading…
Reference in New Issue
Block a user