build(deps): bump androidGradlePlugin from 8.7.2 to 8.7.3

Bumps `androidGradlePlugin` from 8.7.2 to 8.7.3.

Updates `com.android.application` from 8.7.2 to 8.7.3

Updates `com.android.library` from 8.7.2 to 8.7.3

---
updated-dependencies:
- dependency-name: com.android.application
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.android.library
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/FUNDING.yml

@@ -1,2 +1,3 @@
 ko_fi: zaneschepke
-liberapay: zaneschepke
+liberapay: zaneschepke
+github: zaneschepke

.github/workflows/release.yml

@@ -34,29 +34,28 @@ on:
 
 jobs:
   check_commits:
+    name: Check for New Commits
     runs-on: ubuntu-latest
+    outputs:
+      has_new_commits: ${{ steps.check.outputs.new_commits }}
+
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # This fetches all history so we can check commits
 
-      - name: Check for new commits in the last 23 hours
-        id: check_commits
+      - name: Check for new commits
+        id: check
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          # Get the current time and the time 23 hours ago in ISO 8601 format
-          now=$(date --utc +%Y-%m-%dT%H:%M:%SZ)
-          past=$(date --utc --date='23 hours ago' +%Y-%m-%dT%H:%M:%SZ)
-
-          # Fetch commit history and check for commits in the last 23 hours
-          if git rev-list --since="$past" --count HEAD > /dev/null; then
-            echo "New commits found in the last 23 hours."
-            echo "::set-output name=new_commits::true"
-          else
-            echo "No new commits found in the last 23 hours."
-            echo "::set-output name=new_commits::false"
-          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' || github.event_name != 'schedule'}}
+    if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
     name: Build Signed APK
     runs-on: ubuntu-latest
     env:
@@ -95,6 +94,32 @@ jobs:
           fileDir: ${{ env.KEY_STORE_LOCATION }}
           encodedString: ${{ secrets.KEYSTORE }}
 
+      # update latest tag
+      - name: Set latest tag
+        uses: rickstaa/action-create-tag@v1
+        id: tag_creation
+        with:
+          tag: "latest"  # or any tag name you wish to use
+          message: "Automated tag for HEAD commit"
+          force_push_tag: true
+          tag_exists_error: false
+
+      - name: Get latest release
+        id: latest_release
+        uses: kaliber5/action-get-release@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          latest: true
+
+      - name: Generate Changelog
+        id: changelog
+        uses: requarks/changelog-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          toTag: ${{ github.event_name == 'schedule' && 'nightly' || steps.latest_release.outputs.tag_name }}
+          fromTag: "latest"
+          writeToFile: false  # we won't write to file, just output
+
       # create keystore path for gradle to read
       - name: Create keystore path env var
         run: |
@@ -210,6 +235,9 @@ jobs:
 
             SHA256 fingerprint:
             ```${{ steps.checksum.outputs.checksum }}```
+
+            ### Changelog
+            ${{ steps.changelog.outputs.changes }}
           tag_name: ${{ env.TAG_NAME }}
           name: ${{ env.TAG_NAME }}
           draft: false

README.md

@@ -5,7 +5,6 @@ WG Tunnel
 <div align="center">
 
 [![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/rbRRNh6H7V)
-[![X Community](https://img.shields.io/badge/X-000000?style=for-the-badge&logo=x&logoColor=white)](https://twitter.com/i/communities/1780655267685736818)
 [![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/wgtunnel)
 
 </div>

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/schemas/com.zaneschepke.wireguardautotunnel.data.AppDatabase/12.json

@@ -0,0 +1,246 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 12,
+    "identityHash": "acf79ac5defacda5be6c3f976e777de3",
+    "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, `is_stop_on_no_internet_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"
+          },
+          {
+            "fieldPath": "isStopOnNoInternetEnabled",
+            "columnName": "is_stop_on_no_internet_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, `is_ethernet_tunnel` INTEGER NOT NULL DEFAULT false)",
+        "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"
+          },
+          {
+            "fieldPath": "isEthernetTunnel",
+            "columnName": "is_ethernet_tunnel",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          }
+        ],
+        "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, 'acf79ac5defacda5be6c3f976e777de3')"
+    ]
+  }
+}

app/src/main/AndroidManifest.xml

@@ -3,17 +3,7 @@
     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"
-        android:maxSdkVersion="30"
-        tools:ignore="LeanbackUsesWifi" />
+    <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" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -22,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" />
@@ -49,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>
@@ -71,7 +68,9 @@
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.WireguardAutoTunnel">
+            android:theme="@style/Theme.WireguardAutoTunnel"
+			android:configChanges="orientation|screenSize|keyboardHidden"
+			>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -158,7 +157,7 @@
 				android:value="true" />
 		</service>
         <service
-            android:name=".service.foreground.AutoTunnelService"
+            android:name=".service.foreground.autotunnel.AutoTunnelService"
             android:enabled="true"
             android:exported="false"
             android:foregroundServiceType="systemExempted"
@@ -169,6 +168,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>
@@ -189,10 +189,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

@@ -3,9 +3,13 @@ package com.zaneschepke.wireguardautotunnel
 import android.app.Application
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.os.LocaleListCompat
 import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
 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
@@ -25,6 +29,9 @@ class WireGuardAutoTunnel : Application() {
 	@Inject
 	lateinit var logReader: LogReader
 
+	@Inject
+	lateinit var appStateRepository: AppStateRepository
+
 	@Inject
 	@IoDispatcher
 	lateinit var ioDispatcher: CoroutineDispatcher
@@ -45,9 +52,19 @@ class WireGuardAutoTunnel : Application() {
 		} else {
 			Timber.plant(ReleaseTree())
 		}
+		applicationScope.launch {
+			appStateRepository.getLocale()?.let {
+				val locale = LocaleUtil.getLocaleFromPrefCode(it)
+				val appLocale: LocaleListCompat = LocaleListCompat.forLanguageTags(locale)
+				AppCompatDelegate.setApplicationLocales(appLocale)
+			}
+		}
 		if (!isRunningOnTv()) {
 			applicationScope.launch(ioDispatcher) {
-				logReader.start()
+				if (appStateRepository.isLocalLogsEnabled()) {
+					Timber.d("Starting logger")
+					logReader.start()
+				}
 			}
 		}
 	}

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 = 12,
 	autoMigrations =
 	[
 		AutoMigration(from = 1, to = 2),
@@ -36,6 +36,15 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 		AutoMigration(7, 8),
 		AutoMigration(8, 9),
 		AutoMigration(9, 10),
+		AutoMigration(
+			from = 10,
+			to = 11,
+			spec = RemoveTunnelPauseMigration::class,
+		),
+		AutoMigration(
+			from = 11,
+			to = 12,
+		),
 	],
 	exportSchema = true,
 )
@@ -55,3 +64,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/TunnelConfigDao.kt

@@ -44,6 +44,9 @@ interface TunnelConfigDao {
 	@Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
 	suspend fun resetMobileDataTunnel()
 
+	@Query("UPDATE TunnelConfig SET is_ethernet_tunnel = 0 WHERE is_ethernet_tunnel =1")
+	suspend fun resetEthernetTunnel()
+
 	@Query("SELECT * FROM TUNNELCONFIG WHERE is_primary_tunnel=1")
 	suspend fun findByPrimary(): TunnelConfigs
 

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

@@ -21,11 +21,14 @@ 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 isLocalLogsEnabled = booleanPreferencesKey("LOCAL_LOGS_ENABLED")
+		val locale = stringPreferencesKey("LOCALE")
+		val theme = stringPreferencesKey("THEME")
 	}
 
 	// preferences

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

@@ -1,15 +1,21 @@
 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 isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
+	val locale: String? = null,
+	val theme: Theme = Theme.AUTOMATIC,
 ) {
 	companion object {
 		const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
 		const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
 		const val PIN_LOCK_ENABLED_DEFAULT = false
 		const val IS_TUNNEL_STATS_EXPANDED = false
+		const val IS_LOGS_ENABLED_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,19 @@ 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,
+	@ColumnInfo(
+		name = "is_stop_on_no_internet_enabled",
+		defaultValue = "false",
+	)
+	val isStopOnNoInternetEnabled: Boolean = false,
 )

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

@@ -5,6 +5,7 @@ import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
 import com.wireguard.config.Config
+import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
 import java.io.InputStream
 
 @Entity(indices = [Index(value = ["name"], unique = true)])
@@ -57,6 +58,11 @@ data class TunnelConfig(
 		defaultValue = "null",
 	)
 	var pingIp: String? = null,
+	@ColumnInfo(
+		name = "is_ethernet_tunnel",
+		defaultValue = "false",
+	)
+	var isEthernetTunnel: Boolean = false,
 ) {
 
 	fun toAmConfig(): org.amnezia.awg.config.Config {
@@ -79,6 +85,12 @@ data class TunnelConfig(
 			}
 		}
 
+		fun tunnelConfigFromAmConfig(config: org.amnezia.awg.config.Config, name: String): TunnelConfig {
+			val amQuick = config.toAwgQuickString(true)
+			val wgQuick = config.toWgQuickString()
+			return TunnelConfig(name = name, wgQuick = wgQuick, amQuick = amQuick)
+		}
+
 		const val AM_QUICK_DEFAULT = ""
 	}
 }

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,17 @@ interface AppStateRepository {
 
 	suspend fun setTunnelStatsExpanded(expanded: Boolean)
 
+	suspend fun setTheme(theme: Theme)
+
+	suspend fun getTheme(): Theme
+
+	suspend fun isLocalLogsEnabled(): Boolean
+
+	suspend fun setLocalLogsEnabled(enabled: Boolean)
+
+	suspend fun setLocale(localeTag: String)
+
+	suspend fun getLocale(): String?
+
 	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,77 @@ 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 suspend fun isLocalLogsEnabled(): Boolean {
+		return dataStoreManager.getFromStore(DataStoreManager.isLocalLogsEnabled) ?: GeneralState.IS_LOGS_ENABLED_DEFAULT
+	}
+
+	override suspend fun setLocalLogsEnabled(enabled: Boolean) {
+		dataStoreManager.saveToDataStore(DataStoreManager.isLocalLogsEnabled, enabled)
+	}
+
+	override suspend fun setLocale(localeTag: String) {
+		dataStoreManager.saveToDataStore(DataStoreManager.locale, localeTag)
+	}
+
+	override suspend fun getLocale(): String? {
+		return dataStoreManager.getFromStore(DataStoreManager.locale)
 	}
 
 	override val generalStateFlow: Flow<GeneralState> =
@@ -60,15 +91,18 @@ 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,
+						isLocalLogsEnabled = pref[DataStoreManager.isLocalLogsEnabled] ?: GeneralState.IS_LOGS_ENABLED_DEFAULT,
+						locale = pref[DataStoreManager.locale],
+						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()
 		}
 	}
 
@@ -57,11 +53,22 @@ class RoomTunnelConfigRepository(
 		}
 	}
 
+	override suspend fun updateEthernetTunnel(tunnelConfig: TunnelConfig?) {
+		withContext(ioDispatcher) {
+			tunnelConfigDao.resetEthernetTunnel()
+			tunnelConfig?.let {
+				save(
+					it.copy(
+						isEthernetTunnel = true,
+					),
+				)
+			}
+		}
+	}
+
 	override suspend fun delete(tunnelConfig: TunnelConfig) {
 		withContext(ioDispatcher) {
 			tunnelConfigDao.delete(tunnelConfig)
-		}.also {
-			WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
 		}
 	}
 

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

@@ -15,6 +15,8 @@ interface TunnelConfigRepository {
 
 	suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?)
 
+	suspend fun updateEthernetTunnel(tunnelConfig: TunnelConfig?)
+
 	suspend fun delete(tunnelConfig: TunnelConfig)
 
 	suspend fun getById(id: Int): TunnelConfig?

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/Action.kt

@@ -1,8 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
-
-enum class Action {
-	START,
-	START_FOREGROUND,
-	STOP,
-	STOP_FOREGROUND,
-}

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

@@ -1,76 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
-
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
-import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
-
-data class AutoTunnelState(
-	val isWifiConnected: Boolean = false,
-	val isEthernetConnected: Boolean = false,
-	val isMobileDataConnected: Boolean = false,
-	val currentNetworkSSID: String = "",
-	val settings: Settings = Settings(),
-	val tunnels: TunnelConfigs = emptyList(),
-) {
-	fun isEthernetConditionMet(): Boolean {
-		return (
-			isEthernetConnected &&
-				settings.isTunnelOnEthernetEnabled
-			)
-	}
-
-	fun isMobileDataConditionMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				settings.isTunnelOnMobileDataEnabled &&
-				!isWifiConnected &&
-				isMobileDataConnected
-			)
-	}
-
-	fun isTunnelOffOnMobileDataConditionMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				!settings.isTunnelOnMobileDataEnabled &&
-				isMobileDataConnected &&
-				!isWifiConnected
-			)
-	}
-
-	fun isUntrustedWifiConditionMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				isWifiConnected &&
-				!settings.trustedNetworkSSIDs.isMatchingToWildcardList(currentNetworkSSID) &&
-				settings.isTunnelOnWifiEnabled
-			)
-	}
-
-	fun isTrustedWifiConditionMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				(
-					isWifiConnected &&
-						settings.trustedNetworkSSIDs.isMatchingToWildcardList(currentNetworkSSID)
-					)
-			)
-	}
-
-	fun isTunnelOffOnWifiConditionMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				(
-					isWifiConnected &&
-						!settings.isTunnelOnWifiEnabled
-					)
-			)
-	}
-
-	fun isTunnelOffOnNoConnectivityMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				!isWifiConnected &&
-				!isMobileDataConnected
-			)
-	}
-}

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

@@ -3,69 +3,84 @@ 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.service.foreground.autotunnel.AutoTunnelService
+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/foreground/autotunnel/AutoTunnelEvent.kt

@@ -0,0 +1,9 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel
+
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+
+sealed class AutoTunnelEvent {
+	data class Start(val tunnelConfig: TunnelConfig? = null) : AutoTunnelEvent()
+	data object Stop : AutoTunnelEvent()
+	data object DoNothing : AutoTunnelEvent()
+}

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

@@ -1,6 +1,5 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
+package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel
 
-import android.content.Context
 import android.content.Intent
 import android.net.NetworkCapabilities
 import android.os.IBinder
@@ -10,11 +9,12 @@ import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.lifecycleScope
 import com.wireguard.android.util.RootShell
 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.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
 import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
 import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
@@ -22,19 +22,18 @@ import com.zaneschepke.wireguardautotunnel.service.network.NetworkStatus
 import com.zaneschepke.wireguardautotunnel.service.network.WifiService
 import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
 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.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.collect
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.update
@@ -42,6 +41,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.net.InetAddress
+import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 import javax.inject.Provider
 
@@ -50,6 +50,7 @@ class AutoTunnelService : LifecycleService() {
 	private val foregroundId = 122
 
 	@Inject
+	@AppShell
 	lateinit var rootShell: Provider<RootShell>
 
 	@Inject
@@ -74,6 +75,9 @@ class AutoTunnelService : LifecycleService() {
 	@IoDispatcher
 	lateinit var ioDispatcher: CoroutineDispatcher
 
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
 	@Inject
 	@MainImmediateDispatcher
 	lateinit var mainImmediateDispatcher: CoroutineDispatcher
@@ -82,20 +86,15 @@ class AutoTunnelService : LifecycleService() {
 
 	private var wakeLock: PowerManager.WakeLock? = null
 
-	private var wifiJob: Job? = null
-	private var mobileDataJob: Job? = null
-	private var ethernetJob: Job? = null
-	private var pingJob: Job? = null
-	private var networkEventJob: Job? = null
+	private val pingTunnelRestartActive = AtomicBoolean(false)
 
-	@get:Synchronized @set:Synchronized
-	private var running: Boolean = false
+	private var pingJob: Job? = null
 
 	override fun onCreate() {
 		super.onCreate()
 		lifecycleScope.launch(mainImmediateDispatcher) {
 			kotlin.runCatching {
-				launchNotification()
+				launchWatcherNotification()
 			}.onFailure {
 				Timber.e(it)
 			}
@@ -110,42 +109,26 @@ 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()
 			startVpnStateJob()
+			startNetworkJobs()
+			startPingStateJob()
 		}.onFailure {
 			Timber.e(it)
 		}
 	}
 
-	private fun stopService() {
+	fun stop() {
 		wakeLock?.let {
 			if (it.isHeld) {
 				it.release()
@@ -155,12 +138,12 @@ 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 {
@@ -223,6 +202,16 @@ class AutoTunnelService : LifecycleService() {
 		handleNetworkEventChanges()
 	}
 
+	private fun startPingStateJob() = lifecycleScope.launch {
+		autoTunnelStateFlow.collect {
+			if (it.isPingEnabled()) {
+				pingJob.onNotRunning { pingJob = startPingJob() }
+			} else {
+				if (!pingTunnelRestartActive.get()) cancelAndResetPingJob()
+			}
+		}
+	}
+
 	private suspend fun watchForMobileDataConnectivityChanges() {
 		withContext(ioDispatcher) {
 			Timber.i("Starting mobile data watcher")
@@ -230,28 +219,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")
 					}
 				}
@@ -264,9 +241,8 @@ class AutoTunnelService : LifecycleService() {
 			Timber.i("Starting ping watcher")
 			runCatching {
 				do {
-					val vpnState = tunnelService.get().vpnState.value
-					val settings = appDataRepository.settings.getSettings()
-					if (vpnState.status == TunnelState.UP && !settings.isAutoTunnelPaused) {
+					val vpnState = autoTunnelStateFlow.value.vpnState
+					if (vpnState.status.isUp() && !autoTunnelStateFlow.value.isNoConnectivity()) {
 						if (vpnState.tunnelConfig != null) {
 							val config = TunnelConfig.configFromWgQuick(vpnState.tunnelConfig.wgQuick)
 							val results = if (vpnState.tunnelConfig.pingIp != null) {
@@ -282,7 +258,9 @@ class AutoTunnelService : LifecycleService() {
 							if (results.contains(false)) {
 								Timber.i("Restarting VPN for ping failure")
 								val cooldown = vpnState.tunnelConfig.pingCooldown
-								tunnelService.get().bounceTunnel(vpnState.tunnelConfig)
+								pingTunnelRestartActive.set(true)
+								tunnelService.get().bounceTunnel()
+								pingTunnelRestartActive.set(false)
 								delay(cooldown ?: Constants.PING_COOLDOWN)
 								continue
 							}
@@ -296,34 +274,20 @@ 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) {
 			appDataRepository.settings.getSettingsFlow().combine(
-				// ignore isActive changes to allow manual tunnel overrides
-				appDataRepository.tunnels.getTunnelConfigsFlow().distinctUntilChanged { old, new ->
-					old.map { it.isActive } != new.map { it.isActive }
-				},
+				appDataRepository.tunnels.getTunnelConfigsFlow(),
 			) { settings, tunnels ->
-				autoTunnelStateFlow.value.copy(
-					settings = settings,
-					tunnels = tunnels,
-				)
-			}.collect {
-				onAutoTunnelPause(it.settings.isAutoTunnelPaused)
-				manageJobsBySettings(it.settings)
-				autoTunnelStateFlow.emit(it)
+				Pair(settings, tunnels)
+			}.collect { pair ->
+				autoTunnelStateFlow.update {
+					it.copy(
+						settings = pair.first,
+						tunnels = pair.second,
+					)
+				}
 			}
 		}
 	}
@@ -332,51 +296,19 @@ class AutoTunnelService : LifecycleService() {
 		Timber.i("Starting vpn state watcher")
 		withContext(ioDispatcher) {
 			tunnelService.get().vpnState.collect { state ->
-				state.tunnelConfig?.let {
-					val settings = appDataRepository.settings.getSettings()
-					if (it.isPingEnabled && !settings.isPingEnabled) {
-						pingJob.onNotRunning { pingJob = startPingJob() }
-					}
-					if (!it.isPingEnabled && !settings.isPingEnabled) {
-						cancelAndResetPingJob()
-					}
+				autoTunnelStateFlow.update {
+					it.copy(vpnState = state)
 				}
 			}
 		}
 	}
 
-	private fun manageJobsBySettings(settings: Settings) {
-		with(settings) {
-			if (isPingEnabled) {
-				pingJob.onNotRunning { pingJob = startPingJob() }
-			} else {
-				cancelAndResetPingJob()
-			}
-			if (isTunnelOnWifiEnabled || isTunnelOnEthernetEnabled || isTunnelOnMobileDataEnabled) {
-				startNetworkJobs()
-			} else {
-				cancelAndResetNetworkJobs()
-			}
-		}
-	}
-
 	private fun startNetworkJobs() {
-		wifiJob.onNotRunning {
-			Timber.i("Wifi job starting")
-			wifiJob = startWifiJob()
-		}
-		ethernetJob.onNotRunning {
-			ethernetJob = startEthernetJob()
-			Timber.i("Ethernet job starting")
-		}
-		mobileDataJob.onNotRunning {
-			mobileDataJob = startMobileDataJob()
-			Timber.i("Mobile data job starting")
-		}
-		networkEventJob.onNotRunning {
-			Timber.i("Network event job starting")
-			networkEventJob = startNetworkEventJob()
-		}
+		Timber.i("Starting all network state jobs..")
+		startWifiJob()
+		startEthernetJob()
+		startMobileDataJob()
+		startNetworkEventJob()
 	}
 
 	private fun cancelAndResetPingJob() {
@@ -384,18 +316,7 @@ class AutoTunnelService : LifecycleService() {
 		pingJob = null
 	}
 
-	private fun cancelAndResetNetworkJobs() {
-		networkEventJob?.cancelWithMessage("Network event job canceled")
-		wifiJob?.cancelWithMessage("Wifi job canceled")
-		ethernetJob?.cancelWithMessage("Ethernet job canceled")
-		mobileDataJob?.cancelWithMessage("Mobile data job canceled")
-		networkEventJob = null
-		wifiJob = null
-		ethernetJob = null
-		mobileDataJob = null
-	}
-
-	private fun updateEthernet(connected: Boolean) {
+	private fun emitEthernetConnected(connected: Boolean) {
 		autoTunnelStateFlow.update {
 			it.copy(
 				isEthernetConnected = connected,
@@ -403,7 +324,7 @@ class AutoTunnelService : LifecycleService() {
 		}
 	}
 
-	private fun updateWifi(connected: Boolean) {
+	private fun emitWifiConnected(connected: Boolean) {
 		autoTunnelStateFlow.update {
 			it.copy(
 				isWifiConnected = connected,
@@ -411,6 +332,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 +355,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 +379,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 +393,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,113 +408,27 @@ 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)
 			}
 		}
 	}
 
-	private suspend fun getMobileDataTunnel(): TunnelConfig? {
-		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 ->
-				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 {
-									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) {
-										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()
-							}
-						}
-
-						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.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")
-						}
-					}
+			Timber.i("Starting auto-tunnel network event watcher")
+			// ignore vpnState emits to allow manual overrides
+			autoTunnelStateFlow.distinctUntilChanged { old, new ->
+				old.copy(vpnState = new.vpnState) == new || old.tunnels.map { it.isActive } != new.tunnels.map { it.isActive }
+			}.collect { watcherState ->
+				when (val event = watcherState.asAutoTunnelEvent()) {
+					is AutoTunnelEvent.Start -> tunnelService.get().startTunnel(
+						event.tunnelConfig
+							?: appDataRepository.getPrimaryOrFirstTunnel(),
+					)
+					is AutoTunnelEvent.Stop -> tunnelService.get().stopTunnel()
+					AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: no condition met")
 				}
 			}
 		}

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

@@ -0,0 +1,144 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel
+
+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,
+	val currentNetworkSSID: String = "",
+	val settings: Settings = Settings(),
+	val tunnels: TunnelConfigs = emptyList(),
+) {
+
+	private fun isMobileDataActive(): Boolean {
+		return !isEthernetConnected && !isWifiConnected && isMobileDataConnected
+	}
+
+	private fun isMobileTunnelDataChangeNeeded(): Boolean {
+		val preferredTunnel = preferredMobileDataTunnel()
+		return preferredTunnel != null &&
+			vpnState.status.isUp() && preferredTunnel.id != vpnState.tunnelConfig?.id
+	}
+
+	private fun isEthernetTunnelChangeNeeded(): Boolean {
+		val preferredTunnel = preferredEthernetTunnel()
+		return preferredTunnel != null && vpnState.status.isUp() && preferredTunnel.id != vpnState.tunnelConfig?.id
+	}
+
+	private fun preferredMobileDataTunnel(): TunnelConfig? {
+		return tunnels.firstOrNull { it.isMobileDataTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
+	}
+
+	private fun preferredEthernetTunnel(): TunnelConfig? {
+		return tunnels.firstOrNull { it.isEthernetTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
+	}
+
+	private fun preferredWifiTunnel(): TunnelConfig? {
+		return getTunnelWithMatchingTunnelNetwork() ?: tunnels.firstOrNull { it.isPrimaryTunnel }
+	}
+
+	private fun isWifiActive(): Boolean {
+		return !isEthernetConnected && isWifiConnected
+	}
+
+	private fun startOnEthernet(): Boolean {
+		return isEthernetConnected && settings.isTunnelOnEthernetEnabled && vpnState.status.isDown()
+	}
+
+	private fun stopOnEthernet(): Boolean {
+		return isEthernetConnected && !settings.isTunnelOnEthernetEnabled && vpnState.status.isUp()
+	}
+
+	fun isNoConnectivity(): Boolean {
+		return !isEthernetConnected && !isWifiConnected && !isMobileDataConnected
+	}
+
+	private fun stopOnMobileData(): Boolean {
+		return isMobileDataActive() && !settings.isTunnelOnMobileDataEnabled && vpnState.status.isUp()
+	}
+
+	private fun startOnMobileData(): Boolean {
+		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && vpnState.status.isDown()
+	}
+
+	private fun changeOnMobileData(): Boolean {
+		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && isMobileTunnelDataChangeNeeded()
+	}
+
+	private fun changeOnEthernet(): Boolean {
+		return isEthernetConnected && settings.isTunnelOnEthernetEnabled && isEthernetTunnelChangeNeeded()
+	}
+
+	private fun stopOnWifi(): Boolean {
+		return isWifiActive() && !settings.isTunnelOnWifiEnabled && vpnState.status.isUp()
+	}
+
+	private fun stopOnTrustedWifi(): Boolean {
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isUp() && isCurrentSSIDTrusted()
+	}
+
+	private fun startOnUntrustedWifi(): Boolean {
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isDown() && !isCurrentSSIDTrusted()
+	}
+
+	private fun changeOnUntrustedWifi(): Boolean {
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isUp() && !isCurrentSSIDTrusted() && !isWifiTunnelPreferred()
+	}
+
+	private fun isWifiTunnelPreferred(): Boolean {
+		val preferred = preferredWifiTunnel()
+		val vpnTunnel = vpnState.tunnelConfig
+		return if (preferred != null && vpnTunnel != null) {
+			preferred.id == vpnTunnel.id
+		} else {
+			true
+		}
+	}
+
+	fun asAutoTunnelEvent(): AutoTunnelEvent {
+		return when {
+			// ethernet scenarios
+			stopOnEthernet() -> AutoTunnelEvent.Stop
+			startOnEthernet() || changeOnEthernet() -> AutoTunnelEvent.Start(preferredEthernetTunnel())
+			// mobile data scenarios
+			stopOnMobileData() -> AutoTunnelEvent.Stop
+			startOnMobileData() || changeOnMobileData() -> AutoTunnelEvent.Start(preferredMobileDataTunnel())
+			// wifi scenarios
+			stopOnWifi() -> AutoTunnelEvent.Stop
+			stopOnTrustedWifi() -> AutoTunnelEvent.Stop
+			startOnUntrustedWifi() || changeOnUntrustedWifi() -> AutoTunnelEvent.Start(preferredWifiTunnel())
+			// no connectivity
+			isNoConnectivity() && settings.isStopOnNoInternetEnabled -> AutoTunnelEvent.Stop
+			else -> AutoTunnelEvent.DoNothing
+		}
+	}
+
+	private fun isCurrentSSIDTrusted(): Boolean {
+		return if (settings.isWildcardsEnabled) {
+			settings.trustedNetworkSSIDs.isMatchingToWildcardList(currentNetworkSSID)
+		} else {
+			settings.trustedNetworkSSIDs.contains(currentNetworkSSID)
+		}
+	}
+
+	private fun getTunnelWithMatchingTunnelNetwork(): TunnelConfig? {
+		return tunnels.firstOrNull {
+			if (settings.isWildcardsEnabled) {
+				it.tunnelNetworks.isMatchingToWildcardList(currentNetworkSSID)
+			} else {
+				it.tunnelNetworks.contains(currentNetworkSSID)
+			}
+		}
+	}
+
+	fun isPingEnabled(): Boolean {
+		return settings.isPingEnabled ||
+			(vpnState.status.isUp() && vpnState.tunnelConfig != null && tunnels.first { it.id == vpnState.tunnelConfig.id }.isPingEnabled)
+	}
+}

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

@@ -4,11 +4,9 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 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.foreground.autotunnel.AutoTunnelService
 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 +22,9 @@ class ShortcutsActivity : ComponentActivity() {
 	@Inject
 	lateinit var tunnelService: Provider<TunnelService>
 
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
 	@Inject
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
@@ -44,26 +45,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()
 								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()
 						}
 					}
 				}
@@ -72,6 +63,11 @@ class ShortcutsActivity : ComponentActivity() {
 		finish()
 	}
 
+	enum class Action {
+		START,
+		STOP,
+	}
+
 	companion object {
 		const val LEGACY_TUNNEL_SERVICE_NAME = "WireGuardTunnelService"
 		const val LEGACY_AUTO_TUNNEL_SERVICE_NAME = "WireGuardConnectivityWatcherService"

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()
+					} 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,11 +5,12 @@ 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 stopTunnel(tunnelConfig: TunnelConfig): Result<TunnelState>
+	suspend fun startTunnel(tunnelConfig: TunnelConfig?, background: Boolean = false)
 
-	suspend fun bounceTunnel(tunnelConfig: TunnelConfig): Result<TunnelState>
+	suspend fun stopTunnel()
+
+	suspend fun bounceTunnel()
 
 	val vpnState: StateFlow<VpnState>
 
@@ -18,5 +19,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/TunnelState.kt

@@ -24,6 +24,14 @@ enum class TunnelState {
 		}
 	}
 
+	fun isDown(): Boolean {
+		return this == DOWN
+	}
+
+	fun isUp(): Boolean {
+		return this == UP
+	}
+
 	companion object {
 		fun from(state: Tunnel.State): TunnelState {
 			return when (state) {

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
@@ -20,7 +21,10 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import org.amnezia.awg.backend.Tunnel
 import timber.log.Timber
@@ -36,6 +40,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())
@@ -46,10 +51,12 @@ constructor(
 		vpnState.copy(
 			tunnelConfig = tunnels.firstOrNull { it.id == vpnState.tunnelConfig?.id },
 		)
-	}.stateIn(applicationScope, SharingStarted.Lazily, VpnState())
+	}.stateIn(applicationScope, SharingStarted.Eagerly, VpnState())
 
 	private var statsJob: Job? = null
 
+	private val mutex = Mutex()
+
 	private suspend fun backend(): Any {
 		val settings = appDataRepository.settings.getSettings()
 		if (settings.isKernelEnabled) return kernelBackend.get()
@@ -87,106 +94,101 @@ constructor(
 		}
 	}
 
-	override suspend fun startTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
-		return withContext(ioDispatcher) {
-			onBeforeStart(tunnelConfig)
-			setState(tunnelConfig, TunnelState.UP).onSuccess {
-				emitTunnelState(it)
-			}.onFailure {
-				Timber.e(it)
-				onStartFailed()
+	private fun isTunnelAlreadyRunning(tunnelConfig: TunnelConfig): Boolean {
+		val isRunning = tunnelConfig == _vpnState.value.tunnelConfig && _vpnState.value.status.isUp()
+		if (isRunning) Timber.w("Tunnel already running")
+		return isRunning
+	}
+
+	override suspend fun startTunnel(tunnelConfig: TunnelConfig?, background: Boolean) {
+		if (tunnelConfig == null) return
+		withContext(ioDispatcher) {
+			mutex.withLock {
+				if (isTunnelAlreadyRunning(tunnelConfig)) return@withContext
+				onBeforeStart(background)
+				setState(tunnelConfig, TunnelState.UP).onSuccess {
+					startStatsJob()
+					if (it.isUp()) appDataRepository.tunnels.save(tunnelConfig.copy(isActive = true))
+					updateTunnelState(it, tunnelConfig)
+				}.onFailure {
+					Timber.e(it)
+				}
 			}
 		}
 	}
 
-	override suspend fun stopTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
-		return withContext(ioDispatcher) {
-			onBeforeStop(tunnelConfig)
-			setState(tunnelConfig, TunnelState.DOWN).onSuccess {
-				emitTunnelState(it)
-			}.onFailure {
-				Timber.e(it)
-				onStopFailed()
+	override suspend fun stopTunnel() {
+		withContext(ioDispatcher) {
+			mutex.withLock {
+				if (_vpnState.value.status.isDown()) return@withContext
+				with(_vpnState.value) {
+					if (tunnelConfig == null) return@withContext
+					setState(tunnelConfig, TunnelState.DOWN).onSuccess {
+						updateTunnelState(it, null)
+						onStop(tunnelConfig)
+						stopBackgroundService()
+					}.onFailure {
+						Timber.e(it)
+					}
+				}
 			}
 		}
 	}
 
-	// use this when we just want to bounce tunnel and not change tunnelConfig active state
-	override suspend fun bounceTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
-		toggleTunnel(tunnelConfig)
-		delay(VPN_RESTART_DELAY)
-		return toggleTunnel(tunnelConfig)
+	override suspend fun bounceTunnel() {
+		if (_vpnState.value.tunnelConfig == null) return
+		val config = _vpnState.value.tunnelConfig
+		stopTunnel()
+		startTunnel(config)
 	}
 
-	private suspend fun toggleTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
-		return withContext(ioDispatcher) {
-			setState(tunnelConfig, TunnelState.TOGGLE).onSuccess {
-				emitTunnelState(it)
-				resetBackendStatistics()
-			}.onFailure {
-				Timber.e(it)
+	private suspend fun shutDownActiveTunnel() {
+		with(_vpnState.value) {
+			if (status.isUp()) {
+				stopTunnel()
 			}
 		}
 	}
 
-	private suspend fun onStopFailed() {
-		_vpnState.value.tunnelConfig?.let {
-			appDataRepository.tunnels.save(it.copy(isActive = true))
-		}
+	private suspend fun startBackgroundService() {
+		serviceManager.startBackgroundService()
+		serviceManager.requestTunnelTileUpdate()
 	}
 
-	private suspend fun onStartFailed() {
-		_vpnState.value.tunnelConfig?.let {
-			appDataRepository.tunnels.save(it.copy(isActive = false))
-		}
-		cancelStatsJob()
-		resetBackendStatistics()
+	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) }
+	private suspend fun onBeforeStart(background: Boolean) {
+		shutDownActiveTunnel()
 		resetBackendStatistics()
-		appDataRepository.tunnels.save(tunnelConfig.copy(isActive = true))
-		emitVpnStateConfig(tunnelConfig)
-		startStatsJob()
+		val settings = appDataRepository.settings.getSettings()
+		if (background || settings.isKernelEnabled) startBackgroundService()
 	}
 
-	private suspend fun onBeforeStop(tunnelConfig: TunnelConfig) {
-		cancelStatsJob()
-		resetBackendStatistics()
+	private suspend fun onStop(tunnelConfig: TunnelConfig) {
 		appDataRepository.tunnels.save(tunnelConfig.copy(isActive = false))
+		cancelStatsJob()
+		resetBackendStatistics()
 	}
 
-	private fun emitTunnelState(state: TunnelState) {
-		_vpnState.tryEmit(
-			_vpnState.value.copy(
-				status = state,
-			),
-		)
+	private fun updateTunnelState(state: TunnelState, tunnelConfig: TunnelConfig?) {
+		_vpnState.update {
+			it.copy(status = state, tunnelConfig = tunnelConfig)
+		}
 	}
 
 	private fun emitBackendStatistics(statistics: TunnelStatistics) {
-		_vpnState.tryEmit(
-			_vpnState.value.copy(
-				statistics = statistics,
-			),
-		)
-	}
-
-	private fun emitVpnStateConfig(tunnelConfig: TunnelConfig) {
-		_vpnState.tryEmit(
-			_vpnState.value.copy(
-				tunnelConfig = tunnelConfig,
-			),
-		)
+		_vpnState.update {
+			it.copy(statistics = statistics)
+		}
 	}
 
 	private fun resetBackendStatistics() {
-		_vpnState.tryEmit(
-			_vpnState.value.copy(
-				statistics = null,
-			),
-		)
+		_vpnState.update {
+			it.copy(statistics = null)
+		}
 	}
 
 	override suspend fun getState(): TunnelState {
@@ -230,16 +232,21 @@ constructor(
 	}
 
 	override fun onStateChange(newState: Tunnel.State) {
-		emitTunnelState(TunnelState.from(newState))
+		_vpnState.update {
+			it.copy(status = TunnelState.from(newState))
+		}
+		serviceManager.requestTunnelTileUpdate()
 	}
 
 	override fun onStateChange(state: State) {
-		emitTunnelState(TunnelState.from(state))
+		_vpnState.update {
+			it.copy(status = TunnelState.from(state))
+		}
+		serviceManager.requestTunnelTileUpdate()
 	}
 
 	companion object {
-		const val STATS_START_DELAY = 5_000L
+		const val STATS_START_DELAY = 1_000L
 		const val VPN_STATISTIC_CHECK_INTERVAL = 1_000L
-		const val VPN_RESTART_DELAY = 1_000L
 	}
 }

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

@@ -1,15 +1,25 @@
 package com.zaneschepke.wireguardautotunnel.ui
 
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.wireguard.android.backend.WgQuickBackend
+import com.wireguard.android.util.RootShell
+import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 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.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
+import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
+import com.zaneschepke.wireguardautotunnel.util.LocaleUtil.OPTION_PHONE_LANGUAGE
+import com.zaneschepke.wireguardautotunnel.util.StringValue
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -20,8 +30,10 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.takeWhile
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
+import kotlinx.coroutines.withContext
 import xyz.teamgravity.pin_lock_compose.PinManager
 import javax.inject.Inject
 import javax.inject.Provider
@@ -33,34 +45,39 @@ constructor(
 	private val appDataRepository: AppDataRepository,
 	private val tunnelService: Provider<TunnelService>,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+	@AppShell private val rootShell: Provider<RootShell>,
+	private val serviceManager: ServiceManager,
+	private val logReader: LogReader,
 ) : 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)
+	private val _isAppReady = MutableStateFlow(false)
 	val isAppReady = _isAppReady.asStateFlow()
 
-	init {
+	private val _configurationChange = MutableStateFlow(false)
+	val configurationChange = _configurationChange.asStateFlow()
 
+	init {
 		viewModelScope.launch {
 			initPin()
 			initAutoTunnel()
@@ -93,15 +110,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 +121,107 @@ constructor(
 	fun onPinLockEnabled() = viewModelScope.launch {
 		appDataRepository.appState.setPinLockEnabled(true)
 	}
+
+	fun setLocationDisclosureShown() = viewModelScope.launch {
+		appDataRepository.appState.setLocationDisclosureShown(true)
+	}
+
+	fun onToggleLocalLogging() = viewModelScope.launch(ioDispatcher) {
+		with(uiState.value.generalState) {
+			val toggledOn = !isLocalLogsEnabled
+			appDataRepository.appState.setLocalLogsEnabled(toggledOn)
+			if (!toggledOn) onLoggerStop()
+			_configurationChange.update {
+				true
+			}
+		}
+	}
+
+	private suspend fun onLoggerStop() {
+		logReader.stop()
+		logReader.deleteAndClearLogs()
+	}
+
+	fun onToggleAlwaysOnVPN() = viewModelScope.launch {
+		with(uiState.value.settings) {
+			appDataRepository.settings.save(
+				copy(
+					isAlwaysOnVpnEnabled = !isAlwaysOnVpnEnabled,
+				),
+			)
+		}
+	}
+
+	fun onLocaleChange(localeTag: String) = viewModelScope.launch {
+		val locale = LocaleUtil.getLocaleFromPrefCode(localeTag)
+		val storageLocale = if (localeTag == OPTION_PHONE_LANGUAGE) OPTION_PHONE_LANGUAGE else locale
+		appDataRepository.appState.setLocale(storageLocale)
+		val appLocale: LocaleListCompat = LocaleListCompat.forLanguageTags(locale)
+		AppCompatDelegate.setApplicationLocales(appLocale)
+	}
+
+	fun onToggleRestartAtBoot() = viewModelScope.launch {
+		with(uiState.value.settings) {
+			appDataRepository.settings.save(
+				copy(
+					isRestoreOnBootEnabled = !isRestoreOnBootEnabled,
+				),
+			)
+		}
+	}
+
+	fun onToggleShortcutsEnabled() = viewModelScope.launch {
+		with(uiState.value.settings) {
+			appDataRepository.settings.save(
+				this.copy(
+					isShortcutsEnabled = !isShortcutsEnabled,
+				),
+			)
+		}
+	}
+
+	private fun saveKernelMode(enabled: Boolean) = viewModelScope.launch {
+		with(uiState.value.settings) {
+			appDataRepository.settings.save(
+				this.copy(
+					isKernelEnabled = enabled,
+				),
+			)
+		}
+	}
+
+	fun onToggleKernelMode() = viewModelScope.launch {
+		with(uiState.value.settings) {
+			if (!isKernelEnabled) {
+				requestRoot().onSuccess {
+					if (!isKernelSupported()) return@onSuccess SnackbarController.showMessage(StringValue.StringResource(R.string.kernel_not_supported))
+					appDataRepository.settings.save(
+						copy(
+							isKernelEnabled = true,
+							isAmneziaEnabled = false,
+						),
+					)
+				}
+			} else {
+				saveKernelMode(enabled = false)
+			}
+		}
+	}
+
+	private suspend fun isKernelSupported(): Boolean {
+		return withContext(ioDispatcher) {
+			WgQuickBackend.hasKernelSupport()
+		}
+	}
+
+	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))
+			}
+		}
+	}
 }

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

@@ -1,16 +1,15 @@
 package com.zaneschepke.wireguardautotunnel.ui
 
+import android.content.Intent
 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
@@ -25,64 +24,56 @@ import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 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.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.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
 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.extensions.requestAutoTunnelTileServiceUpdate
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
+import kotlin.system.exitProcess
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
+
 	@Inject
 	lateinit var appStateRepository: AppStateRepository
 
 	@Inject
 	lateinit var tunnelService: TunnelService
 
-	private val viewModel by viewModels<AppViewModel>()
-
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		enableEdgeToEdge(
-			navigationBarStyle = SystemBarStyle.auto(
-				lightScrim = Color.Transparent.toArgb(),
-				darkScrim = Color.Transparent.toArgb(),
-			),
-		)
+
+		val viewModel by viewModels<AppViewModel>()
 
 		installSplashScreen().apply {
 			setKeepOnScreenCondition {
@@ -91,30 +82,34 @@ class MainActivity : AppCompatActivity() {
 		}
 
 		setContent {
-			val appUiState by viewModel.uiState.collectAsStateWithLifecycle(lifecycle = this.lifecycle)
+			val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
+			val configurationChange by viewModel.configurationChange.collectAsStateWithLifecycle()
 			val navController = rememberNavController()
-			val navBackStackEntry by navController.currentBackStackEntryAsState()
 
-			LaunchedEffect(appUiState.vpnState.status) {
-				val context = this@MainActivity
-				when (appUiState.vpnState.status) {
-					TunnelState.DOWN -> ServiceManager.stopTunnelBackgroundService(context)
-					else -> Unit
+			LaunchedEffect(configurationChange) {
+				if (configurationChange) {
+					Intent(this@MainActivity, MainActivity::class.java).also {
+						startActivity(it)
+						exitProcess(0)
+					}
 				}
-				context.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() }
+					WireguardAutoTunnelTheme(theme = appUiState.generalState.theme) {
 						Scaffold(
+							contentWindowInsets = WindowInsets(0.dp),
 							snackbarHost = {
 								SnackbarHost(host) { snackbarData: SnackbarData ->
 									CustomSnackBar(
@@ -127,16 +122,6 @@ class MainActivity : AppCompatActivity() {
 									)
 								}
 							},
-							modifier =
-							Modifier
-								.focusable()
-								.focusProperties {
-									if (navBackStackEntry?.isCurrentRoute(Route.Lock) == true) {
-										Unit
-									} else {
-										up = focusRequester
-									}
-								},
 							bottomBar = {
 								BottomNavBar(
 									navController,
@@ -159,17 +144,16 @@ class MainActivity : AppCompatActivity() {
 									),
 								)
 							},
-						) { padding ->
-							Box(modifier = Modifier.fillMaxSize().padding(padding)) {
+						) {
+							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),
+									startDestination = (if (appUiState.generalState.isPinLockEnabled) Route.Lock else Route.Main),
 								) {
 									composable<Route.Main> {
 										MainScreen(
-											focusRequester = focusRequester,
 											uiState = appUiState,
 										)
 									}
@@ -177,22 +161,34 @@ class MainActivity : AppCompatActivity() {
 										SettingsScreen(
 											appViewModel = viewModel,
 											uiState = appUiState,
-											focusRequester = focusRequester,
 										)
 									}
-									composable<Route.Support> {
-										SupportScreen(
-											focusRequester = focusRequester,
-											appUiState = appUiState,
+									composable<Route.LocationDisclosure> {
+										LocationDisclosureScreen(viewModel, appUiState)
+									}
+									composable<Route.AutoTunnel> {
+										AutoTunnelScreen(
+											appUiState,
 										)
 									}
+									composable<Route.Appearance> {
+										AppearanceScreen()
+									}
+									composable<Route.Language> {
+										LanguageScreen(appUiState, viewModel)
+									}
+									composable<Route.Display> {
+										DisplayScreen(appUiState)
+									}
+									composable<Route.Support> {
+										SupportScreen(appUiState, viewModel)
+									}
 									composable<Route.Logs> {
 										LogsScreen()
 									}
 									composable<Route.Config> {
 										val args = it.toRoute<Route.Config>()
 										ConfigScreen(
-											focusRequester = focusRequester,
 											tunnelId = args.id,
 										)
 									}
@@ -200,7 +196,6 @@ class MainActivity : AppCompatActivity() {
 										val args = it.toRoute<Route.Option>()
 										OptionsScreen(
 											tunnelId = args.id,
-											focusRequester = focusRequester,
 											appUiState = appUiState,
 										)
 									}
@@ -209,6 +204,9 @@ class MainActivity : AppCompatActivity() {
 											appViewModel = viewModel,
 										)
 									}
+									composable<Route.Scanner> {
+										ScannerScreen()
+									}
 								}
 							}
 						}
@@ -217,9 +215,9 @@ class MainActivity : AppCompatActivity() {
 			}
 		}
 	}
-
 	override fun onDestroy() {
 		super.onDestroy()
+		// save battery by not polling stats while app is closed
 		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()
 
@@ -20,6 +35,9 @@ sealed class Route {
 	@Serializable
 	data object Lock : Route()
 
+	@Serializable
+	data object Scanner : Route()
+
 	@Serializable
 	data class Config(
 		val id: Int,

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,99 @@
+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
+
+@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

@@ -3,6 +3,7 @@ package com.zaneschepke.wireguardautotunnel.ui.common.config
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsFocusedAsState
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
@@ -10,7 +11,6 @@ import androidx.compose.material.icons.outlined.Save
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -18,21 +18,19 @@ 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
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
-import com.zaneschepke.wireguardautotunnel.R
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.ui.common.textbox.CustomTextField
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
 
 @Composable
 fun SubmitConfigurationTextBox(
 	value: String?,
 	label: String,
 	hint: String,
-	focusRequester: FocusRequester,
 	isErrorValue: (value: String?) -> Boolean,
 	onSubmit: (value: String) -> Unit,
 	keyboardOptions: KeyboardOptions = KeyboardOptions(
@@ -47,18 +45,22 @@ fun SubmitConfigurationTextBox(
 
 	var stateValue by remember { mutableStateOf(value ?: "") }
 
-	OutlinedTextField(
+	CustomTextField(
 		isError = isErrorValue(stateValue),
-		modifier = Modifier
-			.fillMaxWidth()
-			.focusRequester(focusRequester),
+		textStyle = MaterialTheme.typography.bodySmall,
 		value = stateValue,
-		singleLine = true,
-		interactionSource = interactionSource,
 		onValueChange = { stateValue = it },
+		interactionSource = interactionSource,
 		label = { Text(label) },
-		maxLines = 1,
-		placeholder = { Text(hint) },
+		containerColor = MaterialTheme.colorScheme.surface,
+		placeholder = { Text(hint, style = MaterialTheme.typography.bodySmall) },
+		modifier =
+		Modifier
+			.padding(
+				top = 5.dp,
+				bottom = 10.dp,
+			).fillMaxWidth().padding(end = 16.dp.scaledWidth()),
+		singleLine = true,
 		keyboardOptions = keyboardOptions,
 		keyboardActions = KeyboardActions(
 			onDone = {
@@ -66,16 +68,17 @@ fun SubmitConfigurationTextBox(
 				keyboardController?.hide()
 			},
 		),
-		trailingIcon = {
+		trailing = {
 			if (!isErrorValue(stateValue) && isFocused) {
 				IconButton(onClick = {
 					onSubmit(stateValue)
 					keyboardController?.hide()
 					focusManager.clearFocus()
 				}) {
+					val icon = Icons.Outlined.Save
 					Icon(
-						imageVector = Icons.Outlined.Save,
-						contentDescription = stringResource(R.string.save_changes),
+						imageVector = icon,
+						contentDescription = icon.name,
 						tint = MaterialTheme.colorScheme.primary,
 					)
 				}

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/TopNavBar.kt

@@ -0,0 +1,35 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.navigation
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material3.CenterAlignedTopAppBar
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun TopNavBar(title: String, trailing: @Composable () -> Unit = {}, showBack: Boolean = true) {
+	val navController = LocalNavController.current
+	CenterAlignedTopAppBar(
+		title = {
+			Text(title)
+		},
+		navigationIcon = {
+			if (showBack) {
+				IconButton(onClick = { navController.popBackStack() }) {
+					val icon = Icons.AutoMirrored.Outlined.ArrowBack
+					Icon(
+						imageVector = icon,
+						contentDescription = icon.name,
+					)
+				}
+			}
+		},
+		actions = {
+			trailing()
+		},
+	)
+}

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,109 @@
+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.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,
+	interactionSource: 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
@@ -34,6 +33,7 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -60,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
@@ -67,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)
 	}
@@ -85,9 +86,14 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 	var showApplicationsDialog by remember { mutableStateOf(false) }
 	var showAuthPrompt by remember { mutableStateOf(false) }
 	var isAuthenticated by remember { mutableStateOf(false) }
-	var configType by remember { mutableStateOf(ConfigType.WIREGUARD) }
 
 	val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+	var configType by remember { mutableStateOf<ConfigType?>(null) }
+	val derivedConfigType = remember {
+		derivedStateOf {
+			configType ?: if (!uiState.isAmneziaEnabled) ConfigType.WIREGUARD else ConfigType.AMNEZIA
+		}
+	}
 	val saved by viewModel.saved.collectAsStateWithLifecycle(null)
 
 	LaunchedEffect(saved) {
@@ -96,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()
@@ -168,6 +162,9 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 	}
 
 	Scaffold(
+		topBar = {
+			TopNavBar(stringResource(R.string.edit_tunnel))
+		},
 		floatingActionButtonPosition = FabPosition.End,
 		floatingActionButton = {
 			FloatingActionButton(
@@ -184,8 +181,8 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 				)
 			}
 		},
-	) {
-		Column {
+	) { padding ->
+		Column(Modifier.padding(padding)) {
 			Column(
 				horizontalAlignment = Alignment.CenterHorizontally,
 				verticalArrangement = Arrangement.Top,
@@ -210,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,
@@ -226,10 +223,8 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 						)
 						ConfigurationToggle(
 							stringResource(id = R.string.show_amnezia_properties),
-							checked = configType == ConfigType.AMNEZIA,
-							padding = screenPadding,
+							checked = derivedConfigType.value == ConfigType.AMNEZIA,
 							onCheckChanged = { configType = if (it) ConfigType.AMNEZIA else ConfigType.WIREGUARD },
-							modifier = Modifier.focusRequester(focusRequester),
 						)
 						ConfigurationTextBox(
 							value = uiState.tunnelName,
@@ -239,8 +234,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 							hint = stringResource(R.string.tunnel_name).lowercase(),
 							modifier =
 							Modifier
-								.fillMaxWidth()
-								.focusRequester(focusRequester),
+								.fillMaxWidth(),
 						)
 						OutlinedTextField(
 							modifier =
@@ -249,12 +243,12 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								.clickable { showAuthPrompt = true },
 							value = uiState.interfaceProxy.privateKey,
 							visualTransformation =
-							if ((tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID.toInt()) || isAuthenticated) {
+							if ((tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID) || isAuthenticated) {
 								VisualTransformation.None
 							} else {
 								PasswordVisualTransformation()
 							},
-							enabled = (tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID.toInt()) || isAuthenticated,
+							enabled = (tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID) || isAuthenticated,
 							onValueChange = { value -> viewModel.onPrivateKeyChange(value) },
 							trailingIcon = {
 								IconButton(
@@ -344,7 +338,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								modifier = Modifier.width(IntrinsicSize.Min),
 							)
 						}
-						if (configType == ConfigType.AMNEZIA) {
+						if (derivedConfigType.value == ConfigType.AMNEZIA) {
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.junkPacketCount,
 								onValueChange = viewModel::onJunkPacketCountChanged,
@@ -353,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,
@@ -367,8 +360,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.junkPacketMaxSize,
@@ -381,8 +373,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.initPacketJunkSize,
@@ -392,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,
@@ -406,8 +396,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.initPacketMagicHeader,
@@ -420,8 +409,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.responsePacketMagicHeader,
@@ -434,8 +422,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.underloadPacketMagicHeader,
@@ -448,8 +435,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.transportPacketMagicHeader,
@@ -462,8 +448,7 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								).lowercase(),
 								modifier =
 								Modifier
-									.fillMaxWidth()
-									.focusRequester(focusRequester),
+									.fillMaxWidth(),
 							)
 						}
 						Row(

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

@@ -74,6 +74,7 @@ data class ConfigUiState(
 			return from(config).copy(
 				tunnelName = tunnel.name,
 				tunnel = tunnel,
+				isAmneziaEnabled = config.`interface`.junkPacketCount.isPresent,
 			)
 		}
 	}

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,14 +35,13 @@ 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.LocalClipboardManager
 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.journeyapps.barcodescanner.ScanContract
-import com.journeyapps.barcodescanner.ScanOptions
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.ui.AppUiState
@@ -46,6 +50,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
@@ -54,17 +59,17 @@ 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 clipboard = LocalClipboardManager.current
 	val snackbar = SnackbarController.current
 
 	var showBottomSheet by remember { mutableStateOf(false) }
@@ -72,30 +77,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(
@@ -105,15 +105,12 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 		viewModel.onTunnelFileSelected(data, context)
 	})
 
-	val scanLauncher =
-		rememberLauncherForActivityResult(
-			contract = ScanContract(),
-			onResult = {
-				if (it.contents != null) {
-					viewModel.onTunnelQrResult(it.contents)
-				}
-			},
-		)
+	val requestPermissionLauncher = rememberLauncherForActivityResult(
+		ActivityResultContracts.RequestPermission(),
+	) { isGranted ->
+		if (!isGranted) return@rememberLauncherForActivityResult snackbar.showMessage("Camera permission required")
+		navController.navigate(Route.Scanner)
+	}
 
 	VpnDeniedDialog(showVpnPermissionDialog, onDismiss = { showVpnPermissionDialog = false })
 
@@ -121,7 +118,7 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 		InfoDialog(
 			onDismiss = { showDeleteTunnelAlertDialog = false },
 			onAttest = {
-				selectedTunnel?.let { viewModel.onDelete(it, context) }
+				selectedTunnel?.let { viewModel.onDelete(it) }
 				showDeleteTunnelAlertDialog = false
 				selectedTunnel = null
 			},
@@ -131,26 +128,35 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 		)
 	}
 
-	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 (!checked) viewModel.onTunnelStop(tunnel).also { return }
-		if (uiState.settings.isKernelEnabled) {
-			context.startTunnelBackground(tunnel.id)
-		} else {
-			viewModel.onTunnelStart(tunnel)
-		}
+	fun requestBatteryOptimizationsDisabled() {
+		val intent =
+			Intent().apply {
+				action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+				data = Uri.parse("package:${context.packageName}")
+			}
+		batteryActivity.launch(intent)
 	}
 
-	fun launchQrScanner() {
-		val scanOptions = ScanOptions()
-		scanOptions.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
-		scanOptions.setOrientationLocked(true)
-		scanOptions.setPrompt(
-			context.getString(R.string.scanning_qr),
-		)
-		scanOptions.setBeepEnabled(false)
-		scanLauncher.launch(scanOptions)
+	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 vpnActivity.launch(intent)
+		if (!checked) viewModel.onTunnelStop().also { return }
+		viewModel.onTunnelStart(tunnel, uiState.settings.isKernelEnabled)
 	}
 
 	Scaffold(
@@ -165,23 +171,49 @@ 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,
-				)
-			}, focusRequester, isVisible = isFabVisible, onClick = {
-				showBottomSheet = true
-			})
+			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,
+							)
+						}
+					},
+				)
+			}
+		},
+	) { padding ->
 		TunnelImportSheet(
 			showBottomSheet,
 			onDismiss = { showBottomSheet = false },
 			onFileClick = { tunnelFileImportResultLauncher.launch(Constants.ALLOWED_TV_FILE_TYPES) },
-			onQrClick = { launchQrScanner() },
+			onQrClick = { requestPermissionLauncher.launch(android.Manifest.permission.CAMERA) },
+			onClipboardClick = {
+				clipboard.getText()?.text?.let {
+					viewModel.onClipboardImport(it)
+				}
+			},
 			onManualImportClick = {
 				navController.navigate(
 					Route.Config(Constants.MANUAL_TUNNEL_CONFIG_ID),
@@ -190,10 +222,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(padding)
 				.overscroll(ScrollableDefaults.overscrollEffect())
 				.nestedScroll(nestedScrollConnection),
 			state = rememberLazyListState(0, uiState.tunnels.count()),
@@ -205,23 +237,21 @@ 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(
 				uiState.tunnels,
 				key = { tunnel -> tunnel.id },
 			) { tunnel ->
-				val isActive = uiState.tunnels.any {
-					it.id == tunnel.id &&
-						it.isActive
-				}
 				val expanded = uiState.generalState.isTunnelStatsExpanded
 				TunnelRowItem(
-					isActive,
+					tunnel.id == uiState.vpnState.tunnelConfig?.id &&
+						uiState.vpnState.status.isUp(),
 					expanded,
 					selectedTunnel?.id == tunnel.id,
 					tunnel,
@@ -231,7 +261,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

@@ -19,6 +19,8 @@ import com.zaneschepke.wireguardautotunnel.util.FileReadException
 import com.zaneschepke.wireguardautotunnel.util.InvalidFileExtensionException
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.extensions.extractNameAndNumber
+import com.zaneschepke.wireguardautotunnel.util.extensions.hasNumberInParentheses
 import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
@@ -28,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)
@@ -67,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 {
+	fun onTunnelStop() = viewModelScope.launch {
 		Timber.i("Stopping active tunnel")
-		tunnelService.stopTunnel(tunnel)
+		tunnelService.get().stopTunnel()
 	}
 
 	private fun generateQrCodeDefaultName(config: String): String {
@@ -100,28 +100,18 @@ constructor(
 		return defaultName
 	}
 
-	fun onTunnelQrResult(result: String) = viewModelScope.launch(ioDispatcher) {
-		kotlin.runCatching {
-			val amConfig = TunnelConfig.configFromAmQuick(result)
-			val amQuick = amConfig.toAwgQuickString(true)
-			val wgQuick = amConfig.toWgQuickString()
-
-			val tunnelName = makeTunnelNameUnique(generateQrCodeTunnelName(result))
-			val tunnelConfig = TunnelConfig(name = tunnelName, wgQuick = wgQuick, amQuick = amQuick)
-			saveTunnel(tunnelConfig)
-		}.onFailure {
-			Timber.e(it)
-			SnackbarController.showMessage(StringValue.StringResource(R.string.error_invalid_code))
-		}
-	}
-
 	private suspend fun makeTunnelNameUnique(name: String): String {
 		return withContext(ioDispatcher) {
 			val tunnels = appDataRepository.tunnels.getAll()
 			var tunnelName = name
 			var num = 1
 			while (tunnels.any { it.name == tunnelName }) {
-				tunnelName = "$name($num)"
+				tunnelName = if (!tunnelName.hasNumberInParentheses()) {
+					"$name($num)"
+				} else {
+					val pair = tunnelName.extractNameAndNumber()
+					"${pair?.first}($num)"
+				}
 				num++
 			}
 			tunnelName
@@ -168,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 }
@@ -189,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)
 	}
@@ -248,14 +250,19 @@ constructor(
 
 	private fun saveSettings(settings: Settings) = viewModelScope.launch { appDataRepository.settings.save(settings) }
 
-	fun onCopyTunnel(tunnel: TunnelConfig?) = viewModelScope.launch {
-		tunnel?.let {
-			saveTunnel(
-				TunnelConfig(
-					name = it.name.plus(NumberUtils.randomThree()),
-					wgQuick = it.wgQuick,
-				),
-			)
+	fun onCopyTunnel(tunnel: TunnelConfig) = viewModelScope.launch {
+		saveTunnel(
+			TunnelConfig(name = makeTunnelNameUnique(tunnel.name), wgQuick = tunnel.wgQuick, amQuick = tunnel.amQuick),
+		)
+	}
+
+	fun onClipboardImport(config: String) = viewModelScope.launch(ioDispatcher) {
+		runCatching {
+			val amConfig = TunnelConfig.configFromAmQuick(config)
+			val tunnelConfig = TunnelConfig.tunnelConfigFromAmConfig(amConfig, makeTunnelNameUnique(generateQrCodeDefaultName(config)))
+			saveTunnel(tunnelConfig)
+		}.onFailure {
+			SnackbarController.showMessage(StringValue.StringResource(R.string.error_file_format))
 		}
 	}
 }

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

@@ -4,43 +4,23 @@ 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
 
 @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,30 +29,29 @@ fun AutoTunnelRowItem(settings: Settings, onToggle: () -> Unit, focusRequester:
 				icon.name,
 				modifier =
 				Modifier
-					.size(iconSize).scale(1.5f),
+					.size(16.dp).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()) {
-				itemFocusRequester.requestFocus()
+				onToggle()
 			}
 		},
 		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/TunnelImportSheet.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ContentPasteGo
 import androidx.compose.material.icons.filled.Create
 import androidx.compose.material.icons.filled.FileOpen
 import androidx.compose.material.icons.filled.QrCode
@@ -22,9 +23,17 @@ import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 
+// TODO refactor this component
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun TunnelImportSheet(show: Boolean, onDismiss: () -> Unit, onFileClick: () -> Unit, onQrClick: () -> Unit, onManualImportClick: () -> Unit) {
+fun TunnelImportSheet(
+	show: Boolean,
+	onDismiss: () -> Unit,
+	onFileClick: () -> Unit,
+	onQrClick: () -> Unit,
+	onManualImportClick: () -> Unit,
+	onClipboardClick: () -> Unit,
+) {
 	val sheetState = rememberModalBottomSheetState()
 
 	val context = LocalContext.current
@@ -77,6 +86,28 @@ fun TunnelImportSheet(show: Boolean, onDismiss: () -> Unit, onFileClick: () -> U
 						modifier = Modifier.padding(10.dp),
 					)
 				}
+				HorizontalDivider()
+				Row(
+					modifier =
+					Modifier
+						.fillMaxWidth()
+						.clickable {
+							onDismiss()
+							onClipboardClick()
+						}
+						.padding(10.dp),
+				) {
+					val icon = Icons.Filled.ContentPasteGo
+					Icon(
+						icon,
+						contentDescription = icon.name,
+						modifier = Modifier.padding(10.dp),
+					)
+					Text(
+						stringResource(id = R.string.add_from_clipboard),
+						modifier = Modifier.padding(10.dp),
+					)
+				}
 			}
 			HorizontalDivider()
 			Row(

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

@@ -9,11 +9,11 @@ import androidx.compose.material.icons.rounded.CopyAll
 import androidx.compose.material.icons.rounded.Delete
 import androidx.compose.material.icons.rounded.Info
 import androidx.compose.material.icons.rounded.Settings
+import androidx.compose.material.icons.rounded.SettingsEthernet
 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,14 +23,15 @@ 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
 
@@ -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
@@ -56,20 +56,17 @@ fun TunnelRowItem(
 	val itemFocusRequester = remember { FocusRequester() }
 	ExpandingRowListItem(
 		leading = {
-			val circleIcon = Icons.Rounded.Circle
-			val icon =
-				if (tunnel.isPrimaryTunnel) {
-					Icons.Rounded.Star
-				} else if (tunnel.isMobileDataTunnel) {
-					Icons.Rounded.Smartphone
-				} else {
-					circleIcon
-				}
+			val icon = when {
+				tunnel.isPrimaryTunnel -> Icons.Rounded.Star
+				tunnel.isMobileDataTunnel -> Icons.Rounded.Smartphone
+				tunnel.isEthernetTunnel -> Icons.Rounded.SettingsEthernet
+				else -> Icons.Rounded.Circle
+			}
 			Icon(
 				icon,
 				icon.name,
 				tint = leadingIconColor,
-				modifier = Modifier.size(iconSize),
+				modifier = Modifier.size(16.dp),
 			)
 		},
 		text = tunnel.name,
@@ -89,7 +86,6 @@ fun TunnelRowItem(
 		},
 		isExpanded = expanded && isActive,
 		expanded = { if (isActive && expanded) TunnelStatisticsRow(vpnState.statistics, tunnel) },
-		focusRequester = focusRequester,
 		trailing = {
 			if (
 				isSelected &&
@@ -143,7 +139,6 @@ fun TunnelRowItem(
 							)
 						}
 						IconButton(
-							modifier = Modifier.focusRequester(focusRequester),
 							onClick = {
 								if (isActive) {
 									onClick()
@@ -181,21 +176,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,32 +1,26 @@
 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.layout.size
 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.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.SettingsEthernet
+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
@@ -36,298 +30,261 @@ 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.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.config.SubmitConfigurationTextBox
+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.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.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.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)
+				.verticalScroll(rememberScrollState())
+				.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,
+			GroupLabel(stringResource(R.string.auto_tunneling))
+			SurfaceSelectionGroupButton(
+				buildList {
+					addAll(
+						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) },
 							),
-							keyboardActions = KeyboardActions(onDone = { saveTrustedSSID() }),
-							trailingIcon = {
-								if (currentText != "") {
-									IconButton(onClick = { saveTrustedSSID() }) {
+							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.SettingsEthernet,
+								title = {
+									Text(
+										stringResource(R.string.ethernet_tunnel),
+										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+									)
+								},
+								description = {
+									Text(
+										stringResource(R.string.set_ethernet_tunnel),
+										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.outline),
+									)
+								},
+								trailing = {
+									ScaledSwitch(
+										config.isEthernetTunnel,
+										onClick = { optionsViewModel.onToggleIsEthernetTunnel(config) },
+									)
+								},
+								onClick = { optionsViewModel.onToggleIsEthernetTunnel(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) },
+							),
+						),
+					)
+					if (config.isPingEnabled || appUiState.settings.isPingEnabled) {
+						add(
+							SelectionItem(
+								title = {},
+								description = {
+									SubmitConfigurationTextBox(
+										config.pingIp,
+										stringResource(R.string.set_custom_ping_ip),
+										stringResource(R.string.default_ping_ip),
+										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})",
+										keyboardOptions = KeyboardOptions(
+											keyboardType = KeyboardType.Number,
+											imeAction = ImeAction.Done,
+										),
+										isErrorValue = ::isSecondsError,
+										onSubmit = {
+											optionsViewModel.saveTunnelChanges(
+												config.copy(pingInterval = if (it.isBlank()) null else it.toLong() * 1000),
+											)
+										},
+									)
+									SubmitConfigurationTextBox(
+										config.pingCooldown?.let { (it / 1000).toString() },
+										stringResource(R.string.set_custom_ping_cooldown),
+										"(${stringResource(R.string.optional_default)} ${Constants.PING_COOLDOWN / 1000})",
+										keyboardOptions = KeyboardOptions(
+											keyboardType = KeyboardType.Number,
+										),
+										isErrorValue = ::isSecondsError,
+										onSubmit = {
+											optionsViewModel.saveTunnelChanges(
+												config.copy(pingCooldown = if (it.isBlank()) null else it.toLong() * 1000),
+											)
+										},
+									)
+								},
+							),
+						)
+					}
+					add(
+						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(
-											imageVector = Icons.Outlined.Add,
-											contentDescription = stringResource(R.string.save_changes),
-											tint = MaterialTheme.colorScheme.primary,
+											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),
-									)
-								},
-							)
-							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),
-									)
-								},
-							)
-						}
-					}
-				}
-			}
+							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()
+										}
+									},
+								)
+							},
+						),
+					)
+				},
+			)
 		}
 	}
 }

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)
 
@@ -76,4 +77,12 @@ constructor(
 			),
 		)
 	}
+
+	fun onToggleIsEthernetTunnel(tunnelConfig: TunnelConfig) = viewModelScope.launch {
+		if (tunnelConfig.isEthernetTunnel) {
+			appDataRepository.tunnels.updateEthernetTunnel(null)
+		} else {
+			appDataRepository.tunnels.updateEthernetTunnel(tunnelConfig)
+		}
+	}
 }

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

@@ -0,0 +1,44 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.scanner
+
+import android.app.Activity
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.viewinterop.AndroidView
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.journeyapps.barcodescanner.CompoundBarcodeView
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+
+@Composable
+fun ScannerScreen(viewModel: ScannerViewModel = hiltViewModel()) {
+	val context = LocalContext.current
+	val navController = LocalNavController.current
+
+	val success = viewModel.success.collectAsStateWithLifecycle(null)
+
+	LaunchedEffect(success.value) {
+		if (success.value != null) navController.popBackStack()
+	}
+
+	val barcodeView = remember {
+		CompoundBarcodeView(context).apply {
+			this.initializeFromIntent((context as Activity).intent)
+			this.setStatusText("")
+			this.decodeSingle { result ->
+				result.text?.let { barCodeOrQr ->
+					viewModel.onTunnelQrResult(barCodeOrQr)
+				}
+			}
+		}
+	}
+	AndroidView(factory = { barcodeView })
+	DisposableEffect(Unit) {
+		barcodeView.resume()
+		onDispose {
+			barcodeView.pause()
+		}
+	}
+}

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

@@ -0,0 +1,65 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.scanner
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.util.NumberUtils
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import javax.inject.Inject
+
+@HiltViewModel
+class ScannerViewModel @Inject
+constructor(
+	private val appDataRepository: AppDataRepository,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : ViewModel() {
+
+	private val _success = MutableSharedFlow<Boolean>()
+	val success = _success.asSharedFlow()
+
+	private suspend fun makeTunnelNameUnique(name: String): String {
+		return withContext(ioDispatcher) {
+			val tunnels = appDataRepository.tunnels.getAll()
+			var tunnelName = name
+			var num = 1
+			while (tunnels.any { it.name == tunnelName }) {
+				tunnelName = "$name($num)"
+				num++
+			}
+			tunnelName
+		}
+	}
+
+	fun onTunnelQrResult(result: String) = viewModelScope.launch(ioDispatcher) {
+		kotlin.runCatching {
+			val amConfig = TunnelConfig.configFromAmQuick(result)
+			val tunnelConfig = TunnelConfig.tunnelConfigFromAmConfig(amConfig, makeTunnelNameUnique(generateQrCodeDefaultName(result)))
+			appDataRepository.tunnels.save(tunnelConfig)
+			_success.emit(true)
+		}.onFailure {
+			_success.emit(false)
+			Timber.e(it)
+			SnackbarController.showMessage(StringValue.StringResource(R.string.error_invalid_code))
+		}
+	}
+
+	private fun generateQrCodeDefaultName(config: String): String {
+		return try {
+			TunnelConfig.configFromAmQuick(config).peers[0].endpoint.get().host
+		} catch (e: Exception) {
+			Timber.e(e)
+			NumberUtils.generateRandomTunnelName()
+		}
+	}
+}

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

@@ -1,246 +1,76 @@
 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.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
 
-@OptIn(
-	ExperimentalPermissionsApi::class,
-	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 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 +87,240 @@ 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)
 					},
+					trailing = {
+						ForwardButton(Modifier.focusable()) { navController.navigate(Route.AutoTunnel) }
+					},
+				),
+			),
+		)
+		SurfaceSelectionGroupButton(
+			buildList {
+				add(
+					SelectionItem(
+						Icons.Filled.AppShortcut,
+						{
+							ScaledSwitch(
+								uiState.settings.isShortcutsEnabled,
+								onClick = { appViewModel.onToggleShortcutsEnabled() },
+							)
+						},
+						title = {
+							Text(
+								stringResource(R.string.enabled_app_shortcuts),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						onClick = { appViewModel.onToggleShortcutsEnabled() },
+					),
 				)
-				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,
+				if (!isRunningOnTv) {
+					addAll(
+						listOf(
+							SelectionItem(
+								Icons.Outlined.VpnLock,
+								{
+									ScaledSwitch(
+										enabled = !(
+											(
+												uiState.settings.isTunnelOnWifiEnabled ||
+													uiState.settings.isTunnelOnEthernetEnabled ||
+													uiState.settings.isTunnelOnMobileDataEnabled
+												) &&
+												uiState.settings.isAutoTunnelEnabled
+											),
+										onClick = { appViewModel.onToggleAlwaysOnVPN() },
+										checked = uiState.settings.isAlwaysOnVpnEnabled,
+									)
+								},
+								title = {
+									Text(
+										stringResource(R.string.always_on_vpn_support),
+										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+									)
+								},
+								onClick = { appViewModel.onToggleAlwaysOnVPN() },
 							),
-							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.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 = { appViewModel.onToggleRestartAtBoot() },
+							)
+						},
+						title = {
+							Text(
+								stringResource(R.string.restart_at_boot),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						onClick = { appViewModel.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 = { appViewModel.onToggleKernelMode() },
+								enabled = !(
+									uiState.settings.isAutoTunnelEnabled ||
+										uiState.settings.isAlwaysOnVpnEnabled ||
+										(uiState.vpnState.status == TunnelState.UP)
+									),
+							)
+						},
+						onClick = {
+							appViewModel.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,273 +1,36 @@
 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
-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.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
 
 @HiltViewModel
 class SettingsViewModel
 @Inject
 constructor(
 	private val appDataRepository: AppDataRepository,
-	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(
-				copy(
-					isAlwaysOnVpnEnabled = !isAlwaysOnVpnEnabled,
-				),
-			)
-		}
-	}
-
-	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(
-				this.copy(
-					isShortcutsEnabled = !isShortcutsEnabled,
-				),
-			)
-		}
-	}
-
-	private fun saveKernelMode(enabled: Boolean) = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				this.copy(
-					isKernelEnabled = enabled,
-				),
-			)
-		}
-	}
-
-	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 {
-					appDataRepository.settings.save(
-						copy(
-							isKernelEnabled = true,
-							isAmneziaEnabled = false,
-						),
-					)
-				}
-			} else {
-				saveKernelMode(enabled = false)
-			}
-		}
-	}
-
-	fun onToggleRestartOnPing() = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				copy(
-					isPingEnabled = !isPingEnabled,
-				),
-			)
-		}
-	}
-
-	private suspend fun isKernelSupported(): Boolean {
-		return withContext(ioDispatcher) {
-			WgQuickBackend.hasKernelSupport()
-		}
-	}
-
-	fun onToggleRestartAtBoot() = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				copy(
-					isRestoreOnBootEnabled = !isRestoreOnBootEnabled,
-				),
-			)
-		}
-	}
-
-	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 {
-				rootShell.get().start()
-				SnackbarController.showMessage(StringValue.StringResource(R.string.root_accepted))
-			}.onFailure {
-				SnackbarController.showMessage(StringValue.StringResource(R.string.error_root_denied))
-			}
-		}
-	}
-
-	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,96 @@
+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.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.common.SelectedLabel
+import com.zaneschepke.wireguardautotunnel.ui.common.button.SelectionItemButton
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar
+import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
+import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
+import java.text.Collator
+import java.util.Locale
+
+@Composable
+fun LanguageScreen(appUiState: AppUiState, appViewModel: AppViewModel) {
+	val collator = Collator.getInstance(Locale.getDefault())
+
+	val locales = LocaleUtil.supportedLocales.map {
+		val tag = it.replace("_", "-")
+		Locale.forLanguageTag(tag)
+	}
+
+	val sortedLocales =
+		remember(locales) {
+			locales.sortedWith(compareBy(collator) { it.getDisplayName(it) }).toList()
+		}
+
+	Scaffold(
+		topBar = {
+			TopNavBar(stringResource(R.string.language))
+		},
+	) { padding ->
+		LazyColumn(
+			horizontalAlignment = Alignment.CenterHorizontally,
+			verticalArrangement = Arrangement.Top,
+			modifier =
+			Modifier
+				.fillMaxSize().padding(padding)
+				.padding(horizontal = 24.dp.scaledWidth()).windowInsetsPadding(WindowInsets.navigationBars),
+		) {
+			item {
+				Box(modifier = Modifier.padding(top = 24.dp.scaledHeight())) {
+					SelectionItemButton(
+						buttonText = stringResource(R.string.automatic),
+						onClick = {
+							appViewModel.onLocaleChange(LocaleUtil.OPTION_PHONE_LANGUAGE)
+						},
+						trailing = {
+							if (appUiState.generalState.locale == LocaleUtil.OPTION_PHONE_LANGUAGE) {
+								SelectedLabel()
+							}
+						},
+						ripple = false,
+					)
+				}
+			}
+			items(sortedLocales, key = { it }) { locale ->
+				SelectionItemButton(
+					buttonText = locale.getDisplayLanguage(locale).replaceFirstChar { if (it.isLowerCase()) it.titlecase(locale) else it.toString() } +
+						if (locale.toLanguageTag().contains("-")) {
+							" (${locale.getDisplayCountry(locale)
+								.replaceFirstChar { if (it.isLowerCase()) it.titlecase(locale) else it.toString() }})"
+						} else {
+							""
+						},
+					onClick = {
+						appViewModel.onLocaleChange(locale.toLanguageTag())
+					},
+					trailing = {
+						if (locale.toLanguageTag() == appUiState.generalState.locale) {
+							SelectedLabel()
+						}
+					},
+					ripple = false,
+				)
+			}
+		}
+	}
+}

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

@@ -0,0 +1,357 @@
+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.AirplanemodeActive
+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 isWifiNameReadable(): Boolean {
+		return when {
+			!isBackgroundLocationGranted ||
+				!fineLocationState.status.isGranted -> {
+				showLocationDialog = true
+				false
+			}
+			!context.isLocationServicesEnabled() -> {
+				showLocationServicesAlertDialog = true
+				false
+			}
+			else -> true
+		}
+	}
+
+	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))
+		},
+	) { padding ->
+		Column(
+			horizontalAlignment = Alignment.Start,
+			verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
+			modifier =
+			Modifier
+				.fillMaxSize()
+				.padding(padding)
+				.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 = {
+											viewModel.onToggleTunnelOnWifi()
+										},
+									)
+								},
+								onClick = {
+									viewModel.onToggleTunnelOnWifi()
+								},
+							),
+							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 = { ssid ->
+												if (uiState.settings.isWifiNameByShellEnabled || isWifiNameReadable()) viewModel.onSaveTrustedSSID(ssid)
+											},
+											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()
+						},
+					),
+					SelectionItem(
+						Icons.Outlined.AirplanemodeActive,
+						title = {
+							Text(
+								stringResource(R.string.stop_on_no_internet),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						description = {
+							Text(
+								stringResource(R.string.stop_on_internet_loss),
+								style = MaterialTheme.typography.bodySmall.copy(MaterialTheme.colorScheme.outline),
+							)
+						},
+						trailing = {
+							ScaledSwitch(
+								checked = uiState.settings.isStopOnNoInternetEnabled,
+								onClick = { viewModel.onToggleStopOnNoInternet() },
+							)
+						},
+						onClick = {
+							viewModel.onToggleStopOnNoInternet()
+						},
+					),
+				),
+			)
+		}
+	}
+}

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

@@ -0,0 +1,139 @@
+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,
+				),
+			)
+		}
+	}
+
+	fun onToggleStopOnNoInternet() = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(isStopOnNoInternetEnabled = !isStopOnNoInternetEnabled),
+			)
+		}
+	}
+}

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

@@ -0,0 +1,107 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.components
+
+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.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.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.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,
+			interactionSource = remember { MutableInteractionSource() },
+			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,250 @@
 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.AttachMoney
+import androidx.compose.material.icons.filled.Book
+import androidx.compose.material.icons.filled.Mail
+import androidx.compose.material.icons.filled.Policy
+import androidx.compose.material.icons.filled.ViewTimeline
+import androidx.compose.material.icons.outlined.ViewHeadline
 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.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.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.AppViewModel
 import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
+import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
+import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
+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.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.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(appUiState: AppUiState, appViewModel: AppViewModel) {
 	val context = LocalContext.current
 	val navController = LocalNavController.current
-	val fillMaxWidth = .85f
+
+	var showDialog by remember { mutableStateOf(false) }
+
+	if (showDialog) {
+		InfoDialog(onAttest = {
+			showDialog = false
+			appViewModel.onToggleLocalLogging()
+		}, onDismiss = {
+			showDialog = false
+		}, title = {
+			Text(stringResource(R.string.configuration_change))
+		}, body = { Text(stringResource(R.string.requires_app_relaunch)) }, confirmText = { Text(stringResource(R.string.yes)) })
+	}
 
 	Column(
-		horizontalAlignment = Alignment.CenterHorizontally,
-		verticalArrangement = Arrangement.Top,
+		horizontalAlignment = Alignment.Start,
+		verticalArrangement = Arrangement.spacedBy(24.dp.scaledHeight(), Alignment.Top),
 		modifier =
 		Modifier
 			.fillMaxSize()
+			.padding(top = topPadding)
 			.verticalScroll(rememberScrollState())
-			.focusable(),
+			.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),
-						)
-					},
-					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)
+		GroupLabel(stringResource(R.string.thank_you))
+		SurfaceSelectionGroupButton(
+			buildList {
+				add(
+					SelectionItem(
+						Icons.Filled.Book,
+						title = {
 							Text(
-								stringResource(id = R.string.docs_description),
-								textAlign = TextAlign.Justify,
-								modifier =
-								Modifier
-									.padding(start = 10.dp)
-									.weight(
-										weight = 1.0f,
-										fill = false,
-									),
-								softWrap = true,
+								stringResource(R.string.docs_description),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
 							)
-						}
-						Icon(
-							forwardIcon,
-							forwardIcon.name,
-						)
-					}
-				}
-				HorizontalDivider(
-					thickness = 0.5.dp,
-					color = MaterialTheme.colorScheme.onBackground,
+						},
+						trailing = {
+							ForwardButton { context.openWebUrl(context.getString(R.string.docs_url)) }
+						},
+						onClick = {
+							context.openWebUrl(context.getString(R.string.docs_url))
+						},
+					),
 				)
-				TextButton(
-					onClick = {
-						context.openWebUrl(
-							context.resources.getString(R.string.telegram_url),
-						)
-					},
-					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),
-							)
-						}
-						Icon(
-							forwardIcon,
-							forwardIcon.name,
-						)
-					}
-				}
-				HorizontalDivider(
-					thickness = 0.5.dp,
-					color = MaterialTheme.colorScheme.onBackground,
-				)
-				TextButton(
-					onClick = {
-						context.openWebUrl(
-							context.resources.getString(R.string.github_url),
-						)
-					},
-					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)
+					add(
+						SelectionItem(
+							Icons.Outlined.ViewHeadline,
+							title = {
 								Text(
-									stringResource(id = R.string.read_logs),
-									textAlign = TextAlign.Justify,
-									modifier = Modifier.padding(start = 10.dp),
+									stringResource(R.string.local_logging),
+									style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
 								)
-							}
-							Icon(
-								Icons.AutoMirrored.Rounded.ArrowForward,
-								stringResource(id = R.string.go),
-							)
-						}
+							},
+							description = {
+								Text(
+									stringResource(R.string.enable_local_logging),
+									style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.outline),
+								)
+							},
+							trailing = {
+								ScaledSwitch(
+									appUiState.generalState.isLocalLogsEnabled,
+									onClick = {
+										showDialog = true
+									},
+								)
+							},
+							onClick = {
+								showDialog = true
+							},
+						),
+					)
+					if (appUiState.generalState.isLocalLogsEnabled) {
+						add(
+							SelectionItem(
+								Icons.Filled.ViewTimeline,
+								title = {
+									Text(
+										stringResource(R.string.read_logs),
+										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+									)
+								},
+								trailing = {
+									ForwardButton {
+										navController.navigate(Route.Logs)
+									}
+								},
+								onClick = {
+									navController.navigate(Route.Logs)
+								},
+							),
+						)
 					}
 				}
-			}
-		}
-		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),
+				add(
+					SelectionItem(
+						Icons.Filled.Policy,
+						title = {
+							Text(
+								stringResource(R.string.privacy_policy),
+								style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+							)
+						},
+						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)
+		SurfaceSelectionGroupButton(
+			buildList {
+				addAll(
+					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()
+							},
+						),
+					),
+				)
+				if (BuildConfig.FLAVOR == "fdroid") {
+					add(
+						SelectionItem(
+							Icons.Filled.AttachMoney,
+							title = {
+								Text(
+									stringResource(R.string.donate),
+									style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+								)
+							},
+							trailing = {
+								ForwardButton {
+									context.openWebUrl(context.getString(R.string.donate_url))
+								}
+							},
+							onClick = {
+								context.openWebUrl(context.getString(R.string.donate_url))
+							},
+						),
+					)
 				}
-			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)
-		}
+			},
+		)
+		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,30 @@
+package com.zaneschepke.wireguardautotunnel.util
+
+import android.content.res.Resources
+import androidx.core.os.ConfigurationCompat
+import com.zaneschepke.wireguardautotunnel.BuildConfig
+
+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): String {
+		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 localeCode
+	}
+}

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,28 @@ 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
+private const val ANDROID_TV_SIZE_MULTIPLIER = 1.5f
+
 fun Context.openWebUrl(url: String): Result<Unit> {
 	return kotlin.runCatching {
 		val webpage: Uri = Uri.parse(url)
@@ -26,6 +36,52 @@ 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) *
+		(if (isRunningOnTv()) ANDROID_TV_SIZE_MULTIPLIER else 1f)
+	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) *
+		(if (isRunningOnTv()) ANDROID_TV_SIZE_MULTIPLIER else 1f)
+	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 +92,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 +168,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

@@ -3,6 +3,8 @@ package com.zaneschepke.wireguardautotunnel.util.extensions
 import timber.log.Timber
 import java.util.regex.Pattern
 
+val hasNumberInParentheses = """^(.+?)\((\d+)\)$""".toRegex()
+
 fun String.isValidIpv4orIpv6Address(): Boolean {
 	val ipv4Pattern = Pattern.compile(
 		"^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\$",
@@ -13,10 +15,22 @@ fun String.isValidIpv4orIpv6Address(): Boolean {
 	return ipv4Pattern.matcher(this).matches() || ipv6Pattern.matcher(this).matches()
 }
 
+fun String.hasNumberInParentheses(): Boolean {
+	return hasNumberInParentheses.matches(this)
+}
+
+// Function to extract name and number
+fun String.extractNameAndNumber(): Pair<String, Int>? {
+	val matchResult = hasNumberInParentheses.matchEntire(this)
+	return matchResult?.let {
+		Pair(it.groupValues[1], it.groupValues[2].toInt())
+	}
+}
+
 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) }
@@ -25,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
 			}