Automated build update

Fixes auto tunnel bug that can happen on startup
Fixes auto tunnel bug that didn't allow manual toggle override of tunnel while auto tunnel is active
Add basic foreground persistent notifications (optionally turned off via android settings)

.github/workflows/release.yml

@@ -34,28 +34,28 @@ on:
 
 jobs:
   check_commits:
+    name: Check for New Commits
     runs-on: ubuntu-latest
     outputs:
-        new_commits: ${{ steps.check_last_commit.outputs.new_commits }}
+      has_new_commits: ${{ steps.check.outputs.new_commits }}
+
     steps:
-      - name: Checkout repository
+      - name: Checkout Repository
         uses: actions/checkout@v3
         with:
-          fetch-depth: 0
+          fetch-depth: 0  # This fetches all history so we can check commits
 
-      - name: Check for new commits in the last 23 hours
-        id: check_last_commit
+      - name: Check for new commits
+        id: check
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          if git log --since="23 hours ago" --oneline | grep -q .; then
-            echo "New commits found in the last 23 hours."
-            echo "new_commits=true" >> $GITHUB_OUTPUT
-          else
-            echo "No new commits in the last 23 hours."
-            echo "new_commits=false" >> $GITHUB_OUTPUT
-          fi
+          # This script checks for commits newer than 23 hours ago
+          NEW_COMMITS=$(git rev-list --count --after="$(date -Iseconds -d '23 hours ago')" ${{ github.sha }})
+          echo "new_commits=$NEW_COMMITS" >> $GITHUB_OUTPUT
   build:
     needs: check_commits
-    if: needs.check_commits.outputs.new_commits == 'true'
+    if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
     name: Build Signed APK
     runs-on: ubuntu-latest
     env:

app/build.gradle.kts

@@ -44,6 +44,8 @@ android {
 			getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
 		}
 
+		buildConfigField("String[]", "LANGUAGES", "new String[]{ ${languageList().joinToString(separator = ", ") { "\"$it\"" }} }")
+
 		testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 		vectorDrawables { useSupportLibrary = true }
 	}
@@ -149,6 +151,7 @@ dependencies {
 	implementation(libs.androidx.compose.ui.tooling.preview)
 	implementation(libs.androidx.material3)
 	implementation(libs.androidx.appcompat)
+	implementation(libs.material)
 
 	// test
 	testImplementation(libs.junit)

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

@@ -0,0 +1,232 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 11,
+    "identityHash": "4c9418386f72dfac5d28ab96c1e5ea0b",
+    "entities": [
+      {
+        "tableName": "Settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL, `trusted_network_ssids` TEXT NOT NULL, `is_always_on_vpn_enabled` INTEGER NOT NULL, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_enabled` INTEGER NOT NULL DEFAULT false, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT false, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `is_amnezia_enabled` INTEGER NOT NULL DEFAULT false, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT false, `is_wifi_by_shell_enabled` INTEGER NOT NULL DEFAULT false)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAutoTunnelEnabled",
+            "columnName": "is_tunnel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isTunnelOnMobileDataEnabled",
+            "columnName": "is_tunnel_on_mobile_data_enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "trustedNetworkSSIDs",
+            "columnName": "trusted_network_ssids",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAlwaysOnVpnEnabled",
+            "columnName": "is_always_on_vpn_enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isTunnelOnEthernetEnabled",
+            "columnName": "is_tunnel_on_ethernet_enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShortcutsEnabled",
+            "columnName": "is_shortcuts_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isTunnelOnWifiEnabled",
+            "columnName": "is_tunnel_on_wifi_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isKernelEnabled",
+            "columnName": "is_kernel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isRestoreOnBootEnabled",
+            "columnName": "is_restore_on_boot_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isMultiTunnelEnabled",
+            "columnName": "is_multi_tunnel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isPingEnabled",
+            "columnName": "is_ping_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isAmneziaEnabled",
+            "columnName": "is_amnezia_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isWildcardsEnabled",
+            "columnName": "is_wildcards_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isWifiNameByShellEnabled",
+            "columnName": "is_wifi_by_shell_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "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, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `ping_interval` INTEGER DEFAULT null, `ping_cooldown` INTEGER DEFAULT null, `ping_ip` TEXT DEFAULT null)",
+        "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": "isPingEnabled",
+            "columnName": "is_ping_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "pingInterval",
+            "columnName": "ping_interval",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "null"
+          },
+          {
+            "fieldPath": "pingCooldown",
+            "columnName": "ping_cooldown",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "null"
+          },
+          {
+            "fieldPath": "pingIp",
+            "columnName": "ping_ip",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "null"
+          }
+        ],
+        "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`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "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, '4c9418386f72dfac5d28ab96c1e5ea0b')"
+    ]
+  }
+}

app/src/main/AndroidManifest.xml

@@ -3,13 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32"
-        tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -19,7 +12,8 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <!--foreground service exempt android 14-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"
+		tools:ignore="ProtectedPermissions" />
 
     <!--foreground service permissions-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -46,6 +40,12 @@
     <uses-feature
         android:name="android.hardware.screen.portrait"
         android:required="false" />
+	<uses-feature
+		android:name="android.hardware.gamepad"
+		android:required="false"/>
+
+	<uses-feature android:name="android.hardware.wifi"
+		android:required="false"/>
 
     <queries>
         <intent>
@@ -166,6 +166,7 @@
 		<service
 			android:name=".service.foreground.TunnelBackgroundService"
 			android:exported="false"
+			android:persistent="true"
 			android:foregroundServiceType="systemExempted"
 			android:permission="android.permission.BIND_VPN_SERVICE">
 			<intent-filter>
@@ -186,10 +187,6 @@
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
-		<receiver
-			android:name=".receiver.BackgroundActionReceiver"
-			android:enabled="true"
-			android:exported="false"/>
 		<receiver
 			android:name=".receiver.AppUpdateReceiver"
 			android:exported="false">

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

@@ -1,11 +1,14 @@
 package com.zaneschepke.wireguardautotunnel
 
 import android.app.Application
+import android.content.Context
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
 import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.wireguardautotunnel.data.datastore.LocaleStorage
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import dagger.hilt.android.HiltAndroidApp
@@ -18,6 +21,10 @@ import javax.inject.Inject
 @HiltAndroidApp
 class WireGuardAutoTunnel : Application() {
 
+	val localeStorage: LocaleStorage by lazy {
+		LocaleStorage(this)
+	}
+
 	@Inject
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
@@ -52,6 +59,10 @@ class WireGuardAutoTunnel : Application() {
 		}
 	}
 
+	override fun attachBaseContext(base: Context) {
+		super.attachBaseContext(LocaleUtil.getLocalizedContext(base, LocaleStorage(base).getPreferredLocale()))
+	}
+
 	companion object {
 		lateinit var instance: WireGuardAutoTunnel
 			private set

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

@@ -11,7 +11,7 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 
 @Database(
 	entities = [Settings::class, TunnelConfig::class],
-	version = 10,
+	version = 11,
 	autoMigrations =
 	[
 		AutoMigration(from = 1, to = 2),
@@ -36,6 +36,11 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 		AutoMigration(7, 8),
 		AutoMigration(8, 9),
 		AutoMigration(9, 10),
+		AutoMigration(
+			from = 10,
+			to = 11,
+			spec = RemoveTunnelPauseMigration::class,
+		),
 	],
 	exportSchema = true,
 )
@@ -55,3 +60,9 @@ abstract class AppDatabase : RoomDatabase() {
 	columnName = "is_battery_saver_enabled",
 )
 class RemoveLegacySettingColumnsMigration : AutoMigrationSpec
+
+@DeleteColumn(
+	tableName = "Settings",
+	columnName = "is_auto_tunnel_paused",
+)
+class RemoveTunnelPauseMigration : AutoMigrationSpec

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

@@ -21,11 +21,12 @@ class DataStoreManager(
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) {
 	companion object {
-		val LOCATION_DISCLOSURE_SHOWN = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
-		val BATTERY_OPTIMIZE_DISABLE_SHOWN = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
-		val CURRENT_SSID = stringPreferencesKey("CURRENT_SSID")
-		val IS_PIN_LOCK_ENABLED = booleanPreferencesKey("PIN_LOCK_ENABLED")
-		val IS_TUNNEL_STATS_EXPANDED = booleanPreferencesKey("TUNNEL_STATS_EXPANDED")
+		val locationDisclosureShown = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
+		val batteryDisableShown = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
+		val currentSSID = stringPreferencesKey("CURRENT_SSID")
+		val pinLockEnabled = booleanPreferencesKey("PIN_LOCK_ENABLED")
+		val tunnelStatsExpanded = booleanPreferencesKey("TUNNEL_STATS_EXPANDED")
+		val theme = stringPreferencesKey("THEME")
 	}
 
 	// preferences

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/datastore/LocalStorage.kt

@@ -0,0 +1,17 @@
+package com.zaneschepke.wireguardautotunnel.data.datastore
+
+import android.content.Context
+import android.content.SharedPreferences
+import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
+
+class LocaleStorage(context: Context) {
+	private var preferences: SharedPreferences = context.getSharedPreferences("sp", Context.MODE_PRIVATE)
+
+	fun getPreferredLocale(): String {
+		return preferences.getString("preferred_locale", LocaleUtil.OPTION_PHONE_LANGUAGE)!!
+	}
+
+	fun setPreferredLocale(localeCode: String) {
+		preferences.edit().putString("preferred_locale", localeCode).apply()
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/domain/GeneralState.kt

@@ -1,10 +1,13 @@
 package com.zaneschepke.wireguardautotunnel.data.domain
 
+import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
+
 data class GeneralState(
 	val isLocationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
 	val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
 	val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
 	val isTunnelStatsExpanded: Boolean = IS_TUNNEL_STATS_EXPANDED,
+	val theme: Theme = Theme.AUTOMATIC,
 ) {
 	companion object {
 		const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false

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

@@ -40,11 +40,6 @@ data class Settings(
 		defaultValue = "false",
 	)
 	val isMultiTunnelEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_auto_tunnel_paused",
-		defaultValue = "false",
-	)
-	val isAutoTunnelPaused: Boolean = false,
 	@ColumnInfo(
 		name = "is_ping_enabled",
 		defaultValue = "false",
@@ -55,4 +50,14 @@ data class Settings(
 		defaultValue = "false",
 	)
 	val isAmneziaEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_wildcards_enabled",
+		defaultValue = "false",
+	)
+	val isWildcardsEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_wifi_by_shell_enabled",
+		defaultValue = "false",
+	)
+	val isWifiNameByShellEnabled: Boolean = false,
 )

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

@@ -1,6 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
+import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.Flow
 
 interface AppStateRepository {
@@ -24,5 +25,9 @@ interface AppStateRepository {
 
 	suspend fun setTunnelStatsExpanded(expanded: Boolean)
 
+	suspend fun setTheme(theme: Theme)
+
+	suspend fun getTheme(): Theme
+
 	val generalStateFlow: Flow<GeneralState>
 }

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

@@ -2,6 +2,7 @@ package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
+import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import timber.log.Timber
@@ -11,47 +12,61 @@ class DataStoreAppStateRepository(
 ) :
 	AppStateRepository {
 	override suspend fun isLocationDisclosureShown(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN)
+		return dataStoreManager.getFromStore(DataStoreManager.locationDisclosureShown)
 			?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
 	}
 
 	override suspend fun setLocationDisclosureShown(shown: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN, shown)
+		dataStoreManager.saveToDataStore(DataStoreManager.locationDisclosureShown, shown)
 	}
 
 	override suspend fun isPinLockEnabled(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.IS_PIN_LOCK_ENABLED)
+		return dataStoreManager.getFromStore(DataStoreManager.pinLockEnabled)
 			?: GeneralState.PIN_LOCK_ENABLED_DEFAULT
 	}
 
 	override suspend fun setPinLockEnabled(enabled: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.IS_PIN_LOCK_ENABLED, enabled)
+		dataStoreManager.saveToDataStore(DataStoreManager.pinLockEnabled, enabled)
 	}
 
 	override suspend fun isBatteryOptimizationDisableShown(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN)
+		return dataStoreManager.getFromStore(DataStoreManager.batteryDisableShown)
 			?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
 	}
 
 	override suspend fun setBatteryOptimizationDisableShown(shown: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN, shown)
+		dataStoreManager.saveToDataStore(DataStoreManager.batteryDisableShown, shown)
 	}
 
 	override suspend fun getCurrentSsid(): String? {
-		return dataStoreManager.getFromStore(DataStoreManager.CURRENT_SSID)
+		return dataStoreManager.getFromStore(DataStoreManager.currentSSID)
 	}
 
 	override suspend fun setCurrentSsid(ssid: String) {
-		dataStoreManager.saveToDataStore(DataStoreManager.CURRENT_SSID, ssid)
+		dataStoreManager.saveToDataStore(DataStoreManager.currentSSID, ssid)
 	}
 
 	override suspend fun isTunnelStatsExpanded(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.IS_TUNNEL_STATS_EXPANDED)
+		return dataStoreManager.getFromStore(DataStoreManager.tunnelStatsExpanded)
 			?: GeneralState.IS_TUNNEL_STATS_EXPANDED
 	}
 
 	override suspend fun setTunnelStatsExpanded(expanded: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.IS_TUNNEL_STATS_EXPANDED, expanded)
+		dataStoreManager.saveToDataStore(DataStoreManager.tunnelStatsExpanded, expanded)
+	}
+
+	override suspend fun setTheme(theme: Theme) {
+		dataStoreManager.saveToDataStore(DataStoreManager.theme, theme.name)
+	}
+
+	override suspend fun getTheme(): Theme {
+		return dataStoreManager.getFromStore(DataStoreManager.theme)?.let {
+			try {
+				Theme.valueOf(it)
+			} catch (_: IllegalArgumentException) {
+				Theme.AUTOMATIC
+			}
+		} ?: Theme.AUTOMATIC
 	}
 
 	override val generalStateFlow: Flow<GeneralState> =
@@ -60,15 +75,16 @@ class DataStoreAppStateRepository(
 				try {
 					GeneralState(
 						isLocationDisclosureShown =
-						pref[DataStoreManager.LOCATION_DISCLOSURE_SHOWN]
+						pref[DataStoreManager.locationDisclosureShown]
 							?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT,
 						isBatteryOptimizationDisableShown =
-						pref[DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN]
+						pref[DataStoreManager.batteryDisableShown]
 							?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
 						isPinLockEnabled =
-						pref[DataStoreManager.IS_PIN_LOCK_ENABLED]
+						pref[DataStoreManager.pinLockEnabled]
 							?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
-						isTunnelStatsExpanded = pref[DataStoreManager.IS_TUNNEL_STATS_EXPANDED] ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
+						isTunnelStatsExpanded = pref[DataStoreManager.tunnelStatsExpanded] ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
+						theme = getTheme(),
 					)
 				} catch (e: IllegalArgumentException) {
 					Timber.e(e)

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

@@ -1,11 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.withContext
@@ -26,8 +24,6 @@ class RoomTunnelConfigRepository(
 	override suspend fun save(tunnelConfig: TunnelConfig) {
 		withContext(ioDispatcher) {
 			tunnelConfigDao.save(tunnelConfig)
-		}.also {
-			WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
 		}
 	}
 
@@ -60,8 +56,6 @@ class RoomTunnelConfigRepository(
 	override suspend fun delete(tunnelConfig: TunnelConfig) {
 		withContext(ioDispatcher) {
 			tunnelConfigDao.delete(tunnelConfig)
-		}.also {
-			WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
 		}
 	}
 

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

@@ -9,3 +9,11 @@ annotation class Kernel
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class Userspace
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class TunnelShell
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class AppShell

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

@@ -9,6 +9,7 @@ import com.wireguard.android.util.RootShell
 import com.wireguard.android.util.ToolsInstaller
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
 import dagger.Module
@@ -24,9 +25,18 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 class TunnelModule {
+
 	@Provides
 	@Singleton
-	fun provideRootShell(@ApplicationContext context: Context): RootShell {
+	@TunnelShell
+	fun provideTunnelRootShell(@ApplicationContext context: Context): RootShell {
+		return RootShell(context)
+	}
+
+	@Provides
+	@Singleton
+	@AppShell
+	fun provideAppRootShell(@ApplicationContext context: Context): RootShell {
 		return RootShell(context)
 	}
 
@@ -39,14 +49,14 @@ class TunnelModule {
 	@Provides
 	@Singleton
 	@Userspace
-	fun provideUserspaceBackend(@ApplicationContext context: Context, rootShell: RootShell): Backend {
+	fun provideUserspaceBackend(@ApplicationContext context: Context, @TunnelShell rootShell: RootShell): Backend {
 		return GoBackend(context, RootTunnelActionHandler(rootShell))
 	}
 
 	@Provides
 	@Singleton
 	@Kernel
-	fun provideKernelBackend(@ApplicationContext context: Context, rootShell: RootShell): Backend {
+	fun provideKernelBackend(@ApplicationContext context: Context, @TunnelShell rootShell: RootShell): Backend {
 		return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell), RootTunnelActionHandler(rootShell))
 	}
 
@@ -65,6 +75,7 @@ class TunnelModule {
 		tunnelConfigRepository: TunnelConfigRepository,
 		@ApplicationScope applicationScope: CoroutineScope,
 		@IoDispatcher ioDispatcher: CoroutineDispatcher,
+		serviceManager: ServiceManager,
 	): TunnelService {
 		return WireGuardTunnel(
 			amneziaBackend,
@@ -73,6 +84,13 @@ class TunnelModule {
 			appDataRepository,
 			applicationScope,
 			ioDispatcher,
+			serviceManager,
 		)
 	}
+
+	@Singleton
+	@Provides
+	fun provideServiceManager(@ApplicationContext context: Context): ServiceManager {
+		return ServiceManager.getInstance(context)
+	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/receiver/AppUpdateReceiver.kt

@@ -7,12 +7,12 @@ import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
+import javax.inject.Provider
 
 @AndroidEntryPoint
 class AppUpdateReceiver : BroadcastReceiver() {
@@ -25,7 +25,10 @@ class AppUpdateReceiver : BroadcastReceiver() {
 	lateinit var appDataRepository: AppDataRepository
 
 	@Inject
-	lateinit var tunnelService: TunnelService
+	lateinit var tunnelService: Provider<TunnelService>
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
 
 	override fun onReceive(context: Context, intent: Intent) {
 		if (intent.action != Intent.ACTION_MY_PACKAGE_REPLACED) return
@@ -33,11 +36,11 @@ class AppUpdateReceiver : BroadcastReceiver() {
 			val settings = appDataRepository.settings.getSettings()
 			if (settings.isAutoTunnelEnabled) {
 				Timber.i("Restarting services after upgrade")
-				ServiceManager.startWatcherServiceForeground(context)
+				serviceManager.startAutoTunnel(true)
 			}
-			if (!settings.isAutoTunnelEnabled || settings.isAutoTunnelPaused) {
+			if (!settings.isAutoTunnelEnabled) {
 				val tunnels = appDataRepository.tunnels.getAll().filter { it.isActive }
-				if (tunnels.isNotEmpty()) context.startTunnelBackground(tunnels.first().id)
+				if (tunnels.isNotEmpty()) tunnelService.get().startTunnel(tunnels.first(), true)
 			}
 		}
 	}

app/src/main/java/com/zaneschepke/wireguardautotunnel/receiver/BackgroundActionReceiver.kt

@@ -1,61 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class BackgroundActionReceiver : BroadcastReceiver() {
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	lateinit var tunnelConfigRepository: TunnelConfigRepository
-
-	override fun onReceive(context: Context, intent: Intent) {
-		val id = intent.getIntExtra(TUNNEL_ID_EXTRA_KEY, 0)
-		if (id == 0) return
-		when (intent.action) {
-			ACTION_CONNECT -> {
-				Timber.d("Connect actions")
-				applicationScope.launch {
-					val tunnel = tunnelConfigRepository.getById(id)
-					tunnel?.let {
-						ServiceManager.startTunnelBackgroundService(context)
-						tunnelService.get().startTunnel(it)
-					}
-				}
-			}
-			ACTION_DISCONNECT -> {
-				applicationScope.launch {
-					val tunnel = tunnelConfigRepository.getById(id)
-					tunnel?.let {
-						ServiceManager.stopTunnelBackgroundService(context)
-						tunnelService.get().stopTunnel(it)
-					}
-				}
-			}
-		}
-	}
-
-	companion object {
-		const val ACTION_CONNECT = "ACTION_CONNECT"
-		const val ACTION_DISCONNECT = "ACTION_DISCONNECT"
-		const val TUNNEL_ID_EXTRA_KEY = "tunnelId"
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/receiver/BootReceiver.kt

@@ -8,7 +8,6 @@ import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
-import com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -28,6 +27,9 @@ class BootReceiver : BroadcastReceiver() {
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
 
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
 	override fun onReceive(context: Context, intent: Intent) {
 		if (Intent.ACTION_BOOT_COMPLETED != intent.action) return
 		applicationScope.launch {
@@ -37,11 +39,11 @@ class BootReceiver : BroadcastReceiver() {
 					val tunState = tunnelService.get().vpnState.value.status
 					if (activeTunnels.isNotEmpty() && tunState != TunnelState.UP) {
 						Timber.i("Starting previously active tunnel")
-						context.startTunnelBackground(activeTunnels.first().id)
+						tunnelService.get().startTunnel(activeTunnels.first(), true)
 					}
 					if (isAutoTunnelEnabled) {
 						Timber.i("Starting watcher service from boot")
-						ServiceManager.startWatcherServiceForeground(context)
+						serviceManager.startAutoTunnel(true)
 					}
 				}
 			}

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

@@ -1,6 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.service.foreground
 
-import android.content.Context
 import android.content.Intent
 import android.net.NetworkCapabilities
 import android.os.IBinder
@@ -13,6 +12,7 @@ import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.AppShell
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.module.MainImmediateDispatcher
 import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
@@ -26,15 +26,14 @@ import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
 import com.zaneschepke.wireguardautotunnel.util.extensions.getCurrentWifiName
-import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
 import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
 import com.zaneschepke.wireguardautotunnel.util.extensions.onNotRunning
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.update
@@ -50,6 +49,7 @@ class AutoTunnelService : LifecycleService() {
 	private val foregroundId = 122
 
 	@Inject
+	@AppShell
 	lateinit var rootShell: Provider<RootShell>
 
 	@Inject
@@ -74,6 +74,9 @@ class AutoTunnelService : LifecycleService() {
 	@IoDispatcher
 	lateinit var ioDispatcher: CoroutineDispatcher
 
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
 	@Inject
 	@MainImmediateDispatcher
 	lateinit var mainImmediateDispatcher: CoroutineDispatcher
@@ -88,14 +91,11 @@ class AutoTunnelService : LifecycleService() {
 	private var pingJob: Job? = null
 	private var networkEventJob: Job? = null
 
-	@get:Synchronized @set:Synchronized
-	private var running: Boolean = false
-
 	override fun onCreate() {
 		super.onCreate()
 		lifecycleScope.launch(mainImmediateDispatcher) {
 			kotlin.runCatching {
-				launchNotification()
+				launchWatcherNotification()
 			}.onFailure {
 				Timber.e(it)
 			}
@@ -110,32 +110,14 @@ class AutoTunnelService : LifecycleService() {
 
 	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
 		Timber.d("onStartCommand executed with startId: $startId")
-		if (intent != null) {
-			val action = intent.action
-			when (action) {
-				Action.START.name,
-				Action.START_FOREGROUND.name,
-				-> startService()
-				Action.STOP.name, Action.STOP_FOREGROUND.name -> stopService()
-			}
-		}
+		serviceManager.autoTunnelService.complete(this)
 		return super.onStartCommand(intent, flags, startId)
 	}
 
-	private suspend fun launchNotification() {
-		if (appDataRepository.settings.getSettings().isAutoTunnelPaused) {
-			launchWatcherPausedNotification()
-		} else {
-			launchWatcherNotification()
-		}
-	}
-
-	private fun startService() {
-		if (running) return
-		running = true
+	fun start() {
 		kotlin.runCatching {
 			lifecycleScope.launch(mainImmediateDispatcher) {
-				launchNotification()
+				launchWatcherNotification()
 				initWakeLock()
 			}
 			startSettingsJob()
@@ -145,7 +127,7 @@ class AutoTunnelService : LifecycleService() {
 		}
 	}
 
-	private fun stopService() {
+	fun stop() {
 		wakeLock?.let {
 			if (it.isHeld) {
 				it.release()
@@ -157,10 +139,11 @@ class AutoTunnelService : LifecycleService() {
 	override fun onDestroy() {
 		cancelAndResetNetworkJobs()
 		cancelAndResetPingJob()
+		serviceManager.autoTunnelService = CompletableDeferred()
 		super.onDestroy()
 	}
 
-	private fun launchWatcherNotification(description: String = getString(R.string.watcher_notification_text_active)) {
+	private fun launchWatcherNotification(description: String = getString(R.string.monitoring_state_changes)) {
 		val notification =
 			notificationService.createNotification(
 				channelId = getString(R.string.watcher_channel_id),
@@ -176,13 +159,9 @@ class AutoTunnelService : LifecycleService() {
 		)
 	}
 
-	private fun launchWatcherPausedNotification() {
-		launchWatcherNotification(getString(R.string.watcher_notification_text_paused))
-	}
-
 	private fun initWakeLock() {
 		wakeLock =
-			(getSystemService(Context.POWER_SERVICE) as PowerManager).run {
+			(getSystemService(POWER_SERVICE) as PowerManager).run {
 				val tag = this.javaClass.name
 				newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
 					try {
@@ -230,28 +209,16 @@ class AutoTunnelService : LifecycleService() {
 				when (status) {
 					is NetworkStatus.Available -> {
 						Timber.i("Gained Mobile data connection")
-						autoTunnelStateFlow.update {
-							it.copy(
-								isMobileDataConnected = true,
-							)
-						}
+						emitMobileDataConnected(true)
 					}
 
 					is NetworkStatus.CapabilitiesChanged -> {
-						autoTunnelStateFlow.update {
-							it.copy(
-								isMobileDataConnected = true,
-							)
-						}
+						emitMobileDataConnected(true)
 						Timber.i("Mobile data capabilities changed")
 					}
 
 					is NetworkStatus.Unavailable -> {
-						autoTunnelStateFlow.update {
-							it.copy(
-								isMobileDataConnected = false,
-							)
-						}
+						emitMobileDataConnected(false)
 						Timber.i("Lost mobile data connection")
 					}
 				}
@@ -265,8 +232,7 @@ class AutoTunnelService : LifecycleService() {
 			runCatching {
 				do {
 					val vpnState = tunnelService.get().vpnState.value
-					val settings = appDataRepository.settings.getSettings()
-					if (vpnState.status == TunnelState.UP && !settings.isAutoTunnelPaused) {
+					if (vpnState.status == TunnelState.UP) {
 						if (vpnState.tunnelConfig != null) {
 							val config = TunnelConfig.configFromWgQuick(vpnState.tunnelConfig.wgQuick)
 							val results = if (vpnState.tunnelConfig.pingIp != null) {
@@ -296,17 +262,6 @@ class AutoTunnelService : LifecycleService() {
 		}
 	}
 
-	private fun onAutoTunnelPause(paused: Boolean) {
-		if (autoTunnelStateFlow.value.settings.isAutoTunnelPaused
-			!= paused
-		) {
-			when (paused) {
-				true -> launchWatcherPausedNotification()
-				false -> launchWatcherNotification()
-			}
-		}
-	}
-
 	private suspend fun watchForSettingsChanges() {
 		Timber.i("Starting settings watcher")
 		withContext(ioDispatcher) {
@@ -316,12 +271,13 @@ class AutoTunnelService : LifecycleService() {
 					old.map { it.isActive } != new.map { it.isActive }
 				},
 			) { settings, tunnels ->
+				Timber.d("Tunnels or settings changed!")
 				autoTunnelStateFlow.value.copy(
 					settings = settings,
 					tunnels = tunnels,
 				)
 			}.collect {
-				onAutoTunnelPause(it.settings.isAutoTunnelPaused)
+				Timber.d("got new settings: ${it.settings}")
 				manageJobsBySettings(it.settings)
 				autoTunnelStateFlow.emit(it)
 			}
@@ -331,7 +287,12 @@ class AutoTunnelService : LifecycleService() {
 	private suspend fun watchForVpnStateChanges() {
 		Timber.i("Starting vpn state watcher")
 		withContext(ioDispatcher) {
-			tunnelService.get().vpnState.collect { state ->
+			tunnelService.get().vpnState.distinctUntilChanged { old, new ->
+				old.tunnelConfig?.id == new.tunnelConfig?.id
+			}.collect { state ->
+				autoTunnelStateFlow.update {
+					it.copy(vpnState = state)
+				}
 				state.tunnelConfig?.let {
 					val settings = appDataRepository.settings.getSettings()
 					if (it.isPingEnabled && !settings.isPingEnabled) {
@@ -395,7 +356,7 @@ class AutoTunnelService : LifecycleService() {
 		mobileDataJob = null
 	}
 
-	private fun updateEthernet(connected: Boolean) {
+	private fun emitEthernetConnected(connected: Boolean) {
 		autoTunnelStateFlow.update {
 			it.copy(
 				isEthernetConnected = connected,
@@ -403,7 +364,7 @@ class AutoTunnelService : LifecycleService() {
 		}
 	}
 
-	private fun updateWifi(connected: Boolean) {
+	private fun emitWifiConnected(connected: Boolean) {
 		autoTunnelStateFlow.update {
 			it.copy(
 				isWifiConnected = connected,
@@ -411,6 +372,22 @@ class AutoTunnelService : LifecycleService() {
 		}
 	}
 
+	private fun emitWifiSSID(ssid: String) {
+		autoTunnelStateFlow.update {
+			it.copy(
+				currentNetworkSSID = ssid,
+			)
+		}
+	}
+
+	private fun emitMobileDataConnected(connected: Boolean) {
+		autoTunnelStateFlow.update {
+			it.copy(
+				isMobileDataConnected = connected,
+			)
+		}
+	}
+
 	private suspend fun watchForEthernetConnectivityChanges() {
 		withContext(ioDispatcher) {
 			Timber.i("Starting ethernet data watcher")
@@ -418,16 +395,16 @@ class AutoTunnelService : LifecycleService() {
 				when (status) {
 					is NetworkStatus.Available -> {
 						Timber.i("Gained Ethernet connection")
-						updateEthernet(true)
+						emitEthernetConnected(true)
 					}
 
 					is NetworkStatus.CapabilitiesChanged -> {
 						Timber.i("Ethernet capabilities changed")
-						updateEthernet(true)
+						emitEthernetConnected(true)
 					}
 
 					is NetworkStatus.Unavailable -> {
-						updateEthernet(false)
+						emitEthernetConnected(false)
 						Timber.i("Lost Ethernet connection")
 					}
 				}
@@ -442,12 +419,12 @@ class AutoTunnelService : LifecycleService() {
 				when (status) {
 					is NetworkStatus.Available -> {
 						Timber.i("Gained Wi-Fi connection")
-						updateWifi(true)
+						emitWifiConnected(true)
 					}
 
 					is NetworkStatus.CapabilitiesChanged -> {
 						Timber.i("Wifi capabilities changed")
-						updateWifi(true)
+						emitWifiConnected(true)
 						val ssid = getWifiSSID(status.networkCapabilities)
 						ssid?.let { name ->
 							if (name.contains(Constants.UNREADABLE_SSID)) {
@@ -456,16 +433,12 @@ class AutoTunnelService : LifecycleService() {
 								Timber.i("Detected valid SSID")
 							}
 							appDataRepository.appState.setCurrentSsid(name)
-							autoTunnelStateFlow.update {
-								it.copy(
-									currentNetworkSSID = name,
-								)
-							}
+							emitWifiSSID(name)
 						} ?: Timber.w("Failed to read ssid")
 					}
 
 					is NetworkStatus.Unavailable -> {
-						updateWifi(false)
+						emitWifiConnected(false)
 						Timber.i("Lost Wi-Fi connection")
 					}
 				}
@@ -475,9 +448,8 @@ class AutoTunnelService : LifecycleService() {
 
 	private suspend fun getWifiSSID(networkCapabilities: NetworkCapabilities): String? {
 		return withContext(ioDispatcher) {
-			try {
-				rootShell.get().getCurrentWifiName()
-			} catch (_: Exception) {
+			with(autoTunnelStateFlow.value.settings) {
+				if (isWifiNameByShellEnabled) return@withContext rootShell.get().getCurrentWifiName()
 				wifiService.getNetworkName(networkCapabilities)
 			}
 		}
@@ -487,100 +459,95 @@ class AutoTunnelService : LifecycleService() {
 		return appDataRepository.tunnels.findByMobileDataTunnel().firstOrNull()
 	}
 
-	private fun isTunnelDown(): Boolean {
-		return tunnelService.get().vpnState.value.status == TunnelState.DOWN
-	}
-
 	private suspend fun handleNetworkEventChanges() {
 		withContext(ioDispatcher) {
 			Timber.i("Starting network event watcher")
-			autoTunnelStateFlow.collectLatest { watcherState ->
+			autoTunnelStateFlow.collect { watcherState ->
 				val autoTunnel = "Auto-tunnel watcher"
-				if (!watcherState.settings.isAutoTunnelPaused) {
-					// delay for rapid network state changes and then collect latest
-					delay(Constants.WATCHER_COLLECTION_DELAY)
-					val activeTunnel = tunnelService.get().vpnState.value.tunnelConfig
-					val defaultTunnel = appDataRepository.getPrimaryOrFirstTunnel()
-					when {
-						watcherState.isEthernetConditionMet() -> {
-							Timber.i("$autoTunnel - tunnel on on ethernet condition met")
-							if (isTunnelDown()) {
-								defaultTunnel?.let {
+				// delay for rapid network state changes and then collect latest
+				delay(Constants.WATCHER_COLLECTION_DELAY)
+				val activeTunnel = watcherState.vpnState.tunnelConfig
+				val defaultTunnel = appDataRepository.getPrimaryOrFirstTunnel()
+				val isTunnelDown = tunnelService.get().getState() == TunnelState.DOWN
+				when {
+					watcherState.isEthernetConditionMet() -> {
+						Timber.i("$autoTunnel - tunnel on on ethernet condition met")
+						if (isTunnelDown) {
+							defaultTunnel?.let {
+								tunnelService.get().startTunnel(it)
+							}
+						}
+					}
+
+					watcherState.isMobileDataConditionMet() -> {
+						Timber.i("$autoTunnel - tunnel on mobile data condition met")
+						val mobileDataTunnel = getMobileDataTunnel()
+						val tunnel =
+							mobileDataTunnel ?: defaultTunnel
+						if (isTunnelDown || activeTunnel?.isMobileDataTunnel == false) {
+							tunnel?.let {
+								tunnelService.get().startTunnel(it)
+							}
+						}
+					}
+
+					watcherState.isTunnelOffOnMobileDataConditionMet() -> {
+						Timber.i("$autoTunnel - tunnel off on mobile data met, turning vpn off")
+						if (!isTunnelDown) {
+							activeTunnel?.let {
+								tunnelService.get().stopTunnel(it)
+							}
+						}
+					}
+
+					watcherState.isUntrustedWifiConditionMet() -> {
+						Timber.i("Untrusted wifi condition met")
+						if (activeTunnel == null || watcherState.isCurrentSSIDActiveTunnelNetwork() == false ||
+							isTunnelDown
+						) {
+							Timber.i(
+								"$autoTunnel - tunnel on ssid not associated with current tunnel condition met",
+							)
+							watcherState.getTunnelWithMatchingTunnelNetwork()?.let {
+								Timber.i("Found tunnel associated with this SSID, bringing tunnel up: ${it.name}")
+								if (isTunnelDown || activeTunnel?.id != it.id) {
 									tunnelService.get().startTunnel(it)
 								}
-							}
-						}
-
-						watcherState.isMobileDataConditionMet() -> {
-							Timber.i("$autoTunnel - tunnel on mobile data condition met")
-							val mobileDataTunnel = getMobileDataTunnel()
-							val tunnel =
-								mobileDataTunnel ?: defaultTunnel
-							if (isTunnelDown() || activeTunnel?.isMobileDataTunnel == false) {
-								tunnel?.let {
-									tunnelService.get().startTunnel(it)
-								}
-							}
-						}
-
-						watcherState.isTunnelOffOnMobileDataConditionMet() -> {
-							Timber.i("$autoTunnel - tunnel off on mobile data met, turning vpn off")
-							if (!isTunnelDown()) {
-								activeTunnel?.let {
-									tunnelService.get().stopTunnel(it)
-								}
-							}
-						}
-
-						watcherState.isUntrustedWifiConditionMet() -> {
-							Timber.i("Untrusted wifi condition met")
-							if (activeTunnel?.tunnelNetworks?.isMatchingToWildcardList(watcherState.currentNetworkSSID) == false ||
-								activeTunnel == null || isTunnelDown()
-							) {
-								Timber.i(
-									"$autoTunnel - tunnel on ssid not associated with current tunnel condition met",
-								)
-								watcherState.tunnels.firstOrNull { it.tunnelNetworks.isMatchingToWildcardList(watcherState.currentNetworkSSID) }?.let {
-									Timber.i("Found tunnel associated with this SSID, bringing tunnel up: ${it.name}")
-									if (isTunnelDown() || activeTunnel?.id != it.id) {
+							} ?: suspend {
+								Timber.i("No tunnel associated with this SSID, using defaults")
+								val default = appDataRepository.getPrimaryOrFirstTunnel()
+								if (default?.name != tunnelService.get().name || isTunnelDown) {
+									default?.let {
 										tunnelService.get().startTunnel(it)
 									}
-								} ?: suspend {
-									Timber.i("No tunnel associated with this SSID, using defaults")
-									val default = appDataRepository.getPrimaryOrFirstTunnel()
-									if (default?.name != tunnelService.get().name || isTunnelDown()) {
-										default?.let {
-											tunnelService.get().startTunnel(it)
-										}
-									}
-								}.invoke()
-							}
+								}
+							}.invoke()
 						}
+					}
 
-						watcherState.isTrustedWifiConditionMet() -> {
-							Timber.i(
-								"$autoTunnel - tunnel off on trusted wifi condition met, turning vpn off",
-							)
-							if (!isTunnelDown()) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
-						}
+					watcherState.isTrustedWifiConditionMet() -> {
+						Timber.i(
+							"$autoTunnel - tunnel off on trusted wifi condition met, turning vpn off",
+						)
+						if (!isTunnelDown) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
+					}
 
-						watcherState.isTunnelOffOnWifiConditionMet() -> {
-							Timber.i(
-								"$autoTunnel - tunnel off on wifi condition met, turning vpn off",
-							)
-							if (!isTunnelDown()) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
-						}
+					watcherState.isTunnelOffOnWifiConditionMet() -> {
+						Timber.i(
+							"$autoTunnel - tunnel off on wifi condition met, turning vpn off",
+						)
+						if (!isTunnelDown) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
+					}
+// TODO disable for this now
+// 					watcherState.isTunnelOffOnNoConnectivityMet() -> {
+// 						Timber.i(
+// 							"$autoTunnel - tunnel off on no connectivity met, turning vpn off",
+// 						)
+// 						if (!isTunnelDown) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
+// 					}
 
-						watcherState.isTunnelOffOnNoConnectivityMet() -> {
-							Timber.i(
-								"$autoTunnel - tunnel off on no connectivity met, turning vpn off",
-							)
-							if (!isTunnelDown()) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
-						}
-
-						else -> {
-							Timber.i("$autoTunnel - no condition met")
-						}
+					else -> {
+						Timber.i("$autoTunnel - no condition met")
 					}
 				}
 			}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/AutoTunnelState.kt

@@ -1,10 +1,13 @@
 package com.zaneschepke.wireguardautotunnel.service.foreground
 
 import com.zaneschepke.wireguardautotunnel.data.domain.Settings
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
 import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
 import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
 
 data class AutoTunnelState(
+	val vpnState: VpnState = VpnState(),
 	val isWifiConnected: Boolean = false,
 	val isEthernetConnected: Boolean = false,
 	val isMobileDataConnected: Boolean = false,
@@ -41,7 +44,7 @@ data class AutoTunnelState(
 		return (
 			!isEthernetConnected &&
 				isWifiConnected &&
-				!settings.trustedNetworkSSIDs.isMatchingToWildcardList(currentNetworkSSID) &&
+				!isCurrentSSIDTrusted() &&
 				settings.isTunnelOnWifiEnabled
 			)
 	}
@@ -51,7 +54,7 @@ data class AutoTunnelState(
 			!isEthernetConnected &&
 				(
 					isWifiConnected &&
-						settings.trustedNetworkSSIDs.isMatchingToWildcardList(currentNetworkSSID)
+						isCurrentSSIDTrusted()
 					)
 			)
 	}
@@ -73,4 +76,32 @@ data class AutoTunnelState(
 				!isMobileDataConnected
 			)
 	}
+
+	fun isCurrentSSIDTrusted(): Boolean {
+		return if (settings.isWildcardsEnabled) {
+			settings.trustedNetworkSSIDs.isMatchingToWildcardList(currentNetworkSSID)
+		} else {
+			settings.trustedNetworkSSIDs.contains(currentNetworkSSID)
+		}
+	}
+	fun isCurrentSSIDActiveTunnelNetwork(): Boolean {
+		val currentTunnelNetworks = vpnState.tunnelConfig?.tunnelNetworks
+		return (
+			if (settings.isWildcardsEnabled) {
+				currentTunnelNetworks?.isMatchingToWildcardList(currentNetworkSSID)
+			} else {
+				currentTunnelNetworks?.contains(currentNetworkSSID)
+			}
+			) == true
+	}
+
+	fun getTunnelWithMatchingTunnelNetwork(): TunnelConfig? {
+		return tunnels.firstOrNull {
+			if (settings.isWildcardsEnabled) {
+				it.tunnelNetworks.isMatchingToWildcardList(currentNetworkSSID)
+			} else {
+				it.tunnelNetworks.contains(currentNetworkSSID)
+			}
+		}
+	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/ServiceManager.kt

@@ -3,69 +3,83 @@ package com.zaneschepke.wireguardautotunnel.service.foreground
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import android.net.VpnService
+import com.zaneschepke.wireguardautotunnel.util.SingletonHolder
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
+import jakarta.inject.Inject
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
 import timber.log.Timber
 
-object ServiceManager {
-	private fun <T : Service> actionOnService(action: Action, context: Context, cls: Class<T>, extras: Map<String, Int>? = null) {
-		if (VpnService.prepare(context) != null) return
-		val intent =
-			Intent(context, cls).also {
-				it.action = action.name
-				extras?.forEach { (k, v) -> it.putExtra(k, v) }
-			}
-		intent.component?.javaClass
-		try {
-			when (action) {
-				Action.START_FOREGROUND, Action.STOP_FOREGROUND ->
-					context.startForegroundService(
-						intent,
-					)
+@OptIn(ExperimentalCoroutinesApi::class)
+class ServiceManager
+@Inject constructor(private val context: Context) {
 
-				Action.START, Action.STOP -> context.startService(intent)
+	private val _autoTunnelActive = MutableStateFlow(false)
+
+	val autoTunnelActive = _autoTunnelActive.asStateFlow()
+
+	var autoTunnelService = CompletableDeferred<AutoTunnelService>()
+	var backgroundService = CompletableDeferred<TunnelBackgroundService>()
+
+	companion object : SingletonHolder<ServiceManager, Context>(::ServiceManager)
+
+	private fun <T : Service> startService(cls: Class<T>, background: Boolean) {
+		runCatching {
+			val intent = Intent(context, cls)
+			if (background) {
+				context.startForegroundService(intent)
+			} else {
+				context.startService(intent)
 			}
-		} catch (e: Exception) {
-			Timber.e(e.message)
+		}.onFailure { Timber.e(it) }
+	}
+
+	suspend fun startAutoTunnel(background: Boolean) {
+		if (autoTunnelService.isCompleted) return _autoTunnelActive.update { true }
+		kotlin.runCatching {
+			startService(AutoTunnelService::class.java, background)
+			autoTunnelService.await()
+			autoTunnelService.getCompleted().start()
+			_autoTunnelActive.update { true }
+		}.onFailure {
+			Timber.e(it)
 		}
 	}
 
-	fun startWatcherServiceForeground(context: Context) {
-		actionOnService(
-			Action.START_FOREGROUND,
-			context,
-			AutoTunnelService::class.java,
-		)
+	suspend fun startBackgroundService() {
+		if (backgroundService.isCompleted) return
+		kotlin.runCatching {
+			startService(TunnelBackgroundService::class.java, true)
+			backgroundService.await()
+			backgroundService.getCompleted().start()
+		}.onFailure {
+			Timber.e(it)
+		}
 	}
 
-	fun startWatcherService(context: Context) {
-		actionOnService(
-			Action.START,
-			context,
-			AutoTunnelService::class.java,
-		)
+	fun stopBackgroundService() {
+		if (!backgroundService.isCompleted) return
+		runCatching {
+			backgroundService.getCompleted().stop()
+		}.onFailure {
+			Timber.e(it)
+		}
 	}
 
-	fun stopWatcherService(context: Context) {
-		actionOnService(
-			Action.STOP,
-			context,
-			AutoTunnelService::class.java,
-		)
+	fun stopAutoTunnel() {
+		if (!autoTunnelService.isCompleted) return
+		runCatching {
+			autoTunnelService.getCompleted().stop()
+			_autoTunnelActive.update { false }
+		}.onFailure {
+			Timber.e(it)
+		}
 	}
 
-	fun startTunnelBackgroundService(context: Context) {
-		actionOnService(
-			Action.START_FOREGROUND,
-			context,
-			TunnelBackgroundService::class.java,
-		)
-	}
-
-	fun stopTunnelBackgroundService(context: Context) {
-		actionOnService(
-			Action.STOP,
-			context,
-			TunnelBackgroundService::class.java,
-		)
+	fun requestTunnelTileUpdate() {
+		context.requestTunnelTileServiceStateUpdate()
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/TunnelBackgroundService.kt

@@ -3,10 +3,13 @@ package com.zaneschepke.wireguardautotunnel.service.foreground
 import android.app.Notification
 import android.content.Intent
 import android.os.IBinder
+import androidx.core.app.ServiceCompat
 import androidx.lifecycle.LifecycleService
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.util.Constants
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CompletableDeferred
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -15,11 +18,14 @@ class TunnelBackgroundService : LifecycleService() {
 	@Inject
 	lateinit var notificationService: NotificationService
 
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
 	private val foregroundId = 123
 
 	override fun onCreate() {
 		super.onCreate()
-		startForeground(foregroundId, createNotification())
+		start()
 	}
 
 	override fun onBind(intent: Intent): IBinder? {
@@ -29,32 +35,34 @@ class TunnelBackgroundService : LifecycleService() {
 	}
 
 	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		if (intent != null) {
-			val action = intent.action
-			when (action) {
-				Action.START.name,
-				Action.START_FOREGROUND.name,
-				-> startService()
-				Action.STOP.name, Action.STOP_FOREGROUND.name -> stopService()
-			}
-		}
+		serviceManager.backgroundService.complete(this)
 		return super.onStartCommand(intent, flags, startId)
 	}
 
-	private fun startService() {
-		startForeground(foregroundId, createNotification())
+	fun start() {
+		ServiceCompat.startForeground(
+			this,
+			foregroundId,
+			createNotification(),
+			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+		)
 	}
 
-	private fun stopService() {
+	fun stop() {
 		stopForeground(STOP_FOREGROUND_REMOVE)
 		stopSelf()
 	}
 
+	override fun onDestroy() {
+		serviceManager.backgroundService = CompletableDeferred()
+		super.onDestroy()
+	}
+
 	private fun createNotification(): Notification {
 		return notificationService.createNotification(
 			getString(R.string.vpn_channel_id),
 			getString(R.string.vpn_channel_name),
-			getString(R.string.tunnel_start_text),
+			getString(R.string.tunnel_running),
 			description = "",
 		)
 	}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/shortcut/ShortcutsActivity.kt

@@ -6,9 +6,8 @@ import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.Action
 import com.zaneschepke.wireguardautotunnel.service.foreground.AutoTunnelService
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
-import com.zaneschepke.wireguardautotunnel.util.extensions.stopTunnelBackground
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -24,6 +23,9 @@ class ShortcutsActivity : ComponentActivity() {
 	@Inject
 	lateinit var tunnelService: Provider<TunnelService>
 
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
 	@Inject
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
@@ -44,26 +46,16 @@ class ShortcutsActivity : ComponentActivity() {
 						Timber.d("Shortcut action on name: ${tunnelConfig?.name}")
 						tunnelConfig?.let {
 							when (intent.action) {
-								Action.START.name -> this@ShortcutsActivity.startTunnelBackground(it.id)
-								Action.STOP.name -> this@ShortcutsActivity.stopTunnelBackground(it.id)
+								Action.START.name -> tunnelService.get().startTunnel(it, true)
+								Action.STOP.name -> tunnelService.get().stopTunnel(it)
 								else -> Unit
 							}
 						}
 					}
 					AutoTunnelService::class.java.simpleName, LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
 						when (intent.action) {
-							Action.START.name ->
-								appDataRepository.settings.save(
-									settings.copy(
-										isAutoTunnelPaused = false,
-									),
-								)
-							Action.STOP.name ->
-								appDataRepository.settings.save(
-									settings.copy(
-										isAutoTunnelPaused = true,
-									),
-								)
+							Action.START.name -> serviceManager.startAutoTunnel(true)
+							Action.STOP.name -> serviceManager.stopAutoTunnel()
 						}
 					}
 				}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tile/AutoTunnelControlTile.kt

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.service.tile
 
 import android.content.Intent
-import android.os.Build
 import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
@@ -9,9 +8,9 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -23,51 +22,18 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository
 
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
 	@Inject
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
 
 	private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
 
-	/* This works around an annoying unsolved frameworks bug some people are hitting. */
-	override fun onBind(intent: Intent): IBinder? {
-		var ret: IBinder? = null
-		try {
-			ret = super.onBind(intent)
-		} catch (e: Throwable) {
-			Timber.e("Failed to bind to AutoTunnelTile")
-		}
-		return ret
-	}
-
 	override fun onCreate() {
 		super.onCreate()
 		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
-
-		applicationScope.launch {
-			appDataRepository.settings.getSettingsFlow().collect {
-				kotlin.runCatching {
-					when (it.isAutoTunnelEnabled) {
-						true -> {
-							if (it.isAutoTunnelPaused) {
-								setInactive()
-								setTileDescription(this@AutoTunnelControlTile.getString(R.string.paused))
-							} else {
-								setActive()
-								setTileDescription(this@AutoTunnelControlTile.getString(R.string.active))
-							}
-						}
-
-						false -> {
-							setTileDescription(this@AutoTunnelControlTile.getString(R.string.disabled))
-							setUnavailable()
-						}
-					}
-				}.onFailure {
-					Timber.e(it)
-				}
-			}
-		}
 	}
 
 	override fun onStopListening() {
@@ -82,26 +48,28 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
 	override fun onStartListening() {
 		super.onStartListening()
 		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+		lifecycleScope.launch {
+			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
+			updateTileState()
+		}
+	}
+
+	private fun updateTileState() {
+		serviceManager.autoTunnelActive.value.let {
+			if (it) setActive() else setInactive()
+		}
 	}
 
 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
 			lifecycleScope.launch {
-				kotlin.runCatching {
-					val settings = appDataRepository.settings.getSettings()
-					if (settings.isAutoTunnelPaused) {
-						return@launch appDataRepository.settings.save(
-							settings.copy(
-								isAutoTunnelPaused = false,
-							),
-						)
-					}
-					appDataRepository.settings.save(
-						settings.copy(
-							isAutoTunnelPaused = true,
-						),
-					)
+				if (serviceManager.autoTunnelActive.value) {
+					serviceManager.stopAutoTunnel()
+					setInactive()
+				} else {
+					serviceManager.startAutoTunnel(true)
+					setActive()
 				}
 			}
 		}
@@ -128,16 +96,15 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
 		}
 	}
 
-	private fun setTileDescription(description: String) {
-		kotlin.runCatching {
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-				qsTile.subtitle = description
-			}
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-				qsTile.stateDescription = description
-			}
-			qsTile.updateTile()
+	/* This works around an annoying unsolved frameworks bug some people are hitting. */
+	override fun onBind(intent: Intent): IBinder? {
+		var ret: IBinder? = null
+		try {
+			ret = super.onBind(intent)
+		} catch (_: Throwable) {
+			Timber.e("Failed to bind to TunnelControlTile")
 		}
+		return ret
 	}
 
 	override val lifecycle: Lifecycle

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tile/TunnelControlTile.kt

@@ -1,6 +1,8 @@
 package com.zaneschepke.wireguardautotunnel.service.tile
 
+import android.content.Intent
 import android.os.Build
+import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
 import androidx.lifecycle.Lifecycle
@@ -11,8 +13,6 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
-import com.zaneschepke.wireguardautotunnel.util.extensions.stopTunnelBackground
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -36,7 +36,6 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 
 	override fun onCreate() {
 		super.onCreate()
-		Timber.d("onCreate for tile service")
 		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
 	}
 
@@ -52,6 +51,7 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 	override fun onStartListening() {
 		super.onStartListening()
 		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+		Timber.d("Updating tile!")
 		lifecycleScope.launch {
 			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
 			updateTileState()
@@ -68,13 +68,15 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
-			Timber.d("Click")
 			lifecycleScope.launch {
-				val context = this@TunnelControlTile
 				val lastActive = appDataRepository.getStartTunnelConfig()
 				lastActive?.let { tunnel ->
-					if (tunnel.isActive) return@launch context.stopTunnelBackground(tunnel.id)
-					context.startTunnelBackground(tunnel.id)
+					if (tunnel.isActive) {
+						tunnelService.get().stopTunnel(tunnel)
+					} else {
+						tunnelService.get().startTunnel(tunnel, true)
+					}
+					updateTileState()
 				}
 			}
 		}
@@ -124,6 +126,17 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 		}
 	}
 
+	/* This works around an annoying unsolved frameworks bug some people are hitting. */
+	override fun onBind(intent: Intent): IBinder? {
+		var ret: IBinder? = null
+		try {
+			ret = super.onBind(intent)
+		} catch (_: Throwable) {
+			Timber.e("Failed to bind to TunnelControlTile")
+		}
+		return ret
+	}
+
 	override val lifecycle: Lifecycle
 		get() = lifecycleRegistry
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tunnel/TunnelService.kt

@@ -5,7 +5,7 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import kotlinx.coroutines.flow.StateFlow
 
 interface TunnelService : Tunnel, org.amnezia.awg.backend.Tunnel {
-	suspend fun startTunnel(tunnelConfig: TunnelConfig): Result<TunnelState>
+	suspend fun startTunnel(tunnelConfig: TunnelConfig, background: Boolean = false): Result<TunnelState>
 
 	suspend fun stopTunnel(tunnelConfig: TunnelConfig): Result<TunnelState>
 
@@ -18,5 +18,6 @@ interface TunnelService : Tunnel, org.amnezia.awg.backend.Tunnel {
 	suspend fun getState(): TunnelState
 
 	fun cancelStatsJob()
+
 	fun startStatsJob()
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tunnel/WireGuardTunnel.kt

@@ -8,6 +8,7 @@ import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepositor
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.module.Kernel
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.AmneziaStatistics
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.WireGuardStatistics
@@ -24,6 +25,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.amnezia.awg.backend.Tunnel
 import timber.log.Timber
+import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 import javax.inject.Provider
 
@@ -36,6 +38,7 @@ constructor(
 	private val appDataRepository: AppDataRepository,
 	@ApplicationScope private val applicationScope: CoroutineScope,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+	private val serviceManager: ServiceManager,
 ) : TunnelService {
 
 	private val _vpnState = MutableStateFlow(VpnState())
@@ -50,6 +53,8 @@ constructor(
 
 	private var statsJob: Job? = null
 
+	private val runningHandle = AtomicBoolean(false)
+
 	private suspend fun backend(): Any {
 		val settings = appDataRepository.settings.getSettings()
 		if (settings.isKernelEnabled) return kernelBackend.get()
@@ -87,9 +92,16 @@ constructor(
 		}
 	}
 
-	override suspend fun startTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
+	override suspend fun startTunnel(tunnelConfig: TunnelConfig, background: Boolean): Result<TunnelState> {
 		return withContext(ioDispatcher) {
+			if (runningHandle.get() == true && tunnelConfig == vpnState.value.tunnelConfig) {
+				Timber.w("Tunnel already running")
+				return@withContext Result.success(vpnState.value.status)
+			}
+			runningHandle.set(true)
 			onBeforeStart(tunnelConfig)
+			val settings = appDataRepository.settings.getSettings()
+			if (background || settings.isKernelEnabled) startBackgroundService()
 			setState(tunnelConfig, TunnelState.UP).onSuccess {
 				emitTunnelState(it)
 			}.onFailure {
@@ -107,6 +119,9 @@ constructor(
 			}.onFailure {
 				Timber.e(it)
 				onStopFailed()
+			}.also {
+				stopBackgroundService()
+				runningHandle.set(false)
 			}
 		}
 	}
@@ -141,20 +156,39 @@ constructor(
 		}
 		cancelStatsJob()
 		resetBackendStatistics()
+		runningHandle.set(false)
+	}
+
+	private suspend fun shutDownActiveTunnel(config: TunnelConfig) {
+		with(_vpnState.value) {
+			if (status == TunnelState.UP && tunnelConfig != config) {
+				tunnelConfig?.let { stopTunnel(it) }
+			}
+		}
+	}
+
+	private suspend fun startBackgroundService() {
+		serviceManager.startBackgroundService()
+		serviceManager.requestTunnelTileUpdate()
+	}
+
+	private fun stopBackgroundService() {
+		serviceManager.stopBackgroundService()
+		serviceManager.requestTunnelTileUpdate()
 	}
 
 	private suspend fun onBeforeStart(tunnelConfig: TunnelConfig) {
-		if (_vpnState.value.status == TunnelState.UP) vpnState.value.tunnelConfig?.let { stopTunnel(it) }
-		resetBackendStatistics()
+		shutDownActiveTunnel(tunnelConfig)
 		appDataRepository.tunnels.save(tunnelConfig.copy(isActive = true))
 		emitVpnStateConfig(tunnelConfig)
+		resetBackendStatistics()
 		startStatsJob()
 	}
 
 	private suspend fun onBeforeStop(tunnelConfig: TunnelConfig) {
+		appDataRepository.tunnels.save(tunnelConfig.copy(isActive = false))
 		cancelStatsJob()
 		resetBackendStatistics()
-		appDataRepository.tunnels.save(tunnelConfig.copy(isActive = false))
 	}
 
 	private fun emitTunnelState(state: TunnelState) {

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

@@ -10,4 +10,5 @@ data class AppUiState(
 	val tunnels: List<TunnelConfig> = emptyList(),
 	val vpnState: VpnState = VpnState(),
 	val generalState: GeneralState = GeneralState(),
+	val autoTunnelActive: Boolean = false,
 )

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

@@ -9,7 +9,6 @@ import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -33,34 +32,34 @@ constructor(
 	private val appDataRepository: AppDataRepository,
 	private val tunnelService: Provider<TunnelService>,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+	private val serviceManager: ServiceManager,
 ) : ViewModel() {
 
-	private val _appUiState = MutableStateFlow(AppUiState())
-
 	val uiState =
 		combine(
 			appDataRepository.settings.getSettingsFlow(),
 			appDataRepository.tunnels.getTunnelConfigsFlow(),
 			tunnelService.get().vpnState,
 			appDataRepository.appState.generalStateFlow,
-		) { settings, tunnels, tunnelState, generalState ->
+			serviceManager.autoTunnelActive,
+		) { settings, tunnels, tunnelState, generalState, autoTunnel ->
 			AppUiState(
 				settings,
 				tunnels,
 				tunnelState,
 				generalState,
+				autoTunnel,
 			)
 		}.stateIn(
 			viewModelScope + ioDispatcher,
 			SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
-			_appUiState.value,
+			AppUiState(),
 		)
 
 	private val _isAppReady = MutableStateFlow<Boolean>(false)
 	val isAppReady = _isAppReady.asStateFlow()
 
 	init {
-
 		viewModelScope.launch {
 			initPin()
 			initAutoTunnel()
@@ -93,15 +92,7 @@ constructor(
 
 	private suspend fun initAutoTunnel() {
 		val settings = appDataRepository.settings.getSettings()
-		if (settings.isAutoTunnelEnabled) ServiceManager.startWatcherService(WireGuardAutoTunnel.instance)
-	}
-
-	fun setTunnels(tunnels: TunnelConfigs) = viewModelScope.launch(ioDispatcher) {
-		_appUiState.emit(
-			_appUiState.value.copy(
-				tunnels = tunnels,
-			),
-		)
+		if (settings.isAutoTunnelEnabled) serviceManager.startAutoTunnel(false)
 	}
 
 	fun onPinLockDisabled() = viewModelScope.launch(ioDispatcher) {
@@ -112,4 +103,8 @@ constructor(
 	fun onPinLockEnabled() = viewModelScope.launch {
 		appDataRepository.appState.setPinLockEnabled(true)
 	}
+
+	fun setLocationDisclosureShown() = viewModelScope.launch {
+		appDataRepository.appState.setLocationDisclosureShown(true)
+	}
 }

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

@@ -1,16 +1,15 @@
 package com.zaneschepke.wireguardautotunnel.ui
 
+import android.content.Context
 import android.os.Bundle
-import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
@@ -28,28 +27,24 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusProperties
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.data.datastore.LocaleStorage
 import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalFocusRequester
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.isCurrentRoute
-import com.zaneschepke.wireguardautotunnel.ui.common.prompt.CustomSnackBar
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.CustomSnackBar
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarControllerProvider
 import com.zaneschepke.wireguardautotunnel.ui.screens.config.ConfigScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
@@ -57,17 +52,31 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.options.OptionsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.pinlock.PinLockScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.scanner.ScannerScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.AppearanceScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.display.DisplayScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language.LanguageScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.AutoTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.disclosure.LocationDisclosureScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.logs.LogsScreen
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 import dagger.hilt.android.AndroidEntryPoint
+import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
+
+	private val localeStorage: LocaleStorage by lazy {
+		(application as WireGuardAutoTunnel).localeStorage
+	}
+
+	private lateinit var oldPrefLocaleCode: String
+
 	@Inject
 	lateinit var appStateRepository: AppStateRepository
 
@@ -78,12 +87,6 @@ class MainActivity : AppCompatActivity() {
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		enableEdgeToEdge(
-			navigationBarStyle = SystemBarStyle.auto(
-				lightScrim = Color.Transparent.toArgb(),
-				darkScrim = Color.Transparent.toArgb(),
-			),
-		)
 
 		installSplashScreen().apply {
 			setKeepOnScreenCondition {
@@ -94,124 +97,126 @@ class MainActivity : AppCompatActivity() {
 		setContent {
 			val appUiState by viewModel.uiState.collectAsStateWithLifecycle(lifecycle = this.lifecycle)
 			val navController = rememberNavController()
-			val navBackStackEntry by navController.currentBackStackEntryAsState()
+			val rootItemFocusRequester = remember { FocusRequester() }
 
-			LaunchedEffect(appUiState.vpnState.status) {
-				val context = this@MainActivity
-				when (appUiState.vpnState.status) {
-					TunnelState.DOWN -> ServiceManager.stopTunnelBackgroundService(context)
-					else -> Unit
-				}
-				context.requestTunnelTileServiceStateUpdate()
+			LaunchedEffect(appUiState.tunnels) {
+				Timber.d("Updating launched")
+				requestTunnelTileServiceStateUpdate()
+			}
+
+			LaunchedEffect(appUiState.autoTunnelActive) {
+				requestAutoTunnelTileServiceUpdate()
 			}
 
 			with(appUiState.settings) {
-				LaunchedEffect(isAutoTunnelPaused, isAutoTunnelEnabled) {
+				LaunchedEffect(isAutoTunnelEnabled) {
 					this@MainActivity.requestAutoTunnelTileServiceUpdate()
 				}
 			}
 
-			CompositionLocalProvider(LocalNavController provides navController) {
-				SnackbarControllerProvider { host ->
-					WireguardAutoTunnelTheme {
-						val focusRequester = remember { FocusRequester() }
-						Scaffold(
-							snackbarHost = {
-								SnackbarHost(host) { snackbarData: SnackbarData ->
-									CustomSnackBar(
-										snackbarData.visuals.message,
-										isRtl = false,
-										containerColor =
-										MaterialTheme.colorScheme.surfaceColorAtElevation(
-											2.dp,
-										),
-									)
-								}
-							},
-							modifier =
-							Modifier
-								.focusable()
-								.focusProperties {
-									if (navBackStackEntry?.isCurrentRoute(Route.Lock) == true) {
-										Unit
-									} else {
-										up = focusRequester
+			CompositionLocalProvider(LocalFocusRequester provides rootItemFocusRequester) {
+				CompositionLocalProvider(LocalNavController provides navController) {
+					SnackbarControllerProvider { host ->
+						WireguardAutoTunnelTheme(theme = appUiState.generalState.theme) {
+							Scaffold(
+								contentWindowInsets = WindowInsets(0.dp),
+								snackbarHost = {
+									SnackbarHost(host) { snackbarData: SnackbarData ->
+										CustomSnackBar(
+											snackbarData.visuals.message,
+											isRtl = false,
+											containerColor =
+											MaterialTheme.colorScheme.surfaceColorAtElevation(
+												2.dp,
+											),
+										)
 									}
 								},
-							bottomBar = {
-								BottomNavBar(
-									navController,
-									listOf(
-										BottomNavItem(
-											name = stringResource(R.string.tunnels),
-											route = Route.Main,
-											icon = Icons.Rounded.Home,
+								bottomBar = {
+									BottomNavBar(
+										navController,
+										listOf(
+											BottomNavItem(
+												name = stringResource(R.string.tunnels),
+												route = Route.Main,
+												icon = Icons.Rounded.Home,
+											),
+											BottomNavItem(
+												name = stringResource(R.string.settings),
+												route = Route.Settings,
+												icon = Icons.Rounded.Settings,
+											),
+											BottomNavItem(
+												name = stringResource(R.string.support),
+												route = Route.Support,
+												icon = Icons.Rounded.QuestionMark,
+											),
 										),
-										BottomNavItem(
-											name = stringResource(R.string.settings),
-											route = Route.Settings,
-											icon = Icons.Rounded.Settings,
-										),
-										BottomNavItem(
-											name = stringResource(R.string.support),
-											route = Route.Support,
-											icon = Icons.Rounded.QuestionMark,
-										),
-									),
-								)
-							},
-						) { padding ->
-							Box(modifier = Modifier.fillMaxSize().padding(padding)) {
-								NavHost(
-									navController,
-									enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
-									exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
-									startDestination = (if (appUiState.generalState.isPinLockEnabled == true) Route.Lock else Route.Main),
-								) {
-									composable<Route.Main> {
-										MainScreen(
-											focusRequester = focusRequester,
-											uiState = appUiState,
-										)
-									}
-									composable<Route.Settings> {
-										SettingsScreen(
-											appViewModel = viewModel,
-											uiState = appUiState,
-											focusRequester = focusRequester,
-										)
-									}
-									composable<Route.Support> {
-										SupportScreen(
-											focusRequester = focusRequester,
-											appUiState = appUiState,
-										)
-									}
-									composable<Route.Logs> {
-										LogsScreen()
-									}
-									composable<Route.Config> {
-										val args = it.toRoute<Route.Config>()
-										ConfigScreen(
-											focusRequester = focusRequester,
-											tunnelId = args.id,
-										)
-									}
-									composable<Route.Option> {
-										val args = it.toRoute<Route.Option>()
-										OptionsScreen(
-											tunnelId = args.id,
-											focusRequester = focusRequester,
-											appUiState = appUiState,
-										)
-									}
-									composable<Route.Lock> {
-										PinLockScreen(
-											appViewModel = viewModel,
-										)
-									}
-									composable<Route.Scanner> {
-										ScannerScreen()
+									)
+								},
+							) {
+								Box(modifier = Modifier.fillMaxSize().padding(it)) {
+									NavHost(
+										navController,
+										enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
+										exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
+										startDestination = (if (appUiState.generalState.isPinLockEnabled == true) Route.Lock else Route.Main),
+									) {
+										composable<Route.Main> {
+											MainScreen(
+												uiState = appUiState,
+											)
+										}
+										composable<Route.Settings> {
+											SettingsScreen(
+												appViewModel = viewModel,
+												uiState = appUiState,
+											)
+										}
+										composable<Route.LocationDisclosure> {
+											LocationDisclosureScreen(viewModel, appUiState)
+										}
+										composable<Route.AutoTunnel> {
+											AutoTunnelScreen(
+												appUiState,
+											)
+										}
+										composable<Route.Appearance> {
+											AppearanceScreen()
+										}
+										composable<Route.Language> {
+											LanguageScreen(localeStorage)
+										}
+										composable<Route.Display> {
+											DisplayScreen(appUiState)
+										}
+										composable<Route.Support> {
+											SupportScreen()
+										}
+										composable<Route.Logs> {
+											LogsScreen()
+										}
+										composable<Route.Config> {
+											val args = it.toRoute<Route.Config>()
+											ConfigScreen(
+												tunnelId = args.id,
+											)
+										}
+										composable<Route.Option> {
+											val args = it.toRoute<Route.Option>()
+											OptionsScreen(
+												tunnelId = args.id,
+												appUiState = appUiState,
+											)
+										}
+										composable<Route.Lock> {
+											PinLockScreen(
+												appViewModel = viewModel,
+											)
+										}
+										composable<Route.Scanner> {
+											ScannerScreen()
+										}
 									}
 								}
 							}
@@ -222,6 +227,21 @@ class MainActivity : AppCompatActivity() {
 		}
 	}
 
+	override fun attachBaseContext(newBase: Context) {
+		oldPrefLocaleCode = LocaleStorage(newBase).getPreferredLocale()
+		applyOverrideConfiguration(LocaleUtil.getLocalizedConfiguration(oldPrefLocaleCode))
+		super.attachBaseContext(newBase)
+	}
+
+	override fun onResume() {
+		val currentLocaleCode = LocaleStorage(this).getPreferredLocale()
+		if (oldPrefLocaleCode != currentLocaleCode) {
+			recreate() // locale is changed, restart the activity to update
+			oldPrefLocaleCode = currentLocaleCode
+		}
+		super.onResume()
+	}
+
 	override fun onDestroy() {
 		super.onDestroy()
 		tunnelService.cancelStatsJob()

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

@@ -9,6 +9,21 @@ sealed class Route {
 	@Serializable
 	data object Settings : Route()
 
+	@Serializable
+	data object AutoTunnel : 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()
 

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

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
@@ -17,7 +18,7 @@ fun ClickableIconButton(onClick: () -> Unit, onIconClick: () -> Unit, text: Stri
 		onClick = onClick,
 		enabled = enabled,
 	) {
-		Text(text, Modifier.weight(1f, false))
+		Text(text, Modifier.weight(1f, false), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.primary)
 		Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
 		Icon(
 			imageVector = icon,

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

@@ -16,8 +16,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 
@@ -31,12 +29,10 @@ fun ExpandingRowListItem(
 	trailing: @Composable () -> Unit,
 	isExpanded: Boolean,
 	expanded: @Composable () -> Unit = {},
-	focusRequester: FocusRequester,
 ) {
 	Box(
 		modifier =
 		Modifier
-			.focusRequester(focusRequester)
 			.animateContentSize()
 			.clip(RoundedCornerShape(30.dp))
 			.combinedClickable(

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

@@ -0,0 +1,37 @@
+package com.zaneschepke.wireguardautotunnel.ui.common
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+
+@Composable
+fun SelectedLabel() {
+	Row(
+		modifier = Modifier.fillMaxWidth(),
+		horizontalArrangement = Arrangement.End,
+		verticalAlignment = Alignment.CenterVertically,
+	) {
+		Text(
+			stringResource(id = R.string.selected),
+			modifier =
+			Modifier.padding(
+				horizontal = 24.dp.scaledWidth(),
+				vertical = 16.dp.scaledHeight(),
+			),
+			color =
+			MaterialTheme.colorScheme.onSurfaceVariant,
+			style = MaterialTheme.typography.labelSmall,
+		)
+	}
+}

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

@@ -0,0 +1,100 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.button
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+import kotlin.let
+
+@androidx.compose.runtime.Composable
+fun IconSurfaceButton(title: String, onClick: () -> Unit, selected: Boolean, leadingIcon: ImageVector? = null, description: String? = null) {
+	val border: BorderStroke? =
+		if (selected) {
+			BorderStroke(
+				1.dp,
+				MaterialTheme.colorScheme.primary,
+			)
+		} else {
+			null
+		}
+	Card(
+		modifier =
+		Modifier
+			.fillMaxWidth()
+			.height(IntrinsicSize.Min),
+		shape = RoundedCornerShape(8.dp),
+		border = border,
+		colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface),
+	) {
+		Box(
+			modifier = Modifier.clickable { onClick() }
+				.fillMaxWidth(),
+		) {
+			Column(
+				modifier =
+				Modifier
+					.padding(horizontal = 8.dp.scaledWidth(), vertical = 10.dp.scaledHeight())
+					.padding(end = 16.dp.scaledWidth()).padding(start = 8.dp.scaledWidth())
+					.fillMaxSize(),
+				verticalArrangement = Arrangement.Center,
+				horizontalAlignment = Alignment.Start,
+			) {
+				Row(
+					verticalAlignment = Alignment.Companion.CenterVertically,
+					horizontalArrangement = Arrangement.spacedBy(16.dp.scaledWidth()),
+				) {
+					Row(
+						horizontalArrangement = Arrangement.spacedBy(
+							16.dp.scaledWidth(),
+						),
+						verticalAlignment = Alignment.Companion.CenterVertically,
+						modifier = Modifier.padding(vertical = if (description == null) 10.dp.scaledHeight() else 0.dp),
+					) {
+						leadingIcon?.let {
+							Icon(
+								leadingIcon,
+								leadingIcon.name,
+								Modifier.size(iconSize),
+								if (selected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurface,
+							)
+						}
+						Column {
+							Text(
+								title,
+								style = MaterialTheme.typography.titleMedium,
+							)
+							description?.let {
+								Text(
+									description,
+									color = MaterialTheme.colorScheme.onSurfaceVariant,
+									style = MaterialTheme.typography.bodyMedium,
+								)
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}

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

@@ -0,0 +1,18 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.button
+
+import androidx.compose.material3.Switch
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+
+@Composable
+fun ScaledSwitch(checked: Boolean, onClick: (checked: Boolean) -> Unit, enabled: Boolean = true, modifier: Modifier = Modifier) {
+	Switch(
+		checked,
+		{ onClick(it) },
+		modifier.scale((52.dp.scaledHeight() / 52.dp)),
+		enabled = enabled,
+	)
+}

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

@@ -0,0 +1,63 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.button
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+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.unit.dp
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+
+@Composable
+fun SelectionItemButton(
+	leading: (@Composable () -> Unit)? = null,
+	buttonText: String,
+	trailing: (@Composable () -> Unit)? = null,
+	onClick: () -> Unit,
+	ripple: Boolean = true,
+) {
+	Card(
+		modifier =
+		Modifier.clip(RoundedCornerShape(8.dp))
+			.clickable(
+				indication = if (ripple) ripple() else null,
+				interactionSource = remember { MutableInteractionSource() },
+				onClick = { onClick() },
+			)
+			.height(56.dp.scaledHeight()),
+		colors =
+		CardDefaults.cardColors(
+			containerColor = MaterialTheme.colorScheme.background,
+		),
+	) {
+		Row(
+			verticalAlignment = Alignment.CenterVertically,
+			horizontalArrangement = Arrangement.Start,
+			modifier = Modifier.fillMaxSize(),
+		) {
+			leading?.let {
+				it()
+			}
+			Text(
+				buttonText,
+				style = MaterialTheme.typography.bodyLarge,
+				color = MaterialTheme.colorScheme.onSurface,
+			)
+			trailing?.let {
+				it()
+			}
+		}
+	}
+}

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

@@ -0,0 +1,13 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.button.surface
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.vector.ImageVector
+
+data class SelectionItem(
+	val leadingIcon: ImageVector? = null,
+	val trailing: (@Composable () -> Unit)? = null,
+	val title: (@Composable () -> Unit),
+	val description: (@Composable () -> Unit)? = null,
+	val onClick: (() -> Unit)? = null,
+	val height: Int = 64,
+)

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

@@ -0,0 +1,86 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.button.surface
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+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.theme.iconSize
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+
+@Composable
+fun SurfaceSelectionGroupButton(items: List<SelectionItem>) {
+	Card(
+		modifier = Modifier.fillMaxWidth(),
+		shape = RoundedCornerShape(8.dp),
+		colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface),
+	) {
+		items.mapIndexed { index, item ->
+			Box(
+				contentAlignment = Alignment.Center,
+				modifier = Modifier
+					.then(item.onClick?.let { Modifier.clickable { it() } } ?: Modifier)
+					.fillMaxWidth(),
+			) {
+				Row(
+					verticalAlignment = Alignment.CenterVertically,
+					modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp.scaledHeight()),
+				) {
+					Row(
+						verticalAlignment = Alignment.CenterVertically,
+						modifier = Modifier
+							.padding(start = 16.dp.scaledWidth())
+							.weight(4f, false)
+							.fillMaxWidth(),
+					) {
+						item.leadingIcon?.let { icon ->
+							Icon(
+								icon,
+								icon.name,
+								modifier = Modifier.size(iconSize),
+							)
+						}
+						Column(
+							horizontalAlignment = Alignment.Start,
+							verticalArrangement = Arrangement.spacedBy(2.dp, Alignment.CenterVertically),
+							modifier = Modifier
+								.fillMaxWidth()
+								.padding(start = if (item.leadingIcon != null) 16.dp.scaledWidth() else 0.dp)
+								.padding(vertical = if (item.description == null) 16.dp.scaledHeight() else 6.dp.scaledHeight()),
+						) {
+							item.title()
+							item.description?.let {
+								it()
+							}
+						}
+					}
+					item.trailing?.let {
+						Box(
+							contentAlignment = Alignment.CenterEnd,
+							modifier = Modifier
+								.padding(end = 24.dp.scaledWidth(), start = 16.dp.scaledWidth())
+								.weight(1f),
+						) {
+							it()
+						}
+					}
+				}
+			}
+			if (index + 1 != items.size) HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant)
+		}
+	}
+}

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

@@ -3,7 +3,6 @@ package com.zaneschepke.wireguardautotunnel.ui.common.config
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
@@ -11,22 +10,19 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.Dp
 
 @Composable
 fun ConfigurationToggle(
 	label: String,
 	enabled: Boolean = true,
 	checked: Boolean,
-	padding: Dp,
 	onCheckChanged: (checked: Boolean) -> Unit,
 	modifier: Modifier = Modifier,
 ) {
 	Row(
 		modifier =
 		Modifier
-			.fillMaxWidth()
-			.padding(padding),
+			.fillMaxWidth(),
 		verticalAlignment = Alignment.CenterVertically,
 		horizontalArrangement = Arrangement.SpaceBetween,
 	) {

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

@@ -18,8 +18,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
@@ -32,7 +30,6 @@ fun SubmitConfigurationTextBox(
 	value: String?,
 	label: String,
 	hint: String,
-	focusRequester: FocusRequester,
 	isErrorValue: (value: String?) -> Boolean,
 	onSubmit: (value: String) -> Unit,
 	keyboardOptions: KeyboardOptions = KeyboardOptions(
@@ -50,8 +47,7 @@ fun SubmitConfigurationTextBox(
 	OutlinedTextField(
 		isError = isErrorValue(stateValue),
 		modifier = Modifier
-			.fillMaxWidth()
-			.focusRequester(focusRequester),
+			.fillMaxWidth(),
 		value = stateValue,
 		singleLine = true,
 		interactionSource = interactionSource,

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

@@ -0,0 +1,21 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.label
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+
+@Composable
+fun GroupLabel(title: String) {
+	Row(
+		verticalAlignment = Alignment.CenterVertically,
+		horizontalArrangement = Arrangement.Start,
+	) {
+		Text(
+			title,
+			style = MaterialTheme.typography.titleMedium,
+		)
+	}
+}

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

@@ -0,0 +1,33 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.label
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import com.zaneschepke.wireguardautotunnel.BuildConfig
+import com.zaneschepke.wireguardautotunnel.R
+
+@Composable
+fun VersionLabel() {
+	val clipboardManager = LocalClipboardManager.current
+	Row(
+		verticalAlignment = Alignment.CenterVertically,
+		horizontalArrangement = Arrangement.Start,
+	) {
+		Text(
+			"${stringResource(R.string.version)}: ${BuildConfig.VERSION_NAME}",
+			style = MaterialTheme.typography.labelMedium,
+			color = MaterialTheme.colorScheme.outline,
+			modifier = Modifier.clickable {
+				clipboardManager.setText(AnnotatedString(BuildConfig.VERSION_NAME))
+			},
+		)
+	}
+}

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

@@ -20,15 +20,15 @@ fun BottomNavBar(navController: NavController, bottomNavItems: List<BottomNavIte
 	val navBackStackEntry by navController.currentBackStackEntryAsState()
 
 	showBottomBar = bottomNavItems.any {
-		navBackStackEntry?.isCurrentRoute(it.route) == true
+		navBackStackEntry?.isCurrentRoute(it.route::class) == true
 	}
 
 	if (showBottomBar) {
 		NavigationBar(
 			containerColor = MaterialTheme.colorScheme.surface,
 		) {
-			bottomNavItems.forEach { item ->
-				val selected = navBackStackEntry.isCurrentRoute(item.route)
+			bottomNavItems.forEachIndexed { index, item ->
+				val selected = navBackStackEntry.isCurrentRoute(item.route::class)
 				NavigationBarItem(
 					selected = selected,
 					onClick = {

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

@@ -5,10 +5,11 @@ import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavDestination.Companion.hasRoute
 import androidx.navigation.NavDestination.Companion.hierarchy
 import com.zaneschepke.wireguardautotunnel.ui.Route
+import kotlin.reflect.KClass
 
 @SuppressLint("RestrictedApi")
-fun NavBackStackEntry?.isCurrentRoute(route: Route): Boolean {
+fun <T : Route> NavBackStackEntry?.isCurrentRoute(cls: KClass<T>): Boolean {
 	return this?.destination?.hierarchy?.any {
-		it.hasRoute(route = route::class)
+		it.hasRoute(route = cls)
 	} == true
 }

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

@@ -1,8 +1,11 @@
 package com.zaneschepke.wireguardautotunnel.ui.common.navigation
 
 import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.ui.focus.FocusRequester
 import androidx.navigation.NavHostController
 
 val LocalNavController = compositionLocalOf<NavHostController> {
 	error("NavController was not provided")
 }
+
+val LocalFocusRequester = compositionLocalOf<FocusRequester> { error("FocusRequester is not provided") }

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

@@ -11,19 +11,21 @@ import androidx.compose.runtime.Composable
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun TopNavBar(title: String, trailing: @Composable () -> Unit = {}) {
+fun TopNavBar(title: String, trailing: @Composable () -> Unit = {}, showBack: Boolean = true) {
 	val navController = LocalNavController.current
 	CenterAlignedTopAppBar(
 		title = {
 			Text(title)
 		},
 		navigationIcon = {
-			IconButton(onClick = { navController.popBackStack() }) {
-				val icon = Icons.AutoMirrored.Outlined.ArrowBack
-				Icon(
-					imageVector = icon,
-					contentDescription = icon.name,
-				)
+			if (showBack) {
+				IconButton(onClick = { navController.popBackStack() }) {
+					val icon = Icons.AutoMirrored.Outlined.ArrowBack
+					Icon(
+						imageVector = icon,
+						contentDescription = icon.name,
+					)
+				}
 			}
 		},
 		actions = {

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

@@ -1,27 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.screen
-
-import androidx.compose.foundation.focusable
-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.CircularProgressIndicator
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun LoadingScreen() {
-	Column(
-		horizontalAlignment = Alignment.CenterHorizontally,
-		verticalArrangement = Arrangement.Top,
-		modifier =
-		Modifier
-			.fillMaxSize()
-			.focusable()
-			.padding(),
-	) {
-		Column(modifier = Modifier.padding(120.dp)) { CircularProgressIndicator() }
-	}
-}

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.prompt
+package com.zaneschepke.wireguardautotunnel.ui.common.snackbar
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.IntrinsicSize

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

@@ -0,0 +1,110 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.textbox
+
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.unit.dp
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CustomTextField(
+	value: String,
+	modifier: Modifier = Modifier,
+	textStyle: TextStyle = MaterialTheme.typography.bodyLarge.copy(color = MaterialTheme.colorScheme.onSurface),
+	label: @Composable () -> Unit,
+	containerColor: Color,
+	onValueChange: (value: String) -> Unit = {},
+	singleLine: Boolean = false,
+	placeholder: @Composable (() -> Unit)? = null,
+	keyboardOptions: KeyboardOptions,
+	keyboardActions: KeyboardActions,
+	supportingText: @Composable (() -> Unit)? = null,
+	leading: @Composable (() -> Unit)? = null,
+	trailing: @Composable (() -> Unit)? = null,
+	isError: Boolean = false,
+	readOnly: Boolean = false,
+	enabled: Boolean = true,
+) {
+	val interactionSource = remember { MutableInteractionSource() }
+	val space = " "
+	BasicTextField(
+		value = value,
+		textStyle = textStyle,
+		onValueChange = {
+			onValueChange(it)
+		},
+		keyboardActions = keyboardActions,
+		keyboardOptions = keyboardOptions,
+		readOnly = readOnly,
+		cursorBrush = SolidColor(MaterialTheme.colorScheme.onSurface),
+		modifier = modifier,
+		interactionSource = interactionSource,
+		enabled = enabled,
+		singleLine = singleLine,
+	) {
+		OutlinedTextFieldDefaults.DecorationBox(
+			value = space + value,
+			innerTextField = {
+				if (value.isEmpty()) {
+					if (placeholder != null) {
+						placeholder()
+					}
+				}
+				it.invoke()
+			},
+			contentPadding = OutlinedTextFieldDefaults.contentPadding(top = 0.dp, bottom = 0.dp),
+			leadingIcon = leading,
+			trailingIcon = trailing,
+			singleLine = singleLine,
+			supportingText = supportingText,
+			colors = TextFieldDefaults.colors().copy(
+				disabledLabelColor = MaterialTheme.colorScheme.onSurface,
+				disabledContainerColor = containerColor,
+				focusedLabelColor = MaterialTheme.colorScheme.onSurface,
+				focusedContainerColor = containerColor,
+				unfocusedContainerColor = containerColor,
+				focusedTextColor = MaterialTheme.colorScheme.onSurface,
+				cursorColor = MaterialTheme.colorScheme.onSurface,
+			),
+			enabled = enabled,
+			label = label,
+			visualTransformation = VisualTransformation.None,
+			interactionSource = interactionSource,
+			placeholder = placeholder,
+			container = {
+				OutlinedTextFieldDefaults.ContainerBox(
+					enabled,
+					isError = isError,
+					interactionSource,
+					colors = TextFieldDefaults.colors().copy(
+						errorContainerColor = containerColor,
+						disabledLabelColor = MaterialTheme.colorScheme.onSurface,
+						disabledContainerColor = containerColor,
+						focusedIndicatorColor = MaterialTheme.colorScheme.onSurface,
+						focusedLabelColor = MaterialTheme.colorScheme.onSurface,
+						focusedContainerColor = containerColor,
+						unfocusedContainerColor = containerColor,
+						focusedTextColor = MaterialTheme.colorScheme.onSurface,
+						cursorColor = MaterialTheme.colorScheme.onSurface,
+					),
+					shape = RoundedCornerShape(8.dp),
+					focusedBorderThickness = 0.5.dp,
+					unfocusedBorderThickness = 0.5.dp,
+				)
+			},
+		)
+	}
+}

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

@@ -1,6 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.config
 
-import android.annotation.SuppressLint
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.focusGroup
 import androidx.compose.foundation.layout.Arrangement
@@ -61,6 +60,7 @@ import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
 import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationToggle
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
@@ -68,11 +68,11 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.config.components.Applicat
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigType
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 import kotlinx.coroutines.delay
 
-@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @Composable
-fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
+fun ConfigScreen(tunnelId: Int) {
 	val viewModel = hiltViewModel<ConfigViewModel, ConfigViewModel.ConfigViewModelFactory> { factory ->
 		factory.create(tunnelId)
 	}
@@ -102,18 +102,6 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 		}
 	}
 
-	LaunchedEffect(Unit) {
-		if (!uiState.loading && context.isRunningOnTv()) {
-			delay(Constants.FOCUS_REQUEST_DELAY)
-			kotlin.runCatching {
-				focusRequester.requestFocus()
-			}.onFailure {
-				delay(Constants.FOCUS_REQUEST_DELAY)
-				focusRequester.requestFocus()
-			}
-		}
-	}
-
 	LaunchedEffect(Unit) {
 		delay(2_000L)
 		viewModel.cleanUpUninstalledApps()
@@ -174,6 +162,9 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 	}
 
 	Scaffold(
+		topBar = {
+			TopNavBar(stringResource(R.string.edit_tunnel))
+		},
 		floatingActionButtonPosition = FabPosition.End,
 		floatingActionButton = {
 			FloatingActionButton(
@@ -191,7 +182,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 			}
 		},
 	) {
-		Column {
+		Column(Modifier.padding(it)) {
 			Column(
 				horizontalAlignment = Alignment.CenterHorizontally,
 				verticalArrangement = Arrangement.Top,
@@ -216,7 +207,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 							Modifier.fillMaxWidth(fillMaxWidth)
 						}
 						)
-						.padding(bottom = 10.dp),
+						.padding(bottom = 10.dp.scaledHeight()).padding(top = 24.dp.scaledHeight()),
 				) {
 					Column(
 						horizontalAlignment = Alignment.Start,
@@ -233,9 +224,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 						ConfigurationToggle(
 							stringResource(id = R.string.show_amnezia_properties),
 							checked = derivedConfigType.value == ConfigType.AMNEZIA,
-							padding = screenPadding,
 							onCheckChanged = { configType = if (it) ConfigType.AMNEZIA else ConfigType.WIREGUARD },
-							modifier = Modifier.focusRequester(focusRequester),
 						)
 						ConfigurationTextBox(
 							value = uiState.tunnelName,
@@ -358,8 +347,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								hint = stringResource(R.string.junk_packet_count).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.junkPacketMinSize,
@@ -372,8 +360,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.junkPacketMaxSize,
@@ -386,8 +373,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.initPacketJunkSize,
@@ -397,8 +383,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								hint = stringResource(R.string.init_packet_junk_size).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.responsePacketJunkSize,
@@ -411,8 +396,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.initPacketMagicHeader,
@@ -425,8 +409,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.responsePacketMagicHeader,
@@ -439,8 +422,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.underloadPacketMagicHeader,
@@ -453,8 +435,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.transportPacketMagicHeader,
@@ -467,8 +448,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 						}
 						Row(
@@ -539,27 +519,15 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								hint = stringResource(R.string.base64_key),
 								modifier = Modifier.fillMaxWidth(),
 							)
-							OutlinedTextField(
-								modifier =
-								Modifier
-									.fillMaxWidth()
-									.clickable { showAuthPrompt = true },
+							ConfigurationTextBox(
 								value = peer.preSharedKey,
-								visualTransformation =
-								if ((tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID.toInt()) || isAuthenticated) {
-									VisualTransformation.None
-								} else {
-									PasswordVisualTransformation()
-								},
-								enabled = (tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID.toInt()) || isAuthenticated || peer.preSharedKey.isEmpty(),
 								onValueChange = { value ->
 									viewModel.onPreSharedKeyChange(index, value)
 								},
-								label = { Text(stringResource(R.string.preshared_key)) },
-								singleLine = true,
-								placeholder = { Text(stringResource(R.string.optional)) },
-								keyboardOptions = keyboardOptions,
 								keyboardActions = keyboardActions,
+								label = stringResource(R.string.preshared_key),
+								hint = stringResource(R.string.optional),
+								modifier = Modifier.fillMaxWidth(),
 							)
 							OutlinedTextField(
 								modifier = Modifier.fillMaxWidth(),

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

@@ -1,8 +1,11 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main
 
-import android.annotation.SuppressLint
+import android.content.Intent
+import android.net.Uri
 import android.net.VpnService
+import android.provider.Settings
 import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity.RESULT_OK
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -10,19 +13,21 @@ import androidx.compose.foundation.gestures.ScrollableDefaults
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.fillMaxSize
+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.foundation.overscroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.outlined.Add
 import androidx.compose.material3.FabPosition
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -30,11 +35,11 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 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.hilt.navigation.compose.hiltViewModel
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
@@ -44,6 +49,7 @@ import com.zaneschepke.wireguardautotunnel.ui.common.NestedScrollListener
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
 import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberFileImportLauncherForResult
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.AutoTunnelRowItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.GettingStartedLabel
@@ -52,15 +58,14 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelImpo
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelRowItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.VpnDeniedDialog
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.isBatteryOptimizationsDisabled
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
-import com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
-import kotlinx.coroutines.delay
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 
-@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState, focusRequester: FocusRequester) {
+fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState) {
 	val context = LocalContext.current
 	val navController = LocalNavController.current
 	val snackbar = SnackbarController.current
@@ -70,30 +75,25 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 	var isFabVisible by rememberSaveable { mutableStateOf(true) }
 	var showDeleteTunnelAlertDialog by remember { mutableStateOf(false) }
 	var selectedTunnel by remember { mutableStateOf<TunnelConfig?>(null) }
+	val isRunningOnTv = remember { context.isRunningOnTv() }
 
 	val nestedScrollConnection = remember {
 		NestedScrollListener({ isFabVisible = false }, { isFabVisible = true })
 	}
 
-	val vpnActivityResultState =
+	val vpnActivity =
 		rememberLauncherForActivityResult(
 			ActivityResultContracts.StartActivityForResult(),
 			onResult = {
 				if (it.resultCode != RESULT_OK) showVpnPermissionDialog = true
 			},
 		)
-
-	LaunchedEffect(Unit) {
-		if (context.isRunningOnTv()) {
-			delay(Constants.FOCUS_REQUEST_DELAY)
-			runCatching {
-				focusRequester.requestFocus()
-			}.onFailure {
-				delay(Constants.FOCUS_REQUEST_DELAY)
-				focusRequester.requestFocus()
-			}
+	val batteryActivity =
+		rememberLauncherForActivityResult(
+			ActivityResultContracts.StartActivityForResult(),
+		) { result: ActivityResult ->
+			viewModel.setBatteryOptimizeDisableShown()
 		}
-	}
 
 	val tunnelFileImportResultLauncher = rememberFileImportLauncherForResult(onNoFileExplorer = {
 		snackbar.showMessage(
@@ -116,7 +116,7 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 		InfoDialog(
 			onDismiss = { showDeleteTunnelAlertDialog = false },
 			onAttest = {
-				selectedTunnel?.let { viewModel.onDelete(it, context) }
+				selectedTunnel?.let { viewModel::onDelete }
 				showDeleteTunnelAlertDialog = false
 				selectedTunnel = null
 			},
@@ -126,15 +126,35 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 		)
 	}
 
+	fun requestBatteryOptimizationsDisabled() {
+		val intent =
+			Intent().apply {
+				action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+				data = Uri.parse("package:${context.packageName}")
+			}
+		batteryActivity.launch(intent)
+	}
+
+	fun onAutoTunnelToggle() {
+		if (!uiState.generalState.isBatteryOptimizationDisableShown &&
+			!context.isBatteryOptimizationsDisabled() && !isRunningOnTv
+		) {
+			return requestBatteryOptimizationsDisabled()
+		}
+		val intent = if (!uiState.settings.isKernelEnabled) {
+			VpnService.prepare(context)
+		} else {
+			null
+		}
+		if (intent != null) return vpnActivity.launch(intent)
+		viewModel.onToggleAutoTunnel()
+	}
+
 	fun onTunnelToggle(checked: Boolean, tunnel: TunnelConfig) {
 		val intent = if (uiState.settings.isKernelEnabled) null else VpnService.prepare(context)
-		if (intent != null) return vpnActivityResultState.launch(intent)
+		if (intent != null) return vpnActivity.launch(intent)
 		if (!checked) viewModel.onTunnelStop(tunnel).also { return }
-		if (uiState.settings.isKernelEnabled) {
-			context.startTunnelBackground(tunnel.id)
-		} else {
-			viewModel.onTunnelStart(tunnel)
-		}
+		viewModel.onTunnelStart(tunnel, uiState.settings.isKernelEnabled)
 	}
 
 	Scaffold(
@@ -149,16 +169,37 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 		},
 		floatingActionButtonPosition = FabPosition.End,
 		floatingActionButton = {
-			ScrollDismissFab({
-				val icon = Icons.Filled.Add
-				Icon(
-					imageVector = icon,
-					contentDescription = icon.name,
-					tint = MaterialTheme.colorScheme.onPrimary,
+			if (!isRunningOnTv) {
+				ScrollDismissFab({
+					val icon = Icons.Filled.Add
+					Icon(
+						imageVector = icon,
+						contentDescription = icon.name,
+						tint = MaterialTheme.colorScheme.onPrimary,
+					)
+				}, isVisible = isFabVisible, onClick = {
+					showBottomSheet = true
+				})
+			}
+		},
+		topBar = {
+			if (isRunningOnTv) {
+				TopNavBar(
+					showBack = false,
+					title = stringResource(R.string.app_name),
+					trailing = {
+						IconButton(onClick = {
+							showBottomSheet = true
+						}) {
+							val icon = Icons.Outlined.Add
+							Icon(
+								imageVector = icon,
+								contentDescription = icon.name,
+							)
+						}
+					},
 				)
-			}, focusRequester, isVisible = isFabVisible, onClick = {
-				showBottomSheet = true
-			})
+			}
 		},
 	) {
 		TunnelImportSheet(
@@ -174,10 +215,10 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 		)
 		LazyColumn(
 			horizontalAlignment = Alignment.Start,
-			verticalArrangement = Arrangement.Top,
+			verticalArrangement = Arrangement.spacedBy(5.dp.scaledHeight(), Alignment.Top),
 			modifier =
 			Modifier
-				.fillMaxSize()
+				.fillMaxSize().padding(it)
 				.overscroll(ScrollableDefaults.overscrollEffect())
 				.nestedScroll(nestedScrollConnection),
 			state = rememberLazyListState(0, uiState.tunnels.count()),
@@ -189,10 +230,11 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 				item {
 					GettingStartedLabel(onClick = { context.openWebUrl(it) })
 				}
-			}
-			if (uiState.settings.isAutoTunnelEnabled) {
+			} else {
 				item {
-					AutoTunnelRowItem(uiState.settings, { viewModel.onToggleAutoTunnelingPause() }, focusRequester)
+					AutoTunnelRowItem(uiState, {
+						onAutoTunnelToggle()
+					})
 				}
 			}
 			items(
@@ -215,7 +257,6 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 					onDelete = { showDeleteTunnelAlertDialog = true },
 					onCopy = { viewModel.onCopyTunnel(tunnel) },
 					onSwitchClick = { onTunnelToggle(it, tunnel) },
-					focusRequester = focusRequester,
 				)
 			}
 		}

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

@@ -30,26 +30,24 @@ import timber.log.Timber
 import java.io.InputStream
 import java.util.zip.ZipInputStream
 import javax.inject.Inject
+import javax.inject.Provider
 
 @HiltViewModel
 class MainViewModel
 @Inject
 constructor(
 	private val appDataRepository: AppDataRepository,
-	val tunnelService: TunnelService,
+	private val tunnelService: Provider<TunnelService>,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+	private val serviceManager: ServiceManager,
 ) : ViewModel() {
 
-	private fun stopWatcherService(context: Context) {
-		ServiceManager.stopWatcherService(context)
-	}
-
-	fun onDelete(tunnel: TunnelConfig, context: Context) {
+	fun onDelete(tunnel: TunnelConfig) {
 		viewModelScope.launch {
 			val settings = appDataRepository.settings.getSettings()
 			val isPrimary = tunnel.isPrimaryTunnel
 			if (appDataRepository.tunnels.count() == 1 || isPrimary) {
-				stopWatcherService(context)
+				serviceManager.stopAutoTunnel()
 				resetTunnelSetting(settings)
 			}
 			appDataRepository.tunnels.delete(tunnel)
@@ -69,14 +67,14 @@ constructor(
 		appDataRepository.appState.setTunnelStatsExpanded(expanded)
 	}
 
-	fun onTunnelStart(tunnelConfig: TunnelConfig) = viewModelScope.launch {
+	fun onTunnelStart(tunnelConfig: TunnelConfig, background: Boolean) = viewModelScope.launch {
 		Timber.i("Starting tunnel ${tunnelConfig.name}")
-		tunnelService.startTunnel(tunnelConfig)
+		tunnelService.get().startTunnel(tunnelConfig, background)
 	}
 
 	fun onTunnelStop(tunnel: TunnelConfig) = viewModelScope.launch {
 		Timber.i("Stopping active tunnel")
-		tunnelService.stopTunnel(tunnel)
+		tunnelService.get().stopTunnel(tunnel)
 	}
 
 	private fun generateQrCodeDefaultName(config: String): String {
@@ -160,6 +158,21 @@ constructor(
 		}
 	}
 
+	fun onToggleAutoTunnel() = viewModelScope.launch {
+		val settings = appDataRepository.settings.getSettings()
+		val toggled = !settings.isAutoTunnelEnabled
+		if (toggled) {
+			serviceManager.startAutoTunnel(false)
+		} else {
+			serviceManager.stopAutoTunnel()
+		}
+		appDataRepository.settings.save(
+			settings.copy(
+				isAutoTunnelEnabled = toggled,
+			),
+		)
+	}
+
 	private suspend fun saveTunnelsFromZipUri(uri: Uri, context: Context) {
 		ZipInputStream(getInputStreamFromUri(uri, context)).use { zip ->
 			generateSequence { zip.nextEntry }
@@ -181,18 +194,15 @@ constructor(
 		}
 	}
 
+	fun setBatteryOptimizeDisableShown() = viewModelScope.launch {
+		appDataRepository.appState.setBatteryOptimizationDisableShown(true)
+	}
+
 	private suspend fun saveTunnelFromConfUri(name: String, uri: Uri, context: Context) {
 		val stream = getInputStreamFromUri(uri, context) ?: throw FileReadException
 		saveTunnelConfigFromStream(stream, name)
 	}
 
-	fun onToggleAutoTunnelingPause() = viewModelScope.launch {
-		val settings = appDataRepository.settings.getSettings()
-		appDataRepository.settings.save(
-			settings.copy(isAutoTunnelPaused = !settings.isAutoTunnelPaused),
-		)
-	}
-
 	private fun saveTunnel(tunnelConfig: TunnelConfig) = viewModelScope.launch {
 		appDataRepository.tunnels.save(tunnelConfig)
 	}

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

@@ -4,43 +4,27 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Bolt
 import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
+import com.zaneschepke.wireguardautotunnel.ui.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.common.ExpandingRowListItem
+import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.theme.SilverTree
-import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 
 @Composable
-fun AutoTunnelRowItem(settings: Settings, onToggle: () -> Unit, focusRequester: FocusRequester) {
+fun AutoTunnelRowItem(appUiState: AppUiState, onToggle: () -> Unit) {
 	val context = LocalContext.current
 	val itemFocusRequester = remember { FocusRequester() }
-	val autoTunnelingLabel =
-		buildAnnotatedString {
-			append(stringResource(id = R.string.auto_tunneling))
-			append(": ")
-			if (settings.isAutoTunnelPaused) {
-				append(
-					stringResource(id = R.string.paused),
-				)
-			} else {
-				append(
-					stringResource(id = R.string.active),
-				)
-			}
-		}
 	ExpandingRowListItem(
 		leading = {
 			val icon = Icons.Rounded.Bolt
@@ -49,23 +33,23 @@ fun AutoTunnelRowItem(settings: Settings, onToggle: () -> Unit, focusRequester:
 				icon.name,
 				modifier =
 				Modifier
-					.size(iconSize).scale(1.5f),
+					.size(16.dp.scaledHeight()).scale(1.5f),
 				tint =
-				if (settings.isAutoTunnelPaused) {
+				if (!appUiState.autoTunnelActive) {
 					Color.Gray
 				} else {
 					SilverTree
 				},
 			)
 		},
-		text = autoTunnelingLabel.text,
+		text = stringResource(R.string.auto_tunneling),
 		trailing = {
-			TextButton(
-				modifier = Modifier.focusRequester(itemFocusRequester),
-				onClick = { onToggle() },
-			) {
-				Text(stringResource(id = if (settings.isAutoTunnelPaused) R.string.resume else R.string.pause))
-			}
+			ScaledSwitch(
+				appUiState.settings.isAutoTunnelEnabled,
+				onClick = {
+					onToggle()
+				},
+			)
 		},
 		onClick = {
 			if (context.isRunningOnTv()) {
@@ -73,6 +57,5 @@ fun AutoTunnelRowItem(settings: Settings, onToggle: () -> Unit, focusRequester:
 			}
 		},
 		isExpanded = false,
-		focusRequester = focusRequester,
 	)
 }

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

@@ -9,19 +9,16 @@ import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.unit.dp
 
 @Composable
-fun ScrollDismissFab(icon: @Composable () -> Unit, focusRequester: FocusRequester, isVisible: Boolean, onClick: () -> Unit) {
+fun ScrollDismissFab(icon: @Composable () -> Unit, isVisible: Boolean, onClick: () -> Unit) {
 	AnimatedVisibility(
 		visible = isVisible,
 		enter = slideInVertically(initialOffsetY = { it * 2 }),
 		exit = slideOutVertically(targetOffsetY = { it * 2 }),
 		modifier =
 		Modifier
-			.focusRequester(focusRequester)
 			.focusGroup(),
 	) {
 		FloatingActionButton(

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

@@ -13,7 +13,6 @@ import androidx.compose.material.icons.rounded.Smartphone
 import androidx.compose.material.icons.rounded.Star
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.Switch
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -23,16 +22,18 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.ExpandingRowListItem
+import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
-import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
 import com.zaneschepke.wireguardautotunnel.util.extensions.asColor
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 
 @Composable
 fun TunnelRowItem(
@@ -46,7 +47,6 @@ fun TunnelRowItem(
 	onCopy: () -> Unit,
 	onDelete: () -> Unit,
 	onSwitchClick: (checked: Boolean) -> Unit,
-	focusRequester: FocusRequester,
 ) {
 	val leadingIconColor = if (!isActive) Color.Gray else vpnState.statistics.asColor()
 	val context = LocalContext.current
@@ -69,7 +69,7 @@ fun TunnelRowItem(
 				icon,
 				icon.name,
 				tint = leadingIconColor,
-				modifier = Modifier.size(iconSize),
+				modifier = Modifier.size(16.dp.scaledHeight()),
 			)
 		},
 		text = tunnel.name,
@@ -89,7 +89,6 @@ fun TunnelRowItem(
 		},
 		isExpanded = expanded && isActive,
 		expanded = { if (isActive && expanded) TunnelStatisticsRow(vpnState.statistics, tunnel) },
-		focusRequester = focusRequester,
 		trailing = {
 			if (
 				isSelected &&
@@ -143,7 +142,6 @@ fun TunnelRowItem(
 							)
 						}
 						IconButton(
-							modifier = Modifier.focusRequester(focusRequester),
 							onClick = {
 								if (isActive) {
 									onClick()
@@ -181,21 +179,17 @@ fun TunnelRowItem(
 								icon.name,
 							)
 						}
-						Switch(
+						ScaledSwitch(
 							modifier = Modifier.focusRequester(itemFocusRequester),
 							checked = isActive,
-							onCheckedChange = { checked ->
-								onSwitchClick(checked)
-							},
+							onClick = onSwitchClick,
 						)
 					}
 				} else {
-					Switch(
+					ScaledSwitch(
 						modifier = Modifier.focusRequester(itemFocusRequester),
 						checked = isActive,
-						onCheckedChange = { checked ->
-							onSwitchClick(checked)
-						},
+						onClick = onSwitchClick,
 					)
 				}
 			}

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

@@ -46,14 +46,18 @@ fun TunnelStatisticsRow(statistics: TunnelStatistics?, tunnelConfig: TunnelConfi
 			Column(
 				verticalArrangement = Arrangement.spacedBy(10.dp),
 			) {
-				Text(stringResource(R.string.peer).lowercase() + ": $peerId", style = MaterialTheme.typography.bodySmall)
-				Text("tx: $peerTxMB MB", style = MaterialTheme.typography.bodySmall)
+				Text(
+					stringResource(R.string.peer).lowercase() + ": $peerId",
+					style = MaterialTheme.typography.bodySmall,
+					color = MaterialTheme.colorScheme.outline,
+				)
+				Text("tx: $peerTxMB MB", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.outline)
 			}
 			Column(
 				verticalArrangement = Arrangement.spacedBy(10.dp),
 			) {
-				Text(stringResource(R.string.handshake) + ": $handshake", style = MaterialTheme.typography.bodySmall)
-				Text("rx: $peerRxMB MB", style = MaterialTheme.typography.bodySmall)
+				Text(stringResource(R.string.handshake) + ": $handshake", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.outline)
+				Text("rx: $peerRxMB MB", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.outline)
 			}
 		}
 	}

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

@@ -1,33 +1,23 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.options
 
-import android.annotation.SuppressLint
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
-import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.verticalScroll
+import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material.icons.outlined.Add
 import androidx.compose.material.icons.outlined.Edit
+import androidx.compose.material.icons.outlined.NetworkPing
+import androidx.compose.material.icons.outlined.PhoneAndroid
+import androidx.compose.material.icons.outlined.Security
+import androidx.compose.material.icons.outlined.Star
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -37,298 +27,171 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.ClickableIconButton
-import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationToggle
-import com.zaneschepke.wireguardautotunnel.ui.common.config.SubmitConfigurationTextBox
+import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
+import com.zaneschepke.wireguardautotunnel.ui.common.label.GroupLabel
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.ScrollDismissFab
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.WildcardSupportingLabel
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
-import com.zaneschepke.wireguardautotunnel.util.extensions.isValidIpv4orIpv6Address
-import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
-import kotlinx.coroutines.delay
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.components.TrustedNetworkTextBox
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.components.WildcardsLabel
+import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
 
-@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-fun OptionsScreen(optionsViewModel: OptionsViewModel = hiltViewModel(), focusRequester: FocusRequester, appUiState: AppUiState, tunnelId: Int) {
-	val scrollState = rememberScrollState()
-	val context = LocalContext.current
+fun OptionsScreen(optionsViewModel: OptionsViewModel = hiltViewModel(), appUiState: AppUiState, tunnelId: Int) {
 	val navController = LocalNavController.current
 	val config = appUiState.tunnels.first { it.id == tunnelId }
 
-	val interactionSource = remember { MutableInteractionSource() }
-	val focusManager = LocalFocusManager.current
-	val screenPadding = 5.dp
-	val fillMaxWidth = .85f
-
 	var currentText by remember { mutableStateOf("") }
 
-	LaunchedEffect(Unit) {
-		if (context.isRunningOnTv()) {
-			delay(Constants.FOCUS_REQUEST_DELAY)
-			kotlin.runCatching {
-				focusRequester.requestFocus()
-			}.onFailure {
-				delay(Constants.FOCUS_REQUEST_DELAY)
-				focusRequester.requestFocus()
-			}
-		}
+	LaunchedEffect(config.tunnelNetworks) {
+		currentText = ""
 	}
-
-	fun saveTrustedSSID() {
-		if (currentText.isNotEmpty()) {
-			optionsViewModel.onSaveRunSSID(currentText, config)
-			currentText = ""
-		}
-	}
-
 	Scaffold(
-		floatingActionButton = {
-			ScrollDismissFab(icon = {
-				val icon = Icons.Filled.Edit
-				Icon(
-					imageVector = icon,
-					contentDescription = icon.name,
-					tint = MaterialTheme.colorScheme.onPrimary,
-				)
-			}, focusRequester, isVisible = true, onClick = {
-				navController.navigate(
-					Route.Config(config.id),
-				)
+		topBar = {
+			TopNavBar(config.name, trailing = {
+				IconButton(onClick = {
+					navController.navigate(
+						Route.Config(config.id),
+					)
+				}) {
+					val icon = Icons.Outlined.Edit
+					Icon(
+						imageVector = icon,
+						contentDescription = icon.name,
+					)
+				}
 			})
 		},
 	) {
 		Column(
-			horizontalAlignment = Alignment.CenterHorizontally,
-			verticalArrangement = Arrangement.Top,
+			horizontalAlignment = Alignment.Start,
+			verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
 			modifier =
 			Modifier
 				.fillMaxSize()
-				.verticalScroll(scrollState)
-				.clickable(
-					indication = null,
-					interactionSource = interactionSource,
-				) {
-					focusManager.clearFocus()
-				},
+				.padding(it)
+				.padding(top = 24.dp.scaledHeight())
+				.padding(horizontal = 24.dp.scaledWidth()),
 		) {
-			Surface(
-				tonalElevation = 2.dp,
-				shadowElevation = 2.dp,
-				shape = RoundedCornerShape(12.dp),
-				color = MaterialTheme.colorScheme.surface,
-				modifier =
-				(
-					if (context.isRunningOnTv()) {
-						Modifier
-							.height(IntrinsicSize.Min)
-							.fillMaxWidth(fillMaxWidth)
-							.padding(top = 10.dp)
-					} else {
-						Modifier
-							.fillMaxWidth(fillMaxWidth)
-							.padding(top = 20.dp)
-					}
-					)
-					.padding(bottom = 10.dp),
-			) {
-				Column(
-					horizontalAlignment = Alignment.Start,
-					verticalArrangement = Arrangement.Top,
-					modifier = Modifier.padding(15.dp),
-				) {
-					SectionTitle(
-						title = stringResource(id = R.string.general),
-						padding = screenPadding,
-					)
-					ConfigurationToggle(
-						stringResource(R.string.set_primary_tunnel),
-						enabled = true,
-						checked = config.isPrimaryTunnel,
-						modifier =
-						Modifier
-							.focusRequester(focusRequester),
-						padding = screenPadding,
-						onCheckChanged = { optionsViewModel.onTogglePrimaryTunnel(config) },
-					)
-				}
-			}
-			Surface(
-				tonalElevation = 2.dp,
-				shadowElevation = 2.dp,
-				shape = RoundedCornerShape(12.dp),
-				color = MaterialTheme.colorScheme.surface,
-				modifier =
-				(
-					if (context.isRunningOnTv()) {
-						Modifier
-							.height(IntrinsicSize.Min)
-							.fillMaxWidth(fillMaxWidth)
-							.padding(top = 10.dp)
-					} else {
-						Modifier
-							.fillMaxWidth(fillMaxWidth)
-							.padding(top = 20.dp)
-					}
-					)
-					.padding(bottom = 10.dp),
-			) {
-				Column(
-					horizontalAlignment = Alignment.Start,
-					verticalArrangement = Arrangement.Top,
-					modifier = Modifier.padding(15.dp),
-				) {
-					SectionTitle(
-						title = stringResource(id = R.string.auto_tunneling),
-						padding = screenPadding,
-					)
-					ConfigurationToggle(
-						stringResource(R.string.mobile_data_tunnel),
-						enabled = true,
-						checked = config.isMobileDataTunnel,
-						padding = screenPadding,
-						onCheckChanged = { optionsViewModel.onToggleIsMobileDataTunnel(config) },
-					)
-					Column {
-						FlowRow(
-							modifier =
-							Modifier
-								.padding(screenPadding)
-								.fillMaxWidth(),
-							horizontalArrangement = Arrangement.spacedBy(5.dp),
-						) {
-							config.tunnelNetworks.forEach { ssid ->
-								ClickableIconButton(
-									onClick = {
-										if (context.isRunningOnTv()) {
-											focusRequester.requestFocus()
-											optionsViewModel.onDeleteRunSSID(ssid, config)
-										}
-									},
-									onIconClick = {
-										if (context.isRunningOnTv()) focusRequester.requestFocus()
-										optionsViewModel.onDeleteRunSSID(ssid, config)
-									},
-									text = ssid,
-									icon = Icons.Filled.Close,
-									enabled = true,
-								)
-							}
-							if (config.tunnelNetworks.isEmpty()) {
-								Text(
-									stringResource(R.string.no_wifi_names_configured),
-									fontStyle = FontStyle.Italic,
-									color = MaterialTheme.colorScheme.onSurface,
-								)
-							}
-						}
-						OutlinedTextField(
-							enabled = true,
-							value = currentText,
-							onValueChange = { currentText = it },
-							label = { Text(stringResource(id = R.string.use_tunnel_on_wifi_name)) },
-							supportingText = { WildcardSupportingLabel { context.openWebUrl(it) } },
-							modifier =
-							Modifier
-								.padding(
-									start = screenPadding,
-									top = 5.dp,
-									bottom = 10.dp,
-								),
-							maxLines = 1,
-							keyboardOptions =
-							KeyboardOptions(
-								capitalization = KeyboardCapitalization.None,
-								imeAction = ImeAction.Done,
-							),
-							keyboardActions = KeyboardActions(onDone = { saveTrustedSSID() }),
-							trailingIcon = {
-								if (currentText != "") {
-									IconButton(onClick = { saveTrustedSSID() }) {
-										Icon(
-											imageVector = Icons.Outlined.Add,
-											contentDescription = stringResource(R.string.save_changes),
-											tint = MaterialTheme.colorScheme.primary,
+			GroupLabel(stringResource(R.string.auto_tunneling))
+			SurfaceSelectionGroupButton(
+				listOf(
+					SelectionItem(
+						Icons.Outlined.Star,
+						title = {
+							Text(
+								stringResource(R.string.primary_tunnel),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						description = {
+							Text(
+								stringResource(R.string.set_primary_tunnel),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.outline),
+							)
+						},
+						trailing = {
+							ScaledSwitch(
+								config.isPrimaryTunnel,
+								onClick = { optionsViewModel.onTogglePrimaryTunnel(config) },
+							)
+						},
+						onClick = { optionsViewModel.onTogglePrimaryTunnel(config) },
+					),
+					SelectionItem(
+						Icons.Outlined.PhoneAndroid,
+						title = { Text(stringResource(R.string.mobile_tunnel), style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface)) },
+						description = {
+							Text(
+								stringResource(R.string.mobile_data_tunnel),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.outline),
+							)
+						},
+						trailing = {
+							ScaledSwitch(
+								config.isMobileDataTunnel,
+								onClick = { optionsViewModel.onToggleIsMobileDataTunnel(config) },
+							)
+						},
+						onClick = { optionsViewModel.onToggleIsMobileDataTunnel(config) },
+					),
+					SelectionItem(
+						Icons.Outlined.NetworkPing,
+						title = {
+							Text(
+								stringResource(R.string.restart_on_ping),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						trailing = {
+							ScaledSwitch(
+								checked = config.isPingEnabled,
+								onClick = { optionsViewModel.onToggleRestartOnPing(config) },
+							)
+						},
+						onClick = { optionsViewModel.onToggleRestartOnPing(config) },
+					),
+					SelectionItem(
+						title = {
+							Row(
+								verticalAlignment = Alignment.CenterVertically,
+								modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp.scaledHeight()),
+							) {
+								Row(
+									verticalAlignment = Alignment.CenterVertically,
+									modifier = Modifier
+										.weight(4f, false)
+										.fillMaxWidth(),
+								) {
+									val icon = Icons.Outlined.Security
+									Icon(
+										icon,
+										icon.name,
+										modifier = Modifier.size(iconSize),
+									)
+									Column(
+										horizontalAlignment = Alignment.Start,
+										verticalArrangement = Arrangement.spacedBy(2.dp, Alignment.CenterVertically),
+										modifier = Modifier
+											.fillMaxWidth()
+											.padding(start = 16.dp.scaledWidth())
+											.padding(vertical = 6.dp.scaledHeight()),
+									) {
+										Text(
+											stringResource(R.string.use_tunnel_on_wifi_name),
+											style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
 										)
 									}
 								}
-							},
-						)
-						ConfigurationToggle(
-							stringResource(R.string.restart_on_ping),
-							enabled = !appUiState.settings.isPingEnabled,
-							checked = config.isPingEnabled || appUiState.settings.isPingEnabled,
-							padding = screenPadding,
-							onCheckChanged = { optionsViewModel.onToggleRestartOnPing(config) },
-						)
-						if (config.isPingEnabled || appUiState.settings.isPingEnabled) {
-							SubmitConfigurationTextBox(
-								config.pingIp,
-								stringResource(R.string.set_custom_ping_ip),
-								stringResource(R.string.default_ping_ip),
-								focusRequester,
-								isErrorValue = { !it.isNullOrBlank() && !it.isValidIpv4orIpv6Address() },
-								onSubmit = {
-									optionsViewModel.saveTunnelChanges(
-										config.copy(pingIp = it.ifBlank { null }),
-									)
-								},
-							)
-							fun isSecondsError(seconds: String?): Boolean {
-								return seconds?.let { value -> if (value.isBlank()) false else value.toLong() >= Long.MAX_VALUE / 1000 } ?: false
 							}
-							SubmitConfigurationTextBox(
-								config.pingInterval?.let { (it / 1000).toString() },
-								stringResource(R.string.set_custom_ping_internal),
-								"(${stringResource(R.string.optional_default)} ${Constants.PING_INTERVAL / 1000})",
-								focusRequester,
-								keyboardOptions = KeyboardOptions(
-									keyboardType = KeyboardType.Number,
-									imeAction = ImeAction.Done,
-								),
-								isErrorValue = ::isSecondsError,
-								onSubmit = {
-									optionsViewModel.saveTunnelChanges(
-										config.copy(pingInterval = if (it.isBlank()) null else it.toLong() * 1000),
-									)
+						},
+						description = {
+							TrustedNetworkTextBox(
+								config.tunnelNetworks,
+								onDelete = { optionsViewModel.onDeleteRunSSID(it, config) },
+								currentText = currentText,
+								onSave = { optionsViewModel.onSaveRunSSID(it, config) },
+								onValueChange = { currentText = it },
+								supporting = {
+									if (appUiState.settings.isWildcardsEnabled) {
+										WildcardsLabel()
+									}
 								},
 							)
-							SubmitConfigurationTextBox(
-								config.pingCooldown?.let { (it / 1000).toString() },
-								stringResource(R.string.set_custom_ping_cooldown),
-								"(${stringResource(R.string.optional_default)} ${Constants.PING_COOLDOWN / 1000})",
-								focusRequester,
-								keyboardOptions = KeyboardOptions(
-									keyboardType = KeyboardType.Number,
-								),
-								isErrorValue = ::isSecondsError,
-								onSubmit = {
-									optionsViewModel.saveTunnelChanges(
-										config.copy(pingCooldown = if (it.isBlank()) null else it.toLong() * 1000),
-									)
-								},
-							)
-						}
-					}
-				}
-			}
+						},
+					),
+				),
+			)
 		}
 	}
 }

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

@@ -32,6 +32,7 @@ constructor(
 	}
 
 	fun onSaveRunSSID(ssid: String, tunnelConfig: TunnelConfig) = viewModelScope.launch {
+		if (ssid.isBlank()) return@launch
 		val trimmed = ssid.trim()
 		val tunnelsWithName = appDataRepository.tunnels.findByTunnelNetworksName(trimmed)
 

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

@@ -1,87 +1,61 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.settings
 
-import android.Manifest
-import android.content.Context.POWER_SERVICE
-import android.content.Intent
-import android.net.Uri
-import android.net.VpnService
-import android.os.Build
-import android.os.PowerManager
-import android.provider.Settings
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity.RESULT_OK
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.focusable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
-import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.outlined.Add
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
+import androidx.compose.material.icons.automirrored.outlined.ViewQuilt
+import androidx.compose.material.icons.filled.AppShortcut
+import androidx.compose.material.icons.outlined.AdminPanelSettings
+import androidx.compose.material.icons.outlined.Bolt
+import androidx.compose.material.icons.outlined.Code
+import androidx.compose.material.icons.outlined.FolderZip
+import androidx.compose.material.icons.outlined.Notifications
+import androidx.compose.material.icons.outlined.Pin
+import androidx.compose.material.icons.outlined.Restore
+import androidx.compose.material.icons.outlined.VpnLock
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.KeyboardCapitalization
 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.google.accompanist.permissions.isGranted
-import com.google.accompanist.permissions.rememberPermissionState
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
 import com.zaneschepke.wireguardautotunnel.ui.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.ClickableIconButton
-import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationToggle
+import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalFocusRequester
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
-import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.VpnDeniedDialog
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.BackgroundLocationDialog
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.BackgroundLocationDisclosure
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.LocationServicesDialog
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.WildcardSupportingLabel
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
+import com.zaneschepke.wireguardautotunnel.ui.theme.topPadding
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
-import com.zaneschepke.wireguardautotunnel.util.extensions.launchAppSettings
-import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
+import com.zaneschepke.wireguardautotunnel.util.extensions.launchNotificationSettings
+import com.zaneschepke.wireguardautotunnel.util.extensions.launchVpnSettings
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
 import com.zaneschepke.wireguardautotunnel.util.extensions.showToast
 import xyz.teamgravity.pin_lock_compose.PinManager
 
@@ -90,157 +64,22 @@ import xyz.teamgravity.pin_lock_compose.PinManager
 	ExperimentalLayoutApi::class,
 )
 @Composable
-fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel: AppViewModel, uiState: AppUiState, focusRequester: FocusRequester) {
+fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel: AppViewModel, uiState: AppUiState) {
 	val context = LocalContext.current
 	val navController = LocalNavController.current
 	val focusManager = LocalFocusManager.current
 	val snackbar = SnackbarController.current
+	val rootFocusRequester = LocalFocusRequester.current
+	val isRunningOnTv = remember { context.isRunningOnTv() }
 
-	val scrollState = rememberScrollState()
 	val interactionSource = remember { MutableInteractionSource() }
-	val isRunningOnTv = context.isRunningOnTv()
-
-	val settingsUiState by viewModel.uiState.collectAsStateWithLifecycle()
-
-	val fineLocationState = rememberPermissionState(Manifest.permission.ACCESS_FINE_LOCATION)
-	var currentText by remember { mutableStateOf("") }
-	var isBackgroundLocationGranted by remember { mutableStateOf(true) }
-	var showVpnPermissionDialog by remember { mutableStateOf(false) }
-	var showLocationServicesAlertDialog by remember { mutableStateOf(false) }
-	val didExportFiles by remember { mutableStateOf(false) }
 	var showAuthPrompt by remember { mutableStateOf(false) }
-	var showLocationDialog by remember { mutableStateOf(false) }
-
-	val screenPadding = 5.dp
-	val fillMaxWidth = .85f
-
-	LaunchedEffect(uiState.settings.trustedNetworkSSIDs) {
-		currentText = ""
-	}
-
-	val startForResult =
-		rememberLauncherForActivityResult(
-			ActivityResultContracts.StartActivityForResult(),
-		) { result: ActivityResult ->
-			if (result.resultCode == RESULT_OK) {
-				result.data
-				// Handle the Intent
-			}
-			viewModel.setBatteryOptimizeDisableShown()
-		}
-
-	val vpnActivityResultState =
-		rememberLauncherForActivityResult(
-			ActivityResultContracts.StartActivityForResult(),
-			onResult = {
-				val accepted = (it.resultCode == RESULT_OK)
-				if (accepted) {
-					viewModel.onToggleAutoTunnel(context)
-				} else {
-					showVpnPermissionDialog = true
-				}
-			},
-		)
-
-	fun isBatteryOptimizationsDisabled(): Boolean {
-		val pm = context.getSystemService(POWER_SERVICE) as PowerManager
-		return pm.isIgnoringBatteryOptimizations(context.packageName)
-	}
-
-	fun requestBatteryOptimizationsDisabled() {
-		val intent =
-			Intent().apply {
-				action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
-				data = Uri.parse("package:${context.packageName}")
-			}
-		startForResult.launch(intent)
-	}
-
-	fun handleAutoTunnelToggle() {
-		if (!uiState.generalState.isBatteryOptimizationDisableShown &&
-			!isBatteryOptimizationsDisabled() && !context.isRunningOnTv()
-		) {
-			return requestBatteryOptimizationsDisabled()
-		}
-		val intent = if (!uiState.settings.isKernelEnabled) {
-			VpnService.prepare(context)
-		} else {
-			null
-		}
-		if (intent != null) return vpnActivityResultState.launch(intent)
-		viewModel.onToggleAutoTunnel(context)
-	}
-
-	fun saveTrustedSSID() {
-		if (currentText.isNotEmpty()) {
-			viewModel.onSaveTrustedSSID(currentText)
-		}
-	}
-
-	fun checkFineLocationGranted() {
-		isBackgroundLocationGranted =
-			if (!fineLocationState.status.isGranted) {
-				false
-			} else {
-				viewModel.setLocationDisclosureShown()
-				true
-			}
-	}
-
-	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-		if (
-			isRunningOnTv &&
-			Build.VERSION.SDK_INT == Build.VERSION_CODES.Q
-		) {
-			checkFineLocationGranted()
-		} else {
-			val backgroundLocationState =
-				rememberPermissionState(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
-			isBackgroundLocationGranted =
-				if (!backgroundLocationState.status.isGranted) {
-					false
-				} else {
-					SideEffect { viewModel.setLocationDisclosureShown() }
-					true
-				}
-		}
-	}
-
-	if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
-		checkFineLocationGranted()
-	}
-	if (!uiState.generalState.isLocationDisclosureShown) {
-		BackgroundLocationDisclosure(
-			onDismiss = { viewModel.setLocationDisclosureShown() },
-			onAttest = {
-				context.launchAppSettings()
-				viewModel.setLocationDisclosureShown()
-			},
-			scrollState,
-			focusRequester,
-		)
-		return
-	}
-
-	BackgroundLocationDialog(
-		showLocationDialog,
-		onDismiss = { showLocationDialog = false },
-		onAttest = { showLocationDialog = false },
-	)
-
-	LocationServicesDialog(
-		showLocationServicesAlertDialog,
-		onDismiss = { showVpnPermissionDialog = false },
-		onAttest = { handleAutoTunnelToggle() },
-	)
-
-	VpnDeniedDialog(showVpnPermissionDialog, onDismiss = { showVpnPermissionDialog = false })
 
 	if (showAuthPrompt) {
 		AuthorizationPrompt(
 			onSuccess = {
 				showAuthPrompt = false
-				viewModel.exportAllConfigs()
+				viewModel.exportAllConfigs(context)
 			},
 			onError = { _ ->
 				showAuthPrompt = false
@@ -257,351 +96,238 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel:
 		)
 	}
 
-	fun onAutoTunnelWifiChecked() {
-		when (false) {
-			isBackgroundLocationGranted -> showLocationDialog = true
-			fineLocationState.status.isGranted -> showLocationDialog = true
-			viewModel.isLocationEnabled(context) ->
-				showLocationServicesAlertDialog = true
-			else -> {
-				viewModel.onToggleTunnelOnWifi()
-			}
-		}
-	}
-
 	Column(
-		horizontalAlignment = Alignment.CenterHorizontally,
-		verticalArrangement = Arrangement.Top,
+		horizontalAlignment = Alignment.Start,
+		verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
 		modifier =
 		Modifier
+			.verticalScroll(rememberScrollState())
 			.fillMaxSize()
-			.verticalScroll(scrollState)
-			.clickable(
-				indication = null,
-				interactionSource = interactionSource,
-			) {
-				focusManager.clearFocus()
-			},
-	) {
-		Surface(
-			tonalElevation = 2.dp,
-			shadowElevation = 2.dp,
-			shape = RoundedCornerShape(12.dp),
-			color = MaterialTheme.colorScheme.surface,
-			modifier =
-			(
-				if (isRunningOnTv) {
-					Modifier
-						.height(IntrinsicSize.Min)
-						.fillMaxWidth(fillMaxWidth)
-						.padding(top = 10.dp)
+			.padding(top = topPadding)
+			.padding(bottom = 40.dp.scaledHeight())
+			.padding(horizontal = 24.dp.scaledWidth())
+			.then(
+				if (!isRunningOnTv) {
+					Modifier.clickable(
+						indication = null,
+						interactionSource = interactionSource,
+					) {
+						focusManager.clearFocus()
+					}
 				} else {
 					Modifier
-						.fillMaxWidth(fillMaxWidth)
-						.padding(top = 20.dp)
-				}
-				)
-				.padding(bottom = 10.dp),
-		) {
-			Column(
-				horizontalAlignment = Alignment.Start,
-				verticalArrangement = Arrangement.Top,
-				modifier = Modifier.padding(15.dp),
-			) {
-				SectionTitle(
-					title = stringResource(id = R.string.auto_tunneling),
-					padding = screenPadding,
-				)
-				ConfigurationToggle(
-					stringResource(id = R.string.tunnel_on_wifi),
-					enabled = !uiState.settings.isAlwaysOnVpnEnabled,
-					checked = uiState.settings.isTunnelOnWifiEnabled,
-					padding = screenPadding,
-					onCheckChanged = { checked ->
-						if (!checked || settingsUiState.isRooted) viewModel.onToggleTunnelOnWifi().also { return@ConfigurationToggle }
-						onAutoTunnelWifiChecked()
+				},
+			),
+	) {
+		SurfaceSelectionGroupButton(
+			listOf(
+				SelectionItem(
+					Icons.Outlined.Bolt,
+					title = { Text(stringResource(R.string.auto_tunneling), style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface)) },
+					description = {
+						Text(
+							stringResource(R.string.on_demand_rules),
+							style = MaterialTheme.typography.bodySmall.copy(MaterialTheme.colorScheme.outline),
+						)
 					},
-					modifier =
-					if (uiState.settings.isAutoTunnelEnabled) {
-						Modifier
-					} else {
-						Modifier
-							.focusRequester(focusRequester)
+					onClick = {
+						if (!uiState.generalState.isLocationDisclosureShown) return@SelectionItem navController.navigate(Route.LocationDisclosure)
+						navController.navigate(Route.AutoTunnel)
 					},
-				)
-				if (uiState.settings.isTunnelOnWifiEnabled) {
-					Column {
-						FlowRow(
-							modifier =
-							Modifier
-								.padding(screenPadding)
-								.fillMaxWidth(),
-							horizontalArrangement = Arrangement.spacedBy(5.dp),
-						) {
-							uiState.settings.trustedNetworkSSIDs.forEach { ssid ->
-								ClickableIconButton(
-									onClick = {
-										if (isRunningOnTv) {
-											focusRequester.requestFocus()
-											viewModel.onDeleteTrustedSSID(ssid)
-										}
-									},
-									onIconClick = {
-										if (isRunningOnTv) focusRequester.requestFocus()
-										viewModel.onDeleteTrustedSSID(ssid)
-									},
-									text = ssid,
-									icon = Icons.Filled.Close,
-								)
-							}
-							if (uiState.settings.trustedNetworkSSIDs.isEmpty()) {
-								Text(
-									stringResource(R.string.none),
-									fontStyle = FontStyle.Italic,
-									style = MaterialTheme.typography.bodySmall,
-									color = MaterialTheme.colorScheme.onSurface,
-								)
-							}
-						}
-						OutlinedTextField(
-							value = currentText,
-							onValueChange = { currentText = it },
-							label = { Text(stringResource(R.string.add_trusted_ssid)) },
-							modifier =
-							Modifier
-								.padding(
-									start = screenPadding,
-									top = 5.dp,
-									bottom = 10.dp,
-								),
-							supportingText = { WildcardSupportingLabel { context.openWebUrl(it) } },
-							maxLines = 1,
-							keyboardOptions =
-							KeyboardOptions(
-								capitalization = KeyboardCapitalization.None,
-								imeAction = ImeAction.Done,
+					trailing = {
+						ForwardButton(Modifier.focusable().focusRequester(rootFocusRequester)) { navController.navigate(Route.AutoTunnel) }
+					},
+				),
+			),
+		)
+		SurfaceSelectionGroupButton(
+			buildList {
+				if (!isRunningOnTv) {
+					addAll(
+						listOf(
+							SelectionItem(
+								Icons.Filled.AppShortcut,
+								{
+									ScaledSwitch(
+										uiState.settings.isShortcutsEnabled,
+										onClick = { viewModel.onToggleShortcutsEnabled() },
+									)
+								},
+								title = {
+									Text(
+										stringResource(R.string.enabled_app_shortcuts),
+										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+									)
+								},
+								onClick = { viewModel.onToggleShortcutsEnabled() },
 							),
-							keyboardActions = KeyboardActions(onDone = { saveTrustedSSID() }),
-							trailingIcon = {
-								if (currentText != "") {
-									IconButton(onClick = { saveTrustedSSID() }) {
-										Icon(
-											imageVector = Icons.Outlined.Add,
-											contentDescription =
-											if (currentText == "") {
-												stringResource(
-													id =
-													R.string
-														.trusted_ssid_empty_description,
-												)
-											} else {
-												stringResource(
-													id =
-													R.string
-														.trusted_ssid_value_description,
-												)
-											},
-											tint = MaterialTheme.colorScheme.primary,
-										)
-									}
+							SelectionItem(
+								Icons.Outlined.VpnLock,
+								{
+									ScaledSwitch(
+										enabled = !(
+											(
+												uiState.settings.isTunnelOnWifiEnabled ||
+													uiState.settings.isTunnelOnEthernetEnabled ||
+													uiState.settings.isTunnelOnMobileDataEnabled
+												) &&
+												uiState.settings.isAutoTunnelEnabled
+											),
+										onClick = { viewModel.onToggleAlwaysOnVPN() },
+										checked = uiState.settings.isAlwaysOnVpnEnabled,
+									)
+								},
+								title = {
+									Text(
+										stringResource(R.string.always_on_vpn_support),
+										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+									)
+								},
+								onClick = { viewModel.onToggleAlwaysOnVPN() },
+							),
+							SelectionItem(
+								Icons.Outlined.AdminPanelSettings,
+								title = {
+									Text(
+										stringResource(R.string.kill_switch),
+										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+									)
+								},
+								onClick = {
+									context.launchVpnSettings()
+								},
+								trailing = {
+									ForwardButton { context.launchVpnSettings() }
+								},
+							),
+						),
+					)
+				}
+				add(
+					SelectionItem(
+						Icons.Outlined.Restore,
+						{
+							ScaledSwitch(
+								uiState.settings.isRestoreOnBootEnabled,
+								onClick = { viewModel.onToggleRestartAtBoot() },
+							)
+						},
+						title = {
+							Text(
+								stringResource(R.string.restart_at_boot),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						onClick = { viewModel.onToggleRestartAtBoot() },
+					),
+				)
+			},
+		)
+
+		SurfaceSelectionGroupButton(
+			listOf(
+				SelectionItem(
+					Icons.AutoMirrored.Outlined.ViewQuilt,
+					title = { Text(stringResource(R.string.appearance), style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface)) },
+					onClick = {
+						navController.navigate(Route.Appearance)
+					},
+					trailing = {
+						ForwardButton { navController.navigate(Route.Appearance) }
+					},
+				),
+				SelectionItem(
+					Icons.Outlined.Notifications,
+					title = { Text(stringResource(R.string.notifications), style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface)) },
+					onClick = {
+						context.launchNotificationSettings()
+					},
+					trailing = {
+						ForwardButton { context.launchNotificationSettings() }
+					},
+				),
+				SelectionItem(
+					Icons.Outlined.Pin,
+					title = {
+						Text(
+							stringResource(R.string.enable_app_lock),
+							style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+						)
+					},
+					trailing = {
+						ScaledSwitch(
+							uiState.generalState.isPinLockEnabled,
+							onClick = {
+								if (uiState.generalState.isPinLockEnabled) {
+									appViewModel.onPinLockDisabled()
+								} else {
+									PinManager.initialize(context)
+									navController.navigate(Route.Lock)
 								}
 							},
 						)
-					}
-				}
-				ConfigurationToggle(
-					stringResource(R.string.tunnel_mobile_data),
-					enabled = !uiState.settings.isAlwaysOnVpnEnabled,
-					checked = uiState.settings.isTunnelOnMobileDataEnabled,
-					padding = screenPadding,
-					onCheckChanged = { viewModel.onToggleTunnelOnMobileData() },
-				)
-				ConfigurationToggle(
-					stringResource(id = R.string.tunnel_on_ethernet),
-					enabled = !uiState.settings.isAlwaysOnVpnEnabled,
-					checked = uiState.settings.isTunnelOnEthernetEnabled,
-					padding = screenPadding,
-					onCheckChanged = { viewModel.onToggleTunnelOnEthernet() },
-				)
-				ConfigurationToggle(
-					stringResource(R.string.restart_on_ping),
-					checked = uiState.settings.isPingEnabled,
-					padding = screenPadding,
-					onCheckChanged = { viewModel.onToggleRestartOnPing() },
-				)
-				Row(
-					verticalAlignment = Alignment.CenterVertically,
-					modifier =
-					(
-						if (!uiState.settings.isAutoTunnelEnabled) {
-							Modifier
-						} else {
-							Modifier.focusRequester(
-								focusRequester,
-							)
-						}
-						)
-						.fillMaxSize()
-						.padding(top = 5.dp),
-					horizontalArrangement = Arrangement.Center,
-				) {
-					TextButton(
-						onClick = {
-							if (uiState.tunnels.isEmpty()) return@TextButton context.showToast(R.string.tunnel_required)
-							handleAutoTunnelToggle()
-						},
-					) {
-						val autoTunnelButtonText =
-							if (uiState.settings.isAutoTunnelEnabled) {
-								stringResource(R.string.disable_auto_tunnel)
-							} else {
-								stringResource(id = R.string.enable_auto_tunnel)
-							}
-						Text(autoTunnelButtonText)
-					}
-				}
-			}
-		}
-		Surface(
-			tonalElevation = 2.dp,
-			shadowElevation = 2.dp,
-			shape = RoundedCornerShape(12.dp),
-			color = MaterialTheme.colorScheme.surface,
-			modifier =
-			Modifier
-				.fillMaxWidth(fillMaxWidth)
-				.padding(vertical = 10.dp),
-		) {
-			Column(
-				horizontalAlignment = Alignment.Start,
-				verticalArrangement = Arrangement.Top,
-				modifier = Modifier.padding(15.dp),
-			) {
-				SectionTitle(
-					title = stringResource(id = R.string.backend),
-					padding = screenPadding,
-				)
-				ConfigurationToggle(
-					stringResource(R.string.use_kernel),
-					enabled =
-					!(
-						uiState.settings.isAutoTunnelEnabled ||
-							uiState.settings.isAlwaysOnVpnEnabled ||
-							(uiState.vpnState.status == TunnelState.UP) ||
-							!settingsUiState.isKernelAvailable
-						),
-					checked = uiState.settings.isKernelEnabled,
-					padding = screenPadding,
-					onCheckChanged = {
-						viewModel.onToggleKernelMode()
 					},
-				)
-				Row(
-					verticalAlignment = Alignment.CenterVertically,
-					modifier =
-					Modifier
-						.fillMaxSize()
-						.padding(top = 5.dp),
-					horizontalArrangement = Arrangement.Center,
-				) {
-					TextButton(
-						onClick = {
-							viewModel.onRequestRoot()
-						},
-					) {
-						Text(stringResource(R.string.request_root))
-					}
-				}
-			}
-		}
-		Surface(
-			tonalElevation = 2.dp,
-			shadowElevation = 2.dp,
-			shape = RoundedCornerShape(12.dp),
-			color = MaterialTheme.colorScheme.surface,
-			modifier =
-			Modifier
-				.fillMaxWidth(fillMaxWidth)
-				.padding(vertical = 10.dp)
-				.padding(bottom = 10.dp),
-		) {
-			Column(
-				horizontalAlignment = Alignment.Start,
-				verticalArrangement = Arrangement.Top,
-				modifier = Modifier.padding(15.dp),
-			) {
-				SectionTitle(
-					title = stringResource(id = R.string.other),
-					padding = screenPadding,
-				)
-				if (!isRunningOnTv) {
-					ConfigurationToggle(
-						stringResource(R.string.always_on_vpn_support),
-						enabled = !(
-							(
-								uiState.settings.isTunnelOnWifiEnabled ||
-									uiState.settings.isTunnelOnEthernetEnabled ||
-									uiState.settings.isTunnelOnMobileDataEnabled
-								) &&
-								uiState.settings.isAutoTunnelEnabled
-							),
-						checked = uiState.settings.isAlwaysOnVpnEnabled,
-						padding = screenPadding,
-						onCheckChanged = { viewModel.onToggleAlwaysOnVPN() },
-					)
-					ConfigurationToggle(
-						stringResource(R.string.enabled_app_shortcuts),
-						enabled = true,
-						checked = uiState.settings.isShortcutsEnabled,
-						padding = screenPadding,
-						onCheckChanged = { viewModel.onToggleShortcutsEnabled() },
-					)
-				}
-				ConfigurationToggle(
-					stringResource(R.string.restart_at_boot),
-					enabled = true,
-					checked = uiState.settings.isRestoreOnBootEnabled,
-					padding = screenPadding,
-					onCheckChanged = {
-						viewModel.onToggleRestartAtBoot()
-					},
-				)
-				ConfigurationToggle(
-					stringResource(R.string.enable_app_lock),
-					enabled = true,
-					checked = uiState.generalState.isPinLockEnabled,
-					padding = screenPadding,
-					onCheckChanged = {
+					onClick = {
 						if (uiState.generalState.isPinLockEnabled) {
 							appViewModel.onPinLockDisabled()
 						} else {
-							// TODO may want to show a dialog before proceeding in the future
-							PinManager.initialize(WireGuardAutoTunnel.instance)
+							PinManager.initialize(context)
 							navController.navigate(Route.Lock)
 						}
 					},
-				)
-				if (!isRunningOnTv) {
-					Row(
-						verticalAlignment = Alignment.CenterVertically,
-						modifier =
-						Modifier
-							.fillMaxSize()
-							.padding(top = 5.dp),
-						horizontalArrangement = Arrangement.Center,
-					) {
-						TextButton(
-							enabled = !didExportFiles,
-							onClick = {
-								if (uiState.tunnels.isEmpty()) return@TextButton context.showToast(R.string.tunnel_required)
-								showAuthPrompt = true
-							},
-						) {
-							Text(stringResource(R.string.export_configs))
-						}
-					}
-				}
-			}
+				),
+			),
+		)
+
+		if (!isRunningOnTv) {
+			SurfaceSelectionGroupButton(
+				listOf(
+					SelectionItem(
+						Icons.Outlined.Code,
+						title = { Text(stringResource(R.string.kernel), style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface)) },
+						description = {
+							Text(
+								stringResource(R.string.use_kernel),
+								style = MaterialTheme.typography.bodySmall.copy(MaterialTheme.colorScheme.outline),
+							)
+						},
+						trailing = {
+							ScaledSwitch(
+								uiState.settings.isKernelEnabled,
+								onClick = { viewModel.onToggleKernelMode() },
+								enabled = !(
+									uiState.settings.isAutoTunnelEnabled ||
+										uiState.settings.isAlwaysOnVpnEnabled ||
+										(uiState.vpnState.status == TunnelState.UP)
+									),
+							)
+						},
+						onClick = {
+							viewModel.onToggleKernelMode()
+						},
+					),
+				),
+			)
+		}
+
+		if (!isRunningOnTv) {
+			SurfaceSelectionGroupButton(
+				listOf(
+					SelectionItem(
+						Icons.Outlined.FolderZip,
+						title = {
+							Text(
+								stringResource(R.string.export_configs),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						onClick = {
+							if (uiState.tunnels.isEmpty()) return@SelectionItem context.showToast(R.string.tunnel_required)
+							showAuthPrompt = true
+						},
+					),
+				),
+			)
 		}
 	}
 }

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

@@ -1,6 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings
-
-data class SettingsUiState(
-	val isRooted: Boolean = false,
-	val isKernelAvailable: Boolean = false,
-)

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

@@ -1,8 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.settings
 
 import android.content.Context
-import android.location.LocationManager
-import androidx.core.location.LocationManagerCompat
+import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wireguard.android.backend.WgQuickBackend
@@ -10,22 +9,19 @@ import com.wireguard.android.util.RootShell
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.AppShell
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
-import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.FileUtils
 import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.extensions.launchShareFile
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.io.File
+import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Provider
 
@@ -34,94 +30,18 @@ class SettingsViewModel
 @Inject
 constructor(
 	private val appDataRepository: AppDataRepository,
-	private val rootShell: Provider<RootShell>,
+	@AppShell private val rootShell: Provider<RootShell>,
 	private val fileUtils: FileUtils,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
 
-	private val _uiState = MutableStateFlow(SettingsUiState())
-	val uiState = _uiState.onStart {
-		_uiState.update {
-			it.copy(isKernelAvailable = isKernelSupported(), isRooted = isRooted())
-		}
-	}.stateIn(
-		viewModelScope,
-		SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
-		SettingsUiState(),
-	)
 	private val settings = appDataRepository.settings.getSettingsFlow()
 		.stateIn(viewModelScope, SharingStarted.Eagerly, Settings())
 
-	fun onSaveTrustedSSID(ssid: String) = viewModelScope.launch {
-		val trimmed = ssid.trim()
-		with(settings.value) {
-			if (!trustedNetworkSSIDs.contains(trimmed)) {
-				this.trustedNetworkSSIDs.add(ssid)
-				appDataRepository.settings.save(this)
-			} else {
-				SnackbarController.showMessage(
-					StringValue.StringResource(
-						R.string.error_ssid_exists,
-					),
-				)
-			}
-		}
-	}
-
 	fun setLocationDisclosureShown() = viewModelScope.launch {
 		appDataRepository.appState.setLocationDisclosureShown(true)
 	}
 
-	fun setBatteryOptimizeDisableShown() = viewModelScope.launch {
-		appDataRepository.appState.setBatteryOptimizationDisableShown(true)
-	}
-
-	fun onToggleTunnelOnMobileData() = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				copy(
-					isTunnelOnMobileDataEnabled = !this.isTunnelOnMobileDataEnabled,
-				),
-			)
-		}
-	}
-
-	fun onDeleteTrustedSSID(ssid: String) = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				copy(
-					trustedNetworkSSIDs = (this.trustedNetworkSSIDs - ssid).toMutableList(),
-				),
-			)
-		}
-	}
-
-	private fun exportTunnels(files: List<File>) = viewModelScope.launch {
-		fileUtils.saveFilesToZip(files).onSuccess {
-			SnackbarController.showMessage(StringValue.StringResource(R.string.exported_configs_message))
-		}.onFailure {
-			SnackbarController.showMessage(StringValue.StringResource(R.string.export_configs_failed))
-		}
-	}
-
-	fun onToggleAutoTunnel(context: Context) = viewModelScope.launch {
-		with(settings.value) {
-			var isAutoTunnelPaused = this.isAutoTunnelPaused
-			if (isAutoTunnelEnabled) {
-				ServiceManager.stopWatcherService(context)
-			} else {
-				ServiceManager.startWatcherService(context)
-				isAutoTunnelPaused = false
-			}
-			appDataRepository.settings.save(
-				copy(
-					isAutoTunnelEnabled = !isAutoTunnelEnabled,
-					isAutoTunnelPaused = isAutoTunnelPaused,
-				),
-			)
-		}
-	}
-
 	fun onToggleAlwaysOnVPN() = viewModelScope.launch {
 		with(settings.value) {
 			appDataRepository.settings.save(
@@ -132,24 +52,6 @@ constructor(
 		}
 	}
 
-	fun onToggleTunnelOnEthernet() = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				copy(
-					isTunnelOnEthernetEnabled = !isTunnelOnEthernetEnabled,
-				),
-			)
-		}
-	}
-
-	fun isLocationEnabled(context: Context): Boolean {
-		val locationManager =
-			context.getSystemService(
-				Context.LOCATION_SERVICE,
-			) as LocationManager
-		return LocationManagerCompat.isLocationEnabled(locationManager)
-	}
-
 	fun onToggleShortcutsEnabled() = viewModelScope.launch {
 		with(settings.value) {
 			appDataRepository.settings.save(
@@ -170,33 +72,11 @@ constructor(
 		}
 	}
 
-	fun onToggleTunnelOnWifi() = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				copy(
-					isTunnelOnWifiEnabled = !isTunnelOnWifiEnabled,
-				),
-			)
-		}
-	}
-
-	fun onToggleAmnezia() = viewModelScope.launch {
-		with(settings.value) {
-			if (isKernelEnabled) {
-				saveKernelMode(false)
-			}
-			appDataRepository.settings.save(
-				copy(
-					isAmneziaEnabled = !isAmneziaEnabled,
-				),
-			)
-		}
-	}
-
 	fun onToggleKernelMode() = viewModelScope.launch {
 		with(settings.value) {
 			if (!isKernelEnabled) {
 				requestRoot().onSuccess {
+					if (!isKernelSupported()) return@onSuccess SnackbarController.showMessage(StringValue.StringResource(R.string.kernel_not_supported))
 					appDataRepository.settings.save(
 						copy(
 							isKernelEnabled = true,
@@ -210,16 +90,6 @@ constructor(
 		}
 	}
 
-	fun onToggleRestartOnPing() = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				copy(
-					isPingEnabled = !isPingEnabled,
-				),
-			)
-		}
-	}
-
 	private suspend fun isKernelSupported(): Boolean {
 		return withContext(ioDispatcher) {
 			WgQuickBackend.hasKernelSupport()
@@ -236,17 +106,6 @@ constructor(
 		}
 	}
 
-	private suspend fun isRooted(): Boolean {
-		return try {
-			withContext(ioDispatcher) {
-				rootShell.get().start()
-			}
-			true
-		} catch (_: Exception) {
-			false
-		}
-	}
-
 	private suspend fun requestRoot(): Result<Unit> {
 		return withContext(ioDispatcher) {
 			kotlin.runCatching {
@@ -258,16 +117,16 @@ constructor(
 		}
 	}
 
-	fun onRequestRoot() = viewModelScope.launch {
-		requestRoot()
-	}
-
-	fun exportAllConfigs() = viewModelScope.launch {
+	fun exportAllConfigs(context: Context) = viewModelScope.launch {
 		kotlin.runCatching {
+			val shareFile = fileUtils.createNewShareFile("wg-export_${Instant.now().epochSecond}.zip")
 			val tunnels = appDataRepository.tunnels.getAll()
 			val wgFiles = fileUtils.createWgFiles(tunnels)
 			val amFiles = fileUtils.createAmFiles(tunnels)
-			exportTunnels(wgFiles + amFiles)
+			val allFiles = wgFiles + amFiles
+			fileUtils.zipAll(shareFile, allFiles)
+			val uri = FileProvider.getUriForFile(context, context.getString(R.string.provider), shareFile)
+			context.launchShareFile(uri)
 		}
 	}
 }

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

@@ -0,0 +1,72 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance
+
+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.material.icons.Icons
+import androidx.compose.material.icons.outlined.Contrast
+import androidx.compose.material.icons.outlined.Translate
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+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.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+
+@Composable
+fun AppearanceScreen() {
+	val navController = LocalNavController.current
+
+	Scaffold(
+		topBar = {
+			TopNavBar(stringResource(R.string.appearance))
+		},
+	) {
+		Column(
+			horizontalAlignment = Alignment.Start,
+			verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
+			modifier =
+			Modifier
+				.fillMaxSize().padding(it)
+				.padding(top = 24.dp.scaledHeight())
+				.padding(horizontal = 24.dp.scaledWidth()),
+		) {
+			SurfaceSelectionGroupButton(
+				listOf(
+					SelectionItem(
+						Icons.Outlined.Translate,
+						title = { Text(stringResource(R.string.language), style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface)) },
+						onClick = { navController.navigate(Route.Language) },
+						trailing = {
+							ForwardButton { navController.navigate(Route.Language) }
+						},
+					),
+				),
+			)
+			SurfaceSelectionGroupButton(
+				listOf(
+					SelectionItem(
+						Icons.Outlined.Contrast,
+						title = { Text(stringResource(R.string.display_theme), style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface)) },
+						onClick = { navController.navigate(Route.Display) },
+						trailing = {
+							ForwardButton { navController.navigate(Route.Display) }
+						},
+					),
+				),
+			)
+		}
+	}
+}

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

@@ -0,0 +1,63 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.display
+
+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.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.common.button.IconSurfaceButton
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
+import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+
+@Composable
+fun DisplayScreen(appUiState: AppUiState, viewModel: DisplayViewModel = hiltViewModel()) {
+	Scaffold(
+		topBar = {
+			TopNavBar(stringResource(R.string.display_theme))
+		},
+	) {
+		Column(
+			horizontalAlignment = Alignment.Start,
+			verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
+			modifier =
+			Modifier
+				.fillMaxSize()
+				.padding(it)
+				.padding(top = 24.dp.scaledHeight())
+				.padding(horizontal = 24.dp.scaledWidth()),
+		) {
+			IconSurfaceButton(
+				title = stringResource(R.string.automatic),
+				onClick = {
+					viewModel.onThemeChange(Theme.AUTOMATIC)
+				},
+				selected = appUiState.generalState.theme == Theme.AUTOMATIC,
+			)
+			IconSurfaceButton(
+				title = stringResource(R.string.light),
+				onClick = { viewModel.onThemeChange(Theme.LIGHT) },
+				selected = appUiState.generalState.theme == Theme.LIGHT,
+			)
+			IconSurfaceButton(
+				title = stringResource(R.string.dark),
+				onClick = { viewModel.onThemeChange(Theme.DARK) },
+				selected = appUiState.generalState.theme == Theme.DARK,
+			)
+			IconSurfaceButton(
+				title = stringResource(R.string.dynamic),
+				onClick = { viewModel.onThemeChange(Theme.DYNAMIC) },
+				selected = appUiState.generalState.theme == Theme.DYNAMIC,
+			)
+		}
+	}
+}

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

@@ -0,0 +1,21 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.display
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class DisplayViewModel
+@Inject
+constructor(
+	private val appStateRepository: AppStateRepository,
+) : ViewModel() {
+
+	fun onThemeChange(theme: Theme) = viewModelScope.launch {
+		appStateRepository.setTheme(theme)
+	}
+}

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

@@ -0,0 +1,114 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableStateOf
+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.unit.dp
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.datastore.LocaleStorage
+import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.SelectedLabel
+import com.zaneschepke.wireguardautotunnel.ui.common.button.SelectionItemButton
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
+import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
+import com.zaneschepke.wireguardautotunnel.util.extensions.navigateAndForget
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+import timber.log.Timber
+import java.text.Collator
+import java.util.Locale
+
+@Composable
+fun LanguageScreen(localeStorage: LocaleStorage) {
+	val navController = LocalNavController.current
+
+	val context = LocalContext.current
+
+	val collator = Collator.getInstance(Locale.getDefault())
+
+	val currentLocale = remember { mutableStateOf(LocaleUtil.OPTION_PHONE_LANGUAGE) }
+
+	val locales = LocaleUtil.supportedLocales.map {
+		val tag = it.replace("_", "-")
+		Locale.forLanguageTag(tag)
+	}
+
+	val sortedLocales =
+		remember(locales) {
+			locales.sortedWith(compareBy(collator) { it.getDisplayName(it) }).toList()
+		}
+
+	LaunchedEffect(Unit) {
+		currentLocale.value = localeStorage.getPreferredLocale()
+	}
+
+	fun onChangeLocale(locale: String) {
+		Timber.d("Setting preferred locale: $locale")
+		localeStorage.setPreferredLocale(locale)
+		LocaleUtil.applyLocalizedContext(context, locale)
+		navController.navigateAndForget(Route.Main)
+	}
+
+	Scaffold(
+		topBar = {
+			TopNavBar(stringResource(R.string.language))
+		},
+	) {
+		LazyColumn(
+			horizontalAlignment = Alignment.CenterHorizontally,
+			verticalArrangement = Arrangement.Top,
+			modifier =
+			Modifier
+				.fillMaxSize().padding(it)
+				.padding(horizontal = 24.dp.scaledWidth()).windowInsetsPadding(WindowInsets.navigationBars),
+		) {
+			item {
+				Box(modifier = Modifier.padding(top = 24.dp.scaledHeight())) {
+					SelectionItemButton(
+						buttonText = stringResource(R.string.automatic),
+						onClick = {
+							onChangeLocale(LocaleUtil.OPTION_PHONE_LANGUAGE)
+						},
+						trailing = {
+							if (currentLocale.value == LocaleUtil.OPTION_PHONE_LANGUAGE) {
+								SelectedLabel()
+							}
+						},
+						ripple = false,
+					)
+				}
+			}
+			items(sortedLocales, key = { it }) { locale ->
+				SelectionItemButton(
+					buttonText = locale.getDisplayLanguage(locale).capitalize(locale) +
+						if (locale.toLanguageTag().contains("-")) " (${locale.getDisplayCountry(locale).capitalize(locale)})" else "",
+					onClick = {
+						onChangeLocale(locale.toLanguageTag())
+					},
+					trailing = {
+						if (locale.toLanguageTag() == currentLocale.value) {
+							SelectedLabel()
+						}
+					},
+					ripple = false,
+				)
+			}
+		}
+	}
+}

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

@@ -0,0 +1,330 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel
+
+import android.Manifest
+import android.os.Build
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Code
+import androidx.compose.material.icons.outlined.Filter1
+import androidx.compose.material.icons.outlined.NetworkPing
+import androidx.compose.material.icons.outlined.Security
+import androidx.compose.material.icons.outlined.SettingsEthernet
+import androidx.compose.material.icons.outlined.SignalCellular4Bar
+import androidx.compose.material.icons.outlined.Wifi
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+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.hilt.navigation.compose.hiltViewModel
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import com.google.accompanist.permissions.rememberPermissionState
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.components.TrustedNetworkTextBox
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.components.WildcardsLabel
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.BackgroundLocationDialog
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.LearnMoreLinkLabel
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.LocationServicesDialog
+import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
+import com.zaneschepke.wireguardautotunnel.util.extensions.isLocationServicesEnabled
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+
+@OptIn(ExperimentalPermissionsApi::class, ExperimentalLayoutApi::class)
+@Composable
+fun AutoTunnelScreen(uiState: AppUiState, viewModel: AutoTunnelViewModel = hiltViewModel()) {
+	val context = LocalContext.current
+
+	val fineLocationState = rememberPermissionState(Manifest.permission.ACCESS_FINE_LOCATION)
+	var currentText by remember { mutableStateOf("") }
+	var isBackgroundLocationGranted by remember { mutableStateOf(true) }
+	var showLocationServicesAlertDialog by remember { mutableStateOf(false) }
+	var showLocationDialog by remember { mutableStateOf(false) }
+
+	fun checkFineLocationGranted() {
+		isBackgroundLocationGranted = fineLocationState.status.isGranted
+	}
+
+	fun onAutoTunnelWifiChecked() {
+		if (uiState.settings.isTunnelOnWifiEnabled) viewModel.onToggleTunnelOnWifi().also { return }
+		when (false) {
+			isBackgroundLocationGranted -> showLocationDialog = true
+			fineLocationState.status.isGranted -> showLocationDialog = true
+			context.isLocationServicesEnabled() ->
+				showLocationServicesAlertDialog = true
+			else -> {
+				viewModel.onToggleTunnelOnWifi()
+			}
+		}
+	}
+
+	if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) checkFineLocationGranted()
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+		if (context.isRunningOnTv() && Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
+			checkFineLocationGranted()
+		} else {
+			val backgroundLocationState = rememberPermissionState(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
+			isBackgroundLocationGranted = backgroundLocationState.status.isGranted
+		}
+	}
+
+	LaunchedEffect(uiState.settings.trustedNetworkSSIDs) {
+		currentText = ""
+	}
+
+	LocationServicesDialog(
+		showLocationServicesAlertDialog,
+		onDismiss = { showLocationServicesAlertDialog = false },
+		onAttest = {
+			viewModel.onToggleTunnelOnWifi()
+		},
+	)
+
+	BackgroundLocationDialog(
+		showLocationDialog,
+		onDismiss = { showLocationDialog = false },
+		onAttest = { showLocationDialog = false },
+	)
+
+	Scaffold(
+		contentWindowInsets = WindowInsets(0.dp),
+		topBar = {
+			TopNavBar(stringResource(R.string.auto_tunneling))
+		},
+	) {
+		Column(
+			horizontalAlignment = Alignment.Start,
+			verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
+			modifier =
+			Modifier
+				.fillMaxSize()
+				.padding(it)
+				.padding(top = 24.dp.scaledHeight())
+				.padding(horizontal = 24.dp.scaledWidth()),
+		) {
+			SurfaceSelectionGroupButton(
+				buildList {
+					addAll(
+						listOf(
+							SelectionItem(
+								Icons.Outlined.Wifi,
+								title = {
+									Text(
+										stringResource(R.string.tunnel_on_wifi),
+										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+									)
+								},
+								description = {
+								},
+								trailing = {
+									ScaledSwitch(
+										enabled = !uiState.settings.isAlwaysOnVpnEnabled,
+										checked = uiState.settings.isTunnelOnWifiEnabled,
+										onClick = {
+											if (uiState.settings.isWifiNameByShellEnabled) viewModel.onToggleTunnelOnWifi().also { return@ScaledSwitch }
+											onAutoTunnelWifiChecked()
+										},
+									)
+								},
+								onClick = {
+									if (uiState.settings.isWifiNameByShellEnabled) viewModel.onToggleTunnelOnWifi().also { return@SelectionItem }
+									onAutoTunnelWifiChecked()
+								},
+							),
+							SelectionItem(
+								Icons.Outlined.Code,
+								title = {
+									Text(
+										stringResource(R.string.wifi_name_via_shell),
+										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+									)
+								},
+								description = {
+									Text(
+										stringResource(R.string.use_root_shell_for_wifi),
+										style = MaterialTheme.typography.bodySmall.copy(MaterialTheme.colorScheme.outline),
+									)
+								},
+								trailing = {
+									ScaledSwitch(
+										checked = uiState.settings.isWifiNameByShellEnabled,
+										onClick = {
+											viewModel.onRootShellWifiToggle()
+										},
+									)
+								},
+								onClick = {
+									viewModel.onRootShellWifiToggle()
+								},
+							),
+						),
+					)
+					if (uiState.settings.isTunnelOnWifiEnabled) {
+						addAll(
+							listOf(
+								SelectionItem(
+									Icons.Outlined.Filter1,
+									title = {
+										Text(
+											stringResource(R.string.use_wildcards),
+											style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+										)
+									},
+									description = {
+										LearnMoreLinkLabel({ context.openWebUrl(it) }, stringResource(id = R.string.docs_wildcards))
+									},
+									trailing = {
+										ScaledSwitch(
+											checked = uiState.settings.isWildcardsEnabled,
+											onClick = {
+												viewModel.onToggleWildcards()
+											},
+										)
+									},
+									onClick = {
+										viewModel.onToggleWildcards()
+									},
+								),
+								SelectionItem(
+									title = {
+										Row(
+											verticalAlignment = Alignment.CenterVertically,
+											modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp.scaledHeight()),
+										) {
+											Row(
+												verticalAlignment = Alignment.CenterVertically,
+												modifier = Modifier
+													.weight(4f, false)
+													.fillMaxWidth(),
+											) {
+												val icon = Icons.Outlined.Security
+												Icon(
+													icon,
+													icon.name,
+													modifier = Modifier.size(iconSize),
+												)
+												Column(
+													horizontalAlignment = Alignment.Start,
+													verticalArrangement = Arrangement.spacedBy(2.dp, Alignment.CenterVertically),
+													modifier = Modifier
+														.fillMaxWidth()
+														.padding(start = 16.dp.scaledWidth())
+														.padding(vertical = 6.dp.scaledHeight()),
+												) {
+													Text(
+														stringResource(R.string.trusted_wifi_names),
+														style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+													)
+												}
+											}
+										}
+									},
+									description = {
+										TrustedNetworkTextBox(
+											uiState.settings.trustedNetworkSSIDs,
+											onDelete = viewModel::onDeleteTrustedSSID,
+											currentText = currentText,
+											onSave = viewModel::onSaveTrustedSSID,
+											onValueChange = { currentText = it },
+											supporting = {
+												if (uiState.settings.isWildcardsEnabled) {
+													WildcardsLabel()
+												}
+											},
+										)
+									},
+								),
+							),
+						)
+					}
+				},
+			)
+			SurfaceSelectionGroupButton(
+				listOf(
+					SelectionItem(
+						Icons.Outlined.SignalCellular4Bar,
+						title = {
+							Text(
+								stringResource(R.string.tunnel_mobile_data),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						trailing = {
+							ScaledSwitch(
+								enabled = !uiState.settings.isAlwaysOnVpnEnabled,
+								checked = uiState.settings.isTunnelOnMobileDataEnabled,
+								onClick = { viewModel.onToggleTunnelOnMobileData() },
+							)
+						},
+						onClick = {
+							viewModel.onToggleTunnelOnMobileData()
+						},
+					),
+					SelectionItem(
+						Icons.Outlined.SettingsEthernet,
+						title = {
+							Text(
+								stringResource(R.string.tunnel_on_ethernet),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						trailing = {
+							ScaledSwitch(
+								enabled = !uiState.settings.isAlwaysOnVpnEnabled,
+								checked = uiState.settings.isTunnelOnEthernetEnabled,
+								onClick = { viewModel.onToggleTunnelOnEthernet() },
+							)
+						},
+						onClick = {
+							viewModel.onToggleTunnelOnEthernet()
+						},
+					),
+					SelectionItem(
+						Icons.Outlined.NetworkPing,
+						title = {
+							Text(
+								stringResource(R.string.restart_on_ping),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						trailing = {
+							ScaledSwitch(
+								checked = uiState.settings.isPingEnabled,
+								onClick = { viewModel.onToggleRestartOnPing() },
+							)
+						},
+						onClick = {
+							viewModel.onToggleRestartOnPing()
+						},
+					),
+				),
+			)
+		}
+	}
+}

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

@@ -0,0 +1,131 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.wireguard.android.util.RootShell
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.AppShell
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import javax.inject.Provider
+
+@HiltViewModel
+class AutoTunnelViewModel
+@Inject
+constructor(
+	private val appDataRepository: AppDataRepository,
+	@AppShell private val rootShell: Provider<RootShell>,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : ViewModel() {
+
+	private val settings = appDataRepository.settings.getSettingsFlow()
+		.stateIn(viewModelScope, SharingStarted.Eagerly, Settings())
+
+	fun onToggleTunnelOnWifi() = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(
+					isTunnelOnWifiEnabled = !isTunnelOnWifiEnabled,
+				),
+			)
+		}
+	}
+
+	fun onToggleTunnelOnMobileData() = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(
+					isTunnelOnMobileDataEnabled = !isTunnelOnMobileDataEnabled,
+				),
+			)
+		}
+	}
+
+	fun onToggleWildcards() = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(
+					isWildcardsEnabled = !isWildcardsEnabled,
+				),
+			)
+		}
+	}
+
+	fun onDeleteTrustedSSID(ssid: String) = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(
+					trustedNetworkSSIDs = (trustedNetworkSSIDs - ssid).toMutableList(),
+				),
+			)
+		}
+	}
+
+	fun onRootShellWifiToggle() = viewModelScope.launch {
+		requestRoot().onSuccess {
+			with(settings.value) {
+				appDataRepository.settings.save(
+					copy(isWifiNameByShellEnabled = !isWifiNameByShellEnabled),
+				)
+			}
+		}
+	}
+
+	private suspend fun requestRoot(): Result<Unit> {
+		return withContext(ioDispatcher) {
+			kotlin.runCatching {
+				rootShell.get().start()
+				SnackbarController.showMessage(StringValue.StringResource(R.string.root_accepted))
+			}.onFailure {
+				SnackbarController.showMessage(StringValue.StringResource(R.string.error_root_denied))
+			}
+		}
+	}
+
+	fun onToggleTunnelOnEthernet() = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(
+					isTunnelOnEthernetEnabled = !isTunnelOnEthernetEnabled,
+				),
+			)
+		}
+	}
+
+	fun onSaveTrustedSSID(ssid: String) = viewModelScope.launch {
+		if (ssid.isEmpty()) return@launch
+		val trimmed = ssid.trim()
+		with(settings.value) {
+			if (!trustedNetworkSSIDs.contains(trimmed)) {
+				this.trustedNetworkSSIDs.add(ssid)
+				appDataRepository.settings.save(this)
+			} else {
+				SnackbarController.showMessage(
+					StringValue.StringResource(
+						R.string.error_ssid_exists,
+					),
+				)
+			}
+		}
+	}
+
+	fun onToggleRestartOnPing() = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(
+					isPingEnabled = !isPingEnabled,
+				),
+			)
+		}
+	}
+}

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

@@ -0,0 +1,104 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.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.common.ClickableIconButton
+import com.zaneschepke.wireguardautotunnel.ui.common.textbox.CustomTextField
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun TrustedNetworkTextBox(
+	trustedNetworks: List<String>,
+	onDelete: (ssid: String) -> Unit,
+	currentText: String,
+	onSave: (ssid: String) -> Unit,
+	onValueChange: (network: String) -> Unit,
+	supporting: @Composable () -> Unit,
+) {
+	val context = LocalContext.current
+	Column(verticalArrangement = Arrangement.spacedBy(10.dp.scaledHeight())) {
+		FlowRow(
+			modifier =
+			Modifier.fillMaxWidth(),
+			horizontalArrangement = Arrangement.spacedBy(5.dp, Alignment.CenterHorizontally),
+		) {
+			trustedNetworks.forEach { ssid ->
+				ClickableIconButton(
+					onClick = {
+						if (context.isRunningOnTv()) {
+							onDelete(ssid)
+						}
+					},
+					onIconClick = {
+						onDelete(ssid)
+					},
+					text = ssid,
+					icon = Icons.Filled.Close,
+				)
+			}
+		}
+		CustomTextField(
+			textStyle = MaterialTheme.typography.bodySmall,
+			value = currentText,
+			onValueChange = onValueChange,
+			label = { Text(stringResource(R.string.add_wifi_name)) },
+			containerColor = MaterialTheme.colorScheme.surface,
+			supportingText = supporting,
+			modifier =
+			Modifier
+				.padding(
+					top = 5.dp,
+					bottom = 10.dp,
+				).fillMaxWidth().padding(end = 16.dp.scaledWidth()),
+			singleLine = true,
+			keyboardOptions =
+			KeyboardOptions(
+				capitalization = KeyboardCapitalization.None,
+				imeAction = ImeAction.Done,
+			),
+			keyboardActions = KeyboardActions(onDone = { onSave(currentText) }),
+			trailing = {
+				if (currentText != "") {
+					IconButton(onClick = {
+						onSave(currentText)
+					}) {
+						val icon = Icons.Outlined.Add
+						Icon(
+							imageVector = icon,
+							contentDescription = stringResource(
+								R.string
+									.trusted_ssid_value_description,
+							),
+							tint = MaterialTheme.colorScheme.primary,
+						)
+					}
+				}
+			},
+		)
+	}
+}

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

@@ -0,0 +1,16 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.components
+
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontStyle
+import com.zaneschepke.wireguardautotunnel.R
+
+@Composable
+fun WildcardsLabel() {
+	Text(
+		stringResource(R.string.wildcards_active),
+		style = MaterialTheme.typography.bodySmall.copy(MaterialTheme.colorScheme.outline, fontStyle = FontStyle.Italic),
+	)
+}

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

@@ -1,88 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
-
-import androidx.compose.foundation.ScrollState
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.LocationOff
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
-
-@Composable
-fun BackgroundLocationDisclosure(onDismiss: () -> Unit, onAttest: () -> Unit, scrollState: ScrollState, focusRequester: FocusRequester) {
-	val context = LocalContext.current
-	Column(
-		horizontalAlignment = Alignment.CenterHorizontally,
-		verticalArrangement = Arrangement.Top,
-		modifier =
-		Modifier
-			.fillMaxSize()
-			.verticalScroll(scrollState),
-	) {
-		Icon(
-			Icons.Rounded.LocationOff,
-			contentDescription = stringResource(id = R.string.map),
-			modifier =
-			Modifier
-				.padding(30.dp)
-				.size(128.dp),
-		)
-		Text(
-			stringResource(R.string.prominent_background_location_title),
-			textAlign = TextAlign.Center,
-			modifier = Modifier.padding(30.dp),
-			fontSize = 20.sp,
-		)
-		Text(
-			stringResource(R.string.prominent_background_location_message),
-			textAlign = TextAlign.Center,
-			modifier = Modifier.padding(30.dp),
-			fontSize = 15.sp,
-		)
-		Row(
-			modifier =
-			if (context.isRunningOnTv()) {
-				Modifier
-					.fillMaxWidth()
-					.padding(10.dp)
-			} else {
-				Modifier
-					.fillMaxWidth()
-					.padding(30.dp)
-			},
-			verticalAlignment = Alignment.CenterVertically,
-			horizontalArrangement = Arrangement.SpaceEvenly,
-		) {
-			TextButton(onClick = { onDismiss() }) {
-				Text(stringResource(id = R.string.no_thanks))
-			}
-			TextButton(
-				modifier = Modifier.focusRequester(focusRequester),
-				onClick = {
-					onAttest()
-				},
-			) {
-				Text(stringResource(id = R.string.turn_on))
-			}
-		}
-	}
-}

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

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

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

@@ -12,18 +12,18 @@ import androidx.compose.ui.text.withStyle
 import com.zaneschepke.wireguardautotunnel.R
 
 @Composable
-fun WildcardSupportingLabel(onClick: (url: String) -> Unit) {
+fun LearnMoreLinkLabel(onClick: (url: String) -> Unit, url: String) {
 	// TODO update link when docs are fully updated
 	val gettingStarted =
 		buildAnnotatedString {
 			pushStringAnnotation(
 				tag = "details",
-				annotation = stringResource(id = R.string.docs_wildcards),
+				annotation = url,
 			)
 			withStyle(
 				style = SpanStyle(color = MaterialTheme.colorScheme.primary),
 			) {
-				append(stringResource(id = R.string.wildcard_supported))
+				append(stringResource(id = R.string.learn_more))
 			}
 			pop()
 		}

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

@@ -0,0 +1,104 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.disclosure
+
+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.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.LocationOn
+import androidx.compose.material.icons.rounded.PermScanWifi
+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.ui.Alignment
+import androidx.compose.ui.Modifier
+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 com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
+import com.zaneschepke.wireguardautotunnel.ui.theme.topPadding
+import com.zaneschepke.wireguardautotunnel.util.extensions.goFromRoot
+import com.zaneschepke.wireguardautotunnel.util.extensions.launchAppSettings
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+
+@Composable
+fun LocationDisclosureScreen(appViewModel: AppViewModel, appUiState: AppUiState) {
+	val context = LocalContext.current
+	val navController = LocalNavController.current
+
+	LaunchedEffect(Unit, appUiState) {
+		if (appUiState.generalState.isLocationDisclosureShown) navController.goFromRoot(Route.AutoTunnel)
+	}
+
+	Column(
+		horizontalAlignment = Alignment.CenterHorizontally,
+		verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
+		modifier =
+		Modifier.fillMaxSize().padding(top = topPadding).padding(horizontal = 24.dp.scaledWidth()),
+	) {
+		val icon = Icons.Rounded.PermScanWifi
+		Icon(
+			icon,
+			contentDescription = icon.name,
+			modifier = Modifier
+				.padding(30.dp.scaledHeight())
+				.size(128.dp.scaledHeight()),
+		)
+		Text(
+			stringResource(R.string.prominent_background_location_title),
+			style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.Bold),
+		)
+		Text(
+			stringResource(R.string.prominent_background_location_message),
+			style = MaterialTheme.typography.bodyLarge,
+		)
+		SurfaceSelectionGroupButton(
+			listOf(
+				SelectionItem(
+					Icons.Outlined.LocationOn,
+					title = {
+						Text(
+							stringResource(R.string.launch_app_settings),
+							style = MaterialTheme.typography.bodyLarge.copy(MaterialTheme.colorScheme.onSurface),
+						)
+					},
+					onClick = {
+						context.launchAppSettings().also {
+							appViewModel.setLocationDisclosureShown()
+						}
+					},
+					trailing = {
+						ForwardButton {
+							context.launchAppSettings().also {
+								appViewModel.setLocationDisclosureShown()
+							}
+						}
+					},
+				),
+			),
+		)
+		SurfaceSelectionGroupButton(
+			listOf(
+				SelectionItem(
+					title = { Text(stringResource(R.string.skip), style = MaterialTheme.typography.bodyLarge.copy(MaterialTheme.colorScheme.onSurface)) },
+					onClick = { appViewModel.setLocationDisclosureShown() },
+					trailing = {
+						ForwardButton { appViewModel.setLocationDisclosureShown() }
+					},
+				),
+			),
+		)
+	}
+}

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

@@ -1,310 +1,155 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.support
 
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.rounded.ArrowForward
-import androidx.compose.material.icons.rounded.Book
-import androidx.compose.material.icons.rounded.FormatListNumbered
-import androidx.compose.material.icons.rounded.Mail
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
+import androidx.compose.material.icons.filled.Book
+import androidx.compose.material.icons.filled.LineStyle
+import androidx.compose.material.icons.filled.Mail
+import androidx.compose.material.icons.filled.Policy
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.zaneschepke.wireguardautotunnel.BuildConfig
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
+import com.zaneschepke.wireguardautotunnel.ui.common.label.GroupLabel
+import com.zaneschepke.wireguardautotunnel.ui.common.label.VersionLabel
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ForwardButton
+import com.zaneschepke.wireguardautotunnel.ui.theme.topPadding
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchSupportEmail
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
 
 @Composable
-fun SupportScreen(focusRequester: FocusRequester, appUiState: AppUiState) {
+fun SupportScreen() {
 	val context = LocalContext.current
 	val navController = LocalNavController.current
-	val fillMaxWidth = .85f
 
 	Column(
-		horizontalAlignment = Alignment.CenterHorizontally,
-		verticalArrangement = Arrangement.Top,
+		horizontalAlignment = Alignment.Start,
+		verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
 		modifier =
 		Modifier
 			.fillMaxSize()
-			.verticalScroll(rememberScrollState())
-			.focusable(),
+			.padding(top = topPadding)
+			.padding(horizontal = 24.dp.scaledWidth()),
 	) {
-		Surface(
-			tonalElevation = 2.dp,
-			shadowElevation = 2.dp,
-			shape = RoundedCornerShape(12.dp),
-			color = MaterialTheme.colorScheme.surface,
-			modifier =
-			(
-				if (context.isRunningOnTv()) {
-					Modifier
-						.height(IntrinsicSize.Min)
-						.fillMaxWidth(fillMaxWidth)
-						.padding(top = 10.dp)
-				} else {
-					Modifier
-						.fillMaxWidth(fillMaxWidth)
-						.padding(top = 20.dp)
-				}
-				)
-				.padding(bottom = 25.dp),
-		) {
-			Column(modifier = Modifier.padding(20.dp)) {
-				val forwardIcon = Icons.AutoMirrored.Rounded.ArrowForward
-				Text(
-					stringResource(R.string.thank_you),
-					textAlign = TextAlign.Start,
-					fontWeight = FontWeight.Bold,
-					modifier = Modifier.padding(bottom = 20.dp),
-					fontSize = 16.sp,
-				)
-				Text(
-					stringResource(id = R.string.support_help_text),
-					textAlign = TextAlign.Start,
-					fontSize = 16.sp,
-					modifier = Modifier.padding(bottom = 20.dp),
-				)
-				TextButton(
-					onClick = {
-						context.openWebUrl(
-							context.resources.getString(R.string.docs_url),
+		GroupLabel(stringResource(R.string.thank_you))
+		SurfaceSelectionGroupButton(
+			listOf(
+				SelectionItem(
+					Icons.Filled.Book,
+					title = {
+						Text(
+							stringResource(R.string.docs_description),
+							style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
 						)
 					},
-					modifier =
-					Modifier
-						.padding(vertical = 5.dp)
-						.focusRequester(focusRequester),
-				) {
-					Row(
-						horizontalArrangement = Arrangement.SpaceBetween,
-						verticalAlignment = Alignment.CenterVertically,
-						modifier = Modifier.fillMaxWidth(),
-					) {
-						Row {
-							val icon = Icons.Rounded.Book
-							Icon(icon, icon.name)
-							Text(
-								stringResource(id = R.string.docs_description),
-								textAlign = TextAlign.Justify,
-								modifier =
-								Modifier
-									.padding(start = 10.dp)
-									.weight(
-										weight = 1.0f,
-										fill = false,
-									),
-								softWrap = true,
-							)
-						}
-						Icon(
-							forwardIcon,
-							forwardIcon.name,
-						)
-					}
-				}
-				HorizontalDivider(
-					thickness = 0.5.dp,
-					color = MaterialTheme.colorScheme.onBackground,
-				)
-				TextButton(
+					trailing = {
+						ForwardButton { context.openWebUrl(context.getString(R.string.docs_url)) }
+					},
 					onClick = {
-						context.openWebUrl(
-							context.resources.getString(R.string.telegram_url),
+						context.openWebUrl(context.getString(R.string.docs_url))
+					},
+				),
+				SelectionItem(
+					Icons.Filled.LineStyle,
+					title = {
+						Text(
+							stringResource(R.string.read_logs),
+							style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
 						)
 					},
-					modifier = Modifier.padding(vertical = 5.dp),
-				) {
-					Row(
-						horizontalArrangement = Arrangement.SpaceBetween,
-						verticalAlignment = Alignment.CenterVertically,
-						modifier = Modifier.fillMaxWidth(),
-					) {
-						Row {
-							val icon = ImageVector.vectorResource(R.drawable.telegram)
-							Icon(
-								icon,
-								icon.name,
-								Modifier.size(25.dp),
-							)
-							Text(
-								stringResource(id = R.string.chat_description),
-								textAlign = TextAlign.Justify,
-								modifier = Modifier.padding(start = 10.dp),
-							)
+					trailing = {
+						ForwardButton {
+							navController.navigate(Route.Logs)
 						}
-						Icon(
-							forwardIcon,
-							forwardIcon.name,
-						)
-					}
-				}
-				HorizontalDivider(
-					thickness = 0.5.dp,
-					color = MaterialTheme.colorScheme.onBackground,
-				)
-				TextButton(
+					},
 					onClick = {
-						context.openWebUrl(
-							context.resources.getString(R.string.github_url),
+						navController.navigate(Route.Logs)
+					},
+				),
+				SelectionItem(
+					Icons.Filled.Policy,
+					title = {
+						Text(
+							stringResource(R.string.privacy_policy),
+							style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
 						)
 					},
-					modifier = Modifier.padding(vertical = 5.dp),
-				) {
-					Row(
-						horizontalArrangement = Arrangement.SpaceBetween,
-						verticalAlignment = Alignment.CenterVertically,
-						modifier = Modifier.fillMaxWidth(),
-					) {
-						Row {
-							val icon = ImageVector.vectorResource(R.drawable.github)
-							Icon(
-								imageVector = icon,
-								icon.name,
-								Modifier.size(25.dp),
-							)
-							Text(
-								stringResource(id = R.string.open_issue),
-								textAlign = TextAlign.Justify,
-								modifier = Modifier.padding(start = 10.dp),
-							)
-						}
-						Icon(
-							forwardIcon,
-							forwardIcon.name,
-						)
-					}
-				}
-				HorizontalDivider(
-					thickness = 0.5.dp,
-					color = MaterialTheme.colorScheme.onBackground,
-				)
-				TextButton(
-					onClick = { context.launchSupportEmail() },
-					modifier = Modifier.padding(vertical = 5.dp),
-				) {
-					Row(
-						horizontalArrangement = Arrangement.SpaceBetween,
-						verticalAlignment = Alignment.CenterVertically,
-						modifier = Modifier.fillMaxWidth(),
-					) {
-						Row {
-							val icon = Icons.Rounded.Mail
-							Icon(icon, icon.name)
-							Text(
-								stringResource(id = R.string.email_description),
-								textAlign = TextAlign.Justify,
-								modifier = Modifier.padding(start = 10.dp),
-							)
-						}
-						Icon(
-							forwardIcon,
-							forwardIcon.name,
-						)
-					}
-				}
-				if (!context.isRunningOnTv()) {
-					HorizontalDivider(
-						thickness = 0.5.dp,
-						color = MaterialTheme.colorScheme.onBackground,
-					)
-					TextButton(
-						onClick = { navController.navigate(Route.Logs) },
-						modifier = Modifier.padding(vertical = 5.dp),
-					) {
-						Row(
-							horizontalArrangement = Arrangement.SpaceBetween,
-							verticalAlignment = Alignment.CenterVertically,
-							modifier = Modifier.fillMaxWidth(),
-						) {
-							Row {
-								val icon = Icons.Rounded.FormatListNumbered
-								Icon(icon, icon.name)
-								Text(
-									stringResource(id = R.string.read_logs),
-									textAlign = TextAlign.Justify,
-									modifier = Modifier.padding(start = 10.dp),
-								)
-							}
-							Icon(
-								Icons.AutoMirrored.Rounded.ArrowForward,
-								stringResource(id = R.string.go),
-							)
-						}
-					}
-				}
-			}
-		}
-		Spacer(modifier = Modifier.weight(1f))
-		Text(
-			stringResource(id = R.string.privacy_policy),
-			style = TextStyle(textDecoration = TextDecoration.Underline),
-			fontSize = 16.sp,
-			modifier =
-			Modifier.clickable {
-				context.openWebUrl(
-					context.resources.getString(R.string.privacy_policy_url),
-				)
-			},
+					trailing = {
+						ForwardButton { context.openWebUrl(context.getString(R.string.privacy_policy_url)) }
+					},
+					onClick = {
+						context.openWebUrl(context.getString(R.string.privacy_policy_url))
+					},
+				),
+
+			),
 		)
-		Row(
-			horizontalArrangement = Arrangement.spacedBy(25.dp),
-			verticalAlignment = Alignment.CenterVertically,
-			modifier = Modifier.padding(25.dp),
-		) {
-			val version =
-				buildAnnotatedString {
-					append(stringResource(id = R.string.version))
-					append(": ")
-					append(BuildConfig.VERSION_NAME)
-				}
-			val mode =
-				buildAnnotatedString {
-					append(stringResource(R.string.mode))
-					append(": ")
-					when (appUiState.settings.isKernelEnabled) {
-						true -> append(stringResource(id = R.string.kernel))
-						false -> append(stringResource(id = R.string.userspace))
-					}
-				}
-			Text(version.text, modifier = Modifier.focusable())
-			Text(mode.text)
-		}
+		SurfaceSelectionGroupButton(
+			listOf(
+				SelectionItem(
+					ImageVector.vectorResource(R.drawable.telegram),
+					title = {
+						Text(
+							stringResource(R.string.chat_description),
+							style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+						)
+					},
+					trailing = {
+						ForwardButton {
+							context.openWebUrl(context.getString(R.string.telegram_url))
+						}
+					},
+					onClick = {
+						context.openWebUrl(context.getString(R.string.telegram_url))
+					},
+				),
+				SelectionItem(
+					ImageVector.vectorResource(R.drawable.github),
+					title = { Text(stringResource(R.string.open_issue), style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface)) },
+					trailing = {
+						ForwardButton {
+							context.openWebUrl(context.getString(R.string.github_url))
+						}
+					},
+					onClick = {
+						context.openWebUrl(context.getString(R.string.github_url))
+					},
+				),
+				SelectionItem(
+					Icons.Filled.Mail,
+					title = {
+						Text(
+							stringResource(R.string.email_description),
+							style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+						)
+					},
+					trailing = {
+						ForwardButton {
+							context.launchSupportEmail()
+						}
+					},
+					onClick = {
+						context.launchSupportEmail()
+					},
+				),
+			),
+		)
+		VersionLabel()
 	}
 }

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

@@ -1,6 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.support.logs
 
-import android.annotation.SuppressLint
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
@@ -32,15 +31,17 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.ClipboardManager
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.zaneschepke.logcatter.model.LogMessage
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.text.LogTypeLabel
 
-@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @Composable
 fun LogsScreen(viewModel: LogsViewModel = hiltViewModel()) {
 	val logs = viewModel.logs
@@ -83,6 +84,9 @@ fun LogsScreen(viewModel: LogsViewModel = hiltViewModel()) {
 	}
 
 	Scaffold(
+		topBar = {
+			TopNavBar(stringResource(R.string.logs))
+		},
 		floatingActionButton = {
 			FloatingActionButton(
 				onClick = {
@@ -107,7 +111,7 @@ fun LogsScreen(viewModel: LogsViewModel = hiltViewModel()) {
 			modifier =
 			Modifier
 				.fillMaxSize()
-				.padding(horizontal = 24.dp),
+				.padding(horizontal = 24.dp).padding(it),
 		) {
 			itemsIndexed(
 				logs,

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

@@ -11,6 +11,7 @@ import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.module.MainDispatcher
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.FileUtils
 import com.zaneschepke.wireguardautotunnel.util.extensions.chunked
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchShareFile
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -19,7 +20,6 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
-import java.io.File
 import java.time.Duration
 import java.time.Instant
 import javax.inject.Inject
@@ -29,6 +29,7 @@ class LogsViewModel
 @Inject
 constructor(
 	private val localLogCollector: LogReader,
+	private val fileUtils: FileUtils,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 	@MainDispatcher private val mainDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
@@ -51,12 +52,7 @@ constructor(
 
 	fun shareLogs(context: Context): Job = viewModelScope.launch(ioDispatcher) {
 		runCatching {
-			val sharePath = File(context.filesDir, "external_files")
-			if (sharePath.exists()) sharePath.delete()
-			sharePath.mkdir()
-			val file = File("${sharePath.path + "/" + Constants.BASE_LOG_FILE_NAME}-${Instant.now().epochSecond}.zip")
-			if (file.exists()) file.delete()
-			file.createNewFile()
+			val file = fileUtils.createNewShareFile("${Constants.BASE_LOG_FILE_NAME}-${Instant.now().epochSecond}.zip")
 			localLogCollector.zipLogFiles(file.absolutePath)
 			val uri = FileProvider.getUriForFile(context, context.getString(R.string.provider), file)
 			context.launchShareFile(uri)

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/theme/Color.kt

@@ -3,14 +3,14 @@ package com.zaneschepke.wireguardautotunnel.ui.theme
 import androidx.compose.ui.graphics.Color
 
 val OffWhite = Color(0xFFE5E1E5)
-val LightGrey = Color(0xFF8D9D9F)
+val LightGrey = Color(0xFFCAC4D0)
 val Aqua = Color(0xFF76BEBD)
 val SilverTree = Color(0xFF6DB58B)
 val Plantation = Color(0xFF264A49)
 val Shark = Color(0xFF21272A)
 val BalticSea = Color(0xFF1C1B1F)
 val Brick = Color(0xFFCE4257)
-val Corn = Color(0xFFFBEC5D)
+val Straw = Color(0xFFD4C483)
 
 sealed class ThemeColors(
 	val background: Color,
@@ -19,7 +19,7 @@ sealed class ThemeColors(
 	val secondary: Color,
 	val onSurface: Color,
 ) {
-	// TODO fix light theme colors
+
 	data object Light : ThemeColors(
 		background = LightGrey,
 		surface = OffWhite,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/theme/Size.kt

@@ -0,0 +1,7 @@
+package com.zaneschepke.wireguardautotunnel.ui.theme
+
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+
+val iconSize = 24.dp.scaledHeight()
+val topPadding = 80.dp.scaledHeight()

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/theme/Theme.kt

@@ -36,24 +36,39 @@ private val LightColorScheme =
 		onSecondaryContainer = ThemeColors.Light.primary,
 	)
 
+enum class Theme {
+	AUTOMATIC,
+	LIGHT,
+	DARK,
+	DYNAMIC,
+}
+
 @Composable
-fun WireguardAutoTunnelTheme(
-	// force dark theme
-	useDarkTheme: Boolean = isSystemInDarkTheme(),
-	content: @Composable () -> Unit,
-) {
+fun WireguardAutoTunnelTheme(theme: Theme = Theme.AUTOMATIC, content: @Composable () -> Unit) {
 	val context = LocalContext.current
-	val colorScheme = when {
-		(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) -> {
-			if (useDarkTheme) {
-				dynamicDarkColorScheme(context)
+	var isDark = isSystemInDarkTheme()
+	val autoTheme = if (isDark) DarkColorScheme else LightColorScheme
+	val colorScheme = when (theme) {
+		Theme.AUTOMATIC -> autoTheme
+		Theme.DARK -> {
+			isDark = true
+			DarkColorScheme
+		}
+		Theme.LIGHT -> {
+			isDark = false
+			LightColorScheme
+		}
+		Theme.DYNAMIC -> {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+				if (isDark) {
+					dynamicDarkColorScheme(context)
+				} else {
+					dynamicLightColorScheme(context)
+				}
 			} else {
-				dynamicLightColorScheme(context)
+				autoTheme
 			}
 		}
-		useDarkTheme -> DarkColorScheme
-		// TODO force dark theme for now until light theme designed
-		else -> DarkColorScheme
 	}
 	val view = LocalView.current
 	if (!view.isInEditMode) {
@@ -62,8 +77,7 @@ fun WireguardAutoTunnelTheme(
 			WindowCompat.setDecorFitsSystemWindows(window, false)
 			window.statusBarColor = Color.Transparent.toArgb()
 			window.navigationBarColor = Color.Transparent.toArgb()
-			WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars =
-				!useDarkTheme
+			WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = !isDark
 		}
 	}
 

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/theme/Type.kt

@@ -5,9 +5,9 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaled
 
 // Set of Material typography styles to start with
 
@@ -17,43 +17,47 @@ val inter = FontFamily(
 
 val Typography =
 	Typography(
-		bodyLarge =
-		TextStyle(
+		bodyLarge = TextStyle(
 			fontFamily = inter,
 			fontWeight = FontWeight.Normal,
-			fontSize = 16.sp,
-			lineHeight = 24.sp,
+			fontSize = 16.sp.scaled(),
+			lineHeight = 24.sp.scaled(),
 			letterSpacing = 0.5.sp,
 		),
 		bodySmall = TextStyle(
 			fontFamily = inter,
 			fontWeight = FontWeight.Normal,
-			fontSize = 13.sp,
-			lineHeight = 20.sp,
+			fontSize = 12.sp.scaled(),
+			lineHeight = 20.sp.scaled(),
 			letterSpacing = 1.sp,
 			color = LightGrey,
 		),
+		bodyMedium = TextStyle(
+			fontFamily = inter,
+			fontSize = 14.sp.scaled(),
+			lineHeight = 20.sp.scaled(),
+			fontWeight = FontWeight(400),
+			letterSpacing = 0.25.sp,
+		),
 		labelLarge = TextStyle(
 			fontFamily = inter,
 			fontWeight = FontWeight.Normal,
-			fontSize = 15.sp,
-			lineHeight = 18.sp,
+			fontSize = 15.sp.scaled(),
+			lineHeight = 18.sp.scaled(),
 			letterSpacing = 0.sp,
 		),
 		labelMedium = TextStyle(
 			fontFamily = inter,
 			fontWeight = FontWeight.SemiBold,
-			fontSize = 12.sp,
-			lineHeight = 16.sp,
+			fontSize = 12.sp.scaled(),
+			lineHeight = 16.sp.scaled(),
 			letterSpacing = 0.5.sp,
 		),
 		titleMedium = TextStyle(
 			fontFamily = inter,
 			fontWeight = FontWeight.Bold,
-			fontSize = 17.sp,
-			lineHeight = 21.sp,
+			fontSize = 16.sp.scaled(),
+			lineHeight = 21.sp.scaled(),
 			letterSpacing = 0.sp,
 		),
 	)
-
-val iconSize = 15.dp

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/Constants.kt

@@ -21,7 +21,6 @@ object Constants {
 	const val SYSTEM_EXEMPT_SERVICE_TYPE_ID = 1024
 
 	const val SUBSCRIPTION_TIMEOUT = 5_000L
-	const val FOCUS_REQUEST_DELAY = 500L
 
 	const val TRANSITION_ANIMATION_TIME = 200
 

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/FileUtils.kt

@@ -1,19 +1,13 @@
 package com.zaneschepke.wireguardautotunnel.util
 
-import android.content.ContentValues
 import android.content.Context
-import android.os.Build
-import android.os.Environment
-import android.provider.MediaStore
-import android.provider.MediaStore.MediaColumns
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
-import timber.log.Timber
+import java.io.BufferedOutputStream
 import java.io.File
-import java.io.OutputStream
-import java.time.Instant
+import java.io.FileOutputStream
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 
@@ -22,73 +16,60 @@ class FileUtils(
 	private val ioDispatcher: CoroutineDispatcher,
 ) {
 
-	fun createWgFiles(tunnels: TunnelConfigs): List<File> {
-		return tunnels.map { config ->
-			val file = File(context.cacheDir, "${config.name}-wg.conf")
-			file.outputStream().use {
-				it.write(config.wgQuick.toByteArray())
-			}
-			file
-		}
-	}
-
-	fun createAmFiles(tunnels: TunnelConfigs): List<File> {
-		return tunnels.filter { it.amQuick != TunnelConfig.AM_QUICK_DEFAULT }.map { config ->
-			val file = File(context.cacheDir, "${config.name}-am.conf")
-			file.outputStream().use {
-				it.write(config.amQuick.toByteArray())
-			}
-			file
-		}
-	}
-
-	suspend fun saveFilesToZip(files: List<File>): Result<Unit> {
+	suspend fun createWgFiles(tunnels: TunnelConfigs): List<File> {
 		return withContext(ioDispatcher) {
-			try {
-				val zipOutputStream =
-					createDownloadsFileOutputStream(
-						"wg-export_${Instant.now().epochSecond}.zip",
-						Constants.ZIP_FILE_MIME_TYPE,
-					)
-				ZipOutputStream(zipOutputStream).use { zos ->
-					files.forEach { file ->
-						val entry = ZipEntry(file.name)
-						zos.putNextEntry(entry)
-						if (file.isFile) {
-							file.inputStream().use { fis -> fis.copyTo(zos) }
+			tunnels.map { config ->
+				val file = File(context.cacheDir, "${config.name}-wg.conf")
+				file.outputStream().use {
+					it.write(config.wgQuick.toByteArray())
+				}
+				file
+			}
+		}
+	}
+
+	suspend fun createAmFiles(tunnels: TunnelConfigs): List<File> {
+		return withContext(ioDispatcher) {
+			tunnels.filter { it.amQuick != TunnelConfig.AM_QUICK_DEFAULT }.map { config ->
+				val file = File(context.cacheDir, "${config.name}-am.conf")
+				file.outputStream().use {
+					it.write(config.amQuick.toByteArray())
+				}
+				file
+			}
+		}
+	}
+
+	suspend fun zipAll(zipFile: File, files: List<File>) {
+		withContext(ioDispatcher) {
+			ZipOutputStream(BufferedOutputStream(FileOutputStream(zipFile))).use { zos ->
+				files.forEach { file ->
+					val zipFileName = (
+						file.parentFile?.let { parent ->
+							file.absolutePath.removePrefix(parent.absolutePath)
+						} ?: file.absolutePath
+						).removePrefix("/")
+					val entry = ZipEntry("$zipFileName${(if (file.isDirectory) "/" else "")}")
+					zos.putNextEntry(entry)
+					if (file.isFile) {
+						file.inputStream().use {
+							it.copyTo(zos)
 						}
 					}
-					return@withContext Result.success(Unit)
 				}
-			} catch (e: Exception) {
-				Timber.e(e)
-				Result.failure(ConfigExportException)
 			}
 		}
 	}
 
-	// TODO issue with android 9
-	private fun createDownloadsFileOutputStream(fileName: String, mimeType: String = Constants.ALL_FILE_TYPES): OutputStream? {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-			val resolver = context.contentResolver
-			val contentValues =
-				ContentValues().apply {
-					put(MediaColumns.DISPLAY_NAME, fileName)
-					put(MediaColumns.MIME_TYPE, mimeType)
-					put(MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS)
-				}
-			val uri = resolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, contentValues)
-			if (uri != null) {
-				return resolver.openOutputStream(uri)
-			}
-		} else {
-			val target =
-				File(
-					Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),
-					fileName,
-				)
-			return target.outputStream()
+	suspend fun createNewShareFile(name: String): File {
+		return withContext(ioDispatcher) {
+			val sharePath = File(context.filesDir, "external_files")
+			if (sharePath.exists()) sharePath.delete()
+			sharePath.mkdir()
+			val file = File("${sharePath.path}/$name")
+			if (file.exists()) file.delete()
+			file.createNewFile()
+			file
 		}
-		return null
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/LocaleUtil.kt

@@ -0,0 +1,100 @@
+package com.zaneschepke.wireguardautotunnel.util
+
+import android.content.Context
+import android.content.res.Configuration
+import android.content.res.Resources
+import android.os.Build
+import android.os.LocaleList
+import androidx.core.os.ConfigurationCompat
+import com.zaneschepke.wireguardautotunnel.BuildConfig
+import java.util.Locale
+
+object LocaleUtil {
+	private const val DEFAULT_LANG = "en"
+	val supportedLocales: Array<String> = BuildConfig.LANGUAGES
+	const val OPTION_PHONE_LANGUAGE = "sys_def"
+
+	/**
+	 * returns the locale to use depending on the preference value
+	 * when preference value = "sys_def" returns the locale of current system
+	 * else it returns the locale code e.g. "en", "bn" etc.
+	 */
+	fun getLocaleFromPrefCode(prefCode: String): Locale {
+		val localeCode = if (prefCode != OPTION_PHONE_LANGUAGE) {
+			prefCode
+		} else {
+			val systemLang = ConfigurationCompat.getLocales(Resources.getSystem().configuration).get(0)?.language ?: DEFAULT_LANG
+			if (systemLang in supportedLocales) {
+				systemLang
+			} else {
+				DEFAULT_LANG
+			}
+		}
+		return Locale.forLanguageTag(localeCode)
+	}
+
+	fun getLocalizedConfiguration(prefLocaleCode: String): Configuration {
+		val locale = getLocaleFromPrefCode(prefLocaleCode)
+		return getLocalizedConfiguration(locale)
+	}
+
+	private fun getLocalizedConfiguration(locale: Locale): Configuration {
+		val config = Configuration()
+		return config.apply {
+			config.setLayoutDirection(locale)
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				config.setLocale(locale)
+				val localeList = LocaleList(locale)
+				LocaleList.setDefault(localeList)
+				config.setLocales(localeList)
+			} else {
+				config.setLocale(locale)
+			}
+		}
+	}
+
+	fun getLocalizedContext(baseContext: Context, prefLocaleCode: String?): Context {
+		if (prefLocaleCode == null) return baseContext
+		val currentLocale = getLocaleFromPrefCode(prefLocaleCode)
+		val baseLocale = getLocaleFromConfiguration(baseContext.resources.configuration)
+		Locale.setDefault(currentLocale)
+		return if (!baseLocale.toString().equals(currentLocale.toString(), ignoreCase = true)) {
+			val config = getLocalizedConfiguration(currentLocale)
+			baseContext.createConfigurationContext(config)
+			baseContext
+		} else {
+			baseContext
+		}
+	}
+
+	fun applyLocalizedContext(baseContext: Context, prefLocaleCode: String) {
+		val currentLocale = getLocaleFromPrefCode(prefLocaleCode)
+		val baseLocale = getLocaleFromConfiguration(baseContext.resources.configuration)
+		Locale.setDefault(currentLocale)
+		if (!baseLocale.toString().equals(currentLocale.toString(), ignoreCase = true)) {
+			val config = getLocalizedConfiguration(currentLocale)
+			baseContext.resources.updateConfiguration(config, baseContext.resources.displayMetrics)
+		}
+	}
+
+	@Suppress("DEPRECATION")
+	private fun getLocaleFromConfiguration(configuration: Configuration): Locale {
+		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			configuration.locales.get(0)
+		} else {
+			configuration.locale
+		}
+	}
+
+	fun getLocalizedResources(resources: Resources, prefLocaleCode: String): Resources {
+		val locale = getLocaleFromPrefCode(prefLocaleCode)
+		val config = resources.configuration
+		@Suppress("DEPRECATION")
+		config.locale = locale
+		config.setLayoutDirection(locale)
+
+		@Suppress("DEPRECATION")
+		resources.updateConfiguration(config, resources.displayMetrics)
+		return resources
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/SingletonHolder.kt

@@ -0,0 +1,26 @@
+package com.zaneschepke.wireguardautotunnel.util
+
+open class SingletonHolder<out T : Any, in A>(creator: (A) -> T) {
+	private var creator: ((A) -> T)? = creator
+
+	@Volatile private var instance: T? = null
+
+	fun getInstance(arg: A): T {
+		val i = instance
+		if (i != null) {
+			return i
+		}
+
+		return synchronized(this) {
+			val i2 = instance
+			if (i2 != null) {
+				i2
+			} else {
+				val created = creator!!(arg)
+				instance = created
+				creator = null
+				created
+			}
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/ContextExtensions.kt

@@ -2,18 +2,27 @@ package com.zaneschepke.wireguardautotunnel.util.extensions
 
 import android.content.ComponentName
 import android.content.Context
+import android.content.Context.POWER_SERVICE
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.location.LocationManager
 import android.net.Uri
+import android.os.PowerManager
 import android.provider.Settings
 import android.service.quicksettings.TileService
 import android.widget.Toast
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.core.location.LocationManagerCompat
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.receiver.BackgroundActionReceiver
 import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
 import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
 import com.zaneschepke.wireguardautotunnel.util.Constants
 
+private const val BASELINE_HEIGHT = 2201
+private const val BASELINE_WIDTH = 1080
+private const val BASELINE_DENSITY = 2.625
+
 fun Context.openWebUrl(url: String): Result<Unit> {
 	return kotlin.runCatching {
 		val webpage: Uri = Uri.parse(url)
@@ -26,6 +35,50 @@ fun Context.openWebUrl(url: String): Result<Unit> {
 	}
 }
 
+fun Context.isBatteryOptimizationsDisabled(): Boolean {
+	val pm = getSystemService(POWER_SERVICE) as PowerManager
+	return pm.isIgnoringBatteryOptimizations(packageName)
+}
+
+val Context.actionBarSize
+	get() = theme.obtainStyledAttributes(intArrayOf(android.R.attr.actionBarSize))
+		.let { attrs -> attrs.getDimension(0, 0F).toInt().also { attrs.recycle() } }
+
+fun Context.resizeHeight(dp: Dp): Dp {
+	val displayMetrics = resources.displayMetrics
+	val density = displayMetrics.density
+	val height = displayMetrics.heightPixels - this.actionBarSize
+	val resizeHeightPercentage =
+		(height.toFloat() / BASELINE_HEIGHT) * (BASELINE_DENSITY.toFloat() / density)
+	return dp * resizeHeightPercentage
+}
+
+fun Context.resizeHeight(textUnit: TextUnit): TextUnit {
+	val displayMetrics = resources.displayMetrics
+	val density = displayMetrics.density
+	val height = displayMetrics.heightPixels - actionBarSize
+	val resizeHeightPercentage =
+		(height.toFloat() / BASELINE_HEIGHT) * (BASELINE_DENSITY.toFloat() / density)
+	return textUnit * resizeHeightPercentage * 1.1
+}
+
+fun Context.resizeWidth(dp: Dp): Dp {
+	val displayMetrics = resources.displayMetrics
+	val density = displayMetrics.density
+	val width = displayMetrics.widthPixels
+	val resizeWidthPercentage =
+		(width.toFloat() / BASELINE_WIDTH) * (BASELINE_DENSITY.toFloat() / density)
+	return dp * resizeWidthPercentage
+}
+
+fun Context.launchNotificationSettings() {
+	if (isRunningOnTv()) return launchAppSettings()
+	val settingsIntent: Intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
+		.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+		.putExtra(Settings.EXTRA_APP_PACKAGE, packageName)
+	this.startActivity(settingsIntent)
+}
+
 fun Context.launchShareFile(file: Uri) {
 	val shareIntent = Intent().apply {
 		setAction(Intent.ACTION_SEND)
@@ -36,6 +89,14 @@ fun Context.launchShareFile(file: Uri) {
 	this.startActivity(Intent.createChooser(shareIntent, ""))
 }
 
+fun Context.isLocationServicesEnabled(): Boolean {
+	val locationManager =
+		getSystemService(
+			Context.LOCATION_SERVICE,
+		) as LocationManager
+	return LocationManagerCompat.isLocationEnabled(locationManager)
+}
+
 fun Context.showToast(resId: Int) {
 	Toast.makeText(
 		this,
@@ -104,23 +165,23 @@ fun Context.launchAppSettings() {
 	}
 }
 
-fun Context.startTunnelBackground(tunnelId: Int) {
-	sendBroadcast(
-		Intent(this, BackgroundActionReceiver::class.java).apply {
-			action = BackgroundActionReceiver.ACTION_CONNECT
-			putExtra(BackgroundActionReceiver.TUNNEL_ID_EXTRA_KEY, tunnelId)
-		},
-	)
-}
-
-fun Context.stopTunnelBackground(tunnelId: Int) {
-	sendBroadcast(
-		Intent(this, BackgroundActionReceiver::class.java).apply {
-			action = BackgroundActionReceiver.ACTION_DISCONNECT
-			putExtra(BackgroundActionReceiver.TUNNEL_ID_EXTRA_KEY, tunnelId)
-		},
-	)
-}
+// fun Context.startTunnelBackground(tunnelId: Int) {
+// 	sendBroadcast(
+// 		Intent(this, BackgroundActionReceiver::class.java).apply {
+// 			action = BackgroundActionReceiver.ACTION_CONNECT
+// 			putExtra(BackgroundActionReceiver.TUNNEL_ID_EXTRA_KEY, tunnelId)
+// 		},
+// 	)
+// }
+//
+// fun Context.stopTunnelBackground(tunnelId: Int) {
+// 	sendBroadcast(
+// 		Intent(this, BackgroundActionReceiver::class.java).apply {
+// 			action = BackgroundActionReceiver.ACTION_DISCONNECT
+// 			putExtra(BackgroundActionReceiver.TUNNEL_ID_EXTRA_KEY, tunnelId)
+// 		},
+// 	)
+// }
 
 fun Context.requestTunnelTileServiceStateUpdate() {
 	TileService.requestListeningState(

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/StringExtensions.kt

@@ -28,9 +28,9 @@ fun String.extractNameAndNumber(): Pair<String, Int>? {
 }
 
 fun List<String>.isMatchingToWildcardList(value: String): Boolean {
-	val excludeValues = this.filter { it.startsWith("!") }.map { it.removePrefix("!").toRegexWithWildcards() }
+	val excludeValues = this.filter { it.startsWith("!") }.map { it.removePrefix("!").transformWildcardsToRegex() }
 	Timber.d("Excluded values: $excludeValues")
-	val includedValues = this.filter { !it.startsWith("!") }.map { it.toRegexWithWildcards() }
+	val includedValues = this.filter { !it.startsWith("!") }.map { it.transformWildcardsToRegex() }
 	Timber.d("Included values: $includedValues")
 	val matches = includedValues.filter { it.matches(value) }
 	val excludedMatches = excludeValues.filter { it.matches(value) }
@@ -39,6 +39,32 @@ fun List<String>.isMatchingToWildcardList(value: String): Boolean {
 	return matches.isNotEmpty() && excludedMatches.isEmpty()
 }
 
-fun String.toRegexWithWildcards(): Regex {
-	return this.replace("*", ".*").replace("?", ".").toRegex()
+fun String.transformWildcardsToRegex(): Regex {
+	return this.replaceUnescapedChar("*", ".*").replaceUnescapedChar("?", ".").toRegex()
+}
+
+fun String.replaceUnescapedChar(charToReplace: String, replacement: String): String {
+	val escapedChar = Regex.escape(charToReplace)
+	val regex = "(?<!\\\\)(?<!(?<!\\\\)\\\\)($escapedChar)".toRegex()
+	return regex.replace(this) { matchResult ->
+		if (matchResult.range.first == 0 ||
+			this[matchResult.range.first - 1] != '\\' ||
+			(matchResult.range.first > 1 && this[matchResult.range.first - 2] == '\\')
+		) {
+			replacement.toString()
+		} else {
+			matchResult.value
+		}
+	}
+}
+
+fun String.isCharacterEscaped(index: Int): Boolean {
+	if (index <= 0) return false
+	var backslashCount = 0
+	var currentIndex = index - 1
+	while (currentIndex >= 0 && this[currentIndex] == '\\') {
+		backslashCount++
+		currentIndex--
+	}
+	return backslashCount % 2 != 0
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/TunnelExtensions.kt

@@ -5,8 +5,8 @@ import com.wireguard.android.util.RootShell
 import com.wireguard.config.Peer
 import com.zaneschepke.wireguardautotunnel.service.tunnel.HandshakeStatus
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.ui.theme.Corn
 import com.zaneschepke.wireguardautotunnel.ui.theme.SilverTree
+import com.zaneschepke.wireguardautotunnel.ui.theme.Straw
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import org.amnezia.awg.config.Config
@@ -58,7 +58,7 @@ fun TunnelStatistics?.asColor(): Color {
 		?.let { statuses ->
 			when {
 				statuses.all { it == HandshakeStatus.HEALTHY } -> SilverTree
-				statuses.any { it == HandshakeStatus.STALE } -> Corn
+				statuses.any { it == HandshakeStatus.STALE } -> Straw
 				statuses.all { it == HandshakeStatus.NOT_STARTED } -> Color.Gray
 				else -> Color.Gray
 			}

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/UiExtensions.kt

@@ -1,10 +1,43 @@
 package com.zaneschepke.wireguardautotunnel.util.extensions
 
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
 import androidx.navigation.NavController
+import androidx.navigation.NavGraph.Companion.findStartDestination
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.isCurrentRoute
 
 fun NavController.navigateAndForget(route: Route) {
 	navigate(route) {
 		popUpTo(0)
 	}
 }
+
+fun NavController.goFromRoot(route: Route) {
+	if (currentBackStackEntry?.isCurrentRoute(route::class) == true) return
+	this.navigate(route) {
+		// Pop up to the start destination of the graph to
+		// avoid building up a large stack of destinations
+		// on the back stack as users select items
+		popUpTo(graph.findStartDestination().id) {
+			saveState = true
+		}
+		// Avoid multiple copies of the same destination when
+		// reselecting the same item
+		launchSingleTop = true
+		restoreState = true
+	}
+}
+
+fun Dp.scaledHeight(): Dp {
+	return WireGuardAutoTunnel.instance.resizeHeight(this)
+}
+
+fun Dp.scaledWidth(): Dp {
+	return WireGuardAutoTunnel.instance.resizeWidth(this)
+}
+
+fun TextUnit.scaled(): TextUnit {
+	return WireGuardAutoTunnel.instance.resizeHeight(this)
+}

app/src/main/res/values/strings.xml

@@ -23,7 +23,7 @@
     <string name="enable_auto_tunnel">Start auto-tunneling</string>
     <string name="disable_auto_tunnel">Stop auto-tunneling</string>
     <string name="tunnel_mobile_data">Tunnel on mobile data</string>
-	<string name="privacy_policy">View Privacy Policy</string>
+	<string name="privacy_policy">View privacy policy</string>
     <string name="okay">Okay</string>
     <string name="tunnel_on_ethernet">Tunnel on ethernet</string>
     <string name="prominent_background_location_message">This feature requires background location permission to enable Wi-Fi SSID monitoring even while the application is closed. For more details, please see the Privacy Policy linked on the Support screen.</string>
@@ -193,11 +193,38 @@
 	<string name="set_custom_ping_internal">Ping interval (sec)</string>
 	<string name="optional_default">"optional, default: "</string>
 	<string name="set_custom_ping_cooldown">Ping restart cooldown (sec)</string>
-    <string name="wildcard_supported">Learn about supported wildcards.</string>
 	<string name="details">details</string>
 	<string name="show_amnezia_properties">Show Amnezia properties</string>
 	<string name="never">never</string>
 	<string name="sec">sec</string>
 	<string name="handshake">handshake</string>
     <string name="logs">Logs</string>
+    <string name="tunnel_notifications">Tunnel notifications</string>
+	<string name="kill_switch">Kill switch</string>
+	<string name="appearance">Appearance</string>
+	<string name="notifications">Notifications</string>
+	<string name="automatic">Automatic</string>
+	<string name="light">Light</string>
+	<string name="dark">Dark</string>
+	<string name="dynamic">Dynamic</string>
+	<string name="language">Language</string>
+	<string name="display_theme">Display theme</string>
+	<string name="selected">Selected</string>
+    <string name="trusted_wifi_names">Trusted wifi names</string>
+	<string name="add_wifi_name">Add wifi name</string>
+	<string name="on_demand_rules">On demand tunnel rules</string>
+	<string name="primary_tunnel">Primary tunnel</string>
+	<string name="mobile_tunnel">Mobile data tunnel</string>
+	<string name="skip">Skip</string>
+	<string name="launch_app_settings">Launch app settings</string>
+	<string name="use_wildcards">Use name wildcards</string>
+	<string name="learn_more">Learn more</string>
+	<string name="wildcards_active">Wildcards active</string>
+    <string name="wifi_name_via_shell">Wifi name via shell</string>
+	<string name="use_root_shell_for_wifi">Use root shell to get wifi name</string>
+	<string name="kernel_not_supported">Kernel not supported</string>
+	<string name="start_auto">Start auto-tunnel</string>
+	<string name="stop_auto">Stop auto-tunnel</string>
+    <string name="tunnel_running">Tunnel running</string>
+	<string name="monitoring_state_changes">Monitoring state changes</string>
 </resources>

app/src/main/res/xml/shortcuts.xml

@@ -37,8 +37,8 @@
         android:enabled="true"
         android:icon="@drawable/auto_play"
         android:shortcutId="autoOn1"
-        android:shortcutLongLabel="@string/auto_on"
-        android:shortcutShortLabel="@string/auto_tun_on">
+        android:shortcutLongLabel="@string/start_auto"
+        android:shortcutShortLabel="@string/start_auto">
         <intent
             android:action="START"
             android:targetClass="com.zaneschepke.wireguardautotunnel.service.shortcut.ShortcutsActivity"
@@ -53,8 +53,8 @@
         android:enabled="true"
         android:icon="@drawable/auto_pause"
         android:shortcutId="autoOff1"
-        android:shortcutLongLabel="@string/auto_off"
-        android:shortcutShortLabel="@string/auto_tun_off">
+        android:shortcutLongLabel="@string/stop_auto"
+        android:shortcutShortLabel="@string/stop_auto">
         <intent
             android:action="STOP"
             android:targetClass="com.zaneschepke.wireguardautotunnel.service.shortcut.ShortcutsActivity"

buildSrc/src/main/kotlin/Constants.kt

@@ -1,8 +1,8 @@
 object Constants {
-	const val VERSION_NAME = "3.5.4"
+	const val VERSION_NAME = "3.6.0"
     const val JVM_TARGET = "17"
-    const val VERSION_CODE = 35400
-    const val TARGET_SDK = 34
+    const val VERSION_CODE = 36000
+    const val TARGET_SDK = 35
     const val MIN_SDK = 26
     const val APP_ID = "com.zaneschepke.wireguardautotunnel"
     const val APP_NAME = "wgtunnel"

buildSrc/src/main/kotlin/Extensions.kt

@@ -72,6 +72,18 @@ fun Project.getSigningProperty(property: String): String {
         )
 }
 
+fun Project.languageList(): List<String> {
+	return fileTree("../app/src/main/res") { include("**/strings.xml") }
+		.asSequence()
+		.map { stringFile -> stringFile.parentFile.name }
+		.map { valuesFolderName -> valuesFolderName.replace("values-", "") }
+		.filter { valuesFolderName -> valuesFolderName != "values" }
+		.map { languageCode -> languageCode.replace("-r", "_") }
+		.distinct()
+		.sorted()
+		.toList() + "en"
+}
+
 
 
 

fastlane/metadata/android/en-US/changelogs/35400.txt

@@ -1,5 +0,0 @@
-What's new:
-- Fix Android 12 crashing issue
-- Fix copy tunnel bug
-- Auto toggle Amnezia props
-- Hide preshared key without auth

fastlane/metadata/android/en-US/changelogs/36000.txt

@@ -0,0 +1,6 @@
+What's new:
+- UI update
+- AndroidTV navigation improvements
+- Battery drain bug fix
+- Wildcards fix with optional setting
+- Other improvements

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ androidx-junit = "1.2.1"
 appcompat = "1.7.0"
 biometricKtx = "1.2.0-alpha05"
 coreGoogleShortcuts = "1.1.0"
-coreKtx = "1.13.1"
+coreKtx = "1.15.0"
 datastorePreferences = "1.1.1"
 desugar_jdk_libs = "2.1.2"
 espressoCore = "3.6.1"
@@ -14,18 +14,18 @@ hiltAndroid = "2.52"
 hiltNavigationCompose = "1.2.0"
 junit = "4.13.2"
 kotlinx-serialization-json = "1.7.3"
-lifecycle-runtime-compose = "2.8.6"
-material3 = "1.3.0"
+lifecycle-runtime-compose = "2.8.7"
+material3 = "1.3.1"
 navigationCompose = "2.8.3"
 pinLockCompose = "1.0.4"
 roomVersion = "2.6.1"
 timber = "5.0.1"
 tunnel = "1.2.1"
-androidGradlePlugin = "8.7.1"
+androidGradlePlugin = "8.7.2"
 kotlin = "2.0.21"
 ksp = "2.0.21-1.0.25"
-composeBom = "2024.10.00"
-compose = "1.7.4"
+composeBom = "2024.10.01"
+compose = "1.7.5"
 zxingAndroidEmbedded = "4.3.0"
 coreSplashscreen = "1.0.1"
 gradlePlugins-grgit = "5.3.0"

versionCode.txt

@@ -1 +1 @@
-10
+4