fix checksum

.github/workflows/build.yml

@@ -118,11 +118,6 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: android_artifacts_${{ inputs.flavor }}
-          path: >-
-            app/build/outputs/apk/${{ inputs.flavor }}/${{ inputs.build_type }}/${{
-              inputs.flavor == 'fdroid' && inputs.build_type == 'release'
-                && 'wgtunnel-fdroid-release-*.apk'
-                || format('wgtunnel-{0}-v*.apk', inputs.flavor)
-            }}
+          path: app/build/outputs/apk/${{ inputs.flavor }}/${{ inputs.build_type  }}/wgtunnel-${{ inputs.flavor }}${{ inputs.flavor == 'fdroid' && '-release' || '' }}-*.apk
           retention-days: 1
           if-no-files-found: warn

.github/workflows/nightly.yml

@@ -69,7 +69,7 @@ jobs:
         run: mkdir ${{ github.workspace }}/temp
 
       - name: Download artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           pattern: android_artifacts_*
           path: ${{ github.workspace }}/temp

.github/workflows/publish.yml

@@ -108,7 +108,7 @@ jobs:
         run: mkdir ${{ github.workspace }}/temp
 
       - name: Download artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           pattern: android_artifacts_*
           path: ${{ github.workspace }}/temp

app/build.gradle.kts

@@ -197,7 +197,6 @@ 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

@@ -1,359 +0,0 @@
-{
-  "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,6 +4,7 @@ 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
@@ -23,6 +24,8 @@ 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/AndroidManifest.xml

@@ -47,10 +47,6 @@
             <action android:name="android.intent.action.MAIN" />
 			<category android:name="android.intent.category.LAUNCHER" />
         </intent>
-        <intent>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-        </intent>
     </queries>
     <application
         android:name=".WireGuardAutoTunnel"

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

@@ -3,7 +3,6 @@ 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
@@ -25,9 +24,7 @@ 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
@@ -40,12 +37,10 @@ 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
@@ -65,18 +60,15 @@ 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.dns.DnsSettingsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.KillSwitchScreen
 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
@@ -85,11 +77,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() {
@@ -230,143 +222,120 @@ class MainActivity : AppCompatActivity() {
                             },
                         )
 
-                        Box(modifier = Modifier.fillMaxSize()) {
-                            // Top banner if in locked down mode
-                            if (appUiState.appSettings.appMode == AppMode.LOCK_DOWN) {
-                                AppAlertBanner(
-                                    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
-                                                ),
-                                        )
+                        Scaffold(
+                            modifier =
+                                Modifier.pointerInput(Unit) {
+                                    detectTapGestures {
+                                        viewModel.handleEvent(AppEvent.ClearSelectedTunnels)
                                     }
                                 },
-                                topBar = { DynamicTopAppBar(navBarState) },
-                                bottomBar = {
-                                    AnimatedVisibility(
-                                        visible = navBarState.showBottom,
-                                        enter = slideInVertically(initialOffsetY = { it }),
-                                        exit = slideOutVertically(targetOffsetY = { it }),
-                                    ) {
-                                        BottomNavbar(appUiState = appUiState)
-                                    }
-                                },
-                            ) { padding ->
-                                Box(
-                                    modifier =
-                                        Modifier.fillMaxSize()
-                                            .background(MaterialTheme.colorScheme.surface)
-                                            .padding(padding)
-                                            .consumeWindowInsets(padding)
-                                            .imePadding()
+                            snackbarHost = {
+                                SnackbarHost(snackbar) { snackbarData: SnackbarData ->
+                                    CustomSnackBar(
+                                        snackbarData.visuals.message,
+                                        isRtl = false,
+                                        containerColor =
+                                            MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
+                                    )
+                                }
+                            },
+                            topBar = { DynamicTopAppBar(navBarState) },
+                            bottomBar = {
+                                AnimatedVisibility(
+                                    visible = navBarState.showBottom,
+                                    enter = slideInVertically(initialOffsetY = { it }),
+                                    exit = slideOutVertically(targetOffsetY = { it }),
                                 ) {
-                                    NavHost(
-                                        navController,
-                                        startDestination =
-                                            (if (appUiState.appState.isPinLockEnabled) Route.Lock
-                                            else Route.Main),
-                                    ) {
-                                        composable<Route.Main> {
-                                            MainScreen(appUiState, appViewState, viewModel)
-                                        }
-                                        composable<Route.Settings> {
-                                            SettingsScreen(appUiState, appViewState, viewModel)
-                                        }
-                                        composable<Route.LocationDisclosure> {
-                                            LocationDisclosureScreen(viewModel)
-                                        }
-                                        composable<Route.AutoTunnel> {
-                                            AutoTunnelScreen(appUiState, viewModel)
-                                        }
-                                        composable<Route.Appearance> { AppearanceScreen() }
-                                        composable<Route.Language> {
-                                            LanguageScreen(appUiState, viewModel)
-                                        }
-                                        composable<Route.Display> {
-                                            DisplayScreen(appUiState, viewModel)
-                                        }
-                                        composable<Route.Support> {
-                                            SupportScreen(appViewModel = viewModel)
-                                        }
-                                        composable<Route.License> { LicenseScreen() }
-                                        composable<Route.AutoTunnelAdvanced> {
-                                            AutoTunnelAdvancedScreen(appUiState, viewModel)
-                                        }
-                                        composable<Route.WifiDetectionMethod> {
-                                            WifiDetectionMethodScreen(appUiState, viewModel)
-                                        }
-                                        composable<Route.Logs> {
-                                            LogsScreen(appViewState, viewModel)
-                                        }
-                                        composable<Route.Config> { backStack ->
-                                            val args = backStack.toRoute<Route.Config>()
-                                            val config =
-                                                appUiState.tunnels.firstOrNull { it.id == args.id }
-                                            ConfigScreen(config, appUiState, viewModel)
-                                        }
-                                        composable<Route.TunnelOptions> { backStack ->
-                                            val args = backStack.toRoute<Route.TunnelOptions>()
-                                            appUiState.tunnels
-                                                .firstOrNull { it.id == args.id }
-                                                ?.let { config ->
-                                                    TunnelOptionsScreen(
-                                                        config,
-                                                        viewModel,
-                                                        appViewState,
-                                                        appUiState.appSettings,
-                                                    )
-                                                }
-                                        }
-                                        composable<Route.Lock> { PinLockScreen(viewModel) }
-                                        composable<Route.SplitTunnel> {
-                                            SplitTunnelScreen(viewModel)
-                                        }
-                                        composable<Route.TunnelAutoTunnel> { backStack ->
-                                            val args = backStack.toRoute<Route.TunnelOptions>()
-                                            appUiState.tunnels
-                                                .firstOrNull { it.id == args.id }
-                                                ?.let {
-                                                    TunnelAutoTunnelScreen(
-                                                        it,
-                                                        appUiState.appSettings,
-                                                        viewModel,
-                                                    )
-                                                }
-                                        }
-                                        composable<Route.Sort> { SortScreen(appUiState, viewModel) }
-                                        composable<Route.TunnelMonitoring> {
-                                            TunnelMonitoringScreen(appUiState, viewModel)
-                                        }
-                                        composable<Route.ProxySettings> {
-                                            ProxySettingsScreen(appUiState, viewModel)
-                                        }
-                                        composable<Route.SystemFeatures> {
-                                            SystemFeaturesScreen(appUiState, viewModel)
-                                        }
-                                        composable<Route.Dns> {
-                                            DnsSettingsScreen(appUiState, viewModel)
-                                        }
+                                    BottomNavbar(appUiState = appUiState)
+                                }
+                            },
+                        ) { padding ->
+                            Box(
+                                modifier =
+                                    Modifier.fillMaxSize()
+                                        .background(MaterialTheme.colorScheme.surface)
+                                        .padding(padding)
+                                        .consumeWindowInsets(padding)
+                                        .imePadding()
+                            ) {
+                                NavHost(
+                                    navController,
+                                    startDestination =
+                                        (if (appUiState.appState.isPinLockEnabled) Route.Lock
+                                        else Route.Main),
+                                ) {
+                                    composable<Route.Main> {
+                                        MainScreen(appUiState, appViewState, viewModel)
+                                    }
+                                    composable<Route.Settings> {
+                                        SettingsScreen(appUiState, appViewState, viewModel)
+                                    }
+                                    composable<Route.SettingsAdvanced> {
+                                        SettingsAdvancedScreen(appUiState, viewModel)
+                                    }
+                                    composable<Route.LocationDisclosure> {
+                                        LocationDisclosureScreen(viewModel)
+                                    }
+                                    composable<Route.AutoTunnel> {
+                                        AutoTunnelScreen(appUiState, viewModel)
+                                    }
+                                    composable<Route.Appearance> { AppearanceScreen() }
+                                    composable<Route.Language> {
+                                        LanguageScreen(appUiState, viewModel)
+                                    }
+                                    composable<Route.Display> {
+                                        DisplayScreen(appUiState, viewModel)
+                                    }
+                                    composable<Route.Support> {
+                                        SupportScreen(appViewModel = viewModel)
+                                    }
+                                    composable<Route.License> { LicenseScreen() }
+                                    composable<Route.AutoTunnelAdvanced> {
+                                        AutoTunnelAdvancedScreen(appUiState, viewModel)
+                                    }
+                                    composable<Route.WifiDetectionMethod> {
+                                        WifiDetectionMethodScreen(appUiState, viewModel)
+                                    }
+                                    composable<Route.Logs> { LogsScreen(appViewState, viewModel) }
+                                    composable<Route.Config> { backStack ->
+                                        val args = backStack.toRoute<Route.Config>()
+                                        val config =
+                                            appUiState.tunnels.firstOrNull { it.id == args.id }
+                                        ConfigScreen(config, viewModel)
+                                    }
+                                    composable<Route.TunnelOptions> { backStack ->
+                                        val args = backStack.toRoute<Route.TunnelOptions>()
+                                        appUiState.tunnels
+                                            .firstOrNull { it.id == args.id }
+                                            ?.let { config ->
+                                                TunnelOptionsScreen(
+                                                    config,
+                                                    viewModel,
+                                                    appViewState,
+                                                    appUiState.appSettings,
+                                                )
+                                            }
+                                    }
+                                    composable<Route.Lock> { PinLockScreen(viewModel) }
+                                    composable<Route.KillSwitch> {
+                                        KillSwitchScreen(appUiState, viewModel)
+                                    }
+                                    composable<Route.SplitTunnel> { SplitTunnelScreen(viewModel) }
+                                    composable<Route.TunnelAutoTunnel> { backStack ->
+                                        val args = backStack.toRoute<Route.TunnelOptions>()
+                                        appUiState.tunnels
+                                            .firstOrNull { it.id == args.id }
+                                            ?.let {
+                                                TunnelAutoTunnelScreen(
+                                                    it,
+                                                    appUiState.appSettings,
+                                                    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.BackendMode
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 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.setBackendMode(BackendMode.Inactive)
+        tunnelManager.setBackendState(BackendState.INACTIVE, emptyList())
         super.onTerminate()
     }
 

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

@@ -24,7 +24,6 @@ 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
@@ -35,7 +34,22 @@ class RestartReceiver : BroadcastReceiver() {
         Timber.d("RestartReceiver triggered with action: ${intent.action}")
         serviceManager.updateTunnelTile()
         serviceManager.updateAutoTunnelTile()
-        if (intent.action == Intent.ACTION_MY_PACKAGE_REPLACED)
-            applicationScope.launch(ioDispatcher) { logReader.deleteAndClearLogs() }
+        applicationScope.launch(ioDispatcher) {
+            val settings = appDataRepository.settings.get()
+            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,6 +16,7 @@ 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.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus.StopReason.Ping
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
@@ -99,10 +100,26 @@ 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.getBackendState() != BackendState.KILL_SWITCH_ACTIVE
+            ) {
+                eventHandlerJob?.cancel()
+                val allowedIps =
+                    if (settings.isLanOnKillSwitchEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS
+                    else emptyList()
+                tunnelManager.setBackendState(BackendState.KILL_SWITCH_ACTIVE, allowedIps)
+            }
+        }
+    }
+
     private fun launchWatcherNotification(
         description: String = getString(R.string.monitoring_state_changes)
     ) {
@@ -383,6 +400,14 @@ 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.setBackendState(BackendState.KILL_SWITCH_ACTIVE, event.allowedIps)
+                }
+                AutoTunnelEvent.StopKillSwitch -> {
+                    Timber.d("Stopping kill switch")
+                    tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptySet())
+                }
             }
         }
     }

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, false),
+                                amQuick = amnezia.toAwgQuickString(true),
                                 wgQuick = wg.toWgQuickString(true),
                             )
                         bouncingTunnelIds.remove(currentConf.id)

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

@@ -5,8 +5,7 @@ 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.di.Kernel
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
@@ -24,7 +23,7 @@ constructor(
     @ApplicationScope private val applicationScope: CoroutineScope,
     serviceManager: ServiceManager,
     appDataRepository: AppDataRepository,
-    @Kernel private val backend: Backend,
+    private val backend: Backend,
 ) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
 
     override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
@@ -60,12 +59,12 @@ constructor(
         }
     }
 
-    override fun setBackendMode(backendMode: BackendMode) {
+    override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
         Timber.w("Not yet implemented for kernel")
     }
 
-    override fun getBackendMode(): BackendMode {
-        return BackendMode.Inactive
+    override fun getBackendState(): BackendState {
+        return BackendState.INACTIVE
     }
 
     override suspend fun runningTunnelNames(): Set<String> {

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

@@ -1,13 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-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.BackendState
 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
@@ -15,106 +11,39 @@ 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(
-    @Kernel private val kernelTunnel: TunnelProvider,
-    @Userspace private val userspaceTunnel: TunnelProvider,
-    @ProxyUserspace private val proxyUserspaceTunnel: TunnelProvider,
-    private val serviceManager: ServiceManager,
+    private val kernelTunnel: TunnelProvider,
+    private val userspaceTunnel: TunnelProvider,
     private val appDataRepository: AppDataRepository,
-    @ApplicationScope applicationScope: CoroutineScope,
-    @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    applicationScope: CoroutineScope,
+    ioDispatcher: CoroutineDispatcher,
 ) : TunnelProvider {
 
-    @OptIn(ExperimentalAtomicApi::class)
-    private val tunnelProviderFlow: StateFlow<TunnelProvider> = run {
-        val currentBackend = AtomicReference(userspaceTunnel)
-        val currentSettings = AtomicReference(AppSettings())
-        val initialEmit = AtomicBoolean(true)
-
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private val tunnelProviderFlow =
         appDataRepository.settings.flow
             .filterNotNull()
-            // ignore default state
-            .filterNot { it == AppSettings() }
-            .distinctUntilChanged { old, new ->
-                old.appMode == new.appMode &&
-                    old.isLanOnKillSwitchEnabled == new.isLanOnKillSwitchEnabled
+            .flatMapLatest { settings ->
+                MutableStateFlow(if (settings.isKernelEnabled) kernelTunnel else userspaceTunnel)
             }
-            .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
-            .flatMapLatest { it.activeTunnels }
-            .stateIn(
-                scope = applicationScope.plus(ioDispatcher),
-                started = SharingStarted.Eagerly,
-                initialValue = emptyMap(),
-            )
+        tunnelProviderFlow.value.activeTunnels
 
     @OptIn(ExperimentalCoroutinesApi::class)
     override val errorEvents: SharedFlow<Pair<TunnelConf, BackendError>> =
@@ -160,12 +89,12 @@ constructor(
         tunnelProviderFlow.value.bounceTunnel(tunnelConf, reason)
     }
 
-    override fun setBackendMode(backendMode: BackendMode) {
-        tunnelProviderFlow.value.setBackendMode(backendMode)
+    override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+        tunnelProviderFlow.value.setBackendState(backendState, allowedIps)
     }
 
-    override fun getBackendMode(): BackendMode {
-        return tunnelProviderFlow.value.getBackendMode()
+    override fun getBackendState(): BackendState {
+        return tunnelProviderFlow.value.getBackendState()
     }
 
     override suspend fun runningTunnelNames(): Set<String> {
@@ -187,4 +116,20 @@ 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/TunnelMonitor.kt

@@ -138,22 +138,19 @@ constructor(
                         }
 
                         val host =
-                            tunnelConf.pingTarget
-                                ?: {
-                                        val parts = allowedIpStr.split("/")
-                                        val internalIp =
-                                            if (parts.size == 2) parts[0] else allowedIpStr
+                            {
+                                    val parts = allowedIpStr.split("/")
+                                    val internalIp = if (parts.size == 2) parts[0] else allowedIpStr
 
-                                        val prefix =
-                                            if (parts.size == 2) parts[1].toIntOrNull() ?: 32
-                                            else 32
-                                        if (prefix <= 1) {
-                                            CLOUDFLARE_IPV4_IP
-                                        } else {
-                                            internalIp.removeSurrounding("[", "]")
-                                        }
+                                    val prefix =
+                                        if (parts.size == 2) parts[1].toIntOrNull() ?: 32 else 32
+                                    if (prefix <= 1) {
+                                        tunnelConf.pingTarget ?: CLOUDFLARE_IPV4_IP
+                                    } else {
+                                        internalIp.removeSurrounding("[", "]")
                                     }
-                                    .invoke()
+                                }
+                                .invoke()
 
                         val attemptTime = System.currentTimeMillis()
                         runCatching {

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.BackendMode
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 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 setBackendMode(backendMode: BackendMode)
+    fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
 
-    fun getBackendMode(): BackendMode
+    fun getBackendState(): BackendState
 
     suspend fun runningTunnelNames(): Set<String>
 

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

@@ -1,30 +1,23 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 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.asAmBackendMode
-import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendMode
+import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendState
+import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendState
 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
@@ -36,58 +29,14 @@ constructor(
     private val backend: Backend,
 ) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
 
+    private var previousBackendState: Pair<BackendState, Boolean>? = null
+
     override suspend fun startBackend(tunnel: TunnelConf) {
         try {
             updateTunnelStatus(tunnel, TunnelStatus.Starting)
-
-            val proxies: List<Proxy> =
-                when (backend) {
-                    is ProxyGoBackend -> {
-                        val proxySettings = appDataRepository.proxySettings.get()
-                        Timber.d("Adding proxy configs")
-                        buildList {
-                            if (proxySettings.socks5ProxyEnabled) {
-                                add(
-                                    Socks5Proxy(
-                                        proxySettings.socks5ProxyBindAddress
-                                            ?: 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)
+            val amConfig = tunnel.toAmConfig()
+            handleVpnKillSwitchWithDomainEndpoints(amConfig)
+            backend.setState(tunnel, Tunnel.State.UP, amConfig)
         } catch (e: BackendException) {
             Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
             throw e.toBackendError()
@@ -104,20 +53,47 @@ constructor(
         } catch (e: BackendException) {
             Timber.e(e, "Failed to stop tunnel ${tunnel.id}")
             throw e.toBackendError()
+        } finally {
+            handlePreviouslyEnabledVpnKillSwitch()
         }
     }
 
-    override fun setBackendMode(backendMode: BackendMode) {
-        Timber.d("Setting backend mode: $backendMode")
+    // stop vpn kill switch if we need to resolve DNS for peer endpoints
+    private suspend fun handleVpnKillSwitchWithDomainEndpoints(config: Config) {
+        if (
+            config.peers.any { it.endpoint.getOrNull()?.toString()?.isUrl() == true } &&
+                backend.backendState.asBackendState() == BackendState.KILL_SWITCH_ACTIVE
+        ) {
+            val bypassLan = appDataRepository.settings.get().isLanOnKillSwitchEnabled
+            previousBackendState = Pair(BackendState.KILL_SWITCH_ACTIVE, bypassLan)
+            setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
+        }
+    }
+
+    // restore vpn kill switch if needed
+    private fun handlePreviouslyEnabledVpnKillSwitch() {
+        // let auto tunnel handle this if it is active
+        if (serviceManager.autoTunnelService.value == null) {
+            previousBackendState?.let { (state, lanEnabled) ->
+                Timber.d("Restoring kill switch configuration")
+                val lan = if (lanEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS else emptyList()
+                backend.setBackendState(state.asAmBackendState(), lan)
+            }
+        }
+        previousBackendState = null
+    }
+
+    override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+        Timber.d("Setting backend state: $backendState with allowedIps: $allowedIps")
         try {
-            backend.backendMode = backendMode.asAmBackendMode()
+            backend.setBackendState(backendState.asAmBackendState(), allowedIps)
         } catch (e: BackendException) {
             throw e.toBackendError()
         }
     }
 
-    override fun getBackendMode(): BackendMode {
-        return backend.backendMode.asBackendMode()
+    override fun getBackendState(): BackendState {
+        return backend.backendState.asBackendState()
     }
 
     override suspend fun runningTunnelNames(): Set<String> {

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

@@ -4,6 +4,7 @@ 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
@@ -22,6 +23,7 @@ constructor(
     private val serviceManager: ServiceManager,
     private val appDataRepository: AppDataRepository,
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val tunnelManager: TunnelManager,
 ) : CoroutineWorker(context, params) {
 
     companion object {
@@ -51,11 +53,10 @@ constructor(
         withContext(ioDispatcher) {
             Timber.i("Service worker started")
             with(appDataRepository.settings.get()) {
-                Timber.i("Checking to see if auto-tunnel has been killed by system")
-                if (isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null) {
-                    Timber.i("Service has been killed by system, restoring.")
-                    serviceManager.startAutoTunnel()
-                }
+                if (isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null)
+                    return@with serviceManager.startAutoTunnel()
+                if (tunnelManager.activeTunnels.value.isEmpty())
+                    tunnelManager.restorePreviousState()
             }
             Result.success()
         }

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

@@ -2,16 +2,14 @@ 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, ProxySettings::class],
-    version = 20,
+    entities = [Settings::class, TunnelConfig::class],
+    version = 19,
     autoMigrations =
         [
             AutoMigration(from = 1, to = 2),
@@ -32,7 +30,6 @@ 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,
 )
@@ -41,8 +38,6 @@ abstract class AppDatabase : RoomDatabase() {
     abstract fun settingDao(): SettingsDao
 
     abstract fun tunnelConfigDoa(): TunnelConfigDao
-
-    abstract fun proxySettingsDoa(): ProxySettingsDao
 }
 
 @DeleteColumn(tableName = "Settings", columnName = "default_tunnel")
@@ -73,11 +68,3 @@ 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,25 +2,20 @@ package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.RoomDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
-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
+import timber.log.Timber
 
-class DatabaseCallback @Inject constructor(private val databaseProvider: Provider<AppDatabase>) :
-    RoomDatabase.Callback() {
-
-    override fun onCreate(db: SupportSQLiteDatabase) {
-        super.onCreate(db)
-
-        // Launch coroutine to insert default entry
-        CoroutineScope(Dispatchers.IO).launch {
-            val db = databaseProvider.get()
-            db.settingDao().save(Settings())
-            db.proxySettingsDoa().save(ProxySettings())
+class DatabaseCallback : RoomDatabase.Callback() {
+    override fun onCreate(db: SupportSQLiteDatabase) =
+        db.run {
+            beginTransaction()
+            try {
+                execSQL(Queries.createDefaultSettings())
+                Timber.i("Bootstrapping settings data")
+                setTransactionSuccessful()
+            } catch (e: Exception) {
+                Timber.e(e)
+            } finally {
+                endTransaction()
+            }
         }
-    }
 }

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

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

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

@@ -0,0 +1,37 @@
+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

@@ -1,25 +0,0 @@
-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<List<Settings>>
+    @Query("SELECT * FROM settings") fun getAllFlow(): Flow<MutableList<Settings>>
 
     @Delete suspend fun delete(t: Settings)
 

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

@@ -1,18 +0,0 @@
-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,9 +3,6 @@ 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(
@@ -21,16 +18,24 @@ 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")
@@ -47,8 +52,16 @@ 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),
-    @ColumnInfo(name = "dns_protocol", defaultValue = "0")
-    val dnsProtocol: DnsProtocol = DnsProtocol.fromValue(0),
-    @ColumnInfo(name = "dns_endpoint") val dnsEndpoint: String? = null,
-)
+) {
+    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/mapper/ProxySettingsMapper.kt

@@ -1,32 +0,0 @@
-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,78 +2,70 @@ 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
 
-fun Settings.toAppSettings(): AppSettings {
-    return AppSettings(
-        id = id,
-        isAutoTunnelEnabled = isAutoTunnelEnabled,
-        isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
-        trustedNetworkSSIDs = trustedNetworkSSIDs,
-        isAlwaysOnVpnEnabled = isAlwaysOnVpnEnabled,
-        isTunnelOnEthernetEnabled = isTunnelOnEthernetEnabled,
-        isShortcutsEnabled = isShortcutsEnabled,
-        isTunnelOnWifiEnabled = isTunnelOnWifiEnabled,
-        isRestoreOnBootEnabled = isRestoreOnBootEnabled,
-        isMultiTunnelEnabled = isMultiTunnelEnabled,
-        isPingEnabled = isPingEnabled,
-        isWildcardsEnabled = isWildcardsEnabled,
-        isStopOnNoInternetEnabled = isStopOnNoInternetEnabled,
-        isLanOnKillSwitchEnabled = isLanOnKillSwitchEnabled,
-        debounceDelaySeconds = debounceDelaySeconds,
-        isDisableKillSwitchOnTrustedEnabled = isDisableKillSwitchOnTrustedEnabled,
-        isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
-        wifiDetectionMethod =
-            AndroidNetworkMonitor.WifiDetectionMethod.fromValue(wifiDetectionMethod.value),
-        tunnelPingIntervalSeconds = tunnelPingIntervalSeconds,
-        tunnelPingAttempts = tunnelPingAttempts,
-        tunnelPingTimeoutSeconds = tunnelPingTimeoutSeconds,
-        appMode = appMode,
-        dnsProtocol = dnsProtocol,
-        dnsEndpoint = dnsEndpoint,
-    )
-}
+object SettingsMapper {
+    fun toAppSettings(settings: Settings): AppSettings {
+        return AppSettings(
+            id = settings.id,
+            isAutoTunnelEnabled = settings.isAutoTunnelEnabled,
+            isTunnelOnMobileDataEnabled = settings.isTunnelOnMobileDataEnabled,
+            trustedNetworkSSIDs = settings.trustedNetworkSSIDs,
+            isAlwaysOnVpnEnabled = settings.isAlwaysOnVpnEnabled,
+            isTunnelOnEthernetEnabled = settings.isTunnelOnEthernetEnabled,
+            isShortcutsEnabled = settings.isShortcutsEnabled,
+            isTunnelOnWifiEnabled = settings.isTunnelOnWifiEnabled,
+            isKernelEnabled = settings.isKernelEnabled,
+            isRestoreOnBootEnabled = settings.isRestoreOnBootEnabled,
+            isMultiTunnelEnabled = settings.isMultiTunnelEnabled,
+            isPingEnabled = settings.isPingEnabled,
+            isAmneziaEnabled = settings.isAmneziaEnabled,
+            isWildcardsEnabled = settings.isWildcardsEnabled,
+            isStopOnNoInternetEnabled = settings.isStopOnNoInternetEnabled,
+            isVpnKillSwitchEnabled = settings.isVpnKillSwitchEnabled,
+            isKernelKillSwitchEnabled = settings.isKernelKillSwitchEnabled,
+            isLanOnKillSwitchEnabled = settings.isLanOnKillSwitchEnabled,
+            debounceDelaySeconds = settings.debounceDelaySeconds,
+            isDisableKillSwitchOnTrustedEnabled = settings.isDisableKillSwitchOnTrustedEnabled,
+            isTunnelOnUnsecureEnabled = settings.isTunnelOnUnsecureEnabled,
+            wifiDetectionMethod =
+                AndroidNetworkMonitor.WifiDetectionMethod.fromValue(
+                    settings.wifiDetectionMethod.value
+                ),
+            tunnelPingIntervalSeconds = settings.tunnelPingIntervalSeconds,
+            tunnelPingAttempts = settings.tunnelPingAttempts,
+            tunnelPingTimeoutSeconds = settings.tunnelPingTimeoutSeconds,
+        )
+    }
 
-fun AppSettings.toSettings(): Settings {
-    return Settings(
-        id = id,
-        isAutoTunnelEnabled = isAutoTunnelEnabled,
-        isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
-        trustedNetworkSSIDs = trustedNetworkSSIDs,
-        isAlwaysOnVpnEnabled = isAlwaysOnVpnEnabled,
-        isTunnelOnEthernetEnabled = isTunnelOnEthernetEnabled,
-        isShortcutsEnabled = isShortcutsEnabled,
-        isTunnelOnWifiEnabled = isTunnelOnWifiEnabled,
-        isRestoreOnBootEnabled = isRestoreOnBootEnabled,
-        isMultiTunnelEnabled = isMultiTunnelEnabled,
-        isPingEnabled = isPingEnabled,
-        isWildcardsEnabled = isWildcardsEnabled,
-        isStopOnNoInternetEnabled = isStopOnNoInternetEnabled,
-        isLanOnKillSwitchEnabled = isLanOnKillSwitchEnabled,
-        debounceDelaySeconds = debounceDelaySeconds,
-        isDisableKillSwitchOnTrustedEnabled = isDisableKillSwitchOnTrustedEnabled,
-        isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
-        wifiDetectionMethod = WifiDetectionMethod.fromValue(wifiDetectionMethod.value),
-        tunnelPingIntervalSeconds = tunnelPingIntervalSeconds,
-        tunnelPingAttempts = tunnelPingAttempts,
-        tunnelPingTimeoutSeconds = tunnelPingTimeoutSeconds,
-        appMode = appMode,
-        dnsProtocol = dnsProtocol,
-        dnsEndpoint = dnsEndpoint,
-    )
-}
-
-fun AppSettings.toDomain(): DnsSettings {
-    return DnsSettings(
-        protocol =
-            DnsProtocol.entries.toTypedArray().getOrElse(dnsProtocol.value) { DnsProtocol.SYSTEM },
-        endpoint = dnsEndpoint,
-    )
-}
-
-fun DnsSettings.toAppSettings(existing: AppSettings): AppSettings {
-    return existing.copy(dnsProtocol = protocol, dnsEndpoint = endpoint)
+    fun toSettings(appSettings: AppSettings): Settings {
+        return Settings(
+            id = appSettings.id,
+            isAutoTunnelEnabled = appSettings.isAutoTunnelEnabled,
+            isTunnelOnMobileDataEnabled = appSettings.isTunnelOnMobileDataEnabled,
+            trustedNetworkSSIDs = appSettings.trustedNetworkSSIDs,
+            isAlwaysOnVpnEnabled = appSettings.isAlwaysOnVpnEnabled,
+            isTunnelOnEthernetEnabled = appSettings.isTunnelOnEthernetEnabled,
+            isShortcutsEnabled = appSettings.isShortcutsEnabled,
+            isTunnelOnWifiEnabled = appSettings.isTunnelOnWifiEnabled,
+            isKernelEnabled = appSettings.isKernelEnabled,
+            isRestoreOnBootEnabled = appSettings.isRestoreOnBootEnabled,
+            isMultiTunnelEnabled = appSettings.isMultiTunnelEnabled,
+            isPingEnabled = appSettings.isPingEnabled,
+            isAmneziaEnabled = appSettings.isAmneziaEnabled,
+            isWildcardsEnabled = appSettings.isWildcardsEnabled,
+            isStopOnNoInternetEnabled = appSettings.isStopOnNoInternetEnabled,
+            isVpnKillSwitchEnabled = appSettings.isVpnKillSwitchEnabled,
+            isKernelKillSwitchEnabled = appSettings.isKernelKillSwitchEnabled,
+            isLanOnKillSwitchEnabled = appSettings.isLanOnKillSwitchEnabled,
+            debounceDelaySeconds = appSettings.debounceDelaySeconds,
+            isDisableKillSwitchOnTrustedEnabled = appSettings.isDisableKillSwitchOnTrustedEnabled,
+            isTunnelOnUnsecureEnabled = appSettings.isTunnelOnUnsecureEnabled,
+            wifiDetectionMethod =
+                Settings.WifiDetectionMethod.fromValue(appSettings.wifiDetectionMethod.value),
+            tunnelPingIntervalSeconds = appSettings.tunnelPingIntervalSeconds,
+            tunnelPingAttempts = appSettings.tunnelPingAttempts,
+            tunnelPingTimeoutSeconds = appSettings.tunnelPingTimeoutSeconds,
+        )
+    }
 }

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

@@ -1,12 +0,0 @@
-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

@@ -1,45 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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,7 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.*
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+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
@@ -10,7 +13,6 @@ 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

@@ -38,13 +38,13 @@ class GitHubUpdateRepository(
                     gitHubApi.getLatestRelease(githubOwner, githubRepo).onFailure(Timber::e)
                 }
             release.map { release ->
-                val standaloneApkAsset =
+                val apkAsset =
                     release.assets.find { asset ->
                         asset.name.startsWith("wgtunnel-${Constants.STANDALONE_FLAVOR}-v") &&
                             asset.name.endsWith(".apk")
                     }
                 val newVersion =
-                    standaloneApkAsset
+                    apkAsset
                         ?.name
                         ?.removePrefix("wgtunnel-${Constants.STANDALONE_FLAVOR}-v")
                         ?.removeSuffix(".apk") ?: return@map null
@@ -53,10 +53,7 @@ class GitHubUpdateRepository(
                 if (isNightly && newVersion != currentVersion)
                     return@map GitHubReleaseMapper.toAppUpdate(release, newVersion)
                 if (NumberUtils.compareVersions(newVersion, currentVersion) > 0) {
-                    GitHubReleaseMapper.toAppUpdate(
-                        release.copy(assets = listOf(standaloneApkAsset)),
-                        newVersion,
-                    )
+                    GitHubReleaseMapper.toAppUpdate(release, newVersion)
                 } else {
                     null
                 }
@@ -66,7 +63,7 @@ class GitHubUpdateRepository(
     override suspend fun downloadApk(
         apkUrl: String,
         fileName: String,
-        onProgress: suspend (Float) -> Unit,
+        onProgress: (Float) -> Unit,
     ): Result<File> =
         withContext(ioDispatcher) {
             try {

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

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

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

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

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

@@ -7,6 +7,7 @@ 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
@@ -25,7 +26,6 @@ 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,21 +48,10 @@ 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(
@@ -97,19 +86,7 @@ class TunnelModule {
         @ApplicationScope applicationScope: CoroutineScope,
         serviceManager: ServiceManager,
         appDataRepository: AppDataRepository,
-        @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,
+        backend: Backend,
     ): TunnelProvider {
         return UserspaceTunnel(applicationScope, serviceManager, appDataRepository, backend)
     }
@@ -119,17 +96,14 @@ 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

@@ -1,7 +0,0 @@
-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

@@ -0,0 +1,7 @@
+package com.zaneschepke.wireguardautotunnel.domain.enums
+
+enum class BackendState {
+    KILL_SWITCH_ACTIVE,
+    SERVICE_ACTIVE,
+    INACTIVE,
+}

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

@@ -11,4 +11,8 @@ 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

@@ -1,16 +0,0 @@
-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,8 +1,6 @@
 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,
@@ -13,9 +11,11 @@ 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,9 +29,6 @@ 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,6 +99,8 @@ 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)
     }
@@ -107,10 +109,6 @@ 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
@@ -144,7 +142,7 @@ data class TunnelConf(
             config: org.amnezia.awg.config.Config,
             name: String? = null,
         ): TunnelConf {
-            val amQuick = config.toAwgQuickString(true, false)
+            val amQuick = config.toAwgQuickString(true)
             val wgQuick = config.toWgQuickString()
             return TunnelConf(
                 tunName = name ?: config.defaultName(),
@@ -156,8 +154,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)
-        val IPV4_PUBLIC_NETWORKS =
-            setOf(
+        private val IPV4_PUBLIC_NETWORKS =
+            listOf(
                 "0.0.0.0/5",
                 "8.0.0.0/7",
                 "11.0.0.0/8",
@@ -189,6 +187,6 @@ data class TunnelConf(
                 "200.0.0.0/5",
                 "208.0.0.0/4",
             )
-        val LAN_BYPASS_ALLOWED_IPS = setOf(IPV6_ALL_NETWORKS) + IPV4_PUBLIC_NETWORKS
+        val LAN_BYPASS_ALLOWED_IPS = listOf(IPV6_ALL_NETWORKS) + IPV4_PUBLIC_NETWORKS
     }
 }

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

@@ -10,6 +10,4 @@ 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

@@ -1,12 +0,0 @@
-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/repository/UpdateRepository.kt

@@ -9,6 +9,6 @@ interface UpdateRepository {
     suspend fun downloadApk(
         apkUrl: String,
         fileName: String,
-        onProgress: suspend (Float) -> Unit,
+        onProgress: (Float) -> Unit,
     ): Result<File>
 }

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

@@ -53,6 +53,16 @@ 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.BackendMode
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import org.amnezia.awg.crypto.Key
 
 data class TunnelState(
     val status: TunnelStatus = TunnelStatus.Down,
-    val backendState: BackendMode = BackendMode.Inactive,
+    val backendState: BackendState = BackendState.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,6 +7,8 @@ sealed class Route {
 
     @Serializable data object Settings : Route()
 
+    @Serializable data object SettingsAdvanced : Route()
+
     @Serializable data object AutoTunnel : Route()
 
     @Serializable data object AutoTunnelAdvanced : Route()
@@ -19,6 +21,8 @@ sealed class Route {
 
     @Serializable data object Display : Route()
 
+    @Serializable data object KillSwitch : Route()
+
     @Serializable data object Language : Route()
 
     @Serializable data object Main : Route()
@@ -45,10 +49,4 @@ 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

@@ -1,25 +0,0 @@
-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

@@ -0,0 +1,34 @@
+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

@@ -1,42 +0,0 @@
-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
 
-@Composable
+@androidx.compose.runtime.Composable
 fun IconSurfaceButton(
     title: String,
     onClick: () -> Unit,

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

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

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

@@ -1,70 +1,55 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.textbox
+package com.zaneschepke.wireguardautotunnel.ui.common.config
 
 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,
-    supportingText: (@Composable () -> Unit)? = null,
-    interactionSource: MutableInteractionSource = MutableInteractionSource(),
-    visualTransformation: VisualTransformation = VisualTransformation.None,
-    enabled: Boolean = true,
-    readOnly: Boolean = false,
-    singleLine: Boolean = true,
+    interactionSource: MutableInteractionSource? = null,
 ) {
-    CustomTextField(
+    OutlinedTextField(
         isError = isError,
-        textStyle =
-            MaterialTheme.typography.bodySmall.copy(color = MaterialTheme.colorScheme.onSurface),
-        modifier = modifier.fillMaxWidth().height(48.dp),
+        textStyle = MaterialTheme.typography.labelLarge,
+        modifier = modifier,
         value = value,
-        visualTransformation = visualTransformation,
-        singleLine = singleLine,
+        singleLine = true,
         interactionSource = interactionSource,
         onValueChange = { onValueChange(it) },
         label = {
             Text(
                 label,
                 color = MaterialTheme.colorScheme.onSurface,
-                style = MaterialTheme.typography.labelMedium,
+                style = MaterialTheme.typography.bodyMedium,
             )
         },
-        containerColor = MaterialTheme.colorScheme.surface,
+        maxLines = 1,
         placeholder = {
             Text(
                 hint,
-                style = MaterialTheme.typography.bodySmall,
                 color = MaterialTheme.colorScheme.outline,
+                style = MaterialTheme.typography.bodyMedium,
             )
         },
         keyboardOptions = keyboardOptions,
         keyboardActions = keyboardActions,
-        trailing = trailing,
-        supportingText = supportingText,
-        leading = leading,
-        readOnly = readOnly,
-        enabled = enabled,
+        trailingIcon = trailing,
     )
 }

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

@@ -0,0 +1,41 @@
+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/config/SubmitConfigurationTextBox.kt

@@ -1,9 +1,9 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.textbox
+package com.zaneschepke.wireguardautotunnel.ui.common.config
 
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsFocusedAsState
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 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.fillMaxWidth().height(48.dp),
+        modifier = Modifier.padding(top = 5.dp, bottom = 10.dp).fillMaxWidth().padding(end = 16.dp),
         singleLine = true,
         keyboardOptions = keyboardOptions,
         keyboardActions =

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.heightIn
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowDropDown
@@ -23,29 +23,37 @@ 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 = optionToString(currentValue), style = MaterialTheme.typography.bodyMedium)
+        Text(
+            text = currentValue?.toString() ?: stringResource(R.string._default),
+            style = MaterialTheme.typography.bodyMedium,
+        )
         Icon(Icons.Default.ArrowDropDown, contentDescription = stringResource(R.string.dropdown))
     }
-
     DropdownMenu(
-        modifier = modifier.heightIn(max = 250.dp),
+        modifier = modifier.height(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(optionToString(option)) },
+                text = { Text(text = option.toString()) },
                 onClick = {
                     onValueSelected(option)
                     onDismiss()

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

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

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

@@ -1,69 +0,0 @@
-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/CustomTextField.kt

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

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

@@ -11,13 +11,12 @@ 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.padding(top = LockedDownBannerHeight),
+        modifier = modifier,
         colors = TopAppBarDefaults.topAppBarColors().copy(Color.Transparent),
         title = {
             AnimatedVisibility(

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

@@ -15,7 +15,6 @@ 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
@@ -39,8 +38,6 @@ 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 }
@@ -147,10 +144,7 @@ fun currentNavBackStackEntryAsNavBarState(
                         topTitle = { Text(stringResource(R.string.settings)) },
                         route = Route.Settings,
                         topTrailing = {
-                            ActionIconButton(
-                                Icons.Rounded.SettingsBackupRestore,
-                                R.string.quick_actions,
-                            ) {
+                            ActionIconButton(Icons.Rounded.Menu, R.string.quick_actions) {
                                 viewModel.handleEvent(
                                     AppEvent.SetBottomSheet(
                                         AppViewState.BottomSheet.BACKUP_AND_RESTORE
@@ -184,33 +178,16 @@ 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.SystemFeatures::class) ->
+                backStackEntry.isCurrentRoute(Route.KillSwitch::class) ->
                     NavBarState(
-                        topTitle = { Text(stringResource(R.string.android_integrations)) },
-                        route = Route.SystemFeatures,
-                    )
-
-                backStackEntry.isCurrentRoute(Route.Dns::class) ->
-                    NavBarState(
-                        topTitle = { Text(stringResource(R.string.dns_settings)) },
-                        route = Route.Dns,
+                        topTitle = { Text(stringResource(R.string.kill_switch)) },
+                        route = Route.KillSwitch,
                     )
 
                 backStackEntry.isCurrentRoute(Route.Support::class) ->
@@ -247,7 +224,8 @@ fun currentNavBackStackEntryAsNavBarState(
                     )
                 }
 
-                backStackEntry.isCurrentRoute(Route.AutoTunnelAdvanced::class) ->
+                backStackEntry.isCurrentRoute(Route.AutoTunnelAdvanced::class) ||
+                    backStackEntry.isCurrentRoute(Route.SettingsAdvanced::class) ->
                     NavBarState(
                         showTop = true,
                         showBottom = true,
@@ -300,14 +278,12 @@ fun currentNavBackStackEntryAsNavBarState(
 
                 backStackEntry.isCurrentRoute(Route.Config::class) -> {
                     val args = backStackEntry?.toRoute<Route.Config>()
-                    val name =
-                        uiState.tunnels.find { it.id == args?.id }?.name
-                            ?: context.getString(R.string.new_tunnel)
+                    val name = uiState.tunnels.find { it.id == args?.id }?.name
 
                     NavBarState(
                         showTop = true,
                         showBottom = true,
-                        topTitle = { Text(name) },
+                        topTitle = { name?.let { Text(it) } },
                         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,14 +145,7 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AppViewModel) {
                         title = { Text(title) },
                         trailing = {
                             Button({ viewModel.handleEvent(AppEvent.ToggleAutoTunnel) }) {
-                                Text(
-                                    buttonText,
-                                    fontWeight = FontWeight.Bold,
-                                    style =
-                                        MaterialTheme.typography.bodyMedium.copy(
-                                            color = MaterialTheme.colorScheme.surface
-                                        ),
-                                )
+                                Text(buttonText, fontWeight = FontWeight.Bold)
                             }
                         },
                     )

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.LabelledDropdown
+import com.zaneschepke.wireguardautotunnel.ui.common.dropdown.LabelledNumberDropdown
 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),
     ) {
-        LabelledDropdown(
+        LabelledNumberDropdown(
             title = {
                 Text(
                     stringResource(R.string.debounce_delay),
@@ -49,7 +49,6 @@ 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.asTitleString
+import com.zaneschepke.wireguardautotunnel.util.extensions.asString
 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.asTitleString(context),
+                                uiState.appSettings.wifiDetectionMethod.asString(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.asTitleString
+import com.zaneschepke.wireguardautotunnel.util.extensions.asString
 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.asTitleString(context)
+            val title = it.asString(context)
             val description = it.asDescriptionString(context)
             IconSurfaceButton(
                 title = title,

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

@@ -1,16 +1,20 @@
 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.ExperimentalMaterial3Api
+import androidx.compose.material3.*
 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
@@ -70,34 +74,47 @@ fun ExportTunnelsBottomSheet(viewModel: AppViewModel) {
         )
     }
 
-    CustomBottomSheet(
-        listOf(
-            SheetOption(
-                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
-                    }
-                },
-            ),
-        )
+    ModalBottomSheet(
+        containerColor = MaterialTheme.colorScheme.surface,
+        onDismissRequest = {
+            viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+        },
     ) {
-        viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+        ExportOptionRow(
+            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,15 +1,21 @@
 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.*
-import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material3.*
 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(
@@ -22,61 +28,99 @@ fun TunnelImportSheet(
 ) {
     val isTv = LocalIsAndroidTV.current
 
-    CustomBottomSheet(
-        buildList {
-            add(
-                SheetOption(
-                    Icons.Outlined.FileOpen,
-                    stringResource(R.string.add_tunnels_text),
-                    onClick = {
+    val sheetState = rememberModalBottomSheetState()
+
+    val context = LocalContext.current
+    ModalBottomSheet(
+        containerColor = MaterialTheme.colorScheme.surface,
+        onDismissRequest = { onDismiss() },
+        sheetState = sheetState,
+    ) {
+        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),
             )
-            if (!isTv)
-                add(
-                    SheetOption(
-                        Icons.Outlined.QrCode,
-                        stringResource(R.string.add_from_qr),
-                        onClick = {
+            Text(stringResource(id = R.string.add_tunnels_text), modifier = Modifier.padding(10.dp))
+        }
+        if (!isTv) {
+            HorizontalDivider()
+            Row(
+                modifier =
+                    Modifier.fillMaxWidth()
+                        .clickable {
                             onDismiss()
                             onQrClick()
-                        },
-                    )
+                        }
+                        .padding(10.dp)
+            ) {
+                Icon(
+                    Icons.Filled.QrCode,
+                    contentDescription = stringResource(id = R.string.qr_scan),
+                    modifier = Modifier.padding(10.dp),
                 )
-            add(
-                SheetOption(
-                    Icons.Outlined.ContentPasteGo,
-                    stringResource(R.string.add_from_clipboard),
-                    onClick = {
-                        onDismiss()
-                        onClipboardClick()
-                    },
+                Text(stringResource(id = R.string.add_from_qr), modifier = Modifier.padding(10.dp))
+            }
+            HorizontalDivider()
+            Row(
+                modifier =
+                    Modifier.fillMaxWidth()
+                        .clickable {
+                            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(
-                SheetOption(
-                    Icons.Outlined.Link,
-                    stringResource(R.string.add_from_url),
-                    onClick = {
+            }
+        }
+        HorizontalDivider()
+        Row(
+            modifier =
+                Modifier.fillMaxWidth()
+                    .clickable {
                         onDismiss()
                         onUrlClick()
-                    },
-                )
+                    }
+                    .padding(10.dp)
+        ) {
+            Icon(
+                Icons.Filled.Link,
+                contentDescription = stringResource(id = R.string.add_from_url),
+                modifier = Modifier.padding(10.dp),
             )
-            add(
-                SheetOption(
-                    Icons.Outlined.Create,
-                    stringResource(R.string.create_import),
-                    onClick = {
+            Text(stringResource(id = R.string.add_from_url), modifier = Modifier.padding(10.dp))
+        }
+        HorizontalDivider()
+        Row(
+            modifier =
+                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,12 +1,16 @@
 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
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -14,14 +18,13 @@ 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
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components.PeersSection
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
@@ -29,7 +32,6 @@ import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 @Composable
 fun ConfigScreen(
     tunnelConf: TunnelConf?,
-    appUiState: AppUiState,
     appViewModel: AppViewModel,
     viewModel: ConfigViewModel = hiltViewModel(),
 ) {
@@ -38,52 +40,44 @@ fun ConfigScreen(
 
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
-    var save by remember { mutableStateOf(false) }
+    val activity = context as? MainActivity
 
-    val isTunnelNameTaken by
-        remember(uiState.tunnelName, appUiState.tunnels) {
-            derivedStateOf {
-                appUiState.tunnels
-                    .filter { it.id != tunnelConf?.id }
-                    .any { it.name == uiState.tunnelName }
-            }
-        }
-
-    SecureScreenFromRecording()
+    // 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) }
+    }
 
     LaunchedEffect(Unit) {
         // set callback for navbar to invoke save
         appViewModel.handleEvent(
             AppEvent.SetScreenAction {
                 keyboardController?.hide()
-                if (!isTunnelNameTaken) {
-                    save = true
-                }
+                viewModel.save(tunnelConf)
             }
         )
     }
 
     LaunchedEffect(tunnelConf) { viewModel.initFromTunnel(tunnelConf) }
 
-    // TODO improve error messages
-    LaunchedEffect(save) {
-        if (save) {
-            try {
-                appViewModel.handleEvent(
-                    AppEvent.SaveTunnel(
-                        uiState.configProxy.buildTunnelConfFromState(uiState.tunnelName, tunnelConf)
-                    )
-                )
-                appViewModel.handleEvent(
-                    AppEvent.ShowMessage(StringValue.StringResource(R.string.config_changes_saved))
-                )
-                appViewModel.handleEvent(AppEvent.PopBackStack(true))
-            } catch (e: Exception) {
-                val message = e.message ?: context.resources.getString(R.string.unknown_error)
-                appViewModel.handleEvent(AppEvent.ShowMessage(StringValue.DynamicString(message)))
-            } finally {
-                save = false
-            }
+    LaunchedEffect(uiState.success) {
+        if (uiState.success == true) {
+            appViewModel.handleEvent(
+                AppEvent.ShowMessage(StringValue.StringResource(R.string.config_changes_saved))
+            )
+            appViewModel.handleEvent(AppEvent.PopBackStack(true))
+        }
+    }
+
+    LaunchedEffect(uiState.message) {
+        uiState.message?.let { message ->
+            appViewModel.handleEvent(AppEvent.ShowMessage(message))
+            viewModel.setMessage(null)
         }
     }
 
@@ -113,15 +107,11 @@ fun ConfigScreen(
     }
 
     Column(
-        horizontalAlignment = Alignment.Start,
         verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
         modifier =
-            Modifier.fillMaxSize()
-                .verticalScroll(rememberScrollState())
-                .padding(top = 12.dp, bottom = 24.dp)
-                .padding(horizontal = 12.dp),
+            Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(horizontal = 24.dp),
     ) {
-        InterfaceSection(isTunnelNameTaken, uiState, viewModel)
+        InterfaceSection(uiState, viewModel)
         PeersSection(uiState, viewModel)
         AddPeerButton(viewModel)
     }

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

@@ -1,20 +1,32 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main.config
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.state.ConfigUiState
 import com.zaneschepke.wireguardautotunnel.ui.state.ConfigProxy
 import com.zaneschepke.wireguardautotunnel.ui.state.InterfaceProxy
 import com.zaneschepke.wireguardautotunnel.ui.state.PeerProxy
+import com.zaneschepke.wireguardautotunnel.util.StringValue
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 
 @HiltViewModel
-class ConfigViewModel @Inject constructor() : ViewModel() {
+class ConfigViewModel
+@Inject
+constructor(
+    private val tunnelRepository: TunnelRepository,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : ViewModel() {
 
     private val _uiState = MutableStateFlow(ConfigUiState())
     val uiState: StateFlow<ConfigUiState> = _uiState.asStateFlow()
@@ -109,6 +121,41 @@ class ConfigViewModel @Inject constructor() : ViewModel() {
         updatePeer(index, updated)
     }
 
+    fun setMessage(message: StringValue?) {
+        _uiState.update { it.copy(message = message) }
+    }
+
+    // TODO improve error messaging
+    fun save(tunnelConf: TunnelConf?) =
+        viewModelScope.launch(ioDispatcher) {
+            val message =
+                try {
+                    val saveConfig = buildTunnelConfFromState(tunnelConf)
+                    tunnelRepository.save(saveConfig)
+                    _uiState.update { it.copy(success = true) }
+                } catch (e: Exception) {
+                    setMessage(
+                        e.message?.let { message -> (StringValue.DynamicString(message)) }
+                            ?: StringValue.StringResource(R.string.unknown_error)
+                    )
+                }
+        }
+
+    private fun buildTunnelConfFromState(tunnelConf: TunnelConf?): TunnelConf {
+        val (wg, am) = _uiState.value.configProxy.buildConfigs()
+        val name = _uiState.value.tunnelName
+        return tunnelConf?.copyWithCallback(
+            tunName = name,
+            amQuick = am.toAwgQuickString(true),
+            wgQuick = wg.toWgQuickString(true),
+        )
+            ?: TunnelConf(
+                tunName = name,
+                amQuick = am.toAwgQuickString(true),
+                wgQuick = wg.toWgQuickString(true),
+            )
+    }
+
     fun onAuthenticated() {
         _uiState.update { it.copy(isAuthenticated = true) }
     }

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

@@ -2,7 +2,6 @@ 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
@@ -10,9 +9,7 @@ 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.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
@@ -21,12 +18,10 @@ 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(
@@ -42,208 +37,189 @@ fun InterfaceFields(
     val keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() })
     val keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done)
 
-    Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
-        ConfigurationTextBox(
-            value = interfaceState.privateKey,
-            hint =
-                stringResource(R.string.hint_template, stringResource(R.string.base64_key))
-                    .lowercase(Locale.getDefault()),
-            onValueChange = { onInterfaceChange(interfaceState.copy(privateKey = it)) },
-            label = stringResource(R.string.private_key),
-            modifier = Modifier.fillMaxWidth().clickable { if (!isAuthenticated) showAuthPrompt() },
-            visualTransformation =
-                if (isAuthenticated) VisualTransformation.None else PasswordVisualTransformation(),
-            trailing = {
-                IconButton(
-                    enabled = true,
-                    onClick = {
-                        if (!isAuthenticated) return@IconButton showAuthPrompt()
-                        val keypair = KeyPair()
-                        onInterfaceChange(
-                            interfaceState.copy(
-                                privateKey = keypair.privateKey.toBase64(),
-                                publicKey = keypair.publicKey.toBase64(),
-                            )
+    OutlinedTextField(
+        value = interfaceState.privateKey,
+        onValueChange = { onInterfaceChange(interfaceState.copy(privateKey = it)) },
+        label = {
+            Text(stringResource(R.string.private_key), style = MaterialTheme.typography.bodyMedium)
+        },
+        modifier = Modifier.fillMaxWidth().clickable { if (!isAuthenticated) showAuthPrompt() },
+        visualTransformation =
+            if (isAuthenticated) VisualTransformation.None else PasswordVisualTransformation(),
+        trailingIcon = {
+            IconButton(
+                enabled = true,
+                onClick = {
+                    if (!isAuthenticated) return@IconButton showAuthPrompt()
+                    val keypair = com.wireguard.crypto.KeyPair()
+                    onInterfaceChange(
+                        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,
                     )
-                }
+                },
+            ) {
+                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,
+    )
+    OutlinedTextField(
+        value = interfaceState.publicKey,
+        onValueChange = { onInterfaceChange(interfaceState.copy(publicKey = it)) },
+        label = {
+            Text(stringResource(R.string.public_key), style = MaterialTheme.typography.bodyMedium)
+        },
+        enabled = false,
+        modifier = Modifier.fillMaxWidth(),
+        singleLine = true,
+        trailingIcon = {
+            IconButton(onClick = { clipboardManager.copy(interfaceState.publicKey) }) {
+                Icon(Icons.Rounded.ContentCopy, stringResource(R.string.copy_public_key))
+            }
+        },
+        keyboardOptions = keyboardOptions,
+        keyboardActions = keyboardActions,
+    )
+    ConfigurationTextBox(
+        value = interfaceState.addresses,
+        onValueChange = { onInterfaceChange(interfaceState.copy(addresses = it)) },
+        label = stringResource(R.string.addresses),
+        hint = stringResource(R.string.comma_separated_list),
+        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))
             },
-            enabled = isAuthenticated,
-            singleLine = true,
-            keyboardOptions = keyboardOptions,
-            keyboardActions = keyboardActions,
+            label = stringResource(R.string.response_packet_magic_header),
+            hint = stringResource(R.string.response_packet_magic_header).lowercase(),
+            modifier = Modifier.fillMaxWidth(),
         )
         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,
-                    )
-                }
+            value = interfaceState.underloadPacketMagicHeader,
+            onValueChange = {
+                onInterfaceChange(interfaceState.copy(underloadPacketMagicHeader = it))
             },
-            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()),
+            label = stringResource(R.string.underload_packet_magic_header),
+            hint = stringResource(R.string.underload_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),
+            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(),
         )
-        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),
-                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,18 +11,13 @@ 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(
-    isTunnelNameTaken: Boolean,
-    uiState: ConfigUiState,
-    viewModel: ConfigViewModel,
-) {
+fun InterfaceSection(uiState: ConfigUiState, viewModel: ConfigViewModel) {
     var isDropDownExpanded by remember { mutableStateOf(false) }
     val isAmneziaCompatibilitySet =
         remember(uiState.configProxy.`interface`) {
@@ -31,8 +26,8 @@ fun InterfaceSection(
 
     Surface(shape = RoundedCornerShape(12.dp), color = MaterialTheme.colorScheme.surface) {
         Column(
-            verticalArrangement = Arrangement.spacedBy(12.dp),
-            modifier = Modifier.padding(horizontal = 16.dp).focusGroup(),
+            verticalArrangement = Arrangement.spacedBy(6.dp),
+            modifier = Modifier.padding(16.dp).focusGroup(),
         ) {
             Row(
                 horizontalArrangement = Arrangement.SpaceBetween,
@@ -55,10 +50,7 @@ fun InterfaceSection(
                 value = uiState.tunnelName,
                 onValueChange = viewModel::updateTunnelName,
                 label = stringResource(R.string.name),
-                isError = isTunnelNameTaken,
-                hint =
-                    stringResource(R.string.hint_template, stringResource(R.string.tunnel_name))
-                        .lowercase(Locale.getDefault()),
+                hint = stringResource(R.string.tunnel_name).lowercase(),
                 modifier = Modifier.fillMaxWidth(),
             )
             InterfaceFields(

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

@@ -6,6 +6,7 @@ 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
@@ -16,9 +17,8 @@ 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.textbox.ConfigurationTextBox
+import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
 import com.zaneschepke.wireguardautotunnel.ui.state.PeerProxy
-import java.util.*
 
 @Composable
 fun PeerFields(
@@ -35,32 +35,44 @@ fun PeerFields(
         value = peer.publicKey,
         onValueChange = { onPeerChange(peer.copy(publicKey = it)) },
         label = stringResource(R.string.public_key),
-        hint =
-            stringResource(R.string.hint_template, stringResource(R.string.base64_key))
-                .lowercase(Locale.getDefault()),
+        hint = stringResource(R.string.base64_key),
         modifier = Modifier.fillMaxWidth(),
     )
-    ConfigurationTextBox(
+    OutlinedTextField(
         visualTransformation =
             if (isAuthenticated) VisualTransformation.None else PasswordVisualTransformation(),
         value = peer.preSharedKey,
         enabled = isAuthenticated,
-        hint = stringResource(R.string.optional),
         onValueChange = { onPeerChange(peer.copy(preSharedKey = it)) },
-        label = stringResource(R.string.preshared_key),
+        label = {
+            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,
     )
-    ConfigurationTextBox(
+    OutlinedTextField(
         value = peer.persistentKeepalive,
         onValueChange = { onPeerChange(peer.copy(persistentKeepalive = it)) },
-        label = stringResource(R.string.persistent_keepalive),
-        hint = stringResource(R.string.optional),
-        trailing = {
+        label = {
             Text(
-                stringResource(R.string.seconds).lowercase(Locale.getDefault()),
+                stringResource(R.string.persistent_keepalive),
+                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),
             )
@@ -73,18 +85,21 @@ fun PeerFields(
         value = peer.endpoint,
         onValueChange = { onPeerChange(peer.copy(endpoint = it)) },
         label = stringResource(R.string.endpoint),
-        hint =
-            stringResource(R.string.hint_template, stringResource(R.string.server_port))
-                .lowercase(Locale.getDefault()),
+        hint = stringResource(R.string.endpoint).lowercase(),
         modifier = Modifier.fillMaxWidth(),
     )
-    ConfigurationTextBox(
+    OutlinedTextField(
         value = peer.allowedIps,
         onValueChange = { onPeerChange(peer.copy(allowedIps = it)) },
-        label = stringResource(R.string.allowed_ips),
-        hint =
-            stringResource(R.string.hint_template, stringResource(R.string.comma_separated))
-                .lowercase(Locale.getDefault()),
+        label = {
+            Text(stringResource(R.string.allowed_ips), style = MaterialTheme.typography.bodyMedium)
+        },
+        placeholder = {
+            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(12.dp),
-                modifier = Modifier.padding(horizontal = 16.dp).focusGroup(),
+                verticalArrangement = Arrangement.spacedBy(6.dp),
+                modifier = Modifier.padding(16.dp).focusGroup(),
             ) {
                 Row(
                     horizontalArrangement = Arrangement.SpaceBetween,

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

@@ -3,6 +3,7 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.main.config.state
 import com.zaneschepke.wireguardautotunnel.ui.state.ConfigProxy
 import com.zaneschepke.wireguardautotunnel.ui.state.InterfaceProxy
 import com.zaneschepke.wireguardautotunnel.ui.state.PeerProxy
+import com.zaneschepke.wireguardautotunnel.util.StringValue
 
 data class ConfigUiState(
     val tunnelName: String = "",
@@ -12,5 +13,6 @@ data class ConfigUiState(
     val showScripts: Boolean = false,
     val isAuthenticated: Boolean = true,
     val showAuthPrompt: Boolean = false,
-    val saveChanges: Boolean = false,
+    val message: StringValue? = null,
+    val success: Boolean? = null,
 )

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, false),
+                amQuick = am.toAwgQuickString(true),
                 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, false)
+            ConfigType.AM -> tunnelConf.toAmConfig().toAwgQuickString(true)
             ConfigType.WG -> tunnelConf.toWgConfig().toWgQuickString(true)
         }
 

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

@@ -1,6 +1,5 @@
 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
@@ -10,7 +9,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.textbox.SubmitConfigurationTextBox
+import com.zaneschepke.wireguardautotunnel.ui.common.config.SubmitConfigurationTextBox
 import com.zaneschepke.wireguardautotunnel.util.extensions.isValidIpv4orIpv6Address
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
@@ -28,7 +27,7 @@ fun pingConfigItem(tunnelConf: TunnelConf, viewModel: AppViewModel): SelectionIt
                     isErrorValue = {
                         it?.isNotBlank() == true &&
                             !it.isValidIpv4orIpv6Address() &&
-                            !Patterns.DOMAIN_NAME.matcher(it).matches()
+                            !android.util.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,20 +9,18 @@ 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.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.ui.Route
 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
@@ -35,28 +33,12 @@ fun SettingsScreen(uiState: AppUiState, appViewState: AppViewState, viewModel: A
 
     val interactionSource = remember { MutableInteractionSource() }
 
-    val showBackupBottomSheet by
-        remember(appViewState.bottomSheet) {
-            derivedStateOf {
-                appViewState.bottomSheet == AppViewState.BottomSheet.BACKUP_AND_RESTORE
-            }
+    when (appViewState.bottomSheet) {
+        AppViewState.BottomSheet.BACKUP_AND_RESTORE -> {
+            SettingsBottomSheet(viewModel)
         }
-    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)
+        else -> Unit
+    }
 
     Column(
         horizontalAlignment = Alignment.Start,
@@ -78,23 +60,17 @@ 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(dnsSettingsItem())
-                    // TODO changing these settings won't work in certain app states
-                    if (showProxySettings) add(proxYSettingsItem())
+                    add(appShortcutsItem(uiState, viewModel))
+                    if (!isTv) add(alwaysOnVpnItem(uiState, viewModel))
+                    add(killSwitchItem())
+                    add(RestartAtBootItem(uiState, viewModel))
                 }
         )
         SectionDivider()
-        SurfaceSelectionGroupButton(listOf(systemFeaturesItem()))
-        SectionDivider()
         SurfaceSelectionGroupButton(
             items =
                 buildList {
@@ -104,5 +80,18 @@ 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/advanced/SettingsAdvancedScreen.kt

@@ -1,5 +1,6 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.system
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.advanced
 
+import android.view.WindowManager
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -7,23 +8,33 @@ 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.ui.common.SectionDivider
-import com.zaneschepke.wireguardautotunnel.ui.common.SecureScreenFromRecording
+import com.zaneschepke.wireguardautotunnel.MainActivity
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.system.components.*
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.advanced.components.RemoteControlItem
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 
 @Composable
-fun SystemFeaturesScreen(appUiState: AppUiState, viewModel: AppViewModel) {
+fun SettingsAdvancedScreen(appUiState: AppUiState, viewModel: AppViewModel) {
+    val context = LocalContext.current
 
-    val isTv = LocalIsAndroidTV.current
+    val activity = context as? MainActivity
 
-    SecureScreenFromRecording()
+    // 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) }
+    }
 
     Column(
         horizontalAlignment = Alignment.Start,
@@ -34,20 +45,6 @@ fun SystemFeaturesScreen(appUiState: AppUiState, viewModel: AppViewModel) {
                 .padding(vertical = 24.dp)
                 .padding(horizontal = 12.dp),
     ) {
-        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))
-            }
-        )
+        SurfaceSelectionGroupButton(listOf(RemoteControlItem(appUiState, viewModel)))
     }
 }

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.system.components
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.advanced.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/components/BackupBottomSheet.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.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/KillSwitchitem.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.Android
+import androidx.compose.material.icons.outlined.VpnKeyOff
 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 systemFeaturesItem(): SelectionItem {
+fun killSwitchItem(): SelectionItem {
     val navController = LocalNavController.current
     return SelectionItem(
-        leading = { Icon(Icons.Outlined.Android, null) },
-        trailing = { ForwardButton { navController.navigate(Route.SystemFeatures) } },
+        leading = { Icon(Icons.Outlined.VpnKeyOff, contentDescription = null) },
         title = {
             Text(
-                text = stringResource(R.string.system_features),
+                text = stringResource(R.string.kill_switch_options),
                 style =
                     MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
             )
         },
-        onClick = { navController.navigate(Route.SystemFeatures) },
+        trailing = { ForwardButton { navController.navigate(Route.KillSwitch) } },
+        onClick = { navController.navigate(Route.KillSwitch) },
     )
 }

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.system.components
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.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/settings/components/SettingsBottomSheet.kt

@@ -0,0 +1,78 @@
+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/alwaysOnVpnItem.kt

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

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

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

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

@@ -1,45 +0,0 @@
-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/kernelModeItem.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.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

@@ -1,31 +0,0 @@
-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/dns/DnsSettingsScreen.kt

@@ -1,83 +0,0 @@
-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

@@ -0,0 +1,50 @@
+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/killswitch/components/LanTrafficItem.kt

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.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/killswitch/components/VpnKillSwitchItem.kt

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

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

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

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

@@ -1,14 +1,18 @@
 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.outlined.Delete
-import androidx.compose.material.icons.outlined.FolderZip
-import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.FolderZip
+import androidx.compose.material3.*
 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
@@ -16,26 +20,48 @@ import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun LogsBottomSheet(viewModel: AppViewModel) {
-    CustomBottomSheet(
-        listOf(
-            SheetOption(
-                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)
-                },
-            ),
-        )
+    ModalBottomSheet(
+        containerColor = MaterialTheme.colorScheme.surface,
+        onDismissRequest = {
+            viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+        },
     ) {
-        viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+        Row(
+            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.LabelledDropdown
+import com.zaneschepke.wireguardautotunnel.ui.common.dropdown.LabelledNumberDropdown
 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) {
-            LabelledDropdown(
+            LabelledNumberDropdown(
                 title = {
                     Text(
                         text = stringResource(R.string.tunnel_ping_interval),
@@ -67,9 +67,8 @@ fun TunnelMonitoringScreen(uiState: AppUiState, viewModel: AppViewModel) {
                     viewModel.handleEvent(AppEvent.SetPingInterval(selected!!))
                 },
                 options = (10..60).step(10).toList(),
-                optionToString = { it?.toString() ?: stringResource(R.string._default) },
             )
-            LabelledDropdown(
+            LabelledNumberDropdown(
                 title = {
                     Text(
                         text = stringResource(R.string.attempts_per_interval),
@@ -85,9 +84,8 @@ fun TunnelMonitoringScreen(uiState: AppUiState, viewModel: AppViewModel) {
                     viewModel.handleEvent(AppEvent.SetPingAttempts(selected!!))
                 },
                 options = (1..5).toList(),
-                optionToString = { it?.toString() ?: stringResource(R.string._default) },
             )
-            LabelledDropdown(
+            LabelledNumberDropdown(
                 title = {
                     Text(
                         text = stringResource(R.string.ping_timeout),
@@ -112,7 +110,6 @@ 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)))
         }