Batyka/zaprett-app
1
0
Fork 0
mirror of https://github.com/CherretGit/zaprett-app.git synced 2025-12-10 05:29:37 +05:00
Code Issues Packages Projects Releases 1 Wiki Activity

remove unwanted popBackStack() in error dialog

Browse Source
This commit is contained in:
white
2025-12-04 16:25:56 +03:00
parent 0065b8a92b
commit 80f5934060
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/cherret/zaprett/MainActivity.kt
View File

@@ -209,7 +209,7 @@ class MainActivity : ComponentActivity() {
startDestination = Screen.home.route, startDestination = Screen.home.route,
Modifier.padding(innerPadding) 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.hosts.route) { HostsScreen(navController) }
composable(Screen.strategies.route) { StrategyScreen(navController) } composable(Screen.strategies.route) { StrategyScreen(navController) }
composable(Screen.ipsets.route) { IpsetsScreen(navController) } composable(Screen.ipsets.route) { IpsetsScreen(navController) }

4
app/src/main/java/com/cherret/zaprett/ui/screen/HomeScreen.kt
View File

@@ -81,7 +81,7 @@ import java.io.IOException
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
fun HomeScreen(viewModel: HomeViewModel = viewModel(), navController: NavController, vpnLauncher: ActivityResultLauncher<Intent>) { fun HomeScreen(viewModel: HomeViewModel = viewModel(), vpnLauncher: ActivityResultLauncher<Intent>) {
val context = LocalContext.current val context = LocalContext.current
val sharedPreferences: SharedPreferences = remember { context.getSharedPreferences("settings", Context.MODE_PRIVATE) } val sharedPreferences: SharedPreferences = remember { context.getSharedPreferences("settings", Context.MODE_PRIVATE) }
val requestVpnPermission by viewModel.requestVpnPermission.collectAsState() val requestVpnPermission by viewModel.requestVpnPermission.collectAsState()
@@ -119,7 +119,6 @@ fun HomeScreen(viewModel: HomeViewModel = viewModel(), navController: NavControl
AlertDialog( AlertDialog(
onDismissRequest = { onDismissRequest = {
viewModel.clearError() viewModel.clearError()
navController.popBackStack()
}, },
title = { Text(stringResource(R.string.error_text)) }, title = { Text(stringResource(R.string.error_text)) },
text = { text = {
@@ -140,7 +139,6 @@ fun HomeScreen(viewModel: HomeViewModel = viewModel(), navController: NavControl
confirmButton = { confirmButton = {
TextButton(onClick = { TextButton(onClick = {
viewModel.clearError() viewModel.clearError()
navController.popBackStack()
}) { }) {
Text(stringResource(R.string.btn_continue)) Text(stringResource(R.string.btn_continue))
} }