zaneschepke
/
wgtunnel
mirror of https://github.com/zaneschepke/wgtunnel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: location disclosure screen navigation bug

This commit is contained in:
Zane Schepke 2024-12-31 19:13:15 -05:00
parent 02a8db0f9a
commit 4196a543b2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/SettingsScreen.kt
View File

@ -112,6 +112,11 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel:
}, },
), ),
) { ) {
val onAutoTunnelClick = {
if (!uiState.generalState.isLocationDisclosureShown) {
navController.navigate(Route.LocationDisclosure)
} else navController.navigate(Route.AutoTunnel)
}
SurfaceSelectionGroupButton( SurfaceSelectionGroupButton(
listOf( listOf(
SelectionItem( SelectionItem(
@ -124,11 +129,10 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel:
) )
}, },
onClick = { onClick = {
if (!uiState.generalState.isLocationDisclosureShown) return@SelectionItem navController.navigate(Route.LocationDisclosure) onAutoTunnelClick()
navController.navigate(Route.AutoTunnel)
}, },
trailing = { trailing = {
ForwardButton(Modifier.focusable()) { navController.navigate(Route.AutoTunnel) } ForwardButton(Modifier.focusable()) { onAutoTunnelClick() }
}, },
), ),
), ),