File tree Expand file tree Collapse file tree
app/src/main/java/com/getcode Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -16,6 +16,7 @@ import androidx.compose.runtime.remember
1616import androidx.compose.runtime.setValue
1717import androidx.compose.ui.Modifier
1818import androidx.compose.ui.platform.LocalContext
19+ import cafe.adriel.voyager.core.stack.StackEvent
1920import cafe.adriel.voyager.navigator.CurrentScreen
2021import cafe.adriel.voyager.navigator.Navigator
2122import cafe.adriel.voyager.transitions.ScreenTransition
@@ -75,9 +76,16 @@ fun CodeApp() {
7576 modifier = Modifier
7677 .padding(innerPaddingModifier)
7778 ) {
78- when (navigator.lastItem) {
79- is LoginScreen , is MainRoot -> CrossfadeTransition (navigator = navigator)
80- else -> SlideTransition (navigator = navigator)
79+ when (navigator.lastEvent) {
80+ StackEvent .Push ,
81+ StackEvent .Pop -> {
82+ when (navigator.lastItem) {
83+ is LoginScreen , is MainRoot -> CrossfadeTransition (navigator = navigator)
84+ else -> SlideTransition (navigator = navigator)
85+ }
86+ }
87+ StackEvent .Idle ,
88+ StackEvent .Replace -> CurrentScreen ()
8189 }
8290 }
8391 }
You can’t perform that action at this time.
0 commit comments