diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt index cabe963d9..6e3f5bcf1 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt @@ -5,6 +5,7 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost @@ -57,11 +58,15 @@ fun AppNavigation( ) { var actionableNextPage by remember { mutableStateOf(nextPage) } + val scope = rememberCoroutineScope() val nav = remember { { route: String -> - if (getRouteWithArguments(navController) != route) { - navController.navigate(route) + scope.launch { + if (getRouteWithArguments(navController) != route) { + navController.navigate(route) + } } + Unit } } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/LoadRedirectScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/LoadRedirectScreen.kt index 08558dbd0..7928a1f15 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/LoadRedirectScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/LoadRedirectScreen.kt @@ -33,14 +33,18 @@ fun LoadRedirectScreen(eventId: String?, navController: NavController) { if (eventId == null) return var noteBase by remember { mutableStateOf(null) } + val scope = rememberCoroutineScope() val nav = remember(navController) { { route: String -> - navController.navigate(route) { - popUpTo(Route.Event.route) { - inclusive = true + scope.launch { + navController.navigate(route) { + popUpTo(Route.Event.route) { + inclusive = true + } } } + Unit } } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt index c7d31ba6b..1bffcfed1 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt @@ -69,9 +69,12 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun val nav = remember(navController) { { route: String -> - if (getRouteWithArguments(navController) != route) { - navController.navigate(route) + scope.launch { + if (getRouteWithArguments(navController) != route) { + navController.navigate(route) + } } + Unit } }