chore: bump version

#472

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

@@ -0,0 +1,267 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 13,
+    "identityHash": "ff209157b98a641c424f5086818ec585",
+    "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, `is_vpn_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `is_lan_on_kill_switch_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"
+          },
+          {
+            "fieldPath": "isVpnKillSwitchEnabled",
+            "columnName": "is_vpn_kill_switch_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isKernelKillSwitchEnabled",
+            "columnName": "is_kernel_kill_switch_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isLanOnKillSwitchEnabled",
+            "columnName": "is_lan_on_kill_switch_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, 'ff209157b98a641c424f5086818ec585')"
+    ]
+  }
+}

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">
@@ -208,5 +204,10 @@
 				<action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
 			</intent-filter>
 		</receiver>
+		<receiver
+			android:name=".receiver.NotificationActionReceiver"
+			android:exported="false"
+			android:permission="${applicationId}.permission.CONTROL_TUNNELS">
+		</receiver>
     </application>
 </manifest>

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

@@ -4,14 +4,21 @@ import android.app.Application
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
 import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.module.MainDispatcher
+import com.zaneschepke.wireguardautotunnel.service.tunnel.BackendState
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -25,10 +32,23 @@ class WireGuardAutoTunnel : Application() {
 	@Inject
 	lateinit var logReader: LogReader
 
+	@Inject
+	lateinit var appStateRepository: AppStateRepository
+
+	@Inject
+	lateinit var settingsRepository: SettingsRepository
+
+	@Inject
+	lateinit var tunnelService: TunnelService
+
 	@Inject
 	@IoDispatcher
 	lateinit var ioDispatcher: CoroutineDispatcher
 
+	@Inject
+	@MainDispatcher
+	lateinit var mainDispatcher: CoroutineDispatcher
+
 	override fun onCreate() {
 		super.onCreate()
 		instance = this
@@ -45,13 +65,28 @@ class WireGuardAutoTunnel : Application() {
 		} else {
 			Timber.plant(ReleaseTree())
 		}
-		if (!isRunningOnTv()) {
-			applicationScope.launch(ioDispatcher) {
-				logReader.start()
+
+		applicationScope.launch {
+			withContext(mainDispatcher) {
+				if (appStateRepository.isLocalLogsEnabled() && !isRunningOnTv()) logReader.initialize()
+			}
+			if (!settingsRepository.getSettings().isKernelEnabled) {
+				tunnelService.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
+			}
+
+			appStateRepository.getLocale()?.let {
+				LocaleUtil.changeLocale(it)
 			}
 		}
 	}
 
+	override fun onTerminate() {
+		applicationScope.launch {
+			tunnelService.setBackendState(BackendState.INACTIVE, emptyList())
+		}
+		super.onTerminate()
+	}
+
 	companion object {
 		lateinit var instance: WireGuardAutoTunnel
 			private set

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

@@ -11,7 +11,7 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 
 @Database(
 	entities = [Settings::class, TunnelConfig::class],
-	version = 10,
+	version = 13,
 	autoMigrations =
 	[
 		AutoMigration(from = 1, to = 2),
@@ -36,6 +36,19 @@ 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,
+		),
+		AutoMigration(
+			from = 12,
+			to = 13,
+		),
 	],
 	exportSchema = true,
 )
@@ -55,3 +68,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/Queries.kt

@@ -16,7 +16,7 @@ object Queries {
 		        VALUES
 		        ('false',
 		        'false',
-		        'sampleSSID1,sampleSSID2',
+		        '',
 		        'false',
 		        'false',
 		        'false',

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,34 @@ 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,
+	@ColumnInfo(
+		name = "is_vpn_kill_switch_enabled",
+		defaultValue = "false",
+	)
+	val isVpnKillSwitchEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_kernel_kill_switch_enabled",
+		defaultValue = "false",
+	)
+	val isKernelKillSwitchEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_lan_on_kill_switch_enabled",
+		defaultValue = "false",
+	)
+	val isLanOnKillSwitchEnabled: Boolean = false,
 )

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,21 @@ 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 = ""
+
+		val IPV4_PUBLIC_NETWORKS = setOf(
+			"0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3",
+			"64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12",
+			"172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7",
+			"176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16",
+			"192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10",
+			"193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4",
+		)
 	}
 }

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 {
@@ -16,13 +17,21 @@ interface AppStateRepository {
 
 	suspend fun setBatteryOptimizationDisableShown(shown: Boolean)
 
-	suspend fun getCurrentSsid(): String?
-
-	suspend fun setCurrentSsid(ssid: String)
-
 	suspend fun isTunnelStatsExpanded(): Boolean
 
 	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,69 @@ 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)
-	}
-
-	override suspend fun getCurrentSsid(): String? {
-		return dataStoreManager.getFromStore(DataStoreManager.CURRENT_SSID)
-	}
-
-	override suspend fun setCurrentSsid(ssid: String) {
-		dataStoreManager.saveToDataStore(DataStoreManager.CURRENT_SSID, ssid)
+		dataStoreManager.saveToDataStore(DataStoreManager.batteryDisableShown, shown)
 	}
 
 	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 +83,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/AppModule.kt

@@ -2,7 +2,9 @@ package com.zaneschepke.wireguardautotunnel.module
 
 import android.content.Context
 import com.zaneschepke.logcatter.LogReader
-import com.zaneschepke.logcatter.LogcatCollector
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
+import com.zaneschepke.logcatter.LogcatReader
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -25,6 +27,12 @@ class AppModule {
 	@Singleton
 	@Provides
 	fun provideLogCollect(@ApplicationContext context: Context): LogReader {
-		return LogcatCollector.init(context = context)
+		return LogcatReader.init(storageDir = context.filesDir.absolutePath)
+	}
+
+	@Singleton
+	@Provides
+	fun provideNotificationService(@ApplicationContext context: Context): NotificationService {
+		return WireGuardNotification(context)
 	}
 }

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

@@ -4,8 +4,6 @@ import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
 import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
 import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
 import com.zaneschepke.wireguardautotunnel.service.network.WifiService
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -15,10 +13,6 @@ import dagger.hilt.android.scopes.ServiceScoped
 @Module
 @InstallIn(ServiceComponent::class)
 abstract class ServiceModule {
-	@Binds
-	@ServiceScoped
-	abstract fun provideNotificationService(wireGuardNotification: WireGuardNotification): NotificationService
-
 	@Binds
 	@ServiceScoped
 	abstract fun provideWifiService(wifiService: WifiService): NetworkService<WifiService>

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

@@ -9,6 +9,8 @@ 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.notification.NotificationService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
 import dagger.Module
@@ -24,9 +26,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 +50,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 +76,8 @@ class TunnelModule {
 		tunnelConfigRepository: TunnelConfigRepository,
 		@ApplicationScope applicationScope: CoroutineScope,
 		@IoDispatcher ioDispatcher: CoroutineDispatcher,
+		serviceManager: ServiceManager,
+		notificationService: NotificationService,
 	): TunnelService {
 		return WireGuardTunnel(
 			amneziaBackend,
@@ -73,6 +86,18 @@ class TunnelModule {
 			appDataRepository,
 			applicationScope,
 			ioDispatcher,
+			serviceManager,
+			notificationService,
 		)
 	}
+
+	@Singleton
+	@Provides
+	fun provideServiceManager(
+		@ApplicationContext context: Context,
+		@IoDispatcher ioDispatcher: CoroutineDispatcher,
+		appDataRepository: AppDataRepository,
+	): ServiceManager {
+		return ServiceManager(context, ioDispatcher, appDataRepository)
+	}
 }

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/receiver/KernelReceiver.kt

@@ -5,8 +5,8 @@ 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 com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -26,6 +26,9 @@ class KernelReceiver : BroadcastReceiver() {
 	@Inject
 	lateinit var tunnelConfigRepository: TunnelConfigRepository
 
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
 	override fun onReceive(context: Context, intent: Intent) {
 		val action = intent.action ?: return
 		applicationScope.launch {
@@ -37,7 +40,7 @@ class KernelReceiver : BroadcastReceiver() {
 						tunnelConfigRepository.save(it.copy(isActive = true))
 					}
 				}
-				context.requestTunnelTileServiceStateUpdate()
+				serviceManager.updateTunnelTile()
 			}
 		}
 	}

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

@@ -0,0 +1,36 @@
+package com.zaneschepke.wireguardautotunnel.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class NotificationActionReceiver : BroadcastReceiver() {
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	lateinit var tunnelService: TunnelService
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	override fun onReceive(context: Context, intent: Intent) {
+		applicationScope.launch {
+			when (intent.action) {
+				NotificationAction.AUTO_TUNNEL_OFF.name -> serviceManager.stopAutoTunnel()
+				NotificationAction.TUNNEL_OFF.name -> tunnelService.stopTunnel()
+			}
+		}
+	}
+}

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

@@ -1,589 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
-
-import android.content.Context
-import android.content.Intent
-import android.net.NetworkCapabilities
-import android.os.IBinder
-import android.os.PowerManager
-import androidx.core.app.ServiceCompat
-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.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.module.MainImmediateDispatcher
-import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
-import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
-import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
-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.CoroutineDispatcher
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.net.InetAddress
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class AutoTunnelService : LifecycleService() {
-	private val foregroundId = 122
-
-	@Inject
-	lateinit var rootShell: Provider<RootShell>
-
-	@Inject
-	lateinit var wifiService: NetworkService<WifiService>
-
-	@Inject
-	lateinit var mobileDataService: NetworkService<MobileDataService>
-
-	@Inject
-	lateinit var ethernetService: NetworkService<EthernetService>
-
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
-
-	@Inject
-	lateinit var notificationService: NotificationService
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
-
-	@Inject
-	@MainImmediateDispatcher
-	lateinit var mainImmediateDispatcher: CoroutineDispatcher
-
-	private val autoTunnelStateFlow = MutableStateFlow(AutoTunnelState())
-
-	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
-
-	@get:Synchronized @set:Synchronized
-	private var running: Boolean = false
-
-	override fun onCreate() {
-		super.onCreate()
-		lifecycleScope.launch(mainImmediateDispatcher) {
-			kotlin.runCatching {
-				launchNotification()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
-
-	override fun onBind(intent: Intent): IBinder? {
-		super.onBind(intent)
-		// We don't provide binding, so return null
-		return null
-	}
-
-	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()
-			}
-		}
-		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
-		kotlin.runCatching {
-			lifecycleScope.launch(mainImmediateDispatcher) {
-				launchNotification()
-				initWakeLock()
-			}
-			startSettingsJob()
-			startVpnStateJob()
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
-
-	private fun stopService() {
-		wakeLock?.let {
-			if (it.isHeld) {
-				it.release()
-			}
-		}
-		stopSelf()
-	}
-
-	override fun onDestroy() {
-		cancelAndResetNetworkJobs()
-		cancelAndResetPingJob()
-		super.onDestroy()
-	}
-
-	private fun launchWatcherNotification(description: String = getString(R.string.watcher_notification_text_active)) {
-		val notification =
-			notificationService.createNotification(
-				channelId = getString(R.string.watcher_channel_id),
-				channelName = getString(R.string.watcher_channel_name),
-				title = getString(R.string.auto_tunnel_title),
-				description = description,
-			)
-		ServiceCompat.startForeground(
-			this,
-			foregroundId,
-			notification,
-			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-		)
-	}
-
-	private fun launchWatcherPausedNotification() {
-		launchWatcherNotification(getString(R.string.watcher_notification_text_paused))
-	}
-
-	private fun initWakeLock() {
-		wakeLock =
-			(getSystemService(Context.POWER_SERVICE) as PowerManager).run {
-				val tag = this.javaClass.name
-				newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
-					try {
-						Timber.i("Initiating wakelock with 10 min timeout")
-						acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
-					} finally {
-						release()
-					}
-				}
-			}
-	}
-
-	private fun startSettingsJob() = lifecycleScope.launch {
-		watchForSettingsChanges()
-	}
-
-	private fun startVpnStateJob() = lifecycleScope.launch {
-		watchForVpnStateChanges()
-	}
-
-	private fun startWifiJob() = lifecycleScope.launch {
-		watchForWifiConnectivityChanges()
-	}
-
-	private fun startMobileDataJob() = lifecycleScope.launch {
-		watchForMobileDataConnectivityChanges()
-	}
-
-	private fun startEthernetJob() = lifecycleScope.launch {
-		watchForEthernetConnectivityChanges()
-	}
-
-	private fun startPingJob() = lifecycleScope.launch {
-		watchForPingFailure()
-	}
-
-	private fun startNetworkEventJob() = lifecycleScope.launch {
-		handleNetworkEventChanges()
-	}
-
-	private suspend fun watchForMobileDataConnectivityChanges() {
-		withContext(ioDispatcher) {
-			Timber.i("Starting mobile data watcher")
-			mobileDataService.networkStatus.collect { status ->
-				when (status) {
-					is NetworkStatus.Available -> {
-						Timber.i("Gained Mobile data connection")
-						autoTunnelStateFlow.update {
-							it.copy(
-								isMobileDataConnected = true,
-							)
-						}
-					}
-
-					is NetworkStatus.CapabilitiesChanged -> {
-						autoTunnelStateFlow.update {
-							it.copy(
-								isMobileDataConnected = true,
-							)
-						}
-						Timber.i("Mobile data capabilities changed")
-					}
-
-					is NetworkStatus.Unavailable -> {
-						autoTunnelStateFlow.update {
-							it.copy(
-								isMobileDataConnected = false,
-							)
-						}
-						Timber.i("Lost mobile data connection")
-					}
-				}
-			}
-		}
-	}
-
-	private suspend fun watchForPingFailure() {
-		withContext(ioDispatcher) {
-			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) {
-						if (vpnState.tunnelConfig != null) {
-							val config = TunnelConfig.configFromWgQuick(vpnState.tunnelConfig.wgQuick)
-							val results = if (vpnState.tunnelConfig.pingIp != null) {
-								Timber.d("Pinging custom ip : ${vpnState.tunnelConfig.pingIp}")
-								listOf(InetAddress.getByName(vpnState.tunnelConfig.pingIp).isReachable(Constants.PING_TIMEOUT.toInt()))
-							} else {
-								Timber.d("Pinging all peers")
-								config.peers.map { peer ->
-									peer.isReachable()
-								}
-							}
-							Timber.i("Ping results reachable: $results")
-							if (results.contains(false)) {
-								Timber.i("Restarting VPN for ping failure")
-								val cooldown = vpnState.tunnelConfig.pingCooldown
-								tunnelService.get().bounceTunnel(vpnState.tunnelConfig)
-								delay(cooldown ?: Constants.PING_COOLDOWN)
-								continue
-							}
-						}
-					}
-					delay(vpnState.tunnelConfig?.pingInterval ?: Constants.PING_INTERVAL)
-				} while (true)
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
-
-	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 }
-				},
-			) { settings, tunnels ->
-				autoTunnelStateFlow.value.copy(
-					settings = settings,
-					tunnels = tunnels,
-				)
-			}.collect {
-				onAutoTunnelPause(it.settings.isAutoTunnelPaused)
-				manageJobsBySettings(it.settings)
-				autoTunnelStateFlow.emit(it)
-			}
-		}
-	}
-
-	private suspend fun watchForVpnStateChanges() {
-		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()
-					}
-				}
-			}
-		}
-	}
-
-	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()
-		}
-	}
-
-	private fun cancelAndResetPingJob() {
-		pingJob?.cancelWithMessage("Ping job canceled")
-		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) {
-		autoTunnelStateFlow.update {
-			it.copy(
-				isEthernetConnected = connected,
-			)
-		}
-	}
-
-	private fun updateWifi(connected: Boolean) {
-		autoTunnelStateFlow.update {
-			it.copy(
-				isWifiConnected = connected,
-			)
-		}
-	}
-
-	private suspend fun watchForEthernetConnectivityChanges() {
-		withContext(ioDispatcher) {
-			Timber.i("Starting ethernet data watcher")
-			ethernetService.networkStatus.collect { status ->
-				when (status) {
-					is NetworkStatus.Available -> {
-						Timber.i("Gained Ethernet connection")
-						updateEthernet(true)
-					}
-
-					is NetworkStatus.CapabilitiesChanged -> {
-						Timber.i("Ethernet capabilities changed")
-						updateEthernet(true)
-					}
-
-					is NetworkStatus.Unavailable -> {
-						updateEthernet(false)
-						Timber.i("Lost Ethernet connection")
-					}
-				}
-			}
-		}
-	}
-
-	private suspend fun watchForWifiConnectivityChanges() {
-		withContext(ioDispatcher) {
-			Timber.i("Starting wifi watcher")
-			wifiService.networkStatus.collect { status ->
-				when (status) {
-					is NetworkStatus.Available -> {
-						Timber.i("Gained Wi-Fi connection")
-						updateWifi(true)
-					}
-
-					is NetworkStatus.CapabilitiesChanged -> {
-						Timber.i("Wifi capabilities changed")
-						updateWifi(true)
-						val ssid = getWifiSSID(status.networkCapabilities)
-						ssid?.let { name ->
-							if (name.contains(Constants.UNREADABLE_SSID)) {
-								Timber.w("SSID unreadable: missing permissions")
-							} else {
-								Timber.i("Detected valid SSID")
-							}
-							appDataRepository.appState.setCurrentSsid(name)
-							autoTunnelStateFlow.update {
-								it.copy(
-									currentNetworkSSID = name,
-								)
-							}
-						} ?: Timber.w("Failed to read ssid")
-					}
-
-					is NetworkStatus.Unavailable -> {
-						updateWifi(false)
-						Timber.i("Lost Wi-Fi connection")
-					}
-				}
-			}
-		}
-	}
-
-	private suspend fun getWifiSSID(networkCapabilities: NetworkCapabilities): String? {
-		return withContext(ioDispatcher) {
-			try {
-				rootShell.get().getCurrentWifiName()
-			} catch (_: Exception) {
-				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")
-						}
-					}
-				}
-			}
-		}
-	}
-}

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,116 @@ 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.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.AutoTunnelService
+import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
+import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
+import jakarta.inject.Inject
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.withContext
 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, private val ioDispatcher: CoroutineDispatcher, private val appDataRepository: AppDataRepository) {
 
-				Action.START, Action.STOP -> context.startService(intent)
+	private val _autoTunnelActive = MutableStateFlow(false)
+
+	val autoTunnelActive = _autoTunnelActive.asStateFlow()
+
+	var autoTunnelService = CompletableDeferred<AutoTunnelService>()
+	var backgroundService = CompletableDeferred<TunnelBackgroundService>()
+	var autoTunnelTile = CompletableDeferred<AutoTunnelControlTile>()
+	var tunnelControlTile = CompletableDeferred<TunnelControlTile>()
+
+	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) {
+		val settings = appDataRepository.settings.getSettings()
+		appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
+		if (autoTunnelService.isCompleted) return _autoTunnelActive.update { true }
+		kotlin.runCatching {
+			startService(AutoTunnelService::class.java, background)
+			autoTunnelService.await()
+			autoTunnelService.getCompleted().start()
+			_autoTunnelActive.update { true }
+			updateAutoTunnelTile()
+		}.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,
-		)
+	suspend fun toggleAutoTunnel(background: Boolean) {
+		withContext(ioDispatcher) {
+			if (_autoTunnelActive.value) return@withContext stopAutoTunnel()
+			startAutoTunnel(background)
+		}
 	}
 
-	fun startTunnelBackgroundService(context: Context) {
-		actionOnService(
-			Action.START_FOREGROUND,
-			context,
-			TunnelBackgroundService::class.java,
-		)
+	fun updateAutoTunnelTile() {
+		if (autoTunnelTile.isCompleted) {
+			autoTunnelTile.getCompleted().updateTileState()
+		} else {
+			context.requestAutoTunnelTileServiceUpdate()
+		}
 	}
 
-	fun stopTunnelBackgroundService(context: Context) {
-		actionOnService(
-			Action.STOP,
-			context,
-			TunnelBackgroundService::class.java,
-		)
+	fun updateTunnelTile() {
+		if (tunnelControlTile.isCompleted) {
+			tunnelControlTile.getCompleted().updateTileState()
+		} else {
+			context.requestTunnelTileServiceStateUpdate()
+		}
+	}
+
+	suspend fun stopAutoTunnel() {
+		withContext(ioDispatcher) {
+			val settings = appDataRepository.settings.getSettings()
+			appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
+			if (!autoTunnelService.isCompleted) return@withContext
+			runCatching {
+				autoTunnelService.getCompleted().stop()
+				_autoTunnelActive.update { false }
+				updateAutoTunnelTile()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
 	}
 }

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

@@ -3,10 +3,14 @@ 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.service.notification.WireGuardNotification
+import com.zaneschepke.wireguardautotunnel.util.Constants
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CompletableDeferred
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -15,11 +19,12 @@ class TunnelBackgroundService : LifecycleService() {
 	@Inject
 	lateinit var notificationService: NotificationService
 
-	private val foregroundId = 123
+	@Inject
+	lateinit var serviceManager: ServiceManager
 
 	override fun onCreate() {
 		super.onCreate()
-		startForeground(foregroundId, createNotification())
+		start()
 	}
 
 	override fun onBind(intent: Intent): IBinder? {
@@ -29,32 +34,33 @@ 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,
+			NotificationService.KERNEL_SERVICE_NOTIFICATION_ID,
+			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),
+			WireGuardNotification.NotificationChannels.VPN,
+			getString(R.string.tunnel_running),
 			description = "",
 		)
 	}

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

@@ -0,0 +1,309 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel
+
+import android.content.Intent
+import android.net.NetworkCapabilities
+import android.os.IBinder
+import android.os.PowerManager
+import androidx.core.app.ServiceCompat
+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.foreground.autotunnel.model.AutoTunnelEvent
+import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model.AutoTunnelState
+import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model.NetworkState
+import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
+import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
+import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
+import com.zaneschepke.wireguardautotunnel.service.network.NetworkStatus
+import com.zaneschepke.wireguardautotunnel.service.network.WifiService
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
+import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
+import com.zaneschepke.wireguardautotunnel.util.extensions.getCurrentWifiName
+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.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNot
+import kotlinx.coroutines.flow.update
+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
+
+@AndroidEntryPoint
+class AutoTunnelService : LifecycleService() {
+
+	@Inject
+	@AppShell
+	lateinit var rootShell: Provider<RootShell>
+
+	@Inject
+	lateinit var wifiService: NetworkService<WifiService>
+
+	@Inject
+	lateinit var mobileDataService: NetworkService<MobileDataService>
+
+	@Inject
+	lateinit var ethernetService: NetworkService<EthernetService>
+
+	@Inject
+	lateinit var appDataRepository: Provider<AppDataRepository>
+
+	@Inject
+	lateinit var notificationService: NotificationService
+
+	@Inject
+	lateinit var tunnelService: Provider<TunnelService>
+
+	@Inject
+	@IoDispatcher
+	lateinit var ioDispatcher: CoroutineDispatcher
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	@MainImmediateDispatcher
+	lateinit var mainImmediateDispatcher: CoroutineDispatcher
+
+	private val autoTunnelStateFlow = MutableStateFlow(AutoTunnelState())
+
+	private var wakeLock: PowerManager.WakeLock? = null
+
+	private val pingTunnelRestartActive = AtomicBoolean(false)
+
+	private var pingJob: Job? = null
+
+	override fun onCreate() {
+		super.onCreate()
+		serviceManager.autoTunnelService.complete(this)
+		lifecycleScope.launch(mainImmediateDispatcher) {
+			kotlin.runCatching {
+				launchWatcherNotification()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	override fun onBind(intent: Intent): IBinder? {
+		super.onBind(intent)
+		return null
+	}
+
+	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+		Timber.d("onStartCommand executed with startId: $startId")
+		serviceManager.autoTunnelService.complete(this)
+		return super.onStartCommand(intent, flags, startId)
+	}
+
+	fun start() {
+		kotlin.runCatching {
+			lifecycleScope.launch(mainImmediateDispatcher) {
+				launchWatcherNotification()
+				initWakeLock()
+			}
+			startAutoTunnelJob()
+			startAutoTunnelStateJob()
+			startPingStateJob()
+		}.onFailure {
+			Timber.e(it)
+		}
+	}
+
+	fun stop() {
+		wakeLock?.let { if (it.isHeld) it.release() }
+		stopSelf()
+	}
+
+	override fun onDestroy() {
+		cancelAndResetPingJob()
+		serviceManager.autoTunnelService = CompletableDeferred()
+		super.onDestroy()
+	}
+
+	private fun launchWatcherNotification(description: String = getString(R.string.monitoring_state_changes)) {
+		val notification =
+			notificationService.createNotification(
+				WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
+				title = getString(R.string.auto_tunnel_title),
+				description = description,
+				actions = listOf(
+					notificationService.createNotificationAction(NotificationAction.AUTO_TUNNEL_OFF),
+				),
+			)
+		ServiceCompat.startForeground(
+			this,
+			NotificationService.AUTO_TUNNEL_NOTIFICATION_ID,
+			notification,
+			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+		)
+	}
+
+	private fun initWakeLock() {
+		wakeLock = (getSystemService(POWER_SERVICE) as PowerManager).run {
+			val tag = this.javaClass.name
+			newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
+				try {
+					Timber.i("Initiating wakelock with 10 min timeout")
+					acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
+				} finally {
+					release()
+				}
+			}
+		}
+	}
+
+	private fun startPingJob() = lifecycleScope.launch {
+		watchForPingFailure()
+	}
+
+	private fun startPingStateJob() = lifecycleScope.launch {
+		autoTunnelStateFlow.collect {
+			if (it.isPingEnabled()) {
+				pingJob.onNotRunning { pingJob = startPingJob() }
+			} else {
+				if (!pingTunnelRestartActive.get()) cancelAndResetPingJob()
+			}
+		}
+	}
+
+	private suspend fun watchForPingFailure() {
+		withContext(ioDispatcher) {
+			Timber.i("Starting ping watcher")
+			runCatching {
+				do {
+					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) {
+								Timber.d("Pinging custom ip : ${vpnState.tunnelConfig.pingIp}")
+								listOf(InetAddress.getByName(vpnState.tunnelConfig.pingIp).isReachable(Constants.PING_TIMEOUT.toInt()))
+							} else {
+								Timber.d("Pinging all peers")
+								config.peers.map { peer ->
+									peer.isReachable()
+								}
+							}
+							Timber.i("Ping results reachable: $results")
+							if (results.contains(false)) {
+								Timber.i("Restarting VPN for ping failure")
+								val cooldown = vpnState.tunnelConfig.pingCooldown
+								pingTunnelRestartActive.set(true)
+								tunnelService.get().bounceTunnel()
+								pingTunnelRestartActive.set(false)
+								delay(cooldown ?: Constants.PING_COOLDOWN)
+								continue
+							}
+						}
+					}
+					delay(vpnState.tunnelConfig?.pingInterval ?: Constants.PING_INTERVAL)
+				} while (true)
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	private fun startAutoTunnelStateJob() = lifecycleScope.launch(ioDispatcher) {
+		combine(
+			combineSettings(),
+			combineNetworkEventsJob(),
+		) { double, networkState ->
+			AutoTunnelState(tunnelService.get().vpnState.value, networkState, double.first, double.second)
+		}.collect { state ->
+			autoTunnelStateFlow.update {
+				it.copy(state.vpnState, state.networkState, state.settings, state.tunnels)
+			}
+		}
+	}
+
+	private fun cancelAndResetPingJob() {
+		pingJob?.cancelWithMessage("Ping job canceled")
+		pingJob = null
+	}
+
+	private fun combineNetworkEventsJob(): Flow<NetworkState> {
+		return combine(
+			wifiService.networkStatus,
+			mobileDataService.networkStatus,
+			ethernetService.networkStatus,
+		) { wifi, mobileData, ethernet ->
+			NetworkState(
+				wifi.isConnected,
+				mobileData.isConnected,
+				ethernet.isConnected,
+				when (wifi) {
+					is NetworkStatus.CapabilitiesChanged -> getWifiSSID(wifi.networkCapabilities)
+					is NetworkStatus.Available -> autoTunnelStateFlow.value.networkState.wifiName
+					is NetworkStatus.Unavailable -> null
+				},
+			)
+		}.distinctUntilChanged().filterNot { it.isWifiConnected && it.wifiName == null }
+	}
+
+	private fun combineSettings(): Flow<Pair<Settings, TunnelConfigs>> {
+		return combine(
+			appDataRepository.get().settings.getSettingsFlow(),
+			appDataRepository.get().tunnels.getTunnelConfigsFlow().distinctUntilChanged { old, new ->
+				old.map { it.isActive } != new.map { it.isActive }
+			},
+		) { settings, tunnels ->
+			Pair(settings, tunnels)
+		}.distinctUntilChanged()
+	}
+
+	private suspend fun getWifiSSID(networkCapabilities: NetworkCapabilities): String? {
+		return withContext(ioDispatcher) {
+			with(autoTunnelStateFlow.value.settings) {
+				if (isWifiNameByShellEnabled) return@withContext rootShell.get().getCurrentWifiName()
+				wifiService.getNetworkName(networkCapabilities)
+			}.also {
+				if (it?.contains(Constants.UNREADABLE_SSID) == true) {
+					Timber.w("SSID unreadable: missing permissions")
+				} else {
+					Timber.i("Detected valid SSID")
+				}
+			}
+		}
+	}
+
+	private fun startAutoTunnelJob() = lifecycleScope.launch(ioDispatcher) {
+		Timber.i("Starting auto-tunnel network event watcher")
+		autoTunnelStateFlow.collect { watcherState ->
+			Timber.d("New auto tunnel state emitted")
+			when (val event = watcherState.asAutoTunnelEvent()) {
+				is AutoTunnelEvent.Start -> tunnelService.get().startTunnel(
+					event.tunnelConfig
+						?: appDataRepository.get().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/model/AutoTunnelEvent.kt

@@ -0,0 +1,9 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
+
+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/model/AutoTunnelState.kt

@@ -0,0 +1,147 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
+
+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
+import timber.log.Timber
+
+data class AutoTunnelState(
+	val vpnState: VpnState = VpnState(),
+	val networkState: NetworkState = NetworkState(),
+	val settings: Settings = Settings(),
+	val tunnels: TunnelConfigs = emptyList(),
+) {
+
+	private fun isMobileDataActive(): Boolean {
+		return !networkState.isEthernetConnected && !networkState.isWifiConnected && networkState.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 !networkState.isEthernetConnected && networkState.isWifiConnected
+	}
+
+	private fun startOnEthernet(): Boolean {
+		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && vpnState.status.isDown()
+	}
+
+	private fun stopOnEthernet(): Boolean {
+		return networkState.isEthernetConnected && !settings.isTunnelOnEthernetEnabled && vpnState.status.isUp()
+	}
+
+	fun isNoConnectivity(): Boolean {
+		return !networkState.isEthernetConnected && !networkState.isWifiConnected && !networkState.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 networkState.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 {
+		Timber.d("Is tunnel on wifi enabled ${settings.isTunnelOnWifiEnabled}")
+		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 networkState.wifiName?.let {
+			hasTrustedWifiName(it)
+		} == true
+	}
+
+	private fun hasTrustedWifiName(wifiName: String, wifiNames: List<String> = settings.trustedNetworkSSIDs): Boolean {
+		return if (settings.isWildcardsEnabled) {
+			wifiNames.isMatchingToWildcardList(wifiName)
+		} else {
+			wifiNames.contains(wifiName)
+		}
+	}
+
+	private fun getTunnelWithMatchingTunnelNetwork(): TunnelConfig? {
+		return networkState.wifiName?.let { wifiName ->
+			tunnels.firstOrNull {
+				hasTrustedWifiName(wifiName, it.tunnelNetworks)
+			}
+		}
+	}
+
+	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/foreground/autotunnel/model/NetworkState.kt

@@ -0,0 +1,8 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
+
+data class NetworkState(
+	val isWifiConnected: Boolean = false,
+	val isMobileDataConnected: Boolean = false,
+	val isEthernetConnected: Boolean = false,
+	val wifiName: String? = null,
+)

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/network/BaseNetworkService.kt

@@ -10,7 +10,10 @@ import android.os.Build
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.map
+import timber.log.Timber
 
 abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 	val context: Context,
@@ -22,8 +25,17 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 	val wifiManager =
 		context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
 
+	fun checkHasCapability(networkCapability: Int): Boolean {
+		val network = connectivityManager.activeNetwork
+		val networkCapabilities = connectivityManager.getNetworkCapabilities(network)
+		return networkCapabilities?.hasTransport(networkCapability) == true
+	}
+
 	override val networkStatus =
 		callbackFlow {
+			if (!checkHasCapability(networkCapability)) {
+				trySend(NetworkStatus.Unavailable())
+			}
 			val networkStatusCallback =
 				when (Build.VERSION.SDK_INT) {
 					in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
@@ -36,7 +48,7 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 							}
 
 							override fun onLost(network: Network) {
-								trySend(NetworkStatus.Unavailable(network))
+								trySend(NetworkStatus.Unavailable())
 							}
 
 							override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
@@ -57,7 +69,7 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 							}
 
 							override fun onLost(network: Network) {
-								trySend(NetworkStatus.Unavailable(network))
+								trySend(NetworkStatus.Unavailable())
 							}
 
 							override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
@@ -80,17 +92,20 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 			connectivityManager.registerNetworkCallback(request, networkStatusCallback)
 
 			awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
-		}
+		}.catch {
+			Timber.e(it)
+			// conflate for backpressure
+		}.conflate()
 }
 
 inline fun <Result> Flow<NetworkStatus>.map(
-	crossinline onUnavailable: suspend (network: Network) -> Result,
+	crossinline onUnavailable: suspend () -> Result,
 	crossinline onAvailable: suspend (network: Network) -> Result,
 	crossinline onCapabilitiesChanged:
 	suspend (network: Network, networkCapabilities: NetworkCapabilities) -> Result,
 ): Flow<Result> = map { status ->
 	when (status) {
-		is NetworkStatus.Unavailable -> onUnavailable(status.network)
+		is NetworkStatus.Unavailable -> onUnavailable()
 		is NetworkStatus.Available -> onAvailable(status.network)
 		is NetworkStatus.CapabilitiesChanged ->
 			onCapabilitiesChanged(

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/network/NetworkStatus.kt

@@ -4,10 +4,11 @@ import android.net.Network
 import android.net.NetworkCapabilities
 
 sealed class NetworkStatus {
-	class Available(val network: Network) : NetworkStatus()
+	abstract val isConnected: Boolean
+	class Available(val network: Network, override val isConnected: Boolean = true) : NetworkStatus()
 
-	class Unavailable(val network: Network) : NetworkStatus()
+	class Unavailable(override val isConnected: Boolean = false) : NetworkStatus()
 
-	class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities) :
+	class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities, override val isConnected: Boolean = true) :
 		NetworkStatus()
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/notification/NotificationAction.kt

@@ -0,0 +1,17 @@
+package com.zaneschepke.wireguardautotunnel.service.notification
+
+import android.content.Context
+import com.zaneschepke.wireguardautotunnel.R
+
+enum class NotificationAction {
+	TUNNEL_OFF,
+	AUTO_TUNNEL_OFF,
+	;
+
+	fun title(context: Context): String {
+		return when (this) {
+			TUNNEL_OFF -> context.getString(R.string.stop)
+			AUTO_TUNNEL_OFF -> context.getString(R.string.stop)
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/notification/NotificationService.kt

@@ -2,21 +2,32 @@ package com.zaneschepke.wireguardautotunnel.service.notification
 
 import android.app.Notification
 import android.app.NotificationManager
-import android.app.PendingIntent
+import android.content.Context
+import androidx.core.app.NotificationCompat
+import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification.NotificationChannels
 
 interface NotificationService {
+	val context: Context
 	fun createNotification(
-		channelId: String,
-		channelName: String,
+		channel: NotificationChannels,
 		title: String = "",
-		action: PendingIntent? = null,
-		actionText: String? = null,
-		description: String,
+		actions: Collection<NotificationCompat.Action> = emptyList(),
+		description: String = "",
 		showTimestamp: Boolean = false,
 		importance: Int = NotificationManager.IMPORTANCE_HIGH,
-		vibration: Boolean = false,
 		onGoing: Boolean = true,
-		lights: Boolean = true,
 		onlyAlertOnce: Boolean = true,
 	): Notification
+
+	fun createNotificationAction(action: NotificationAction): NotificationCompat.Action
+
+	fun remove(notificationId: Int)
+
+	fun show(notificationId: Int, notification: Notification)
+
+	companion object {
+		const val KERNEL_SERVICE_NOTIFICATION_ID = 123
+		const val AUTO_TUNNEL_NOTIFICATION_ID = 122
+		const val VPN_NOTIFICATION_ID = 100
+	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/notification/WireGuardNotification.kt

@@ -1,105 +1,134 @@
 package com.zaneschepke.wireguardautotunnel.service.notification
 
+import android.Manifest
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.Color
+import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.MainActivity
+import com.zaneschepke.wireguardautotunnel.receiver.NotificationActionReceiver
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 class WireGuardNotification
 @Inject
 constructor(
-	@ApplicationContext private val context: Context,
-) :
-	NotificationService {
-	private val notificationManager =
-		context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+	@ApplicationContext override val context: Context,
+) : NotificationService {
 
-	private val watcherBuilder: NotificationCompat.Builder =
-		NotificationCompat.Builder(
-			context,
-			context.getString(R.string.watcher_channel_id),
-		)
-	private val tunnelBuilder: NotificationCompat.Builder =
-		NotificationCompat.Builder(
-			context,
-			context.getString(R.string.vpn_channel_id),
-		)
+	enum class NotificationChannels {
+		VPN,
+		AUTO_TUNNEL,
+	}
+
+	private val notificationManager = NotificationManagerCompat.from(context)
 
 	override fun createNotification(
-		channelId: String,
-		channelName: String,
+		channel: NotificationChannels,
 		title: String,
-		action: PendingIntent?,
-		actionText: String?,
+		actions: Collection<NotificationCompat.Action>,
 		description: String,
 		showTimestamp: Boolean,
 		importance: Int,
-		vibration: Boolean,
 		onGoing: Boolean,
-		lights: Boolean,
 		onlyAlertOnce: Boolean,
 	): Notification {
-		val channel =
-			NotificationChannel(
-				channelId,
-				channelName,
-				importance,
-			)
-				.let {
-					it.description = title
-					it.enableLights(lights)
-					it.lightColor = Color.RED
-					it.enableVibration(vibration)
-					it.vibrationPattern = longArrayOf(100, 200, 300)
-					it
-				}
-		notificationManager.createNotificationChannel(channel)
-		val pendingIntent: PendingIntent =
-			Intent(context, MainActivity::class.java).let { notificationIntent ->
-				PendingIntent.getActivity(
+		notificationManager.createNotificationChannel(channel.asChannel())
+		return channel.asBuilder().apply {
+			actions.forEach {
+				addAction(it)
+			}
+			setContentTitle(title)
+			setContentText(description)
+			setOnlyAlertOnce(onlyAlertOnce)
+			setOngoing(onGoing)
+			setPriority(NotificationCompat.PRIORITY_HIGH)
+			setShowWhen(showTimestamp)
+			setSmallIcon(R.drawable.ic_launcher)
+		}.build()
+	}
+
+	override fun createNotificationAction(notificationAction: NotificationAction): NotificationCompat.Action {
+		val pendingIntent = PendingIntent.getBroadcast(
+			context,
+			0,
+			Intent(context, NotificationActionReceiver::class.java).apply {
+				action = notificationAction.name
+			},
+			PendingIntent.FLAG_IMMUTABLE,
+		)
+		return NotificationCompat.Action.Builder(
+			R.drawable.ic_launcher,
+			notificationAction.title(context).uppercase(),
+			pendingIntent,
+		).build()
+	}
+
+	override fun remove(notificationId: Int) {
+		notificationManager.cancel(notificationId)
+	}
+
+	override fun show(notificationId: Int, notification: Notification) {
+		with(notificationManager) {
+			if (ActivityCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
+				return
+			}
+			notify(notificationId, notification)
+		}
+	}
+
+	fun NotificationChannels.asBuilder(): NotificationCompat.Builder {
+		return when (this) {
+			NotificationChannels.VPN -> {
+				NotificationCompat.Builder(
 					context,
-					0,
-					notificationIntent,
-					PendingIntent.FLAG_IMMUTABLE,
+					context.getString(R.string.auto_tunnel_channel_id),
 				)
 			}
+			NotificationChannels.AUTO_TUNNEL -> {
+				NotificationCompat.Builder(
+					context,
+					context.getString(R.string.vpn_channel_id),
+				)
+			}
+		}
+	}
 
-		val builder =
-			when (channelId) {
-				context.getString(R.string.watcher_channel_id) -> watcherBuilder
-				context.getString(R.string.vpn_channel_id) -> tunnelBuilder
-				else -> {
-					NotificationCompat.Builder(
-						context,
-						channelId,
-					)
+	fun NotificationChannels.asChannel(): NotificationChannel {
+		return when (this) {
+			NotificationChannels.VPN -> {
+				NotificationChannel(
+					context.getString(R.string.vpn_channel_id),
+					context.getString(R.string.vpn_channel_name),
+					NotificationManager.IMPORTANCE_HIGH,
+				).apply {
+					description = context.getString(R.string.vpn_channel_description)
+					enableLights(true)
+					lightColor = Color.WHITE
+					enableVibration(false)
+					vibrationPattern = longArrayOf(100, 200, 300)
 				}
 			}
-
-		return builder.let {
-			if (action != null && actionText != null) {
-				it.addAction(
-					NotificationCompat.Action.Builder(0, actionText, action).build(),
-				)
-				it.setAutoCancel(true)
+			NotificationChannels.AUTO_TUNNEL -> {
+				NotificationChannel(
+					context.getString(R.string.auto_tunnel_channel_id),
+					context.getString(R.string.auto_tunnel_channel_name),
+					NotificationManager.IMPORTANCE_HIGH,
+				).apply {
+					description = context.getString(R.string.auto_tunnel_channel_description)
+					enableLights(true)
+					lightColor = Color.WHITE
+					enableVibration(false)
+					vibrationPattern = longArrayOf(100, 200, 300)
+				}
 			}
-			it.setContentTitle(title)
-				.setContentText(description)
-				.setOnlyAlertOnce(onlyAlertOnce)
-				.setContentIntent(pendingIntent)
-				.setOngoing(onGoing)
-				.setPriority(NotificationCompat.PRIORITY_HIGH)
-				.setShowWhen(showTimestamp)
-				.setSmallIcon(R.drawable.ic_launcher)
-				.build()
 		}
 	}
 }

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,107 +1,63 @@
 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
-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.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class AutoTunnelControlTile : TileService(), LifecycleOwner {
+class AutoTunnelControlTile : TileService() {
 	@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() {
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+		serviceManager.autoTunnelTile.complete(this)
 	}
 
 	override fun onDestroy() {
 		super.onDestroy()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+		serviceManager.autoTunnelTile = CompletableDeferred()
 	}
 
 	override fun onStartListening() {
 		super.onStartListening()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+		serviceManager.autoTunnelTile.complete(this)
+		applicationScope.launch {
+			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
+			updateTileState()
+		}
+	}
+
+	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,
-						),
-					)
+			applicationScope.launch {
+				if (serviceManager.autoTunnelActive.value) {
+					serviceManager.stopAutoTunnel()
+					setInactive()
+				} else {
+					serviceManager.startAutoTunnel(true)
+					setActive()
 				}
 			}
 		}
@@ -127,19 +83,4 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
 			qsTile.updateTile()
 		}
 	}
-
-	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()
-		}
-	}
-
-	override val lifecycle: Lifecycle
-		get() = lifecycleRegistry
 }

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

@@ -3,25 +3,20 @@ package com.zaneschepke.wireguardautotunnel.service.tile
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.lifecycleScope
 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.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
-import com.zaneschepke.wireguardautotunnel.util.extensions.stopTunnelBackground
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Provider
 
 @AndroidEntryPoint
-class TunnelControlTile : TileService(), LifecycleOwner {
+class TunnelControlTile : TileService() {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository
 
@@ -32,33 +27,29 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
 
-	private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
+	@Inject
+	lateinit var serviceManager: ServiceManager
 
 	override fun onCreate() {
 		super.onCreate()
-		Timber.d("onCreate for tile service")
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
-	}
-
-	override fun onStopListening() {
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+		serviceManager.tunnelControlTile.complete(this)
 	}
 
 	override fun onDestroy() {
 		super.onDestroy()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+		serviceManager.tunnelControlTile = CompletableDeferred()
 	}
 
 	override fun onStartListening() {
 		super.onStartListening()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
-		lifecycleScope.launch {
+		serviceManager.tunnelControlTile.complete(this)
+		applicationScope.launch {
 			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
 			updateTileState()
 		}
 	}
 
-	private suspend fun updateTileState() {
+	fun updateTileState() = applicationScope.launch {
 		val lastActive = appDataRepository.getStartTunnelConfig()
 		lastActive?.let {
 			updateTile(it)
@@ -68,13 +59,15 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
-			Timber.d("Click")
-			lifecycleScope.launch {
-				val context = this@TunnelControlTile
+			applicationScope.launch {
 				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()
 				}
 			}
 		}
@@ -123,7 +116,4 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 			}
 		}
 	}
-
-	override val lifecycle: Lifecycle
-		get() = lifecycleRegistry
 }

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

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

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

@@ -5,11 +5,16 @@ 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()
+
+	suspend fun getBackendState(): BackendState
+
+	suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
 
 	val vpnState: StateFlow<VpnState>
 
@@ -17,6 +22,7 @@ interface TunnelService : Tunnel, org.amnezia.awg.backend.Tunnel {
 
 	suspend fun getState(): TunnelState
 
-	fun cancelStatsJob()
-	fun startStatsJob()
+	fun cancelActiveTunnelJobs()
+
+	fun startActiveTunnelJobs()
 }

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,21 +8,30 @@ 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.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.AmneziaStatistics
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.WireGuardStatistics
+import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendState
+import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendState
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.asStateFlow
+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 com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService.Companion.VPN_NOTIFICATION_ID
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Provider
@@ -31,28 +40,38 @@ class WireGuardTunnel
 @Inject
 constructor(
 	private val amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
-	tunnelConfigRepository: TunnelConfigRepository,
+	private val tunnelConfigRepository: TunnelConfigRepository,
 	@Kernel private val kernelBackend: Provider<Backend>,
 	private val appDataRepository: AppDataRepository,
 	@ApplicationScope private val applicationScope: CoroutineScope,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+	private val serviceManager: ServiceManager,
+	private val notificationService: NotificationService,
 ) : TunnelService {
 
 	private val _vpnState = MutableStateFlow(VpnState())
-	override val vpnState: StateFlow<VpnState> = _vpnState.combine(
-		tunnelConfigRepository.getTunnelConfigsFlow(),
-	) {
-			vpnState, tunnels ->
-		vpnState.copy(
-			tunnelConfig = tunnels.firstOrNull { it.id == vpnState.tunnelConfig?.id },
-		)
-	}.stateIn(applicationScope, SharingStarted.Lazily, VpnState())
+	override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
 
 	private var statsJob: Job? = null
+	private var tunnelChangesJob: Job? = null
+
+	@get:Synchronized @set:Synchronized
+	private var isKernelBackend: Boolean? = null
+
+	private val tunnelControlMutex = Mutex()
+
+	init {
+		applicationScope.launch(ioDispatcher) {
+			appDataRepository.settings.getSettingsFlow().collect {
+				isKernelBackend = it.isKernelEnabled
+			}
+		}
+	}
 
 	private suspend fun backend(): Any {
-		val settings = appDataRepository.settings.getSettings()
-		if (settings.isKernelEnabled) return kernelBackend.get()
+		val isKernelEnabled = isKernelBackend
+			?: appDataRepository.settings.getSettings().isKernelEnabled
+		if (isKernelEnabled) return kernelBackend.get()
 		return amneziaBackend.get()
 	}
 
@@ -87,106 +106,169 @@ 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) {
+			if (isTunnelAlreadyRunning(tunnelConfig)) return@withContext
+			withServiceActive {
+				onBeforeStart(background)
+				tunnelControlMutex.withLock {
+					setState(tunnelConfig, TunnelState.UP).onSuccess {
+						startActiveTunnelJobs()
+						if (it.isUp()) appDataRepository.tunnels.save(tunnelConfig.copy(isActive = true))
+						with(notificationService) {
+							val notification = createNotification(
+								WireGuardNotification.NotificationChannels.VPN,
+								title = "${context.getString(R.string.tunnel_running)} - ${tunnelConfig.name}",
+								actions = listOf(
+									notificationService.createNotificationAction(NotificationAction.TUNNEL_OFF),
+								),
+							)
+							show(VPN_NOTIFICATION_ID, notification)
+						}
+						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) {
+			if (_vpnState.value.status.isDown()) return@withContext
+			with(_vpnState.value) {
+				if (tunnelConfig == null) return@withContext
+				tunnelControlMutex.withLock {
+					setState(tunnelConfig, TunnelState.DOWN).onSuccess {
+						updateTunnelState(it, null)
+						onStop(tunnelConfig)
+						notificationService.remove(VPN_NOTIFICATION_ID)
+						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)
-	}
-
-	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 toggleTunnel(tunnelConfig: TunnelConfig) {
+		withContext(ioDispatcher) {
+			tunnelControlMutex.withLock {
+				setState(tunnelConfig, TunnelState.TOGGLE)
 			}
 		}
 	}
 
-	private suspend fun onStopFailed() {
+	// utility to keep vpnService alive during rapid changes to prevent bad states
+	private suspend fun withServiceActive(callback: suspend () -> Unit) {
+		when (val backend = backend()) {
+			is org.amnezia.awg.backend.Backend -> {
+				val backendState = backend.backendState
+				if (backendState == org.amnezia.awg.backend.Backend.BackendState.INACTIVE) {
+					backend.setBackendState(org.amnezia.awg.backend.Backend.BackendState.SERVICE_ACTIVE, emptyList())
+				}
+				callback()
+			}
+			is Backend -> callback()
+		}
+	}
+
+	override suspend fun bounceTunnel() {
 		_vpnState.value.tunnelConfig?.let {
-			appDataRepository.tunnels.save(it.copy(isActive = true))
+			withServiceActive {
+				toggleTunnel(it)
+				toggleTunnel(it)
+			}
 		}
 	}
 
-	private suspend fun onStartFailed() {
-		_vpnState.value.tunnelConfig?.let {
-			appDataRepository.tunnels.save(it.copy(isActive = false))
+	override suspend fun getBackendState(): BackendState {
+		return when (val backend = backend()) {
+			is org.amnezia.awg.backend.Backend -> {
+				backend.backendState.asBackendState()
+			}
+			is Backend -> BackendState.SERVICE_ACTIVE
+			else -> BackendState.INACTIVE
 		}
-		cancelStatsJob()
-		resetBackendStatistics()
 	}
 
-	private suspend fun onBeforeStart(tunnelConfig: TunnelConfig) {
-		if (_vpnState.value.status == TunnelState.UP) vpnState.value.tunnelConfig?.let { stopTunnel(it) }
-		resetBackendStatistics()
-		appDataRepository.tunnels.save(tunnelConfig.copy(isActive = true))
-		emitVpnStateConfig(tunnelConfig)
-		startStatsJob()
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+		kotlin.runCatching {
+			when (val backend = backend()) {
+				is org.amnezia.awg.backend.Backend -> {
+					backend.setBackendState(backendState.asAmBackendState(), allowedIps)
+				}
+				is Backend -> {
+					// TODO not yet implemented
+					Timber.d("Kernel backend state not yet implemented")
+				}
+				else -> Unit
+			}
+		}
 	}
 
-	private suspend fun onBeforeStop(tunnelConfig: TunnelConfig) {
-		cancelStatsJob()
+	private suspend fun shutDownActiveTunnel() {
+		with(_vpnState.value) {
+			if (status.isUp()) {
+				stopTunnel()
+			}
+		}
+	}
+
+	private suspend fun startBackgroundService() {
+		serviceManager.startBackgroundService()
+		serviceManager.updateTunnelTile()
+	}
+
+	private fun stopBackgroundService() {
+		serviceManager.stopBackgroundService()
+		serviceManager.updateTunnelTile()
+	}
+
+	private suspend fun onBeforeStart(background: Boolean) {
+		shutDownActiveTunnel()
 		resetBackendStatistics()
+		val settings = appDataRepository.settings.getSettings()
+		if (background || settings.isKernelEnabled) startBackgroundService()
+	}
+
+	private suspend fun onStop(tunnelConfig: TunnelConfig) {
 		appDataRepository.tunnels.save(tunnelConfig.copy(isActive = false))
+		cancelActiveTunnelJobs()
+		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 updateTunnelConfig(tunnelConfig: TunnelConfig?) {
+		_vpnState.update {
+			it.copy(tunnelConfig = tunnelConfig)
+		}
 	}
 
-	private fun emitVpnStateConfig(tunnelConfig: TunnelConfig) {
-		_vpnState.tryEmit(
-			_vpnState.value.copy(
-				tunnelConfig = tunnelConfig,
-			),
-		)
+	private fun updateBackendStatistics(statistics: TunnelStatistics) {
+		_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 {
@@ -197,12 +279,14 @@ constructor(
 		}
 	}
 
-	override fun cancelStatsJob() {
+	override fun cancelActiveTunnelJobs() {
 		statsJob?.cancel()
+		tunnelChangesJob?.cancel()
 	}
 
-	override fun startStatsJob() {
+	override fun startActiveTunnelJobs() {
 		statsJob = startTunnelStatisticsJob()
+		tunnelChangesJob = startTunnelConfigChangesJob()
 	}
 
 	override fun getName(): String {
@@ -214,11 +298,11 @@ constructor(
 		delay(STATS_START_DELAY)
 		while (true) {
 			when (backend) {
-				is Backend -> emitBackendStatistics(
+				is Backend -> updateBackendStatistics(
 					WireGuardStatistics(backend.getStatistics(this@WireGuardTunnel)),
 				)
 				is org.amnezia.awg.backend.Backend -> {
-					emitBackendStatistics(
+					updateBackendStatistics(
 						AmneziaStatistics(
 							backend.getStatistics(this@WireGuardTunnel),
 						),
@@ -229,17 +313,38 @@ constructor(
 		}
 	}
 
+	private fun startTunnelConfigChangesJob() = applicationScope.launch(ioDispatcher) {
+		tunnelConfigRepository.getTunnelConfigsFlow().collect {
+			with(_vpnState.value) {
+				if (status.isDown() || tunnelConfig == null) return@collect
+				val vpnConfigFromStorage = it.first { it.id == tunnelConfig.id }
+				val isRestartNeeded = vpnConfigFromStorage.wgQuick != tunnelConfig.wgQuick ||
+					vpnConfigFromStorage.amQuick != tunnelConfig.amQuick
+				updateTunnelConfig(vpnConfigFromStorage)
+				if (isRestartNeeded) {
+					Timber.d("Bouncing tunnel on config change")
+					bounceTunnel()
+				}
+			}
+		}
+	}
+
 	override fun onStateChange(newState: Tunnel.State) {
-		emitTunnelState(TunnelState.from(newState))
+		_vpnState.update {
+			it.copy(status = TunnelState.from(newState))
+		}
+		serviceManager.updateTunnelTile()
 	}
 
 	override fun onStateChange(state: State) {
-		emitTunnelState(TunnelState.from(state))
+		_vpnState.update {
+			it.copy(status = TunnelState.from(state))
+		}
+		serviceManager.updateTunnelTile()
 	}
 
 	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

@@ -2,14 +2,23 @@ package com.zaneschepke.wireguardautotunnel.ui
 
 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.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.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.service.tunnel.BackendState
 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.StringValue
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -20,8 +29,11 @@ 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 timber.log.Timber
 import xyz.teamgravity.pin_lock_compose.PinManager
 import javax.inject.Inject
 import javax.inject.Provider
@@ -33,37 +45,42 @@ 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()
+			initServices()
 			initTunnel()
 			appReadyCheck()
 		}
@@ -77,7 +94,7 @@ constructor(
 	}
 
 	private suspend fun initTunnel() {
-		if (tunnelService.get().getState() == TunnelState.UP) tunnelService.get().startStatsJob()
+		if (tunnelService.get().getState() == TunnelState.UP) tunnelService.get().startActiveTunnelJobs()
 		val activeTunnels = appDataRepository.tunnels.getActive()
 		if (activeTunnels.isNotEmpty() &&
 			tunnelService.get().getState() == TunnelState.DOWN
@@ -91,17 +108,12 @@ constructor(
 		if (isPinEnabled) PinManager.initialize(WireGuardAutoTunnel.instance)
 	}
 
-	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,
-			),
-		)
+	private suspend fun initServices() {
+		withContext(ioDispatcher) {
+			val settings = appDataRepository.settings.getSettings()
+			handleVpnKillSwitchChange(settings.isVpnKillSwitchEnabled)
+			if (settings.isAutoTunnelEnabled) serviceManager.startAutoTunnel(false)
+		}
 	}
 
 	fun onPinLockDisabled() = viewModelScope.launch(ioDispatcher) {
@@ -112,4 +124,146 @@ 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.deleteAndClearLogs()
+	}
+
+	fun onToggleAlwaysOnVPN() = viewModelScope.launch {
+		with(uiState.value.settings) {
+			appDataRepository.settings.save(
+				copy(
+					isAlwaysOnVpnEnabled = !isAlwaysOnVpnEnabled,
+				),
+			)
+		}
+	}
+
+	fun onLocaleChange(localeTag: String) = viewModelScope.launch {
+		appDataRepository.appState.setLocale(localeTag)
+		LocaleUtil.changeLocale(localeTag)
+		_configurationChange.update {
+			true
+		}
+	}
+
+	fun onToggleRestartAtBoot() = viewModelScope.launch {
+		with(uiState.value.settings) {
+			appDataRepository.settings.save(
+				copy(
+					isRestoreOnBootEnabled = !isRestoreOnBootEnabled,
+				),
+			)
+		}
+	}
+
+	fun onToggleVpnKillSwitch(enabled: Boolean) = viewModelScope.launch {
+		with(uiState.value.settings) {
+			appDataRepository.settings.save(
+				copy(
+					isVpnKillSwitchEnabled = enabled,
+					isLanOnKillSwitchEnabled = if (enabled) isLanOnKillSwitchEnabled else false,
+				),
+			)
+		}
+		handleVpnKillSwitchChange(enabled)
+	}
+
+	private suspend fun handleVpnKillSwitchChange(enabled: Boolean) {
+		withContext(ioDispatcher) {
+			if (enabled) {
+				Timber.d("Starting kill switch")
+				val allowedIps = if (appDataRepository.settings.getSettings().isLanOnKillSwitchEnabled) {
+					TunnelConfig.IPV4_PUBLIC_NETWORKS
+				} else {
+					emptySet()
+				}
+				tunnelService.get().setBackendState(BackendState.KILL_SWITCH_ACTIVE, allowedIps)
+			} else {
+				Timber.d("Sending shutdown of kill switch")
+				tunnelService.get().setBackendState(BackendState.SERVICE_ACTIVE, emptySet())
+			}
+		}
+	}
+
+	fun onToggleLanOnKillSwitch(enabled: Boolean) = viewModelScope.launch(ioDispatcher) {
+		appDataRepository.settings.save(
+			uiState.value.settings.copy(
+				isLanOnKillSwitchEnabled = enabled,
+			),
+		)
+		val allowedIps = if (enabled) TunnelConfig.IPV4_PUBLIC_NETWORKS else emptySet()
+		Timber.d("Setting allowedIps $allowedIps")
+		tunnelService.get().setBackendState(BackendState.KILL_SWITCH_ACTIVE, allowedIps)
+	}
+
+	fun onToggleShortcutsEnabled() = viewModelScope.launch {
+		with(uiState.value.settings) {
+			appDataRepository.settings.save(
+				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,57 @@ 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.settings.killswitch.KillSwitchScreen
 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 +83,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 +123,6 @@ class MainActivity : AppCompatActivity() {
 									)
 								}
 							},
-							modifier =
-							Modifier
-								.focusable()
-								.focusProperties {
-									if (navBackStackEntry?.isCurrentRoute(Route.Lock) == true) {
-										Unit
-									} else {
-										up = focusRequester
-									}
-								},
 							bottomBar = {
 								BottomNavBar(
 									navController,
@@ -165,11 +151,10 @@ class MainActivity : AppCompatActivity() {
 									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 +162,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 +197,6 @@ class MainActivity : AppCompatActivity() {
 										val args = it.toRoute<Route.Option>()
 										OptionsScreen(
 											tunnelId = args.id,
-											focusRequester = focusRequester,
 											appUiState = appUiState,
 										)
 									}
@@ -209,6 +205,12 @@ class MainActivity : AppCompatActivity() {
 											appViewModel = viewModel,
 										)
 									}
+									composable<Route.Scanner> {
+										ScannerScreen()
+									}
+									composable<Route.KillSwitch> {
+										KillSwitchScreen(appUiState, viewModel)
+									}
 								}
 							}
 						}
@@ -217,9 +219,9 @@ class MainActivity : AppCompatActivity() {
 			}
 		}
 	}
-
 	override fun onDestroy() {
 		super.onDestroy()
-		tunnelService.cancelStatsJob()
+		// save battery by not polling stats while app is closed
+		tunnelService.cancelActiveTunnelJobs()
 	}
 }

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

@@ -9,6 +9,24 @@ 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 KillSwitch : Route()
+
+	@Serializable
+	data object Language : Route()
+
 	@Serializable
 	data object Main : Route()
 
@@ -20,6 +38,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/permission/vpn/VpnDeniedDialog.kt

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
+package com.zaneschepke.wireguardautotunnel.ui.common.permission.vpn
 
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material3.MaterialTheme

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/permission/vpn/withVpnPermission.kt

@@ -0,0 +1,38 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.permission.vpn
+
+import android.net.VpnService
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity.RESULT_OK
+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.platform.LocalContext
+
+@Composable
+inline fun <T> withVpnPermission(crossinline onSuccess: (t: T) -> Unit): (t: T) -> Unit {
+	val context = LocalContext.current
+
+	var showVpnPermissionDialog by remember { mutableStateOf(false) }
+
+	val vpnActivity =
+		rememberLauncherForActivityResult(
+			ActivityResultContracts.StartActivityForResult(),
+			onResult = {
+				if (it.resultCode != RESULT_OK) showVpnPermissionDialog = true
+			},
+		)
+
+	VpnDeniedDialog(showVpnPermissionDialog, onDismiss = { showVpnPermissionDialog = false })
+
+	return {
+		val intent = VpnService.prepare(context)
+		if (intent != null) {
+			vpnActivity.launch(intent)
+		} else {
+			onSuccess(it)
+		}
+	}
+}

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

@@ -0,0 +1,35 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.permission
+
+import android.content.Intent
+import android.net.Uri
+import android.provider.Settings
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import com.zaneschepke.wireguardautotunnel.util.extensions.isBatteryOptimizationsDisabled
+
+@Composable
+inline fun withIgnoreBatteryOpt(ignore: Boolean, crossinline callback: () -> Unit): () -> Unit {
+	val context = LocalContext.current
+	val batteryActivity =
+		rememberLauncherForActivityResult(
+			ActivityResultContracts.StartActivityForResult(),
+		) { result: ActivityResult ->
+			// we only ask once
+			callback()
+		}
+	return {
+		if (ignore || context.isBatteryOptimizationsDisabled()) {
+			callback()
+		} else {
+			batteryActivity.launch(
+				Intent().apply {
+					action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+					data = Uri.parse("package:${context.packageName}")
+				},
+			)
+		}
+	}
+}

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,28 +1,27 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main
 
-import android.annotation.SuppressLint
-import android.net.VpnService
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity.RESULT_OK
 import androidx.compose.foundation.ExperimentalFoundationApi
 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 +29,14 @@ 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.core.os.ConfigurationCompat
 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,57 +45,59 @@ 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.permission.vpn.withVpnPermission
+import com.zaneschepke.wireguardautotunnel.ui.common.permission.withIgnoreBatteryOpt
 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
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.ScrollDismissFab
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelImportSheet
 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.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
+import java.text.Collator
 
-@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) }
-	var showVpnPermissionDialog by remember { mutableStateOf(false) }
 	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 currentLocale = ConfigurationCompat.getLocales(context.resources.configuration)[0]
+	val collator = Collator.getInstance(currentLocale)
+
+	val sortedTunnels = remember(uiState.tunnels) {
+		uiState.tunnels.sortedWith(compareBy(collator) { it.name })
+	}
+
+	val startAutoTunnel = withVpnPermission<Unit> { viewModel.onToggleAutoTunnel() }
+	val startTunnel = withVpnPermission<TunnelConfig> {
+		viewModel.onTunnelStart(it, uiState.settings.isKernelEnabled)
+	}
+	val autoTunnelToggleBattery = withIgnoreBatteryOpt(uiState.generalState.isBatteryOptimizationDisableShown) {
+		if (!uiState.generalState.isBatteryOptimizationDisableShown) viewModel.setBatteryOptimizeDisableShown()
+		if (uiState.settings.isKernelEnabled) {
+			viewModel.onToggleAutoTunnel()
+		} else {
+			startAutoTunnel.invoke(Unit)
+		}
+	}
 
 	val nestedScrollConnection = remember {
 		NestedScrollListener({ isFabVisible = false }, { isFabVisible = true })
 	}
 
-	val vpnActivityResultState =
-		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 tunnelFileImportResultLauncher = rememberFileImportLauncherForResult(onNoFileExplorer = {
 		snackbar.showMessage(
 			context.getString(R.string.error_no_file_explorer),
@@ -105,23 +106,18 @@ 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)
-				}
-			},
-		)
-
-	VpnDeniedDialog(showVpnPermissionDialog, onDismiss = { showVpnPermissionDialog = false })
+	val requestPermissionLauncher = rememberLauncherForActivityResult(
+		ActivityResultContracts.RequestPermission(),
+	) { isGranted ->
+		if (!isGranted) return@rememberLauncherForActivityResult snackbar.showMessage("Camera permission required")
+		navController.navigate(Route.Scanner)
+	}
 
 	if (showDeleteTunnelAlertDialog) {
 		InfoDialog(
 			onDismiss = { showDeleteTunnelAlertDialog = false },
 			onAttest = {
-				selectedTunnel?.let { viewModel.onDelete(it, context) }
+				selectedTunnel?.let { viewModel.onDelete(it) }
 				showDeleteTunnelAlertDialog = false
 				selectedTunnel = null
 			},
@@ -132,27 +128,14 @@ 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 (!checked) viewModel.onTunnelStop().also { return }
 		if (uiState.settings.isKernelEnabled) {
-			context.startTunnelBackground(tunnel.id)
+			viewModel.onTunnelStart(tunnel, uiState.settings.isKernelEnabled)
 		} else {
-			viewModel.onTunnelStart(tunnel)
+			startTunnel.invoke(tunnel)
 		}
 	}
 
-	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)
-	}
-
 	Scaffold(
 		modifier =
 		Modifier.pointerInput(Unit) {
@@ -165,23 +148,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 +199,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 +214,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) {
+						autoTunnelToggleBattery.invoke()
+					}
 				}
 			}
 			items(
-				uiState.tunnels,
+				sortedTunnels,
 				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 +238,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,10 @@ constructor(
 		}
 	}
 
+	fun onToggleAutoTunnel() = viewModelScope.launch {
+		serviceManager.toggleAutoTunnel(false)
+	}
+
 	private suspend fun saveTunnelsFromZipUri(uri: Uri, context: Context) {
 		ZipInputStream(getInputStreamFromUri(uri, context)).use { zip ->
 			generateSequence { zip.nextEntry }
@@ -189,18 +183,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 +239,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,75 @@
 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.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.VpnKeyOff
+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.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 +86,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.VpnKeyOff,
+								title = {
+									Text(
+										stringResource(R.string.kill_switch_options),
+										style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onSurface),
+									)
+								},
+								onClick = {
+									navController.navigate(Route.KillSwitch)
+								},
+								trailing = {
+									ForwardButton { navController.navigate(Route.KillSwitch) }
+								},
+							),
+						),
+					)
+				}
+				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,93 @@
+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.fillMaxSize
+import androidx.compose.foundation.layout.padding
+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()),
+		) {
+			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,358 @@
+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.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+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(
+		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)
+				.verticalScroll(rememberScrollState())
+				.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))
-			}
-		}
-	}
-}