RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: stop polluting backstack with unlive channels

This commit is contained in:
Infi 2023-03-05 04:11:20 +01:00
parent 61bfda37f2
commit 8c6fa7ac1c
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/chat/revolt/components/screens/chat/drawer/channel/ChannelList.kt
View File

@ -67,7 +67,11 @@ fun RowScope.ChannelList(
) )
} ?: false, } ?: false,
onClick = { onClick = {
navController.navigate("channel/${channel.id}") navController.navigate("channel/${channel.id}") {
navController.graph.startDestinationRoute?.let { route ->
popUpTo(route)
}
}
coroutineScope.launch { drawerState.focusCenter() } coroutineScope.launch { drawerState.focusCenter() }
}, },
onLongClick = { onLongClick = {
@ -109,8 +113,8 @@ fun RowScope.ChannelList(
onClick = { onClick = {
coroutineScope.launch { drawerState.focusCenter() } coroutineScope.launch { drawerState.focusCenter() }
navController.navigate("channel/${ch.id}") { navController.navigate("channel/${ch.id}") {
popUpTo("home") { navController.graph.startDestinationRoute?.let { route ->
inclusive = true popUpTo(route)
} }
} }
}, },

8
app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
View File

@ -64,8 +64,8 @@ class ChatRouterViewModel : ViewModel() {
if (serverId == "home") { if (serverId == "home") {
navController.navigate("home") { navController.navigate("home") {
popUpTo("home") { navController.graph.startDestinationRoute?.let { route ->
inclusive = true popUpTo(route)
} }
} }
return return
@ -73,8 +73,8 @@ class ChatRouterViewModel : ViewModel() {
val channelId = RevoltAPI.serverCache[serverId]?.channels?.firstOrNull() val channelId = RevoltAPI.serverCache[serverId]?.channels?.firstOrNull()
navController.navigate("channel/$channelId") { navController.navigate("channel/$channelId") {
popUpTo("home") { navController.graph.startDestinationRoute?.let { route ->
inclusive = true popUpTo(route)
} }
} }
} }