feat: config screen peer action to exclude private ips

closes #402

Author: zaneschepke

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

@@ -115,7 +115,9 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel:
 		val onAutoTunnelClick = {
 			if (!uiState.generalState.isLocationDisclosureShown) {
 				navController.navigate(Route.LocationDisclosure)
-			} else navController.navigate(Route.AutoTunnel)
+			} else {
+				navController.navigate(Route.AutoTunnel)
+			}
 		}
 		SurfaceSelectionGroupButton(
 			listOf(

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/autotunnel/AutoTunnelScreen.kt

@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
@@ -21,7 +22,6 @@ import androidx.compose.material.icons.outlined.Security
 import androidx.compose.material.icons.outlined.Settings
 import androidx.compose.material.icons.outlined.SettingsEthernet
 import androidx.compose.material.icons.outlined.SignalCellular4Bar
-import androidx.compose.material.icons.outlined.VpnKeyOff
 import androidx.compose.material.icons.outlined.Wifi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -135,6 +135,7 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AutoTunnelViewModel = hiltV
 				.fillMaxSize()
 				.padding(padding)
 				.verticalScroll(rememberScrollState())
+				.imePadding()
 				.padding(top = 24.dp.scaledHeight())
 				.padding(horizontal = 24.dp.scaledWidth()),
 		) {
@@ -376,7 +377,7 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AutoTunnelViewModel = hiltV
 							ForwardButton { navController.navigate(Route.AutoTunnelAdvanced) }
 						},
 					),
-				)
+				),
 			)
 		}
 	}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/autotunnel/advanced/AdvancedScreen.kt

@@ -39,17 +39,16 @@ import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
 
 @Composable
 fun AdvancedScreen(appUiState: AppUiState, appViewModel: AppViewModel) {
-
 	var isDropDownExpanded by remember {
 		mutableStateOf(false)
 	}
 
 	var selected by remember { mutableIntStateOf(appUiState.settings.debounceDelaySeconds) }
 
 	LaunchedEffect(selected) {
-		if(selected == appUiState.settings.debounceDelaySeconds) return@LaunchedEffect
+		if (selected == appUiState.settings.debounceDelaySeconds) return@LaunchedEffect
 		appViewModel.saveSettings(appUiState.settings.copy(debounceDelaySeconds = selected))
-		if(appUiState.settings.isAutoTunnelEnabled) {
+		if (appUiState.settings.isAutoTunnelEnabled) {
 			appViewModel.bounceAutoTunnel()
 		}
 	}
@@ -86,32 +85,36 @@ fun AdvancedScreen(appUiState: AppUiState, appViewModel: AppViewModel) {
 						trailing = {
 							Row(
 								horizontalArrangement = Arrangement.spacedBy(5.dp, Alignment.CenterHorizontally),
-								verticalAlignment = Alignment.CenterVertically) {
+								verticalAlignment = Alignment.CenterVertically,
+							) {
 								Text(text = selected.toString(), style = MaterialTheme.typography.bodyMedium)
 								val icon = Icons.Default.ArrowDropDown
 								Icon(icon, icon.name)
 							}
 							DropdownMenu(
-								modifier = Modifier.height(140.dp.scaledHeight()),
+								modifier = Modifier.height(250.dp.scaledHeight()),
 								scrollState = rememberScrollState(),
 								containerColor = MaterialTheme.colorScheme.surface,
 								expanded = isDropDownExpanded,
 								onDismissRequest = {
 									isDropDownExpanded = false
-								}) {
+								},
+							) {
 								(0..10).forEachIndexed { index, num ->
-									DropdownMenuItem(text = {
-										Text(text = num.toString())
-									},
+									DropdownMenuItem(
+										text = {
+											Text(text = num.toString())
+										},
 										onClick = {
 											isDropDownExpanded = false
 											selected = num
-										})
+										},
+									)
 								}
 							}
 						},
-					)
-				)
+					),
+				),
 			)
 		}
 	}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/autotunnel/advanced/InterfaceActions.kt

@@ -0,0 +1,7 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.advanced
+
+enum class InterfaceActions {
+	TOGGLE_AMNEZIA_VALUES,
+	SET_AMNEZIA_COMPATIBILITY,
+	TOGGLE_SHOW_SCRIPTS,
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/autotunnel/advanced/PeerActions.kt

@@ -0,0 +1,5 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.advanced
+
+enum class PeerActions {
+	EXCLUDE_LAN,
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/TunnelOptionsScreen.kt

@@ -3,12 +3,12 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.CallSplit
-import androidx.compose.material.icons.outlined.Adjust
 import androidx.compose.material.icons.outlined.Bolt
 import androidx.compose.material.icons.outlined.Edit
 import androidx.compose.material.icons.outlined.Star
@@ -32,28 +32,17 @@ import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.common.label.GroupLabel
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.config.model.InterfaceProxy
-import com.zaneschepke.wireguardautotunnel.util.extensions.isWgCompatibilityMode
-import com.zaneschepke.wireguardautotunnel.util.extensions.resetAmneziaProperties
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-import com.zaneschepke.wireguardautotunnel.util.extensions.toAmneziaCompatibilityConfig
 
 @Composable
 fun OptionsScreen(appViewModel: AppViewModel, appUiState: AppUiState, tunnelId: Int) {
 	val navController = LocalNavController.current
 	val config = appUiState.tunnels.first { it.id == tunnelId }
 
-	// TODO optimize
-
-	val amConfig = config.toAmConfig()
-
-	val isAmneziaCompatibilityEnabled = amConfig.`interface`.isWgCompatibilityMode()
-
 	var currentText by remember { mutableStateOf("") }
 
 	LaunchedEffect(config.tunnelNetworks) {
@@ -71,6 +60,7 @@ fun OptionsScreen(appViewModel: AppViewModel, appUiState: AppUiState, tunnelId:
 			Modifier
 				.fillMaxSize()
 				.padding(it)
+				.imePadding()
 				.verticalScroll(rememberScrollState())
 				.padding(top = 24.dp.scaledHeight())
 				.padding(horizontal = 24.dp.scaledWidth()),
@@ -152,38 +142,6 @@ fun OptionsScreen(appViewModel: AppViewModel, appUiState: AppUiState, tunnelId:
 					),
 				),
 			)
-			val amneziaClick = {
-				val proxy = InterfaceProxy.from(amConfig.`interface`)
-				val `interface` = if (!isAmneziaCompatibilityEnabled) proxy.toAmneziaCompatibilityConfig() else proxy.resetAmneziaProperties()
-				appViewModel.updateExistingTunnelConfig(config, `interface` = `interface`)
-			}
-			GroupLabel(stringResource(R.string.quick_actions))
-			SurfaceSelectionGroupButton(
-				listOf(
-					SelectionItem(
-						Icons.Outlined.Adjust,
-						title = {
-							Text(
-								stringResource(R.string.enable_amnezia),
-								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
-							)
-						},
-						description = {
-							Text(
-								stringResource(R.string.wg_compat_mode),
-								style = MaterialTheme.typography.bodySmall.copy(MaterialTheme.colorScheme.outline),
-							)
-						},
-						trailing = {
-							ScaledSwitch(
-								isAmneziaCompatibilityEnabled,
-								onClick = { amneziaClick() },
-							)
-						},
-						onClick = { amneziaClick() },
-					),
-				),
-			)
 		}
 	}
 }