aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCloudburst <us@conep.one>2023-01-23 12:49:44 +0000
committerCloudburst <us@conep.one>2023-01-23 12:49:44 +0000
commit64f88108be3d9fdd78b1c57534060b382a8d3538 (patch)
tree31a60ea5f35ec1997aef630a38746e75e3693820
parentea068d31bdc3a421b99bd887c4c2957c42d13b51 (diff)
downloadpluralwear-64f88108be3d9fdd78b1c57534060b382a8d3538.tar.gz
pluralwear-64f88108be3d9fdd78b1c57534060b382a8d3538.tar.bz2
pluralwear-64f88108be3d9fdd78b1c57534060b382a8d3538.zip
Fix navigation stacking
-rw-r--r--wear/src/main/java/dev/equestria/pluralwear/presentation/activity/register_switch/SwitchActivity.kt5
1 files changed, 3 insertions, 2 deletions
diff --git a/wear/src/main/java/dev/equestria/pluralwear/presentation/activity/register_switch/SwitchActivity.kt b/wear/src/main/java/dev/equestria/pluralwear/presentation/activity/register_switch/SwitchActivity.kt
index d1852f0..12bfa75 100644
--- a/wear/src/main/java/dev/equestria/pluralwear/presentation/activity/register_switch/SwitchActivity.kt
+++ b/wear/src/main/java/dev/equestria/pluralwear/presentation/activity/register_switch/SwitchActivity.kt
@@ -25,6 +25,7 @@ import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.navigation.NavHostController
+import androidx.navigation.NavOptions
import androidx.wear.compose.material.Button
import androidx.wear.compose.material.ButtonDefaults
import androidx.wear.compose.material.Icon
@@ -156,7 +157,7 @@ fun SwitchPage(system: PkFullSystem?, navController: NavHostController?) {
showDialog = showSuccessDialog,
onDismissRequest = {
showSuccessDialog = false
- navController?.navigate("home")
+ navController?.popBackStack("home", inclusive = true)
},
scrollState = successDialogScrollState
) {
@@ -180,7 +181,7 @@ fun SwitchPage(system: PkFullSystem?, navController: NavHostController?) {
Button(
onClick = {
showSuccessDialog = false
- navController?.navigate("home")
+ navController?.popBackStack("switch", inclusive = true)
},
colors = ButtonDefaults.primaryButtonColors()
) {