From 80f5934060e45afb7dceb641adebca8e137b0284 Mon Sep 17 00:00:00 2001 From: white Date: Thu, 4 Dec 2025 16:25:56 +0300 Subject: [PATCH] remove unwanted popBackStack() in error dialog --- app/src/main/java/com/cherret/zaprett/MainActivity.kt | 2 +- app/src/main/java/com/cherret/zaprett/ui/screen/HomeScreen.kt | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/cherret/zaprett/MainActivity.kt b/app/src/main/java/com/cherret/zaprett/MainActivity.kt index 908fc2c..97ffa8d 100644 --- a/app/src/main/java/com/cherret/zaprett/MainActivity.kt +++ b/app/src/main/java/com/cherret/zaprett/MainActivity.kt @@ -209,7 +209,7 @@ class MainActivity : ComponentActivity() { startDestination = Screen.home.route, Modifier.padding(innerPadding) ) { - composable(Screen.home.route) { HomeScreen(viewModel = viewModel, navController,vpnPermissionLauncher) } + composable(Screen.home.route) { HomeScreen(viewModel = viewModel,vpnPermissionLauncher) } composable(Screen.hosts.route) { HostsScreen(navController) } composable(Screen.strategies.route) { StrategyScreen(navController) } composable(Screen.ipsets.route) { IpsetsScreen(navController) } diff --git a/app/src/main/java/com/cherret/zaprett/ui/screen/HomeScreen.kt b/app/src/main/java/com/cherret/zaprett/ui/screen/HomeScreen.kt index c4fd7e3..47c8ed7 100644 --- a/app/src/main/java/com/cherret/zaprett/ui/screen/HomeScreen.kt +++ b/app/src/main/java/com/cherret/zaprett/ui/screen/HomeScreen.kt @@ -81,7 +81,7 @@ import java.io.IOException @OptIn(ExperimentalMaterial3Api::class) @Composable -fun HomeScreen(viewModel: HomeViewModel = viewModel(), navController: NavController, vpnLauncher: ActivityResultLauncher) { +fun HomeScreen(viewModel: HomeViewModel = viewModel(), vpnLauncher: ActivityResultLauncher) { val context = LocalContext.current val sharedPreferences: SharedPreferences = remember { context.getSharedPreferences("settings", Context.MODE_PRIVATE) } val requestVpnPermission by viewModel.requestVpnPermission.collectAsState() @@ -119,7 +119,6 @@ fun HomeScreen(viewModel: HomeViewModel = viewModel(), navController: NavControl AlertDialog( onDismissRequest = { viewModel.clearError() - navController.popBackStack() }, title = { Text(stringResource(R.string.error_text)) }, text = { @@ -140,7 +139,6 @@ fun HomeScreen(viewModel: HomeViewModel = viewModel(), navController: NavControl confirmButton = { TextButton(onClick = { viewModel.clearError() - navController.popBackStack() }) { Text(stringResource(R.string.btn_continue)) }