fix db migration race, ui bugs

app/build.gradle.kts

@@ -9,6 +9,7 @@ plugins {
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.grgit)
     alias(libs.plugins.licensee)
+    id("kotlin-parcelize")
 }
 
 android {
@@ -229,6 +230,11 @@ dependencies {
     implementation(libs.roomdatabasebackup) {
         exclude(group = "org.reactivestreams", module = "reactive-streams")
     }
+
+    // state management
+    implementation(libs.orbit.compose)
+    implementation(libs.orbit.viewmodel)
+    implementation(libs.orbit.core)
 }
 
 tasks.register<Copy>("copyLicenseeJsonToAssets") {

app/proguard-rules.pro

@@ -0,0 +1,3 @@
+-keep class com.zaneschepke.wireguardautotunnel.ui.navigation.Route { *; }
+-keep class com.zaneschepke.wireguardautotunnel.ui.navigation.Route$** { *; }
+-keepclassmembers class com.zaneschepke.wireguardautotunnel.ui.navigation.Route$** { *; }

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

@@ -0,0 +1,364 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 22,
+    "identityHash": "db93d0490401ccbef25ca39f27bafa29",
+    "entities": [
+      {
+        "tableName": "Settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL DEFAULT 0, `trusted_network_ssids` TEXT NOT NULL DEFAULT '', `is_always_on_vpn_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL DEFAULT 0, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT 0, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT 0, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT 0, `is_ping_enabled` INTEGER NOT NULL DEFAULT 0, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT 0, `is_stop_on_no_internet_enabled` INTEGER NOT NULL DEFAULT 0, `is_lan_on_kill_switch_enabled` INTEGER NOT NULL DEFAULT 0, `debounce_delay_seconds` INTEGER NOT NULL DEFAULT 3, `is_disable_kill_switch_on_trusted_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_unsecure_enabled` INTEGER NOT NULL DEFAULT 0, `wifi_detection_method` INTEGER NOT NULL DEFAULT 0, `is_ping_monitoring_enabled` INTEGER NOT NULL DEFAULT 1, `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,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnMobileDataEnabled",
+            "columnName": "is_tunnel_on_mobile_data_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "trustedNetworkSSIDs",
+            "columnName": "trusted_network_ssids",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isAlwaysOnVpnEnabled",
+            "columnName": "is_always_on_vpn_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnEthernetEnabled",
+            "columnName": "is_tunnel_on_ethernet_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isShortcutsEnabled",
+            "columnName": "is_shortcuts_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnWifiEnabled",
+            "columnName": "is_tunnel_on_wifi_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isRestoreOnBootEnabled",
+            "columnName": "is_restore_on_boot_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isMultiTunnelEnabled",
+            "columnName": "is_multi_tunnel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isPingEnabled",
+            "columnName": "is_ping_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isWildcardsEnabled",
+            "columnName": "is_wildcards_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isStopOnNoInternetEnabled",
+            "columnName": "is_stop_on_no_internet_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isLanOnKillSwitchEnabled",
+            "columnName": "is_lan_on_kill_switch_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "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": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnUnsecureEnabled",
+            "columnName": "is_tunnel_on_unsecure_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "wifiDetectionMethod",
+            "columnName": "wifi_detection_method",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isPingMonitoringEnabled",
+            "columnName": "is_ping_monitoring_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "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 0, `socks5_proxy_bind_address` TEXT, `http_proxy_enable` INTEGER NOT NULL DEFAULT 0, `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": "0"
+          },
+          {
+            "fieldPath": "socks5ProxyBindAddress",
+            "columnName": "socks5_proxy_bind_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "httpProxyEnabled",
+            "columnName": "http_proxy_enable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "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, 'db93d0490401ccbef25ca39f27bafa29')"
+    ]
+  }
+}

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

@@ -1,5 +1,6 @@
 package com.zaneschepke.wireguardautotunnel
 
+import ProxySettingsScreen
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Color
@@ -15,16 +16,12 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.background
-import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
@@ -34,35 +31,29 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navigation
 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.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.domain.sideeffect.GlobalSideEffect
+import com.zaneschepke.wireguardautotunnel.ui.LocalIsAndroidTV
+import com.zaneschepke.wireguardautotunnel.ui.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
 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
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.navigation.components.BottomNavbar
 import com.zaneschepke.wireguardautotunnel.ui.navigation.components.DynamicTopAppBar
-import com.zaneschepke.wireguardautotunnel.ui.navigation.components.currentNavBackStackEntryAsNavBarState
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.AutoTunnelScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.advanced.AutoTunnelAdvancedScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.detection.WifiDetectionMethodScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.LocationDisclosureScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel.TunnelAutoTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.sort.SortScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.SplitTunnelScreen
-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.appearance.AppearanceScreen
@@ -71,47 +62,38 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.langua
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.dns.DnsSettingsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.logs.LogsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.monitoring.TunnelMonitoringScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.proxy.ProxySettingsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.system.SystemFeaturesScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.license.LicenseScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.TunnelsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.autotunnel.TunnelAutoTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.config.ConfigScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.sort.SortScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.splittunnel.SplitTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.tunneloptions.TunnelOptionsScreen
 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.LocaleUtil
-import com.zaneschepke.wireguardautotunnel.util.extensions.restartApp
+import com.zaneschepke.wireguardautotunnel.util.extensions.*
-import com.zaneschepke.wireguardautotunnel.util.extensions.showToast
+import com.zaneschepke.wireguardautotunnel.viewmodel.*
-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 java.util.*
 import javax.inject.Inject
-import kotlin.system.exitProcess
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
+import xyz.teamgravity.pin_lock_compose.PinManager
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
     @Inject lateinit var appStateRepository: AppStateRepository
-
     @Inject lateinit var tunnelManager: TunnelManager
-
     @Inject lateinit var networkMonitor: NetworkMonitor
-
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
-
-    @Inject @MainDispatcher lateinit var mainDispatcher: CoroutineDispatcher
-
     @Inject lateinit var appDatabase: AppDatabase
 
-    private var lastLocationPermissionState: Boolean? = null
-
     private lateinit var roomBackup: RoomBackup
 
-    val REQUEST_CODE = 123
-
     @SuppressLint("BatteryLife")
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge(
@@ -122,32 +104,40 @@ class MainActivity : AppCompatActivity() {
             window.isNavigationBarContrastEnforced = false
         }
         super.onCreate(savedInstanceState)
+
         roomBackup = RoomBackup(this)
 
-        val viewModel by viewModels<AppViewModel>()
+        val viewModel by viewModels<SharedAppViewModel>()
 
         installSplashScreen().apply {
-            setKeepOnScreenCondition { !viewModel.appViewState.value.isAppReady }
+            setKeepOnScreenCondition { !viewModel.container.stateFlow.value.isAppLoaded }
         }
 
         setContent {
+            val context = LocalContext.current
             val isTv = isRunningOnTv()
-            val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
+            val appState by viewModel.container.stateFlow.collectAsStateWithLifecycle()
-            val appViewState by viewModel.appViewState.collectAsStateWithLifecycle()
-
             val navController = rememberNavController()
-            val backStackEntry by navController.currentBackStackEntryAsState()
+            val scope = rememberCoroutineScope()
-            val navBarState by
+
-                currentNavBackStackEntryAsNavBarState(
+            var pinManagerInitialized by remember { mutableStateOf(false) }
-                    navController,
+
-                    backStackEntry,
+            LaunchedEffect(appState.isAppLoaded) {
-                    viewModel,
+                if (appState.isAppLoaded) {
-                    appUiState,
+                    if (appState.pinLockEnabled && !pinManagerInitialized) {
-                    appViewState,
+                        PinManager.initialize(this@MainActivity)
-                )
+                        pinManagerInitialized = true
+                    }
+                    appState.locale.let { LocaleUtil.changeLocale(it) }
+                }
+            }
+
             val snackbar = remember { SnackbarHostState() }
             var showVpnPermissionDialog by remember { mutableStateOf(false) }
             var vpnPermissionDenied by remember { mutableStateOf(false) }
+            var requestingAppMode by remember {
+                mutableStateOf<Pair<AppMode?, TunnelConf?>>(Pair(null, null))
+            }
 
             val vpnActivity =
                 rememberLauncherForActivityResult(
@@ -159,214 +149,237 @@ class MainActivity : AppCompatActivity() {
                         } else {
                             vpnPermissionDenied = false
                             showVpnPermissionDialog = false
+                            val (appMode, config) = requestingAppMode
+                            when (appMode) {
+                                AppMode.VPN -> if (config != null) viewModel.startTunnel(config)
+                                AppMode.LOCK_DOWN -> viewModel.setAppMode(AppMode.LOCK_DOWN)
+                                else -> Unit
+                            }
                         }
+                        requestingAppMode = Pair(null, null)
                     },
                 )
 
-            LaunchedEffect(appUiState.tunnels) {
-                if (!appViewState.isAppReady) {
-                    viewModel.handleEvent(AppEvent.AppReadyCheck(appUiState.tunnels))
-                }
-            }
-
             val batteryActivity =
                 rememberLauncherForActivityResult(
                     ActivityResultContracts.StartActivityForResult()
                 ) { _: ActivityResult ->
-                    viewModel.handleEvent(AppEvent.SetBatteryOptimizeDisableShown)
+                    viewModel.disableBatteryOptimizationsShown()
                 }
 
-            with(appViewState) {
+            fun requestDisableBatteryOptimizations() {
-                LaunchedEffect(isConfigChanged) {
+                batteryActivity.launch(
-                    if (isConfigChanged) {
+                    Intent().apply {
-                        Intent(this@MainActivity, MainActivity::class.java).also {
+                        action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
-                            startActivity(it)
+                        data = "package:${this@MainActivity.packageName}".toUri()
-                            exitProcess(0)
-                        }
                     }
-                }
+                )
-                LaunchedEffect(errorMessage) {
+            }
-                    errorMessage?.let {
+
-                        snackbar.showSnackbar(it.asString(this@MainActivity))
+            LaunchedEffect(Unit) {
-                        viewModel.handleEvent(AppEvent.MessageShown)
+                viewModel.globalSideEffect.collect { sideEffect ->
-                    }
+                    when (sideEffect) {
-                }
+                        GlobalSideEffect.ConfigChanged -> restartApp()
-                LaunchedEffect(popBackStack) {
+                        GlobalSideEffect.PopBackStack -> navController.popBackStack()
-                    if (popBackStack) {
+                        GlobalSideEffect.RequestBatteryOptimizationDisabled ->
-                        navController.popBackStack()
+                            requestDisableBatteryOptimizations()
-                        viewModel.handleEvent(AppEvent.PopBackStack(false))
+                        is GlobalSideEffect.RequestVpnPermission -> {
-                    }
+                            requestingAppMode = Pair(sideEffect.requestingMode, sideEffect.config)
-                }
-                LaunchedEffect(requestVpnPermission) {
-                    if (requestVpnPermission) {
-                        if (!vpnPermissionDenied) {
                             vpnActivity.launch(VpnService.prepare(this@MainActivity))
-                        } else {
-                            showVpnPermissionDialog = true
                         }
-                        viewModel.handleEvent(AppEvent.VpnPermissionRequested)
+                        is GlobalSideEffect.ShareFile -> context.launchShareFile(sideEffect.file)
-                    }
+                        is GlobalSideEffect.Snackbar ->
-                }
+                            scope.launch {
-                LaunchedEffect(requestBatteryPermission) {
+                                snackbar.showSnackbar(sideEffect.message.asString(context))
-                    if (requestBatteryPermission) {
-                        batteryActivity.launch(
-                            Intent().apply {
-                                action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
-                                data = "package:${this@MainActivity.packageName}".toUri()
                             }
-                        )
+                        is GlobalSideEffect.Toast ->
+                            scope.launch { context.showToast(sideEffect.message.asString(context)) }
+                        is GlobalSideEffect.LaunchUrl -> context.openWebUrl(sideEffect.url)
+                        is GlobalSideEffect.InstallApk -> context.installApk(sideEffect.apk)
                     }
                 }
             }
 
-            CompositionLocalProvider(LocalIsAndroidTV provides isTv) {
+            if (!appState.isAppLoaded) return@setContent
-                CompositionLocalProvider(LocalNavController provides navController) {
+
-                    WireguardAutoTunnelTheme(theme = appUiState.appState.theme) {
+            CompositionLocalProvider(
-                        VpnDeniedDialog(
+                LocalIsAndroidTV provides isTv,
-                            showVpnPermissionDialog,
+                LocalSharedVm provides viewModel,
-                            onDismiss = {
+                LocalNavController provides navController,
-                                showVpnPermissionDialog = false
+            ) {
-                                vpnPermissionDenied = false
+                WireguardAutoTunnelTheme(theme = appState.theme) {
+                    VpnDeniedDialog(
+                        showVpnPermissionDialog,
+                        onDismiss = {
+                            showVpnPermissionDialog = false
+                            vpnPermissionDenied = false
+                        },
+                    )
+
+                    Box(modifier = Modifier.fillMaxSize()) {
+                        if (appState.settings.appMode == AppMode.LOCK_DOWN) {
+                            AppAlertBanner(
+                                stringResource(R.string.locked_down).uppercase(Locale.getDefault()),
+                                OffWhite,
+                                AlertRed,
+                                modifier = Modifier.fillMaxWidth().zIndex(2f),
+                            )
+                        }
+
+                        Scaffold(
+                            snackbarHost = {
+                                SnackbarHost(snackbar) { snackbarData ->
+                                    CustomSnackBar(
+                                        snackbarData.visuals.message,
+                                        isRtl = false,
+                                        containerColor =
+                                            MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
+                                    )
+                                }
                             },
-                        )
+                            topBar = { DynamicTopAppBar(appState.navBarState) },
-
+                            bottomBar = {
-                        Box(modifier = Modifier.fillMaxSize()) {
+                                BottomNavbar(
-                            // Top banner if in locked down mode
+                                    appState.isAutoTunnelActive,
-                            if (appUiState.appSettings.appMode == AppMode.LOCK_DOWN) {
+                                    appState.navBarState,
-                                AppAlertBanner(
+                                    navController,
-                                    stringResource(R.string.locked_down)
-                                        .uppercase(Locale.getDefault()),
-                                    OffWhite,
-                                    AlertRed,
-                                    modifier =
-                                        Modifier.fillMaxWidth().zIndex(2f), // Draw above everything
                                 )
-                            }
+                            },
-
+                        ) { padding ->
-                            Scaffold(
+                            Box(
                                 modifier =
-                                    Modifier.pointerInput(Unit) {
+                                    Modifier.fillMaxSize()
-                                        detectTapGestures {
+                                        .background(MaterialTheme.colorScheme.surface)
-                                            viewModel.handleEvent(AppEvent.ClearSelectedTunnels)
+                                        .padding(padding)
-                                        }
+                                        .consumeWindowInsets(padding)
-                                    },
+                                        .imePadding()
-                                snackbarHost = {
+                            ) {
-                                    SnackbarHost(snackbar) { snackbarData: SnackbarData ->
+                                NavHost(
-                                        CustomSnackBar(
+                                    navController = navController,
-                                            snackbarData.visuals.message,
+                                    startDestination =
-                                            isRtl = false,
+                                        if (appState.pinLockEnabled && !appState.isAuthorized)
-                                            containerColor =
+                                            Route.Lock
-                                                MaterialTheme.colorScheme.surfaceColorAtElevation(
+                                        else Route.TunnelsGraph,
-                                                    2.dp
-                                                ),
-                                        )
-                                    }
-                                },
-                                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()
                                 ) {
-                                    NavHost(
+                                    composable<Route.Lock> { PinLockScreen() }
-                                        navController,
+                                    navigation<Route.TunnelsGraph>(
-                                        startDestination =
+                                        startDestination = Route.Tunnels
-                                            (if (appUiState.appState.isPinLockEnabled) Route.Lock
-                                            else Route.Main),
                                     ) {
-                                        composable<Route.Main> {
+                                        composable<Route.Tunnels> {
-                                            MainScreen(appUiState, appViewState, viewModel)
+                                            val viewModel =
+                                                it.sharedViewModel<TunnelsViewModel>(navController)
+                                            TunnelsScreen(viewModel)
                                         }
-                                        composable<Route.Settings> {
+                                        composable<Route.Sort> {
-                                            SettingsScreen(appUiState, appViewState, viewModel)
+                                            val viewModel =
+                                                it.sharedViewModel<TunnelsViewModel>(navController)
+                                            SortScreen(viewModel)
                                         }
+                                        composable<Route.TunnelOptions> { backStackEntry ->
+                                            val args = backStackEntry.toRoute<Route.TunnelOptions>()
+                                            val viewModel =
+                                                backStackEntry.sharedViewModel<TunnelsViewModel>(
+                                                    navController
+                                                )
+                                            TunnelOptionsScreen(args.id, viewModel)
+                                        }
+                                        composable<Route.SplitTunnel> { backStackEntry ->
+                                            val args = backStackEntry.toRoute<Route.SplitTunnel>()
+                                            SplitTunnelScreen(args.id)
+                                        }
+                                        composable<Route.TunnelAutoTunnel> { backStackEntry ->
+                                            val args =
+                                                backStackEntry.toRoute<Route.TunnelAutoTunnel>()
+                                            val viewModel =
+                                                backStackEntry.sharedViewModel<TunnelsViewModel>(
+                                                    navController
+                                                )
+                                            TunnelAutoTunnelScreen(args.id, viewModel)
+                                        }
+                                        composable<Route.Config> { backStackEntry ->
+                                            val args = backStackEntry.toRoute<Route.Config>()
+                                            val viewModel =
+                                                backStackEntry.sharedViewModel<TunnelsViewModel>(
+                                                    navController
+                                                )
+                                            ConfigScreen(args.id, viewModel)
+                                        }
+                                    }
+
+                                    navigation<Route.AutoTunnelGraph>(
+                                        startDestination =
+                                            if (appState.isLocationDisclosureShown) Route.AutoTunnel
+                                            else Route.LocationDisclosure
+                                    ) {
                                         composable<Route.LocationDisclosure> {
+                                            val viewModel =
+                                                it.sharedViewModel<AutoTunnelViewModel>(
+                                                    navController
+                                                )
                                             LocationDisclosureScreen(viewModel)
                                         }
                                         composable<Route.AutoTunnel> {
-                                            AutoTunnelScreen(appUiState, viewModel)
+                                            val viewModel =
+                                                it.sharedViewModel<AutoTunnelViewModel>(
+                                                    navController
+                                                )
+                                            AutoTunnelScreen(viewModel)
                                         }
-                                        composable<Route.Appearance> { AppearanceScreen() }
+                                        composable<Route.AdvancedAutoTunnel> {
-                                        composable<Route.Language> {
+                                            val viewModel =
-                                            LanguageScreen(appUiState, viewModel)
+                                                it.sharedViewModel<AutoTunnelViewModel>(
-                                        }
+                                                    navController
-                                        composable<Route.Display> {
+                                                )
-                                            DisplayScreen(appUiState, viewModel)
+                                            AutoTunnelAdvancedScreen(viewModel)
-                                        }
-                                        composable<Route.Support> {
-                                            SupportScreen(appViewModel = viewModel)
-                                        }
-                                        composable<Route.License> { LicenseScreen() }
-                                        composable<Route.AutoTunnelAdvanced> {
-                                            AutoTunnelAdvancedScreen(appUiState, viewModel)
                                         }
                                         composable<Route.WifiDetectionMethod> {
-                                            WifiDetectionMethodScreen(appUiState, viewModel)
+                                            val viewModel =
+                                                it.sharedViewModel<AutoTunnelViewModel>(
+                                                    navController
+                                                )
+                                            WifiDetectionMethodScreen(viewModel)
                                         }
-                                        composable<Route.Logs> {
+                                    }
-                                            LogsScreen(appViewState, viewModel)
+
+                                    navigation<Route.SettingsGraph>(
+                                        startDestination = Route.Settings
+                                    ) {
+                                        composable<Route.Settings> {
+                                            val viewModel =
+                                                it.sharedViewModel<SettingsViewModel>(navController)
+                                            SettingsScreen(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)
+                                            val viewModel =
-                                        }
+                                                it.sharedViewModel<SettingsViewModel>(navController)
-                                        composable<Route.ProxySettings> {
+                                            TunnelMonitoringScreen(viewModel)
-                                            ProxySettingsScreen(appUiState, viewModel)
                                         }
                                         composable<Route.SystemFeatures> {
-                                            SystemFeaturesScreen(appUiState, viewModel)
+                                            val viewModel =
+                                                it.sharedViewModel<SettingsViewModel>(navController)
+                                            SystemFeaturesScreen(viewModel)
                                         }
                                         composable<Route.Dns> {
-                                            DnsSettingsScreen(appUiState, viewModel)
+                                            val viewModel =
+                                                it.sharedViewModel<SettingsViewModel>(navController)
+                                            DnsSettingsScreen(viewModel)
                                         }
+                                        composable<Route.ProxySettings> { ProxySettingsScreen() }
+                                        composable<Route.Appearance> { AppearanceScreen() }
+                                        composable<Route.Language> { LanguageScreen() }
+                                        composable<Route.Display> { DisplayScreen() }
+                                        composable<Route.Logs> { LogsScreen() }
+                                    }
+
+                                    navigation<Route.SupportGraph>(
+                                        startDestination = Route.Support
+                                    ) {
+                                        composable<Route.Support> {
+                                            val viewModel =
+                                                it.sharedViewModel<SupportViewModel>(navController)
+                                            SupportScreen(viewModel)
+                                        }
+                                        composable<Route.License> { LicenseScreen() }
                                     }
                                 }
                             }
@@ -389,15 +402,15 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun performBackup() =
-        lifecycleScope.launch(ioDispatcher) {
+        lifecycleScope.launch {
             roomBackup
                 .database(appDatabase)
                 .backupLocation(RoomBackup.BACKUP_FILE_LOCATION_CUSTOM_DIALOG)
                 .enableLogDebug(true)
                 .maxFileCount(5)
                 .apply {
-                    onCompleteListener { success, message, exitCode ->
+                    onCompleteListener { success, _, _ ->
-                        lifecycleScope.launch(mainDispatcher) {
+                        lifecycleScope.launch {
                             if (success) {
                                 showToast(
                                     getString(
@@ -406,7 +419,9 @@ class MainActivity : AppCompatActivity() {
                                     )
                                 )
                                 restartApp()
-                            } else showToast(R.string.backup_failed)
+                            } else {
+                                showToast(R.string.backup_failed)
+                            }
                         }
                     }
                 }
@@ -420,8 +435,8 @@ class MainActivity : AppCompatActivity() {
                 .enableLogDebug(true)
                 .backupLocation(RoomBackup.BACKUP_FILE_LOCATION_CUSTOM_DIALOG)
                 .apply {
-                    onCompleteListener { success, message, exitCode ->
+                    onCompleteListener { success, _, _ ->
-                        lifecycleScope.launch(mainDispatcher) {
+                        lifecycleScope.launch {
                             if (success) {
                                 showToast(
                                     getString(
@@ -430,7 +445,9 @@ class MainActivity : AppCompatActivity() {
                                     )
                                 )
                                 restartApp()
-                            } else showToast(R.string.restore_failed)
+                            } else {
+                                showToast(R.string.restore_failed)
+                            }
                         }
                     }
                 }

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

@@ -15,14 +15,16 @@ import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 import timber.log.Timber
 
 @HiltAndroidApp
@@ -64,6 +66,11 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
             Timber.plant(ReleaseTree())
         }
 
+        applicationScope.launch(ioDispatcher) {
+            launch { if (appDataRepository.appState.isLocalLogsEnabled()) logReader.start() }
+            launch { notificationMonitor.handleApplicationNotifications() }
+        }
+
         GoBackend.setAlwaysOnCallback {
             applicationScope.launch {
                 val settings = appDataRepository.settings.get()
@@ -77,16 +84,6 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
         }
 
         ServiceWorker.start(this)
-
-        applicationScope.launch {
-            launch { notificationMonitor.handleApplicationNotifications() }
-            appDataRepository.appState.getLocale()?.let {
-                withContext(mainDispatcher) { LocaleUtil.changeLocale(it) }
-            }
-            appDataRepository.appState.isLocalLogsEnabled().let { enabled ->
-                if (enabled) logReader.start()
-            }
-        }
     }
 
     override fun onTerminate() {

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/notification/NotificationManager.kt

@@ -16,9 +16,9 @@ interface NotificationManager {
         title: String = "",
         actions: Collection<NotificationCompat.Action> = emptyList(),
         description: String = "",
-        showTimestamp: Boolean = false,
+        showTimestamp: Boolean = true,
         importance: Int = NotificationManager.IMPORTANCE_HIGH,
-        onGoing: Boolean = true,
+        onGoing: Boolean = false,
         onlyAlertOnce: Boolean = true,
     ): Notification
 
@@ -27,9 +27,9 @@ interface NotificationManager {
         title: StringValue,
         actions: Collection<NotificationCompat.Action> = emptyList(),
         description: StringValue,
-        showTimestamp: Boolean = false,
+        showTimestamp: Boolean = true,
         importance: Int = NotificationManager.IMPORTANCE_HIGH,
-        onGoing: Boolean = true,
+        onGoing: Boolean = false,
         onlyAlertOnce: Boolean = true,
     ): Notification
 

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

@@ -131,6 +131,7 @@ class TunnelForegroundService : LifecycleService() {
                         tunnelConf.id,
                     )
                 ),
+            onGoing = true,
         )
     }
 

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

@@ -19,13 +19,14 @@ import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus.StopReason.Ping
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
-import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.AutoTunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.NetworkState
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
+import com.zaneschepke.wireguardautotunnel.util.extensions.to
 import com.zaneschepke.wireguardautotunnel.util.extensions.toMillis
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -117,6 +118,7 @@ class AutoTunnelService : LifecycleService() {
                             NotificationAction.AUTO_TUNNEL_OFF
                         )
                     ),
+                onGoing = true,
             )
         ServiceCompat.startForeground(
             this,
@@ -240,7 +242,7 @@ class AutoTunnelService : LifecycleService() {
     }
 
     // all relevant settings to auto tunnel
-    private fun areAutoTunnelSettingsTheSame(old: AppSettings, new: AppSettings): Boolean {
+    private fun areAutoTunnelSettingsTheSame(old: GeneralSettings, new: GeneralSettings): Boolean {
         return (old.isTunnelOnWifiEnabled == new.isTunnelOnWifiEnabled &&
             old.isTunnelOnMobileDataEnabled == new.isTunnelOnMobileDataEnabled &&
             old.isTunnelOnEthernetEnabled == new.isTunnelOnEthernetEnabled &&
@@ -254,7 +256,7 @@ class AutoTunnelService : LifecycleService() {
             old.isStopOnNoInternetEnabled == new.isStopOnNoInternetEnabled)
     }
 
-    private fun combineSettings(): Flow<Pair<AppSettings, Tunnels>> {
+    private fun combineSettings(): Flow<Pair<GeneralSettings, Tunnels>> {
         return combine(
                 appDataRepository
                     .get()
@@ -302,7 +304,7 @@ class AutoTunnelService : LifecycleService() {
                 .distinctUntilChanged(::areAutoTunnelPermissionsRequiredTheSame)
                 .map {
                     NetworkPermissionState(
-                        it.settings.wifiDetectionMethod,
+                        it.settings.wifiDetectionMethod.to(),
                         it.networkState.locationServicesEnabled == true,
                         it.networkState.locationPermissionGranted == true,
                         (it.tunnels.any { tunnel -> tunnel.tunnelNetworks.isNotEmpty() } ||

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

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.core.service.autotunnel
 
-import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.state.NetworkState
 import com.zaneschepke.wireguardautotunnel.domain.state.PingState
@@ -11,7 +11,7 @@ import org.amnezia.awg.crypto.Key
 sealed class StateChange {
     data class NetworkChange(val networkState: NetworkState) : StateChange()
 
-    data class SettingsChange(val settings: AppSettings, val tunnels: Tunnels) : StateChange()
+    data class SettingsChange(val settings: GeneralSettings, val tunnels: Tunnels) : StateChange()
 
     data class ActiveTunnelsChange(val activeTunnels: Map<TunnelConf, TunnelState>) : StateChange()
 

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

@@ -7,7 +7,7 @@ import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.events.BackendCoreException
 import com.zaneschepke.wireguardautotunnel.domain.events.BackendMessage
-import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.PingState
@@ -42,13 +42,13 @@ constructor(
     @OptIn(ExperimentalAtomicApi::class)
     private val tunnelProviderFlow: StateFlow<TunnelProvider> = run {
         val currentBackend = AtomicReference(userspaceTunnel)
-        val currentSettings = AtomicReference(AppSettings())
+        val currentSettings = AtomicReference(GeneralSettings())
         val initialEmit = AtomicBoolean(true)
 
         appDataRepository.settings.flow
             .filterNotNull()
             // ignore default state
-            .filterNot { it == AppSettings() }
+            .filterNot { it == GeneralSettings() }
             .distinctUntilChanged { old, new ->
                 old.appMode == new.appMode &&
                     old.isLanOnKillSwitchEnabled == new.isLanOnKillSwitchEnabled

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

@@ -87,7 +87,6 @@ constructor(
                         )
                     }
                     .build()
-
             backend.setState(tunnel, Tunnel.State.UP, updatedConfig)
         } catch (e: BackendException) {
             Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")

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

@@ -12,7 +12,7 @@ import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
 
 @Database(
     entities = [Settings::class, TunnelConfig::class, ProxySettings::class],
-    version = 21,
+    version = 22,
     autoMigrations =
         [
             AutoMigration(from = 1, to = 2),
@@ -35,6 +35,7 @@ import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
             AutoMigration(from = 18, to = 19, spec = PingMigration::class),
             AutoMigration(from = 19, to = 20, spec = ProxyMigration::class),
             AutoMigration(from = 20, to = 21, spec = FixProxySettingsMigration::class),
+            AutoMigration(from = 21, to = 22),
         ],
     exportSchema = true,
 )

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

@@ -13,7 +13,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 
@@ -85,9 +84,5 @@ class DataStoreManager(
         }
     }
 
-    fun <T> getFromStoreBlocking(key: Preferences.Key<T>) = runBlocking {
-        context.dataStore.data.map { it[key] }.first()
-    }
-
     val preferencesFlow: Flow<Preferences?> = context.dataStore.data.flowOn(ioDispatcher)
 }

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

@@ -2,25 +2,15 @@ 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
 
 class DatabaseCallback @Inject constructor(private val databaseProvider: Provider<AppDatabase>) :
     RoomDatabase.Callback() {
 
     override fun onCreate(db: SupportSQLiteDatabase) {
         super.onCreate(db)
-
+        db.execSQL("INSERT INTO proxy_settings DEFAULT VALUES")
-        // Launch coroutine to insert default entry
+        db.execSQL("INSERT INTO Settings DEFAULT VALUES")
-        CoroutineScope(Dispatchers.IO).launch {
-            val db = databaseProvider.get()
-            db.settingDao().save(Settings())
-            db.proxySettingsDoa().save(ProxySettings())
-        }
     }
 }

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

@@ -24,6 +24,16 @@ class DatabaseConverters {
         }
     }
 
+    @TypeConverter
+    fun setToString(value: Set<String>): String {
+        return listToString(value.toList())
+    }
+
+    @TypeConverter
+    fun stringToSet(value: String): Set<String> {
+        return stringToList(value).toSet()
+    }
+
     @TypeConverter fun fromStatus(status: WifiDetectionMethod): Int = status.value
 
     @TypeConverter

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

@@ -22,6 +22,8 @@ interface TunnelConfigDao {
 
     @Delete suspend fun delete(t: TunnelConfig)
 
+    @Delete suspend fun delete(t: TunnelConfigs)
+
     @Query("SELECT COUNT('id') FROM TunnelConfig") suspend fun count(): Long
 
     @Query("SELECT * FROM TunnelConfig WHERE tunnel_networks LIKE '%' || :name || '%'")

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

@@ -7,10 +7,10 @@ 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")
+    @ColumnInfo(name = "socks5_proxy_enabled", defaultValue = "0")
     val socks5ProxyEnabled: Boolean = false,
     @ColumnInfo(name = "socks5_proxy_bind_address") val socks5ProxyBindAddress: String? = null,
-    @ColumnInfo(name = "http_proxy_enable", defaultValue = "false")
+    @ColumnInfo(name = "http_proxy_enable", defaultValue = "0")
     val httpProxyEnabled: Boolean = false,
     @ColumnInfo(name = "http_proxy_bind_address") val httpProxyBindAddress: String? = null,
     @ColumnInfo(name = "proxy_username") val proxyUsername: String? = null,

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

@@ -10,38 +10,40 @@ import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
 @Entity
 data class Settings(
     @PrimaryKey(autoGenerate = true) val id: Int = 0,
-    @ColumnInfo(name = "is_tunnel_enabled") val isAutoTunnelEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_enabled", defaultValue = "0")
-    @ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
+    val isAutoTunnelEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_on_mobile_data_enabled", defaultValue = "0")
     val isTunnelOnMobileDataEnabled: Boolean = false,
-    @ColumnInfo(name = "trusted_network_ssids") val trustedNetworkSSIDs: List<String> = emptyList(),
+    @ColumnInfo(name = "trusted_network_ssids", defaultValue = "")
-    @ColumnInfo(name = "is_always_on_vpn_enabled") val isAlwaysOnVpnEnabled: Boolean = false,
+    val trustedNetworkSSIDs: Set<String> = emptySet(),
-    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
+    @ColumnInfo(name = "is_always_on_vpn_enabled", defaultValue = "0")
+    val isAlwaysOnVpnEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled", defaultValue = "0")
     val isTunnelOnEthernetEnabled: Boolean = false,
-    @ColumnInfo(name = "is_shortcuts_enabled", defaultValue = "false")
+    @ColumnInfo(name = "is_shortcuts_enabled", defaultValue = "0")
     val isShortcutsEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_wifi_enabled", defaultValue = "false")
+    @ColumnInfo(name = "is_tunnel_on_wifi_enabled", defaultValue = "0")
     val isTunnelOnWifiEnabled: Boolean = false,
-    @ColumnInfo(name = "is_restore_on_boot_enabled", defaultValue = "false")
+    @ColumnInfo(name = "is_restore_on_boot_enabled", defaultValue = "0")
     val isRestoreOnBootEnabled: Boolean = false,
-    @ColumnInfo(name = "is_multi_tunnel_enabled", defaultValue = "false")
+    @ColumnInfo(name = "is_multi_tunnel_enabled", defaultValue = "0")
     val isMultiTunnelEnabled: Boolean = false,
-    @ColumnInfo(name = "is_ping_enabled", defaultValue = "false")
+    @ColumnInfo(name = "is_ping_enabled", defaultValue = "0") val isPingEnabled: Boolean = false,
-    val isPingEnabled: Boolean = false,
+    @ColumnInfo(name = "is_wildcards_enabled", defaultValue = "0")
-    @ColumnInfo(name = "is_wildcards_enabled", defaultValue = "false")
     val isWildcardsEnabled: Boolean = false,
-    @ColumnInfo(name = "is_stop_on_no_internet_enabled", defaultValue = "false")
+    @ColumnInfo(name = "is_stop_on_no_internet_enabled", defaultValue = "0")
     val isStopOnNoInternetEnabled: Boolean = false,
-    @ColumnInfo(name = "is_lan_on_kill_switch_enabled", defaultValue = "false")
+    @ColumnInfo(name = "is_lan_on_kill_switch_enabled", defaultValue = "0")
     val isLanOnKillSwitchEnabled: Boolean = false,
     @ColumnInfo(name = "debounce_delay_seconds", defaultValue = "3")
     val debounceDelaySeconds: Int = 3,
-    @ColumnInfo(name = "is_disable_kill_switch_on_trusted_enabled", defaultValue = "false")
+    @ColumnInfo(name = "is_disable_kill_switch_on_trusted_enabled", defaultValue = "0")
     val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_unsecure_enabled", defaultValue = "false")
+    @ColumnInfo(name = "is_tunnel_on_unsecure_enabled", defaultValue = "0")
     val isTunnelOnUnsecureEnabled: Boolean = false,
     @ColumnInfo(name = "wifi_detection_method", defaultValue = "0")
     val wifiDetectionMethod: WifiDetectionMethod = WifiDetectionMethod.fromValue(0),
-    @ColumnInfo(name = "is_ping_monitoring_enabled", defaultValue = "true")
+    @ColumnInfo(name = "is_ping_monitoring_enabled", defaultValue = "1")
     val isPingMonitoringEnabled: Boolean = true,
     @ColumnInfo(name = "tunnel_ping_interval_sec", defaultValue = "30")
     val tunnelPingIntervalSeconds: Int = 30,

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

@@ -11,7 +11,7 @@ data class TunnelConfig(
     @ColumnInfo(name = "name") val name: String,
     @ColumnInfo(name = "wg_quick") val wgQuick: String,
     @ColumnInfo(name = "tunnel_networks", defaultValue = "")
-    val tunnelNetworks: List<String> = listOf(),
+    val tunnelNetworks: Set<String> = setOf(),
     @ColumnInfo(name = "is_mobile_data_tunnel", defaultValue = "false")
     val isMobileDataTunnel: Boolean = false,
     @ColumnInfo(name = "is_primary_tunnel", defaultValue = "false")
@@ -27,7 +27,7 @@ data class TunnelConfig(
     val isIpv4Preferred: Boolean = true,
     @ColumnInfo(name = "position", defaultValue = "0") val position: Int = 0,
     @ColumnInfo(name = "auto_tunnel_apps", defaultValue = "[]")
-    val autoTunnelApps: List<String> = listOf(),
+    val autoTunnelApps: Set<String> = setOf(),
 ) {
 
     companion object {

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

@@ -1,14 +1,13 @@
 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
+import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
 
-fun Settings.toAppSettings(): AppSettings {
+fun Settings.toAppSettings(): GeneralSettings {
-    return AppSettings(
+    return GeneralSettings(
         id = id,
         isAutoTunnelEnabled = isAutoTunnelEnabled,
         isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
@@ -26,8 +25,7 @@ fun Settings.toAppSettings(): AppSettings {
         debounceDelaySeconds = debounceDelaySeconds,
         isDisableKillSwitchOnTrustedEnabled = isDisableKillSwitchOnTrustedEnabled,
         isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
-        wifiDetectionMethod =
+        wifiDetectionMethod = WifiDetectionMethod.fromValue(wifiDetectionMethod.value),
-            AndroidNetworkMonitor.WifiDetectionMethod.fromValue(wifiDetectionMethod.value),
         tunnelPingIntervalSeconds = tunnelPingIntervalSeconds,
         tunnelPingAttempts = tunnelPingAttempts,
         tunnelPingTimeoutSeconds = tunnelPingTimeoutSeconds,
@@ -37,7 +35,7 @@ fun Settings.toAppSettings(): AppSettings {
     )
 }
 
-fun AppSettings.toSettings(): Settings {
+fun GeneralSettings.toSettings(): Settings {
     return Settings(
         id = id,
         isAutoTunnelEnabled = isAutoTunnelEnabled,
@@ -66,7 +64,7 @@ fun AppSettings.toSettings(): Settings {
     )
 }
 
-fun AppSettings.toDomain(): DnsSettings {
+fun GeneralSettings.toDomain(): DnsSettings {
     return DnsSettings(
         protocol =
             DnsProtocol.entries.toTypedArray().getOrElse(dnsProtocol.value) { DnsProtocol.SYSTEM },
@@ -74,6 +72,6 @@ fun AppSettings.toDomain(): DnsSettings {
     )
 }
 
-fun DnsSettings.toAppSettings(existing: AppSettings): AppSettings {
+fun DnsSettings.toAppSettings(existing: GeneralSettings): GeneralSettings {
     return existing.copy(dnsProtocol = protocol, dnsEndpoint = endpoint)
 }

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

@@ -6,6 +6,10 @@ enum class WifiDetectionMethod(val value: Int) {
     ROOT(2),
     SHIZUKU(3);
 
+    fun needsLocationPermissions(): Boolean {
+        return this == LEGACY || this == DEFAULT
+    }
+
     companion object {
         fun fromValue(value: Int): WifiDetectionMethod =
             entries.find { it.value == value } ?: DEFAULT

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

@@ -7,7 +7,7 @@ import javax.inject.Inject
 class AppDataRoomRepository
 @Inject
 constructor(
-    override val settings: AppSettingRepository,
+    override val settings: GeneralSettingRepository,
     override val tunnels: TunnelRepository,
     override val appState: AppStateRepository,
     override val proxySettings: ProxySettingsRepository,

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

@@ -3,15 +3,25 @@ package com.zaneschepke.wireguardautotunnel.data.repository
 import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.data.entity.GeneralState
 import com.zaneschepke.wireguardautotunnel.data.mapper.GeneralStateMapper
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.model.AppState
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.plus
 import timber.log.Timber
 
-class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager) :
+class DataStoreAppStateRepository(
-    AppStateRepository {
+    private val dataStoreManager: DataStoreManager,
+    @ApplicationScope private val applicationScope: CoroutineScope,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : AppStateRepository {
     override suspend fun isLocationDisclosureShown(): Boolean {
         return dataStoreManager.getFromStore(DataStoreManager.locationDisclosureShown)
             ?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
@@ -167,4 +177,9 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
                 } ?: GeneralState()
             }
             .map(GeneralStateMapper::toAppState)
+            .stateIn(
+                scope = applicationScope + ioDispatcher,
+                started = SharingStarted.Eagerly,
+                initialValue = AppState(),
+            )
 }

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

@@ -0,0 +1,92 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.PackageManager
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.model.InstalledPackage
+import com.zaneschepke.wireguardautotunnel.domain.repository.InstalledPackageRepository
+import com.zaneschepke.wireguardautotunnel.util.extensions.getAllInternetCapablePackages
+import com.zaneschepke.wireguardautotunnel.util.extensions.getFriendlyAppName
+import javax.inject.Singleton
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+
+@Singleton
+class InstalledAndroidPackageRepository(
+    private val context: Context,
+    @ApplicationScope val applicationScope: CoroutineScope,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : InstalledPackageRepository {
+
+    private var cachedPackages: List<InstalledPackage>? = null
+
+    init {
+        val receiver =
+            object : BroadcastReceiver() {
+                override fun onReceive(context: Context, intent: Intent) {
+                    when (intent.action) {
+                        Intent.ACTION_PACKAGE_ADDED,
+                        Intent.ACTION_PACKAGE_REMOVED,
+                        Intent.ACTION_PACKAGE_CHANGED -> {
+                            // don't update if we have nothing cached
+                            if (cachedPackages == null) return
+                            Timber.d("Updating installed packages cache")
+                            applicationScope.launch { refreshInstalledPackages() }
+                        }
+                    }
+                }
+            }
+        val filter =
+            IntentFilter().apply {
+                addAction(Intent.ACTION_PACKAGE_ADDED)
+                addAction(Intent.ACTION_PACKAGE_REMOVED)
+                addAction(Intent.ACTION_PACKAGE_CHANGED)
+                addDataScheme("package")
+            }
+        context.registerReceiver(receiver, filter)
+    }
+
+    override suspend fun getInstalledPackages(): List<InstalledPackage> =
+        withContext(ioDispatcher) {
+            cachedPackages?.let {
+                return@withContext it
+            }
+            refreshInstalledPackages()
+        }
+
+    override suspend fun refreshInstalledPackages(): List<InstalledPackage> =
+        withContext(ioDispatcher) {
+            val packages = context.getAllInternetCapablePackages()
+
+            val installedPackages =
+                packages.mapNotNull { packageInfo ->
+                    try {
+                        val appInfo =
+                            context.packageManager.getApplicationInfo(packageInfo.packageName, 0)
+                        InstalledPackage(
+                            name =
+                                context.packageManager.getFriendlyAppName(
+                                    packageInfo.packageName,
+                                    appInfo,
+                                ),
+                            packageName = packageInfo.packageName,
+                            uId = appInfo.uid,
+                        )
+                    } catch (e: PackageManager.NameNotFoundException) {
+                        Timber.e(e)
+                        null
+                    }
+                }
+
+            cachedPackages = installedPackages
+
+            installedPackages
+        }
+}

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

@@ -5,8 +5,8 @@ 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.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
@@ -15,16 +15,16 @@ import kotlinx.coroutines.withContext
 class RoomSettingsRepository(
     private val settingsDoa: SettingsDao,
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) : AppSettingRepository {
+) : GeneralSettingRepository {
 
-    override suspend fun save(appSettings: AppSettings) {
+    override suspend fun save(generalSettings: GeneralSettings) {
-        withContext(ioDispatcher) { settingsDoa.save(appSettings.toSettings()) }
+        withContext(ioDispatcher) { settingsDoa.save(generalSettings.toSettings()) }
     }
 
     override val flow =
         settingsDoa.getSettingsFlow().flowOn(ioDispatcher).map { it.toAppSettings() }
 
-    override suspend fun get(): AppSettings {
+    override suspend fun get(): GeneralSettings {
         return withContext(ioDispatcher) {
             (settingsDoa.getAll().firstOrNull() ?: Settings()).toAppSettings()
         }

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

@@ -105,4 +105,10 @@ class RoomTunnelRepository(
             tunnelConfigDao.findByPrimary().map(TunnelConfigMapper::toTunnelConf)
         }
     }
+
+    override suspend fun delete(tunnels: List<TunnelConf>) {
+        withContext(ioDispatcher) {
+            tunnelConfigDao.delete(tunnels.map { TunnelConfigMapper.toTunnelConfig(it) })
+        }
+    }
 }

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

@@ -23,6 +23,7 @@ import kotlinx.coroutines.SupervisorJob
 @Module
 @InstallIn(SingletonComponent::class)
 class AppModule {
+
     @Singleton
     @ApplicationScope
     @Provides

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

@@ -22,10 +22,28 @@ import dagger.hilt.components.SingletonComponent
 import io.ktor.client.*
 import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
 
 @Module
 @InstallIn(SingletonComponent::class)
 class RepositoryModule {
+
+    @Provides
+    @Singleton
+    fun provideGlobalEffectRepository(): GlobalEffectRepository {
+        return GlobalEffectRepository()
+    }
+
+    @Provides
+    @Singleton
+    fun provideInstalledPackageRepository(
+        @ApplicationContext context: Context,
+        @ApplicationScope applicationScope: CoroutineScope,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    ): InstalledPackageRepository {
+        return InstalledAndroidPackageRepository(context, applicationScope, ioDispatcher)
+    }
+
     @Provides
     @Singleton
     fun provideDatabase(
@@ -74,7 +92,7 @@ class RepositoryModule {
     fun provideSettingsRepository(
         settingsDao: SettingsDao,
         @IoDispatcher ioDispatcher: CoroutineDispatcher,
-    ): AppSettingRepository {
+    ): GeneralSettingRepository {
         return RoomSettingsRepository(settingsDao, ioDispatcher)
     }
 
@@ -98,14 +116,18 @@ class RepositoryModule {
 
     @Provides
     @Singleton
-    fun provideGeneralStateRepository(dataStoreManager: DataStoreManager): AppStateRepository {
+    fun provideGeneralStateRepository(
-        return DataStoreAppStateRepository(dataStoreManager)
+        dataStoreManager: DataStoreManager,
+        @ApplicationScope applicationScope: CoroutineScope,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    ): AppStateRepository {
+        return DataStoreAppStateRepository(dataStoreManager, applicationScope, ioDispatcher)
     }
 
     @Provides
     @Singleton
     fun provideAppDataRepository(
-        settingsRepository: AppSettingRepository,
+        settingsRepository: GeneralSettingRepository,
         tunnelRepository: TunnelRepository,
         appStateRepository: AppStateRepository,
         proxySettingsRepository: ProxySettingsRepository,

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

@@ -10,7 +10,8 @@ import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.*
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.util.extensions.to
 import com.zaneschepke.wireguardautotunnel.util.network.NetworkUtils
 import dagger.Module
 import dagger.Provides
@@ -140,7 +141,7 @@ class TunnelModule {
     @Singleton
     fun provideNetworkMonitor(
         @ApplicationContext context: Context,
-        settingsRepository: AppSettingRepository,
+        settingsRepository: GeneralSettingRepository,
         @ApplicationScope applicationScope: CoroutineScope,
         @AppShell appShell: RootShell,
     ): NetworkMonitor {
@@ -151,7 +152,7 @@ class TunnelModule {
                     get() =
                         settingsRepository.flow
                             .distinctUntilChangedBy { it.wifiDetectionMethod }
-                            .map { it.wifiDetectionMethod }
+                            .map { it.wifiDetectionMethod.to() }
 
                 override val rootShell: RootShell
                     get() = appShell

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

@@ -3,14 +3,14 @@ package com.zaneschepke.wireguardautotunnel.domain.model
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 
 data class AppState(
-    val isLocationDisclosureShown: Boolean,
+    val isLocationDisclosureShown: Boolean = false,
-    val isBatteryOptimizationDisableShown: Boolean,
+    val isBatteryOptimizationDisableShown: Boolean = false,
-    val isPinLockEnabled: Boolean,
+    val isPinLockEnabled: Boolean = false,
-    val expandedTunnelIds: List<Int>,
+    val expandedTunnelIds: List<Int> = emptyList(),
-    val isLocalLogsEnabled: Boolean,
+    val isLocalLogsEnabled: Boolean = false,
-    val isRemoteControlEnabled: Boolean,
+    val isRemoteControlEnabled: Boolean = false,
-    val showDetailedPingStats: Boolean,
+    val showDetailedPingStats: Boolean = false,
-    val remoteKey: String?,
+    val remoteKey: String? = null,
-    val locale: String?,
+    val locale: String? = null,
-    val theme: Theme,
+    val theme: Theme = Theme.AUTOMATIC,
 )

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

@@ -1,14 +1,14 @@
 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
+import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
 
-data class AppSettings(
+data class GeneralSettings(
     val id: Int = 0,
     val isAutoTunnelEnabled: Boolean = false,
     val isTunnelOnMobileDataEnabled: Boolean = false,
-    val trustedNetworkSSIDs: List<String> = emptyList(),
+    val trustedNetworkSSIDs: Set<String> = emptySet(),
     val isAlwaysOnVpnEnabled: Boolean = false,
     val isTunnelOnEthernetEnabled: Boolean = false,
     val isShortcutsEnabled: Boolean = false,
@@ -24,10 +24,9 @@ data class AppSettings(
     val debounceDelaySeconds: Int = 3,
     val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
     val isTunnelOnUnsecureEnabled: Boolean = false,
-    val wifiDetectionMethod: AndroidNetworkMonitor.WifiDetectionMethod =
+    val wifiDetectionMethod: WifiDetectionMethod = WifiDetectionMethod.DEFAULT,
-        AndroidNetworkMonitor.WifiDetectionMethod.DEFAULT,
+    val tunnelPingIntervalSeconds: Int = PING_INTERVAL_DEFAULT,
-    val tunnelPingIntervalSeconds: Int = 30,
+    val tunnelPingAttempts: Int = PING_ATTEMPTS_DEFAULT,
-    val tunnelPingAttempts: Int = 3,
     val tunnelPingTimeoutSeconds: Int? = null,
     val appMode: AppMode = AppMode.VPN,
     val dnsProtocol: DnsProtocol = DnsProtocol.SYSTEM,
@@ -44,4 +43,9 @@ data class AppSettings(
         """
             .trimIndent()
     }
+
+    companion object {
+        const val PING_INTERVAL_DEFAULT = 30
+        const val PING_ATTEMPTS_DEFAULT = 3
+    }
 }

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

@@ -0,0 +1,3 @@
+package com.zaneschepke.wireguardautotunnel.domain.model
+
+data class InstalledPackage(val name: String, val packageName: String, val uId: Int)

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

@@ -1,16 +1,19 @@
 package com.zaneschepke.wireguardautotunnel.domain.model
 
+import android.os.Parcelable
 import com.wireguard.android.backend.Tunnel
 import com.wireguard.config.Config
 import com.zaneschepke.wireguardautotunnel.util.extensions.*
 import java.io.InputStream
 import java.nio.charset.StandardCharsets
+import kotlinx.parcelize.Parcelize
 
+@Parcelize
 data class TunnelConf(
     val id: Int = 0,
     val tunName: String,
     val wgQuick: String,
-    val tunnelNetworks: List<String> = emptyList(),
+    val tunnelNetworks: Set<String> = emptySet(),
     val isMobileDataTunnel: Boolean = false,
     val isPrimaryTunnel: Boolean = false,
     val amQuick: String,
@@ -21,7 +24,7 @@ data class TunnelConf(
     val isIpv4Preferred: Boolean = true,
     val position: Int = 0,
     @Transient private var stateChangeCallback: ((Any) -> Unit)? = null,
-) : Tunnel, org.amnezia.awg.backend.Tunnel {
+) : Tunnel, org.amnezia.awg.backend.Tunnel, Parcelable {
 
     val isNameKernelCompatible: Boolean = (name.length <= 15)
 
@@ -61,7 +64,7 @@ data class TunnelConf(
         id: Int = this.id,
         tunName: String = this.tunName,
         wgQuick: String = this.wgQuick,
-        tunnelNetworks: List<String> = this.tunnelNetworks,
+        tunnelNetworks: Set<String> = this.tunnelNetworks,
         isMobileDataTunnel: Boolean = this.isMobileDataTunnel,
         isPrimaryTunnel: Boolean = this.isPrimaryTunnel,
         amQuick: String = this.amQuick,
@@ -140,7 +143,17 @@ data class TunnelConf(
             }
         }
 
-        fun tunnelConfigFromAmConfig(
+        fun tunnelConfFromQuick(amQuick: String, name: String? = null): TunnelConf {
+            val config = configFromAmQuick(amQuick)
+            val wgQuick = config.toWgQuickString()
+            return TunnelConf(
+                tunName = name ?: config.defaultName(),
+                wgQuick = wgQuick,
+                amQuick = amQuick,
+            )
+        }
+
+        private fun tunnelConfFromAmConfig(
             config: org.amnezia.awg.config.Config,
             name: String? = null,
         ): TunnelConf {

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

@@ -7,7 +7,7 @@ interface AppDataRepository {
 
     suspend fun getStartTunnelConfig(): TunnelConf?
 
-    val settings: AppSettingRepository
+    val settings: GeneralSettingRepository
     val tunnels: TunnelRepository
     val appState: AppStateRepository
 

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

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

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

@@ -0,0 +1,18 @@
+package com.zaneschepke.wireguardautotunnel.domain.repository
+
+import com.zaneschepke.wireguardautotunnel.domain.sideeffect.GlobalSideEffect
+import javax.inject.Singleton
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+
+@Singleton
+class GlobalEffectRepository {
+
+    private val _globalEffectFlow =
+        MutableSharedFlow<GlobalSideEffect>(replay = 0, extraBufferCapacity = 1)
+    val flow = _globalEffectFlow.asSharedFlow()
+
+    suspend fun post(effect: GlobalSideEffect) {
+        _globalEffectFlow.emit(effect)
+    }
+}

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

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

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

@@ -0,0 +1,12 @@
+package com.zaneschepke.wireguardautotunnel.domain.repository
+
+import com.zaneschepke.wireguardautotunnel.domain.model.InstalledPackage
+
+interface InstalledPackageRepository {
+
+    // gets packages from cache or queries and updates cache if empty
+    suspend fun getInstalledPackages(): List<InstalledPackage>
+
+    // updates the cache and returns the results
+    suspend fun refreshInstalledPackages(): List<InstalledPackage>
+}

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

@@ -34,4 +34,6 @@ interface TunnelRepository {
     suspend fun findByMobileDataTunnel(): Tunnels
 
     suspend fun findPrimary(): Tunnels
+
+    suspend fun delete(tunnels: List<TunnelConf>)
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/sideeffect/GlobalSideEffect.kt

@@ -0,0 +1,27 @@
+package com.zaneschepke.wireguardautotunnel.domain.sideeffect
+
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import java.io.File
+
+sealed class GlobalSideEffect {
+    data object RequestBatteryOptimizationDisabled : GlobalSideEffect()
+
+    data class Snackbar(val message: StringValue) : GlobalSideEffect()
+
+    data class Toast(val message: StringValue) : GlobalSideEffect()
+
+    data object PopBackStack : GlobalSideEffect()
+
+    data class ShareFile(val file: File) : GlobalSideEffect()
+
+    data class LaunchUrl(val url: String) : GlobalSideEffect()
+
+    data object ConfigChanged : GlobalSideEffect()
+
+    data class RequestVpnPermission(val requestingMode: AppMode, val config: TunnelConf?) :
+        GlobalSideEffect()
+
+    data class InstallApk(val apk: File) : GlobalSideEffect()
+}

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

@@ -3,14 +3,14 @@ package com.zaneschepke.wireguardautotunnel.domain.state
 import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.StateChange
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent.*
-import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
 
 data class AutoTunnelState(
     val activeTunnels: Map<TunnelConf, TunnelState> = emptyMap(),
     val networkState: NetworkState = NetworkState(),
-    val settings: AppSettings = AppSettings(),
+    val settings: GeneralSettings = GeneralSettings(),
     val tunnels: List<TunnelConf> = emptyList(),
 ) {
 
@@ -137,7 +137,7 @@ data class AutoTunnelState(
 
     private fun hasTrustedWifiName(
         wifiName: String,
-        wifiNames: List<String> = settings.trustedNetworkSSIDs,
+        wifiNames: Set<String> = settings.trustedNetworkSSIDs,
     ): Boolean {
         return if (settings.isWildcardsEnabled) {
             wifiNames.isMatchingToWildcardList(wifiName)

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

@@ -0,0 +1,13 @@
+package com.zaneschepke.wireguardautotunnel.ui
+
+import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.navigation.NavHostController
+import com.zaneschepke.wireguardautotunnel.viewmodel.SharedAppViewModel
+
+val LocalNavController =
+    compositionLocalOf<NavHostController> { error("NavController was not provided") }
+
+val LocalIsAndroidTV = staticCompositionLocalOf { false }
+
+val LocalSharedVm = staticCompositionLocalOf<SharedAppViewModel> { error("No SharedVm") }

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

@@ -22,7 +22,7 @@ fun ExpandingRowListItem(
     text: String,
     trailing: @Composable () -> Unit,
     isSelected: Boolean,
-    expanded: @Composable () -> Unit,
+    expanded: (@Composable () -> Unit),
     modifier: Modifier = Modifier,
 ) {
     Box(

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

@@ -0,0 +1,21 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.button
+
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
+
+@Composable
+fun ActionIconButton(icon: ImageVector, labelRes: Int, onClick: () -> Unit) {
+    IconButton(onClick = onClick) {
+        Icon(
+            icon,
+            contentDescription = stringResource(labelRes),
+            modifier = Modifier.size(iconSize),
+        )
+    }
+}

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

@@ -12,6 +12,8 @@ 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.button.surface.SelectionItemLabel
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionLabelType
 
 @Composable
 fun IconSurfaceButton(
@@ -55,7 +57,7 @@ fun IconSurfaceButton(
                     ) {
                         leading?.invoke()
                         Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
-                            Text(title, style = MaterialTheme.typography.titleMedium)
+                            SelectionItemLabel(title, SelectionLabelType.TITLE)
                             description?.let {
                                 Text(
                                     description,

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

@@ -4,24 +4,28 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.*
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 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.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItemLabel
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionLabelType
 
 @Composable
 fun SelectionItemButton(
-    leading: (@Composable () -> Unit)? = null,
     buttonText: String,
-    trailing: (@Composable () -> Unit)? = null,
+    description: String? = null,
     onClick: () -> Unit,
-    ripple: Boolean = true,
     modifier: Modifier = Modifier,
+    leading: (@Composable () -> Unit)? = null,
+    trailing: (@Composable () -> Unit)? = null,
+    ripple: Boolean = true,
 ) {
     Card(
         modifier =
@@ -32,24 +36,38 @@ fun SelectionItemButton(
                     interactionSource = remember { MutableInteractionSource() },
                     onClick = { onClick() },
                 )
-                .height(56.dp),
+                .height(IntrinsicSize.Min)
+                .padding(horizontal = 12.dp)
+                .padding(end = 12.dp),
         colors = CardDefaults.cardColors(containerColor = Color.Transparent),
     ) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceBetween,
             modifier = Modifier.fillMaxSize().padding(horizontal = 12.dp),
         ) {
-            Row {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(24.dp),
+            ) {
                 leading?.let { it() }
-                Text(
+                Column(
-                    buttonText,
+                    horizontalAlignment = Alignment.Start,
-                    style = MaterialTheme.typography.labelMedium,
+                    modifier = Modifier.weight(1f).padding(end = 12.dp),
-                    color = MaterialTheme.colorScheme.onSurface,
+                    verticalArrangement = Arrangement.Center,
-                    modifier = Modifier.fillMaxWidth(3 / 4f),
+                ) {
-                    maxLines = 2,
+                    SelectionItemLabel(
-                    overflow = TextOverflow.Ellipsis,
+                        buttonText,
-                )
+                        SelectionLabelType.TITLE,
+                        modifier = Modifier.weight(1f).padding(end = 24.dp),
+                    )
+                    description?.let {
+                        SelectionItemLabel(
+                            it,
+                            SelectionLabelType.DESCRIPTION,
+                            modifier = Modifier.weight(1f).padding(end = 24.dp),
+                        )
+                    }
+                }
             }
             trailing?.let { it() }
         }

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

@@ -22,6 +22,7 @@ fun SelectionItemLabel(text: String, labelType: SelectionLabelType, modifier: Mo
 }
 
 enum class SelectionLabelType {
+
     DESCRIPTION,
     TITLE,
 }

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

@@ -9,8 +9,8 @@ import androidx.activity.compose.ManagedActivityResultLauncher
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.Composable
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
+import com.zaneschepke.wireguardautotunnel.ui.LocalIsAndroidTV
-import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.FileUtils
 import timber.log.Timber
 
 @Composable
@@ -26,9 +26,9 @@ fun rememberFileImportLauncherForResult(
                     super.createIntent(context, input).apply {
                         type =
                             if (isTv) {
-                                Constants.ALLOWED_TV_FILE_TYPES
+                                FileUtils.ALLOWED_TV_FILE_TYPES
                             } else {
-                                Constants.ALL_FILE_TYPES
+                                FileUtils.ALL_FILE_TYPES
                             }
                     }
 
@@ -51,8 +51,8 @@ fun rememberFileImportLauncherForResult(
                 if (
                     activitiesToResolveIntent.all {
                         val name = it.activityInfo.packageName
-                        name.startsWith(Constants.GOOGLE_TV_EXPLORER_STUB) ||
+                        name.startsWith(FileUtils.GOOGLE_TV_EXPLORER_STUB) ||
-                            name.startsWith(Constants.ANDROID_TV_EXPLORER_STUB)
+                            name.startsWith(FileUtils.ANDROID_TV_EXPLORER_STUB)
                     }
                 ) {
                     onNoFileExplorer()
@@ -68,7 +68,7 @@ fun rememberFileImportLauncherForResult(
 
 @Composable
 fun rememberFileExportLauncherForResult(
-    mimeType: String = Constants.ZIP_FILE_MIME_TYPE,
+    mimeType: String = FileUtils.ZIP_FILE_MIME_TYPE,
     onResult: (Uri?) -> Unit,
 ): ManagedActivityResultLauncher<String, Uri?> {
     val isTv = LocalIsAndroidTV.current
@@ -82,7 +82,7 @@ fun rememberFileExportLauncherForResult(
                             addCategory(Intent.CATEGORY_OPENABLE)
                             type =
                                 if (isTv) {
-                                    Constants.ALLOWED_TV_FILE_TYPES
+                                    FileUtils.ALLOWED_TV_FILE_TYPES
                                 } else {
                                     mimeType
                                 }

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

@@ -16,7 +16,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
+import com.zaneschepke.wireguardautotunnel.ui.LocalIsAndroidTV
 
 @Composable
 fun CustomSnackBar(

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

@@ -1,12 +1,11 @@
 package com.zaneschepke.wireguardautotunnel.ui.navigation
 
 import androidx.compose.ui.graphics.vector.ImageVector
-import com.zaneschepke.wireguardautotunnel.ui.Route
 
 data class BottomNavItem(
     val name: String,
-    val route: Route,
     val icon: ImageVector,
     val onClick: () -> Unit,
     val active: Boolean = false,
+    val route: Route,
 )

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

@@ -1,20 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.navigation
-
-import android.annotation.SuppressLint
-import androidx.compose.runtime.compositionLocalOf
-import androidx.compose.runtime.staticCompositionLocalOf
-import androidx.navigation.NavBackStackEntry
-import androidx.navigation.NavDestination.Companion.hasRoute
-import androidx.navigation.NavDestination.Companion.hierarchy
-import androidx.navigation.NavHostController
-import com.zaneschepke.wireguardautotunnel.ui.Route
-import kotlin.reflect.KClass
-
-@SuppressLint("RestrictedApi")
-fun <T : Route> NavBackStackEntry?.isCurrentRoute(cls: KClass<T>): Boolean {
-    return this?.destination?.hierarchy?.any { it.hasRoute(route = cls) } == true
-}
-
-val LocalNavController =
-    compositionLocalOf<NavHostController> { error("NavController was not provided") }
-val LocalIsAndroidTV = staticCompositionLocalOf { false }

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

@@ -1,54 +1,58 @@
-package com.zaneschepke.wireguardautotunnel.ui
+package com.zaneschepke.wireguardautotunnel.ui.navigation
 
 import kotlinx.serialization.Serializable
 
+@Serializable
 sealed class Route {
+    @Serializable data object TunnelsGraph : Route()
+
+    @Serializable data object AutoTunnelGraph : Route()
+
+    @Serializable data object SettingsGraph : Route()
+
+    @Serializable data object SupportGraph : Route()
+
     @Serializable data object Support : Route()
 
-    @Serializable data object Settings : Route()
-
-    @Serializable data object AutoTunnel : Route()
-
-    @Serializable data object AutoTunnelAdvanced : Route()
-
-    @Serializable data object WifiDetectionMethod : Route()
-
-    @Serializable data object LocationDisclosure : Route()
-
-    @Serializable data object Appearance : Route()
-
-    @Serializable data object Display : Route()
-
-    @Serializable data object Language : Route()
-
-    @Serializable data object Main : Route()
-
-    @Serializable data class TunnelOptions(val id: Int) : Route()
-
     @Serializable data object Lock : Route()
 
     @Serializable data object License : Route()
 
-    @Serializable data class Config(val id: Int) : Route()
+    @Serializable data object Logs : Route()
 
-    @Serializable
+    @Serializable data object Appearance : Route()
-    data class SplitTunnel(val id: Int) : Route() {
+
-        companion object {
+    @Serializable data object Language : Route()
-            const val KEY_ID = "id"
+
-        }
+    @Serializable data object Display : Route()
-    }
+
+    @Serializable data object Tunnels : Route()
+
+    @Serializable data class TunnelOptions(val id: Int) : Route()
+
+    @Serializable data class Config(val id: Int?) : Route()
+
+    @Serializable data class SplitTunnel(val id: Int) : Route()
 
     @Serializable data class TunnelAutoTunnel(val id: Int) : Route()
 
-    @Serializable data object Logs : Route()
-
     @Serializable data object Sort : Route()
 
+    @Serializable data object Settings : Route()
+
     @Serializable data object TunnelMonitoring : Route()
 
     @Serializable data object SystemFeatures : Route()
 
+    @Serializable data object Dns : Route()
+
     @Serializable data object ProxySettings : Route()
 
-    @Serializable data object Dns : Route()
+    @Serializable data object AutoTunnel : Route()
+
+    @Serializable data object AdvancedAutoTunnel : Route()
+
+    @Serializable data object WifiDetectionMethod : Route()
+
+    @Serializable data object LocationDisclosure : Route()
 }

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

@@ -1,107 +1,153 @@
 package com.zaneschepke.wireguardautotunnel.ui.navigation.components
 
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Bolt
 import androidx.compose.material.icons.rounded.Home
 import androidx.compose.material.icons.rounded.QuestionMark
 import androidx.compose.material.icons.rounded.Settings
 import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.*
-import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.navigation.NavGraph.Companion.findStartDestination
+import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.navigation.BottomNavItem
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
-import com.zaneschepke.wireguardautotunnel.ui.navigation.isCurrentRoute
+import com.zaneschepke.wireguardautotunnel.ui.state.NavbarState
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.theme.SilverTree
-import com.zaneschepke.wireguardautotunnel.util.extensions.goFromRoot
+import com.zaneschepke.wireguardautotunnel.util.extensions.debounce
+
+@Composable
+fun NavHostController.getCurrentGraph(): State<Route?> {
+    val navBackStackEntry by currentBackStackEntryAsState()
+
+    return remember(navBackStackEntry) {
+        derivedStateOf {
+            val parentRouteString = navBackStackEntry?.destination?.parent?.route
+            when (parentRouteString) {
+                Route.TunnelsGraph::class.qualifiedName -> Route.TunnelsGraph
+                Route.AutoTunnelGraph::class.qualifiedName -> Route.AutoTunnelGraph
+                Route.SettingsGraph::class.qualifiedName -> Route.SettingsGraph
+                Route.SupportGraph::class.qualifiedName -> Route.SupportGraph
+                else -> null
+            }
+        }
+    }
+}
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun BottomNavbar(appUiState: AppUiState) {
+fun BottomNavbar(
-    val navController = LocalNavController.current
+    isAutoTunnelActive: Boolean,
-    val navBackStackEntry by navController.currentBackStackEntryAsState()
+    navbarState: NavbarState,
+    navController: NavHostController,
+) {
+
+    val currentGraph by navController.getCurrentGraph()
+    val coroutineScope = rememberCoroutineScope()
+
+    val navigateToDebounced =
+        remember<(Route) -> Unit> {
+            debounce(scope = coroutineScope, 150L) { route ->
+                navController.navigate(route) {
+                    popUpTo(navController.graph.findStartDestination().id) { saveState = true }
+                    launchSingleTop = true
+                    restoreState = true
+                }
+            }
+        }
 
     val items =
         listOf(
             BottomNavItem(
                 name = stringResource(R.string.tunnels),
-                route = Route.Main,
                 icon = Icons.Rounded.Home,
-                onClick = { navController.goFromRoot(Route.Main) },
+                onClick = { navigateToDebounced(Route.TunnelsGraph) },
+                route = Route.TunnelsGraph,
             ),
             BottomNavItem(
                 name = stringResource(R.string.auto_tunnel),
-                route = Route.AutoTunnel,
                 icon = Icons.Rounded.Bolt,
-                onClick = {
+                onClick = { navigateToDebounced(Route.AutoTunnelGraph) },
-                    val route =
+                route = Route.AutoTunnelGraph,
-                        if (appUiState.appState.isLocationDisclosureShown) {
+                active = isAutoTunnelActive,
-                            Route.AutoTunnel
-                        } else Route.LocationDisclosure
-                    navController.goFromRoot(route)
-                },
-                active = appUiState.isAutoTunnelActive,
             ),
             BottomNavItem(
                 name = stringResource(R.string.settings),
-                route = Route.Settings,
                 icon = Icons.Rounded.Settings,
-                onClick = { navController.goFromRoot(Route.Settings) },
+                onClick = { navigateToDebounced(Route.SettingsGraph) },
+                route = Route.SettingsGraph,
             ),
             BottomNavItem(
                 name = stringResource(R.string.support),
-                route = Route.Support,
                 icon = Icons.Rounded.QuestionMark,
-                onClick = { navController.goFromRoot(Route.Support) },
+                onClick = { navigateToDebounced(Route.SupportGraph) },
+                route = Route.SupportGraph,
             ),
         )
 
-    NavigationBar(containerColor = MaterialTheme.colorScheme.surface) {
+    if (!navbarState.removeBottom) {
-        items.forEach { item ->
+        NavigationBar(containerColor = MaterialTheme.colorScheme.surface) {
-            val isSelected = navBackStackEntry.isCurrentRoute(item.route::class)
+            AnimatedVisibility(
-            val interactionSource = remember { MutableInteractionSource() }
+                visible = navbarState.showBottomItems,
-
+                enter = slideInVertically(initialOffsetY = { it }),
-            NavigationBarItem(
+                exit = slideOutVertically(targetOffsetY = { it }),
-                icon = {
+            ) {
-                    if (item.active) {
+                Row(
-                        BadgedBox(
+                    modifier = Modifier.fillMaxWidth(),
-                            badge = {
+                    horizontalArrangement = Arrangement.spacedBy(0.dp),
-                                Badge(
+                    verticalAlignment = Alignment.CenterVertically,
-                                    modifier = Modifier.offset(x = 8.dp, y = (-8).dp).size(6.dp),
+                ) {
-                                    containerColor = SilverTree,
+                    items.forEach { item ->
-                                )
+                        val interactionSource = remember { MutableInteractionSource() }
-                            }
+                        NavigationBarItem(
-                        ) {
+                            icon = {
-                            Icon(imageVector = item.icon, contentDescription = item.name)
+                                if (item.active) {
-                        }
+                                    BadgedBox(
-                    } else {
+                                        badge = {
-                        Icon(imageVector = item.icon, contentDescription = item.name)
+                                            Badge(
+                                                modifier =
+                                                    Modifier.offset(x = 8.dp, y = (-8).dp)
+                                                        .size(6.dp),
+                                                containerColor = SilverTree,
+                                            )
+                                        }
+                                    ) {
+                                        Icon(
+                                            imageVector = item.icon,
+                                            contentDescription = item.name,
+                                        )
+                                    }
+                                } else {
+                                    Icon(imageVector = item.icon, contentDescription = item.name)
+                                }
+                            },
+                            onClick = item.onClick,
+                            selected = currentGraph == item.route,
+                            enabled = true,
+                            label = null,
+                            alwaysShowLabel = false,
+                            colors =
+                                NavigationBarItemDefaults.colors(
+                                    selectedIconColor = MaterialTheme.colorScheme.primary,
+                                    unselectedIconColor = MaterialTheme.colorScheme.onBackground,
+                                    indicatorColor = Color.Transparent,
+                                ),
+                            interactionSource = interactionSource,
+                        )
                     }
-                },
+                }
-                onClick = item.onClick,
+            }
-                selected = isSelected,
-                enabled = true,
-                label = null,
-                alwaysShowLabel = false,
-                colors =
-                    NavigationBarItemDefaults.colors(
-                        selectedIconColor = MaterialTheme.colorScheme.primary,
-                        unselectedIconColor = MaterialTheme.colorScheme.onBackground,
-                        indicatorColor = Color.Transparent,
-                    ),
-                interactionSource = interactionSource,
-            )
         }
     }
 }

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

@@ -1,6 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.ui.navigation.components
 
-import androidx.compose.animation.*
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -10,32 +9,20 @@ import androidx.compose.runtime.Composable
 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.state.NavbarState
 import com.zaneschepke.wireguardautotunnel.ui.theme.LockedDownBannerHeight
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun DynamicTopAppBar(navBarState: NavBarState, modifier: Modifier = Modifier) {
+fun DynamicTopAppBar(navBarState: NavbarState, modifier: Modifier = Modifier) {
     TopAppBar(
         modifier = modifier.padding(top = LockedDownBannerHeight),
         colors = TopAppBarDefaults.topAppBarColors().copy(Color.Transparent),
         title = {
-            AnimatedVisibility(
+            Box(modifier = Modifier.padding(start = 10.dp)) { navBarState.topTitle?.invoke() }
-                visible = navBarState.showTop,
-                enter = slideInVertically() + fadeIn(),
-                exit = slideOutVertically() + fadeOut(),
-            ) {
-                Box(modifier = Modifier.padding(start = 10.dp)) { navBarState.topTitle?.invoke() }
-            }
         },
         actions = {
-            AnimatedVisibility(
+            Box(modifier = Modifier.padding(end = 10.dp)) { navBarState.topTrailing?.invoke() }
-                visible = navBarState.showTop,
-                enter = slideInVertically() + fadeIn(),
-                exit = slideOutVertically() + fadeOut(),
-            ) {
-                Box(modifier = Modifier.padding(end = 10.dp)) { navBarState.topTrailing?.invoke() }
-            }
         },
     )
 }

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

@@ -1,335 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.navigation.components
-
-import android.os.Build
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.rounded.Sort
-import androidx.compose.material.icons.rounded.*
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
-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
-import androidx.navigation.toRoute
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.navigation.isCurrentRoute
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
-import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
-import com.zaneschepke.wireguardautotunnel.ui.state.NavBarState
-import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.UiEvent
-
-@Composable
-fun currentNavBackStackEntryAsNavBarState(
-    navController: NavController,
-    backStackEntry: NavBackStackEntry?,
-    viewModel: AppViewModel,
-    uiState: AppUiState,
-    appViewState: AppViewState,
-): State<NavBarState> {
-    val context = LocalContext.current
-
-    fun isActiveSelected() =
-        uiState.activeTunnels.any { active ->
-            appViewState.selectedTunnels.any { it.id == active.key.id }
-        }
-
-    @Composable
-    fun ActionIconButton(icon: ImageVector, labelRes: Int, onClick: () -> Unit) {
-        IconButton(onClick = onClick) {
-            Icon(
-                icon,
-                contentDescription = stringResource(labelRes),
-                modifier = Modifier.size(iconSize),
-            )
-        }
-    }
-
-    @Composable
-    fun TunnelActionBar() {
-        val selectedCount = appViewState.selectedTunnels.size
-        val showDelete = !isActiveSelected()
-
-        Row {
-            if (selectedCount == 0) {
-                val showSort = remember(uiState.tunnels) { uiState.tunnels.size > 1 }
-                if (showSort)
-                    ActionIconButton(Icons.AutoMirrored.Rounded.Sort, R.string.sort) {
-                        navController.navigate(Route.Sort)
-                    }
-                ActionIconButton(Icons.Rounded.Add, R.string.add_tunnel) {
-                    viewModel.handleEvent(
-                        AppEvent.SetBottomSheet(AppViewState.BottomSheet.IMPORT_TUNNELS)
-                    )
-                }
-                return@Row
-            }
-            ActionIconButton(Icons.Rounded.SelectAll, R.string.select_all) {
-                viewModel.handleEvent(AppEvent.ToggleSelectAllTunnels)
-            }
-            // due to permissions, and SAF issues on TV, not support less than Android 10 on
-            // Android TV for file exports
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                ActionIconButton(Icons.Rounded.Download, R.string.download) {
-                    viewModel.handleEvent(
-                        AppEvent.SetBottomSheet(AppViewState.BottomSheet.EXPORT_TUNNELS)
-                    )
-                }
-            }
-
-            if (selectedCount == 1) {
-                ActionIconButton(Icons.Rounded.CopyAll, R.string.copy) {
-                    viewModel.handleEvent(AppEvent.CopySelectedTunnel)
-                }
-            }
-
-            if (showDelete) {
-                ActionIconButton(Icons.Rounded.Delete, R.string.delete_tunnel) {
-                    viewModel.handleEvent(AppEvent.SetShowModal(AppViewState.ModalType.DELETE))
-                }
-            }
-        }
-    }
-
-    return produceState(
-        initialValue = NavBarState(),
-        key1 = backStackEntry,
-        key2 = uiState,
-        key3 = appViewState,
-    ) {
-        value =
-            when {
-                backStackEntry.isCurrentRoute(Route.Main::class) -> {
-                    NavBarState(
-                        topTitle = { Text(stringResource(R.string.tunnels)) },
-                        topTrailing = { TunnelActionBar() },
-                        route = Route.Main,
-                    )
-                }
-
-                backStackEntry.isCurrentRoute(Route.AutoTunnel::class) -> {
-
-                    NavBarState(
-                        topTitle = { Text(stringResource(R.string.auto_tunnel)) },
-                        route = Route.AutoTunnel,
-                    )
-                }
-
-                backStackEntry.isCurrentRoute(Route.Logs::class) -> {
-                    NavBarState(
-                        showBottom = false,
-                        topTitle = { Text(stringResource(R.string.logs)) },
-                        topTrailing = {
-                            ActionIconButton(Icons.Rounded.Menu, R.string.quick_actions) {
-                                viewModel.handleEvent(
-                                    AppEvent.SetBottomSheet(AppViewState.BottomSheet.LOGS)
-                                )
-                            }
-                        },
-                        route = Route.Logs,
-                    )
-                }
-
-                backStackEntry.isCurrentRoute(Route.Settings::class) ->
-                    NavBarState(
-                        topTitle = { Text(stringResource(R.string.settings)) },
-                        route = Route.Settings,
-                        topTrailing = {
-                            ActionIconButton(
-                                Icons.Rounded.SettingsBackupRestore,
-                                R.string.quick_actions,
-                            ) {
-                                viewModel.handleEvent(
-                                    AppEvent.SetBottomSheet(
-                                        AppViewState.BottomSheet.BACKUP_AND_RESTORE
-                                    )
-                                )
-                            }
-                        },
-                    )
-
-                backStackEntry.isCurrentRoute(Route.Appearance::class) ->
-                    NavBarState(
-                        topTitle = { Text(stringResource(R.string.appearance)) },
-                        route = Route.Appearance,
-                    )
-
-                backStackEntry.isCurrentRoute(Route.Language::class) ->
-                    NavBarState(
-                        topTitle = { Text(stringResource(R.string.language)) },
-                        route = Route.Language,
-                    )
-
-                backStackEntry.isCurrentRoute(Route.Display::class) ->
-                    NavBarState(
-                        topTitle = { Text(stringResource(R.string.display_theme)) },
-                        route = Route.Display,
-                    )
-
-                backStackEntry.isCurrentRoute(Route.TunnelMonitoring::class) ->
-                    NavBarState(
-                        topTitle = { Text(stringResource(R.string.tunnel_monitoring)) },
-                        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) ->
-                    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,
-                    )
-
-                backStackEntry.isCurrentRoute(Route.Support::class) ->
-                    NavBarState(
-                        topTitle = { Text(stringResource(R.string.support)) },
-                        route = Route.Support,
-                    )
-
-                backStackEntry.isCurrentRoute(Route.Sort::class) -> {
-                    NavBarState(
-                        showTop = true,
-                        showBottom = true,
-                        topTitle = { Text(stringResource(R.string.sort)) },
-                        topTrailing = {
-                            Row {
-                                ActionIconButton(Icons.Rounded.SortByAlpha, R.string.sort) {
-                                    viewModel.handleUiEvent(UiEvent.SortTunnels)
-                                }
-                                ActionIconButton(Icons.Rounded.Save, R.string.save) {
-                                    viewModel.handleEvent(AppEvent.InvokeScreenAction)
-                                }
-                            }
-                        },
-                        route = Route.Sort,
-                    )
-                }
-
-                backStackEntry.isCurrentRoute(Route.License::class) -> {
-                    NavBarState(
-                        showTop = true,
-                        showBottom = true,
-                        topTitle = { Text(stringResource(R.string.licenses)) },
-                        route = Route.License,
-                    )
-                }
-
-                backStackEntry.isCurrentRoute(Route.AutoTunnelAdvanced::class) ->
-                    NavBarState(
-                        showTop = true,
-                        showBottom = true,
-                        topTitle = { Text(stringResource(R.string.advanced_settings)) },
-                        route = Route.AutoTunnelAdvanced,
-                    )
-
-                backStackEntry.isCurrentRoute(Route.TunnelOptions::class) -> {
-                    val args = backStackEntry?.toRoute<Route.TunnelOptions>()
-                    val tunnel = uiState.tunnels.find { it.id == args?.id }
-
-                    NavBarState(
-                        showTop = true,
-                        showBottom = true,
-                        topTitle = { tunnel?.name?.let { Text(it) } },
-                        topTrailing = {
-                            Row {
-                                ActionIconButton(Icons.Rounded.QrCode2, R.string.show_qr) {
-                                    tunnel?.id?.let {
-                                        viewModel.handleEvent(
-                                            AppEvent.SetShowModal(AppViewState.ModalType.QR)
-                                        )
-                                    }
-                                }
-                                ActionIconButton(Icons.Rounded.Edit, R.string.edit_tunnel) {
-                                    tunnel?.id?.let { navController.navigate(Route.Config(it)) }
-                                }
-                            }
-                        },
-                        route = args?.let { Route.TunnelOptions(it.id) },
-                    )
-                }
-
-                backStackEntry.isCurrentRoute(Route.SplitTunnel::class) -> {
-                    val args = backStackEntry?.toRoute<Route.SplitTunnel>()
-                    val name = uiState.tunnels.find { it.id == args?.id }?.name
-
-                    NavBarState(
-                        showTop = true,
-                        showBottom = true,
-                        topTitle = { name?.let { Text(it) } },
-                        topTrailing = {
-                            ActionIconButton(Icons.Rounded.Save, R.string.save) {
-                                viewModel.handleEvent(AppEvent.InvokeScreenAction)
-                            }
-                        },
-                        route = args?.let { Route.SplitTunnel(it.id) },
-                    )
-                }
-
-                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)
-
-                    NavBarState(
-                        showTop = true,
-                        showBottom = true,
-                        topTitle = { Text(name) },
-                        topTrailing = {
-                            ActionIconButton(Icons.Rounded.Save, R.string.save) {
-                                viewModel.handleEvent(AppEvent.InvokeScreenAction)
-                            }
-                        },
-                        route = args?.let { Route.Config(it.id) },
-                    )
-                }
-
-                backStackEntry.isCurrentRoute(Route.TunnelAutoTunnel::class) -> {
-                    val args = backStackEntry?.toRoute<Route.TunnelAutoTunnel>()
-                    val name = uiState.tunnels.find { it.id == args?.id }?.name
-
-                    NavBarState(
-                        showTop = true,
-                        showBottom = true,
-                        topTitle = { name?.let { Text(it) } },
-                        route = args?.let { Route.TunnelAutoTunnel(it.id) },
-                    )
-                }
-
-                else -> NavBarState(showTop = false, showBottom = false)
-            }
-    }
-}

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

@@ -17,61 +17,75 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
 import com.zaneschepke.wireguardautotunnel.ui.common.SectionDivider
 import com.zaneschepke.wireguardautotunnel.ui.common.banner.WarningBanner
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.components.AdvancedSettingsItem
-import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.components.NetworkTunnelingItems
+import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.components.networkTunnelingItems
-import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.components.WifiTunnelingItems
+import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.components.wifiTunnelingItems
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.state.NavbarState
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchAppSettings
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchLocationServicesSettings
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.AutoTunnelViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
-fun AutoTunnelScreen(uiState: AppUiState, viewModel: AppViewModel) {
+fun AutoTunnelScreen(viewModel: AutoTunnelViewModel = hiltViewModel()) {
-    val navController = LocalNavController.current
     val context = LocalContext.current
+    val sharedViewModel = LocalSharedVm.current
+    val navController = LocalNavController.current
+    val autoTunnelState by viewModel.container.stateFlow.collectAsStateWithLifecycle()
+
+    if (!autoTunnelState.stateInitialized) return
+
+    LaunchedEffect(Unit) {
+        sharedViewModel.updateNavbarState(
+            NavbarState(
+                showBottomItems = true,
+                topTitle = { Text(stringResource(R.string.auto_tunnel)) },
+            )
+        )
+    }
 
-    var currentText by remember { mutableStateOf("") }
     var showLocationDialog by remember { mutableStateOf(false) }
 
     val showLocationServicesWarning by
         remember(
-            uiState.connectivityState?.wifiState,
+            autoTunnelState.connectivityState?.wifiState,
-            uiState.appSettings.trustedNetworkSSIDs,
+            autoTunnelState.generalSettings.trustedNetworkSSIDs,
-            uiState.appSettings.wifiDetectionMethod,
+            autoTunnelState.generalSettings.wifiDetectionMethod,
         ) {
             derivedStateOf {
-                uiState.connectivityState?.wifiState?.locationServicesEnabled == false &&
+                autoTunnelState.connectivityState?.wifiState?.locationServicesEnabled == false &&
-                    uiState.appSettings.wifiDetectionMethod.needsLocationPermissions() &&
+                    autoTunnelState.generalSettings.wifiDetectionMethod
-                    uiState.appSettings.trustedNetworkSSIDs.isNotEmpty()
+                        .needsLocationPermissions() &&
+                    autoTunnelState.generalSettings.trustedNetworkSSIDs.isNotEmpty()
             }
         }
 
     val showLocationPermissionsWarning by
         remember(
-            uiState.connectivityState?.wifiState,
+            autoTunnelState.connectivityState?.wifiState,
-            uiState.appSettings.trustedNetworkSSIDs,
+            autoTunnelState.generalSettings.trustedNetworkSSIDs,
-            uiState.appSettings.wifiDetectionMethod,
+            autoTunnelState.generalSettings.wifiDetectionMethod,
         ) {
             derivedStateOf {
-                uiState.connectivityState?.wifiState?.locationPermissionsGranted == false &&
+                autoTunnelState.connectivityState?.wifiState?.locationPermissionsGranted == false &&
-                    uiState.appSettings.wifiDetectionMethod.needsLocationPermissions() &&
+                    autoTunnelState.generalSettings.wifiDetectionMethod
-                    uiState.appSettings.trustedNetworkSSIDs.isNotEmpty()
+                        .needsLocationPermissions() &&
+                    autoTunnelState.generalSettings.trustedNetworkSSIDs.isNotEmpty()
             }
         }
 
-    LaunchedEffect(uiState.appSettings.trustedNetworkSSIDs) { currentText = "" }
-
     if (showLocationDialog) {
         InfoDialog(
             onAttest = {
@@ -121,8 +135,8 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AppViewModel) {
             },
         )
         val (title, buttonText, icon) =
-            remember(uiState.isAutoTunnelActive) {
+            remember(autoTunnelState.autoTunnelActive) {
-                when (uiState.isAutoTunnelActive) {
+                when (autoTunnelState.autoTunnelActive) {
                     true ->
                         Triple(
                             context.getString(R.string.auto_tunnel_running),
@@ -144,7 +158,7 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AppViewModel) {
                         leading = { Icon(icon, null) },
                         title = { Text(title) },
                         trailing = {
-                            Button({ viewModel.handleEvent(AppEvent.ToggleAutoTunnel) }) {
+                            Button({ viewModel.toggleAutoTunnel() }) {
                                 Text(
                                     buttonText,
                                     fontWeight = FontWeight.Bold,
@@ -159,16 +173,16 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AppViewModel) {
                 )
         )
         SurfaceSelectionGroupButton(
-            items = WifiTunnelingItems(uiState, viewModel, currentText) { currentText = it }
+            items = wifiTunnelingItems(autoTunnelState, viewModel, navController)
         )
         SectionDivider()
-        SurfaceSelectionGroupButton(items = NetworkTunnelingItems(uiState, viewModel))
+        SurfaceSelectionGroupButton(items = networkTunnelingItems(autoTunnelState, viewModel))
         SectionDivider()
         SurfaceSelectionGroupButton(
             items =
                 listOf(
                     AdvancedSettingsItem(
-                        onClick = { navController.navigate(Route.AutoTunnelAdvanced) }
+                        onClick = { navController.navigate(Route.AdvancedAutoTunnel) }
                     )
                 )
         )

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

@@ -12,18 +12,33 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
 import com.zaneschepke.wireguardautotunnel.ui.common.dropdown.LabelledDropdown
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.state.NavbarState
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.AutoTunnelViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @Composable
-fun AutoTunnelAdvancedScreen(appUiState: AppUiState, viewModel: AppViewModel) {
+fun AutoTunnelAdvancedScreen(viewModel: AutoTunnelViewModel) {
+    val sharedViewModel = LocalSharedVm.current
+    val autoTunnelState by viewModel.container.stateFlow.collectAsStateWithLifecycle()
+
+    LaunchedEffect(Unit) {
+        sharedViewModel.updateNavbarState(
+            NavbarState(
+                showBottomItems = true,
+                topTitle = { Text(stringResource(R.string.advanced_settings)) },
+            )
+        )
+    }
+
     Column(
         horizontalAlignment = Alignment.Start,
         verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
@@ -44,11 +59,9 @@ fun AutoTunnelAdvancedScreen(appUiState: AppUiState, viewModel: AppViewModel) {
                 )
             },
             leading = { Icon(Icons.Outlined.PauseCircle, null) },
-            onSelected = { selected ->
+            onSelected = { selected -> viewModel.setDebounceDelay(selected!!) },
-                viewModel.handleEvent(AppEvent.SetDebounceDelay(selected!!))
-            },
             options = (0..10).toList(),
-            currentValue = appUiState.appSettings.debounceDelaySeconds,
+            currentValue = autoTunnelState.generalSettings.debounceDelaySeconds,
             optionToString = { it?.toString() ?: stringResource(R.string._default) },
         )
     }

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

@@ -14,12 +14,14 @@ import androidx.compose.ui.text.style.TextOverflow
 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.ui.state.AutoTunnelUiState
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.AutoTunnelViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @Composable
-fun NetworkTunnelingItems(uiState: AppUiState, viewModel: AppViewModel): List<SelectionItem> {
+fun networkTunnelingItems(
+    autoTunnelState: AutoTunnelUiState,
+    viewModel: AutoTunnelViewModel,
+): List<SelectionItem> {
     return listOf(
         SelectionItem(
             leading = { Icon(Icons.Outlined.SignalCellular4Bar, contentDescription = null) },
@@ -34,15 +36,15 @@ fun NetworkTunnelingItems(uiState: AppUiState, viewModel: AppViewModel): List<Se
             },
             trailing = {
                 ScaledSwitch(
-                    enabled = !uiState.appSettings.isAlwaysOnVpnEnabled,
+                    enabled = !autoTunnelState.generalSettings.isAlwaysOnVpnEnabled,
-                    checked = uiState.appSettings.isTunnelOnMobileDataEnabled,
+                    checked = autoTunnelState.generalSettings.isTunnelOnMobileDataEnabled,
-                    onClick = { viewModel.handleEvent(AppEvent.ToggleAutoTunnelOnCellular) },
+                    onClick = { viewModel.setTunnelOnCellular(it) },
                 )
             },
             description = {
                 val cellularActive =
-                    remember(uiState.connectivityState) {
+                    remember(autoTunnelState.connectivityState) {
-                        uiState.connectivityState?.cellularConnected ?: false
+                        autoTunnelState.connectivityState?.cellularConnected ?: false
                     }
                 Text(
                     text =
@@ -56,7 +58,11 @@ fun NetworkTunnelingItems(uiState: AppUiState, viewModel: AppViewModel): List<Se
                     overflow = TextOverflow.Ellipsis,
                 )
             },
-            onClick = { viewModel.handleEvent(AppEvent.ToggleAutoTunnelOnCellular) },
+            onClick = {
+                viewModel.setTunnelOnCellular(
+                    !autoTunnelState.generalSettings.isTunnelOnMobileDataEnabled
+                )
+            },
         ),
         SelectionItem(
             leading = { Icon(Icons.Outlined.SettingsEthernet, contentDescription = null) },
@@ -71,15 +77,15 @@ fun NetworkTunnelingItems(uiState: AppUiState, viewModel: AppViewModel): List<Se
             },
             trailing = {
                 ScaledSwitch(
-                    enabled = !uiState.appSettings.isAlwaysOnVpnEnabled,
+                    enabled = !autoTunnelState.generalSettings.isAlwaysOnVpnEnabled,
-                    checked = uiState.appSettings.isTunnelOnEthernetEnabled,
+                    checked = autoTunnelState.generalSettings.isTunnelOnEthernetEnabled,
-                    onClick = { viewModel.handleEvent(AppEvent.ToggleAutoTunnelOnEthernet) },
+                    onClick = { viewModel.setTunnelOnEthernet(it) },
                 )
             },
             description = {
                 val ethernetActive =
-                    remember(uiState.connectivityState) {
+                    remember(autoTunnelState.connectivityState) {
-                        uiState.connectivityState?.ethernetConnected ?: false
+                        autoTunnelState.connectivityState?.ethernetConnected ?: false
                     }
                 Text(
                     text =
@@ -93,7 +99,11 @@ fun NetworkTunnelingItems(uiState: AppUiState, viewModel: AppViewModel): List<Se
                     overflow = TextOverflow.Ellipsis,
                 )
             },
-            onClick = { viewModel.handleEvent(AppEvent.ToggleAutoTunnelOnEthernet) },
+            onClick = {
+                viewModel.setTunnelOnEthernet(
+                    !autoTunnelState.generalSettings.isTunnelOnEthernetEnabled
+                )
+            },
         ),
         SelectionItem(
             leading = { Icon(Icons.Outlined.PublicOff, contentDescription = null) },
@@ -115,11 +125,15 @@ fun NetworkTunnelingItems(uiState: AppUiState, viewModel: AppViewModel): List<Se
             },
             trailing = {
                 ScaledSwitch(
-                    checked = uiState.appSettings.isStopOnNoInternetEnabled,
+                    checked = autoTunnelState.generalSettings.isStopOnNoInternetEnabled,
-                    onClick = { viewModel.handleEvent(AppEvent.ToggleStopTunnelOnNoInternet) },
+                    onClick = { viewModel.setStopOnNoInternetEnabled(it) },
+                )
+            },
+            onClick = {
+                viewModel.setStopOnNoInternetEnabled(
+                    !autoTunnelState.generalSettings.isStopOnNoInternetEnabled
                 )
             },
-            onClick = { viewModel.handleEvent(AppEvent.ToggleStopTunnelOnNoInternet) },
         ),
     )
 }

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

@@ -20,14 +20,14 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ClickableIconButton
 import com.zaneschepke.wireguardautotunnel.ui.common.textbox.CustomTextField
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun TrustedNetworkTextBox(
-    trustedNetworks: List<String>,
+    trustedNetworks: Set<String>,
     onDelete: (ssid: String) -> Unit,
     currentText: String,
     onSave: (ssid: String) -> Unit,

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

@@ -3,46 +3,48 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.components
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
+import androidx.compose.material.icons.outlined.Filter1
+import androidx.compose.material.icons.outlined.Security
+import androidx.compose.material.icons.outlined.Wifi
+import androidx.compose.material.icons.outlined.WifiFind
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.*
-import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
-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.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
 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.common.functions.rememberClipboardHelper
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.LearnMoreLinkLabel
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.state.AutoTunnelUiState
 import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
 import com.zaneschepke.wireguardautotunnel.util.extensions.asTitleString
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.AutoTunnelViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @Composable
-fun WifiTunnelingItems(
+fun wifiTunnelingItems(
-    uiState: AppUiState,
+    autoTunnelState: AutoTunnelUiState,
-    viewModel: AppViewModel,
+    viewModel: AutoTunnelViewModel,
-    currentText: String,
+    navController: NavController,
-    onTextChange: (String) -> Unit,
 ): List<SelectionItem> {
     val context = LocalContext.current
-    val navController = LocalNavController.current
     val clipboardHelper = rememberClipboardHelper()
 
+    var currentText by rememberSaveable { mutableStateOf("") }
+
+    LaunchedEffect(autoTunnelState.generalSettings.trustedNetworkSSIDs) { currentText = "" }
+
     val baseItems =
         listOf(
             SelectionItem(
@@ -58,16 +60,16 @@ fun WifiTunnelingItems(
                 },
                 trailing = {
                     ScaledSwitch(
-                        enabled = !uiState.appSettings.isAlwaysOnVpnEnabled,
+                        enabled = !autoTunnelState.generalSettings.isAlwaysOnVpnEnabled,
-                        checked = uiState.appSettings.isTunnelOnWifiEnabled,
+                        checked = autoTunnelState.generalSettings.isTunnelOnWifiEnabled,
-                        onClick = { viewModel.handleEvent(AppEvent.ToggleAutoTunnelOnWifi) },
+                        onClick = { viewModel.setAutoTunnelOnWifiEnabled(it) },
                     )
                 },
                 description = {
                     val wifiInfo by
-                        remember(uiState.connectivityState) {
+                        remember(autoTunnelState.connectivityState) {
                             derivedStateOf {
-                                uiState.connectivityState
+                                autoTunnelState.connectivityState
                                     ?.wifiState
                                     ?.takeIf { it.connected }
                                     .let { Pair(it?.ssid, it?.securityType) }
@@ -101,11 +103,15 @@ fun WifiTunnelingItems(
                         }
                     }
                 },
-                onClick = { viewModel.handleEvent(AppEvent.ToggleAutoTunnelOnWifi) },
+                onClick = {
+                    viewModel.setAutoTunnelOnWifiEnabled(
+                        !autoTunnelState.generalSettings.isTunnelOnWifiEnabled
+                    )
+                },
             )
         )
 
-    return if (uiState.appSettings.isTunnelOnWifiEnabled) {
+    return if (autoTunnelState.generalSettings.isTunnelOnWifiEnabled) {
         baseItems +
             listOf(
                 SelectionItem(
@@ -123,7 +129,9 @@ fun WifiTunnelingItems(
                         Text(
                             stringResource(
                                 R.string.current_template,
-                                uiState.appSettings.wifiDetectionMethod.asTitleString(context),
+                                autoTunnelState.generalSettings.wifiDetectionMethod.asTitleString(
+                                    context
+                                ),
                             ),
                             style =
                                 MaterialTheme.typography.bodySmall.copy(
@@ -155,11 +163,15 @@ fun WifiTunnelingItems(
                     },
                     trailing = {
                         ScaledSwitch(
-                            checked = uiState.appSettings.isWildcardsEnabled,
+                            checked = autoTunnelState.generalSettings.isWildcardsEnabled,
-                            onClick = { viewModel.handleEvent(AppEvent.ToggleAutoTunnelWildcards) },
+                            onClick = { viewModel.setWildcardsEnabled(it) },
+                        )
+                    },
+                    onClick = {
+                        viewModel.setWildcardsEnabled(
+                            !autoTunnelState.generalSettings.isWildcardsEnabled
                         )
                     },
-                    onClick = { viewModel.handleEvent(AppEvent.ToggleAutoTunnelWildcards) },
                 ),
                 SelectionItem(
                     title = {
@@ -195,41 +207,18 @@ fun WifiTunnelingItems(
                     },
                     description = {
                         TrustedNetworkTextBox(
-                            uiState.appSettings.trustedNetworkSSIDs,
+                            autoTunnelState.generalSettings.trustedNetworkSSIDs,
-                            onDelete = { viewModel.handleEvent(AppEvent.DeleteTrustedSSID(it)) },
+                            onDelete = { viewModel.removeTrustedNetworkName(it) },
                             currentText = currentText,
-                            onSave = { ssid ->
+                            onSave = { ssid -> viewModel.saveTrustedNetworkName(ssid) },
-                                viewModel.handleEvent(AppEvent.SaveTrustedSSID(ssid))
+                            onValueChange = { currentText = it },
-                            },
-                            onValueChange = onTextChange,
                             supporting = {
-                                if (uiState.appSettings.isWildcardsEnabled) WildcardsLabel()
+                                if (autoTunnelState.generalSettings.isWildcardsEnabled)
+                                    WildcardsLabel()
                             },
                         )
                     },
                 ),
-                SelectionItem(
-                    leading = { Icon(Icons.Outlined.VpnKeyOff, contentDescription = null) },
-                    title = {
-                        Text(
-                            stringResource(R.string.kill_switch_off),
-                            style =
-                                MaterialTheme.typography.bodyMedium.copy(
-                                    MaterialTheme.colorScheme.onSurface
-                                ),
-                        )
-                    },
-                    trailing = {
-                        ScaledSwitch(
-                            enabled = uiState.appSettings.isVpnKillSwitchEnabled,
-                            checked = uiState.appSettings.isDisableKillSwitchOnTrustedEnabled,
-                            onClick = {
-                                viewModel.handleEvent(AppEvent.ToggleStopKillSwitchOnTrusted)
-                            },
-                        )
-                    },
-                    onClick = { viewModel.handleEvent(AppEvent.ToggleStopKillSwitchOnTrusted) },
-                ),
             )
     } else {
         baseItems

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

@@ -4,34 +4,53 @@ 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.material3.Text
 import androidx.compose.runtime.Composable
+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
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
+import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
 import com.zaneschepke.wireguardautotunnel.ui.common.button.IconSurfaceButton
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.state.NavbarState
 import com.zaneschepke.wireguardautotunnel.util.extensions.asDescriptionString
 import com.zaneschepke.wireguardautotunnel.util.extensions.asTitleString
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.AutoTunnelViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @Composable
-fun WifiDetectionMethodScreen(uiState: AppUiState, viewModel: AppViewModel) {
+fun WifiDetectionMethodScreen(viewModel: AutoTunnelViewModel) {
     val context = LocalContext.current
+    val sharedViewModel = LocalSharedVm.current
+
+    val autoTunnelState by viewModel.container.stateFlow.collectAsStateWithLifecycle()
+
+    LaunchedEffect(Unit) {
+        sharedViewModel.updateNavbarState(
+            NavbarState(
+                topTitle = { Text(stringResource(R.string.wifi_detection_method)) },
+                showBottomItems = true,
+            )
+        )
+    }
+
     Column(
         horizontalAlignment = Alignment.Start,
         verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
         modifier = Modifier.fillMaxSize().padding(top = 24.dp).padding(horizontal = 24.dp),
     ) {
-        enumValues<AndroidNetworkMonitor.WifiDetectionMethod>().forEach {
+        enumValues<WifiDetectionMethod>().forEach {
             val title = it.asTitleString(context)
             val description = it.asDescriptionString(context)
             IconSurfaceButton(
                 title = title,
-                onClick = { viewModel.handleEvent(AppEvent.SetDetectionMethod(it)) },
+                onClick = { sharedViewModel.setWifiDetectionMethod(it) },
-                selected = uiState.appSettings.wifiDetectionMethod == it,
+                selected = autoTunnelState.generalSettings.wifiDetectionMethod == it,
                 description = description,
             )
         }

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

@@ -9,17 +9,23 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.ui.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.components.LocationDisclosureHeader
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.components.appSettingsItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.components.skipItem
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.state.NavbarState
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+import com.zaneschepke.wireguardautotunnel.viewmodel.AutoTunnelViewModel
 
 @Composable
-fun LocationDisclosureScreen(viewModel: AppViewModel) {
+fun LocationDisclosureScreen(viewModel: AutoTunnelViewModel) {
+    val navController = LocalNavController.current
+    val sharedViewModel = LocalSharedVm.current
 
-    LaunchedEffect(Unit) { viewModel.handleEvent(AppEvent.SetLocationDisclosureShown) }
+    LaunchedEffect(Unit) { sharedViewModel.updateNavbarState(NavbarState(showBottomItems = true)) }
+
+    LaunchedEffect(Unit) { viewModel.setLocationDisclosureShown() }
 
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
@@ -28,6 +34,6 @@ fun LocationDisclosureScreen(viewModel: AppViewModel) {
     ) {
         LocationDisclosureHeader()
         SurfaceSelectionGroupButton(items = listOf(appSettingsItem()))
-        SurfaceSelectionGroupButton(items = listOf(skipItem()))
+        SurfaceSelectionGroupButton(items = listOf(skipItem(navController)))
     }
 }

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

@@ -3,14 +3,14 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.com
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.LocationOn
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 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.util.extensions.launchAppSettings
 
 @Composable
@@ -20,9 +20,9 @@ fun appSettingsItem(): SelectionItem {
     return SelectionItem(
         leading = { Icon(Icons.Outlined.LocationOn, contentDescription = null) },
         title = {
-            Text(
+            SelectionItemLabel(
-                text = stringResource(R.string.launch_app_settings),
+                stringResource(R.string.launch_app_settings),
-                style = MaterialTheme.typography.bodyLarge.copy(MaterialTheme.colorScheme.onSurface),
+                labelType = SelectionLabelType.TITLE,
             )
         },
         trailing = { ForwardButton { context.launchAppSettings() } },

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

@@ -20,14 +20,14 @@ fun LocationDisclosureHeader() {
     Icon(
         imageVector = icon,
         contentDescription = icon.name,
-        modifier = Modifier.padding(30.dp).size(128.dp),
+        modifier = Modifier.padding(24.dp).size(100.dp),
     )
     Text(
         text = stringResource(R.string.prominent_background_location_title),
-        style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.Bold),
+        style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
     )
     Text(
         text = stringResource(R.string.prominent_background_location_message),
-        style = MaterialTheme.typography.bodyLarge,
+        style = MaterialTheme.typography.bodyMedium,
     )
 }

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

@@ -1,27 +1,22 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.components
 
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import androidx.navigation.NavController
 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
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItemLabel
-import com.zaneschepke.wireguardautotunnel.util.extensions.goFromRoot
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionLabelType
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
 
 @Composable
-fun skipItem(): SelectionItem {
+fun skipItem(navController: NavController): SelectionItem {
-    val navController = LocalNavController.current
     return SelectionItem(
         title = {
-            Text(
+            SelectionItemLabel(stringResource(R.string.skip), labelType = SelectionLabelType.TITLE)
-                text = stringResource(R.string.skip),
-                style = MaterialTheme.typography.bodyLarge.copy(MaterialTheme.colorScheme.onSurface),
-            )
         },
-        trailing = { ForwardButton { navController.goFromRoot(Route.AutoTunnel) } },
+        trailing = { ForwardButton { navController.navigate(Route.AutoTunnelGraph) } },
-        onClick = { navController.goFromRoot(Route.AutoTunnel) },
+        onClick = { navController.navigate(Route.AutoTunnelGraph) },
     )
 }

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

@@ -1,140 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main
-
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Text
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.journeyapps.barcodescanner.ScanContract
-import com.journeyapps.barcodescanner.ScanOptions
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
-import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberClipboardHelper
-import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberFileImportLauncherForResult
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.ExportTunnelsBottomSheet
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelImportSheet
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelList
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.UrlImportDialog
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
-import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.StringValue
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
-
-@Composable
-fun MainScreen(appUiState: AppUiState, appViewState: AppViewState, viewModel: AppViewModel) {
-    val navController = LocalNavController.current
-    val clipboard = rememberClipboardHelper()
-
-    var showUrlImportDialog by remember { mutableStateOf(false) }
-
-    val tunnelFileImportResultLauncher =
-        rememberFileImportLauncherForResult(
-            onNoFileExplorer = {
-                viewModel.handleEvent(
-                    AppEvent.ShowMessage(
-                        StringValue.StringResource(R.string.error_no_file_explorer)
-                    )
-                )
-            },
-            onData = { data -> viewModel.handleEvent(AppEvent.ImportTunnelFromFile(data)) },
-        )
-
-    val scanLauncher =
-        rememberLauncherForActivityResult(
-            contract = ScanContract(),
-            onResult = { result ->
-                if (result != null && result.contents.isNotEmpty())
-                    viewModel.handleEvent(AppEvent.ImportTunnelFromQrCode(result.contents))
-            },
-        )
-
-    val requestPermissionLauncher =
-        rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted
-            ->
-            if (!isGranted) {
-                viewModel.handleEvent(
-                    AppEvent.ShowMessage(
-                        StringValue.StringResource(R.string.camera_permission_required)
-                    )
-                )
-                return@rememberLauncherForActivityResult
-            }
-            scanLauncher.launch(
-                ScanOptions().setDesiredBarcodeFormats(ScanOptions.QR_CODE).setBeepEnabled(false)
-            )
-        }
-
-    if (appViewState.showModal == AppViewState.ModalType.DELETE) {
-        InfoDialog(
-            onDismiss = {
-                viewModel.handleEvent(AppEvent.SetShowModal(AppViewState.ModalType.NONE))
-            },
-            onAttest = {
-                viewModel.handleEvent(AppEvent.DeleteSelectedTunnels)
-                viewModel.handleEvent(AppEvent.SetShowModal(AppViewState.ModalType.NONE))
-            },
-            title = { Text(text = stringResource(R.string.delete_tunnel)) },
-            body = { Text(text = stringResource(R.string.delete_tunnel_message)) },
-            confirmText = { Text(text = stringResource(R.string.yes)) },
-        )
-    }
-
-    when (appViewState.bottomSheet) {
-        AppViewState.BottomSheet.EXPORT_TUNNELS -> {
-            ExportTunnelsBottomSheet(viewModel)
-        }
-        AppViewState.BottomSheet.IMPORT_TUNNELS -> {
-            TunnelImportSheet(
-                onDismiss = {
-                    viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
-                },
-                onFileClick = {
-                    tunnelFileImportResultLauncher.launch(Constants.ALLOWED_TV_FILE_TYPES)
-                },
-                onQrClick = {
-                    requestPermissionLauncher.launch(android.Manifest.permission.CAMERA)
-                },
-                onClipboardClick = {
-                    clipboard.paste { result ->
-                        if (result != null)
-                            viewModel.handleEvent(AppEvent.ImportTunnelFromClipboard(result))
-                    }
-                },
-                onManualImportClick = {
-                    navController.navigate(Route.Config(Constants.MANUAL_TUNNEL_CONFIG_ID))
-                },
-                onUrlClick = { showUrlImportDialog = true },
-            )
-        }
-        else -> Unit
-    }
-
-    if (showUrlImportDialog) {
-        UrlImportDialog(
-            onDismiss = { showUrlImportDialog = false },
-            onConfirm = { url ->
-                viewModel.handleEvent(AppEvent.ImportTunnelFromUrl(url))
-                showUrlImportDialog = false
-            },
-        )
-    }
-
-    TunnelList(
-        appUiState = appUiState,
-        selectedTunnels = appViewState.selectedTunnels,
-        onToggleTunnel = { tunnel, checked ->
-            if (checked) viewModel.handleEvent(AppEvent.StartTunnel(tunnel))
-            else viewModel.handleEvent(AppEvent.StopTunnel(tunnel))
-        },
-        modifier = Modifier.fillMaxSize().padding(vertical = 24.dp).padding(horizontal = 12.dp),
-        viewModel = viewModel,
-    )
-}

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

@@ -1,57 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel
-
-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.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel.components.MobileDataTunnelItem
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel.components.PingRestartItem
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel.components.WifiTunnelItem
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel.components.ethernetTunnelItem
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-
-@Composable
-fun TunnelAutoTunnelScreen(
-    tunnelConf: TunnelConf,
-    appSettings: AppSettings,
-    viewModel: AppViewModel,
-) {
-    var currentText by remember { mutableStateOf("") }
-
-    LaunchedEffect(tunnelConf.tunnelNetworks) { currentText = "" }
-
-    Column(
-        horizontalAlignment = Alignment.Start,
-        verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
-        modifier =
-            Modifier.fillMaxSize()
-                .verticalScroll(rememberScrollState())
-                .padding(vertical = 24.dp)
-                .padding(horizontal = 12.dp),
-    ) {
-        SurfaceSelectionGroupButton(
-            items =
-                buildList {
-                    if (appSettings.isPingEnabled) {
-                        add(PingRestartItem(tunnelConf, viewModel))
-                    }
-                    add(MobileDataTunnelItem(tunnelConf, viewModel))
-                    add(ethernetTunnelItem(tunnelConf, viewModel))
-                    add(
-                        WifiTunnelItem(tunnelConf, appSettings, viewModel, currentText) {
-                            currentText = it
-                        }
-                    )
-                }
-        )
-    }
-}

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

@@ -1,128 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.config
-
-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.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-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.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
-
-@Composable
-fun ConfigScreen(
-    tunnelConf: TunnelConf?,
-    appUiState: AppUiState,
-    appViewModel: AppViewModel,
-    viewModel: ConfigViewModel = hiltViewModel(),
-) {
-    val context = LocalContext.current
-    val keyboardController = LocalSoftwareKeyboardController.current
-
-    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-
-    var save by remember { mutableStateOf(false) }
-
-    val isTunnelNameTaken by
-        remember(uiState.tunnelName, appUiState.tunnels) {
-            derivedStateOf {
-                appUiState.tunnels
-                    .filter { it.id != tunnelConf?.id }
-                    .any { it.name == uiState.tunnelName }
-            }
-        }
-
-    SecureScreenFromRecording()
-
-    LaunchedEffect(Unit) {
-        // set callback for navbar to invoke save
-        appViewModel.handleEvent(
-            AppEvent.SetScreenAction {
-                keyboardController?.hide()
-                if (!isTunnelNameTaken) {
-                    save = true
-                }
-            }
-        )
-    }
-
-    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
-            }
-        }
-    }
-
-    if (uiState.showAuthPrompt) {
-        AuthorizationPrompt(
-            onSuccess = {
-                viewModel.toggleShowAuthPrompt()
-                viewModel.onAuthenticated()
-            },
-            onError = {
-                viewModel.toggleShowAuthPrompt()
-                appViewModel.handleEvent(
-                    AppEvent.ShowMessage(
-                        StringValue.StringResource(R.string.error_authentication_failed)
-                    )
-                )
-            },
-            onFailure = {
-                viewModel.toggleShowAuthPrompt()
-                appViewModel.handleEvent(
-                    AppEvent.ShowMessage(
-                        StringValue.StringResource(R.string.error_authorization_failed)
-                    )
-                )
-            },
-        )
-    }
-
-    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),
-    ) {
-        InterfaceSection(isTunnelNameTaken, uiState, viewModel)
-        PeersSection(uiState, viewModel)
-        AddPeerButton(viewModel)
-    }
-}

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

@@ -1,119 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.config
-
-import androidx.lifecycle.ViewModel
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-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 dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-
-@HiltViewModel
-class ConfigViewModel @Inject constructor() : ViewModel() {
-
-    private val _uiState = MutableStateFlow(ConfigUiState())
-    val uiState: StateFlow<ConfigUiState> = _uiState.asStateFlow()
-
-    fun initFromTunnel(tunnelConf: TunnelConf?) {
-        if (tunnelConf == null) return
-        _uiState.update {
-            val proxy = ConfigProxy.from(tunnelConf.toAmConfig())
-            it.copy(
-                tunnelName = tunnelConf.name,
-                configProxy = proxy,
-                showScripts = proxy.hasScripts(),
-                showAmneziaValues = proxy.`interface`.junkPacketCount.isNotBlank(),
-                isAuthenticated = false,
-            )
-        }
-    }
-
-    fun updateTunnelName(name: String) {
-        _uiState.update { it.copy(tunnelName = name) }
-    }
-
-    fun updateInterface(newInterface: InterfaceProxy) {
-        _uiState.update { it.copy(configProxy = it.configProxy.copy(`interface` = newInterface)) }
-    }
-
-    fun toggleAmneziaValues() {
-        _uiState.update { it.copy(showAmneziaValues = !it.showAmneziaValues) }
-    }
-
-    fun toggleScripts() {
-        _uiState.update { it.copy(showScripts = !it.showScripts) }
-    }
-
-    fun toggleAmneziaCompatibility() {
-        val (show, `interface`) =
-            with(_uiState.value.configProxy) {
-                if (`interface`.isAmneziaCompatibilityModeSet()) {
-                    Pair(false, `interface`.resetAmneziaProperties())
-                } else {
-                    Pair(true, `interface`.toAmneziaCompatibilityConfig())
-                }
-            }
-        _uiState.update {
-            it.copy(
-                showAmneziaValues = show,
-                configProxy = it.configProxy.copy(`interface` = `interface`),
-            )
-        }
-    }
-
-    fun addPeer() {
-        _uiState.update { currentState ->
-            currentState.copy(
-                configProxy =
-                    currentState.configProxy.copy(
-                        peers = currentState.configProxy.peers + PeerProxy()
-                    )
-            )
-        }
-    }
-
-    fun removePeer(index: Int) {
-        _uiState.update { currentState ->
-            currentState.copy(
-                configProxy =
-                    currentState.configProxy.copy(
-                        peers =
-                            currentState.configProxy.peers.toMutableList().apply { removeAt(index) }
-                    )
-            )
-        }
-    }
-
-    fun updatePeer(index: Int, peer: PeerProxy) {
-        _uiState.update { currentState ->
-            currentState.copy(
-                configProxy =
-                    currentState.configProxy.copy(
-                        peers =
-                            currentState.configProxy.peers.toMutableList().apply {
-                                set(index, peer)
-                            }
-                    )
-            )
-        }
-    }
-
-    fun toggleLanExclusion(index: Int) {
-        val peer = _uiState.value.configProxy.peers[index]
-        val updated = if (peer.isLanExcluded()) peer.includeLan() else peer.excludeLan()
-        updatePeer(index, updated)
-    }
-
-    fun onAuthenticated() {
-        _uiState.update { it.copy(isAuthenticated = true) }
-    }
-
-    fun toggleShowAuthPrompt() {
-        _uiState.update { it.copy(showAuthPrompt = !it.showAuthPrompt) }
-    }
-}

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

@@ -1,74 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.config.components
-
-import androidx.compose.foundation.focusGroup
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-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.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,
-) {
-    var isDropDownExpanded by remember { mutableStateOf(false) }
-    val isAmneziaCompatibilitySet =
-        remember(uiState.configProxy.`interface`) {
-            uiState.configProxy.`interface`.isAmneziaCompatibilityModeSet()
-        }
-
-    Surface(shape = RoundedCornerShape(12.dp), color = MaterialTheme.colorScheme.surface) {
-        Column(
-            verticalArrangement = Arrangement.spacedBy(12.dp),
-            modifier = Modifier.padding(horizontal = 16.dp).focusGroup(),
-        ) {
-            Row(
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier.fillMaxWidth(),
-            ) {
-                GroupLabel(stringResource(R.string.interface_))
-                InterfaceDropdown(
-                    expanded = isDropDownExpanded,
-                    onExpandedChange = { isDropDownExpanded = it },
-                    showScripts = uiState.showScripts,
-                    showAmneziaValues = uiState.showAmneziaValues,
-                    isAmneziaCompatibilitySet = isAmneziaCompatibilitySet,
-                    onToggleScripts = viewModel::toggleScripts,
-                    onToggleAmneziaValues = viewModel::toggleAmneziaValues,
-                    onToggleAmneziaCompatibility = viewModel::toggleAmneziaCompatibility,
-                )
-            }
-            ConfigurationTextBox(
-                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()),
-                modifier = Modifier.fillMaxWidth(),
-            )
-            InterfaceFields(
-                interfaceState = uiState.configProxy.`interface`,
-                showAuthPrompt = { viewModel.toggleShowAuthPrompt() },
-                showScripts = uiState.showScripts,
-                showAmneziaValues = uiState.showAmneziaValues,
-                onInterfaceChange = viewModel::updateInterface,
-                isAuthenticated = uiState.isAuthenticated,
-            )
-        }
-    }
-}

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

@@ -1,16 +0,0 @@
-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
-
-data class ConfigUiState(
-    val tunnelName: String = "",
-    val configProxy: ConfigProxy =
-        ConfigProxy(`interface` = InterfaceProxy(), peers = listOf(PeerProxy())),
-    val showAmneziaValues: Boolean = false,
-    val showScripts: Boolean = false,
-    val isAuthenticated: Boolean = true,
-    val showAuthPrompt: Boolean = false,
-    val saveChanges: Boolean = false,
-)

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

@@ -1,52 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.components.SplitTunnelContent
-import com.zaneschepke.wireguardautotunnel.util.StringValue
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
-
-@Composable
-fun SplitTunnelScreen(
-    appViewModel: AppViewModel,
-    viewModel: SplitTunnelViewModel = hiltViewModel(),
-) {
-    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-
-    LaunchedEffect(Unit) {
-        appViewModel.handleEvent(AppEvent.SetScreenAction { viewModel.saveChanges() })
-    }
-
-    LaunchedEffect(uiState.success) {
-        if (uiState.success == true) {
-            appViewModel.handleEvent(
-                AppEvent.ShowMessage(StringValue.StringResource(R.string.config_changes_saved))
-            )
-            appViewModel.handleEvent(AppEvent.PopBackStack(true))
-        }
-    }
-    if (uiState.loading) {
-        Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-            CircularProgressIndicator(modifier = Modifier.size(30.dp), strokeWidth = 5.dp)
-        }
-    } else {
-        SplitTunnelContent(
-            uiState = uiState,
-            onSplitOptionChange = viewModel::updateSplitOption,
-            onAppSelectionToggle = viewModel::toggleAppSelection,
-            onQueryChange = viewModel::onSearchQuery,
-        )
-    }
-}

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

@@ -1,180 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel
-
-import android.content.Context
-import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state.SplitOption
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state.SplitTunnelUiState
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state.TunnelApp
-import com.zaneschepke.wireguardautotunnel.ui.state.ConfigProxy
-import com.zaneschepke.wireguardautotunnel.ui.state.InterfaceProxy
-import com.zaneschepke.wireguardautotunnel.util.extensions.getAllInternetCapablePackages
-import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.qualifiers.ApplicationContext
-import java.text.Collator
-import java.util.*
-import javax.inject.Inject
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
-
-@HiltViewModel
-class SplitTunnelViewModel
-@Inject
-constructor(
-    @ApplicationContext private val context: Context,
-    private val tunnelRepository: TunnelRepository,
-    savedStateHandle: SavedStateHandle,
-) : ViewModel() {
-
-    private val _uiState = MutableStateFlow(SplitTunnelUiState())
-    val uiState: StateFlow<SplitTunnelUiState> =
-        _uiState.stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(5000L),
-            initialValue = SplitTunnelUiState(),
-        )
-
-    private val tunnelId: Int? = savedStateHandle.get<Int>(Route.SplitTunnel.KEY_ID)
-    private var allTunneledApps: List<Pair<TunnelApp, Boolean>> = emptyList()
-
-    init {
-        tunnelId?.let { loadInitialState(it) }
-    }
-
-    private fun loadInitialState(tunnelId: Int) =
-        viewModelScope.launch {
-            val tunnel = tunnelRepository.getById(tunnelId) ?: return@launch
-            val proxyInterface = InterfaceProxy.from(tunnel.toAmConfig().`interface`)
-            val splitOption =
-                when {
-                    proxyInterface.excludedApplications.isNotEmpty() -> SplitOption.EXCLUDE
-                    proxyInterface.includedApplications.isNotEmpty() -> SplitOption.INCLUDE
-                    else -> SplitOption.ALL
-                }
-
-            val packages = context.getAllInternetCapablePackages()
-
-            val installedPackages = packages.map { it.packageName }.toSet()
-
-            // Remove uninstalled apps
-            proxyInterface.includedApplications.retainAll { it in installedPackages }
-            proxyInterface.excludedApplications.retainAll { it in installedPackages }
-
-            var configProxy = ConfigProxy.from(tunnel.toAmConfig())
-            configProxy = configProxy.copy(`interface` = proxyInterface)
-            saveProxyConfig(configProxy, tunnel)
-
-            val collator = Collator.getInstance(Locale.getDefault())
-            val tunneledApps =
-                packages
-                    .filter { it.applicationInfo != null }
-                    .map { pack ->
-                        val selected =
-                            when (splitOption) {
-                                SplitOption.INCLUDE ->
-                                    proxyInterface.includedApplications.contains(pack.packageName)
-                                SplitOption.ALL -> false
-                                SplitOption.EXCLUDE ->
-                                    proxyInterface.excludedApplications.contains(pack.packageName)
-                            }
-                        Pair(
-                            TunnelApp(
-                                name =
-                                    context.packageManager
-                                        .getApplicationLabel(pack.applicationInfo!!)
-                                        .toString(),
-                                `package` = pack.packageName,
-                            ),
-                            selected,
-                        )
-                    }
-                    .sortedWith(
-                        compareByDescending<Pair<TunnelApp, Boolean>> { it.second }
-                            .thenBy(collator) { it.first.name }
-                    )
-
-            allTunneledApps = tunneledApps
-
-            _uiState.update {
-                SplitTunnelUiState(
-                    loading = false,
-                    tunnelConf = tunnel,
-                    tunneledApps = tunneledApps,
-                    queriedApps = tunneledApps,
-                    splitOption = splitOption,
-                )
-            }
-        }
-
-    fun onSearchQuery(query: String) {
-        val filteredApps =
-            if (query.isBlank()) {
-                _uiState.value.tunneledApps
-            } else {
-                _uiState.value.tunneledApps.filter {
-                    it.first.name.contains(query, ignoreCase = true) ||
-                        it.first.`package`.contains(query, ignoreCase = true)
-                }
-            }
-        _uiState.update { it.copy(searchQuery = query, queriedApps = filteredApps) }
-    }
-
-    fun updateSplitOption(newOption: SplitOption) {
-        _uiState.value = _uiState.value.copy(splitOption = newOption)
-    }
-
-    fun toggleAppSelection(packageName: String) {
-        val currentState = _uiState.value
-        val updatedApps =
-            currentState.tunneledApps.map { (app, selected) ->
-                if (app.`package` == packageName) Pair(app, !selected) else Pair(app, selected)
-            }
-        val updatedQueryApps =
-            currentState.queriedApps.map { (app, selected) ->
-                if (app.`package` == packageName) Pair(app, !selected) else Pair(app, selected)
-            }
-        _uiState.value =
-            currentState.copy(tunneledApps = updatedApps, queriedApps = updatedQueryApps)
-    }
-
-    fun saveChanges() =
-        viewModelScope.launch {
-            val state = _uiState.value
-            val tunnel = state.tunnelConf ?: return@launch
-            val configProxy = ConfigProxy.from(tunnel.toAmConfig())
-            val updatedApps = state.tunneledApps
-            with(configProxy.`interface`) {
-                includedApplications.clear()
-                excludedApplications.clear()
-                when (state.splitOption) {
-                    SplitOption.INCLUDE -> {
-                        includedApplications.addAll(
-                            updatedApps.filter { it.second }.map { it.first.`package` }
-                        )
-                    }
-                    SplitOption.EXCLUDE -> {
-                        excludedApplications.addAll(
-                            updatedApps.filter { it.second }.map { it.first.`package` }
-                        )
-                    }
-                    SplitOption.ALL -> Unit
-                }
-            }
-            saveProxyConfig(configProxy, tunnel)
-            _uiState.update { it.copy(success = true) }
-        }
-
-    private suspend fun saveProxyConfig(proxy: ConfigProxy, tunnel: TunnelConf) {
-        val (wg, am) = proxy.buildConfigs()
-        tunnelRepository.save(
-            tunnel.copyWithCallback(
-                amQuick = am.toAwgQuickString(true, false),
-                wgQuick = wg.toWgQuickString(true),
-            )
-        )
-    }
-}

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

@@ -1,50 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.components
-
-import android.content.pm.PackageManager
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.Checkbox
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import com.google.accompanist.drawablepainter.rememberDrawablePainter
-import com.zaneschepke.wireguardautotunnel.ui.common.button.SelectionItemButton
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state.TunnelApp
-import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
-
-@Composable
-fun AppListItem(appInfo: TunnelApp, isSelected: Boolean, onToggle: () -> Unit) {
-    val context = LocalContext.current
-    val icon =
-        remember(appInfo.`package`) {
-            try {
-                context.packageManager.getApplicationIcon(appInfo.`package`)
-            } catch (e: PackageManager.NameNotFoundException) {
-                null
-            }
-        }
-
-    SelectionItemButton(
-        leading = {
-            Image(
-                painter = rememberDrawablePainter(icon),
-                contentDescription = appInfo.name,
-                modifier = Modifier.padding(horizontal = 24.dp).size(iconSize),
-            )
-        },
-        buttonText = appInfo.name,
-        onClick = onToggle,
-        trailing = {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.End,
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Checkbox(checked = isSelected, onCheckedChange = { onToggle() })
-            }
-        },
-    )
-}

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

@@ -1,13 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.state
-
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-
-data class SplitTunnelUiState(
-    val loading: Boolean = true,
-    val tunnelConf: TunnelConf? = null,
-    val tunneledApps: SplitTunnelApps = emptyList(),
-    val queriedApps: SplitTunnelApps = emptyList(),
-    val splitOption: SplitOption = SplitOption.ALL,
-    val searchQuery: String = "",
-    val success: Boolean? = null,
-)

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

@@ -1,85 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions
-
-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.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-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.main.tunneloptions.components.*
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.AuthorizationPromptWrapper
-import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
-
-@Composable
-fun TunnelOptionsScreen(
-    tunnelConf: TunnelConf,
-    viewModel: AppViewModel,
-    appViewState: AppViewState,
-    appSettings: AppSettings,
-) {
-    val isTv = LocalIsAndroidTV.current
-
-    var showAuthPrompt by remember { mutableStateOf(!isTv) }
-    var isAuthorized by remember { mutableStateOf(isTv) }
-
-    if (appViewState.showModal == AppViewState.ModalType.QR) {
-
-        // Show authorization prompt if needed
-        if (showAuthPrompt) {
-            AuthorizationPromptWrapper(
-                onDismiss = {
-                    showAuthPrompt = false
-                    viewModel.handleEvent(AppEvent.SetShowModal(AppViewState.ModalType.NONE))
-                },
-                onSuccess = {
-                    showAuthPrompt = false
-                    isAuthorized = true
-                },
-                viewModel = viewModel,
-            )
-        }
-        if (isAuthorized) {
-            QrCodeDialog(
-                tunnelConf = tunnelConf,
-                onDismiss = {
-                    viewModel.handleEvent(AppEvent.SetShowModal(AppViewState.ModalType.NONE))
-                },
-            )
-        }
-    }
-
-    Column(
-        horizontalAlignment = Alignment.Start,
-        verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
-        modifier =
-            Modifier.fillMaxSize()
-                .verticalScroll(rememberScrollState())
-                .padding(top = 24.dp)
-                .padding(horizontal = 12.dp),
-    ) {
-        SurfaceSelectionGroupButton(
-            items =
-                listOf(
-                    PrimaryTunnelItem(tunnelConf, viewModel),
-                    AutoTunnelingItem(tunnelConf),
-                    serverIpv4Item(tunnelConf, viewModel),
-                    SplitTunnelingItem(tunnelConf),
-                )
-        )
-        if (appSettings.isPingEnabled) {
-            SectionDivider()
-            SurfaceSelectionGroupButton(items = listOf(pingConfigItem(tunnelConf, viewModel)))
-        }
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/pin/PinLockScreen.kt

@@ -1,28 +1,35 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.pin
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
+import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
+import com.zaneschepke.wireguardautotunnel.ui.state.NavbarState
 import com.zaneschepke.wireguardautotunnel.util.StringValue
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 import xyz.teamgravity.pin_lock_compose.PinLock
+import xyz.teamgravity.pin_lock_compose.PinManager
 
 @Composable
-fun PinLockScreen(viewModel: AppViewModel) {
+fun PinLockScreen() {
+    val sharedViewModel = LocalSharedVm.current
     val navController = LocalNavController.current
-    val isTv = LocalIsAndroidTV.current
+    val pinAlreadyExists by rememberSaveable { mutableStateOf(PinManager.pinExists()) }
+    var pinCreated by rememberSaveable { mutableStateOf(false) }
+
+    LaunchedEffect(Unit) { sharedViewModel.updateNavbarState(NavbarState(showBottomItems = false)) }
+
     PinLock(
-        title = { pinExists ->
+        title = {
             Text(
                 color = MaterialTheme.colorScheme.onSurface,
                 text =
-                    if (pinExists) {
+                    if (pinAlreadyExists || pinCreated) {
                         stringResource(id = R.string.enter_pin)
                     } else {
                         stringResource(id = R.string.create_pin)
@@ -32,29 +39,21 @@ fun PinLockScreen(viewModel: AppViewModel) {
         backgroundColor = MaterialTheme.colorScheme.surface,
         textColor = MaterialTheme.colorScheme.onSurface,
         onPinCorrect = {
-            // pin is correct, navigate or hide pin lock
+            sharedViewModel.authenticated()
-            if (isTv) {
+            navController.popBackStack()
-                navController.navigate(Route.Main)
+            navController.navigate(Route.TunnelsGraph)
-            } else {
-                val isPopped = navController.popBackStack()
-                if (!isPopped) {
-                    navController.navigate(Route.Main)
-                }
-            }
         },
         onPinIncorrect = {
-            // pin is incorrect, show error
+            sharedViewModel.showToast(StringValue.StringResource(R.string.incorrect_pin))
-            viewModel.handleEvent(
-                AppEvent.ShowMessage(StringValue.StringResource(R.string.incorrect_pin))
-            )
         },
         onPinCreated = {
-            // pin created for the first time, navigate or hide pin lock
+            pinCreated = true
-            viewModel.handleEvent(
+            sharedViewModel.showToast(StringValue.StringResource(R.string.pin_created))
-                AppEvent.ShowMessage(StringValue.StringResource(R.string.pin_created))
+            sharedViewModel.setPinLockEnabled(true)
-            )
-
-            viewModel.handleEvent(AppEvent.TogglePinLock)
         },
     )
+    BackHandler(enabled = (!pinAlreadyExists && !pinCreated)) {
+        PinManager.clearPin()
+        navController.navigate(Route.SettingsGraph)
+    }
 }

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

@@ -8,55 +8,79 @@ 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.Composable
+import androidx.compose.material.icons.Icons
-import androidx.compose.runtime.derivedStateOf
+import androidx.compose.material.icons.rounded.SettingsBackupRestore
-import androidx.compose.runtime.getValue
+import androidx.compose.material3.Text
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.ui.LocalIsAndroidTV
+import com.zaneschepke.wireguardautotunnel.ui.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
 import com.zaneschepke.wireguardautotunnel.ui.common.SectionDivider
+import com.zaneschepke.wireguardautotunnel.ui.common.button.ActionIconButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.*
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.proxy.compoents.BackendModeBottomSheet
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.proxy.compoents.AppModeBottomSheet
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.state.NavbarState
-import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
+import com.zaneschepke.wireguardautotunnel.viewmodel.SettingsViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import xyz.teamgravity.pin_lock_compose.PinManager
 
 @Composable
-fun SettingsScreen(uiState: AppUiState, appViewState: AppViewState, viewModel: AppViewModel) {
+fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel()) {
     val isTv = LocalIsAndroidTV.current
-    val focusManager = LocalFocusManager.current
+    val context = LocalContext.current
     val navController = LocalNavController.current
-
+    val focusManager = LocalFocusManager.current
+    val sharedViewModel = LocalSharedVm.current
     val interactionSource = remember { MutableInteractionSource() }
 
-    val showBackupBottomSheet by
+    val settingsState by viewModel.container.stateFlow.collectAsStateWithLifecycle()
-        remember(appViewState.bottomSheet) {
+
-            derivedStateOf {
+    if (!settingsState.stateInitialized) return
-                appViewState.bottomSheet == AppViewState.BottomSheet.BACKUP_AND_RESTORE
+
-            }
+    var showBackupSheet by rememberSaveable { mutableStateOf(false) }
-        }
+    var showAppModeSheet by rememberSaveable { mutableStateOf(false) }
-    val showBottomSheet by
+
-        remember(appViewState.bottomSheet) {
-            derivedStateOf { appViewState.bottomSheet == AppViewState.BottomSheet.BACKEND }
-        }
     val showProxySettings by
-        remember(uiState.appSettings.appMode) {
+        remember(settingsState.settings.appMode) {
             derivedStateOf {
-                when (uiState.appSettings.appMode) {
+                when (settingsState.settings.appMode) {
                     AppMode.PROXY -> true
                     else -> false
                 }
             }
         }
 
-    if (showBackupBottomSheet) BackupBottomSheet(viewModel)
+    LaunchedEffect(Unit) {
-    if (showBottomSheet) BackendModeBottomSheet(uiState.appSettings, viewModel)
+        sharedViewModel.updateNavbarState(
+            NavbarState(
+                showBottomItems = true,
+                topTitle = { Text(stringResource(R.string.settings)) },
+                topTrailing = {
+                    ActionIconButton(Icons.Rounded.SettingsBackupRestore, R.string.quick_actions) {
+                        showBackupSheet = true
+                    }
+                },
+            )
+        )
+    }
+
+    if (showBackupSheet) BackupBottomSheet() { showBackupSheet = false }
+    if (showAppModeSheet)
+        AppModeBottomSheet(sharedViewModel::setAppMode, settingsState.settings.appMode) {
+            showAppModeSheet = false
+        }
 
     Column(
         horizontalAlignment = Alignment.Start,
@@ -78,30 +102,51 @@ fun SettingsScreen(uiState: AppUiState, appViewState: AppViewState, viewModel: A
                     }
                 ),
     ) {
-        SurfaceSelectionGroupButton(buildList { add(backendModeItem(uiState, viewModel)) })
+        SurfaceSelectionGroupButton(
+            buildList {
+                add(backendModeItem(settingsState.settings.appMode) { showAppModeSheet = true })
+            }
+        )
         SectionDivider()
         SurfaceSelectionGroupButton(
             items =
                 buildList {
-                    if (uiState.appSettings.appMode == AppMode.LOCK_DOWN) {
+                    if (settingsState.settings.appMode == AppMode.LOCK_DOWN) {
-                        add(lanTrafficItem(uiState, viewModel))
+                        add(
+                            lanTrafficItem(settingsState.settings.isLanOnKillSwitchEnabled) {
+                                viewModel.setLanKillSwitchEnabled(it)
+                            }
+                        )
                     }
-                    add(tunnelMonitoringItem())
+                    add(tunnelMonitoringItem(navController))
-                    add(dnsSettingsItem())
+                    add(dnsSettingsItem(navController))
                     // TODO changing these settings won't work in certain app states
-                    if (showProxySettings) add(proxYSettingsItem())
+                    if (showProxySettings) add(proxYSettingsItem(navController))
                 }
         )
         SectionDivider()
-        SurfaceSelectionGroupButton(listOf(systemFeaturesItem()))
+        SurfaceSelectionGroupButton(listOf(systemFeaturesItem(navController)))
         SectionDivider()
         SurfaceSelectionGroupButton(
             items =
                 buildList {
-                    add(appearanceItem())
+                    add(appearanceItem(navController))
-                    add(LocalLoggingItem(uiState, viewModel))
+                    add(
-                    if (uiState.appState.isLocalLogsEnabled) add(ReadLogsItem())
+                        localLoggingItem(settingsState.isLocalLoggingEnabled) {
-                    add(PinLockItem(uiState, viewModel))
+                            viewModel.setLocalLogging(it)
+                        }
+                    )
+                    if (settingsState.isLocalLoggingEnabled) add(readLogsItem(navController))
+                    add(
+                        pinLockItem(settingsState.isPinLockEnabled) { enabled ->
+                            if (enabled) {
+                                PinManager.initialize(context)
+                                navController.navigate(Route.Lock)
+                            } else {
+                                sharedViewModel.setPinLockEnabled(false)
+                            }
+                        }
+                    )
                 }
         )
     }

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

@@ -4,27 +4,45 @@ 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.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 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.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
 import com.zaneschepke.wireguardautotunnel.ui.common.SectionDivider
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.components.DisplayThemeItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.components.LanguageItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.components.NotificationsItem
+import com.zaneschepke.wireguardautotunnel.ui.state.NavbarState
 
 @Composable
 fun AppearanceScreen() {
+    val sharedViewModel = LocalSharedVm.current
+    val navController = LocalNavController.current
+    LaunchedEffect(Unit) {
+        sharedViewModel.updateNavbarState(
+            NavbarState(
+                showBottomItems = true,
+                topTitle = { Text(stringResource(R.string.appearance)) },
+            )
+        )
+    }
+
     Column(
         horizontalAlignment = Alignment.Start,
         verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
         modifier = Modifier.fillMaxSize().padding(vertical = 24.dp).padding(horizontal = 12.dp),
     ) {
-        SurfaceSelectionGroupButton(items = listOf(LanguageItem()))
+        SurfaceSelectionGroupButton(items = listOf(LanguageItem(navController)))
         SectionDivider()
         SurfaceSelectionGroupButton(items = listOf(NotificationsItem()))
         SectionDivider()
-        SurfaceSelectionGroupButton(items = listOf(DisplayThemeItem()))
+        SurfaceSelectionGroupButton(items = listOf(DisplayThemeItem(navController)))
     }
 }

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

@@ -7,15 +7,14 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import androidx.navigation.NavController
 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
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
 
 @Composable
-fun DisplayThemeItem(): SelectionItem {
+fun DisplayThemeItem(navController: NavController): SelectionItem {
-    val navController = LocalNavController.current
     return SelectionItem(
         leading = { Icon(Icons.Outlined.Contrast, contentDescription = null) },
         title = {

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

@@ -7,15 +7,14 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import androidx.navigation.NavController
 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
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
 
 @Composable
-fun LanguageItem(): SelectionItem {
+fun LanguageItem(navController: NavController): SelectionItem {
-    val navController = LocalNavController.current
     return SelectionItem(
         leading = { Icon(Icons.Outlined.Translate, contentDescription = null) },
         title = {

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/appearance/display/DisplayScreen.kt

@@ -4,20 +4,37 @@ 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.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
 import com.zaneschepke.wireguardautotunnel.ui.common.button.IconSurfaceButton
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.state.NavbarState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @Composable
-fun DisplayScreen(appUiState: AppUiState, viewModel: AppViewModel) {
+fun DisplayScreen() {
+
+    val sharedViewModel = LocalSharedVm.current
+
+    val appState by sharedViewModel.container.stateFlow.collectAsStateWithLifecycle()
+
+    LaunchedEffect(Unit) {
+        sharedViewModel.updateNavbarState(
+            NavbarState(
+                showBottomItems = true,
+                topTitle = { Text(stringResource(R.string.display_theme)) },
+            )
+        )
+    }
+
     Column(
         horizontalAlignment = Alignment.Start,
         verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
@@ -35,8 +52,8 @@ fun DisplayScreen(appUiState: AppUiState, viewModel: AppViewModel) {
                 }
             IconSurfaceButton(
                 title = title,
-                onClick = { viewModel.handleEvent(AppEvent.SetTheme(it)) },
+                onClick = { sharedViewModel.setTheme(it) },
-                selected = appUiState.appState.theme == it,
+                selected = appState.theme == it,
             )
         }
     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/appearance/language/LanguageScreen.kt

@@ -4,25 +4,41 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language.components.AutomaticLanguageItem
+import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language.components.LanguageItem
+import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.common.button.IconSurfaceButton
+import com.zaneschepke.wireguardautotunnel.ui.state.NavbarState
 import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import java.text.Collator
 import java.util.*
 
 @Composable
-fun LanguageScreen(appUiState: AppUiState, viewModel: AppViewModel) {
+fun LanguageScreen() {
-    val collator = Collator.getInstance(Locale.getDefault())
-    val isTv = LocalIsAndroidTV.current
 
+    val sharedViewModel = LocalSharedVm.current
+    val appState by sharedViewModel.container.stateFlow.collectAsStateWithLifecycle()
+
+    LaunchedEffect(Unit) {
+        sharedViewModel.updateNavbarState(
+            NavbarState(
+                showBottomItems = true,
+                topTitle = { Text(stringResource(R.string.language)) },
+            )
+        )
+    }
+
+    val collator = Collator.getInstance(Locale.getDefault())
     val locales =
         LocaleUtil.supportedLocales.map {
             val tag = it.replace("_", "-")
@@ -34,14 +50,48 @@ fun LanguageScreen(appUiState: AppUiState, viewModel: AppViewModel) {
             locales.sortedWith(compareBy(collator) { it.getDisplayName(it) }).toList()
         }
 
+    val lazyListState = rememberLazyListState()
+
+    val selectedIndex =
+        remember(appState.locale, sortedLocales) {
+            if (appState.locale == LocaleUtil.OPTION_PHONE_LANGUAGE) 0
+            else {
+                val selectedLocale = Locale.forLanguageTag(appState.locale)
+                sortedLocales.indexOfFirst {
+                    it.toLanguageTag() == selectedLocale.toLanguageTag()
+                } + 1
+            }
+        }
+
+    LaunchedEffect(selectedIndex) {
+        if (selectedIndex >= 0) {
+            lazyListState.scrollToItem(selectedIndex)
+        }
+    }
+
     LazyColumn(
+        state = lazyListState,
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Top,
         modifier = Modifier.padding(horizontal = 12.dp),
     ) {
-        item { AutomaticLanguageItem(appUiState, viewModel, isTv) }
+        item {
+            IconSurfaceButton(
+                stringResource(R.string.automatic),
+                { sharedViewModel.setLocale(LocaleUtil.OPTION_PHONE_LANGUAGE) },
+                selected = appState.locale == LocaleUtil.OPTION_PHONE_LANGUAGE,
+            )
+        }
         items(sortedLocales, key = { it }) { locale ->
-            LanguageItem(locale, appUiState, viewModel, isTv)
+            val buttonText =
+                locale.getDisplayName(locale).replaceFirstChar {
+                    if (it.isLowerCase()) it.titlecase(locale) else it.toString()
+                }
+            IconSurfaceButton(
+                buttonText,
+                onClick = { sharedViewModel.setLocale(locale.toLanguageTag()) },
+                selected = appState.locale == locale.toLanguageTag(),
+            )
         }
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/appearance/language/components/AutomaticLanguageItem.kt

@@ -7,29 +7,24 @@ 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.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.ui.common.button.SelectionItemButton
 import com.zaneschepke.wireguardautotunnel.ui.common.label.SelectedLabel
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @Composable
-fun AutomaticLanguageItem(appUiState: AppUiState, viewModel: AppViewModel, isAndroidTv: Boolean) {
+fun automaticLanguageItem(locale: String, onChange: (locale: String) -> Unit) {
+    val isTv = LocalIsAndroidTV.current
     Box(modifier = Modifier.padding(top = 24.dp)) {
         SelectionItemButton(
             buttonText = stringResource(R.string.automatic),
-            onClick = {
+            onClick = { onChange(LocaleUtil.OPTION_PHONE_LANGUAGE) },
-                viewModel.handleEvent(AppEvent.SetLocale(LocaleUtil.OPTION_PHONE_LANGUAGE))
-            },
             trailing = {
-                with(appUiState.appState.locale) {
+                if (locale == LocaleUtil.OPTION_PHONE_LANGUAGE) {
-                    if (this == LocaleUtil.OPTION_PHONE_LANGUAGE || this == null) {
+                    SelectedLabel()
-                        SelectedLabel()
-                    }
                 }
             },
-            ripple = isAndroidTv,
+            ripple = isTv,
         )
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/appearance/language/components/LanguageItem.kt

@@ -1,20 +1,14 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language.components
 
 import androidx.compose.runtime.Composable
+import com.zaneschepke.wireguardautotunnel.ui.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.ui.common.button.SelectionItemButton
 import com.zaneschepke.wireguardautotunnel.ui.common.label.SelectedLabel
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 import java.util.*
 
 @Composable
-fun LanguageItem(
+fun languageItem(currentLocale: String, locale: Locale, onChange: (String) -> Unit) {
-    locale: Locale,
+    val isTv = LocalIsAndroidTV.current
-    appUiState: AppUiState,
-    viewModel: AppViewModel,
-    isAndroidTv: Boolean,
-) {
     SelectionItemButton(
         buttonText =
             locale.getDisplayLanguage(locale).replaceFirstChar {
@@ -27,12 +21,12 @@ fun LanguageItem(
                 } else {
                     ""
                 },
-        onClick = { viewModel.handleEvent(AppEvent.SetLocale(locale.toLanguageTag())) },
+        onClick = { onChange(locale.toLanguageTag()) },
         trailing = {
-            if (locale.toLanguageTag() == appUiState.appState.locale) {
+            if (locale.toLanguageTag() == currentLocale) {
                 SelectedLabel()
             }
         },
-        ripple = isAndroidTv,
+        ripple = isTv,
     )
 }

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

@@ -1,37 +1,26 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
 
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
 import com.zaneschepke.wireguardautotunnel.util.StringValue
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @Composable
-fun AuthorizationPromptWrapper(
+fun AuthorizationPromptWrapper(onSuccess: () -> Unit, onDismiss: () -> Unit) {
-    onSuccess: () -> Unit,
+    val sharedViewModel = LocalSharedVm.current
-    onDismiss: () -> Unit,
-    viewModel: AppViewModel,
-) {
-    val context = LocalContext.current
-
     AuthorizationPrompt(
         onSuccess = { onSuccess() },
         onError = { _ ->
             onDismiss()
-            viewModel.handleEvent(
+            sharedViewModel.showSnackMessage(
-                AppEvent.ShowMessage(
+                StringValue.StringResource(R.string.error_authentication_failed)
-                    StringValue.StringResource(R.string.error_authentication_failed)
-                )
             )
         },
         onFailure = {
             onDismiss()
-            viewModel.handleEvent(
+            sharedViewModel.showSnackMessage(
-                AppEvent.ShowMessage(
+                StringValue.StringResource(R.string.error_authorization_failed)
-                    StringValue.StringResource(R.string.error_authorization_failed)
-                )
             )
         },
     )

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

@@ -12,13 +12,10 @@ 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) {
+fun BackupBottomSheet(onDismiss: () -> Unit) {
     val context = LocalContext.current
 
     CustomBottomSheet(
@@ -27,7 +24,7 @@ fun BackupBottomSheet(viewModel: AppViewModel) {
                 ImageVector.vectorResource(R.drawable.database),
                 stringResource(R.string.backup_application),
                 onClick = {
-                    viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+                    onDismiss()
                     (context as? MainActivity)?.performBackup()
                 },
             ),
@@ -35,12 +32,12 @@ fun BackupBottomSheet(viewModel: AppViewModel) {
                 Icons.Outlined.Restore,
                 stringResource(R.string.restore_application),
                 onClick = {
-                    viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+                    onDismiss()
                     (context as? MainActivity)?.performRestore()
                 },
             ),
         )
     ) {
-        viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+        onDismiss()
     }
 }

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

@@ -10,12 +10,12 @@ 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 lanTrafficItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem {
+fun lanTrafficItem(
+    isLanKillSwitchEnabled: Boolean,
+    onClick: (enable: Boolean) -> Unit,
+): SelectionItem {
     return SelectionItem(
         leading = { Icon(Icons.Outlined.Lan, contentDescription = null) },
         title = {
@@ -31,12 +31,7 @@ fun lanTrafficItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem
                 style = MaterialTheme.typography.bodySmall.copy(MaterialTheme.colorScheme.outline),
             )
         },
-        trailing = {
+        trailing = { ScaledSwitch(checked = isLanKillSwitchEnabled, onClick = onClick) },
-            ScaledSwitch(
+        onClick = { onClick(!isLanKillSwitchEnabled) },
-                checked = uiState.appSettings.isLanOnKillSwitchEnabled,
-                onClick = { viewModel.handleEvent(AppEvent.ToggleLanOnKillSwitch) },
-            )
-        },
-        onClick = { viewModel.handleEvent(AppEvent.ToggleLanOnKillSwitch) },
     )
 }

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

@@ -10,12 +10,12 @@ import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItemLabel
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionLabelType
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @Composable
-fun LocalLoggingItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem {
+fun localLoggingItem(
+    isLocalLoggingEnabled: Boolean,
+    onClick: (checked: Boolean) -> Unit,
+): SelectionItem {
     return SelectionItem(
         leading = { Icon(Icons.Outlined.ViewHeadline, contentDescription = null) },
         title = {
@@ -27,12 +27,7 @@ fun LocalLoggingItem(uiState: AppUiState, viewModel: AppViewModel): SelectionIte
                 SelectionLabelType.DESCRIPTION,
             )
         },
-        trailing = {
+        trailing = { ScaledSwitch(checked = isLocalLoggingEnabled, onClick = onClick) },
-            ScaledSwitch(
+        onClick = { onClick(!isLocalLoggingEnabled) },
-                checked = uiState.appState.isLocalLogsEnabled,
-                onClick = { viewModel.handleEvent(AppEvent.ToggleLocalLogging) },
-            )
-        },
-        onClick = { viewModel.handleEvent(AppEvent.ToggleLocalLogging) },
     )
 }

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

@@ -6,31 +6,13 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
-import xyz.teamgravity.pin_lock_compose.PinManager
 
 @Composable
-fun PinLockItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem {
+fun pinLockItem(isPinLockEnabled: Boolean, onClick: (checked: Boolean) -> Unit): SelectionItem {
-    val navController = LocalNavController.current
-    val context = LocalContext.current
-
-    fun onPinLockToggle() {
-        if (uiState.appState.isPinLockEnabled) {
-            viewModel.handleEvent(AppEvent.TogglePinLock)
-        } else {
-            PinManager.initialize(context)
-            navController.navigate(Route.Lock)
-        }
-    }
 
     return SelectionItem(
         leading = { Icon(Icons.Outlined.Pin, contentDescription = null) },
@@ -41,12 +23,7 @@ fun PinLockItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem {
                     MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
             )
         },
-        trailing = {
+        trailing = { ScaledSwitch(checked = isPinLockEnabled, onClick = onClick) },
-            ScaledSwitch(
+        onClick = { onClick(!isPinLockEnabled) },
-                checked = uiState.appState.isPinLockEnabled,
-                onClick = { onPinLockToggle() },
-            )
-        },
-        onClick = { onPinLockToggle() },
     )
 }

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

@@ -7,15 +7,14 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import androidx.navigation.NavController
 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
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
 
 @Composable
-fun appearanceItem(): SelectionItem {
+fun appearanceItem(navController: NavController): SelectionItem {
-    val navController = LocalNavController.current
     return SelectionItem(
         leading = { Icon(Icons.AutoMirrored.Outlined.ViewQuilt, contentDescription = null) },
         title = {

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

@@ -9,17 +9,14 @@ 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.data.model.AppMode
 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 {
+fun backendModeItem(appMode: AppMode, onClick: () -> Unit): SelectionItem {
     val context = LocalContext.current
     return SelectionItem(
         leading = { Icon(ImageVector.vectorResource(R.drawable.sdk), contentDescription = null) },
@@ -31,15 +28,10 @@ fun backendModeItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem
         },
         description = {
             SelectionItemLabel(
-                stringResource(
+                stringResource(R.string.current_template, appMode.asTitleString(context)),
-                    R.string.current_template,
-                    uiState.appSettings.appMode.asTitleString(context),
-                ),
                 SelectionLabelType.DESCRIPTION,
             )
         },
-        onClick = {
+        onClick = onClick,
-            viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.BACKEND))
-        },
     )
 }

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

@@ -7,15 +7,14 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import androidx.navigation.NavController
 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
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
 
 @Composable
-fun dnsSettingsItem(): SelectionItem {
+fun dnsSettingsItem(navController: NavController): SelectionItem {
-    val navController = LocalNavController.current
     return SelectionItem(
         leading = { Icon(Icons.Outlined.Dns, null) },
         trailing = { ForwardButton { navController.navigate(Route.Dns) } },

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

@@ -7,15 +7,14 @@ 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 androidx.navigation.NavController
 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
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
 
 @Composable
-fun proxYSettingsItem(): SelectionItem {
+fun proxYSettingsItem(navController: NavController): SelectionItem {
-    val navController = LocalNavController.current
     return SelectionItem(
         leading = { Icon(ImageVector.vectorResource(R.drawable.proxy), null) },
         trailing = { ForwardButton { navController.navigate(Route.ProxySettings) } },

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

@@ -5,17 +5,16 @@ import androidx.compose.material.icons.filled.ViewTimeline
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import androidx.navigation.NavController
 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.common.button.surface.SelectionItemLabel
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionLabelType
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
 
 @Composable
-fun ReadLogsItem(): SelectionItem {
+fun readLogsItem(navController: NavController): SelectionItem {
-    val navController = LocalNavController.current
     return SelectionItem(
         leading = { Icon(Icons.Filled.ViewTimeline, contentDescription = null) },
         title = {

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

@@ -7,15 +7,14 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import androidx.navigation.NavController
 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
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
 
 @Composable
-fun systemFeaturesItem(): SelectionItem {
+fun systemFeaturesItem(navController: NavController): SelectionItem {
-    val navController = LocalNavController.current
     return SelectionItem(
         leading = { Icon(Icons.Outlined.Android, null) },
         trailing = { ForwardButton { navController.navigate(Route.SystemFeatures) } },

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

@@ -7,15 +7,14 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import androidx.navigation.NavController
 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
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
 
 @Composable
-fun tunnelMonitoringItem(): SelectionItem {
+fun tunnelMonitoringItem(navController: NavController): SelectionItem {
-    val navController = LocalNavController.current
     return SelectionItem(
         leading = { Icon(Icons.Outlined.MonitorHeart, null) },
         trailing = { ForwardButton { navController.navigate(Route.TunnelMonitoring) } },

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

@@ -14,22 +14,37 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+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
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
 import com.zaneschepke.wireguardautotunnel.data.model.DnsProvider
+import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
 import com.zaneschepke.wireguardautotunnel.ui.common.dropdown.LabelledDropdown
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.state.NavbarState
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.SettingsViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @Composable
-fun DnsSettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
+fun DnsSettingsScreen(viewModel: SettingsViewModel) {
     val context = LocalContext.current
+    val sharedViewModel = LocalSharedVm.current
+    val settingsState by viewModel.container.stateFlow.collectAsStateWithLifecycle()
+
+    LaunchedEffect(Unit) {
+        sharedViewModel.updateNavbarState(
+            NavbarState(
+                showBottomItems = true,
+                topTitle = { Text(stringResource(R.string.dns_settings)) },
+            )
+        )
+    }
+
     Column(
         horizontalAlignment = Alignment.Start,
         verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
@@ -50,14 +65,12 @@ fun DnsSettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
                 )
             },
             leading = { Icon(Icons.Outlined.Dns, contentDescription = null) },
-            currentValue = uiState.appSettings.dnsProtocol,
+            currentValue = settingsState.settings.dnsProtocol,
-            onSelected = { selected ->
+            onSelected = { selected -> selected?.let { viewModel.setDnsProtocol(it) } },
-                selected?.let { viewModel.handleEvent(AppEvent.SetDnsProtocol(it)) }
-            },
             options = DnsProtocol.entries,
             optionToString = { (it ?: DnsProtocol.SYSTEM).asString(context) },
         )
-        AnimatedVisibility(uiState.appSettings.dnsProtocol != DnsProtocol.SYSTEM) {
+        AnimatedVisibility(settingsState.settings.dnsProtocol != DnsProtocol.SYSTEM) {
             LabelledDropdown(
                 title = {
                     Text(
@@ -70,11 +83,9 @@ fun DnsSettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
                 },
                 leading = { Icon(Icons.Outlined.Cloud, contentDescription = null) },
                 currentValue =
-                    uiState.appSettings.dnsEndpoint?.let { DnsProvider.fromAddress(it) }
+                    settingsState.settings.dnsEndpoint?.let { DnsProvider.fromAddress(it) }
                         ?: DnsProvider.CLOUDFLARE,
-                onSelected = { selected ->
+                onSelected = { selected -> selected?.let { viewModel.setDnsProvider(it) } },
-                    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/logs/LogsScreen.kt

@@ -4,38 +4,61 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Menu
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
+import com.zaneschepke.wireguardautotunnel.ui.common.button.ActionIconButton
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.logs.components.LogList
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.logs.components.LogsBottomSheet
-import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
+import com.zaneschepke.wireguardautotunnel.ui.state.NavbarState
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.LoggerViewModel
 
 @Composable
-fun LogsScreen(appViewState: AppViewState, viewModel: AppViewModel) {
+fun LogsScreen(viewModel: LoggerViewModel = hiltViewModel()) {
-    val logs by viewModel.logs.collectAsStateWithLifecycle()
+    val sharedViewModel = LocalSharedVm.current
+    val loggerState by viewModel.container.stateFlow.collectAsStateWithLifecycle()
 
     val lazyColumnListState = rememberLazyListState()
-    var isAutoScrolling by remember { mutableStateOf(true) }
+    var isAutoScrolling by rememberSaveable { mutableStateOf(true) }
-    var lastScrollPosition by remember { mutableIntStateOf(0) }
+    var lastScrollPosition by rememberSaveable() { mutableIntStateOf(0) }
+    var showLogsSheet by rememberSaveable { mutableStateOf(false) }
+
+    LaunchedEffect(Unit) {
+        sharedViewModel.updateNavbarState(
+            NavbarState(
+                showBottomItems = false,
+                removeBottom = true,
+                topTitle = { Text(stringResource(R.string.logs)) },
+                topTrailing = {
+                    ActionIconButton(Icons.Rounded.Menu, R.string.quick_actions) {
+                        showLogsSheet = true
+                    }
+                },
+            )
+        )
+    }
 
     LaunchedEffect(isAutoScrolling) {
         if (isAutoScrolling) {
-            lazyColumnListState.animateScrollToItem(logs.size)
+            lazyColumnListState.animateScrollToItem(loggerState.messages.size)
         }
     }
 
-    LaunchedEffect(logs.size) {
+    LaunchedEffect(loggerState.messages.size) {
         if (isAutoScrolling) {
-            lazyColumnListState.animateScrollToItem(logs.size)
+            lazyColumnListState.animateScrollToItem(loggerState.messages.size)
         }
     }
 
@@ -58,14 +81,13 @@ fun LogsScreen(appViewState: AppViewState, viewModel: AppViewModel) {
             }
     }
 
-    when (appViewState.bottomSheet) {
+    if (showLogsSheet) {
-        AppViewState.BottomSheet.LOGS -> {
+        LogsBottomSheet({ viewModel.exportLogs() }, { viewModel.deleteLogs() }) {
-            LogsBottomSheet(viewModel)
+            showLogsSheet = false
         }
-        else -> Unit
     }
 
-    if (logs.isEmpty()) {
+    if (loggerState.messages.isEmpty()) {
         return Box(
             modifier = Modifier.fillMaxSize().padding(horizontal = 24.dp),
             contentAlignment = Alignment.Center,
@@ -80,7 +102,7 @@ fun LogsScreen(appViewState: AppViewState, viewModel: AppViewModel) {
     }
 
     LogList(
-        logs = logs,
+        logs = loggerState.messages,
         lazyColumnListState = lazyColumnListState,
         modifier = Modifier.fillMaxSize().padding(horizontal = 24.dp),
     )

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

@@ -9,33 +9,24 @@ import androidx.compose.ui.res.stringResource
 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 LogsBottomSheet(viewModel: AppViewModel) {
+fun LogsBottomSheet(onExport: () -> Unit, onDelete: () -> Unit, onDismiss: () -> Unit) {
     CustomBottomSheet(
         listOf(
             SheetOption(
                 Icons.Outlined.FolderZip,
                 stringResource(R.string.export_logs),
-                onClick = {
+                onClick = onExport,
-                    viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
-                    viewModel.handleEvent(AppEvent.ExportLogs)
-                },
             ),
             SheetOption(
                 Icons.Outlined.Delete,
                 stringResource(R.string.delete_logs),
-                onClick = {
+                onClick = onDelete,
-                    viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
-                    viewModel.handleEvent(AppEvent.DeleteLogs)
-                },
             ),
         )
     ) {
-        viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+        onDismiss()
     }
 }