remove

.github/workflows/build.yml

@@ -76,7 +76,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up JDK 17
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'

.github/workflows/pr.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'

.github/workflows/publish.yml

@@ -191,7 +191,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'

app/build.gradle.kts

@@ -197,6 +197,7 @@ dependencies {
 
     implementation(libs.zxing.android.embedded)
 
+    implementation(libs.material.icons.core)
     implementation(libs.material.icons.extended)
 
     implementation(libs.androidx.biometric.ktx)

app/schemas/com.zaneschepke.wireguardautotunnel.data.AppDatabase/20.json

@@ -0,0 +1,359 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 20,
+    "identityHash": "51f828868c0ea2f0f5c987410ff5c5a1",
+    "entities": [
+      {
+        "tableName": "Settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL, `trusted_network_ssids` TEXT NOT NULL, `is_always_on_vpn_enabled` INTEGER NOT NULL, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT false, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT false, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT false, `is_stop_on_no_internet_enabled` INTEGER NOT NULL DEFAULT false, `is_lan_on_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `debounce_delay_seconds` INTEGER NOT NULL DEFAULT 3, `is_disable_kill_switch_on_trusted_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_unsecure_enabled` INTEGER NOT NULL DEFAULT false, `wifi_detection_method` INTEGER NOT NULL DEFAULT 0, `is_ping_monitoring_enabled` INTEGER NOT NULL DEFAULT true, `tunnel_ping_interval_sec` INTEGER NOT NULL DEFAULT 30, `tunnel_ping_attempts` INTEGER NOT NULL DEFAULT 3, `tunnel_ping_timeout_sec` INTEGER, `app_mode` INTEGER NOT NULL DEFAULT 0, `dns_protocol` INTEGER NOT NULL DEFAULT 0, `dns_endpoint` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAutoTunnelEnabled",
+            "columnName": "is_tunnel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isTunnelOnMobileDataEnabled",
+            "columnName": "is_tunnel_on_mobile_data_enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "trustedNetworkSSIDs",
+            "columnName": "trusted_network_ssids",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAlwaysOnVpnEnabled",
+            "columnName": "is_always_on_vpn_enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isTunnelOnEthernetEnabled",
+            "columnName": "is_tunnel_on_ethernet_enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShortcutsEnabled",
+            "columnName": "is_shortcuts_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isTunnelOnWifiEnabled",
+            "columnName": "is_tunnel_on_wifi_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isRestoreOnBootEnabled",
+            "columnName": "is_restore_on_boot_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isMultiTunnelEnabled",
+            "columnName": "is_multi_tunnel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isPingEnabled",
+            "columnName": "is_ping_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isWildcardsEnabled",
+            "columnName": "is_wildcards_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isStopOnNoInternetEnabled",
+            "columnName": "is_stop_on_no_internet_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isLanOnKillSwitchEnabled",
+            "columnName": "is_lan_on_kill_switch_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "debounceDelaySeconds",
+            "columnName": "debounce_delay_seconds",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "3"
+          },
+          {
+            "fieldPath": "isDisableKillSwitchOnTrustedEnabled",
+            "columnName": "is_disable_kill_switch_on_trusted_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isTunnelOnUnsecureEnabled",
+            "columnName": "is_tunnel_on_unsecure_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "wifiDetectionMethod",
+            "columnName": "wifi_detection_method",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isPingMonitoringEnabled",
+            "columnName": "is_ping_monitoring_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          },
+          {
+            "fieldPath": "tunnelPingIntervalSeconds",
+            "columnName": "tunnel_ping_interval_sec",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "30"
+          },
+          {
+            "fieldPath": "tunnelPingAttempts",
+            "columnName": "tunnel_ping_attempts",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "3"
+          },
+          {
+            "fieldPath": "tunnelPingTimeoutSeconds",
+            "columnName": "tunnel_ping_timeout_sec",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "appMode",
+            "columnName": "app_mode",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dnsProtocol",
+            "columnName": "dns_protocol",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dnsEndpoint",
+            "columnName": "dns_endpoint",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "TunnelConfig",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false, `am_quick` TEXT NOT NULL DEFAULT '', `is_Active` INTEGER NOT NULL DEFAULT false, `restart_on_ping_failure` INTEGER NOT NULL DEFAULT false, `ping_target` TEXT DEFAULT null, `is_ethernet_tunnel` INTEGER NOT NULL DEFAULT false, `is_ipv4_preferred` INTEGER NOT NULL DEFAULT true, `position` INTEGER NOT NULL DEFAULT 0, `auto_tunnel_apps` TEXT NOT NULL DEFAULT '[]')",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wgQuick",
+            "columnName": "wg_quick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tunnelNetworks",
+            "columnName": "tunnel_networks",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isMobileDataTunnel",
+            "columnName": "is_mobile_data_tunnel",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isPrimaryTunnel",
+            "columnName": "is_primary_tunnel",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "amQuick",
+            "columnName": "am_quick",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isActive",
+            "columnName": "is_Active",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "restartOnPingFailure",
+            "columnName": "restart_on_ping_failure",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "pingTarget",
+            "columnName": "ping_target",
+            "affinity": "TEXT",
+            "defaultValue": "null"
+          },
+          {
+            "fieldPath": "isEthernetTunnel",
+            "columnName": "is_ethernet_tunnel",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isIpv4Preferred",
+            "columnName": "is_ipv4_preferred",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "autoTunnelApps",
+            "columnName": "auto_tunnel_apps",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'[]'"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TunnelConfig_name",
+            "unique": true,
+            "columnNames": [
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
+          }
+        ]
+      },
+      {
+        "tableName": "proxy_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `socks5_proxy_enabled` INTEGER NOT NULL DEFAULT false, `socks5_proxy_bind_address` TEXT, `http_proxy_enable` INTEGER NOT NULL DEFAULT false, `http_proxy_bind_address` TEXT, `proxy_username` TEXT, `proxy_password` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "socks5ProxyEnabled",
+            "columnName": "socks5_proxy_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "socks5ProxyBindAddress",
+            "columnName": "socks5_proxy_bind_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "httpProxyEnabled",
+            "columnName": "http_proxy_enable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "httpProxyBindAddress",
+            "columnName": "http_proxy_bind_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "proxyUsername",
+            "columnName": "proxy_username",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "proxyPassword",
+            "columnName": "proxy_password",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '51f828868c0ea2f0f5c987410ff5c5a1')"
+    ]
+  }
+}

app/src/androidTest/java/com/zaneschepke/wireguardautotunnel/MigrationTest.kt

@@ -4,7 +4,6 @@ import androidx.room.testing.MigrationTestHelper
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
-import com.zaneschepke.wireguardautotunnel.data.Queries
 import java.io.IOException
 import org.junit.Rule
 import org.junit.Test
@@ -24,8 +23,6 @@ class MigrationTest {
         helper.createDatabase(dbName, 6).apply {
             // Database has schema version 1. Insert some data using SQL queries.
             // You can't use DAO classes because they expect the latest schema.
-            execSQL(Queries.createDefaultSettings())
-            execSQL(Queries.createTunnelConfig())
             // Prepare for the next version.
             close()
         }

app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt

@@ -3,6 +3,7 @@ package com.zaneschepke.wireguardautotunnel
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Color
+import android.net.VpnService
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
@@ -24,7 +25,9 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
 import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -37,10 +40,12 @@ import androidx.navigation.toRoute
 import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.banner.AppAlertBanner
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.VpnDeniedDialog
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.CustomSnackBar
 import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
@@ -60,15 +65,18 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.SplitTunn
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.TunnelOptionsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.pin.PinLockScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.advanced.SettingsAdvancedScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.AppearanceScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.display.DisplayScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language.LanguageScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.KillSwitchScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.dns.DnsSettingsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.logs.LogsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.monitoring.TunnelMonitoringScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.proxy.ProxySettingsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.system.SystemFeaturesScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.license.LicenseScreen
+import com.zaneschepke.wireguardautotunnel.ui.theme.AlertRed
+import com.zaneschepke.wireguardautotunnel.ui.theme.OffWhite
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import com.zaneschepke.wireguardautotunnel.util.extensions.restartApp
@@ -77,11 +85,11 @@ import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 import dagger.hilt.android.AndroidEntryPoint
 import de.raphaelebner.roomdatabasebackup.core.RoomBackup
+import java.util.Locale
 import javax.inject.Inject
 import kotlin.system.exitProcess
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
-import org.amnezia.awg.backend.GoBackend.VpnService
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
@@ -222,120 +230,143 @@ class MainActivity : AppCompatActivity() {
                             },
                         )
 
-                        Scaffold(
+                        Box(modifier = Modifier.fillMaxSize()) {
-                            modifier =
+                            // Top banner if in locked down mode
-                                Modifier.pointerInput(Unit) {
+                            if (appUiState.appSettings.appMode == AppMode.LOCK_DOWN) {
-                                    detectTapGestures {
+                                AppAlertBanner(
-                                        viewModel.handleEvent(AppEvent.ClearSelectedTunnels)
+                                    stringResource(R.string.locked_down)
+                                        .uppercase(Locale.getDefault()),
+                                    OffWhite,
+                                    AlertRed,
+                                    modifier =
+                                        Modifier.fillMaxWidth().zIndex(2f), // Draw above everything
+                                )
+                            }
+
+                            Scaffold(
+                                modifier =
+                                    Modifier.pointerInput(Unit) {
+                                        detectTapGestures {
+                                            viewModel.handleEvent(AppEvent.ClearSelectedTunnels)
+                                        }
+                                    },
+                                snackbarHost = {
+                                    SnackbarHost(snackbar) { snackbarData: SnackbarData ->
+                                        CustomSnackBar(
+                                            snackbarData.visuals.message,
+                                            isRtl = false,
+                                            containerColor =
+                                                MaterialTheme.colorScheme.surfaceColorAtElevation(
+                                                    2.dp
+                                                ),
+                                        )
                                     }
                                 },
-                            snackbarHost = {
+                                topBar = { DynamicTopAppBar(navBarState) },
-                                SnackbarHost(snackbar) { snackbarData: SnackbarData ->
+                                bottomBar = {
-                                    CustomSnackBar(
+                                    AnimatedVisibility(
-                                        snackbarData.visuals.message,
+                                        visible = navBarState.showBottom,
-                                        isRtl = false,
+                                        enter = slideInVertically(initialOffsetY = { it }),
-                                        containerColor =
+                                        exit = slideOutVertically(targetOffsetY = { it }),
-                                            MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
+                                    ) {
-                                    )
+                                        BottomNavbar(appUiState = appUiState)
-                                }
+                                    }
-                            },
+                                },
-                            topBar = { DynamicTopAppBar(navBarState) },
+                            ) { padding ->
-                            bottomBar = {
+                                Box(
-                                AnimatedVisibility(
+                                    modifier =
-                                    visible = navBarState.showBottom,
+                                        Modifier.fillMaxSize()
-                                    enter = slideInVertically(initialOffsetY = { it }),
+                                            .background(MaterialTheme.colorScheme.surface)
-                                    exit = slideOutVertically(targetOffsetY = { it }),
+                                            .padding(padding)
+                                            .consumeWindowInsets(padding)
+                                            .imePadding()
                                 ) {
-                                    BottomNavbar(appUiState = appUiState)
+                                    NavHost(
-                                }
+                                        navController,
-                            },
+                                        startDestination =
-                        ) { padding ->
+                                            (if (appUiState.appState.isPinLockEnabled) Route.Lock
-                            Box(
+                                            else Route.Main),
-                                modifier =
+                                    ) {
-                                    Modifier.fillMaxSize()
+                                        composable<Route.Main> {
-                                        .background(MaterialTheme.colorScheme.surface)
+                                            MainScreen(appUiState, appViewState, viewModel)
-                                        .padding(padding)
+                                        }
-                                        .consumeWindowInsets(padding)
+                                        composable<Route.Settings> {
-                                        .imePadding()
+                                            SettingsScreen(appUiState, appViewState, viewModel)
-                            ) {
+                                        }
-                                NavHost(
+                                        composable<Route.LocationDisclosure> {
-                                    navController,
+                                            LocationDisclosureScreen(viewModel)
-                                    startDestination =
+                                        }
-                                        (if (appUiState.appState.isPinLockEnabled) Route.Lock
+                                        composable<Route.AutoTunnel> {
-                                        else Route.Main),
+                                            AutoTunnelScreen(appUiState, viewModel)
-                                ) {
+                                        }
-                                    composable<Route.Main> {
+                                        composable<Route.Appearance> { AppearanceScreen() }
-                                        MainScreen(appUiState, appViewState, viewModel)
+                                        composable<Route.Language> {
-                                    }
+                                            LanguageScreen(appUiState, viewModel)
-                                    composable<Route.Settings> {
+                                        }
-                                        SettingsScreen(appUiState, appViewState, viewModel)
+                                        composable<Route.Display> {
-                                    }
+                                            DisplayScreen(appUiState, viewModel)
-                                    composable<Route.SettingsAdvanced> {
+                                        }
-                                        SettingsAdvancedScreen(appUiState, viewModel)
+                                        composable<Route.Support> {
-                                    }
+                                            SupportScreen(appViewModel = viewModel)
-                                    composable<Route.LocationDisclosure> {
+                                        }
-                                        LocationDisclosureScreen(viewModel)
+                                        composable<Route.License> { LicenseScreen() }
-                                    }
+                                        composable<Route.AutoTunnelAdvanced> {
-                                    composable<Route.AutoTunnel> {
+                                            AutoTunnelAdvancedScreen(appUiState, viewModel)
-                                        AutoTunnelScreen(appUiState, viewModel)
+                                        }
-                                    }
+                                        composable<Route.WifiDetectionMethod> {
-                                    composable<Route.Appearance> { AppearanceScreen() }
+                                            WifiDetectionMethodScreen(appUiState, viewModel)
-                                    composable<Route.Language> {
+                                        }
-                                        LanguageScreen(appUiState, viewModel)
+                                        composable<Route.Logs> {
-                                    }
+                                            LogsScreen(appViewState, viewModel)
-                                    composable<Route.Display> {
+                                        }
-                                        DisplayScreen(appUiState, viewModel)
+                                        composable<Route.Config> { backStack ->
-                                    }
+                                            val args = backStack.toRoute<Route.Config>()
-                                    composable<Route.Support> {
+                                            val config =
-                                        SupportScreen(appViewModel = viewModel)
+                                                appUiState.tunnels.firstOrNull { it.id == args.id }
-                                    }
+                                            ConfigScreen(config, appUiState, viewModel)
-                                    composable<Route.License> { LicenseScreen() }
+                                        }
-                                    composable<Route.AutoTunnelAdvanced> {
+                                        composable<Route.TunnelOptions> { backStack ->
-                                        AutoTunnelAdvancedScreen(appUiState, viewModel)
+                                            val args = backStack.toRoute<Route.TunnelOptions>()
-                                    }
+                                            appUiState.tunnels
-                                    composable<Route.WifiDetectionMethod> {
+                                                .firstOrNull { it.id == args.id }
-                                        WifiDetectionMethodScreen(appUiState, viewModel)
+                                                ?.let { config ->
-                                    }
+                                                    TunnelOptionsScreen(
-                                    composable<Route.Logs> { LogsScreen(appViewState, viewModel) }
+                                                        config,
-                                    composable<Route.Config> { backStack ->
+                                                        viewModel,
-                                        val args = backStack.toRoute<Route.Config>()
+                                                        appViewState,
-                                        val config =
+                                                        appUiState.appSettings,
-                                            appUiState.tunnels.firstOrNull { it.id == args.id }
+                                                    )
-                                        ConfigScreen(config, appUiState, viewModel)
+                                                }
-                                    }
+                                        }
-                                    composable<Route.TunnelOptions> { backStack ->
+                                        composable<Route.Lock> { PinLockScreen(viewModel) }
-                                        val args = backStack.toRoute<Route.TunnelOptions>()
+                                        composable<Route.SplitTunnel> {
-                                        appUiState.tunnels
+                                            SplitTunnelScreen(viewModel)
-                                            .firstOrNull { it.id == args.id }
+                                        }
-                                            ?.let { config ->
+                                        composable<Route.TunnelAutoTunnel> { backStack ->
-                                                TunnelOptionsScreen(
+                                            val args = backStack.toRoute<Route.TunnelOptions>()
-                                                    config,
+                                            appUiState.tunnels
-                                                    viewModel,
+                                                .firstOrNull { it.id == args.id }
-                                                    appViewState,
+                                                ?.let {
-                                                    appUiState.appSettings,
+                                                    TunnelAutoTunnelScreen(
-                                                )
+                                                        it,
-                                            }
+                                                        appUiState.appSettings,
-                                    }
+                                                        viewModel,
-                                    composable<Route.Lock> { PinLockScreen(viewModel) }
+                                                    )
-                                    composable<Route.KillSwitch> {
+                                                }
-                                        KillSwitchScreen(appUiState, viewModel)
+                                        }
-                                    }
+                                        composable<Route.Sort> { SortScreen(appUiState, viewModel) }
-                                    composable<Route.SplitTunnel> { SplitTunnelScreen(viewModel) }
+                                        composable<Route.TunnelMonitoring> {
-                                    composable<Route.TunnelAutoTunnel> { backStack ->
+                                            TunnelMonitoringScreen(appUiState, viewModel)
-                                        val args = backStack.toRoute<Route.TunnelOptions>()
+                                        }
-                                        appUiState.tunnels
+                                        composable<Route.ProxySettings> {
-                                            .firstOrNull { it.id == args.id }
+                                            ProxySettingsScreen(appUiState, viewModel)
-                                            ?.let {
+                                        }
-                                                TunnelAutoTunnelScreen(
+                                        composable<Route.SystemFeatures> {
-                                                    it,
+                                            SystemFeaturesScreen(appUiState, viewModel)
-                                                    appUiState.appSettings,
+                                        }
-                                                    viewModel,
+                                        composable<Route.Dns> {
-                                                )
+                                            DnsSettingsScreen(appUiState, viewModel)
-                                            }
+                                        }
-                                    }
-                                    composable<Route.Sort> { SortScreen(appUiState, viewModel) }
-                                    composable<Route.TunnelMonitoring> {
-                                        TunnelMonitoringScreen(appUiState, viewModel)
                                     }
                                 }
                             }

app/src/main/java/com/zaneschepke/wireguardautotunnel/WireGuardAutoTunnel.kt

@@ -13,7 +13,7 @@ import com.zaneschepke.wireguardautotunnel.core.worker.ServiceWorker
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
@@ -91,7 +91,7 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
 
     override fun onTerminate() {
         applicationScope.cancel()
-        tunnelManager.setBackendStatus(BackendStatus.Inactive)
+        tunnelManager.setBackendMode(BackendMode.Inactive)
         super.onTerminate()
     }
 

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/broadcast/RestartReceiver.kt

@@ -24,6 +24,7 @@ class RestartReceiver : BroadcastReceiver() {
 
     @Inject lateinit var serviceManager: ServiceManager
 
+    // injecting this should let tunnelManger handle clean startup
     @Inject lateinit var tunnelManager: TunnelManager
 
     @Inject lateinit var logReader: LogReader
@@ -34,22 +35,7 @@ class RestartReceiver : BroadcastReceiver() {
         Timber.d("RestartReceiver triggered with action: ${intent.action}")
         serviceManager.updateTunnelTile()
         serviceManager.updateAutoTunnelTile()
-        applicationScope.launch(ioDispatcher) {
+        if (intent.action == Intent.ACTION_MY_PACKAGE_REPLACED)
-            val settings = appDataRepository.settings.get()
+            applicationScope.launch(ioDispatcher) { logReader.deleteAndClearLogs() }
-            if (settings.isRestoreOnBootEnabled) {
-                if (
-                    settings.isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null
-                ) {
-                    Timber.d("Starting auto-tunnel on boot/update")
-                    serviceManager.startAutoTunnel()
-                } else {
-                    Timber.d("Restoring previous tunnel state")
-                    tunnelManager.restorePreviousState()
-                }
-            } else {
-                Timber.d("Restore on boot disabled, skipping")
-            }
-            if (intent.action == Intent.ACTION_MY_PACKAGE_REPLACED) logReader.deleteAndClearLogs()
-        }
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/autotunnel/AutoTunnelService.kt

@@ -16,7 +16,6 @@ import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelMonitor
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus.StopReason.Ping
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
@@ -100,26 +99,10 @@ class AutoTunnelService : LifecycleService() {
 
     override fun onDestroy() {
         serviceManager.handleAutoTunnelServiceDestroy()
-        restoreVpnKillSwitch()
         ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
         super.onDestroy()
     }
 
-    private fun restoreVpnKillSwitch() {
-        with(autoTunnelStateFlow.value) {
-            if (
-                settings.isVpnKillSwitchEnabled &&
-                    tunnelManager.getBackendStatus() !is BackendStatus.KillSwitch
-            ) {
-                eventHandlerJob?.cancel()
-                val allowedIps =
-                    if (settings.isLanOnKillSwitchEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS
-                    else emptyList()
-                tunnelManager.setBackendStatus(BackendStatus.KillSwitch(allowedIps))
-            }
-        }
-    }
-
     private fun launchWatcherNotification(
         description: String = getString(R.string.monitoring_state_changes)
     ) {
@@ -400,14 +383,6 @@ class AutoTunnelService : LifecycleService() {
                 AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: nothing to do")
                 is AutoTunnelEvent.Bounce ->
                     handleBounceWithBackoff(event.configsPeerKeyResolvedMap)
-                is AutoTunnelEvent.StartKillSwitch -> {
-                    Timber.d("Starting kill switch")
-                    tunnelManager.setBackendStatus(BackendStatus.KillSwitch(event.allowedIps))
-                }
-                AutoTunnelEvent.StopKillSwitch -> {
-                    Timber.d("Stopping kill switch")
-                    tunnelManager.setBackendStatus(BackendStatus.Active)
-                }
             }
         }
     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/BaseTunnel.kt

@@ -192,7 +192,7 @@ abstract class BaseTunnel(
                         val (wg, amnezia) = updatedConfigProxy.buildConfigs()
                         currentConf =
                             currentConf.copyWithCallback(
-                                amQuick = amnezia.toAwgQuickString(true),
+                                amQuick = amnezia.toAwgQuickString(true, false),
                                 wgQuick = wg.toWgQuickString(true),
                             )
                         bouncingTunnelIds.remove(currentConf.id)

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/KernelTunnel.kt

@@ -5,7 +5,8 @@ import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Tunnel
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
+import com.zaneschepke.wireguardautotunnel.di.Kernel
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
@@ -23,7 +24,7 @@ constructor(
     @ApplicationScope private val applicationScope: CoroutineScope,
     serviceManager: ServiceManager,
     appDataRepository: AppDataRepository,
-    private val backend: Backend,
+    @Kernel private val backend: Backend,
 ) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
 
     override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
@@ -59,12 +60,12 @@ constructor(
         }
     }
 
-    override fun setBackendStatus(backendStatus: BackendStatus) {
+    override fun setBackendMode(backendMode: BackendMode) {
         Timber.w("Not yet implemented for kernel")
     }
 
-    override fun getBackendStatus(): BackendStatus {
+    override fun getBackendMode(): BackendMode {
-        return BackendStatus.Inactive
+        return BackendMode.Inactive
     }
 
     override suspend fun runningTunnelNames(): Set<String> {

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/TunnelManager.kt

@@ -1,9 +1,13 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.di.*
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
 import com.zaneschepke.wireguardautotunnel.domain.events.BackendMessage
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.PingState
@@ -11,40 +15,106 @@ import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
+import kotlin.concurrent.atomics.AtomicBoolean
+import kotlin.concurrent.atomics.AtomicReference
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.plus
 import org.amnezia.awg.crypto.Key
+import timber.log.Timber
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class TunnelManager
 @Inject
 constructor(
-    private val kernelTunnel: TunnelProvider,
+    @Kernel private val kernelTunnel: TunnelProvider,
-    private val userspaceTunnel: TunnelProvider,
+    @Userspace private val userspaceTunnel: TunnelProvider,
+    @ProxyUserspace private val proxyUserspaceTunnel: TunnelProvider,
+    private val serviceManager: ServiceManager,
     private val appDataRepository: AppDataRepository,
-    applicationScope: CoroutineScope,
+    @ApplicationScope applicationScope: CoroutineScope,
-    ioDispatcher: CoroutineDispatcher,
+    @IoDispatcher ioDispatcher: CoroutineDispatcher,
 ) : TunnelProvider {
 
-    @OptIn(ExperimentalCoroutinesApi::class)
+    @OptIn(ExperimentalAtomicApi::class)
-    private val tunnelProviderFlow =
+    private val tunnelProviderFlow: StateFlow<TunnelProvider> = run {
+        val currentBackend = AtomicReference(userspaceTunnel)
+        val currentSettings = AtomicReference(AppSettings())
+        val initialEmit = AtomicBoolean(true)
+
         appDataRepository.settings.flow
             .filterNotNull()
-            .flatMapLatest { settings ->
+            // ignore default state
-                val backend = if (settings.isKernelEnabled) kernelTunnel else userspaceTunnel
+            .filterNot { it == AppSettings() }
-                MutableStateFlow(backend)
+            .distinctUntilChanged { old, new ->
+                old.appMode == new.appMode &&
+                    old.isLanOnKillSwitchEnabled == new.isLanOnKillSwitchEnabled
             }
+            .map { settings ->
+                Timber.d("App mode changes with ${settings.appMode}")
+                val backend =
+                    when (settings.appMode) {
+                        AppMode.VPN -> userspaceTunnel
+                        AppMode.PROXY -> proxyUserspaceTunnel
+                        AppMode.LOCK_DOWN -> proxyUserspaceTunnel
+                        AppMode.KERNEL -> kernelTunnel
+                    }
+                settings to backend
+            }
+            .onEach { (settings, newBackend) ->
+                val isInitialEmit = initialEmit.exchange(false)
+                val oldBackend = currentBackend.exchange(newBackend)
+                val oldSettings = currentSettings.exchange(settings)
+
+                if ((oldSettings.appMode != settings.appMode) && !isInitialEmit) {
+                    oldBackend.stopTunnel()
+                    if (oldSettings.appMode == AppMode.LOCK_DOWN)
+                        proxyUserspaceTunnel.setBackendMode(BackendMode.Inactive)
+                }
+                if (settings.appMode == AppMode.LOCK_DOWN) {
+                    // kill switch will always catch all ipv6, just add ipv4 networks for allowsIps
+                    val allowedIps =
+                        if (settings.isLanOnKillSwitchEnabled) TunnelConf.IPV4_PUBLIC_NETWORKS
+                        else emptySet()
+                    proxyUserspaceTunnel.setBackendMode(BackendMode.KillSwitch(allowedIps))
+                }
+                // restore state if configured
+                if (isInitialEmit && settings.isRestoreOnBootEnabled) {
+                    Timber.d("Restoring previous state")
+                    if (
+                        settings.isAutoTunnelEnabled &&
+                            serviceManager.autoTunnelService.value == null
+                    ) {
+                        serviceManager.startAutoTunnel()
+                    } else {
+                        val previouslyActiveTuns = appDataRepository.tunnels.getActive()
+                        val tunsToStart =
+                            previouslyActiveTuns.filterNot { tun ->
+                                activeTunnels.value.any { tun.id == it.key.id }
+                            }
+                        tunsToStart.forEach { startTunnel(it) }
+                    }
+                }
+            }
+            .map { (_, backend) -> backend }
             .stateIn(
                 scope = applicationScope.plus(ioDispatcher),
                 started = SharingStarted.Eagerly,
                 initialValue = userspaceTunnel,
             )
+    }
 
     override val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>> =
-        tunnelProviderFlow.value.activeTunnels
+        tunnelProviderFlow
+            .flatMapLatest { it.activeTunnels }
+            .stateIn(
+                scope = applicationScope.plus(ioDispatcher),
+                started = SharingStarted.Eagerly,
+                initialValue = emptyMap(),
+            )
 
     @OptIn(ExperimentalCoroutinesApi::class)
     override val errorEvents: SharedFlow<Pair<TunnelConf, BackendError>> =
@@ -90,12 +160,12 @@ constructor(
         tunnelProviderFlow.value.bounceTunnel(tunnelConf, reason)
     }
 
-    override fun setBackendStatus(backendStatus: BackendStatus) {
+    override fun setBackendMode(backendMode: BackendMode) {
-        tunnelProviderFlow.value.setBackendStatus(backendStatus)
+        tunnelProviderFlow.value.setBackendMode(backendMode)
     }
 
-    override fun getBackendStatus(): BackendStatus {
+    override fun getBackendMode(): BackendMode {
-        return tunnelProviderFlow.value.getBackendStatus()
+        return tunnelProviderFlow.value.getBackendMode()
     }
 
     override suspend fun runningTunnelNames(): Set<String> {
@@ -117,20 +187,4 @@ constructor(
             handshakeSuccessLogs,
         )
     }
-
-    suspend fun restorePreviousState() {
-        val settings = appDataRepository.settings.get()
-        if (settings.isRestoreOnBootEnabled) {
-            val previouslyActiveTuns = appDataRepository.tunnels.getActive()
-            val tunsToStart =
-                previouslyActiveTuns.filterNot { tun ->
-                    activeTunnels.value.any { tun.id == it.key.id }
-                }
-            if (settings.isKernelEnabled) {
-                return tunsToStart.forEach { startTunnel(it) }
-            } else {
-                tunsToStart.firstOrNull()?.let { startTunnel(it) }
-            }
-        }
-    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/TunnelProvider.kt

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
 import com.zaneschepke.wireguardautotunnel.domain.events.BackendMessage
@@ -41,9 +41,9 @@ interface TunnelProvider {
         reason: TunnelStatus.StopReason = TunnelStatus.StopReason.User,
     )
 
-    fun setBackendStatus(backendStatus: BackendStatus)
+    fun setBackendMode(backendMode: BackendMode)
 
-    fun getBackendStatus(): BackendStatus
+    fun getBackendMode(): BackendMode
 
     suspend fun runningTunnelNames(): Set<String>
 

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/UserspaceTunnel.kt

@@ -1,22 +1,30 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
+import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
+import com.zaneschepke.wireguardautotunnel.domain.model.AppProxySettings
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.AmneziaStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendStatus
+import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendMode
-import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendStatus
+import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendMode
 import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
+import java.util.*
 import javax.inject.Inject
-import kotlin.jvm.optionals.getOrNull
 import kotlinx.coroutines.CoroutineScope
 import org.amnezia.awg.backend.Backend
 import org.amnezia.awg.backend.BackendException
+import org.amnezia.awg.backend.ProxyGoBackend
 import org.amnezia.awg.backend.Tunnel
+import org.amnezia.awg.config.Config
+import org.amnezia.awg.config.DnsSettings
+import org.amnezia.awg.config.proxy.HttpProxy
+import org.amnezia.awg.config.proxy.Proxy
+import org.amnezia.awg.config.proxy.Socks5Proxy
 import timber.log.Timber
 
 class UserspaceTunnel
@@ -31,18 +39,55 @@ constructor(
     override suspend fun startBackend(tunnel: TunnelConf) {
         try {
             updateTunnelStatus(tunnel, TunnelStatus.Starting)
-            val amConfig = tunnel.toAmConfig()
+
-            var previousKillSwitch: Backend.BackendStatus? = null
+            val proxies: List<Proxy> =
-            // prevent dns failures from bringing tuns up when vpn kill switch active
+                when (backend) {
-            if (
+                    is ProxyGoBackend -> {
-                amConfig.peers.any { it.endpoint.getOrNull()?.toString()?.isUrl() == true } &&
+                        val proxySettings = appDataRepository.proxySettings.get()
-                    backend.backendStatus is Backend.BackendStatus.KillSwitchActive
+                        Timber.d("Adding proxy configs")
-            ) {
+                        buildList {
-                previousKillSwitch = backend.backendStatus
+                            if (proxySettings.socks5ProxyEnabled) {
-                setBackendStatus(BackendStatus.Active)
+                                add(
-            }
+                                    Socks5Proxy(
-            backend.setState(tunnel, Tunnel.State.UP, amConfig)
+                                        proxySettings.socks5ProxyBindAddress
-            previousKillSwitch?.let { backend.backendStatus = it }
+                                            ?: AppProxySettings.DEFAULT_SOCKS_BIND_ADDRESS,
+                                        proxySettings.proxyUsername,
+                                        proxySettings.proxyPassword,
+                                    )
+                                )
+                            }
+                            if (proxySettings.httpProxyEnabled) {
+                                add(
+                                    HttpProxy(
+                                        proxySettings.httpProxyBindAddress
+                                            ?: AppProxySettings.DEFAULT_HTTP_BIND_ADDRESS,
+                                        proxySettings.proxyUsername,
+                                        proxySettings.proxyPassword,
+                                    )
+                                )
+                            }
+                        }
+                    }
+                    else -> emptyList()
+                }
+            val setting = appDataRepository.settings.get()
+            val config = tunnel.toAmConfig()
+            val updatedConfig =
+                Config.Builder()
+                    .apply {
+                        setInterface(config.`interface`)
+                        addPeers(config.peers)
+                        addProxies(proxies)
+                        setDnsSettings(
+                            DnsSettings(
+                                setting.dnsProtocol == DnsProtocol.DOH,
+                                Optional.ofNullable(setting.dnsEndpoint),
+                            )
+                        )
+                    }
+                    .build()
+
+            backend.setState(tunnel, Tunnel.State.UP, updatedConfig)
         } catch (e: BackendException) {
             Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
             throw e.toBackendError()
@@ -62,17 +107,17 @@ constructor(
         }
     }
 
-    override fun setBackendStatus(backendStatus: BackendStatus) {
+    override fun setBackendMode(backendMode: BackendMode) {
-        Timber.d("Setting backend state: $backendStatus")
+        Timber.d("Setting backend mode: $backendMode")
         try {
-            backend.backendStatus = backendStatus.asAmBackendStatus()
+            backend.backendMode = backendMode.asAmBackendMode()
         } catch (e: BackendException) {
             throw e.toBackendError()
         }
     }
 
-    override fun getBackendStatus(): BackendStatus {
+    override fun getBackendMode(): BackendMode {
-        return backend.backendStatus.asBackendStatus()
+        return backend.backendMode.asBackendMode()
     }
 
     override suspend fun runningTunnelNames(): Set<String> {

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/worker/ServiceWorker.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import androidx.hilt.work.HiltWorker
 import androidx.work.*
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.assisted.Assisted
@@ -23,7 +22,6 @@ constructor(
     private val serviceManager: ServiceManager,
     private val appDataRepository: AppDataRepository,
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-    private val tunnelManager: TunnelManager,
 ) : CoroutineWorker(context, params) {
 
     companion object {
@@ -53,10 +51,11 @@ constructor(
         withContext(ioDispatcher) {
             Timber.i("Service worker started")
             with(appDataRepository.settings.get()) {
-                if (isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null)
+                Timber.i("Checking to see if auto-tunnel has been killed by system")
-                    return@with serviceManager.startAutoTunnel()
+                if (isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null) {
-                if (tunnelManager.activeTunnels.value.isEmpty())
+                    Timber.i("Service has been killed by system, restoring.")
-                    tunnelManager.restorePreviousState()
+                    serviceManager.startAutoTunnel()
+                }
             }
             Result.success()
         }

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/AppDatabase.kt

@@ -2,14 +2,16 @@ package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.*
 import androidx.room.migration.AutoMigrationSpec
+import com.zaneschepke.wireguardautotunnel.data.dao.ProxySettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
+import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings
 import com.zaneschepke.wireguardautotunnel.data.entity.Settings
 import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
 
 @Database(
-    entities = [Settings::class, TunnelConfig::class],
+    entities = [Settings::class, TunnelConfig::class, ProxySettings::class],
-    version = 19,
+    version = 20,
     autoMigrations =
         [
             AutoMigration(from = 1, to = 2),
@@ -30,6 +32,7 @@ import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
             AutoMigration(from = 16, to = 17, spec = WifiDetectionMigration::class),
             AutoMigration(from = 17, to = 18),
             AutoMigration(from = 18, to = 19, spec = PingMigration::class),
+            AutoMigration(from = 19, to = 20, spec = ProxyMigration::class),
         ],
     exportSchema = true,
 )
@@ -38,6 +41,8 @@ abstract class AppDatabase : RoomDatabase() {
     abstract fun settingDao(): SettingsDao
 
     abstract fun tunnelConfigDoa(): TunnelConfigDao
+
+    abstract fun proxySettingsDoa(): ProxySettingsDao
 }
 
 @DeleteColumn(tableName = "Settings", columnName = "default_tunnel")
@@ -68,3 +73,11 @@ class WifiDetectionMigration : AutoMigrationSpec
     ),
 )
 class PingMigration : AutoMigrationSpec
+
+@DeleteColumn.Entries(
+    DeleteColumn(tableName = "Settings", columnName = "is_amnezia_enabled"),
+    DeleteColumn(tableName = "Settings", columnName = "is_vpn_kill_switch_enabled"),
+    DeleteColumn(tableName = "Settings", columnName = "is_kernel_kill_switch_enabled"),
+    DeleteColumn(tableName = "Settings", columnName = "is_kernel_enabled"),
+)
+class ProxyMigration : AutoMigrationSpec

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/DatabaseCallback.kt

@@ -2,20 +2,25 @@ package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.RoomDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
-import timber.log.Timber
+import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings
+import com.zaneschepke.wireguardautotunnel.data.entity.Settings
+import javax.inject.Inject
+import javax.inject.Provider
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
-class DatabaseCallback : RoomDatabase.Callback() {
+class DatabaseCallback @Inject constructor(private val databaseProvider: Provider<AppDatabase>) :
-    override fun onCreate(db: SupportSQLiteDatabase) =
+    RoomDatabase.Callback() {
-        db.run {
+
-            beginTransaction()
+    override fun onCreate(db: SupportSQLiteDatabase) {
-            try {
+        super.onCreate(db)
-                execSQL(Queries.createDefaultSettings())
+
-                Timber.i("Bootstrapping settings data")
+        // Launch coroutine to insert default entry
-                setTransactionSuccessful()
+        CoroutineScope(Dispatchers.IO).launch {
-            } catch (e: Exception) {
+            val db = databaseProvider.get()
-                Timber.e(e)
+            db.settingDao().save(Settings())
-            } finally {
+            db.proxySettingsDoa().save(ProxySettings())
-                endTransaction()
-            }
         }
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/DatabaseConverters.kt

@@ -1,7 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.TypeConverter
-import com.zaneschepke.wireguardautotunnel.data.entity.Settings
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
+import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
 import kotlinx.serialization.json.Json
 
 class DatabaseConverters {
@@ -22,9 +24,16 @@ class DatabaseConverters {
         }
     }
 
-    @TypeConverter fun fromStatus(status: Settings.WifiDetectionMethod): Int = status.value
+    @TypeConverter fun fromStatus(status: WifiDetectionMethod): Int = status.value
 
     @TypeConverter
-    fun toStatus(value: Int): Settings.WifiDetectionMethod =
+    fun toStatus(value: Int): WifiDetectionMethod = WifiDetectionMethod.fromValue(value)
-        Settings.WifiDetectionMethod.fromValue(value)
+
+    @TypeConverter fun toMode(value: Int): AppMode = AppMode.fromValue(value)
+
+    @TypeConverter fun fromMode(mode: AppMode): Int = mode.value
+
+    @TypeConverter fun toDnsProtocol(value: Int): DnsProtocol = DnsProtocol.fromValue(value)
+
+    @TypeConverter fun fromDnsProtocol(mode: DnsProtocol): Int = mode.value
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/Queries.kt

@@ -1,37 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data
-
-object Queries {
-    fun createDefaultSettings(): String {
-        return """
-		INSERT INTO Settings (is_tunnel_enabled,
-		        is_tunnel_on_mobile_data_enabled,
-		        trusted_network_ssids,
-		        is_always_on_vpn_enabled,
-		        is_tunnel_on_ethernet_enabled,
-		        is_shortcuts_enabled,
-		        is_tunnel_on_wifi_enabled,
-		        is_kernel_enabled,
-		        is_restore_on_boot_enabled,
-		        is_multi_tunnel_enabled)
-		        VALUES
-		        ('false',
-		        'false',
-		        '',
-		        'false',
-		        'false',
-		        'false',
-		        'false',
-		        'false',
-		        'false',
-		        'false')
-		"""
-            .trimIndent()
-    }
-
-    fun createTunnelConfig(): String {
-        return """
-		INSERT INTO TunnelConfig (name, wg_quick) VALUES ('test', 'test')
-		"""
-            .trimIndent()
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/dao/ProxySettingsDao.kt

@@ -0,0 +1,25 @@
+package com.zaneschepke.wireguardautotunnel.data.dao
+
+import androidx.room.*
+import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface ProxySettingsDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun save(t: ProxySettings)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun saveAll(t: List<ProxySettings>)
+
+    @Query("SELECT * FROM proxy_settings WHERE id=:id")
+    suspend fun getById(id: Long): ProxySettings?
+
+    @Query("SELECT * FROM proxy_settings") suspend fun getAll(): List<ProxySettings>
+
+    @Query("SELECT * FROM proxy_settings LIMIT 1") fun getSettingsFlow(): Flow<ProxySettings>
+
+    @Query("SELECT * FROM proxy_settings") fun getAllFlow(): Flow<List<ProxySettings>>
+
+    @Delete suspend fun delete(t: ProxySettings)
+
+    @Query("SELECT COUNT('id') FROM proxy_settings") suspend fun count(): Long
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/dao/SettingsDao.kt

@@ -16,7 +16,7 @@ interface SettingsDao {
 
     @Query("SELECT * FROM settings LIMIT 1") fun getSettingsFlow(): Flow<Settings>
 
-    @Query("SELECT * FROM settings") fun getAllFlow(): Flow<MutableList<Settings>>
+    @Query("SELECT * FROM settings") fun getAllFlow(): Flow<List<Settings>>
 
     @Delete suspend fun delete(t: Settings)
 

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/entity/ProxySettings.kt

@@ -0,0 +1,18 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "proxy_settings")
+data class ProxySettings(
+    @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    @ColumnInfo(name = "socks5_proxy_enabled", defaultValue = "false")
+    val socks5ProxyEnabled: Boolean = false,
+    @ColumnInfo(name = "socks5_proxy_bind_address") val socks5ProxyBindAddress: String? = null,
+    @ColumnInfo(name = "http_proxy_enable", defaultValue = "false")
+    val httpProxyEnabled: Boolean = false,
+    @ColumnInfo(name = "http_proxy_bind_address") val httpProxyBindAddress: String? = null,
+    @ColumnInfo(name = "proxy_username") val proxyUsername: String? = null,
+    @ColumnInfo(name = "proxy_password") val proxyPassword: String? = null,
+)

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/entity/Settings.kt

@@ -3,6 +3,9 @@ package com.zaneschepke.wireguardautotunnel.data.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
+import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
 
 @Entity
 data class Settings(
@@ -18,24 +21,16 @@ data class Settings(
     val isShortcutsEnabled: Boolean = false,
     @ColumnInfo(name = "is_tunnel_on_wifi_enabled", defaultValue = "false")
     val isTunnelOnWifiEnabled: Boolean = false,
-    @ColumnInfo(name = "is_kernel_enabled", defaultValue = "false")
-    val isKernelEnabled: Boolean = false,
     @ColumnInfo(name = "is_restore_on_boot_enabled", defaultValue = "false")
     val isRestoreOnBootEnabled: Boolean = false,
     @ColumnInfo(name = "is_multi_tunnel_enabled", defaultValue = "false")
     val isMultiTunnelEnabled: Boolean = false,
     @ColumnInfo(name = "is_ping_enabled", defaultValue = "false")
     val isPingEnabled: Boolean = false,
-    @ColumnInfo(name = "is_amnezia_enabled", defaultValue = "false")
-    val isAmneziaEnabled: Boolean = false,
     @ColumnInfo(name = "is_wildcards_enabled", defaultValue = "false")
     val isWildcardsEnabled: Boolean = false,
     @ColumnInfo(name = "is_stop_on_no_internet_enabled", defaultValue = "false")
     val isStopOnNoInternetEnabled: Boolean = false,
-    @ColumnInfo(name = "is_vpn_kill_switch_enabled", defaultValue = "false")
-    val isVpnKillSwitchEnabled: Boolean = false,
-    @ColumnInfo(name = "is_kernel_kill_switch_enabled", defaultValue = "false")
-    val isKernelKillSwitchEnabled: Boolean = false,
     @ColumnInfo(name = "is_lan_on_kill_switch_enabled", defaultValue = "false")
     val isLanOnKillSwitchEnabled: Boolean = false,
     @ColumnInfo(name = "debounce_delay_seconds", defaultValue = "3")
@@ -52,16 +47,8 @@ data class Settings(
     val tunnelPingIntervalSeconds: Int = 30,
     @ColumnInfo(name = "tunnel_ping_attempts", defaultValue = "3") val tunnelPingAttempts: Int = 3,
     @ColumnInfo(name = "tunnel_ping_timeout_sec") val tunnelPingTimeoutSeconds: Int? = null,
-) {
+    @ColumnInfo(name = "app_mode", defaultValue = "0") val appMode: AppMode = AppMode.fromValue(0),
-    enum class WifiDetectionMethod(val value: Int) {
+    @ColumnInfo(name = "dns_protocol", defaultValue = "0")
-        DEFAULT(0),
+    val dnsProtocol: DnsProtocol = DnsProtocol.fromValue(0),
-        LEGACY(1),
+    @ColumnInfo(name = "dns_endpoint") val dnsEndpoint: String? = null,
-        ROOT(2),
+)
-        SHIZUKU(3);
-
-        companion object {
-            fun fromValue(value: Int): WifiDetectionMethod =
-                entries.find { it.value == value } ?: DEFAULT
-        }
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/mapper/ProxySettingsMapper.kt

@@ -0,0 +1,32 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings
+import com.zaneschepke.wireguardautotunnel.domain.model.AppProxySettings
+
+object ProxySettingsMapper {
+    fun to(proxySettings: ProxySettings): AppProxySettings =
+        with(proxySettings) {
+            AppProxySettings(
+                id,
+                socks5ProxyEnabled,
+                socks5ProxyBindAddress,
+                httpProxyEnabled,
+                httpProxyBindAddress,
+                proxyUsername,
+                proxyPassword,
+            )
+        }
+
+    fun to(proxySettings: AppProxySettings): ProxySettings =
+        with(proxySettings) {
+            ProxySettings(
+                id,
+                socks5ProxyEnabled,
+                socks5ProxyBindAddress,
+                httpProxyEnabled,
+                httpProxyBindAddress,
+                proxyUsername,
+                proxyPassword,
+            )
+        }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/mapper/SettingsMapper.kt

@@ -2,70 +2,78 @@ package com.zaneschepke.wireguardautotunnel.data.mapper
 
 import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
 import com.zaneschepke.wireguardautotunnel.data.entity.Settings
+import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
+import com.zaneschepke.wireguardautotunnel.data.model.DnsSettings
+import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
 import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
 
-object SettingsMapper {
+fun Settings.toAppSettings(): AppSettings {
-    fun toAppSettings(settings: Settings): AppSettings {
+    return AppSettings(
-        return AppSettings(
+        id = id,
-            id = settings.id,
+        isAutoTunnelEnabled = isAutoTunnelEnabled,
-            isAutoTunnelEnabled = settings.isAutoTunnelEnabled,
+        isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
-            isTunnelOnMobileDataEnabled = settings.isTunnelOnMobileDataEnabled,
+        trustedNetworkSSIDs = trustedNetworkSSIDs,
-            trustedNetworkSSIDs = settings.trustedNetworkSSIDs,
+        isAlwaysOnVpnEnabled = isAlwaysOnVpnEnabled,
-            isAlwaysOnVpnEnabled = settings.isAlwaysOnVpnEnabled,
+        isTunnelOnEthernetEnabled = isTunnelOnEthernetEnabled,
-            isTunnelOnEthernetEnabled = settings.isTunnelOnEthernetEnabled,
+        isShortcutsEnabled = isShortcutsEnabled,
-            isShortcutsEnabled = settings.isShortcutsEnabled,
+        isTunnelOnWifiEnabled = isTunnelOnWifiEnabled,
-            isTunnelOnWifiEnabled = settings.isTunnelOnWifiEnabled,
+        isRestoreOnBootEnabled = isRestoreOnBootEnabled,
-            isKernelEnabled = settings.isKernelEnabled,
+        isMultiTunnelEnabled = isMultiTunnelEnabled,
-            isRestoreOnBootEnabled = settings.isRestoreOnBootEnabled,
+        isPingEnabled = isPingEnabled,
-            isMultiTunnelEnabled = settings.isMultiTunnelEnabled,
+        isWildcardsEnabled = isWildcardsEnabled,
-            isPingEnabled = settings.isPingEnabled,
+        isStopOnNoInternetEnabled = isStopOnNoInternetEnabled,
-            isAmneziaEnabled = settings.isAmneziaEnabled,
+        isLanOnKillSwitchEnabled = isLanOnKillSwitchEnabled,
-            isWildcardsEnabled = settings.isWildcardsEnabled,
+        debounceDelaySeconds = debounceDelaySeconds,
-            isStopOnNoInternetEnabled = settings.isStopOnNoInternetEnabled,
+        isDisableKillSwitchOnTrustedEnabled = isDisableKillSwitchOnTrustedEnabled,
-            isVpnKillSwitchEnabled = settings.isVpnKillSwitchEnabled,
+        isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
-            isKernelKillSwitchEnabled = settings.isKernelKillSwitchEnabled,
+        wifiDetectionMethod =
-            isLanOnKillSwitchEnabled = settings.isLanOnKillSwitchEnabled,
+            AndroidNetworkMonitor.WifiDetectionMethod.fromValue(wifiDetectionMethod.value),
-            debounceDelaySeconds = settings.debounceDelaySeconds,
+        tunnelPingIntervalSeconds = tunnelPingIntervalSeconds,
-            isDisableKillSwitchOnTrustedEnabled = settings.isDisableKillSwitchOnTrustedEnabled,
+        tunnelPingAttempts = tunnelPingAttempts,
-            isTunnelOnUnsecureEnabled = settings.isTunnelOnUnsecureEnabled,
+        tunnelPingTimeoutSeconds = tunnelPingTimeoutSeconds,
-            wifiDetectionMethod =
+        appMode = appMode,
-                AndroidNetworkMonitor.WifiDetectionMethod.fromValue(
+        dnsProtocol = dnsProtocol,
-                    settings.wifiDetectionMethod.value
+        dnsEndpoint = dnsEndpoint,
-                ),
+    )
-            tunnelPingIntervalSeconds = settings.tunnelPingIntervalSeconds,
+}
-            tunnelPingAttempts = settings.tunnelPingAttempts,
+
-            tunnelPingTimeoutSeconds = settings.tunnelPingTimeoutSeconds,
+fun AppSettings.toSettings(): Settings {
-        )
+    return Settings(
-    }
+        id = id,
-
+        isAutoTunnelEnabled = isAutoTunnelEnabled,
-    fun toSettings(appSettings: AppSettings): Settings {
+        isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
-        return Settings(
+        trustedNetworkSSIDs = trustedNetworkSSIDs,
-            id = appSettings.id,
+        isAlwaysOnVpnEnabled = isAlwaysOnVpnEnabled,
-            isAutoTunnelEnabled = appSettings.isAutoTunnelEnabled,
+        isTunnelOnEthernetEnabled = isTunnelOnEthernetEnabled,
-            isTunnelOnMobileDataEnabled = appSettings.isTunnelOnMobileDataEnabled,
+        isShortcutsEnabled = isShortcutsEnabled,
-            trustedNetworkSSIDs = appSettings.trustedNetworkSSIDs,
+        isTunnelOnWifiEnabled = isTunnelOnWifiEnabled,
-            isAlwaysOnVpnEnabled = appSettings.isAlwaysOnVpnEnabled,
+        isRestoreOnBootEnabled = isRestoreOnBootEnabled,
-            isTunnelOnEthernetEnabled = appSettings.isTunnelOnEthernetEnabled,
+        isMultiTunnelEnabled = isMultiTunnelEnabled,
-            isShortcutsEnabled = appSettings.isShortcutsEnabled,
+        isPingEnabled = isPingEnabled,
-            isTunnelOnWifiEnabled = appSettings.isTunnelOnWifiEnabled,
+        isWildcardsEnabled = isWildcardsEnabled,
-            isKernelEnabled = appSettings.isKernelEnabled,
+        isStopOnNoInternetEnabled = isStopOnNoInternetEnabled,
-            isRestoreOnBootEnabled = appSettings.isRestoreOnBootEnabled,
+        isLanOnKillSwitchEnabled = isLanOnKillSwitchEnabled,
-            isMultiTunnelEnabled = appSettings.isMultiTunnelEnabled,
+        debounceDelaySeconds = debounceDelaySeconds,
-            isPingEnabled = appSettings.isPingEnabled,
+        isDisableKillSwitchOnTrustedEnabled = isDisableKillSwitchOnTrustedEnabled,
-            isAmneziaEnabled = appSettings.isAmneziaEnabled,
+        isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
-            isWildcardsEnabled = appSettings.isWildcardsEnabled,
+        wifiDetectionMethod = WifiDetectionMethod.fromValue(wifiDetectionMethod.value),
-            isStopOnNoInternetEnabled = appSettings.isStopOnNoInternetEnabled,
+        tunnelPingIntervalSeconds = tunnelPingIntervalSeconds,
-            isVpnKillSwitchEnabled = appSettings.isVpnKillSwitchEnabled,
+        tunnelPingAttempts = tunnelPingAttempts,
-            isKernelKillSwitchEnabled = appSettings.isKernelKillSwitchEnabled,
+        tunnelPingTimeoutSeconds = tunnelPingTimeoutSeconds,
-            isLanOnKillSwitchEnabled = appSettings.isLanOnKillSwitchEnabled,
+        appMode = appMode,
-            debounceDelaySeconds = appSettings.debounceDelaySeconds,
+        dnsProtocol = dnsProtocol,
-            isDisableKillSwitchOnTrustedEnabled = appSettings.isDisableKillSwitchOnTrustedEnabled,
+        dnsEndpoint = dnsEndpoint,
-            isTunnelOnUnsecureEnabled = appSettings.isTunnelOnUnsecureEnabled,
+    )
-            wifiDetectionMethod =
+}
-                Settings.WifiDetectionMethod.fromValue(appSettings.wifiDetectionMethod.value),
+
-            tunnelPingIntervalSeconds = appSettings.tunnelPingIntervalSeconds,
+fun AppSettings.toDomain(): DnsSettings {
-            tunnelPingAttempts = appSettings.tunnelPingAttempts,
+    return DnsSettings(
-            tunnelPingTimeoutSeconds = appSettings.tunnelPingTimeoutSeconds,
+        protocol =
-        )
+            DnsProtocol.entries.toTypedArray().getOrElse(dnsProtocol.value) { DnsProtocol.SYSTEM },
-    }
+        endpoint = dnsEndpoint,
+    )
+}
+
+fun DnsSettings.toAppSettings(existing: AppSettings): AppSettings {
+    return existing.copy(dnsProtocol = protocol, dnsEndpoint = endpoint)
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/model/AppMode.kt

@@ -0,0 +1,12 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+enum class AppMode(val value: Int) {
+    VPN(0),
+    PROXY(1),
+    LOCK_DOWN(2),
+    KERNEL(3);
+
+    companion object {
+        fun fromValue(value: Int): AppMode = entries.find { it.value == value } ?: VPN
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/model/Dns.kt

@@ -0,0 +1,45 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+import android.content.Context
+import com.zaneschepke.wireguardautotunnel.R
+
+enum class DnsProtocol(val value: Int) {
+    SYSTEM(0),
+    DOH(1);
+
+    fun asString(context: Context): String {
+        return when (this) {
+            SYSTEM -> context.getString(R.string.system)
+            DOH -> context.getString(R.string.doh)
+        }
+    }
+
+    companion object {
+        fun fromValue(value: Int): DnsProtocol =
+            DnsProtocol.entries.find { it.value == value } ?: SYSTEM
+    }
+}
+
+data class DnsSettings(
+    val protocol: DnsProtocol = DnsProtocol.SYSTEM,
+    val endpoint: String? = null,
+)
+
+enum class DnsProvider(private val systemAddress: String, private val dohAddress: String) {
+    CLOUDFLARE("1.1.1.1", "https://1.1.1.1/dns-query"),
+    ADGUARD("94.140.14.14", "https://94.140.14.14/dns-query");
+
+    fun asAddress(protocol: DnsProtocol): String {
+        return when (protocol) {
+            DnsProtocol.SYSTEM -> systemAddress
+            DnsProtocol.DOH -> dohAddress
+        }
+    }
+
+    companion object {
+        fun fromAddress(address: String): DnsProvider {
+            return entries.find { it.systemAddress == address || it.dohAddress == address }
+                ?: CLOUDFLARE
+        }
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/model/WifiDetectionMethod.kt

@@ -0,0 +1,13 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+enum class WifiDetectionMethod(val value: Int) {
+    DEFAULT(0),
+    LEGACY(1),
+    ROOT(2),
+    SHIZUKU(3);
+
+    companion object {
+        fun fromValue(value: Int): WifiDetectionMethod =
+            entries.find { it.value == value } ?: DEFAULT
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/AppDataRoomRepository.kt

@@ -1,10 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.*
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import javax.inject.Inject
 
 class AppDataRoomRepository
@@ -13,6 +10,7 @@ constructor(
     override val settings: AppSettingRepository,
     override val tunnels: TunnelRepository,
     override val appState: AppStateRepository,
+    override val proxySettings: ProxySettingsRepository,
 ) : AppDataRepository {
 
     override suspend fun getPrimaryOrFirstTunnel(): TunnelConf? {

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/GitHubUpdateRepository.kt

@@ -41,7 +41,7 @@ class GitHubUpdateRepository(
                 val standaloneApkAsset =
                     release.assets.find { asset ->
                         asset.name.startsWith("wgtunnel-${Constants.STANDALONE_FLAVOR}-v") &&
-                                asset.name.endsWith(".apk")
+                            asset.name.endsWith(".apk")
                     }
                 val newVersion =
                     standaloneApkAsset
@@ -53,9 +53,10 @@ class GitHubUpdateRepository(
                 if (isNightly && newVersion != currentVersion)
                     return@map GitHubReleaseMapper.toAppUpdate(release, newVersion)
                 if (NumberUtils.compareVersions(newVersion, currentVersion) > 0) {
-                    GitHubReleaseMapper.toAppUpdate(release.copy(
+                    GitHubReleaseMapper.toAppUpdate(
-                        assets = listOf(standaloneApkAsset)
+                        release.copy(assets = listOf(standaloneApkAsset)),
-                    ), newVersion)
+                        newVersion,
+                    )
                 } else {
                     null
                 }
@@ -103,4 +104,4 @@ class GitHubUpdateRepository(
                 Result.failure(e)
             }
         }
-}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/RoomProxySettingsRepository.kt

@@ -0,0 +1,30 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import com.zaneschepke.wireguardautotunnel.data.dao.ProxySettingsDao
+import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings
+import com.zaneschepke.wireguardautotunnel.data.mapper.ProxySettingsMapper
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.model.AppProxySettings
+import com.zaneschepke.wireguardautotunnel.domain.repository.ProxySettingsRepository
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
+
+class RoomProxySettingsRepository(
+    private val proxySettingsDao: ProxySettingsDao,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : ProxySettingsRepository {
+    override suspend fun save(proxySettings: AppProxySettings) {
+        withContext(ioDispatcher) { proxySettingsDao.save(ProxySettingsMapper.to(proxySettings)) }
+    }
+
+    override val flow =
+        proxySettingsDao.getSettingsFlow().flowOn(ioDispatcher).map(ProxySettingsMapper::to)
+
+    override suspend fun get(): AppProxySettings {
+        return withContext(ioDispatcher) {
+            ProxySettingsMapper.to(proxySettingsDao.getAll().firstOrNull() ?: ProxySettings())
+        }
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/RoomSettingsRepository.kt

@@ -2,7 +2,8 @@ package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.entity.Settings
-import com.zaneschepke.wireguardautotunnel.data.mapper.SettingsMapper
+import com.zaneschepke.wireguardautotunnel.data.mapper.toAppSettings
+import com.zaneschepke.wireguardautotunnel.data.mapper.toSettings
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
@@ -17,15 +18,15 @@ class RoomSettingsRepository(
 ) : AppSettingRepository {
 
     override suspend fun save(appSettings: AppSettings) {
-        withContext(ioDispatcher) { settingsDoa.save(SettingsMapper.toSettings(appSettings)) }
+        withContext(ioDispatcher) { settingsDoa.save(appSettings.toSettings()) }
     }
 
     override val flow =
-        settingsDoa.getSettingsFlow().flowOn(ioDispatcher).map(SettingsMapper::toAppSettings)
+        settingsDoa.getSettingsFlow().flowOn(ioDispatcher).map { it.toAppSettings() }
 
     override suspend fun get(): AppSettings {
         return withContext(ioDispatcher) {
-            SettingsMapper.toAppSettings(settingsDoa.getAll().firstOrNull() ?: Settings())
+            (settingsDoa.getAll().firstOrNull() ?: Settings()).toAppSettings()
         }
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/di/BackendQualifiers.kt

@@ -9,3 +9,5 @@ import javax.inject.Qualifier
 @Qualifier @Retention(AnnotationRetention.BINARY) annotation class Kernel
 
 @Qualifier @Retention(AnnotationRetention.BINARY) annotation class Userspace
+
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class ProxyUserspace

app/src/main/java/com/zaneschepke/wireguardautotunnel/di/RepositoryModule.kt

@@ -6,6 +6,7 @@ import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
 import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
+import com.zaneschepke.wireguardautotunnel.data.dao.ProxySettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
 import com.zaneschepke.wireguardautotunnel.data.network.GitHubApi
@@ -27,14 +28,17 @@ import kotlinx.coroutines.CoroutineDispatcher
 class RepositoryModule {
     @Provides
     @Singleton
-    fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
+    fun provideDatabase(
+        @ApplicationContext context: Context,
+        callback: DatabaseCallback,
+    ): AppDatabase {
         return Room.databaseBuilder(
                 context,
                 AppDatabase::class.java,
                 context.getString(R.string.db_name),
             )
             .fallbackToDestructiveMigration(true)
-            .addCallback(DatabaseCallback())
+            .addCallback(callback)
             .build()
     }
 
@@ -44,6 +48,12 @@ class RepositoryModule {
         return appDatabase.settingDao()
     }
 
+    @Singleton
+    @Provides
+    fun provideProxyDoa(appDatabase: AppDatabase): ProxySettingsDao {
+        return appDatabase.proxySettingsDoa()
+    }
+
     @Singleton
     @Provides
     fun provideTunnelConfigDoa(appDatabase: AppDatabase): TunnelConfigDao {
@@ -68,6 +78,15 @@ class RepositoryModule {
         return RoomSettingsRepository(settingsDao, ioDispatcher)
     }
 
+    @Singleton
+    @Provides
+    fun provideProxySettingsRepository(
+        proxySettingsDao: ProxySettingsDao,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    ): ProxySettingsRepository {
+        return RoomProxySettingsRepository(proxySettingsDao, ioDispatcher)
+    }
+
     @Singleton
     @Provides
     fun providePreferencesDataStore(
@@ -89,8 +108,14 @@ class RepositoryModule {
         settingsRepository: AppSettingRepository,
         tunnelRepository: TunnelRepository,
         appStateRepository: AppStateRepository,
+        proxySettingsRepository: ProxySettingsRepository,
     ): AppDataRepository {
-        return AppDataRoomRepository(settingsRepository, tunnelRepository, appStateRepository)
+        return AppDataRoomRepository(
+            settingsRepository,
+            tunnelRepository,
+            appStateRepository,
+            proxySettingsRepository,
+        )
     }
 
     @Provides

app/src/main/java/com/zaneschepke/wireguardautotunnel/di/TunnelModule.kt

@@ -7,7 +7,6 @@ import com.wireguard.android.util.ToolsInstaller
 import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
 import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.*
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
@@ -26,6 +25,7 @@ import kotlinx.coroutines.flow.distinctUntilChangedBy
 import kotlinx.coroutines.flow.map
 import org.amnezia.awg.backend.Backend
 import org.amnezia.awg.backend.GoBackend
+import org.amnezia.awg.backend.ProxyGoBackend
 import org.amnezia.awg.backend.RootTunnelActionHandler
 
 @Module
@@ -48,10 +48,21 @@ class TunnelModule {
 
     @Provides
     @Singleton
+    @Userspace
     fun provideAmneziaBackend(@ApplicationContext context: Context): Backend {
         return GoBackend(context, RootTunnelActionHandler(org.amnezia.awg.util.RootShell(context)))
     }
 
+    @Provides
+    @Singleton
+    @ProxyUserspace
+    fun provideAmneziaProxyBackend(@ApplicationContext context: Context): Backend {
+        return ProxyGoBackend(
+            context,
+            RootTunnelActionHandler(org.amnezia.awg.util.RootShell(context)),
+        )
+    }
+
     @Provides
     @Singleton
     fun provideKernelBackend(
@@ -86,7 +97,19 @@ class TunnelModule {
         @ApplicationScope applicationScope: CoroutineScope,
         serviceManager: ServiceManager,
         appDataRepository: AppDataRepository,
-        backend: Backend,
+        @Userspace backend: Backend,
+    ): TunnelProvider {
+        return UserspaceTunnel(applicationScope, serviceManager, appDataRepository, backend)
+    }
+
+    @Provides
+    @Singleton
+    @ProxyUserspace
+    fun provideProxyUserspaceProvider(
+        @ApplicationScope applicationScope: CoroutineScope,
+        serviceManager: ServiceManager,
+        appDataRepository: AppDataRepository,
+        @ProxyUserspace backend: Backend,
     ): TunnelProvider {
         return UserspaceTunnel(applicationScope, serviceManager, appDataRepository, backend)
     }
@@ -96,14 +119,17 @@ class TunnelModule {
     fun provideTunnelManager(
         @Kernel kernelTunnel: TunnelProvider,
         @Userspace userspaceTunnel: TunnelProvider,
+        @ProxyUserspace proxyTunnel: TunnelProvider,
+        serviceManager: ServiceManager,
         appDataRepository: AppDataRepository,
         @IoDispatcher ioDispatcher: CoroutineDispatcher,
         @ApplicationScope applicationScope: CoroutineScope,
-        notificationManager: NotificationManager,
     ): TunnelManager {
         return TunnelManager(
             kernelTunnel,
             userspaceTunnel,
+            proxyTunnel,
+            serviceManager,
             appDataRepository,
             applicationScope,
             ioDispatcher,

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/BackendMode.kt

@@ -0,0 +1,7 @@
+package com.zaneschepke.wireguardautotunnel.domain.enums
+
+sealed class BackendMode {
+    data object Inactive : BackendMode()
+
+    data class KillSwitch(val allowedIps: Set<String>) : BackendMode()
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/BackendState.kt

@@ -1,9 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.enums
-
-sealed class BackendStatus {
-    data object Inactive : BackendStatus()
-
-    data object Active : BackendStatus()
-
-    data class KillSwitch(val allowedIps: List<String>) : BackendStatus()
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/events/AutoTunnelEvent.kt

@@ -11,8 +11,4 @@ sealed class AutoTunnelEvent {
     data object Stop : AutoTunnelEvent()
 
     data object DoNothing : AutoTunnelEvent()
-
-    data class StartKillSwitch(val allowedIps: List<String>) : AutoTunnelEvent()
-
-    data object StopKillSwitch : AutoTunnelEvent()
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/model/AppProxySettings.kt

@@ -0,0 +1,16 @@
+package com.zaneschepke.wireguardautotunnel.domain.model
+
+data class AppProxySettings(
+    val id: Long = 0,
+    val socks5ProxyEnabled: Boolean = false,
+    val socks5ProxyBindAddress: String? = null,
+    val httpProxyEnabled: Boolean = false,
+    val httpProxyBindAddress: String? = null,
+    val proxyUsername: String? = null,
+    val proxyPassword: String? = null,
+) {
+    companion object {
+        const val DEFAULT_SOCKS_BIND_ADDRESS = "127.0.0.1:25344"
+        const val DEFAULT_HTTP_BIND_ADDRESS = "127.0.0.1:25345"
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/model/AppSettings.kt

@@ -1,6 +1,8 @@
 package com.zaneschepke.wireguardautotunnel.domain.model
 
 import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
 
 data class AppSettings(
     val id: Int = 0,
@@ -11,11 +13,9 @@ data class AppSettings(
     val isTunnelOnEthernetEnabled: Boolean = false,
     val isShortcutsEnabled: Boolean = false,
     val isTunnelOnWifiEnabled: Boolean = false,
-    val isKernelEnabled: Boolean = false,
     val isRestoreOnBootEnabled: Boolean = false,
     val isMultiTunnelEnabled: Boolean = false,
     val isPingEnabled: Boolean = false,
-    val isAmneziaEnabled: Boolean = false,
     val isWildcardsEnabled: Boolean = false,
     val isStopOnNoInternetEnabled: Boolean = false,
     val isVpnKillSwitchEnabled: Boolean = false,
@@ -29,6 +29,9 @@ data class AppSettings(
     val tunnelPingIntervalSeconds: Int = 30,
     val tunnelPingAttempts: Int = 3,
     val tunnelPingTimeoutSeconds: Int? = null,
+    val appMode: AppMode = AppMode.VPN,
+    val dnsProtocol: DnsProtocol = DnsProtocol.SYSTEM,
+    val dnsEndpoint: String? = null,
 ) {
     fun toAutoTunnelStateString(): String {
         return """

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/model/TunnelConf.kt

@@ -99,8 +99,6 @@ data class TunnelConf(
 
     override fun getName(): String = tunName
 
-    override fun isIpv4ResolutionPreferred(): Boolean = isIpv4Preferred
-
     override fun onStateChange(newState: org.amnezia.awg.backend.Tunnel.State) {
         stateChangeCallback?.invoke(newState)
     }
@@ -109,6 +107,10 @@ data class TunnelConf(
         stateChangeCallback?.invoke(newState)
     }
 
+    override fun isIpv4ResolutionPreferred(): Boolean {
+        return true
+    }
+
     fun generateUniqueName(tunnelNames: List<String>): String {
         var tunnelName = this.tunName
         var num = 1
@@ -142,7 +144,7 @@ data class TunnelConf(
             config: org.amnezia.awg.config.Config,
             name: String? = null,
         ): TunnelConf {
-            val amQuick = config.toAwgQuickString(true)
+            val amQuick = config.toAwgQuickString(true, false)
             val wgQuick = config.toWgQuickString()
             return TunnelConf(
                 tunName = name ?: config.defaultName(),
@@ -154,8 +156,8 @@ data class TunnelConf(
         private const val IPV6_ALL_NETWORKS = "::/0"
         private const val IPV4_ALL_NETWORKS = "0.0.0.0/0"
         val ALL_IPS = listOf(IPV4_ALL_NETWORKS, IPV6_ALL_NETWORKS)
-        private val IPV4_PUBLIC_NETWORKS =
+        val IPV4_PUBLIC_NETWORKS =
-            listOf(
+            setOf(
                 "0.0.0.0/5",
                 "8.0.0.0/7",
                 "11.0.0.0/8",
@@ -187,6 +189,6 @@ data class TunnelConf(
                 "200.0.0.0/5",
                 "208.0.0.0/4",
             )
-        val LAN_BYPASS_ALLOWED_IPS = listOf(IPV6_ALL_NETWORKS) + IPV4_PUBLIC_NETWORKS
+        val LAN_BYPASS_ALLOWED_IPS = setOf(IPV6_ALL_NETWORKS) + IPV4_PUBLIC_NETWORKS
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/repository/AppDataRepository.kt

@@ -10,4 +10,6 @@ interface AppDataRepository {
     val settings: AppSettingRepository
     val tunnels: TunnelRepository
     val appState: AppStateRepository
+
+    val proxySettings: ProxySettingsRepository
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/repository/ProxySettingsRepository.kt

@@ -0,0 +1,12 @@
+package com.zaneschepke.wireguardautotunnel.domain.repository
+
+import com.zaneschepke.wireguardautotunnel.domain.model.AppProxySettings
+import kotlinx.coroutines.flow.Flow
+
+interface ProxySettingsRepository {
+    suspend fun save(proxySettings: AppProxySettings)
+
+    val flow: Flow<AppProxySettings>
+
+    suspend fun get(): AppProxySettings
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/state/AutoTunnelState.kt

@@ -53,16 +53,6 @@ data class AutoTunnelState(
                         return AutoTunnelEvent.Stop
                     }
                 }
-                // Handle kill switch only if no user tunnel is or will be active
-                if (stopKillSwitchOnTrusted()) {
-                    return AutoTunnelEvent.StopKillSwitch
-                }
-                if (startKillSwitch()) {
-                    val allowedIps =
-                        if (settings.isLanOnKillSwitchEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS
-                        else emptyList()
-                    return StartKillSwitch(allowedIps)
-                }
             }
             is StateChange.MonitoringChange -> {
                 val bounceTunnels = bounceOnPingFailed()

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/state/TunnelState.kt

@@ -1,12 +1,12 @@
 package com.zaneschepke.wireguardautotunnel.domain.state
 
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import org.amnezia.awg.crypto.Key
 
 data class TunnelState(
     val status: TunnelStatus = TunnelStatus.Down,
-    val backendState: BackendStatus = BackendStatus.Inactive,
+    val backendState: BackendMode = BackendMode.Inactive,
     val statistics: TunnelStatistics? = null,
     val pingStates: Map<Key, PingState>? = null,
     val handshakeSuccessLogs: Boolean? = null,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/Route.kt

@@ -7,8 +7,6 @@ sealed class Route {
 
     @Serializable data object Settings : Route()
 
-    @Serializable data object SettingsAdvanced : Route()
-
     @Serializable data object AutoTunnel : Route()
 
     @Serializable data object AutoTunnelAdvanced : Route()
@@ -21,8 +19,6 @@ sealed class Route {
 
     @Serializable data object Display : Route()
 
-    @Serializable data object KillSwitch : Route()
-
     @Serializable data object Language : Route()
 
     @Serializable data object Main : Route()
@@ -49,4 +45,10 @@ sealed class Route {
     @Serializable data object Sort : Route()
 
     @Serializable data object TunnelMonitoring : Route()
+
+    @Serializable data object SystemFeatures : Route()
+
+    @Serializable data object ProxySettings : Route()
+
+    @Serializable data object Dns : Route()
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/SecureScreenFromRecording.kt

@@ -0,0 +1,25 @@
+package com.zaneschepke.wireguardautotunnel.ui.common
+
+import android.view.WindowManager
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.ui.platform.LocalContext
+import com.zaneschepke.wireguardautotunnel.MainActivity
+
+@Composable
+fun SecureScreenFromRecording() {
+    val context = LocalContext.current
+
+    val activity = context as? MainActivity
+
+    // Secure screen due to sensitive information
+    DisposableEffect(Unit) {
+        activity
+            ?.window
+            ?.setFlags(
+                WindowManager.LayoutParams.FLAG_SECURE,
+                WindowManager.LayoutParams.FLAG_SECURE,
+            )
+        onDispose { activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE) }
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/animation/ShimmerEffect.kt

@@ -1,34 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.animation
-
-import androidx.compose.animation.core.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-
-@Composable
-fun ShimmerEffect(modifier: Modifier = Modifier): Brush {
-    val shimmerColors =
-        listOf(
-            Color.LightGray.copy(alpha = 0.9f),
-            Color.LightGray.copy(alpha = 0.3f),
-            Color.LightGray.copy(alpha = 0.9f),
-        )
-
-    val transition = rememberInfiniteTransition()
-    val translateAnim by
-        transition.animateFloat(
-            initialValue = 0f,
-            targetValue = 1000f,
-            animationSpec =
-                infiniteRepeatable(animation = tween(durationMillis = 1200, easing = LinearEasing)),
-        )
-
-    return Brush.linearGradient(
-        colors = shimmerColors,
-        start = Offset(0f, 0f),
-        end = Offset(translateAnim, translateAnim),
-    )
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/banner/AppAlertBanner.kt

@@ -0,0 +1,42 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.banner
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+@Composable
+fun AppAlertBanner(
+    message: String,
+    textColor: Color,
+    containerColor: Color,
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .height(IntrinsicSize.Min)
+                .background(
+                    color = containerColor,
+                    shape = RoundedCornerShape(bottomStart = 8.dp, bottomEnd = 8.dp),
+                )
+                .clip(RoundedCornerShape(bottomStart = 8.dp, bottomEnd = 8.dp))
+                .statusBarsPadding()
+    ) {
+        Text(
+            text = message,
+            color = textColor,
+            style = MaterialTheme.typography.labelSmall.copy(fontSize = 8.sp),
+            modifier = Modifier.align(Alignment.Center).padding(bottom = 5.dp),
+        )
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/IconSurfaceButton.kt

@@ -13,7 +13,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 
-@androidx.compose.runtime.Composable
+@Composable
 fun IconSurfaceButton(
     title: String,
     onClick: () -> Unit,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/LinkIconButton.kt

@@ -0,0 +1,19 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.button
+
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.OpenInNew
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
+
+@Composable
+fun LinkIconButton(modifier: Modifier = Modifier.focusable(), onClick: () -> Unit) {
+    IconButton(modifier = modifier, onClick = onClick) {
+        val icon = Icons.AutoMirrored.Outlined.OpenInNew
+        Icon(icon, icon.name, Modifier.size(iconSize))
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/SelectionItemButton.kt

@@ -37,18 +37,20 @@ fun SelectionItemButton(
     ) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.Start,
+            horizontalArrangement = Arrangement.SpaceBetween,
             modifier = Modifier.fillMaxSize().padding(horizontal = 12.dp),
         ) {
-            leading?.let { it() }
+            Row {
-            Text(
+                leading?.let { it() }
-                buttonText,
+                Text(
-                style = MaterialTheme.typography.labelMedium,
+                    buttonText,
-                color = MaterialTheme.colorScheme.onSurface,
+                    style = MaterialTheme.typography.labelMedium,
-                modifier = Modifier.fillMaxWidth(3 / 4f),
+                    color = MaterialTheme.colorScheme.onSurface,
-                maxLines = 2,
+                    modifier = Modifier.fillMaxWidth(3 / 4f),
-                overflow = TextOverflow.Ellipsis,
+                    maxLines = 2,
-            )
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
             trailing?.let { it() }
         }
     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/config/ConfigurationToggle.kt

@@ -1,41 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.config
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.style.TextAlign
-import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
-
-@Composable
-fun ConfigurationToggle(
-    label: String,
-    enabled: Boolean = true,
-    checked: Boolean,
-    onCheckChanged: (checked: Boolean) -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    Row(
-        modifier = Modifier.fillMaxWidth(),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.SpaceBetween,
-    ) {
-        Text(
-            label,
-            textAlign = TextAlign.Start,
-            style = MaterialTheme.typography.labelLarge,
-            modifier = Modifier.weight(weight = 1.0f, fill = false),
-            softWrap = true,
-        )
-        ScaledSwitch(
-            modifier = modifier,
-            enabled = enabled,
-            checked = checked,
-            onClick = { onCheckChanged(it) },
-        )
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/dropdown/DropdownSelector.kt

@@ -2,7 +2,7 @@ package com.zaneschepke.wireguardautotunnel.ui.common.dropdown
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowDropDown
@@ -23,37 +23,29 @@ fun <T> DropdownSelector(
     label: @Composable (() -> Unit)? = null,
     isExpanded: Boolean = false,
     onDismiss: () -> Unit = {},
+    optionToString: @Composable (T?) -> String = {
+        it?.toString() ?: stringResource(R.string._default)
+    },
 ) {
     Row(
         horizontalArrangement = Arrangement.spacedBy(5.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
         if (label != null) label()
-        Text(
+        Text(text = optionToString(currentValue), style = MaterialTheme.typography.bodyMedium)
-            text = currentValue?.toString() ?: stringResource(R.string._default),
-            style = MaterialTheme.typography.bodyMedium,
-        )
         Icon(Icons.Default.ArrowDropDown, contentDescription = stringResource(R.string.dropdown))
     }
+
     DropdownMenu(
-        modifier = modifier.height(250.dp),
+        modifier = modifier.heightIn(max = 250.dp),
         scrollState = rememberScrollState(),
         containerColor = MaterialTheme.colorScheme.surface,
         expanded = isExpanded,
         onDismissRequest = onDismiss,
     ) {
         options.forEach { option ->
-            if (option == null) {
-                return@forEach DropdownMenuItem(
-                    text = { Text(text = stringResource(R.string._default)) },
-                    onClick = {
-                        onValueSelected(null)
-                        onDismiss()
-                    },
-                )
-            }
             DropdownMenuItem(
-                text = { Text(text = option.toString()) },
+                text = { Text(optionToString(option)) },
                 onClick = {
                     onValueSelected(option)
                     onDismiss()

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/dropdown/LabelledNumberDropdown.kt

@@ -5,15 +5,17 @@ import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionIte
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
 
 @Composable
-fun LabelledNumberDropdown(
+fun <T> LabelledDropdown(
     title: @Composable () -> Unit,
     description: (@Composable () -> Unit)? = null,
     leading: @Composable () -> Unit,
-    onSelected: (Int?) -> Unit,
+    onSelected: (T?) -> Unit,
-    options: List<Int?>,
+    options: List<T?>,
-    currentValue: Int?,
+    currentValue: T?,
+    optionToString: @Composable (T?) -> String,
 ) {
     var isDropDownExpanded by remember { mutableStateOf(false) }
+
     SurfaceSelectionGroupButton(
         listOf(
             SelectionItem(
@@ -25,9 +27,10 @@ fun LabelledNumberDropdown(
                     DropdownSelector(
                         currentValue = currentValue,
                         options = options,
-                        onValueSelected = { num -> onSelected(num) },
+                        onValueSelected = { selected -> onSelected(selected) },
                         isExpanded = isDropDownExpanded,
                         onDismiss = { isDropDownExpanded = false },
+                        optionToString = optionToString,
                     )
                 },
             )

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/sheet/CustomBottomSheet.kt

@@ -0,0 +1,69 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.sheet
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Check
+import androidx.compose.material3.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.R
+
+@Composable
+fun SheetOption(
+    label: String,
+    leadingIcon: ImageVector? = null,
+    onClick: () -> Unit,
+    selected: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier.fillMaxWidth().clickable(onClick = onClick).padding(10.dp),
+        horizontalArrangement = Arrangement.SpaceBetween,
+    ) {
+        Row {
+            leadingIcon?.let {
+                Icon(
+                    imageVector = it,
+                    contentDescription = null,
+                    modifier = Modifier.padding(10.dp),
+                )
+            }
+            Text(text = label, modifier = Modifier.padding(10.dp))
+        }
+        if (selected) {
+            Icon(
+                imageVector = Icons.Outlined.Check,
+                contentDescription = stringResource(R.string.selected),
+                modifier = Modifier.padding(10.dp),
+            )
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CustomBottomSheet(options: List<SheetOption>, onDismiss: () -> Unit) {
+    ModalBottomSheet(
+        containerColor = MaterialTheme.colorScheme.surface,
+        onDismissRequest = onDismiss,
+    ) {
+        options.forEachIndexed { index, option ->
+            SheetOption(option.label, option.leadingIcon, option.onClick, option.selected)
+            if (index != options.size - 1) HorizontalDivider()
+        }
+    }
+}
+
+data class SheetOption(
+    val leadingIcon: ImageVector,
+    val label: String,
+    val onClick: () -> Unit,
+    val selected: Boolean = false,
+)

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/textbox/ConfigurationTextBox.kt

@@ -1,55 +1,70 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.config
+package com.zaneschepke.wireguardautotunnel.ui.common.textbox
 
 import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.unit.dp
 
 @Composable
 fun ConfigurationTextBox(
     value: String,
+    label: String,
     hint: String,
     onValueChange: (String) -> Unit,
+    modifier: Modifier = Modifier,
     keyboardActions: KeyboardActions = KeyboardActions(),
-    label: String,
-    modifier: Modifier,
     isError: Boolean = false,
     keyboardOptions: KeyboardOptions =
         KeyboardOptions(capitalization = KeyboardCapitalization.None, imeAction = ImeAction.Done),
+    leading: (@Composable () -> Unit)? = null,
     trailing: (@Composable () -> Unit)? = null,
-    interactionSource: MutableInteractionSource? = null,
+    supportingText: (@Composable () -> Unit)? = null,
+    interactionSource: MutableInteractionSource = MutableInteractionSource(),
+    visualTransformation: VisualTransformation = VisualTransformation.None,
+    enabled: Boolean = true,
+    readOnly: Boolean = false,
+    singleLine: Boolean = true,
 ) {
-    OutlinedTextField(
+    CustomTextField(
         isError = isError,
-        textStyle = MaterialTheme.typography.labelLarge,
+        textStyle =
-        modifier = modifier,
+            MaterialTheme.typography.bodySmall.copy(color = MaterialTheme.colorScheme.onSurface),
+        modifier = modifier.fillMaxWidth().height(48.dp),
         value = value,
-        singleLine = true,
+        visualTransformation = visualTransformation,
+        singleLine = singleLine,
         interactionSource = interactionSource,
         onValueChange = { onValueChange(it) },
         label = {
             Text(
                 label,
                 color = MaterialTheme.colorScheme.onSurface,
-                style = MaterialTheme.typography.bodyMedium,
+                style = MaterialTheme.typography.labelMedium,
             )
         },
-        maxLines = 1,
+        containerColor = MaterialTheme.colorScheme.surface,
         placeholder = {
             Text(
                 hint,
+                style = MaterialTheme.typography.bodySmall,
                 color = MaterialTheme.colorScheme.outline,
-                style = MaterialTheme.typography.bodyMedium,
             )
         },
         keyboardOptions = keyboardOptions,
         keyboardActions = keyboardActions,
-        trailingIcon = trailing,
+        trailing = trailing,
+        supportingText = supportingText,
+        leading = leading,
+        readOnly = readOnly,
+        enabled = enabled,
     )
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/textbox/CustomTextField.kt

@@ -27,7 +27,7 @@ fun CustomTextField(
     label: @Composable () -> Unit,
     containerColor: Color,
     onValueChange: (value: String) -> Unit = {},
-    singleLine: Boolean = false,
+    singleLine: Boolean = true,
     placeholder: @Composable (() -> Unit)? = null,
     keyboardOptions: KeyboardOptions = KeyboardOptions(),
     keyboardActions: KeyboardActions = KeyboardActions(),
@@ -37,7 +37,8 @@ fun CustomTextField(
     isError: Boolean = false,
     readOnly: Boolean = false,
     enabled: Boolean = true,
-    interactionSource: MutableInteractionSource,
+    visualTransformation: VisualTransformation = VisualTransformation.None,
+    interactionSource: MutableInteractionSource = MutableInteractionSource(),
 ) {
     val space = " "
     BasicTextField(
@@ -52,6 +53,7 @@ fun CustomTextField(
         interactionSource = interactionSource,
         enabled = enabled,
         singleLine = singleLine,
+        visualTransformation = visualTransformation,
     ) {
         OutlinedTextFieldDefaults.DecorationBox(
             value = space + value,
@@ -81,14 +83,14 @@ fun CustomTextField(
                     ),
             enabled = enabled,
             label = label,
-            visualTransformation = VisualTransformation.None,
+            visualTransformation = visualTransformation,
             interactionSource = interactionSource,
             placeholder = placeholder,
             container = {
-                OutlinedTextFieldDefaults.ContainerBox(
+                OutlinedTextFieldDefaults.Container(
-                    enabled,
+                    enabled = enabled,
                     isError = isError,
-                    interactionSource,
+                    interactionSource = interactionSource,
                     colors =
                         TextFieldDefaults.colors()
                             .copy(

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/textbox/SubmitConfigurationTextBox.kt

@@ -1,9 +1,9 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.config
+package com.zaneschepke.wireguardautotunnel.ui.common.textbox
 
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsFocusedAsState
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
@@ -19,13 +19,13 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.common.textbox.CustomTextField
 
 @Composable
 fun SubmitConfigurationTextBox(
     value: String?,
     label: String,
     hint: String,
+    modifier: Modifier = Modifier,
     isErrorValue: (value: String?) -> Boolean,
     onSubmit: (value: String) -> Unit,
     supportingText: @Composable (() -> Unit)? = null,
@@ -62,7 +62,7 @@ fun SubmitConfigurationTextBox(
                 color = MaterialTheme.colorScheme.outline,
             )
         },
-        modifier = Modifier.padding(top = 5.dp, bottom = 10.dp).fillMaxWidth().padding(end = 16.dp),
+        modifier = modifier.fillMaxWidth().height(48.dp),
         singleLine = true,
         keyboardOptions = keyboardOptions,
         keyboardActions =

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/navigation/components/DynamicTopAppBar.kt

@@ -11,12 +11,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.ui.state.NavBarState
+import com.zaneschepke.wireguardautotunnel.ui.theme.LockedDownBannerHeight
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun DynamicTopAppBar(navBarState: NavBarState, modifier: Modifier = Modifier) {
     TopAppBar(
-        modifier = modifier,
+        modifier = modifier.padding(top = LockedDownBannerHeight),
         colors = TopAppBarDefaults.topAppBarColors().copy(Color.Transparent),
         title = {
             AnimatedVisibility(

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/navigation/components/currentNavBackStackEntryAsNavBarState.kt

@@ -15,6 +15,7 @@ import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavController
@@ -38,6 +39,8 @@ fun currentNavBackStackEntryAsNavBarState(
     uiState: AppUiState,
     appViewState: AppViewState,
 ): State<NavBarState> {
+    val context = LocalContext.current
+
     fun isActiveSelected() =
         uiState.activeTunnels.any { active ->
             appViewState.selectedTunnels.any { it.id == active.key.id }
@@ -144,7 +147,10 @@ fun currentNavBackStackEntryAsNavBarState(
                         topTitle = { Text(stringResource(R.string.settings)) },
                         route = Route.Settings,
                         topTrailing = {
-                            ActionIconButton(Icons.Rounded.Menu, R.string.quick_actions) {
+                            ActionIconButton(
+                                Icons.Rounded.SettingsBackupRestore,
+                                R.string.quick_actions,
+                            ) {
                                 viewModel.handleEvent(
                                     AppEvent.SetBottomSheet(
                                         AppViewState.BottomSheet.BACKUP_AND_RESTORE
@@ -178,16 +184,33 @@ fun currentNavBackStackEntryAsNavBarState(
                         route = Route.TunnelMonitoring,
                     )
 
+                backStackEntry.isCurrentRoute(Route.ProxySettings::class) ->
+                    NavBarState(
+                        topTitle = { Text(stringResource(R.string.proxy_settings)) },
+                        route = Route.ProxySettings,
+                        topTrailing = {
+                            ActionIconButton(Icons.Rounded.Save, R.string.save) {
+                                viewModel.handleEvent(AppEvent.InvokeScreenAction)
+                            }
+                        },
+                    )
+
                 backStackEntry.isCurrentRoute(Route.WifiDetectionMethod::class) ->
                     NavBarState(
                         topTitle = { Text(stringResource(R.string.wifi_detection_method)) },
                         route = Route.WifiDetectionMethod,
                     )
 
-                backStackEntry.isCurrentRoute(Route.KillSwitch::class) ->
+                backStackEntry.isCurrentRoute(Route.SystemFeatures::class) ->
                     NavBarState(
-                        topTitle = { Text(stringResource(R.string.kill_switch)) },
+                        topTitle = { Text(stringResource(R.string.android_integrations)) },
-                        route = Route.KillSwitch,
+                        route = Route.SystemFeatures,
+                    )
+
+                backStackEntry.isCurrentRoute(Route.Dns::class) ->
+                    NavBarState(
+                        topTitle = { Text(stringResource(R.string.dns_settings)) },
+                        route = Route.Dns,
                     )
 
                 backStackEntry.isCurrentRoute(Route.Support::class) ->
@@ -224,8 +247,7 @@ fun currentNavBackStackEntryAsNavBarState(
                     )
                 }
 
-                backStackEntry.isCurrentRoute(Route.AutoTunnelAdvanced::class) ||
+                backStackEntry.isCurrentRoute(Route.AutoTunnelAdvanced::class) ->
-                    backStackEntry.isCurrentRoute(Route.SettingsAdvanced::class) ->
                     NavBarState(
                         showTop = true,
                         showBottom = true,
@@ -278,12 +300,14 @@ fun currentNavBackStackEntryAsNavBarState(
 
                 backStackEntry.isCurrentRoute(Route.Config::class) -> {
                     val args = backStackEntry?.toRoute<Route.Config>()
-                    val name = uiState.tunnels.find { it.id == args?.id }?.name
+                    val name =
+                        uiState.tunnels.find { it.id == args?.id }?.name
+                            ?: context.getString(R.string.new_tunnel)
 
                     NavBarState(
                         showTop = true,
                         showBottom = true,
-                        topTitle = { name?.let { Text(it) } },
+                        topTitle = { Text(name) },
                         topTrailing = {
                             ActionIconButton(Icons.Rounded.Save, R.string.save) {
                                 viewModel.handleEvent(AppEvent.InvokeScreenAction)

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

@@ -145,7 +145,14 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AppViewModel) {
                         title = { Text(title) },
                         trailing = {
                             Button({ viewModel.handleEvent(AppEvent.ToggleAutoTunnel) }) {
-                                Text(buttonText, fontWeight = FontWeight.Bold)
+                                Text(
+                                    buttonText,
+                                    fontWeight = FontWeight.Bold,
+                                    style =
+                                        MaterialTheme.typography.bodyMedium.copy(
+                                            color = MaterialTheme.colorScheme.surface
+                                        ),
+                                )
                             }
                         },
                     )

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

@@ -17,7 +17,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.dropdown.LabelledNumberDropdown
+import com.zaneschepke.wireguardautotunnel.ui.common.dropdown.LabelledDropdown
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
@@ -33,7 +33,7 @@ fun AutoTunnelAdvancedScreen(appUiState: AppUiState, viewModel: AppViewModel) {
                 .padding(vertical = 24.dp)
                 .padding(horizontal = 12.dp),
     ) {
-        LabelledNumberDropdown(
+        LabelledDropdown(
             title = {
                 Text(
                     stringResource(R.string.debounce_delay),
@@ -49,6 +49,7 @@ fun AutoTunnelAdvancedScreen(appUiState: AppUiState, viewModel: AppViewModel) {
             },
             options = (0..10).toList(),
             currentValue = appUiState.appSettings.debounceDelaySeconds,
+            optionToString = { it?.toString() ?: stringResource(R.string._default) },
         )
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/autotunnel/components/wifiTunnelingItems.kt

@@ -27,7 +27,7 @@ import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.LearnMoreLinkLabel
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
-import com.zaneschepke.wireguardautotunnel.util.extensions.asString
+import com.zaneschepke.wireguardautotunnel.util.extensions.asTitleString
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
@@ -123,7 +123,7 @@ fun WifiTunnelingItems(
                         Text(
                             stringResource(
                                 R.string.current_template,
-                                uiState.appSettings.wifiDetectionMethod.asString(context),
+                                uiState.appSettings.wifiDetectionMethod.asTitleString(context),
                             ),
                             style =
                                 MaterialTheme.typography.bodySmall.copy(

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/autotunnel/detection/WifiDetectionMethodScreen.kt

@@ -13,7 +13,7 @@ import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
 import com.zaneschepke.wireguardautotunnel.ui.common.button.IconSurfaceButton
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.util.extensions.asDescriptionString
-import com.zaneschepke.wireguardautotunnel.util.extensions.asString
+import com.zaneschepke.wireguardautotunnel.util.extensions.asTitleString
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
@@ -26,7 +26,7 @@ fun WifiDetectionMethodScreen(uiState: AppUiState, viewModel: AppViewModel) {
         modifier = Modifier.fillMaxSize().padding(top = 24.dp).padding(horizontal = 24.dp),
     ) {
         enumValues<AndroidNetworkMonitor.WifiDetectionMethod>().forEach {
-            val title = it.asString(context)
+            val title = it.asTitleString(context)
             val description = it.asDescriptionString(context)
             IconSurfaceButton(
                 title = title,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/ExportTunnelsBottomSheet.kt

@@ -1,20 +1,16 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
 
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.FolderZip
-import androidx.compose.material3.*
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.domain.enums.ConfigType
 import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberFileExportLauncherForResult
+import com.zaneschepke.wireguardautotunnel.ui.common.sheet.CustomBottomSheet
+import com.zaneschepke.wireguardautotunnel.ui.common.sheet.SheetOption
 import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.AuthorizationPromptWrapper
 import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
@@ -74,47 +70,34 @@ fun ExportTunnelsBottomSheet(viewModel: AppViewModel) {
         )
     }
 
-    ModalBottomSheet(
+    CustomBottomSheet(
-        containerColor = MaterialTheme.colorScheme.surface,
+        listOf(
-        onDismissRequest = {
+            SheetOption(
-            viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+                Icons.Outlined.FolderZip,
-        },
+                stringResource(R.string.export_tunnels_amnezia),
+                onClick = {
+                    exportConfigType = ConfigType.AM
+                    if (!isAuthorized && !isTv) {
+                        showAuthPrompt = true
+                    } else {
+                        shouldExport = true
+                    }
+                },
+            ),
+            SheetOption(
+                Icons.Outlined.FolderZip,
+                stringResource(R.string.export_tunnels_wireguard),
+                onClick = {
+                    exportConfigType = ConfigType.WG
+                    if (!isAuthorized && !isTv) {
+                        showAuthPrompt = true
+                    } else {
+                        shouldExport = true
+                    }
+                },
+            ),
+        )
     ) {
-        ExportOptionRow(
+        viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
-            label = stringResource(R.string.export_tunnels_amnezia),
-            onClick = {
-                exportConfigType = ConfigType.AM
-                if (!isAuthorized && !isTv) {
-                    showAuthPrompt = true
-                } else {
-                    shouldExport = true
-                }
-            },
-        )
-        HorizontalDivider()
-
-        ExportOptionRow(
-            label = stringResource(R.string.export_tunnels_wireguard),
-            onClick = {
-                exportConfigType = ConfigType.WG
-                if (!isAuthorized && !isTv) {
-                    showAuthPrompt = true
-                } else {
-                    shouldExport = true
-                }
-            },
-        )
-    }
-}
-
-@Composable
-private fun ExportOptionRow(label: String, onClick: () -> Unit) {
-    Row(modifier = Modifier.fillMaxWidth().clickable(onClick = onClick).padding(10.dp)) {
-        Icon(
-            imageVector = Icons.Outlined.FolderZip,
-            contentDescription = label,
-            modifier = Modifier.padding(10.dp),
-        )
-        Text(text = label, modifier = Modifier.padding(10.dp))
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/TunnelImportSheet.kt

@@ -1,21 +1,15 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
 
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
-import androidx.compose.material3.*
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.common.sheet.CustomBottomSheet
+import com.zaneschepke.wireguardautotunnel.ui.common.sheet.SheetOption
 import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
 
-// TODO refactor this component
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun TunnelImportSheet(
@@ -28,99 +22,61 @@ fun TunnelImportSheet(
 ) {
     val isTv = LocalIsAndroidTV.current
 
-    val sheetState = rememberModalBottomSheetState()
+    CustomBottomSheet(
-
+        buildList {
-    val context = LocalContext.current
+            add(
-    ModalBottomSheet(
+                SheetOption(
-        containerColor = MaterialTheme.colorScheme.surface,
+                    Icons.Outlined.FileOpen,
-        onDismissRequest = { onDismiss() },
+                    stringResource(R.string.add_tunnels_text),
-        sheetState = sheetState,
+                    onClick = {
-    ) {
-        Row(
-            modifier =
-                Modifier.fillMaxWidth()
-                    .clickable {
                         onDismiss()
                         onFileClick()
-                    }
+                    },
-                    .padding(10.dp)
+                )
-        ) {
-            Icon(
-                Icons.Filled.FileOpen,
-                contentDescription = stringResource(id = R.string.open_file),
-                modifier = Modifier.padding(10.dp),
             )
-            Text(stringResource(id = R.string.add_tunnels_text), modifier = Modifier.padding(10.dp))
+            if (!isTv)
-        }
+                add(
-        if (!isTv) {
+                    SheetOption(
-            HorizontalDivider()
+                        Icons.Outlined.QrCode,
-            Row(
+                        stringResource(R.string.add_from_qr),
-                modifier =
+                        onClick = {
-                    Modifier.fillMaxWidth()
-                        .clickable {
                             onDismiss()
                             onQrClick()
-                        }
+                        },
-                        .padding(10.dp)
+                    )
-            ) {
-                Icon(
-                    Icons.Filled.QrCode,
-                    contentDescription = stringResource(id = R.string.qr_scan),
-                    modifier = Modifier.padding(10.dp),
                 )
-                Text(stringResource(id = R.string.add_from_qr), modifier = Modifier.padding(10.dp))
+            add(
-            }
+                SheetOption(
-            HorizontalDivider()
+                    Icons.Outlined.ContentPasteGo,
-            Row(
+                    stringResource(R.string.add_from_clipboard),
-                modifier =
+                    onClick = {
-                    Modifier.fillMaxWidth()
+                        onDismiss()
-                        .clickable {
+                        onClipboardClick()
-                            onDismiss()
+                    },
-                            onClipboardClick()
-                        }
-                        .padding(10.dp)
-            ) {
-                val icon = Icons.Filled.ContentPasteGo
-                Icon(icon, contentDescription = icon.name, modifier = Modifier.padding(10.dp))
-                Text(
-                    stringResource(id = R.string.add_from_clipboard),
-                    modifier = Modifier.padding(10.dp),
                 )
-            }
+            )
-        }
+            add(
-        HorizontalDivider()
+                SheetOption(
-        Row(
+                    Icons.Outlined.Link,
-            modifier =
+                    stringResource(R.string.add_from_url),
-                Modifier.fillMaxWidth()
+                    onClick = {
-                    .clickable {
                         onDismiss()
                         onUrlClick()
-                    }
+                    },
-                    .padding(10.dp)
+                )
-        ) {
-            Icon(
-                Icons.Filled.Link,
-                contentDescription = stringResource(id = R.string.add_from_url),
-                modifier = Modifier.padding(10.dp),
             )
-            Text(stringResource(id = R.string.add_from_url), modifier = Modifier.padding(10.dp))
+            add(
-        }
+                SheetOption(
-        HorizontalDivider()
+                    Icons.Outlined.Create,
-        Row(
+                    stringResource(R.string.create_import),
-            modifier =
+                    onClick = {
-                Modifier.fillMaxWidth()
-                    .clickable {
                         onDismiss()
                         onManualImportClick()
-                    }
+                    },
-                    .padding(10.dp)
+                )
-        ) {
-            Icon(
-                Icons.Filled.Create,
-                contentDescription = stringResource(id = R.string.create_import),
-                modifier = Modifier.padding(10.dp),
             )
-            Text(stringResource(id = R.string.create_import), modifier = Modifier.padding(10.dp))
         }
+    ) {
+        onDismiss()
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/config/ConfigScreen.kt

@@ -1,6 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main.config
 
-import android.view.WindowManager
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -15,9 +14,9 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.zaneschepke.wireguardautotunnel.MainActivity
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.ui.common.SecureScreenFromRecording
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components.AddPeerButton
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components.InterfaceSection
@@ -39,8 +38,6 @@ fun ConfigScreen(
 
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
-    val activity = context as? MainActivity
-
     var save by remember { mutableStateOf(false) }
 
     val isTunnelNameTaken by
@@ -52,16 +49,7 @@ fun ConfigScreen(
             }
         }
 
-    // Secure screen due to sensitive information
+    SecureScreenFromRecording()
-    DisposableEffect(Unit) {
-        activity
-            ?.window
-            ?.setFlags(
-                WindowManager.LayoutParams.FLAG_SECURE,
-                WindowManager.LayoutParams.FLAG_SECURE,
-            )
-        onDispose { activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE) }
-    }
 
     LaunchedEffect(Unit) {
         // set callback for navbar to invoke save
@@ -125,9 +113,13 @@ fun ConfigScreen(
     }
 
     Column(
+        horizontalAlignment = Alignment.Start,
         verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
         modifier =
-            Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(horizontal = 24.dp),
+            Modifier.fillMaxSize()
+                .verticalScroll(rememberScrollState())
+                .padding(top = 12.dp, bottom = 24.dp)
+                .padding(horizontal = 12.dp),
     ) {
         InterfaceSection(isTunnelNameTaken, uiState, viewModel)
         PeersSection(uiState, viewModel)

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/config/components/InterfaceFields.kt

@@ -2,6 +2,7 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.text.KeyboardActions
@@ -9,7 +10,9 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.ContentCopy
 import androidx.compose.material.icons.rounded.Refresh
-import androidx.compose.material3.*
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
@@ -18,10 +21,12 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
+import com.wireguard.crypto.KeyPair
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
 import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberClipboardHelper
+import com.zaneschepke.wireguardautotunnel.ui.common.textbox.ConfigurationTextBox
 import com.zaneschepke.wireguardautotunnel.ui.state.InterfaceProxy
+import java.util.*
 
 @Composable
 fun InterfaceFields(
@@ -37,189 +42,208 @@ fun InterfaceFields(
     val keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() })
     val keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done)
 
-    OutlinedTextField(
+    Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
-        value = interfaceState.privateKey,
+        ConfigurationTextBox(
-        onValueChange = { onInterfaceChange(interfaceState.copy(privateKey = it)) },
+            value = interfaceState.privateKey,
-        label = {
+            hint =
-            Text(stringResource(R.string.private_key), style = MaterialTheme.typography.bodyMedium)
+                stringResource(R.string.hint_template, stringResource(R.string.base64_key))
-        },
+                    .lowercase(Locale.getDefault()),
-        modifier = Modifier.fillMaxWidth().clickable { if (!isAuthenticated) showAuthPrompt() },
+            onValueChange = { onInterfaceChange(interfaceState.copy(privateKey = it)) },
-        visualTransformation =
+            label = stringResource(R.string.private_key),
-            if (isAuthenticated) VisualTransformation.None else PasswordVisualTransformation(),
+            modifier = Modifier.fillMaxWidth().clickable { if (!isAuthenticated) showAuthPrompt() },
-        trailingIcon = {
+            visualTransformation =
-            IconButton(
+                if (isAuthenticated) VisualTransformation.None else PasswordVisualTransformation(),
-                enabled = true,
+            trailing = {
-                onClick = {
+                IconButton(
-                    if (!isAuthenticated) return@IconButton showAuthPrompt()
+                    enabled = true,
-                    val keypair = com.wireguard.crypto.KeyPair()
+                    onClick = {
-                    onInterfaceChange(
+                        if (!isAuthenticated) return@IconButton showAuthPrompt()
-                        interfaceState.copy(
+                        val keypair = KeyPair()
-                            privateKey = keypair.privateKey.toBase64(),
+                        onInterfaceChange(
-                            publicKey = keypair.publicKey.toBase64(),
+                            interfaceState.copy(
+                                privateKey = keypair.privateKey.toBase64(),
+                                publicKey = keypair.publicKey.toBase64(),
+                            )
                         )
+                    },
+                ) {
+                    Icon(
+                        Icons.Rounded.Refresh,
+                        stringResource(R.string.rotate_keys),
+                        tint =
+                            if (isAuthenticated) MaterialTheme.colorScheme.onSurface
+                            else MaterialTheme.colorScheme.outline,
                     )
+                }
+            },
+            enabled = isAuthenticated,
+            singleLine = true,
+            keyboardOptions = keyboardOptions,
+            keyboardActions = keyboardActions,
+        )
+        ConfigurationTextBox(
+            value = interfaceState.publicKey,
+            hint =
+                stringResource(R.string.hint_template, stringResource(R.string.base64_key))
+                    .lowercase(Locale.getDefault()),
+            onValueChange = { onInterfaceChange(interfaceState.copy(publicKey = it)) },
+            label = stringResource(R.string.public_key),
+            enabled = false,
+            modifier = Modifier.fillMaxWidth(),
+            singleLine = true,
+            trailing = {
+                IconButton(onClick = { clipboardManager.copy(interfaceState.publicKey) }) {
+                    Icon(
+                        Icons.Rounded.ContentCopy,
+                        stringResource(R.string.copy_public_key),
+                        tint = MaterialTheme.colorScheme.onSurface,
+                    )
+                }
+            },
+            keyboardOptions = keyboardOptions,
+            keyboardActions = keyboardActions,
+        )
+        ConfigurationTextBox(
+            value = interfaceState.addresses,
+            onValueChange = { onInterfaceChange(interfaceState.copy(addresses = it)) },
+            label = stringResource(R.string.addresses),
+            hint =
+                stringResource(R.string.hint_template, stringResource(R.string.comma_separated))
+                    .lowercase(Locale.getDefault()),
+            modifier = Modifier.fillMaxWidth(),
+        )
+        ConfigurationTextBox(
+            value = interfaceState.listenPort,
+            onValueChange = { onInterfaceChange(interfaceState.copy(listenPort = it)) },
+            label = stringResource(R.string.listen_port),
+            hint = stringResource(R.string.random),
+            modifier = Modifier.fillMaxWidth(),
+        )
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(6.dp),
+        ) {
+            ConfigurationTextBox(
+                value = interfaceState.dnsServers,
+                onValueChange = { onInterfaceChange(interfaceState.copy(dnsServers = it)) },
+                label = stringResource(R.string.dns_servers),
+                hint =
+                    stringResource(R.string.hint_template, stringResource(R.string.comma_separated))
+                        .lowercase(Locale.getDefault()),
+                modifier = Modifier.weight(3f),
+            )
+            ConfigurationTextBox(
+                value = interfaceState.mtu,
+                onValueChange = { onInterfaceChange(interfaceState.copy(mtu = it)) },
+                label = stringResource(R.string.mtu),
+                hint = stringResource(R.string.auto).lowercase(Locale.getDefault()),
+                modifier = Modifier.weight(2f),
+            )
+        }
+        if (showScripts) {
+            ConfigurationTextBox(
+                value = interfaceState.preUp,
+                onValueChange = { onInterfaceChange(interfaceState.copy(preUp = it)) },
+                label = stringResource(R.string.pre_up),
+                hint = stringResource(R.string.hint_template, (R.string.comma_separated)),
+                modifier = Modifier.fillMaxWidth(),
+            )
+            ConfigurationTextBox(
+                value = interfaceState.postUp,
+                onValueChange = { onInterfaceChange(interfaceState.copy(postUp = it)) },
+                label = stringResource(R.string.post_up),
+                hint = stringResource(R.string.hint_template, (R.string.comma_separated)),
+                modifier = Modifier.fillMaxWidth(),
+            )
+            ConfigurationTextBox(
+                value = interfaceState.preDown,
+                onValueChange = { onInterfaceChange(interfaceState.copy(preDown = it)) },
+                label = stringResource(R.string.pre_down),
+                hint = stringResource(R.string.hint_template, (R.string.comma_separated)),
+                modifier = Modifier.fillMaxWidth(),
+            )
+            ConfigurationTextBox(
+                value = interfaceState.postDown,
+                onValueChange = { onInterfaceChange(interfaceState.copy(postDown = it)) },
+                label = stringResource(R.string.post_down),
+                hint = stringResource(R.string.hint_template, (R.string.comma_separated)),
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+        if (showAmneziaValues) {
+            ConfigurationTextBox(
+                value = interfaceState.junkPacketCount,
+                onValueChange = { onInterfaceChange(interfaceState.copy(junkPacketCount = it)) },
+                label = stringResource(R.string.junk_packet_count),
+                hint = stringResource(R.string.hint_template, (R.string.comma_separated)),
+                modifier = Modifier.fillMaxWidth(),
+            )
+            ConfigurationTextBox(
+                value = interfaceState.junkPacketMinSize,
+                onValueChange = { onInterfaceChange(interfaceState.copy(junkPacketMinSize = it)) },
+                label = stringResource(R.string.junk_packet_minimum_size),
+                hint = stringResource(R.string.junk_packet_minimum_size).lowercase(),
+                modifier = Modifier.fillMaxWidth(),
+            )
+            ConfigurationTextBox(
+                value = interfaceState.junkPacketMaxSize,
+                onValueChange = { onInterfaceChange(interfaceState.copy(junkPacketMaxSize = it)) },
+                label = stringResource(R.string.junk_packet_maximum_size),
+                hint = stringResource(R.string.junk_packet_maximum_size).lowercase(),
+                modifier = Modifier.fillMaxWidth(),
+            )
+            ConfigurationTextBox(
+                value = interfaceState.initPacketJunkSize,
+                onValueChange = { onInterfaceChange(interfaceState.copy(initPacketJunkSize = it)) },
+                label = stringResource(R.string.init_packet_junk_size),
+                hint = stringResource(R.string.init_packet_junk_size).lowercase(),
+                modifier = Modifier.fillMaxWidth(),
+            )
+            ConfigurationTextBox(
+                value = interfaceState.responsePacketJunkSize,
+                onValueChange = {
+                    onInterfaceChange(interfaceState.copy(responsePacketJunkSize = it))
                 },
-            ) {
+                label = stringResource(R.string.response_packet_junk_size),
-                Icon(
+                hint = stringResource(R.string.response_packet_junk_size).lowercase(),
-                    Icons.Rounded.Refresh,
+                modifier = Modifier.fillMaxWidth(),
-                    stringResource(R.string.rotate_keys),
+            )
-                    tint =
+            ConfigurationTextBox(
-                        if (isAuthenticated) MaterialTheme.colorScheme.onSurface
+                value = interfaceState.initPacketMagicHeader,
-                        else MaterialTheme.colorScheme.outline,
+                onValueChange = {
-                )
+                    onInterfaceChange(interfaceState.copy(initPacketMagicHeader = it))
-            }
+                },
-        },
+                label = stringResource(R.string.init_packet_magic_header),
-        enabled = isAuthenticated,
+                hint = stringResource(R.string.init_packet_magic_header).lowercase(),
-        singleLine = true,
+                modifier = Modifier.fillMaxWidth(),
-        keyboardOptions = keyboardOptions,
+            )
-        keyboardActions = keyboardActions,
+            ConfigurationTextBox(
-    )
+                value = interfaceState.responsePacketMagicHeader,
-    OutlinedTextField(
+                onValueChange = {
-        value = interfaceState.publicKey,
+                    onInterfaceChange(interfaceState.copy(responsePacketMagicHeader = it))
-        onValueChange = { onInterfaceChange(interfaceState.copy(publicKey = it)) },
+                },
-        label = {
+                label = stringResource(R.string.response_packet_magic_header),
-            Text(stringResource(R.string.public_key), style = MaterialTheme.typography.bodyMedium)
+                hint = stringResource(R.string.response_packet_magic_header).lowercase(),
-        },
+                modifier = Modifier.fillMaxWidth(),
-        enabled = false,
+            )
-        modifier = Modifier.fillMaxWidth(),
+            ConfigurationTextBox(
-        singleLine = true,
+                value = interfaceState.underloadPacketMagicHeader,
-        trailingIcon = {
+                onValueChange = {
-            IconButton(onClick = { clipboardManager.copy(interfaceState.publicKey) }) {
+                    onInterfaceChange(interfaceState.copy(underloadPacketMagicHeader = it))
-                Icon(Icons.Rounded.ContentCopy, stringResource(R.string.copy_public_key))
+                },
-            }
+                label = stringResource(R.string.underload_packet_magic_header),
-        },
+                hint = stringResource(R.string.underload_packet_magic_header).lowercase(),
-        keyboardOptions = keyboardOptions,
+                modifier = Modifier.fillMaxWidth(),
-        keyboardActions = keyboardActions,
+            )
-    )
+            ConfigurationTextBox(
-    ConfigurationTextBox(
+                value = interfaceState.transportPacketMagicHeader,
-        value = interfaceState.addresses,
+                onValueChange = {
-        onValueChange = { onInterfaceChange(interfaceState.copy(addresses = it)) },
+                    onInterfaceChange(interfaceState.copy(transportPacketMagicHeader = it))
-        label = stringResource(R.string.addresses),
+                },
-        hint = stringResource(R.string.comma_separated_list),
+                label = stringResource(R.string.transport_packet_magic_header),
-        modifier = Modifier.fillMaxWidth(),
+                hint = stringResource(R.string.transport_packet_magic_header).lowercase(),
-    )
+                modifier = Modifier.fillMaxWidth(),
-    ConfigurationTextBox(
+            )
-        value = interfaceState.listenPort,
+        }
-        onValueChange = { onInterfaceChange(interfaceState.copy(listenPort = it)) },
-        label = stringResource(R.string.listen_port),
-        hint = stringResource(R.string.random),
-        modifier = Modifier.fillMaxWidth(),
-    )
-    Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(6.dp)) {
-        ConfigurationTextBox(
-            value = interfaceState.dnsServers,
-            onValueChange = { onInterfaceChange(interfaceState.copy(dnsServers = it)) },
-            label = stringResource(R.string.dns_servers),
-            hint = stringResource(R.string.comma_separated_list),
-            modifier = Modifier.weight(3f),
-        )
-        ConfigurationTextBox(
-            value = interfaceState.mtu,
-            onValueChange = { onInterfaceChange(interfaceState.copy(mtu = it)) },
-            label = stringResource(R.string.mtu),
-            hint = stringResource(R.string.auto),
-            modifier = Modifier.weight(2f),
-        )
-    }
-    if (showScripts) {
-        ConfigurationTextBox(
-            value = interfaceState.preUp,
-            onValueChange = { onInterfaceChange(interfaceState.copy(preUp = it)) },
-            label = stringResource(R.string.pre_up),
-            hint = stringResource(R.string.comma_separated_list).lowercase(),
-            modifier = Modifier.fillMaxWidth(),
-        )
-        ConfigurationTextBox(
-            value = interfaceState.postUp,
-            onValueChange = { onInterfaceChange(interfaceState.copy(postUp = it)) },
-            label = stringResource(R.string.post_up),
-            hint = stringResource(R.string.comma_separated_list).lowercase(),
-            modifier = Modifier.fillMaxWidth(),
-        )
-        ConfigurationTextBox(
-            value = interfaceState.preDown,
-            onValueChange = { onInterfaceChange(interfaceState.copy(preDown = it)) },
-            label = stringResource(R.string.pre_down),
-            hint = stringResource(R.string.comma_separated_list).lowercase(),
-            modifier = Modifier.fillMaxWidth(),
-        )
-        ConfigurationTextBox(
-            value = interfaceState.postDown,
-            onValueChange = { onInterfaceChange(interfaceState.copy(postDown = it)) },
-            label = stringResource(R.string.post_down),
-            hint = stringResource(R.string.comma_separated_list).lowercase(),
-            modifier = Modifier.fillMaxWidth(),
-        )
-    }
-    if (showAmneziaValues) {
-        ConfigurationTextBox(
-            value = interfaceState.junkPacketCount,
-            onValueChange = { onInterfaceChange(interfaceState.copy(junkPacketCount = it)) },
-            label = stringResource(R.string.junk_packet_count),
-            hint = stringResource(R.string.junk_packet_count).lowercase(),
-            modifier = Modifier.fillMaxWidth(),
-        )
-        ConfigurationTextBox(
-            value = interfaceState.junkPacketMinSize,
-            onValueChange = { onInterfaceChange(interfaceState.copy(junkPacketMinSize = it)) },
-            label = stringResource(R.string.junk_packet_minimum_size),
-            hint = stringResource(R.string.junk_packet_minimum_size).lowercase(),
-            modifier = Modifier.fillMaxWidth(),
-        )
-        ConfigurationTextBox(
-            value = interfaceState.junkPacketMaxSize,
-            onValueChange = { onInterfaceChange(interfaceState.copy(junkPacketMaxSize = it)) },
-            label = stringResource(R.string.junk_packet_maximum_size),
-            hint = stringResource(R.string.junk_packet_maximum_size).lowercase(),
-            modifier = Modifier.fillMaxWidth(),
-        )
-        ConfigurationTextBox(
-            value = interfaceState.initPacketJunkSize,
-            onValueChange = { onInterfaceChange(interfaceState.copy(initPacketJunkSize = it)) },
-            label = stringResource(R.string.init_packet_junk_size),
-            hint = stringResource(R.string.init_packet_junk_size).lowercase(),
-            modifier = Modifier.fillMaxWidth(),
-        )
-        ConfigurationTextBox(
-            value = interfaceState.responsePacketJunkSize,
-            onValueChange = { onInterfaceChange(interfaceState.copy(responsePacketJunkSize = it)) },
-            label = stringResource(R.string.response_packet_junk_size),
-            hint = stringResource(R.string.response_packet_junk_size).lowercase(),
-            modifier = Modifier.fillMaxWidth(),
-        )
-        ConfigurationTextBox(
-            value = interfaceState.initPacketMagicHeader,
-            onValueChange = { onInterfaceChange(interfaceState.copy(initPacketMagicHeader = it)) },
-            label = stringResource(R.string.init_packet_magic_header),
-            hint = stringResource(R.string.init_packet_magic_header).lowercase(),
-            modifier = Modifier.fillMaxWidth(),
-        )
-        ConfigurationTextBox(
-            value = interfaceState.responsePacketMagicHeader,
-            onValueChange = {
-                onInterfaceChange(interfaceState.copy(responsePacketMagicHeader = it))
-            },
-            label = stringResource(R.string.response_packet_magic_header),
-            hint = stringResource(R.string.response_packet_magic_header).lowercase(),
-            modifier = Modifier.fillMaxWidth(),
-        )
-        ConfigurationTextBox(
-            value = interfaceState.underloadPacketMagicHeader,
-            onValueChange = {
-                onInterfaceChange(interfaceState.copy(underloadPacketMagicHeader = it))
-            },
-            label = stringResource(R.string.underload_packet_magic_header),
-            hint = stringResource(R.string.underload_packet_magic_header).lowercase(),
-            modifier = Modifier.fillMaxWidth(),
-        )
-        ConfigurationTextBox(
-            value = interfaceState.transportPacketMagicHeader,
-            onValueChange = {
-                onInterfaceChange(interfaceState.copy(transportPacketMagicHeader = it))
-            },
-            label = stringResource(R.string.transport_packet_magic_header),
-            hint = stringResource(R.string.transport_packet_magic_header).lowercase(),
-            modifier = Modifier.fillMaxWidth(),
-        )
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/config/components/InterfaceSection.kt

@@ -11,10 +11,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
 import com.zaneschepke.wireguardautotunnel.ui.common.label.GroupLabel
+import com.zaneschepke.wireguardautotunnel.ui.common.textbox.ConfigurationTextBox
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigViewModel
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.state.ConfigUiState
+import java.util.*
 
 @Composable
 fun InterfaceSection(
@@ -30,8 +31,8 @@ fun InterfaceSection(
 
     Surface(shape = RoundedCornerShape(12.dp), color = MaterialTheme.colorScheme.surface) {
         Column(
-            verticalArrangement = Arrangement.spacedBy(6.dp),
+            verticalArrangement = Arrangement.spacedBy(12.dp),
-            modifier = Modifier.padding(16.dp).focusGroup(),
+            modifier = Modifier.padding(horizontal = 16.dp).focusGroup(),
         ) {
             Row(
                 horizontalArrangement = Arrangement.SpaceBetween,
@@ -55,7 +56,9 @@ fun InterfaceSection(
                 onValueChange = viewModel::updateTunnelName,
                 label = stringResource(R.string.name),
                 isError = isTunnelNameTaken,
-                hint = stringResource(R.string.tunnel_name).lowercase(),
+                hint =
+                    stringResource(R.string.hint_template, stringResource(R.string.tunnel_name))
+                        .lowercase(Locale.getDefault()),
                 modifier = Modifier.fillMaxWidth(),
             )
             InterfaceFields(

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/config/components/PeerFields.kt

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -17,8 +16,9 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
+import com.zaneschepke.wireguardautotunnel.ui.common.textbox.ConfigurationTextBox
 import com.zaneschepke.wireguardautotunnel.ui.state.PeerProxy
+import java.util.*
 
 @Composable
 fun PeerFields(
@@ -35,44 +35,32 @@ fun PeerFields(
         value = peer.publicKey,
         onValueChange = { onPeerChange(peer.copy(publicKey = it)) },
         label = stringResource(R.string.public_key),
-        hint = stringResource(R.string.base64_key),
+        hint =
+            stringResource(R.string.hint_template, stringResource(R.string.base64_key))
+                .lowercase(Locale.getDefault()),
         modifier = Modifier.fillMaxWidth(),
     )
-    OutlinedTextField(
+    ConfigurationTextBox(
         visualTransformation =
             if (isAuthenticated) VisualTransformation.None else PasswordVisualTransformation(),
         value = peer.preSharedKey,
         enabled = isAuthenticated,
+        hint = stringResource(R.string.optional),
         onValueChange = { onPeerChange(peer.copy(preSharedKey = it)) },
-        label = {
+        label = stringResource(R.string.preshared_key),
-            Text(
-                stringResource(R.string.preshared_key),
-                style = MaterialTheme.typography.bodyMedium,
-            )
-        },
-        placeholder = {
-            Text(stringResource(R.string.optional), style = MaterialTheme.typography.bodyMedium)
-        },
         modifier = Modifier.fillMaxWidth().clickable { if (!isAuthenticated) showAuthPrompt() },
         keyboardOptions = keyboardOptions,
         keyboardActions = keyboardActions,
         singleLine = true,
     )
-    OutlinedTextField(
+    ConfigurationTextBox(
         value = peer.persistentKeepalive,
         onValueChange = { onPeerChange(peer.copy(persistentKeepalive = it)) },
-        label = {
+        label = stringResource(R.string.persistent_keepalive),
+        hint = stringResource(R.string.optional),
+        trailing = {
             Text(
-                stringResource(R.string.persistent_keepalive),
+                stringResource(R.string.seconds).lowercase(Locale.getDefault()),
-                style = MaterialTheme.typography.bodyMedium,
-            )
-        },
-        placeholder = {
-            Text(stringResource(R.string.optional), style = MaterialTheme.typography.bodyMedium)
-        },
-        trailingIcon = {
-            Text(
-                stringResource(R.string.seconds),
                 style = MaterialTheme.typography.bodyMedium,
                 modifier = Modifier.padding(end = 10.dp),
             )
@@ -85,21 +73,18 @@ fun PeerFields(
         value = peer.endpoint,
         onValueChange = { onPeerChange(peer.copy(endpoint = it)) },
         label = stringResource(R.string.endpoint),
-        hint = stringResource(R.string.endpoint).lowercase(),
+        hint =
+            stringResource(R.string.hint_template, stringResource(R.string.server_port))
+                .lowercase(Locale.getDefault()),
         modifier = Modifier.fillMaxWidth(),
     )
-    OutlinedTextField(
+    ConfigurationTextBox(
         value = peer.allowedIps,
         onValueChange = { onPeerChange(peer.copy(allowedIps = it)) },
-        label = {
+        label = stringResource(R.string.allowed_ips),
-            Text(stringResource(R.string.allowed_ips), style = MaterialTheme.typography.bodyMedium)
+        hint =
-        },
+            stringResource(R.string.hint_template, stringResource(R.string.comma_separated))
-        placeholder = {
+                .lowercase(Locale.getDefault()),
-            Text(
-                stringResource(R.string.comma_separated_list),
-                style = MaterialTheme.typography.bodyMedium,
-            )
-        },
         modifier = Modifier.fillMaxWidth(),
         keyboardOptions = keyboardOptions,
         keyboardActions = keyboardActions,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/config/components/PeersSection.kt

@@ -27,8 +27,8 @@ fun PeersSection(uiState: ConfigUiState, viewModel: ConfigViewModel) {
 
         Surface(shape = RoundedCornerShape(12.dp), color = MaterialTheme.colorScheme.surface) {
             Column(
-                verticalArrangement = Arrangement.spacedBy(6.dp),
+                verticalArrangement = Arrangement.spacedBy(12.dp),
-                modifier = Modifier.padding(16.dp).focusGroup(),
+                modifier = Modifier.padding(horizontal = 16.dp).focusGroup(),
             ) {
                 Row(
                     horizontalArrangement = Arrangement.SpaceBetween,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/splittunnel/SplitTunnelViewModel.kt

@@ -172,7 +172,7 @@ constructor(
         val (wg, am) = proxy.buildConfigs()
         tunnelRepository.save(
             tunnel.copyWithCallback(
-                amQuick = am.toAwgQuickString(true),
+                amQuick = am.toAwgQuickString(true, false),
                 wgQuick = wg.toWgQuickString(true),
             )
         )

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

@@ -67,7 +67,7 @@ private fun QrCodeContent(tunnelConf: TunnelConf) {
     var selectedOption by remember { mutableStateOf(ConfigType.WG) }
     val qrCodeText =
         when (selectedOption) {
-            ConfigType.AM -> tunnelConf.toAmConfig().toAwgQuickString(true)
+            ConfigType.AM -> tunnelConf.toAmConfig().toAwgQuickString(true, false)
             ConfigType.WG -> tunnelConf.toWgConfig().toWgQuickString(true)
         }
 

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

@@ -1,5 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.components
 
+import android.util.Patterns
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.material3.Text
@@ -9,7 +10,7 @@ import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.common.config.SubmitConfigurationTextBox
+import com.zaneschepke.wireguardautotunnel.ui.common.textbox.SubmitConfigurationTextBox
 import com.zaneschepke.wireguardautotunnel.util.extensions.isValidIpv4orIpv6Address
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
@@ -27,7 +28,7 @@ fun pingConfigItem(tunnelConf: TunnelConf, viewModel: AppViewModel): SelectionIt
                     isErrorValue = {
                         it?.isNotBlank() == true &&
                             !it.isValidIpv4orIpv6Address() &&
-                            !android.util.Patterns.DOMAIN_NAME.matcher(it).matches()
+                            !Patterns.DOMAIN_NAME.matcher(it).matches()
                     },
                     supportingText = { Text(stringResource(R.string.ping_target_description)) },
                     onSubmit = { ip ->

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

@@ -9,18 +9,20 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
 import com.zaneschepke.wireguardautotunnel.ui.common.SectionDivider
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
 import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.components.AdvancedSettingsItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.*
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.proxy.compoents.BackendModeBottomSheet
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
@@ -33,12 +35,28 @@ fun SettingsScreen(uiState: AppUiState, appViewState: AppViewState, viewModel: A
 
     val interactionSource = remember { MutableInteractionSource() }
 
-    when (appViewState.bottomSheet) {
+    val showBackupBottomSheet by
-        AppViewState.BottomSheet.BACKUP_AND_RESTORE -> {
+        remember(appViewState.bottomSheet) {
-            SettingsBottomSheet(viewModel)
+            derivedStateOf {
+                appViewState.bottomSheet == AppViewState.BottomSheet.BACKUP_AND_RESTORE
+            }
         }
-        else -> Unit
+    val showBottomSheet by
-    }
+        remember(appViewState.bottomSheet) {
+            derivedStateOf { appViewState.bottomSheet == AppViewState.BottomSheet.BACKEND }
+        }
+    val showProxySettings by
+        remember(uiState.appSettings.appMode) {
+            derivedStateOf {
+                when (uiState.appSettings.appMode) {
+                    AppMode.PROXY -> true
+                    else -> false
+                }
+            }
+        }
+
+    if (showBackupBottomSheet) BackupBottomSheet(viewModel)
+    if (showBottomSheet) BackendModeBottomSheet(uiState.appSettings, viewModel)
 
     Column(
         horizontalAlignment = Alignment.Start,
@@ -60,17 +78,23 @@ fun SettingsScreen(uiState: AppUiState, appViewState: AppViewState, viewModel: A
                     }
                 ),
     ) {
+        SurfaceSelectionGroupButton(buildList { add(backendModeItem(uiState, viewModel)) })
+        SectionDivider()
         SurfaceSelectionGroupButton(
             items =
                 buildList {
+                    if (uiState.appSettings.appMode == AppMode.LOCK_DOWN) {
+                        add(lanTrafficItem(uiState, viewModel))
+                    }
                     add(tunnelMonitoringItem())
-                    add(appShortcutsItem(uiState, viewModel))
+                    add(dnsSettingsItem())
-                    if (!isTv) add(alwaysOnVpnItem(uiState, viewModel))
+                    // TODO changing these settings won't work in certain app states
-                    add(killSwitchItem())
+                    if (showProxySettings) add(proxYSettingsItem())
-                    add(RestartAtBootItem(uiState, viewModel))
                 }
         )
         SectionDivider()
+        SurfaceSelectionGroupButton(listOf(systemFeaturesItem()))
+        SectionDivider()
         SurfaceSelectionGroupButton(
             items =
                 buildList {
@@ -80,18 +104,5 @@ fun SettingsScreen(uiState: AppUiState, appViewState: AppViewState, viewModel: A
                     add(PinLockItem(uiState, viewModel))
                 }
         )
-        SectionDivider()
-        if (!isTv) {
-            SurfaceSelectionGroupButton(items = listOf(kernelModeItem(uiState, viewModel)))
-            SectionDivider()
-        }
-        SurfaceSelectionGroupButton(
-            items =
-                listOf(
-                    AdvancedSettingsItem(
-                        onClick = { navController.navigate(Route.SettingsAdvanced) }
-                    )
-                )
-        )
     }
 }

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

@@ -0,0 +1,46 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Restore
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import com.zaneschepke.wireguardautotunnel.MainActivity
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.common.sheet.CustomBottomSheet
+import com.zaneschepke.wireguardautotunnel.ui.common.sheet.SheetOption
+import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun BackupBottomSheet(viewModel: AppViewModel) {
+    val context = LocalContext.current
+
+    CustomBottomSheet(
+        listOf(
+            SheetOption(
+                ImageVector.vectorResource(R.drawable.database),
+                stringResource(R.string.backup_application),
+                onClick = {
+                    viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+                    (context as? MainActivity)?.performBackup()
+                },
+            ),
+            SheetOption(
+                Icons.Outlined.Restore,
+                stringResource(R.string.restore_application),
+                onClick = {
+                    viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+                    (context as? MainActivity)?.performRestore()
+                },
+            ),
+        )
+    ) {
+        viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.components
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Lan
@@ -15,7 +15,7 @@ import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @Composable
-fun LanTrafficItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem {
+fun lanTrafficItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem {
     return SelectionItem(
         leading = { Icon(Icons.Outlined.Lan, contentDescription = null) },
         title = {

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

@@ -1,78 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Restore
-import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.res.vectorResource
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.MainActivity
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun SettingsBottomSheet(viewModel: AppViewModel) {
-    val context = LocalContext.current
-
-    ModalBottomSheet(
-        containerColor = MaterialTheme.colorScheme.surface,
-        onDismissRequest = {
-            viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
-        },
-    ) {
-        Row(
-            modifier =
-                Modifier.fillMaxWidth()
-                    .clickable {
-                        viewModel.handleEvent(
-                            AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE)
-                        )
-                        (context as? MainActivity)?.performBackup()
-                    }
-                    .padding(10.dp)
-        ) {
-            Icon(
-                imageVector = ImageVector.vectorResource(R.drawable.database),
-                contentDescription = null,
-                modifier = Modifier.padding(10.dp),
-            )
-            Text(
-                text = stringResource(R.string.backup_application),
-                modifier = Modifier.padding(10.dp),
-            )
-        }
-        HorizontalDivider()
-        Row(
-            modifier =
-                Modifier.fillMaxWidth()
-                    .clickable {
-                        viewModel.handleEvent(
-                            AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE)
-                        )
-                        (context as? MainActivity)?.performRestore()
-                    }
-                    .padding(10.dp)
-        ) {
-            Icon(
-                imageVector = Icons.Outlined.Restore,
-                contentDescription = null,
-                modifier = Modifier.padding(10.dp),
-            )
-            Text(
-                text = stringResource(R.string.restore_application),
-                modifier = Modifier.padding(10.dp),
-            )
-        }
-    }
-}

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

@@ -0,0 +1,45 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.ExpandMore
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItemLabel
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionLabelType
+import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
+import com.zaneschepke.wireguardautotunnel.util.extensions.asTitleString
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+
+@Composable
+fun backendModeItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem {
+    val context = LocalContext.current
+    return SelectionItem(
+        leading = { Icon(ImageVector.vectorResource(R.drawable.sdk), contentDescription = null) },
+        trailing = {
+            Icon(Icons.Outlined.ExpandMore, contentDescription = stringResource(R.string.select))
+        },
+        title = {
+            SelectionItemLabel(stringResource(R.string.backend_mode), SelectionLabelType.TITLE)
+        },
+        description = {
+            SelectionItemLabel(
+                stringResource(
+                    R.string.current_template,
+                    uiState.appSettings.appMode.asTitleString(context),
+                ),
+                SelectionLabelType.DESCRIPTION,
+            )
+        },
+        onClick = {
+            viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.BACKEND))
+        },
+    )
+}

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

@@ -1,7 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
 
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.VpnKeyOff
+import androidx.compose.material.icons.outlined.Dns
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -14,18 +14,18 @@ import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionIte
 import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
 
 @Composable
-fun killSwitchItem(): SelectionItem {
+fun dnsSettingsItem(): SelectionItem {
     val navController = LocalNavController.current
     return SelectionItem(
-        leading = { Icon(Icons.Outlined.VpnKeyOff, contentDescription = null) },
+        leading = { Icon(Icons.Outlined.Dns, null) },
+        trailing = { ForwardButton { navController.navigate(Route.Dns) } },
         title = {
             Text(
-                text = stringResource(R.string.kill_switch_options),
+                text = stringResource(R.string.dns_settings),
                 style =
                     MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
             )
         },
-        trailing = { ForwardButton { navController.navigate(Route.KillSwitch) } },
+        onClick = { navController.navigate(Route.Dns) },
-        onClick = { navController.navigate(Route.KillSwitch) },
     )
 }

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

@@ -1,46 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
-
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Code
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
-
-@Composable
-fun kernelModeItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem {
-    return SelectionItem(
-        leading = { Icon(Icons.Outlined.Code, contentDescription = null) },
-        title = {
-            Text(
-                text = stringResource(R.string.kernel),
-                style =
-                    MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
-            )
-        },
-        description = {
-            Text(
-                text = stringResource(R.string.use_kernel),
-                style = MaterialTheme.typography.bodySmall.copy(MaterialTheme.colorScheme.outline),
-            )
-        },
-        trailing = {
-            ScaledSwitch(
-                checked = uiState.appSettings.isKernelEnabled,
-                enabled =
-                    !(uiState.appSettings.isAutoTunnelEnabled ||
-                        uiState.appSettings.isAlwaysOnVpnEnabled ||
-                        uiState.activeTunnels.isNotEmpty()),
-                onClick = { viewModel.handleEvent(AppEvent.ToggleKernelMode) },
-            )
-        },
-        onClick = { viewModel.handleEvent(AppEvent.ToggleKernelMode) },
-    )
-}

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

@@ -0,0 +1,31 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
+
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
+import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+
+@Composable
+fun proxYSettingsItem(): SelectionItem {
+    val navController = LocalNavController.current
+    return SelectionItem(
+        leading = { Icon(ImageVector.vectorResource(R.drawable.proxy), null) },
+        trailing = { ForwardButton { navController.navigate(Route.ProxySettings) } },
+        title = {
+            Text(
+                text = stringResource(R.string.proxy_settings),
+                style =
+                    MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+            )
+        },
+        onClick = { navController.navigate(Route.ProxySettings) },
+    )
+}

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

@@ -1,34 +1,31 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.components
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
 
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.VpnKey
+import androidx.compose.material.icons.outlined.Android
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
+import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
 
 @Composable
-fun VpnKillSwitchItem(uiState: AppUiState, toggleVpnSwitch: () -> Unit): SelectionItem {
+fun systemFeaturesItem(): SelectionItem {
+    val navController = LocalNavController.current
     return SelectionItem(
-        leading = { Icon(Icons.Outlined.VpnKey, contentDescription = null) },
+        leading = { Icon(Icons.Outlined.Android, null) },
+        trailing = { ForwardButton { navController.navigate(Route.SystemFeatures) } },
         title = {
             Text(
-                text = stringResource(R.string.vpn_kill_switch),
+                text = stringResource(R.string.system_features),
                 style =
                     MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
             )
         },
-        trailing = {
+        onClick = { navController.navigate(Route.SystemFeatures) },
-            ScaledSwitch(
-                checked = uiState.appSettings.isVpnKillSwitchEnabled,
-                onClick = { toggleVpnSwitch() },
-            )
-        },
-        onClick = { toggleVpnSwitch() },
     )
 }

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

@@ -0,0 +1,83 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.dns
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+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.outlined.Cloud
+import androidx.compose.material.icons.outlined.Dns
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
+import com.zaneschepke.wireguardautotunnel.data.model.DnsProvider
+import com.zaneschepke.wireguardautotunnel.ui.common.dropdown.LabelledDropdown
+import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+
+@Composable
+fun DnsSettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
+    val context = LocalContext.current
+    Column(
+        horizontalAlignment = Alignment.Start,
+        verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
+        modifier =
+            Modifier.fillMaxSize()
+                .verticalScroll(rememberScrollState())
+                .padding(vertical = 24.dp)
+                .padding(horizontal = 12.dp),
+    ) {
+        LabelledDropdown(
+            title = {
+                Text(
+                    text = stringResource(R.string.dns_protocol),
+                    style =
+                        MaterialTheme.typography.bodyMedium.copy(
+                            color = MaterialTheme.colorScheme.onSurface
+                        ),
+                )
+            },
+            leading = { Icon(Icons.Outlined.Dns, contentDescription = null) },
+            currentValue = uiState.appSettings.dnsProtocol,
+            onSelected = { selected ->
+                selected?.let { viewModel.handleEvent(AppEvent.SetDnsProtocol(it)) }
+            },
+            options = DnsProtocol.entries,
+            optionToString = { (it ?: DnsProtocol.SYSTEM).asString(context) },
+        )
+        AnimatedVisibility(uiState.appSettings.dnsProtocol != DnsProtocol.SYSTEM) {
+            LabelledDropdown(
+                title = {
+                    Text(
+                        text = stringResource(R.string.dns_provider),
+                        style =
+                            MaterialTheme.typography.bodyMedium.copy(
+                                color = MaterialTheme.colorScheme.onSurface
+                            ),
+                    )
+                },
+                leading = { Icon(Icons.Outlined.Cloud, contentDescription = null) },
+                currentValue =
+                    uiState.appSettings.dnsEndpoint?.let { DnsProvider.fromAddress(it) }
+                        ?: DnsProvider.CLOUDFLARE,
+                onSelected = { selected ->
+                    selected?.let { viewModel.handleEvent(AppEvent.SetDnsProvider(it)) }
+                },
+                options = DnsProvider.entries,
+                optionToString = { it?.name ?: DnsProvider.CLOUDFLARE.name },
+            )
+        }
+    }
+}

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

@@ -1,50 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.common.SectionDivider
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.components.LanTrafficItem
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.components.VpnKillSwitchItem
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.components.nativeKillSwitchItem
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
-
-@Composable
-fun KillSwitchScreen(uiState: AppUiState, viewModel: AppViewModel) {
-    val isTv = LocalIsAndroidTV.current
-
-    Column(
-        horizontalAlignment = Alignment.Start,
-        verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
-        modifier = Modifier.fillMaxSize().padding(vertical = 24.dp).padding(horizontal = 12.dp),
-    ) {
-        if (!isTv) {
-            SurfaceSelectionGroupButton(items = listOf(nativeKillSwitchItem()))
-            SectionDivider()
-        }
-        SurfaceSelectionGroupButton(
-            items =
-                buildList {
-                    if (!uiState.appSettings.isKernelEnabled) {
-                        add(
-                            VpnKillSwitchItem(uiState) {
-                                viewModel.handleEvent(AppEvent.ToggleVpnKillSwitch)
-                            }
-                        )
-                        if (uiState.appSettings.isVpnKillSwitchEnabled) {
-                            add(LanTrafficItem(uiState, viewModel))
-                        }
-                    }
-                }
-        )
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/logs/components/LogsBottomSheet.kt

@@ -1,18 +1,14 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.settings.logs.components
 
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.outlined.Delete
-import androidx.compose.material.icons.filled.FolderZip
+import androidx.compose.material.icons.outlined.FolderZip
-import androidx.compose.material3.*
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.common.sheet.CustomBottomSheet
+import com.zaneschepke.wireguardautotunnel.ui.common.sheet.SheetOption
 import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
@@ -20,48 +16,26 @@ import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun LogsBottomSheet(viewModel: AppViewModel) {
-    ModalBottomSheet(
+    CustomBottomSheet(
-        containerColor = MaterialTheme.colorScheme.surface,
+        listOf(
-        onDismissRequest = {
+            SheetOption(
-            viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+                Icons.Outlined.FolderZip,
-        },
+                stringResource(R.string.export_logs),
+                onClick = {
+                    viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+                    viewModel.handleEvent(AppEvent.ExportLogs)
+                },
+            ),
+            SheetOption(
+                Icons.Outlined.Delete,
+                stringResource(R.string.delete_logs),
+                onClick = {
+                    viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+                    viewModel.handleEvent(AppEvent.DeleteLogs)
+                },
+            ),
+        )
     ) {
-        Row(
+        viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
-            modifier =
-                Modifier.fillMaxWidth()
-                    .clickable {
-                        viewModel.handleEvent(
-                            AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE)
-                        )
-                        viewModel.handleEvent(AppEvent.ExportLogs)
-                    }
-                    .padding(10.dp)
-        ) {
-            Icon(
-                imageVector = Icons.Filled.FolderZip,
-                contentDescription = stringResource(R.string.export_logs),
-                modifier = Modifier.padding(10.dp),
-            )
-            Text(text = stringResource(R.string.export_logs), modifier = Modifier.padding(10.dp))
-        }
-        HorizontalDivider()
-        Row(
-            modifier =
-                Modifier.fillMaxWidth()
-                    .clickable {
-                        viewModel.handleEvent(
-                            AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE)
-                        )
-                        viewModel.handleEvent(AppEvent.DeleteLogs)
-                    }
-                    .padding(10.dp)
-        ) {
-            Icon(
-                imageVector = Icons.Filled.Delete,
-                contentDescription = stringResource(R.string.delete_logs),
-                modifier = Modifier.padding(10.dp),
-            )
-            Text(text = stringResource(R.string.delete_logs), modifier = Modifier.padding(10.dp))
-        }
     }
 }

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

@@ -20,7 +20,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.common.dropdown.LabelledNumberDropdown
+import com.zaneschepke.wireguardautotunnel.ui.common.dropdown.LabelledDropdown
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.monitoring.components.detailedPingStatsItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.monitoring.components.enablePingMonitoringItem
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
@@ -51,7 +51,7 @@ fun TunnelMonitoringScreen(uiState: AppUiState, viewModel: AppViewModel) {
     ) {
         SurfaceSelectionGroupButton(listOf(enablePingMonitoringItem(uiState, viewModel)))
         if (uiState.appSettings.isPingEnabled) {
-            LabelledNumberDropdown(
+            LabelledDropdown(
                 title = {
                     Text(
                         text = stringResource(R.string.tunnel_ping_interval),
@@ -67,8 +67,9 @@ fun TunnelMonitoringScreen(uiState: AppUiState, viewModel: AppViewModel) {
                     viewModel.handleEvent(AppEvent.SetPingInterval(selected!!))
                 },
                 options = (10..60).step(10).toList(),
+                optionToString = { it?.toString() ?: stringResource(R.string._default) },
             )
-            LabelledNumberDropdown(
+            LabelledDropdown(
                 title = {
                     Text(
                         text = stringResource(R.string.attempts_per_interval),
@@ -84,8 +85,9 @@ fun TunnelMonitoringScreen(uiState: AppUiState, viewModel: AppViewModel) {
                     viewModel.handleEvent(AppEvent.SetPingAttempts(selected!!))
                 },
                 options = (1..5).toList(),
+                optionToString = { it?.toString() ?: stringResource(R.string._default) },
             )
-            LabelledNumberDropdown(
+            LabelledDropdown(
                 title = {
                     Text(
                         text = stringResource(R.string.ping_timeout),
@@ -110,6 +112,7 @@ fun TunnelMonitoringScreen(uiState: AppUiState, viewModel: AppViewModel) {
                     viewModel.handleEvent(AppEvent.SetPingTimeout(selected))
                 },
                 options = (10..20).toList() + null,
+                optionToString = { it?.toString() ?: stringResource(R.string._default) },
             )
             SurfaceSelectionGroupButton(listOf(detailedPingStatsItem(uiState, viewModel)))
         }

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

@@ -0,0 +1,244 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.proxy
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Forward5
+import androidx.compose.material.icons.outlined.Http
+import androidx.compose.material.icons.outlined.RemoveRedEye
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.domain.model.AppProxySettings
+import com.zaneschepke.wireguardautotunnel.ui.common.SecureScreenFromRecording
+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.SelectionItemLabel
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionLabelType
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
+import com.zaneschepke.wireguardautotunnel.ui.common.label.GroupLabel
+import com.zaneschepke.wireguardautotunnel.ui.common.textbox.ConfigurationTextBox
+import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.extensions.isValidProxyBindAddress
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+
+@Composable
+fun ProxySettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
+
+    val keyboardController = LocalSoftwareKeyboardController.current
+
+    var socks5ProxyEnabled by rememberSaveable {
+        mutableStateOf(uiState.proxySettings.socks5ProxyEnabled)
+    }
+    var httpProxyEnabled by rememberSaveable {
+        mutableStateOf(uiState.proxySettings.httpProxyEnabled)
+    }
+
+    val showAuthSettings by
+        remember(httpProxyEnabled, socks5ProxyEnabled) {
+            derivedStateOf { httpProxyEnabled || socks5ProxyEnabled }
+        }
+
+    var socks5bindAddress by
+        rememberSaveable(uiState.proxySettings.socks5ProxyBindAddress) {
+            mutableStateOf(uiState.proxySettings.socks5ProxyBindAddress)
+        }
+    var httpBindAddress by
+        rememberSaveable(uiState.proxySettings.httpProxyBindAddress) {
+            mutableStateOf(uiState.proxySettings.httpProxyBindAddress)
+        }
+
+    val isSocks5BindAddressError by
+        remember(socks5bindAddress) {
+            derivedStateOf {
+                socks5bindAddress.let { it?.isNotBlank() == true && !it.isValidProxyBindAddress() }
+            }
+        }
+
+    val isHttpBindAddressError by
+        remember(httpBindAddress) {
+            derivedStateOf {
+                httpBindAddress.let { it?.isNotBlank() == true && !it.isValidProxyBindAddress() }
+            }
+        }
+
+    var username by rememberSaveable { mutableStateOf(uiState.proxySettings.proxyUsername ?: "") }
+    var password by rememberSaveable { mutableStateOf(uiState.proxySettings.proxyPassword ?: "") }
+
+    val keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() })
+    val keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done)
+
+    var passwordVisibility by rememberSaveable { mutableStateOf(false) }
+
+    var usernameError by rememberSaveable { mutableStateOf(false) }
+    var passwordError by rememberSaveable { mutableStateOf(false) }
+
+    LaunchedEffect(username) { if (username.isNotBlank() && usernameError) usernameError = false }
+
+    LaunchedEffect(password) { if (password.isNotBlank() && passwordError) passwordError = false }
+
+    LaunchedEffect(Unit) {
+        viewModel.handleEvent(
+            AppEvent.SetScreenAction {
+                keyboardController?.hide()
+                if (username.isBlank() && password.isNotBlank()) {
+                    usernameError = true
+                    return@SetScreenAction
+                }
+                if (password.isBlank() && username.isNotBlank()) {
+                    passwordError = true
+                    return@SetScreenAction
+                }
+                if (isSocks5BindAddressError || isHttpBindAddressError) return@SetScreenAction
+                keyboardController?.hide()
+                viewModel.handleEvent(
+                    AppEvent.SetProxySettings(
+                        socks5ProxyEnabled,
+                        httpProxyEnabled,
+                        httpBindAddress,
+                        socks5bindAddress,
+                        username,
+                        password,
+                    )
+                )
+                viewModel.handleEvent(
+                    AppEvent.ShowMessage(StringValue.StringResource(R.string.config_changes_saved))
+                )
+                viewModel.handleEvent(AppEvent.PopBackStack(true))
+            }
+        )
+    }
+
+    SecureScreenFromRecording()
+
+    Column(
+        horizontalAlignment = Alignment.Start,
+        verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
+        modifier = Modifier.fillMaxSize().padding(top = 24.dp).padding(horizontal = 12.dp),
+    ) {
+        SurfaceSelectionGroupButton(
+            listOf(
+                SelectionItem(
+                    leading = { Icon(Icons.Outlined.Forward5, contentDescription = null) },
+                    title = {
+                        SelectionItemLabel(
+                            stringResource(R.string.socks_5_proxy),
+                            SelectionLabelType.TITLE,
+                        )
+                    },
+                    trailing = {
+                        ScaledSwitch(
+                            checked = socks5ProxyEnabled,
+                            onClick = { socks5ProxyEnabled = !socks5ProxyEnabled },
+                        )
+                    },
+                    onClick = { socks5ProxyEnabled = !socks5ProxyEnabled },
+                )
+            )
+        )
+        if (socks5ProxyEnabled) {
+            ConfigurationTextBox(
+                hint =
+                    stringResource(
+                        R.string.defaults_to_template,
+                        AppProxySettings.DEFAULT_SOCKS_BIND_ADDRESS,
+                    ),
+                label = stringResource(R.string.socks_5_bind_address),
+                value = socks5bindAddress ?: "",
+                isError = isSocks5BindAddressError,
+                onValueChange = { socks5bindAddress = it },
+            )
+        }
+        SurfaceSelectionGroupButton(
+            listOf(
+                SelectionItem(
+                    leading = { Icon(Icons.Outlined.Http, contentDescription = null) },
+                    title = {
+                        SelectionItemLabel(
+                            stringResource(R.string.http_proxy),
+                            SelectionLabelType.TITLE,
+                        )
+                    },
+                    trailing = {
+                        ScaledSwitch(
+                            checked = httpProxyEnabled,
+                            onClick = { httpProxyEnabled = !httpProxyEnabled },
+                        )
+                    },
+                    onClick = { httpProxyEnabled = !httpProxyEnabled },
+                )
+            )
+        )
+        if (httpProxyEnabled) {
+            ConfigurationTextBox(
+                hint =
+                    stringResource(
+                        R.string.defaults_to_template,
+                        AppProxySettings.DEFAULT_HTTP_BIND_ADDRESS,
+                    ),
+                label = stringResource(R.string.http_bind_address),
+                value = httpBindAddress ?: "",
+                isError = isHttpBindAddressError,
+                onValueChange = { httpBindAddress = it },
+            )
+        }
+        if (showAuthSettings) {
+            Column(
+                horizontalAlignment = Alignment.Start,
+                verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
+                modifier = Modifier.padding(horizontal = 12.dp),
+            ) {
+                GroupLabel(
+                    stringResource(
+                        R.string.recommended_template,
+                        stringResource((R.string.proxy_credentials)),
+                    )
+                )
+                ConfigurationTextBox(
+                    value = username,
+                    onValueChange = { username = it },
+                    label = stringResource(R.string.username),
+                    isError = usernameError,
+                    hint = "",
+                    keyboardActions = keyboardActions,
+                    keyboardOptions = keyboardOptions,
+                    modifier = Modifier.fillMaxWidth(),
+                )
+                ConfigurationTextBox(
+                    value = password,
+                    onValueChange = { password = it },
+                    label = stringResource(R.string.password),
+                    isError = passwordError,
+                    hint = "",
+                    keyboardActions = keyboardActions,
+                    keyboardOptions = keyboardOptions,
+                    modifier = Modifier.fillMaxWidth(),
+                    trailing = {
+                        IconButton(onClick = { passwordVisibility = !passwordVisibility }) {
+                            Icon(
+                                Icons.Outlined.RemoveRedEye,
+                                stringResource(R.string.show_password),
+                            )
+                        }
+                    },
+                    visualTransformation =
+                        if (!passwordVisibility) PasswordVisualTransformation()
+                        else VisualTransformation.None,
+                )
+            }
+        }
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/proxy/compoents/BackendModeBottomSheet.kt

@@ -0,0 +1,34 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.proxy.compoents
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+import com.zaneschepke.wireguardautotunnel.ui.common.sheet.CustomBottomSheet
+import com.zaneschepke.wireguardautotunnel.ui.common.sheet.SheetOption
+import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
+import com.zaneschepke.wireguardautotunnel.util.extensions.asIcon
+import com.zaneschepke.wireguardautotunnel.util.extensions.asTitleString
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+
+@Composable
+fun BackendModeBottomSheet(appSettings: AppSettings, viewModel: AppViewModel) {
+    val context = LocalContext.current
+    CustomBottomSheet(
+        enumValues<AppMode>().map {
+            val icon = it.asIcon()
+            SheetOption(
+                icon,
+                label = it.asTitleString(context),
+                onClick = {
+                    viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+                    viewModel.handleEvent(AppEvent.SetAppMode(it))
+                },
+                selected = appSettings.appMode == it,
+            )
+        }
+    ) {
+        viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+    }
+}

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

@@ -1,6 +1,5 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.advanced
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.system
 
-import android.view.WindowManager
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -8,33 +7,23 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.MainActivity
+import com.zaneschepke.wireguardautotunnel.ui.common.SectionDivider
+import com.zaneschepke.wireguardautotunnel.ui.common.SecureScreenFromRecording
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.advanced.components.RemoteControlItem
+import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.system.components.*
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 
 @Composable
-fun SettingsAdvancedScreen(appUiState: AppUiState, viewModel: AppViewModel) {
+fun SystemFeaturesScreen(appUiState: AppUiState, viewModel: AppViewModel) {
-    val context = LocalContext.current
 
-    val activity = context as? MainActivity
+    val isTv = LocalIsAndroidTV.current
 
-    // Secure screen due to sensitive information
+    SecureScreenFromRecording()
-    DisposableEffect(Unit) {
-        activity
-            ?.window
-            ?.setFlags(
-                WindowManager.LayoutParams.FLAG_SECURE,
-                WindowManager.LayoutParams.FLAG_SECURE,
-            )
-        onDispose { activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE) }
-    }
 
     Column(
         horizontalAlignment = Alignment.Start,
@@ -45,6 +34,20 @@ fun SettingsAdvancedScreen(appUiState: AppUiState, viewModel: AppViewModel) {
                 .padding(vertical = 24.dp)
                 .padding(horizontal = 12.dp),
     ) {
-        SurfaceSelectionGroupButton(listOf(RemoteControlItem(appUiState, viewModel)))
+        SurfaceSelectionGroupButton(buildList { if (!isTv) add(nativeKillSwitchItem()) })
+        SectionDivider()
+        SurfaceSelectionGroupButton(
+            buildList {
+                add(restartAtBootItem(appUiState, viewModel))
+                if (!isTv) add(alwaysOnVpnItem(appUiState, viewModel))
+            }
+        )
+        SectionDivider()
+        SurfaceSelectionGroupButton(
+            buildList {
+                add(appShortcutsItem(appUiState, viewModel))
+                add(remoteControlItem(appUiState, viewModel))
+            }
+        )
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/system/components/alwaysOnVpnItem.kt

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.system.components
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.VpnLock

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/system/components/appShortcutItem.kt

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.system.components
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AppShortcut

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/system/components/nativeKillSwitchItem.kt

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.components
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.system.components
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.AdminPanelSettings

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/system/components/remoteControlItem.kt

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.advanced.components
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.system.components
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.clickable
@@ -20,7 +20,7 @@ import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @Composable
-fun RemoteControlItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem {
+fun remoteControlItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem {
     val clipboardManager = rememberClipboardHelper()
 
     return SelectionItem(

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/system/components/restartAtBootItem.kt

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.system.components
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Restore
@@ -15,7 +15,7 @@ import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @Composable
-fun RestartAtBootItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem {
+fun restartAtBootItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem {
     return SelectionItem(
         leading = { Icon(Icons.Outlined.Restore, contentDescription = null) },
         trailing = {

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/SupportViewModel.kt

@@ -21,9 +21,11 @@ import kotlinx.coroutines.withContext
 @HiltViewModel
 class SupportViewModel
 @Inject
-constructor(private val updateRepository: UpdateRepository, private val fileUtils: FileUtils,
+constructor(
-            @MainDispatcher private val mainDispatcher: CoroutineDispatcher) :
+    private val updateRepository: UpdateRepository,
-    ViewModel() {
+    private val fileUtils: FileUtils,
+    @MainDispatcher private val mainDispatcher: CoroutineDispatcher,
+) : ViewModel() {
 
     private val _uiState = MutableStateFlow(SupportUiState())
     val uiState = _uiState.asStateFlow()

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/license/License.kt

@@ -5,7 +5,7 @@ data class LicenseFileEntry(
     val groupId: String,
     val artifactId: String,
     val version: String,
-    val name: String,
+    val name: String? = null,
     val spdxLicenses: List<SpdxLicense> = emptyList(),
     val scm: Scm? = null,
 )

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/license/components/LicenseList.kt

@@ -1,42 +1,50 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.support.license.components
 
 import LicenseFileEntry
-import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.focusable
-import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.ui.common.button.LinkIconButton
+import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 
 @Composable
 fun LicenseList(licenses: List<LicenseFileEntry>) {
-    LazyColumn(modifier = Modifier.fillMaxSize().padding(16.dp)) {
+    val context = LocalContext.current
+
+    LazyColumn(modifier = Modifier.fillMaxSize().padding(24.dp)) {
         items(licenses) { entry ->
             Column(modifier = Modifier.padding(bottom = 12.dp)) {
-                Text(
+                Row(
-                    text = "${entry.name} (${entry.version})",
+                    verticalAlignment = Alignment.CenterVertically,
-                    style = MaterialTheme.typography.titleSmall,
+                    horizontalArrangement = Arrangement.SpaceBetween,
-                )
+                ) {
+                    Column(modifier = Modifier.weight(1f)) {
+                        Text(
+                            text = "${entry.artifactId} (${entry.version})",
+                            style = MaterialTheme.typography.titleSmall,
+                        )
 
-                entry.spdxLicenses.forEach { license ->
+                        entry.spdxLicenses.forEach { license ->
-                    Text(
+                            Text(
-                        text = license.name,
+                                text = license.name,
-                        style = MaterialTheme.typography.bodySmall,
+                                style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.primary,
+                                color = MaterialTheme.colorScheme.primary,
-                    )
+                            )
-                }
+                        }
-
+                    }
-                entry.scm?.url?.let { scmUrl ->
+                    entry.scm?.url?.let { scmUrl ->
-                    Text(
+                        LinkIconButton(modifier = Modifier.size(20.dp).focusable()) {
-                        text = scmUrl,
+                            context.openWebUrl(scmUrl)
-                        style = MaterialTheme.typography.labelSmall,
+                        }
-                        modifier = Modifier.padding(top = 4.dp),
+                    }
-                        color = MaterialTheme.colorScheme.secondary,
-                    )
                 }
             }
         }