chore(deps): bump androidGradlePlugin

Bumps `androidGradlePlugin` from 8.8.0-alpha05 to 8.11.0-alpha05. Updates `com.android.application` from 8.8.0-alpha05 to 8.11.0-alpha05 Updates `com.android.library` from 8.8.0-alpha05 to 8.11.0-alpha05 --- updated-dependencies: - dependency-name: com.android.application dependency-version: 8.11.0-alpha05 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.android.library dependency-version: 8.11.0-alpha05 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2026-07-03 14:07:49 +02:00 · 2025-04-09 14:06:03 +00:00
237 changed files with 2382 additions and 3443 deletions
@@ -1,5 +1,4 @@
-name: Build
-
+name: build
 on:
  workflow_dispatch:
    inputs:
@@ -13,14 +12,6 @@ on:
          - prerelease
          - nightly
          - release
-      flavor:
-        type: choice
-        description: "Product flavor"
-        required: true
-        default: fdroid
-        options:
-          - fdroid
-          - full
    secrets:
      SIGNING_KEY_ALIAS:
        required: false
@@ -39,11 +30,6 @@ on:
        description: "Build type"
        required: true
        default: debug
-      flavor:
-        type: string
-        description: "Product flavor"
-        required: false
-        default: fdroid
    secrets:
      SIGNING_KEY_ALIAS:
        required: false
@@ -55,7 +41,6 @@ on:
        required: false
      KEYSTORE:
        required: false
-
 env:
  UPLOAD_DIR_ANDROID: android_artifacts

@@ -72,8 +57,6 @@ jobs:
      UPLOAD_DIR_ANDROID: ${{ env.UPLOAD_DIR_ANDROID }}
    steps:
      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
      - name: Set up JDK 17
        uses: actions/setup-java@v4
        with:
@@ -82,6 +65,9 @@ jobs:
          cache: gradle
      - name: Grant execute permission for gradlew
        run: chmod +x gradlew
+
+      # Here we need to decode keystore.jks from base64 string and place it
+      # in the folder specified in the release signing configuration
      - name: Decode Keystore
        id: decode_keystore
        uses: timheuer/base64-to-file@v1.2
@@ -89,39 +75,51 @@ jobs:
          fileName: ${{ env.KEY_STORE_FILE }}
          fileDir: ${{ env.KEY_STORE_LOCATION }}
          encodedString: ${{ secrets.KEYSTORE }}
+
+      # create keystore path for gradle to read
      - name: Create keystore path env var
        if: ${{ inputs.build_type != 'debug' }}
        run: |
          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
+
      - name: Create service_account.json
        if: ${{ inputs.build_type != 'debug' }}
        id: createServiceAccount
-        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
-      - name: Build APK
+        run: echo '${{ secrets.ANDROID_SERVICE_ACCOUNT_JSON }}' > service_account.json
+
+      - name: Build Fdroid Release APK
+        if: ${{ inputs.build_type == 'release' }}
+        run: ./gradlew :app:assembleFdroidRelease --info
+
+      - name: Build Fdroid Prerelease APK
+        if: ${{ inputs.build_type == 'prerelease' }}
+        run: ./gradlew :app:assembleFdroidPrerelease --info
+
+      - name: Build Fdroid Nightly APK
+        if: ${{ inputs.build_type == 'nightly' }}
+        run: ./gradlew :app:assembleFdroidNightly --info
+
+      - name: Build Debug APK
+        if: ${{ inputs.build_type == 'debug' }}
+        run: ./gradlew :app:assembleFdroidDebug --stacktrace
+
+      # bump versionCode for nightly and prerelease builds
+      - name: Commit and push versionCode changes
+        if: ${{ inputs.build_type == 'nightly' || inputs.build_type == 'prerelease' }}
        run: |
-          flavor=${{ inputs.flavor }}
-          build_type=${{ inputs.build_type }}
-          case $build_type in
-            "release")
-              ./gradlew :app:assemble${flavor^}Release --info
-              ;;
-            "prerelease")
-              ./gradlew :app:assemble${flavor^}Prerelease --info
-              ;;
-            "nightly")
-              ./gradlew :app:assemble${flavor^}Nightly --info
-              ;;
-            "debug")
-              ./gradlew :app:assemble${flavor^}Debug --stacktrace
-              ;;
-          esac
+          git config --global user.name 'GitHub Actions'
+          git config --global user.email 'actions@github.com'
+          git add versionCode.txt
+          git commit -m "Automated build update"
+
      - name: Get release apk path
        id: apk-path
-        run: echo "path=$(find . -regex '^.*/build/outputs/apk/${{ inputs.flavor }}/${{ inputs.build_type }}/.*\.apk$' -type f | head -1 | tail -c+2)" >> $GITHUB_OUTPUT
+        run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/${{ inputs.build_type }}/.*\.apk$' -type f | head -1 | tail -c+2)" >> $GITHUB_OUTPUT
+
      - name: Upload release apk
        uses: actions/upload-artifact@v4
        with:
          name: ${{ env.UPLOAD_DIR_ANDROID }}
-          path: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
-          retention-days: 1
+          path: ${{github.workspace}}/${{ steps.apk-path.outputs.path }}
+          retention-days: 1
@@ -0,0 +1,36 @@
+name: on-issue
+
+on:
+  issues:
+    types: [ opened, closed, reopened ]
+
+
+jobs:
+
+  on-issue:
+    name: On new issue
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Telegram Message
+        run: |
+          msg_text='${{ github.actor }} updated an issue:
+            status: ${{ github.event.issue.state }} - #${{ github.event.issue.number }} ${{ github.event.issue.title }}
+            https://github.com/zaneschepke/wgtunnel/issues/${{ github.event.issue.number }}'
+          curl -s -X POST 'https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage' \
+          -d "chat_id=${{ secrets.TELEGRAM_TO }}&text=${msg_text}&message_thread_id=${{ vars.TELEGRAM_ACTIVITY_TOPIC }}"
+
+      - name: Send Matrix Message
+        run: |
+          msg_text='${{ github.actor }} updated an issue:
+            status: ${{ github.event.issue.state }} - #${{ github.event.issue.number }} ${{ github.event.issue.title }}
+            https://github.com/zaneschepke/wgtunnel/issues/${{ github.event.issue.number }}'
+          # Escape newlines and quotes for JSON
+          formatted_msg=$(echo -n "$msg_text" | sed ':a;N;$ba;s/\n/\\n/g' | sed 's/"/\\"/g')
+          curl -s -X POST \
+            -H "Authorization: Bearer ${{ secrets.MATRIX_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            -d '{
+            "msgtype": "m.text",
+            "body": "'"$formatted_msg"'"
+            }' \
+            "https://matrix.org/_matrix/client/v3/rooms/${{ vars.MATRIX_ACTIVITY_TOPIC }}/send/m.room.message/$(date +%s)"
@@ -0,0 +1,37 @@
+name: on-publish
+
+on:
+  release:
+    types: [ published ]
+
+
+jobs:
+  on-publish:
+    name: On publish
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Telegram Message
+        run: |
+          msg_text='${{ github.actor }} published a new release:
+            Release: ${{ github.event.release.tag_name }}
+            ${{ github.event.release.body }}
+            https://github.com/zaneschepke/wgtunnel/releases/tag/${{ github.event.release.tag_name }}'
+          curl -s -X POST 'https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage' \
+          -d "chat_id=${{ secrets.TELEGRAM_TO }}&text=${msg_text}&message_thread_id=${{ vars.TELEGRAM_RELEASE_TOPIC }}"
+
+      - name: Send Matrix Message
+        run: |
+            msg_text='${{ github.actor }} published a new release:
+              Release: ${{ github.event.release.tag_name }}
+              ${{ github.event.release.body }}
+              https://github.com/zaneschepke/wgtunnel/releases/tag/${{ github.event.release.tag_name }}'
+            # Escape newlines and quotes for JSON
+            formatted_msg=$(echo -n "$msg_text" | sed ':a;N;$ba;s/\n/\\n/g' | sed 's/"/\\"/g')
+            curl -s -X POST \
+              -H "Authorization: Bearer ${{ secrets.MATRIX_TOKEN }}" \
+              -H "Content-Type: application/json" \
+              -d '{
+                "msgtype": "m.text",
+                "body": "'"$formatted_msg"'"
+              }' \
+              "https://matrix.org/_matrix/client/v3/rooms/${{ vars.MATRIX_RELEASE_TOPIC }}/send/m.room.message/$(date +%s)"
@@ -2,12 +2,12 @@ name: publish

 on:
  schedule:
-    - cron: "4 3 * * *"
+  - cron: "4 3 * * *"
  workflow_dispatch:
    inputs:
      track:
        type: choice
-        description: "Google Play release track"
+        description: "Google play release track"
        options:
          - none
          - internal
@@ -30,102 +30,75 @@ on:
        description: "Tag name for release"
        required: false
        default: nightly
-      flavor:
-        type: choice
-        description: "Product flavor"
-        required: true
-        default: full
-        options:
-          - fdroid
-          - full
  workflow_call:
-    inputs:
-      flavor:
-        type: string
-        description: "Product flavor"
-        required: false
-        default: full
-
 env:
  UPLOAD_DIR_ANDROID: android_artifacts

-permissions:
-  contents: write
-  packages: write
-
 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@v4
+        uses: actions/checkout@v3
        with:
-          fetch-depth: 0
+          fetch-depth: 0  # This fetches all history so we can check commits
+
      - name: Check for new commits
        id: check
        env:
-          GITHUB_TOKEN: ${{ secrets.PAT }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: |
+          # 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-fdroid:
-    if: ${{ inputs.release_type == 'release' || inputs.flavor == 'fdroid' }}
+  build:
+    if: ${{ inputs.release_type != 'none' }}
    uses: ./.github/workflows/build.yml
    secrets: inherit
    with:
      build_type: ${{ inputs.release_type == '' && 'nightly' || inputs.release_type }}
-      flavor: fdroid
-
-  build-full:
-    if: ${{ inputs.release_type == 'release' || inputs.release_type == 'nightly' || inputs.release_type == 'prerelease' || inputs.flavor == 'full' }}
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
-    with:
-      build_type: ${{ inputs.release_type == '' && 'nightly' || inputs.release_type }}
-      flavor: full

  publish:
    needs:
      - check_commits
-      - build-full
+      - build
    if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
    name: publish-github
    runs-on: ubuntu-latest
+    env:
+      GH_USER: ${{ secrets.GH_USER }}
+      # GH needed for gh cli
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      GH_REPO: ${{ github.repository }}
+
    steps:
      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ref: main
      - name: Install system dependencies
        run: |
          sudo apt update && sudo apt install -y gh apksigner
-      - name: Set TAG_NAME
-        run: |
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
-          elif [ "${{ github.event_name }}" = "schedule" ]; then
-            echo "TAG_NAME=nightly" >> $GITHUB_ENV
-            echo "RELEASE_TYPE=nightly" >> $GITHUB_ENV
-          fi
+
+      # update latest tag
      - name: Set latest tag
        uses: rickstaa/action-create-tag@v1
        id: tag_creation
        with:
-          tag: "latest"
+          tag: "latest"  # or any tag name you wish to use
          message: "Automated tag for HEAD commit"
          force_push_tag: true
-          github_token: ${{ secrets.GITHUB_TOKEN }}
          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
@@ -133,19 +106,40 @@ jobs:
          token: ${{ secrets.GITHUB_TOKEN }}
          toTag: ${{ github.event_name == 'schedule' && 'nightly' || steps.latest_release.outputs.tag_name }}
          fromTag: "latest"
-          writeToFile: false
+          writeToFile: false  # we won't write to file, just output
+
+      - name: Get version code
+        if: ${{ inputs.release_type == 'release' }}
+        run: |
+          version_code=$(grep "VERSION_CODE" buildSrc/src/main/kotlin/Constants.kt | awk '{print $5}' | tr -d '\n')
+          echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
+
+      - name: Push changes
+        if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly'  || inputs.release_type == 'prerelease' }}
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ github.ref }}
+
      - name: Make download dir
        run: mkdir ${{ github.workspace }}/temp
+
      - name: Download artifacts
        uses: actions/download-artifact@v4
        with:
          name: ${{ env.UPLOAD_DIR_ANDROID }}
          path: ${{ github.workspace }}/temp
+
+      # Setup TAG_NAME, which is used as a general "name"
+      - if: github.event_name == 'workflow_dispatch'
+        run: echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
+      - if: github.event_name == 'schedule'
+        run: echo "TAG_NAME=nightly" >> $GITHUB_ENV
+
      - name: Set version release notes
        if: ${{ inputs.release_type == 'release' }}
        run: |
-          VERSION_NAME=$(grep "const val VERSION_NAME" buildSrc/src/main/kotlin/Constants.kt | awk -F'"' '{print $2}')
-          RELEASE_NOTES="$(cat ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${VERSION_NAME}.txt || echo "No changelog found for ${VERSION_NAME}")"
+          RELEASE_NOTES="$(cat ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt)"
          echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
          echo "$RELEASE_NOTES" >> $GITHUB_ENV
          echo "EOF" >> $GITHUB_ENV
@@ -154,40 +148,32 @@ jobs:
        if: ${{ contains(env.TAG_NAME, 'nightly') }}
        run: |
          echo "RELEASE_NOTES=Nightly build for the latest development version of the app." >> $GITHUB_ENV
+          gh release delete nightly --yes || true
+          git push origin :nightly || true

      - name: On prerelease release notes
        if: ${{ inputs.release_type == 'prerelease' }}
        run: |
          echo "RELEASE_NOTES=Testing version of app for specific feature." >> $GITHUB_ENV
+          gh release delete ${{ github.event.inputs.tag_name }} --yes || true

-      - name: Delete previous release
-        if: ${{ contains(env.TAG_NAME, 'nightly') || inputs.release_type == 'prerelease' }}
-        uses: ClementTsang/delete-tag-and-release@v0.3.1
-        with:
-          tag_name: ${{ env.TAG_NAME }}
-          delete_release: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get checksums
+      - name: Get checksum
        id: checksum
        run: |
-          checksums=""
-          for file_path in $(find ${{ github.workspace }}/temp -type f -iname "*.apk"); do
-            checksum=$(apksigner verify -print-certs $file_path | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")
-            checksums="$checksums\n$file_path: $checksum"
-          done
-          echo "checksum<<EOF" >> $GITHUB_OUTPUT
-          echo -e "$checksums" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-      - name: Create Release
+          file_path=$(find ${{ github.workspace }}/temp -type f -iname "*.apk" | tail -n1)
+          echo "checksum=$(apksigner verify -print-certs $file_path | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
+
+
+      - name: Create Release with Fastlane changelog notes
        id: create_release
        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
        with:
          body: |
            ${{ env.RELEASE_NOTES }}

-            SHA-256 fingerprints for the 4096-bit signing certificate:
+            SHA-256 fingerprint for the 4096-bit signing certificate:
            ```sh
            ${{ steps.checksum.outputs.checksum }}
            ```
@@ -206,20 +192,26 @@ jobs:
          make_latest: ${{ inputs.release_type == 'release' }}
          files: |
            ${{ github.workspace }}/temp/*
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-  publish-fdroid-public:
+      # notify socials
+      - name: Trigger on-publish workflow
+        if: ${{ inputs.release_type == 'release' }}
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.PAT }}
+          event-type: publish-release
+
+  publish-fdroid:
    runs-on: ubuntu-latest
    needs:
-      - build-fdroid
+      - build
    if: inputs.release_type == 'release'
    steps:
      - name: Dispatch update for fdroid repo
        uses: peter-evans/repository-dispatch@v3
        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          repository: wgtunnel/fdroid
+          token: ${{ secrets.PAT }}
+          repository: zaneschepke/fdroid
          event-type: fdroid-update

  publish-play:
@@ -233,6 +225,8 @@ jobs:
      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
      KEY_STORE_FILE: 'android_keystore.jks'
      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
+      GH_USER: ${{ secrets.GH_USER }}
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}

    steps:
      - uses: actions/checkout@v4
@@ -273,4 +267,5 @@ jobs:
          bundler-cache: true

      - name: Distribute app to Prod track 🚀
-        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane ${{ inputs.track }})
+        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane ${{ inputs.track }})
+
@@ -70,5 +70,5 @@ lint/tmp/
 app/release/output.json
 .idea/codeStyles/
 # where we keep our signing secrets locally
+app/signing.properties
 /.kotlin/
-/app/keystore/
@@ -1,6 +1,6 @@
 MIT License

-Copyright ©  2023-2025 Zane Schepke
+Copyright (c) 2023 WG Auto Tunnel

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,3 +1,2 @@
 /build
-/release
-/src/main/assets/licenses.json
+/release
@@ -6,17 +6,35 @@ plugins {
    alias(libs.plugins.ksp)
    alias(libs.plugins.compose.compiler)
    alias(libs.plugins.grgit)
-    alias(libs.plugins.licensee)
 }

+val versionFile = file("$rootDir/versionCode.txt")
+
+val versionCodeIncrement =
+    with(getBuildTaskName().lowercase()) {
+        when {
+            this.contains(Constants.NIGHTLY) || this.contains(Constants.PRERELEASE) -> {
+                if (versionFile.exists()) {
+                    versionFile.readText().trim().toInt() + 1
+                } else {
+                    1
+                }
+            }
+            else -> 0
+        }
+    }
+
 android {
    namespace = Constants.APP_ID
    compileSdk = Constants.TARGET_SDK

    androidResources { generateLocaleConfig = true }

+    // reproducibility
    dependenciesInfo {
+        // Disables dependency metadata when building APKs.
        includeInApk = false
+        // Disables dependency metadata when building Android App Bundles.
        includeInBundle = false
    }

@@ -24,12 +42,14 @@ android {
        applicationId = Constants.APP_ID
        minSdk = Constants.MIN_SDK
        targetSdk = Constants.TARGET_SDK
-        versionCode = computeVersionCode()
-        versionName = computeVersionName()
+        versionCode = Constants.VERSION_CODE + versionCodeIncrement
+        versionName = determineVersionName()

        ksp { arg("room.schemaLocation", "$projectDir/schemas") }

-        sourceSets { getByName("debug").assets.srcDirs(files("$projectDir/schemas")) }
+        sourceSets {
+            getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
+        }

        buildConfigField(
            "String[]",
@@ -43,18 +63,15 @@ android {

    signingConfigs {
        create(Constants.RELEASE) {
-            storeFile = file(System.getenv("KEY_STORE_PATH") ?: "keystore/android_keystore.jks")
-            storePassword =
-                LocalProperties.get("SIGNING_STORE_PASSWORD")
-                    ?: System.getenv("SIGNING_STORE_PASSWORD")
-            keyAlias =
-                LocalProperties.get("SIGNING_KEY_ALIAS") ?: System.getenv("SIGNING_KEY_ALIAS")
-            keyPassword =
-                LocalProperties.get("SIGNING_KEY_PASSWORD") ?: System.getenv("SIGNING_KEY_PASSWORD")
+            storeFile = getStoreFile()
+            storePassword = getSigningProperty(Constants.STORE_PASS_VAR)
+            keyAlias = getSigningProperty(Constants.KEY_ALIAS_VAR)
+            keyPassword = getSigningProperty(Constants.KEY_PASS_VAR)
        }
    }

    buildTypes {
+        // don't strip
        packaging.jniLibs.keepDebugSymbols.addAll(
            listOf("libwg-go.so", "libwg-quick.so", "libwg.so")
        )
@@ -70,7 +87,6 @@ android {
            signingConfig = signingConfigs.getByName(Constants.RELEASE)
            resValue("string", "provider", "\"${Constants.APP_NAME}.provider\"")
        }
-
        debug {
            applicationIdSuffix = ".debug"
            resValue("string", "app_name", "WG Tunnel - Debug")
@@ -91,21 +107,27 @@ android {
            resValue("string", "app_name", "WG Tunnel - Nightly")
            resValue("string", "provider", "\"${Constants.APP_NAME}.provider.nightly\"")
        }
-    }

-    flavorDimensions.add("type")
+        applicationVariants.all {
+            val variant = this
+            variant.outputs
+                .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
+                .forEach { output ->
+                    val outputFileName =
+                        "${Constants.APP_NAME}-${variant.flavorName}-" +
+                            "${variant.buildType.name}-${variant.versionName}.apk"
+                    output.outputFileName = outputFileName
+                }
+        }
+    }
+    flavorDimensions.add(Constants.TYPE)
    productFlavors {
        create("fdroid") {
-            dimension = "type"
-            buildConfigField("String", "FLAVOR", "\"fdroid\"")
+            dimension = Constants.TYPE
+            proguardFile("fdroid-rules.pro")
        }
-        create("google") {
-            dimension = "type"
-            buildConfigField("String", "FLAVOR", "\"google\"")
-        }
-        create("full") { dimension = "type" }
+        create("general") { dimension = Constants.TYPE }
    }
-
    compileOptions {
        sourceCompatibility = JavaVersion.VERSION_17
        targetCompatibility = JavaVersion.VERSION_17
@@ -117,27 +139,6 @@ android {
        buildConfig = true
    }
    packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
-
-    licensee {
-        Constants.allowedLicenses.forEach { allow(it) }
-        allowUrl(Constants.XZING_LICENSE_URL)
-        allowUrl("https://rafaellins.mit-license.org/2021/")
-    }
-
-    applicationVariants.all {
-        val variant = this
-        variant.outputs
-            .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
-            .forEach { output ->
-                val outputFileName =
-                    if (variant.flavorName == "fdroid" && variant.buildType.name == "release") {
-                        "${Constants.APP_NAME}-fdroid-release-${variant.versionName}.apk"
-                    } else {
-                        "${Constants.APP_NAME}-${variant.flavorName}-v${variant.versionName}.apk"
-                    }
-                output.outputFileName = outputFileName
-            }
-    }
 }

 dependencies {
@@ -146,6 +147,8 @@ dependencies {

    implementation(libs.androidx.core.ktx)
    implementation(libs.androidx.lifecycle.runtime.ktx)
+
+    // helpers for implementing LifecycleOwner in a Service
    implementation(libs.androidx.lifecycle.service)
    implementation(libs.androidx.activity.compose)
    implementation(platform(libs.androidx.compose.bom))
@@ -157,6 +160,7 @@ dependencies {
    implementation(libs.material)
    implementation(libs.androidx.storage)

+    // test
    testImplementation(libs.junit)
    testImplementation(libs.androidx.junit)
    androidTestImplementation(libs.androidx.junit)
@@ -167,64 +171,83 @@ dependencies {
    debugImplementation(libs.androidx.compose.ui.tooling)
    debugImplementation(libs.androidx.compose.manifest)

+    // tunnel
    implementation(libs.tunnel)
    implementation(libs.amneziawg.android)
    coreLibraryDesugaring(libs.desugar.jdk.libs)

+    // logging
    implementation(libs.timber)

+    // compose navigation
    implementation(libs.androidx.navigation.compose)
    implementation(libs.androidx.hilt.navigation.compose)

+    // hilt
    implementation(libs.hilt.android)
    ksp(libs.hilt.android.compiler)
    ksp(libs.androidx.hilt.compiler)

+    // accompanist
    implementation(libs.accompanist.permissions)
    implementation(libs.accompanist.drawablepainter)

+    // storage
    implementation(libs.androidx.room.runtime)
    ksp(libs.androidx.room.compiler)
    implementation(libs.androidx.room.ktx)
    implementation(libs.androidx.datastore.preferences)

+    // lifecycle
    implementation(libs.lifecycle.runtime.compose)
    implementation(libs.androidx.lifecycle.runtime.ktx)
    implementation(libs.androidx.lifecycle.process)

+    // serialization
    implementation(libs.kotlinx.serialization.json)

+    // ui
    implementation(libs.zxing.android.embedded)
    implementation(libs.material.icons.extended)

+    // bio
    implementation(libs.androidx.biometric.ktx)
    implementation(libs.pin.lock.compose)

+    // shortcuts
    implementation(libs.androidx.core)

+    // splash
    implementation(libs.androidx.core.splashscreen)

+    // worker
    implementation(libs.androidx.work.runtime)
    implementation(libs.androidx.hilt.work)
-
-    implementation(libs.qrcode.kotlin)
-    implementation(libs.semver4j)
-
-    implementation(libs.ktor.client.core)
-    implementation(libs.ktor.client.okhttp)
-    implementation(libs.ktor.client.cio)
-    implementation(libs.ktor.client.content.negotiation)
-    implementation(libs.ktor.serialization.kotlinx.json)
-    implementation(libs.slf4j.android)
 }

-tasks.register<Copy>("copyLicenseeJsonToAssets") {
-    dependsOn("licensee")
-    val outputAssets = layout.projectDirectory.dir("src/main/assets")
-    from(layout.buildDirectory.file("reports/licensee/androidFdroidRelease/artifacts.json")) {
-        rename("artifacts.json", "licenses.json")
+fun determineVersionName(): String {
+    return with(getBuildTaskName().lowercase()) {
+        when {
+            contains(Constants.NIGHTLY) || contains(Constants.PRERELEASE) ->
+                Constants.VERSION_NAME + "-${grgitService.service.get().grgit.head().abbreviatedId}"
+            else -> Constants.VERSION_NAME
+        }
    }
-    into(outputAssets)
 }

-tasks.named("preBuild") { dependsOn("copyLicenseeJsonToAssets") }
+val incrementVersionCode by
+    tasks.registering {
+        doLast {
+            val versionFile = file("$rootDir/versionCode.txt")
+            if (versionFile.exists()) {
+                versionFile.writeText(versionCodeIncrement.toString())
+                println("Incremented versionCode to $versionCodeIncrement")
+            }
+        }
+    }
+
+tasks.whenTaskAdded {
+    if (name.startsWith("assemble") && !name.lowercase().contains("debug")) {
+        dependsOn(incrementVersionCode)
+    }
+}
@@ -0,0 +1,42 @@
+-dontwarn com.google.errorprone.annotations.**
+
+-keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
+    <fields>;
+}
+
+# Keep all classes in the org.xbill.DNS package and subpackages
+-keep class org.xbill.DNS.** { *; }
+-dontwarn org.xbill.DNS.**
+
+# Preserve JNA classes if used (e.g., for IPHlpAPI on Windows)
+-keep class com.sun.jna.** { *; }
+-dontwarn com.sun.jna.**
+
+# Keep DNS resolver configuration classes that might be loaded dynamically
+-keep class org.xbill.DNS.config.** { *; }
+-dontwarn org.xbill.DNS.config.**
+
+-keep class org.xbill.DNS.** { *; }
+
+# Prevent optimization issues with native or reflection-based calls
+-dontoptimize
+-dontshrink
+# Uncomment the above if errors persist, but use sparingly as they’re broad
+
+# Suppress warnings about missing classes if not all features are used
+-dontwarn java.lang.management.**
+-dontwarn sun.nio.ch.**
+
+-dontwarn com.google.api.client.http.GenericUrl
+-dontwarn com.google.api.client.http.HttpHeaders
+-dontwarn com.google.api.client.http.HttpRequest
+-dontwarn com.google.api.client.http.HttpRequestFactory
+-dontwarn com.google.api.client.http.HttpResponse
+-dontwarn com.google.api.client.http.HttpTransport
+-dontwarn com.google.api.client.http.javanet.NetHttpTransport$Builder
+-dontwarn com.google.api.client.http.javanet.NetHttpTransport
+-dontwarn javax.lang.model.element.Modifier
+-dontwarn org.joda.time.Instant
+-dontwarn org.slf4j.impl.StaticLoggerBinder
+-dontwarn org.slf4j.impl.StaticMDCBinder
+-dontwarn org.slf4j.impl.StaticMarkerBinder
@@ -0,0 +1,61 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+-keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
+    <fields>;
+}
+
+# Keep all classes in the org.xbill.DNS package and subpackages
+-keep class org.xbill.DNS.** { *; }
+-dontwarn org.xbill.DNS.**
+
+# Preserve JNA classes if used (e.g., for IPHlpAPI on Windows)
+-keep class com.sun.jna.** { *; }
+-dontwarn com.sun.jna.**
+
+# Keep DNS resolver configuration classes that might be loaded dynamically
+-keep class org.xbill.DNS.config.** { *; }
+-dontwarn org.xbill.DNS.config.**
+
+-keep class org.xbill.DNS.** { *; }
+
+# Prevent optimization issues with native or reflection-based calls
+-dontoptimize
+-dontshrink
+# Uncomment the above if errors persist, but use sparingly as they’re broad
+
+# Suppress warnings about missing classes if not all features are used
+-dontwarn java.lang.management.**
+-dontwarn sun.nio.ch.**
+
+-dontwarn com.google.api.client.http.GenericUrl
+-dontwarn com.google.api.client.http.HttpHeaders
+-dontwarn com.google.api.client.http.HttpRequest
+-dontwarn com.google.api.client.http.HttpRequestFactory
+-dontwarn com.google.api.client.http.HttpResponse
+-dontwarn com.google.api.client.http.HttpTransport
+-dontwarn com.google.api.client.http.javanet.NetHttpTransport$Builder
+-dontwarn com.google.api.client.http.javanet.NetHttpTransport
+-dontwarn javax.lang.model.element.Modifier
+-dontwarn org.joda.time.Instant
+-dontwarn org.slf4j.impl.StaticLoggerBinder
+-dontwarn org.slf4j.impl.StaticMDCBinder
+-dontwarn org.slf4j.impl.StaticMarkerBinder
@@ -1,5 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Permissions specific to full -->
-    <!--updater-->
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-</manifest>
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">

-	<uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

    <!--foreground service exempt android 14-->
@@ -16,6 +16,7 @@
    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
    <!--start service on boot permission-->
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <!--android tv support-->

 	<permission
 		android:name="${applicationId}.permission.CONTROL_TUNNELS"
@@ -52,7 +53,7 @@
    <application
        android:name=".WireGuardAutoTunnel"
        android:allowBackup="false"
-        android:banner="@mipmap/ic_banner"
+        android:banner="@drawable/ic_banner"
        android:dataExtractionRules="@xml/data_extraction_rules"
        android:enableOnBackInvokedCallback="true"
        android:fullBackupContent="@xml/backup_rules"
@@ -113,7 +114,7 @@
        <service
            android:name=".core.service.tile.TunnelControlTile"
            android:exported="true"
-            android:icon="@drawable/ic_notification"
+            android:icon="@drawable/ic_launcher"
            android:label="@string/tunnel_control"
            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
            <meta-data
@@ -130,7 +131,7 @@
        <service
            android:name=".core.service.tile.AutoTunnelControlTile"
            android:exported="true"
-            android:icon="@drawable/ic_notification"
+            android:icon="@drawable/ic_launcher"
            android:label="@string/auto_tunnel"
            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
            <meta-data
@@ -169,8 +170,7 @@
            android:exported="false"
 			android:directBootAware="true">
            <intent-filter>
-				<action android:name="android.intent.action.SCREEN_ON" />
-				<action android:name="android.intent.action.USER_PRESENT" />
+                <category android:name="android.intent.category.DEFAULT" />
                <action android:name="android.intent.action.BOOT_COMPLETED" />
                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
@@ -5,6 +5,7 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Color
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
@@ -21,15 +22,33 @@ import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Bolt
+import androidx.compose.material.icons.rounded.Home
+import androidx.compose.material.icons.rounded.QuestionMark
 import androidx.compose.material.icons.rounded.Settings
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarData
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.runtime.CompositionLocalProvider
+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.Modifier
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
-import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.NavHost
@@ -43,15 +62,14 @@ import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.VpnDeniedDialog
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.CustomBottomNavbar
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.DynamicTopAppBar
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.currentNavBackStackEntryAsNavBarState
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.CustomSnackBar
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.navigation.components.BottomNavbar
-import com.zaneschepke.wireguardautotunnel.ui.navigation.components.DynamicTopAppBar
-import com.zaneschepke.wireguardautotunnel.ui.navigation.components.currentNavBackStackEntryAsNavBarState
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.AutoTunnelScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.advanced.AutoTunnelAdvancedScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.LocationDisclosureScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel.TunnelAutoTunnelScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigScreen
@@ -64,12 +82,12 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.settings.advanced.Settings
 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.disclosure.LocationDisclosureScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.KillSwitchScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.logs.LogsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.license.LicenseScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.support.logs.LogsScreen
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
-import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.goFromRoot
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 import dagger.hilt.android.AndroidEntryPoint
@@ -107,7 +125,6 @@ class MainActivity : AppCompatActivity() {
        }

        setContent {
-            val isTv = isRunningOnTv()
            val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
            val appViewState by viewModel.appViewState.collectAsStateWithLifecycle()

@@ -119,7 +136,6 @@ class MainActivity : AppCompatActivity() {
                    backStackEntry,
                    viewModel,
                    appUiState,
-                    appViewState,
                )
            val snackbar = remember { SnackbarHostState() }
            var showVpnPermissionDialog by remember { mutableStateOf(false) }
@@ -202,125 +218,153 @@ class MainActivity : AppCompatActivity() {
                        batteryActivity.launch(
                            Intent().apply {
                                action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
-                                data = "package:${this@MainActivity.packageName}".toUri()
+                                data = Uri.parse("package:${this@MainActivity.packageName}")
                            }
                        )
                    }
                }
            }

-            CompositionLocalProvider(LocalIsAndroidTV provides isTv) {
-                CompositionLocalProvider(LocalNavController provides navController) {
-                    WireguardAutoTunnelTheme(theme = appUiState.appState.theme) {
-                        VpnDeniedDialog(
-                            showVpnPermissionDialog,
-                            onDismiss = { showVpnPermissionDialog = false },
-                        )
+            CompositionLocalProvider(LocalNavController provides navController) {
+                WireguardAutoTunnelTheme(theme = appUiState.appState.theme) {
+                    VpnDeniedDialog(
+                        showVpnPermissionDialog,
+                        onDismiss = { showVpnPermissionDialog = false },
+                    )

-                        Scaffold(
-                            modifier =
-                                Modifier.pointerInput(Unit) {
-                                    detectTapGestures {
-                                        viewModel.handleEvent(AppEvent.ClearSelectedTunnels)
-                                    }
-                                },
-                            snackbarHost = {
-                                SnackbarHost(snackbar) { snackbarData: SnackbarData ->
-                                    CustomSnackBar(
-                                        snackbarData.visuals.message,
-                                        isRtl = false,
-                                        containerColor =
-                                            MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
-                                    )
+                    Scaffold(
+                        modifier =
+                            Modifier.pointerInput(Unit) {
+                                detectTapGestures {
+                                    viewModel.handleEvent(AppEvent.SetSelectedTunnel(null))
                                }
                            },
-                            topBar = { DynamicTopAppBar(navBarState) },
-                            bottomBar = {
-                                AnimatedVisibility(
-                                    visible = navBarState.showBottom,
-                                    enter = slideInVertically(initialOffsetY = { it }),
-                                    exit = slideOutVertically(targetOffsetY = { it }),
-                                ) {
-                                    BottomNavbar(appUiState = appUiState)
-                                }
-                            },
-                        ) { padding ->
-                            Box(
-                                modifier =
-                                    Modifier.fillMaxSize()
-                                        .background(MaterialTheme.colorScheme.surface)
-                                        .padding(padding)
-                                        .consumeWindowInsets(padding)
-                                        .imePadding()
+                        snackbarHost = {
+                            SnackbarHost(snackbar) { snackbarData: SnackbarData ->
+                                CustomSnackBar(
+                                    snackbarData.visuals.message,
+                                    isRtl = false,
+                                    containerColor =
+                                        MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
+                                )
+                            }
+                        },
+                        topBar = { DynamicTopAppBar(navBarState) },
+                        bottomBar = {
+                            AnimatedVisibility(
+                                visible = navBarState.showBottom,
+                                enter = slideInVertically(initialOffsetY = { it }),
+                                exit = slideOutVertically(targetOffsetY = { it }),
                            ) {
-                                NavHost(
-                                    navController,
-                                    startDestination =
-                                        (if (appUiState.appState.isPinLockEnabled) Route.Lock
-                                        else Route.Main),
-                                ) {
-                                    composable<Route.Main> {
-                                        MainScreen(appUiState, appViewState, viewModel)
-                                    }
-                                    composable<Route.Settings> {
-                                        SettingsScreen(appUiState, viewModel)
-                                    }
-                                    composable<Route.SettingsAdvanced> {
-                                        SettingsAdvancedScreen(appUiState, viewModel)
-                                    }
-                                    composable<Route.LocationDisclosure> {
-                                        LocationDisclosureScreen(appUiState, viewModel)
-                                    }
-                                    composable<Route.AutoTunnel> {
-                                        AutoTunnelScreen(appUiState, viewModel)
-                                    }
-                                    composable<Route.Appearance> { AppearanceScreen() }
-                                    composable<Route.Language> {
-                                        LanguageScreen(appUiState, viewModel)
-                                    }
-                                    composable<Route.Display> {
-                                        DisplayScreen(appUiState, viewModel)
-                                    }
-                                    composable<Route.Support> {
-                                        SupportScreen(appViewModel = viewModel)
-                                    }
-                                    composable<Route.License> { LicenseScreen() }
-                                    composable<Route.AutoTunnelAdvanced> {
-                                        AutoTunnelAdvancedScreen(appUiState, viewModel)
-                                    }
-                                    composable<Route.Logs> { LogsScreen(appViewState, viewModel) }
-                                    composable<Route.Config> { backStack ->
-                                        val args = backStack.toRoute<Route.Config>()
-                                        val config =
-                                            appUiState.tunnels.firstOrNull { it.id == args.id }
-                                        ConfigScreen(config, viewModel)
-                                    }
-                                    composable<Route.TunnelOptions> { backStack ->
-                                        val args = backStack.toRoute<Route.TunnelOptions>()
-                                        appUiState.tunnels
-                                            .firstOrNull { it.id == args.id }
-                                            ?.let { config ->
-                                                TunnelOptionsScreen(config, viewModel)
-                                            }
-                                    }
-                                    composable<Route.Lock> { PinLockScreen(viewModel) }
-                                    composable<Route.Scanner> { ScannerScreen(viewModel) }
-                                    composable<Route.KillSwitch> {
-                                        KillSwitchScreen(appUiState, viewModel)
-                                    }
-                                    composable<Route.SplitTunnel> { SplitTunnelScreen(viewModel) }
-                                    composable<Route.TunnelAutoTunnel> { backStack ->
-                                        val args = backStack.toRoute<Route.TunnelOptions>()
-                                        appUiState.tunnels
-                                            .firstOrNull { it.id == args.id }
-                                            ?.let {
-                                                TunnelAutoTunnelScreen(
-                                                    it,
-                                                    appUiState.appSettings,
-                                                    viewModel,
-                                                )
-                                            }
-                                    }
+                                CustomBottomNavbar(
+                                    listOf(
+                                        BottomNavItem(
+                                            name = stringResource(R.string.tunnels),
+                                            route = Route.Main,
+                                            icon = Icons.Rounded.Home,
+                                            onClick = { navController.goFromRoot(Route.Main) },
+                                        ),
+                                        BottomNavItem(
+                                            name = stringResource(R.string.auto_tunnel),
+                                            route = Route.AutoTunnel,
+                                            icon = Icons.Rounded.Bolt,
+                                            onClick = {
+                                                val route =
+                                                    if (
+                                                        appUiState.appState
+                                                            .isLocationDisclosureShown
+                                                    )
+                                                        Route.AutoTunnel
+                                                    else Route.LocationDisclosure
+                                                navController.goFromRoot(route)
+                                            },
+                                            active = appUiState.isAutoTunnelActive,
+                                        ),
+                                        BottomNavItem(
+                                            name = stringResource(R.string.settings),
+                                            route = Route.Settings,
+                                            icon = Icons.Rounded.Settings,
+                                            onClick = { navController.goFromRoot(Route.Settings) },
+                                        ),
+                                        BottomNavItem(
+                                            name = stringResource(R.string.support),
+                                            route = Route.Support,
+                                            icon = Icons.Rounded.QuestionMark,
+                                            onClick = { navController.goFromRoot(Route.Support) },
+                                        ),
+                                    ),
+                                    navBarState = navBarState,
+                                )
+                            }
+                        },
+                    ) { padding ->
+                        Box(
+                            modifier =
+                                Modifier.fillMaxSize()
+                                    .background(MaterialTheme.colorScheme.surface)
+                                    .padding(padding)
+                                    .consumeWindowInsets(padding)
+                                    .imePadding()
+                        ) {
+                            NavHost(
+                                navController,
+                                startDestination =
+                                    (if (appUiState.appState.isPinLockEnabled) Route.Lock
+                                    else Route.Main),
+                            ) {
+                                composable<Route.Main> {
+                                    MainScreen(appUiState, appViewState, viewModel)
+                                }
+                                composable<Route.Settings> {
+                                    SettingsScreen(appUiState, appViewState, viewModel)
+                                }
+                                composable<Route.SettingsAdvanced> {
+                                    SettingsAdvancedScreen(appUiState, viewModel)
+                                }
+                                composable<Route.LocationDisclosure> {
+                                    LocationDisclosureScreen(appUiState, viewModel)
+                                }
+                                composable<Route.AutoTunnel> {
+                                    AutoTunnelScreen(appUiState, viewModel)
+                                }
+                                composable<Route.Appearance> { AppearanceScreen() }
+                                composable<Route.Language> { LanguageScreen(appUiState, viewModel) }
+                                composable<Route.Display> { DisplayScreen(appUiState, viewModel) }
+                                composable<Route.Support> { SupportScreen() }
+                                composable<Route.AutoTunnelAdvanced> {
+                                    AutoTunnelAdvancedScreen(appUiState, viewModel)
+                                }
+                                composable<Route.Logs> { LogsScreen(appViewState, viewModel) }
+                                composable<Route.Config> { backStack ->
+                                    val args = backStack.toRoute<Route.Config>()
+                                    val config = appUiState.tunnels.firstOrNull { it.id == args.id }
+                                    ConfigScreen(config, viewModel)
+                                }
+                                composable<Route.TunnelOptions> { backStack ->
+                                    val args = backStack.toRoute<Route.TunnelOptions>()
+                                    appUiState.tunnels
+                                        .firstOrNull { it.id == args.id }
+                                        ?.let { config ->
+                                            TunnelOptionsScreen(config, appUiState, viewModel)
+                                        }
+                                }
+                                composable<Route.Lock> { PinLockScreen(viewModel) }
+                                composable<Route.Scanner> { ScannerScreen(viewModel) }
+                                composable<Route.KillSwitch> {
+                                    KillSwitchScreen(appUiState, viewModel)
+                                }
+                                composable<Route.SplitTunnel> { SplitTunnelScreen(viewModel) }
+                                composable<Route.TunnelAutoTunnel> { backStack ->
+                                    val args = backStack.toRoute<Route.TunnelOptions>()
+                                    appUiState.tunnels
+                                        .firstOrNull { it.id == args.id }
+                                        ?.let {
+                                            TunnelAutoTunnelScreen(
+                                                it,
+                                                appUiState.appSettings,
+                                                viewModel,
+                                            )
+                                        }
                                }
                            }
                        }
@@ -80,6 +80,9 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
        ServiceWorker.start(this)

        applicationScope.launch {
+            if (!appDataRepository.settings.get().isKernelEnabled) {
+                tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
+            }
            appDataRepository.appState.getLocale()?.let {
                withContext(mainDispatcher) { LocaleUtil.changeLocale(it) }
            }
@@ -91,7 +94,7 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {

    override fun onTerminate() {
        applicationScope.launch {
-            tunnelManager.setBackendState(BackendState.INACTIVE, emptyList())
+            tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
        }
        super.onTerminate()
    }
@@ -8,7 +8,6 @@ import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
@@ -30,10 +29,6 @@ class RestartReceiver : BroadcastReceiver() {

    override fun onReceive(context: Context, intent: Intent) {
        Timber.d("RestartReceiver triggered with action: ${intent.action}")
-        // screen on for Android TV only to help with sleep shutdowns
-        val isTv = context.isRunningOnTv()
-        if (intent.action == Intent.ACTION_SCREEN_ON && !isTv) return
-        if (intent.action == Intent.ACTION_USER_PRESENT && !isTv) return
        serviceManager.updateTunnelTile()
        serviceManager.updateAutoTunnelTile()
        applicationScope.launch(ioDispatcher) {
@@ -60,7 +60,7 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
                setOngoing(onGoing)
                setPriority(NotificationCompat.PRIORITY_HIGH)
                setShowWhen(showTimestamp)
-                setSmallIcon(R.drawable.ic_notification)
+                setSmallIcon(R.drawable.ic_launcher)
            }
            .build()
    }
@@ -102,7 +102,7 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
                PendingIntent.FLAG_IMMUTABLE,
            )
        return NotificationCompat.Action.Builder(
-                R.drawable.ic_notification,
+                R.drawable.ic_launcher,
                notificationAction.title(context).uppercase(),
                pendingIntent,
            )
@@ -17,7 +17,6 @@ import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.distinctByKeys
 import dagger.hilt.android.AndroidEntryPoint
@@ -37,8 +36,6 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import timber.log.Timber

@@ -60,9 +57,6 @@ class TunnelForegroundService : LifecycleService() {
    private val isNetworkConnected = MutableStateFlow(true)

    private val tunnelJobs = ConcurrentHashMap<TunnelConf, Job>()
-    private val pingJobs = ConcurrentHashMap<TunnelConf, Job>()
-
-    private val jobsMutex = Mutex()

    override fun onCreate() {
        super.onCreate()
@@ -94,85 +88,31 @@ class TunnelForegroundService : LifecycleService() {
    }

    fun start() =
-        lifecycleScope.launch(ioDispatcher) {
-            tunnelManager.activeTunnels.distinctByKeys().collect { activeTunnels ->
-                // No active tunnels and no jobs: nothing to do
-                if (activeTunnels.isEmpty() && tunnelJobs.isEmpty()) return@collect
-
-                // Synchronize jobs with active tunnels
-                synchronizeJobs(activeTunnels)
+        lifecycleScope.launch {
+            tunnelManager.activeTunnels.distinctByKeys().collect { tuns ->
+                if (tuns.isEmpty() && tunnelJobs.isEmpty()) return@collect
+                if (tuns.isEmpty() && tunnelJobs.isNotEmpty()) {
+                    return@collect tunnelJobs.forEach { (key, _) ->
+                        Timber.d("Stopping all tunnel jobs")
+                        tunnelJobs[key]?.cancel()
+                        tunnelJobs.remove(key)
+                    }
+                }
+                val (jobsToStop, jobsToStart) = findMissingKeys(tuns, tunnelJobs)
+                if (jobsToStop.isEmpty() && jobsToStart.isEmpty()) return@collect
+                jobsToStop.forEach { tun ->
+                    Timber.d("Stopping tunnel jobs for ${tun.tunName}")
+                    tunnelJobs[tun]?.cancel()
+                    tunnelJobs.remove(tun)
+                }
+                jobsToStart.forEach { tun ->
+                    Timber.d("Starting tunnel jobs for ${tun.tunName}")
+                    tunnelJobs += (tun to startTunnelJobs(tun))
+                }
                updateServiceNotification()
            }
        }

-    private suspend fun synchronizeJobs(activeTunnels: Map<TunnelConf, TunnelState>) {
-        jobsMutex.withLock {
-            // Stop jobs for tunnels that are no longer active
-            stopInactiveJobs(activeTunnels)
-            // Start jobs for new tunnels
-            startNewJobs(activeTunnels)
-        }
-    }
-
-    private fun stopInactiveJobs(activeTunnels: Map<TunnelConf, TunnelState>) {
-        // If no active tunnels, clear all jobs
-        if (activeTunnels.isEmpty()) {
-            clearAllJobs()
-            return
-        }
-        // Stop jobs for tunnels not in activeTunnels
-        val tunnelsToStop = tunnelJobs.keys - activeTunnels.keys
-        tunnelsToStop.forEach { tun -> stopTunnelJobs(tun) }
-    }
-
-    private fun clearAllJobs() {
-        tunnelJobs.forEach { (tun, job) ->
-            Timber.d("Stopping tunnel job for ${tun.tunName}")
-            job.cancel()
-        }
-        tunnelJobs.clear()
-
-        pingJobs.forEach { (tun, job) ->
-            if (isPingBounce(tun)) {
-                Timber.d("Preserving ping job for ${tun.tunName} due to PING bounce")
-                return@forEach
-            }
-            Timber.d("Stopping ping job for ${tun.tunName}")
-            job.cancel()
-        }
-        pingJobs.entries.removeIf { (tun, _) -> !isPingBounce(tun) }
-    }
-
-    private fun stopTunnelJobs(tun: TunnelConf) {
-        tunnelJobs.remove(tun)?.cancel()
-        Timber.d("Stopped tunnel job for ${tun.tunName}")
-        if (isPingBounce(tun))
-            return Timber.d("Preserving ${tun.tunName} ping job due to ping bounce")
-        pingJobs.remove(tun)?.cancel()
-        Timber.d("Stopped ping job for ${tun.tunName}")
-    }
-
-    private fun startNewJobs(activeTunnels: Map<TunnelConf, TunnelState>) {
-        val tunnelsToStart = activeTunnels.keys - tunnelJobs.keys
-        tunnelsToStart.forEach { tun ->
-            tunnelJobs[tun] = startTunnelJobs(tun)
-            Timber.d("Started tunnel job for ${tun.tunName}")
-
-            if (pingJobs[tun]?.isActive == true) {
-                Timber.d("Reusing active ping job for ${tun.tunName}")
-            } else {
-                pingJobs[tun]?.cancel() // Cancel any stale job
-                if (tun.isPingEnabled) {
-                    pingJobs[tun] = startPingJob(tun)
-                    Timber.d("Started ping job for ${tun.tunName}")
-                }
-            }
-        }
-    }
-
-    private fun isPingBounce(tun: TunnelConf): Boolean =
-        tunnelManager.bouncingTunnelIds[tun.id] == TunnelStatus.StopReason.PING
-
    // TODO Would be cool to have this include kill switch
    // TODO also we need to include errors
    private fun updateServiceNotification() {
@@ -192,15 +132,26 @@ class TunnelForegroundService : LifecycleService() {

    // use same scope so we can cancel all of these
    private fun startTunnelJobs(tunnelConf: TunnelConf) =
-        lifecycleScope.launch(ioDispatcher) {
+        lifecycleScope.launch {
            // monitor if we have internet connectivity
            launch { startNetworkMonitorJob() }
            // job to trigger stats emit on interval
            launch { startTunnelStatsJob(tunnelConf) }
            // monitor changes to the tunnel config
            launch { startTunnelConfChangesJob(tunnelConf) }
+            // monitor tunnel ping
+            launch { startPingJob(tunnelConf) }
        }

+    private fun findMissingKeys(
+        map1: Map<TunnelConf, Any>,
+        map2: Map<TunnelConf, Any>,
+    ): Pair<Set<TunnelConf>, Set<TunnelConf>> {
+        val missingMap1 = map2.keys - map1.keys
+        val missingMap2 = map1.keys - map2.keys
+        return missingMap1 to missingMap2
+    }
+
    private suspend fun startTunnelConfChangesJob(tunnelConf: TunnelConf) {
        tunnelRepo.flow
            .flowOn(ioDispatcher)
@@ -237,25 +188,24 @@ class TunnelForegroundService : LifecycleService() {
        }
    }

-    private fun startPingJob(tunnel: TunnelConf) =
-        lifecycleScope.launch(ioDispatcher) {
-            // delay for initial duration
-            delay(tunnel.pingInterval ?: Constants.PING_INTERVAL)
-            while (isActive) {
-                val shouldBounce = shouldBounceTunnel(tunnel)
-                val delayMs =
-                    if (shouldBounce) {
-                        // let this complete, even after cancel
-                        withContext(NonCancellable) {
-                            tunnelManager.bounceTunnel(tunnel, TunnelStatus.StopReason.PING)
-                        }
-                        tunnel.pingCooldown ?: Constants.PING_COOLDOWN
-                    } else {
-                        tunnel.pingInterval ?: Constants.PING_INTERVAL
+    // TODO fix cooldown
+    private suspend fun startPingJob(tunnel: TunnelConf) = coroutineScope {
+        delay(PING_START_DELAY)
+        while (isActive) {
+            val shouldBounce = shouldBounceTunnel(tunnel)
+            val delayMs =
+                if (shouldBounce) {
+                    // let this complete, even after cancel
+                    withContext(NonCancellable) {
+                        tunnelManager.bounceTunnel(tunnel, TunnelStatus.StopReason.PING)
                    }
-                delay(delayMs)
-            }
+                    tunnel.pingCooldown ?: Constants.PING_COOLDOWN
+                } else {
+                    tunnel.pingInterval ?: Constants.PING_INTERVAL
+                }
+            delay(delayMs)
        }
+    }

    private suspend fun shouldBounceTunnel(tunnel: TunnelConf): Boolean {
        if (!isNetworkConnected.value) {
@@ -313,10 +263,10 @@ class TunnelForegroundService : LifecycleService() {
    // TODO add notification handling and optional log reading for restart on handshake failures
    companion object {
        const val STATS_DELAY = 1_000L
+        const val PING_START_DELAY = 30_000L
        // ipv6 disabled or block on network
-        // Failed to send handshake initiation: write udp [::]"
-        // Failed to send data packets: write udp [::]
-        // Failed to send data packets: write udp 0.0.0.0:51820
-        // Handshake did not complete after 5 seconds, retrying
+        // 		const val userspaceStartFailed = "Failed to send handshake initiation: write udp [::]"
+        // 		const val ipv6Fails = "Failed to send data packets: write udp [::]"
+        // 		const val ipv4Fails = "Failed to send data packets: write udp 0.0.0.0:51820"
    }
 }
@@ -148,12 +148,11 @@ class TunnelControlTile : TileService(), LifecycleOwner {

    private fun setTileDescription(description: String) {
        runCatching {
-            if (qsTile == null) return@runCatching
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                qsTile.subtitle = description
+            }
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                qsTile.subtitle = description
                qsTile.stateDescription = description
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                qsTile.subtitle = description
            }
            qsTile.updateTile()
        }
@@ -1,6 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel

-import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Tunnel
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
@@ -11,11 +10,10 @@ import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
 import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.concurrent.thread
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
@@ -37,9 +35,8 @@ abstract class BaseTunnel(

    private val tunMutex = Mutex()
    private val tunStatusMutex = Mutex()
-    private val bounceTunnelMutex = Mutex()

-    override val bouncingTunnelIds = ConcurrentHashMap<Int, TunnelStatus.StopReason>()
+    private val isBouncing = AtomicBoolean(false)

    abstract suspend fun startBackend(tunnel: TunnelConf)

@@ -101,7 +98,7 @@ abstract class BaseTunnel(
                    is org.amnezia.awg.backend.Tunnel.State ->
                        updateTunnelStatus(tunnelConf, state.asTunnelState())
                }
-                handleServiceStateOnChange()
+                handleServiceChangesOnStop()
            }
            serviceManager.updateTunnelTile()
        }
@@ -114,10 +111,13 @@ abstract class BaseTunnel(

    override suspend fun startTunnel(tunnelConf: TunnelConf) {
        if (activeTuns.exists(tunnelConf.id) || tunThreads.containsKey(tunnelConf.id)) return
+        // stop active tunnels if we are userspace
        if (this@BaseTunnel is UserspaceTunnel) stopActiveTunnels()
        tunMutex.withLock {
-            tunThreads[tunnelConf.id] = thread {
-                runCatching {
+            // use thread to interrupt java backend if stuck (like in dns resolution)
+            tunThreads +=
+                tunnelConf.id to
+                    thread {
                        runBlocking {
                            try {
                                Timber.d("Starting tunnel ${tunnelConf.id}...")
@@ -127,32 +127,23 @@ abstract class BaseTunnel(
                                Timber.e(e, "Failed to start tunnel ${tunnelConf.name} userspace")
                                updateTunnelStatus(tunnelConf, TunnelStatus.Error(e))
                            } catch (e: InterruptedException) {
-                                Timber.w(
+                                Timber.i(
                                    "Tunnel start has been interrupted as ${tunnelConf.name} failed to start"
                                )
                            }
                        }
                    }
-                    .onFailure { Timber.w("Tunnel start has been interrupted") }
-            }
        }
    }

    private suspend fun startTunnelInner(tunnelConf: TunnelConf) {
        configureTunnelCallbacks(tunnelConf)
-        Timber.d("Starting  backend for tunnel ${tunnelConf.id}...")
-        try {
-            startBackend(tunnelConf)
-            updateTunnelStatus(tunnelConf, TunnelStatus.Up)
-            Timber.d("Started for tun ${tunnelConf.id}...")
-            saveTunnelActiveState(tunnelConf, true)
-            serviceManager.startTunnelForegroundService()
-        } catch (e: BackendException) {
-            Timber.e(e, "Failed to start backend for ${tunnelConf.name}")
-            val backendError = e.toBackendError()
-            updateTunnelStatus(tunnelConf, TunnelStatus.Error(backendError))
-            throw backendError
-        }
+        Timber.d("Started backend for tunnel ${tunnelConf.id}...")
+        startBackend(tunnelConf)
+        updateTunnelStatus(tunnelConf, TunnelStatus.Up)
+        Timber.d("DONE for tun ${tunnelConf.id}...")
+        saveTunnelActiveState(tunnelConf, true)
+        serviceManager.startTunnelForegroundService()
    }

    private suspend fun saveTunnelActiveState(tunnelConf: TunnelConf, active: Boolean) {
@@ -182,9 +173,9 @@ abstract class BaseTunnel(
        removeActiveTunnel(tunnel)
    }

-    private suspend fun handleServiceStateOnChange() {
-        if (activeTuns.value.isEmpty() && bouncingTunnelIds.isEmpty())
-            serviceManager.stopTunnelForegroundService()
+    private suspend fun handleServiceChangesOnStop() {
+        if (activeTuns.value.isEmpty() && !isBouncing.get())
+            return serviceManager.stopTunnelForegroundService()
    }

    private suspend fun handleStuckStartingTunnelShutdown(tunnel: TunnelConf) {
@@ -214,23 +205,11 @@ abstract class BaseTunnel(
    }

    override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
-        bounceTunnelMutex.withLock {
-            Timber.i(
-                "Bounce tunnel ${tunnelConf.name} for reason: $reason, current bouncing: ${bouncingTunnelIds.size}"
-            )
-            bouncingTunnelIds[tunnelConf.id] = reason
-            try {
-                stopTunnel(tunnelConf, reason)
-                delay(300L)
-                startTunnel(tunnelConf)
-            } finally {
-                bouncingTunnelIds.remove(tunnelConf.id)
-                handleServiceStateOnChange()
-                Timber.d(
-                    "Cleared bounce state for ${tunnelConf.name}, remaining: ${bouncingTunnelIds.size}"
-                )
-            }
-        }
+        Timber.i("Bounce tunnel ${tunnelConf.name}")
+        isBouncing.set(true)
+        stopTunnel(tunnelConf, reason)
+        startTunnel(tunnelConf)
+        isBouncing.set(false)
    }

    override suspend fun runningTunnelNames(): Set<String> =
@@ -9,7 +9,6 @@ import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
@@ -62,9 +61,6 @@ constructor(
                initialValue = emptyMap(),
            )

-    override val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason> =
-        tunnelProviderFlow.value.bouncingTunnelIds
-
    override fun hasVpnPermission(): Boolean {
        return userspaceTunnel.hasVpnPermission()
    }
@@ -82,11 +78,11 @@ constructor(
    }

    override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
-        tunnelProviderFlow.value.stopTunnel(tunnelConf, reason)
+        tunnelProviderFlow.value.stopTunnel(tunnelConf)
    }

    override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
-        tunnelProviderFlow.value.bounceTunnel(tunnelConf, reason)
+        tunnelProviderFlow.value.bounceTunnel(tunnelConf)
    }

    override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
@@ -5,32 +5,16 @@ import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import java.util.concurrent.ConcurrentHashMap
 import kotlinx.coroutines.flow.StateFlow

 interface TunnelProvider {
-    /** Starts the specified tunnel configuration. */
    suspend fun startTunnel(tunnelConf: TunnelConf)

-    /**
-     * Stops the specified tunnel, or all tunnels if none is provided.
-     *
-     * @param tunnelConf The tunnel to stop, or null to stop all active tunnels.
-     * @param reason The reason for stopping, defaults to USER for manual stops. Callers should
-     *   override with specific reasons (e.g., PING, CONFIG_CHANGED) when applicable.
-     */
    suspend fun stopTunnel(
        tunnelConf: TunnelConf? = null,
        reason: TunnelStatus.StopReason = TunnelStatus.StopReason.USER,
    )

-    /**
-     * Bounces (stops and restarts) the specified tunnel.
-     *
-     * @param tunnelConf The tunnel to bounce.
-     * @param reason The reason for bouncing, defaults to USER for manual actions. Callers should
-     *   override with specific reasons (e.g., PING, CONFIG_CHANGED) when applicable.
-     */
    suspend fun bounceTunnel(
        tunnelConf: TunnelConf,
        reason: TunnelStatus.StopReason = TunnelStatus.StopReason.USER,
@@ -46,8 +30,6 @@ interface TunnelProvider {

    val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>>

-    val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason>
-
    fun hasVpnPermission(): Boolean

    suspend fun clearError(tunnelConf: TunnelConf)
@@ -24,8 +24,9 @@ class DataStoreManager(
    companion object {
        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 expandedTunnelIds = stringPreferencesKey("EXPANDED_TUNNEL_IDS")
+        val tunnelStatsExpanded = booleanPreferencesKey("TUNNEL_STATS_EXPANDED")
        val isLocalLogsEnabled = booleanPreferencesKey("LOCAL_LOGS_ENABLED")
        val locale = stringPreferencesKey("LOCALE")
        val theme = stringPreferencesKey("THEME")
@@ -7,6 +7,7 @@ import timber.log.Timber
 class DatabaseCallback : RoomDatabase.Callback() {
    override fun onCreate(db: SupportSQLiteDatabase) =
        db.run {
+            // Notice non-ui thread is here
            beginTransaction()
            try {
                execSQL(Queries.createDefaultSettings())
@@ -1,10 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Asset(
-    val name: String,
-    @SerialName("browser_download_url") val browserDownloadUrl: String,
-)
@@ -7,7 +7,7 @@ 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 expandedTunnelIds: List<Int> = emptyList(),
+    val isTunnelStatsExpanded: Boolean = IS_TUNNEL_STATS_EXPANDED,
    val isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
    val isRemoteControlEnabled: Boolean = IS_REMOTE_CONTROL_ENABLED,
    val remoteKey: String? = null,
@@ -20,8 +20,8 @@ data class GeneralState(
            isLocationDisclosureShown,
            isBatteryOptimizationDisableShown,
            isPinLockEnabled,
-            expandedTunnelIds,
-            isLocalLogsEnabled,
+            isTunnelStatsExpanded,
+            isLocationDisclosureShown,
            isRemoteControlEnabled,
            remoteKey,
            locale,
@@ -35,7 +35,7 @@ data class GeneralState(
                    isLocationDisclosureShown,
                    isBatteryOptimizationDisableShown,
                    isPinLockEnabled,
-                    expandedTunnelIds,
+                    isTunnelStatsExpanded,
                    isLocalLogsEnabled,
                    isRemoteControlEnabled,
                    remoteKey,
@@ -48,6 +48,7 @@ data class GeneralState(
        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
        const val IS_REMOTE_CONTROL_ENABLED = false
    }
@@ -1,24 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.model
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppUpdate
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class GitHubRelease(
-    @SerialName("tag_name") val tagName: String,
-    val name: String?,
-    val body: String?,
-    val assets: List<Asset>,
-) {
-    fun toAppUpdate(): AppUpdate {
-        val apkAsset = assets.firstOrNull { it.name.endsWith(".apk") }
-        return AppUpdate(
-            version = tagName.removePrefix("v"),
-            title = name ?: "Update $tagName",
-            releaseNotes = body ?: "No release notes provided",
-            apkUrl = apkAsset?.browserDownloadUrl,
-            apkFileName = apkAsset?.name,
-        )
-    }
-}
@@ -1,9 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.network
-
-import com.zaneschepke.wireguardautotunnel.data.model.GitHubRelease
-
-interface GitHubApi {
-    suspend fun getLatestRelease(owner: String, repo: String): Result<GitHubRelease>
-
-    suspend fun getNightlyRelease(owner: String, repo: String): Result<GitHubRelease>
-}
@@ -1,28 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.network
-
-import io.ktor.client.HttpClient
-import io.ktor.client.engine.okhttp.OkHttp
-import io.ktor.client.plugins.HttpTimeout
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.serialization.kotlinx.json.json
-import kotlinx.serialization.json.Json
-
-object KtorClient {
-    fun create(): HttpClient {
-        return HttpClient(OkHttp) {
-            install(ContentNegotiation) {
-                json(
-                    Json {
-                        ignoreUnknownKeys = true
-                        isLenient = true
-                    }
-                )
-            }
-            install(HttpTimeout) {
-                requestTimeoutMillis = 15000
-                connectTimeoutMillis = 15000
-                socketTimeoutMillis = 15000
-            }
-        }
-    }
-}
@@ -1,56 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.network
-
-import com.zaneschepke.wireguardautotunnel.data.model.GitHubRelease
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.plugins.ClientRequestException
-import io.ktor.client.request.get
-import io.ktor.http.HttpStatusCode
-
-class KtorGitHubApi(private val client: HttpClient) : GitHubApi {
-    override suspend fun getLatestRelease(owner: String, repo: String): Result<GitHubRelease> {
-        return try {
-            val response: GitHubRelease =
-                client.get("https://api.github.com/repos/$owner/$repo/releases/latest").body()
-            Result.success(response)
-        } catch (e: ClientRequestException) {
-            when (e.response.status) {
-                HttpStatusCode.Forbidden -> Result.failure(Exception("Rate limit exceeded"))
-                HttpStatusCode.NotFound ->
-                    Result.failure(Exception("Repository or release not found"))
-                else -> Result.failure(e)
-            }
-        } catch (e: Exception) {
-            Result.failure(e)
-        }
-    }
-
-    override suspend fun getNightlyRelease(owner: String, repo: String): Result<GitHubRelease> {
-        return try {
-            // Fetch all releases
-            val releases: List<GitHubRelease> =
-                client.get("https://api.github.com/repos/$owner/$repo/releases").body()
-
-            // Find the first release with "nightly" in the tag_name (case-insensitive)
-            val nightlyRelease =
-                releases.firstOrNull { release ->
-                    release.tagName.contains("nightly", ignoreCase = true)
-                }
-
-            if (nightlyRelease != null) {
-                Result.success(nightlyRelease)
-            } else {
-                Result.failure(Exception("No release with 'nightly' tag found"))
-            }
-        } catch (e: ClientRequestException) {
-            when (e.response.status) {
-                HttpStatusCode.Forbidden -> Result.failure(Exception("Rate limit exceeded"))
-                HttpStatusCode.NotFound ->
-                    Result.failure(Exception("Repository or release not found"))
-                else -> Result.failure(e)
-            }
-        } catch (e: Exception) {
-            Result.failure(e)
-        }
-    }
-}
@@ -38,36 +38,13 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
        dataStoreManager.saveToDataStore(DataStoreManager.batteryDisableShown, shown)
    }

-    override suspend fun setTunnelExpanded(id: Int) {
-        val ids =
-            dataStoreManager
-                .getFromStore(DataStoreManager.expandedTunnelIds)
-                ?.split(",")
-                ?.mapNotNull { it.toIntOrNull() } ?: emptyList()
-
-        if (ids.contains(id)) return
-
-        val updatedList = ids.toMutableList().apply { add(id) }
-        dataStoreManager.saveToDataStore(
-            DataStoreManager.expandedTunnelIds,
-            updatedList.joinToString(","),
-        )
+    override suspend fun isTunnelStatsExpanded(): Boolean {
+        return dataStoreManager.getFromStore(DataStoreManager.tunnelStatsExpanded)
+            ?: GeneralState.IS_TUNNEL_STATS_EXPANDED
    }

-    override suspend fun removeTunnelExpanded(id: Int) {
-        val ids =
-            dataStoreManager
-                .getFromStore(DataStoreManager.expandedTunnelIds)
-                ?.split(",")
-                ?.mapNotNull { it.toIntOrNull() } ?: emptyList()
-
-        if (ids.isEmpty() || !ids.contains(id)) return
-
-        val updatedList = ids.toMutableList().apply { remove(id) }
-        dataStoreManager.saveToDataStore(
-            DataStoreManager.expandedTunnelIds,
-            updatedList.joinToString(","),
-        )
+    override suspend fun setTunnelStatsExpanded(expanded: Boolean) {
+        dataStoreManager.saveToDataStore(DataStoreManager.tunnelStatsExpanded, expanded)
    }

    override suspend fun setTheme(theme: Theme) {
@@ -133,10 +110,9 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
                            isPinLockEnabled =
                                pref[DataStoreManager.pinLockEnabled]
                                    ?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
-                            expandedTunnelIds =
-                                pref[DataStoreManager.expandedTunnelIds]?.split(",")?.mapNotNull {
-                                    it.toIntOrNull()
-                                } ?: emptyList(),
+                            isTunnelStatsExpanded =
+                                pref[DataStoreManager.tunnelStatsExpanded]
+                                    ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
                            isLocalLogsEnabled =
                                pref[DataStoreManager.isLocalLogsEnabled]
                                    ?: GeneralState.IS_LOGS_ENABLED_DEFAULT,
@@ -1,98 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import android.content.Context
-import com.zaneschepke.wireguardautotunnel.BuildConfig
-import com.zaneschepke.wireguardautotunnel.data.network.GitHubApi
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppUpdate
-import com.zaneschepke.wireguardautotunnel.domain.repository.UpdateRepository
-import com.zaneschepke.wireguardautotunnel.util.NumberUtils
-import io.ktor.client.HttpClient
-import io.ktor.client.request.get
-import io.ktor.client.statement.HttpResponse
-import io.ktor.client.statement.bodyAsChannel
-import io.ktor.http.contentLength
-import io.ktor.utils.io.ByteReadChannel
-import io.ktor.utils.io.readAvailable
-import java.io.File
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-
-class GitHubUpdateRepository(
-    private val gitHubApi: GitHubApi,
-    private val httpClient: HttpClient,
-    private val githubOwner: String,
-    private val githubRepo: String,
-    private val context: Context,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) : UpdateRepository {
-    override suspend fun checkForUpdate(currentVersion: String): Result<AppUpdate?> =
-        withContext(ioDispatcher) {
-            Timber.i("Checking for update")
-            val release =
-                if (BuildConfig.VERSION_NAME.contains("nightly")) {
-                    gitHubApi.getNightlyRelease(githubOwner, githubRepo)
-                } else {
-                    gitHubApi.getLatestRelease(githubOwner, githubRepo)
-                }
-            release.map { release ->
-                val apkAsset =
-                    release.assets.find { asset ->
-                        asset.name.startsWith("wgtunnel-full-v") && asset.name.endsWith(".apk")
-                    }
-                val newVersion =
-                    apkAsset?.name?.removePrefix("wgtunnel-full-v")?.removeSuffix(".apk")
-                        ?: return@map null
-
-                Timber.i("Latest version: $newVersion, current version: $currentVersion")
-                if (NumberUtils.compareVersions(newVersion, currentVersion) > 0) {
-                    release.toAppUpdate()
-                } else {
-                    null
-                }
-            }
-        }
-
-    override suspend fun downloadApk(
-        apkUrl: String,
-        fileName: String,
-        onProgress: (Float) -> Unit,
-    ): Result<File> =
-        withContext(ioDispatcher) {
-            try {
-                // clean up old files
-                context.getExternalFilesDir(null)?.listFiles()?.forEach { file ->
-                    if (file.extension == "apk") file.delete()
-                }
-
-                val response: HttpResponse = httpClient.get(apkUrl)
-
-                val apkFile = File(context.getExternalFilesDir(null), fileName)
-
-                val channel: ByteReadChannel = response.bodyAsChannel()
-                val totalBytes: Long = response.contentLength() ?: -1L
-                var bytesCopied = 0L
-
-                apkFile.outputStream().use { output ->
-                    val buffer = ByteArray(8 * 1024)
-
-                    while (!channel.isClosedForRead) {
-                        val bytesRead = channel.readAvailable(buffer)
-                        if (bytesRead <= 0) break
-                        output.write(buffer, 0, bytesRead)
-                        bytesCopied += bytesRead
-
-                        if (totalBytes > 0) {
-                            val progress = bytesCopied.toFloat() / totalBytes
-                            onProgress(progress.coerceIn(0f, 1f))
-                        }
-                    }
-                }
-
-                Result.success(apkFile)
-            } catch (e: Exception) {
-                Result.failure(e)
-            }
-        }
-}
@@ -8,25 +8,19 @@ import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.network.GitHubApi
-import com.zaneschepke.wireguardautotunnel.data.network.KtorClient
-import com.zaneschepke.wireguardautotunnel.data.network.KtorGitHubApi
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRoomRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.DataStoreAppStateRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.GitHubUpdateRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.RoomSettingsRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.RoomTunnelRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.UpdateRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import io.ktor.client.HttpClient
 import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineDispatcher

@@ -41,7 +35,7 @@ class RepositoryModule {
                AppDatabase::class.java,
                context.getString(R.string.db_name),
            )
-            .fallbackToDestructiveMigration(true)
+            .fallbackToDestructiveMigration()
            .addCallback(DatabaseCallback())
            .build()
    }
@@ -100,34 +94,4 @@ class RepositoryModule {
    ): AppDataRepository {
        return AppDataRoomRepository(settingsRepository, tunnelRepository, appStateRepository)
    }
-
-    @Provides
-    @Singleton
-    fun provideHttpClient(): HttpClient {
-        return KtorClient.create()
-    }
-
-    @Provides
-    @Singleton
-    fun provideGitHubApi(client: HttpClient): GitHubApi {
-        return KtorGitHubApi(client)
-    }
-
-    @Provides
-    @Singleton
-    fun provideUpdateRepository(
-        gitHubApi: GitHubApi,
-        client: HttpClient,
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
-        @ApplicationContext context: Context,
-    ): UpdateRepository {
-        return GitHubUpdateRepository(
-            gitHubApi,
-            client,
-            "wgtunnel",
-            "wgtunnel",
-            context,
-            ioDispatcher,
-        )
-    }
 }
@@ -6,7 +6,7 @@ data class AppState(
    val isLocationDisclosureShown: Boolean,
    val isBatteryOptimizationDisableShown: Boolean,
    val isPinLockEnabled: Boolean,
-    val expandedTunnelIds: List<Int>,
+    val isTunnelStatsExpanded: Boolean,
    val isLocalLogsEnabled: Boolean,
    val isRemoteControlEnabled: Boolean,
    val remoteKey: String?,
@@ -1,9 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.entity
-
-data class AppUpdate(
-    val version: String,
-    val title: String,
-    val releaseNotes: String,
-    val apkUrl: String?,
-    val apkFileName: String?,
-)
@@ -3,7 +3,11 @@ package com.zaneschepke.wireguardautotunnel.domain.entity
 import com.wireguard.android.backend.Tunnel
 import com.wireguard.config.Config
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.*
+import com.zaneschepke.wireguardautotunnel.util.extensions.defaultName
+import com.zaneschepke.wireguardautotunnel.util.extensions.extractNameAndNumber
+import com.zaneschepke.wireguardautotunnel.util.extensions.hasNumberInParentheses
+import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
+import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
 import java.io.InputStream
 import java.net.InetAddress
 import java.nio.charset.StandardCharsets
@@ -26,7 +30,6 @@ data class TunnelConf(
    val pingIp: String? = null,
    val isEthernetTunnel: Boolean = false,
    val isIpv4Preferred: Boolean = true,
-    val useCache: Boolean = false,
    @Transient private var stateChangeCallback: ((Any) -> Unit)? = null,
 ) : Tunnel, org.amnezia.awg.backend.Tunnel {

@@ -92,9 +95,21 @@ data class TunnelConf(
                isEthernetTunnel,
                isIpv4Preferred,
            )
-            .apply { stateChangeCallback = this@TunnelConf.stateChangeCallback }
+            .apply {
+                stateChangeCallback = this@TunnelConf.stateChangeCallback
+                // 			tunnelStatsCallback = this@TunnelConf.tunnelStatsCallback
+                // 			bounceTunnelCallback = this@TunnelConf.bounceTunnelCallback
+            }
    }

+    // 	fun onUpdateStatistics() {
+    // 		tunnelStatsCallback?.invoke()
+    // 	}
+    //
+    // 	fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
+    // 		bounceTunnelCallback?.invoke(tunnelConf, reason)
+    // 	}
+
    fun toAmConfig(): org.amnezia.awg.config.Config {
        return configFromAmQuick(amQuick.ifBlank { wgQuick })
    }
@@ -107,8 +122,6 @@ data class TunnelConf(

    override fun isIpv4ResolutionPreferred(): Boolean = isIpv4Preferred

-    override fun useCache(): Boolean = useCache
-
    override fun onStateChange(newState: org.amnezia.awg.backend.Tunnel.State) {
        stateChangeCallback?.invoke(newState)
    }
@@ -117,6 +130,12 @@ data class TunnelConf(
        stateChangeCallback?.invoke(newState)
    }

+    fun isTunnelConfigChanged(updatedConf: TunnelConf): Boolean {
+        return updatedConf.wgQuick != wgQuick ||
+            updatedConf.amQuick != amQuick ||
+            updatedConf.name != name
+    }
+
    fun generateUniqueName(tunnelNames: List<String>): String {
        var tunnelName = this.tunName
        var num = 1
@@ -17,9 +17,9 @@ interface AppStateRepository {

    suspend fun setBatteryOptimizationDisableShown(shown: Boolean)

-    suspend fun setTunnelExpanded(id: Int)
+    suspend fun isTunnelStatsExpanded(): Boolean

-    suspend fun removeTunnelExpanded(id: Int)
+    suspend fun setTunnelStatsExpanded(expanded: Boolean)

    suspend fun setTheme(theme: Theme)

@@ -1,14 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.repository
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppUpdate
-import java.io.File
-
-interface UpdateRepository {
-    suspend fun checkForUpdate(currentVersion: String): Result<AppUpdate?>
-
-    suspend fun downloadApk(
-        apkUrl: String,
-        fileName: String,
-        onProgress: (Float) -> Unit,
-    ): Result<File>
-}
@@ -31,8 +31,6 @@ sealed class Route {

    @Serializable data object Scanner : Route()

-    @Serializable data object License : Route()
-
    @Serializable data class Config(val id: Int) : Route()

    @Serializable
@@ -3,82 +3,48 @@ package com.zaneschepke.wireguardautotunnel.ui.common
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.indication
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.PressInteraction
-import androidx.compose.foundation.layout.*
+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.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-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.geometry.Offset
-import androidx.compose.ui.hapticfeedback.HapticFeedbackType
-import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV

@OptIn(ExperimentalFoundationApi::class)
@Composable
 fun ExpandingRowListItem(
    leading: @Composable () -> Unit,
    text: String,
-    onHold: () -> Unit,
+    onHold: () -> Unit = {},
    onClick: () -> Unit,
-    onDoubleClick: () -> Unit,
    trailing: @Composable () -> Unit,
-    isSelected: Boolean,
-    expanded: (@Composable () -> Unit)?,
+    isExpanded: Boolean,
+    expanded: @Composable () -> Unit = {},
 ) {
-    val isTv = LocalIsAndroidTV.current
-    val haptic = LocalHapticFeedback.current
-    val interactionSource = remember { MutableInteractionSource() }
-
    Box(
        modifier =
            Modifier.animateContentSize()
-                .clip(RoundedCornerShape(8.dp))
-                .then(
-                    if (!isTv) {
-                        Modifier.combinedClickable(
-                                onClick = onClick,
-                                onLongClick = {
-                                    haptic.performHapticFeedback(HapticFeedbackType.LongPress)
-                                    onHold()
-                                },
-                                onDoubleClick = onDoubleClick,
-                            )
-                            .indication(
-                                interactionSource = interactionSource,
-                                indication = ripple(),
-                            )
-                    } else Modifier
-                )
+                .clip(RoundedCornerShape(30.dp))
+                .combinedClickable(onClick = { onClick() }, onLongClick = { onHold() })
    ) {
-        LaunchedEffect(isSelected) {
-            if (isSelected) {
-                interactionSource.emit(PressInteraction.Press(Offset.Zero))
-            } else {
-                interactionSource.emit(
-                    PressInteraction.Release(PressInteraction.Press(Offset.Zero))
-                )
-            }
-        }
        Column {
            Row(
-                modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp),
+                modifier = Modifier.fillMaxWidth().padding(horizontal = 15.dp),
                verticalAlignment = Alignment.CenterVertically,
                horizontalArrangement = Arrangement.SpaceBetween,
            ) {
                Row(
                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(16.dp),
+                    horizontalArrangement = Arrangement.spacedBy(15.dp),
                    modifier = Modifier.fillMaxWidth(13 / 20f),
                ) {
                    leading()
@@ -92,7 +58,7 @@ fun ExpandingRowListItem(
                }
                trailing()
            }
-            expanded?.invoke()
+            if (isExpanded) expanded()
        }
    }
 }
@@ -1,16 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common
-
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun SectionDivider() {
-    HorizontalDivider(
-        color = MaterialTheme.colorScheme.outline.copy(0.30f),
-        modifier = Modifier.padding(horizontal = 12.dp),
-    )
-}
@@ -47,7 +47,7 @@ fun SelectionItemButton(
        Row(
            verticalAlignment = Alignment.CenterVertically,
            horizontalArrangement = Arrangement.Start,
-            modifier = Modifier.fillMaxSize().padding(horizontal = 12.dp),
+            modifier = Modifier.fillMaxSize().padding(end = 10.dp),
        ) {
            leading?.let { it() }
            Text(
@@ -3,25 +3,21 @@ package com.zaneschepke.wireguardautotunnel.ui.common.button.surface
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource

@Composable
-fun SelectionItemLabel(text: String, labelType: SelectionLabelType, modifier: Modifier = Modifier) {
-
-    val style =
-        when (labelType) {
-            SelectionLabelType.DESCRIPTION ->
-                MaterialTheme.typography.bodySmall.copy(color = MaterialTheme.colorScheme.outline)
-            SelectionLabelType.TITLE ->
-                MaterialTheme.typography.bodyMedium.copy(
-                    color = MaterialTheme.colorScheme.onSurface
-                )
-        }
-
-    Text(text = text, style = style, modifier = modifier)
-}
-
-enum class SelectionLabelType {
-    DESCRIPTION,
-    TITLE,
+fun SelectionItemLabel(
+    textResId: Int,
+    style: androidx.compose.ui.text.TextStyle = MaterialTheme.typography.bodyMedium,
+    isDescription: Boolean = false,
+) {
+    Text(
+        text = stringResource(textResId),
+        style =
+            style.copy(
+                color =
+                    if (isDescription) MaterialTheme.colorScheme.outline
+                    else MaterialTheme.colorScheme.onSurface
+            ),
+    )
 }
@@ -1,16 +1,22 @@
 package com.zaneschepke.wireguardautotunnel.ui.common.button.surface

 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+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.draw.clip
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize

@@ -21,17 +27,16 @@ fun SurfaceSelectionGroupButton(items: List<SelectionItem>) {
        shape = RoundedCornerShape(8.dp),
        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface),
    ) {
-        items.map { item ->
+        items.mapIndexed { index, item ->
            Box(
                contentAlignment = Alignment.Center,
                modifier =
-                    Modifier.fillMaxWidth()
-                        .clip(RoundedCornerShape(8.dp))
-                        .then(item.onClick?.let { Modifier.clickable { it() } } ?: Modifier),
+                    Modifier.then(item.onClick?.let { Modifier.clickable { it() } } ?: Modifier)
+                        .fillMaxWidth(),
            ) {
                Row(
                    verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp),
+                    modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp),
                ) {
                    Row(
                        verticalAlignment = Alignment.CenterVertically,
@@ -52,7 +57,6 @@ fun SurfaceSelectionGroupButton(items: List<SelectionItem>) {
                            modifier =
                                Modifier.fillMaxWidth()
                                    .padding(start = if (item.leadingIcon != null) 16.dp else 0.dp)
-                                    .weight(1f)
                                    .padding(
                                        vertical = if (item.description == null) 16.dp else 6.dp
                                    ),
@@ -64,13 +68,15 @@ fun SurfaceSelectionGroupButton(items: List<SelectionItem>) {
                    item.trailing?.let {
                        Box(
                            contentAlignment = Alignment.CenterEnd,
-                            modifier = Modifier.padding(start = 16.dp),
+                            modifier = Modifier.padding(start = 16.dp).weight(1f),
                        ) {
                            it()
                        }
                    }
                }
            }
+            if (index + 1 != items.size)
+                HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(0.30f))
        }
    }
 }
@@ -9,23 +9,21 @@ import androidx.activity.compose.ManagedActivityResultLauncher
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.Composable
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import timber.log.Timber
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv

@Composable
 fun rememberFileImportLauncherForResult(
    onNoFileExplorer: () -> Unit,
    onData: (data: Uri) -> Unit,
 ): ManagedActivityResultLauncher<String, Uri?> {
-    val isTv = LocalIsAndroidTV.current
    return rememberLauncherForActivityResult(
        object : ActivityResultContracts.GetContent() {
            override fun createIntent(context: Context, input: String): Intent {
                val intent =
                    super.createIntent(context, input).apply {
                        type =
-                            if (isTv) {
+                            if (context.isRunningOnTv()) {
                                Constants.ALLOWED_TV_FILE_TYPES
                            } else {
                                Constants.ALL_FILE_TYPES
@@ -65,43 +63,3 @@ fun rememberFileImportLauncherForResult(
        onData(data)
    }
 }
-
-@Composable
-fun rememberFileExportLauncherForResult(
-    mimeType: String = Constants.ZIP_FILE_MIME_TYPE,
-    onResult: (Uri?) -> Unit,
-): ManagedActivityResultLauncher<String, Uri?> {
-    val isTv = LocalIsAndroidTV.current
-    return rememberLauncherForActivityResult(
-        contract =
-            object : ActivityResultContracts.CreateDocument(mimeType) {
-                override fun createIntent(context: Context, input: String): Intent {
-                    super.createIntent(context, input)
-                    val intent =
-                        Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
-                            addCategory(Intent.CATEGORY_OPENABLE)
-                            type =
-                                if (isTv) {
-                                    Constants.ALLOWED_TV_FILE_TYPES
-                                } else {
-                                    mimeType
-                                }
-                            putExtra(Intent.EXTRA_TITLE, input)
-                        }
-
-                    Timber.d("Returning SAF intent for launch")
-                    return intent
-                }
-            }
-    ) { uri ->
-        Timber.d("SAF onResult called with Uri: $uri")
-        if (uri != null) {
-            Timber.d(
-                "Uri details: scheme=${uri.scheme}, authority=${uri.authority}, path=${uri.path}"
-            )
-        } else {
-            Timber.d("SAF picker canceled or failed to return a Uri")
-        }
-        onResult(uri)
-    }
-}
@@ -6,16 +6,11 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight

@Composable
-fun GroupLabel(title: String, modifier: Modifier = Modifier) {
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.Start,
-        modifier = modifier,
-    ) {
+fun GroupLabel(title: String) {
+    Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Start) {
        Text(
            title,
            style = MaterialTheme.typography.titleMedium,
@@ -0,0 +1,115 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.navigation
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.spring
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Badge
+import androidx.compose.material3.BadgedBox
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.ui.theme.SilverTree
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+
+@Composable
+fun BottomBarTabs(
+    tabs: List<BottomNavItem>,
+    selectedTabIndex: Int,
+    isChildRoute: Boolean,
+    onTabSelected: (BottomNavItem) -> Unit,
+) {
+    val context = LocalContext.current
+    val isRunningOnTv = remember { context.isRunningOnTv() }
+
+    Row(
+        modifier =
+            Modifier.fillMaxWidth().height(64.dp).padding(horizontal = 8.dp).padding(top = 12.dp),
+        horizontalArrangement = Arrangement.SpaceEvenly,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        tabs.forEachIndexed { index, tab ->
+            Column(
+                modifier =
+                    Modifier.weight(1f)
+                        .fillMaxHeight()
+                        .background(Color.Transparent)
+                        .then(
+                            if (isRunningOnTv) {
+                                Modifier.clickable {
+                                    if (index == selectedTabIndex && !isChildRoute) return@clickable
+                                    tab.onClick.invoke()
+                                    onTabSelected(tab)
+                                }
+                            } else {
+                                Modifier
+                            }
+                        )
+                        .pointerInput(Unit) {
+                            detectTapGestures {
+                                if (index == selectedTabIndex && !isChildRoute)
+                                    return@detectTapGestures
+                                tab.onClick.invoke()
+                                onTabSelected(tab)
+                            }
+                        },
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.Center,
+            ) {
+                val animatedColor by
+                    animateColorAsState(
+                        targetValue = MaterialTheme.colorScheme.primary,
+                        animationSpec = spring(stiffness = Spring.StiffnessLow),
+                        label = "animatedColor",
+                    )
+                val color =
+                    if (selectedTabIndex == index) animatedColor
+                    else MaterialTheme.colorScheme.onSurface
+
+                if (tab.active) {
+                    BadgedBox(
+                        badge = {
+                            Badge(
+                                modifier = Modifier.offset(x = 8.dp, y = ((-8).dp)).size(6.dp),
+                                containerColor = SilverTree,
+                            )
+                        }
+                    ) {
+                        Icon(
+                            imageVector = tab.icon,
+                            contentDescription = tab.name,
+                            tint = color,
+                            modifier = Modifier.size(24.dp),
+                        )
+                    }
+                } else {
+                    Icon(
+                        imageVector = tab.icon,
+                        contentDescription = tab.name,
+                        tint = color,
+                        modifier = Modifier.size(24.dp),
+                    )
+                }
+            }
+        }
+    }
+}
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.navigation
+package com.zaneschepke.wireguardautotunnel.ui.common.navigation

 import androidx.compose.ui.graphics.vector.ImageVector
 import com.zaneschepke.wireguardautotunnel.ui.Route
@@ -0,0 +1,121 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.navigation
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.RoundRect
+import androidx.compose.ui.geometry.toRect
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.PathEffect
+import androidx.compose.ui.graphics.PathMeasure
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.ui.Route
+
+@Composable
+fun CustomBottomNavbar(tabs: List<BottomNavItem>, navBarState: NavBarState) {
+    var selectedTabIndex by remember { mutableIntStateOf(0) }
+    var isChildRoute by remember { mutableStateOf(false) }
+
+    LaunchedEffect(tabs) {}
+    when (navBarState.route) {
+        Route.Main -> {
+            selectedTabIndex = 0
+            isChildRoute = false
+        }
+        Route.AutoTunnel -> {
+            selectedTabIndex = 1
+            isChildRoute = false
+        }
+        Route.Settings -> {
+            selectedTabIndex = 2
+            isChildRoute = false
+        }
+        Route.Support -> {
+            selectedTabIndex = 3
+            isChildRoute = false
+        }
+        else -> isChildRoute = true
+    }
+
+    val systemBars = WindowInsets.systemBars
+    val bottomPadding = with(LocalDensity.current) { systemBars.getBottom(this).toDp() }
+    val navHeight = 64.dp + bottomPadding
+
+    Box(modifier = Modifier.fillMaxWidth().height(navHeight).background(Color.Transparent)) {
+        BottomBarTabs(
+            tabs = tabs,
+            selectedTabIndex = selectedTabIndex,
+            isChildRoute = isChildRoute,
+            onTabSelected = { selectedTabIndex = tabs.indexOf(it) },
+        )
+
+        val animatedSelectedTabIndex by
+            animateFloatAsState(
+                targetValue = selectedTabIndex.toFloat(),
+                label = "animatedSelectedTabIndex",
+                animationSpec =
+                    spring(
+                        stiffness = Spring.StiffnessLow,
+                        dampingRatio = Spring.DampingRatioLowBouncy,
+                    ),
+            )
+
+        val animatedColor by
+            animateColorAsState(
+                targetValue = MaterialTheme.colorScheme.primary,
+                label = "animatedColor",
+                animationSpec = spring(stiffness = Spring.StiffnessLow),
+            )
+
+        Canvas(modifier = Modifier.fillMaxWidth().height(navHeight)) {
+            val path =
+                Path().apply { addRoundRect(RoundRect(size.toRect(), CornerRadius(size.height))) }
+            val length = PathMeasure().apply { setPath(path, false) }.length
+
+            val tabWidth = size.width / tabs.size
+            drawPath(
+                path,
+                brush =
+                    Brush.horizontalGradient(
+                        colors =
+                            listOf(
+                                animatedColor.copy(alpha = 0f),
+                                animatedColor.copy(alpha = 1f),
+                                animatedColor.copy(alpha = 1f),
+                                animatedColor.copy(alpha = 0f),
+                            ),
+                        startX = tabWidth * animatedSelectedTabIndex,
+                        endX = tabWidth * (animatedSelectedTabIndex + 1),
+                    ),
+                style =
+                    Stroke(
+                        width = 4f,
+                        pathEffect =
+                            PathEffect.dashPathEffect(intervals = floatArrayOf(length / 2, length)),
+                    ),
+            )
+        }
+    }
+}
@@ -1,6 +1,10 @@
-package com.zaneschepke.wireguardautotunnel.ui.navigation.components
+package com.zaneschepke.wireguardautotunnel.ui.common.navigation

-import androidx.compose.animation.*
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -10,7 +14,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.state.NavBarState

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -1,12 +1,9 @@
-package com.zaneschepke.wireguardautotunnel.ui.navigation
+package com.zaneschepke.wireguardautotunnel.ui.common.navigation

 import android.annotation.SuppressLint
-import androidx.compose.runtime.compositionLocalOf
-import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavDestination.Companion.hasRoute
 import androidx.navigation.NavDestination.Companion.hierarchy
-import androidx.navigation.NavHostController
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import kotlin.reflect.KClass

@@ -14,7 +11,3 @@ import kotlin.reflect.KClass
 fun <T : Route> NavBackStackEntry?.isCurrentRoute(cls: KClass<T>): Boolean {
    return this?.destination?.hierarchy?.any { it.hasRoute(route = cls) } == true
 }
-
-val LocalNavController =
-    compositionLocalOf<NavHostController> { error("NavController was not provided") }
-val LocalIsAndroidTV = staticCompositionLocalOf { false }
@@ -0,0 +1,7 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.navigation
+
+import androidx.compose.runtime.compositionLocalOf
+import androidx.navigation.NavHostController
+
+val LocalNavController =
+    compositionLocalOf<NavHostController> { error("NavController was not provided") }
@@ -1,18 +1,12 @@
-package com.zaneschepke.wireguardautotunnel.ui.navigation.components
+package com.zaneschepke.wireguardautotunnel.ui.common.navigation

-import android.os.Build
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Add
-import androidx.compose.material.icons.rounded.CopyAll
-import androidx.compose.material.icons.rounded.Delete
-import androidx.compose.material.icons.rounded.Download
 import androidx.compose.material.icons.rounded.Edit
 import androidx.compose.material.icons.rounded.Menu
 import androidx.compose.material.icons.rounded.PlayArrow
 import androidx.compose.material.icons.rounded.Save
-import androidx.compose.material.icons.rounded.SelectAll
 import androidx.compose.material.icons.rounded.Stop
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -21,126 +15,80 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.produceState
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavController
 import androidx.navigation.toRoute
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.navigation.isCurrentRoute
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
-import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
-import com.zaneschepke.wireguardautotunnel.ui.state.NavBarState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Brick
 import com.zaneschepke.wireguardautotunnel.ui.theme.SilverTree
 import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent

+data class NavBarState(
+    val showTop: Boolean = true,
+    val showBottom: Boolean = true,
+    val topTitle: @Composable (() -> Unit)? = null,
+    val topTrailing: @Composable (() -> Unit)? = null,
+    val route: Route? = null,
+)
+
@Composable
 fun currentNavBackStackEntryAsNavBarState(
    navController: NavController,
    backStackEntry: NavBackStackEntry?,
    viewModel: AppViewModel,
    uiState: AppUiState,
-    appViewState: AppViewState,
 ): State<NavBarState> {
-    fun isActiveSelected() =
-        uiState.activeTunnels.any { active ->
-            appViewState.selectedTunnels.any { it.id == active.key.id }
-        }
-
-    @Composable
-    fun ActionIconButton(icon: ImageVector, labelRes: Int, onClick: () -> Unit) {
-        IconButton(onClick = onClick) {
-            Icon(
-                icon,
-                contentDescription = stringResource(labelRes),
-                modifier = Modifier.size(iconSize),
-            )
-        }
-    }
-
-    @Composable
-    fun TunnelActionBar() {
-        val selectedCount = appViewState.selectedTunnels.size
-        val showDelete = !isActiveSelected()
-
-        Row {
-            if (selectedCount == 0) {
-                ActionIconButton(Icons.Rounded.Add, R.string.add_tunnel) {
-                    viewModel.handleEvent(
-                        AppEvent.SetBottomSheet(AppViewState.BottomSheet.IMPORT_TUNNELS)
-                    )
-                }
-            } else {
-                ActionIconButton(Icons.Rounded.SelectAll, R.string.select_all) {
-                    viewModel.handleEvent(AppEvent.ToggleSelectAllTunnels)
-                }
-                // due to permissions, and SAF issues on TV, not support less than Android 10 on
-                // Android TV for file exports
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    ActionIconButton(Icons.Rounded.Download, R.string.download) {
-                        viewModel.handleEvent(
-                            AppEvent.SetBottomSheet(AppViewState.BottomSheet.EXPORT_TUNNELS)
-                        )
-                    }
-                }
-
-                if (selectedCount == 1) {
-                    ActionIconButton(Icons.Rounded.CopyAll, R.string.copy) {
-                        viewModel.handleEvent(AppEvent.CopySelectedTunnel)
-                    }
-                }
-
-                if (showDelete) {
-                    ActionIconButton(Icons.Rounded.Delete, R.string.delete_tunnel) {
-                        viewModel.handleEvent(AppEvent.SetShowModal(AppViewState.ModalType.DELETE))
-                    }
-                }
-            }
-        }
-    }
-
-    return produceState(
-        initialValue = NavBarState(),
-        key1 = backStackEntry,
-        key2 = uiState,
-        key3 = appViewState,
-    ) {
+    return produceState(initialValue = NavBarState(), key1 = backStackEntry, key2 = uiState) {
        value =
            when {
                backStackEntry.isCurrentRoute(Route.Main::class) -> {
                    NavBarState(
                        showTop = true,
                        showBottom = true,
-                        topTitle = { Text(stringResource(R.string.tunnels)) },
-                        topTrailing = { TunnelActionBar() },
+                        { Text(stringResource(R.string.tunnels)) },
+                        {
+                            IconButton(
+                                onClick = { viewModel.handleEvent(AppEvent.ToggleBottomSheet) }
+                            ) {
+                                val icon = Icons.Rounded.Add
+                                Icon(
+                                    icon,
+                                    stringResource(R.string.add_tunnel),
+                                    modifier = Modifier.size(iconSize),
+                                )
+                            }
+                        },
                        route = Route.Main,
                    )
                }
-
                backStackEntry.isCurrentRoute(Route.AutoTunnel::class) -> {
-                    val (icon, label, tint) =
-                        if (uiState.appSettings.isAutoTunnelEnabled) {
-                            Triple(Icons.Rounded.Stop, R.string.stop_auto, Brick)
-                        } else {
-                            Triple(Icons.Rounded.PlayArrow, R.string.start_auto, SilverTree)
-                        }
-
                    NavBarState(
                        showTop = true,
                        showBottom = true,
-                        topTitle = { Text(stringResource(R.string.auto_tunnel)) },
-                        topTrailing = {
+                        { Text(stringResource(R.string.auto_tunnel)) },
+                        {
                            IconButton(
                                onClick = { viewModel.handleEvent(AppEvent.ToggleAutoTunnel) }
                            ) {
+                                val (icon, description, color) =
+                                    if (uiState.appSettings.isAutoTunnelEnabled) {
+                                        Triple(Icons.Rounded.Stop, R.string.stop_auto, Brick)
+                                    } else {
+                                        Triple(
+                                            Icons.Rounded.PlayArrow,
+                                            R.string.start_auto,
+                                            SilverTree,
+                                        )
+                                    }
                                Icon(
                                    icon,
-                                    stringResource(label),
-                                    tint = tint,
+                                    stringResource(description),
+                                    tint = color,
                                    modifier = Modifier.size(iconSize),
                                )
                            }
@@ -148,152 +96,175 @@ fun currentNavBackStackEntryAsNavBarState(
                        route = Route.AutoTunnel,
                    )
                }
-
+                backStackEntry.isCurrentRoute(Route.AutoTunnelAdvanced::class) ||
+                    backStackEntry.isCurrentRoute(Route.SettingsAdvanced::class) -> {
+                    NavBarState(
+                        showTop = true,
+                        showBottom = true,
+                        { Text(stringResource(R.string.advanced_settings)) },
+                        route = Route.AutoTunnelAdvanced,
+                    )
+                }
+                backStackEntry.isCurrentRoute(Route.Settings::class) -> {
+                    NavBarState(
+                        showTop = true,
+                        showBottom = true,
+                        { Text(stringResource(R.string.settings)) },
+                        {
+                            IconButton(
+                                onClick = { viewModel.handleEvent(AppEvent.ToggleBottomSheet) }
+                            ) {
+                                val icon = Icons.Rounded.Menu
+                                Icon(
+                                    icon,
+                                    stringResource(R.string.quick_actions),
+                                    modifier = Modifier.size(iconSize),
+                                )
+                            }
+                        },
+                        route = Route.Settings,
+                    )
+                }
+                backStackEntry.isCurrentRoute(Route.KillSwitch::class) -> {
+                    NavBarState(
+                        showTop = true,
+                        showBottom = true,
+                        { Text(stringResource(R.string.kill_switch)) },
+                        route = Route.KillSwitch,
+                    )
+                }
+                backStackEntry.isCurrentRoute(Route.Appearance::class) -> {
+                    NavBarState(
+                        showTop = true,
+                        showBottom = true,
+                        { Text(stringResource(R.string.appearance)) },
+                        route = Route.Appearance,
+                    )
+                }
+                backStackEntry.isCurrentRoute(Route.Language::class) -> {
+                    NavBarState(
+                        showTop = true,
+                        showBottom = true,
+                        { Text(stringResource(R.string.language)) },
+                        route = Route.Language,
+                    )
+                }
+                backStackEntry.isCurrentRoute(Route.Display::class) -> {
+                    NavBarState(
+                        showTop = true,
+                        showBottom = true,
+                        { Text(stringResource(R.string.display_theme)) },
+                        route = Route.Display,
+                    )
+                }
                backStackEntry.isCurrentRoute(Route.Logs::class) -> {
                    NavBarState(
                        showTop = true,
                        showBottom = false,
-                        topTitle = { Text(stringResource(R.string.logs)) },
-                        topTrailing = {
-                            ActionIconButton(Icons.Rounded.Menu, R.string.quick_actions) {
-                                viewModel.handleEvent(
-                                    AppEvent.SetBottomSheet(AppViewState.BottomSheet.LOGS)
+                        { Text(stringResource(R.string.logs)) },
+                        {
+                            IconButton(
+                                onClick = { viewModel.handleEvent(AppEvent.ToggleBottomSheet) }
+                            ) {
+                                val icon = Icons.Rounded.Menu
+                                Icon(
+                                    icon,
+                                    stringResource(R.string.quick_actions),
+                                    modifier = Modifier.size(iconSize),
                                )
                            }
                        },
                        route = Route.Logs,
                    )
                }
-
-                backStackEntry.isCurrentRoute(Route.Settings::class) ->
-                    NavBarState(
-                        showTop = true,
-                        showBottom = true,
-                        topTitle = { Text(stringResource(R.string.settings)) },
-                        route = Route.Settings,
-                    )
-
-                backStackEntry.isCurrentRoute(Route.Appearance::class) ->
-                    NavBarState(
-                        showTop = true,
-                        showBottom = true,
-                        topTitle = { Text(stringResource(R.string.appearance)) },
-                        route = Route.Appearance,
-                    )
-
-                backStackEntry.isCurrentRoute(Route.Language::class) ->
-                    NavBarState(
-                        showTop = true,
-                        showBottom = true,
-                        topTitle = { Text(stringResource(R.string.language)) },
-                        route = Route.Language,
-                    )
-
-                backStackEntry.isCurrentRoute(Route.Display::class) ->
-                    NavBarState(
-                        showTop = true,
-                        showBottom = true,
-                        topTitle = { Text(stringResource(R.string.display_theme)) },
-                        route = Route.Display,
-                    )
-
-                backStackEntry.isCurrentRoute(Route.KillSwitch::class) ->
-                    NavBarState(
-                        showTop = true,
-                        showBottom = true,
-                        topTitle = { Text(stringResource(R.string.kill_switch)) },
-                        route = Route.KillSwitch,
-                    )
-
-                backStackEntry.isCurrentRoute(Route.Support::class) ->
-                    NavBarState(
-                        showTop = true,
-                        showBottom = true,
-                        topTitle = { Text(stringResource(R.string.support)) },
-                        route = Route.Support,
-                    )
-
-                backStackEntry.isCurrentRoute(Route.License::class) -> {
-                    NavBarState(
-                        showTop = true,
-                        showBottom = true,
-                        topTitle = { Text(stringResource(R.string.licenses)) },
-                        route = Route.License,
-                    )
-                }
-
-                backStackEntry.isCurrentRoute(Route.AutoTunnelAdvanced::class) ||
-                    backStackEntry.isCurrentRoute(Route.SettingsAdvanced::class) ->
-                    NavBarState(
-                        showTop = true,
-                        showBottom = true,
-                        topTitle = { Text(stringResource(R.string.advanced_settings)) },
-                        route = Route.AutoTunnelAdvanced,
-                    )
-
                backStackEntry.isCurrentRoute(Route.TunnelOptions::class) -> {
                    val args = backStackEntry?.toRoute<Route.TunnelOptions>()
                    val tunnel = uiState.tunnels.find { it.id == args?.id }
-
                    NavBarState(
                        showTop = true,
                        showBottom = true,
-                        topTitle = { tunnel?.name?.let { Text(it) } },
-                        topTrailing = {
-                            ActionIconButton(Icons.Rounded.Edit, R.string.edit_tunnel) {
-                                tunnel?.id?.let { navController.navigate(Route.Config(it)) }
+                        { tunnel?.name?.let { Text(it) } },
+                        {
+                            IconButton(
+                                onClick = {
+                                    tunnel?.id?.let {
+                                        navController.navigate(Route.Config(id = it))
+                                    }
+                                }
+                            ) {
+                                val icon = Icons.Rounded.Edit
+                                Icon(
+                                    icon,
+                                    stringResource(R.string.edit_tunnel),
+                                    modifier = Modifier.size(iconSize),
+                                )
                            }
                        },
                        route = args?.let { Route.TunnelOptions(it.id) },
                    )
                }
-
                backStackEntry.isCurrentRoute(Route.SplitTunnel::class) -> {
                    val args = backStackEntry?.toRoute<Route.SplitTunnel>()
                    val name = uiState.tunnels.find { it.id == args?.id }?.name
-
                    NavBarState(
                        showTop = true,
                        showBottom = true,
-                        topTitle = { name?.let { Text(it) } },
-                        topTrailing = {
-                            ActionIconButton(Icons.Rounded.Save, R.string.save) {
-                                viewModel.handleEvent(AppEvent.InvokeScreenAction)
+                        { name?.let { Text(it) } },
+                        {
+                            IconButton(
+                                onClick = { viewModel.handleEvent(AppEvent.InvokeScreenAction) }
+                            ) {
+                                val icon = Icons.Rounded.Save
+                                Icon(
+                                    icon,
+                                    stringResource(R.string.save),
+                                    modifier = Modifier.size(iconSize),
+                                )
                            }
                        },
                        route = args?.let { Route.SplitTunnel(it.id) },
                    )
                }
-
                backStackEntry.isCurrentRoute(Route.Config::class) -> {
                    val args = backStackEntry?.toRoute<Route.Config>()
                    val name = uiState.tunnels.find { it.id == args?.id }?.name
-
                    NavBarState(
                        showTop = true,
                        showBottom = true,
-                        topTitle = { name?.let { Text(it) } },
-                        topTrailing = {
-                            ActionIconButton(Icons.Rounded.Save, R.string.save) {
-                                viewModel.handleEvent(AppEvent.InvokeScreenAction)
+                        { name?.let { Text(it) } },
+                        {
+                            IconButton(
+                                onClick = { viewModel.handleEvent(AppEvent.InvokeScreenAction) }
+                            ) {
+                                val icon = Icons.Rounded.Save
+                                Icon(
+                                    icon,
+                                    stringResource(R.string.save),
+                                    modifier = Modifier.size(iconSize),
+                                )
                            }
                        },
                        route = args?.let { Route.Config(it.id) },
                    )
                }
-
                backStackEntry.isCurrentRoute(Route.TunnelAutoTunnel::class) -> {
                    val args = backStackEntry?.toRoute<Route.TunnelAutoTunnel>()
                    val name = uiState.tunnels.find { it.id == args?.id }?.name
-
                    NavBarState(
                        showTop = true,
                        showBottom = true,
-                        topTitle = { name?.let { Text(it) } },
+                        { name?.let { Text(it) } },
                        route = args?.let { Route.TunnelAutoTunnel(it.id) },
                    )
                }
-
+                backStackEntry.isCurrentRoute(Route.Support::class) -> {
+                    NavBarState(
+                        showTop = true,
+                        showBottom = true,
+                        { Text(stringResource(R.string.support)) },
+                        route = Route.Support,
+                    )
+                }
                else -> NavBarState(showTop = false, showBottom = false)
            }
    }
@@ -19,10 +19,11 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv

@Composable
 fun CustomSnackBar(
@@ -30,10 +31,12 @@ fun CustomSnackBar(
    isRtl: Boolean = true,
    containerColor: Color = MaterialTheme.colorScheme.surface,
 ) {
-    val isTv = LocalIsAndroidTV.current
+    val context = LocalContext.current
    Snackbar(
        containerColor = containerColor,
-        modifier = Modifier.fillMaxWidth(if (isTv) 1 / 3f else 2 / 3f).padding(bottom = 100.dp),
+        modifier =
+            Modifier.fillMaxWidth(if (context.isRunningOnTv()) 1 / 3f else 2 / 3f)
+                .padding(bottom = 100.dp),
        shape = RoundedCornerShape(16.dp),
    ) {
        CompositionLocalProvider(
@@ -0,0 +1,7 @@
+package com.zaneschepke.wireguardautotunnel.ui.enums
+
+enum class InterfaceActions {
+    TOGGLE_AMNEZIA_VALUES,
+    SET_AMNEZIA_COMPATIBILITY,
+    TOGGLE_SHOW_SCRIPTS,
+}
@@ -0,0 +1,5 @@
+package com.zaneschepke.wireguardautotunnel.ui.enums
+
+enum class PeerActions {
+    EXCLUDE_LAN
+}
@@ -1,120 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.navigation.components
-
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.Bolt
-import androidx.compose.material.icons.rounded.Home
-import androidx.compose.material.icons.rounded.QuestionMark
-import androidx.compose.material.icons.rounded.Settings
-import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.navigation.compose.currentBackStackEntryAsState
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.navigation.BottomNavItem
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.navigation.isCurrentRoute
-import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
-import com.zaneschepke.wireguardautotunnel.ui.theme.SilverTree
-import com.zaneschepke.wireguardautotunnel.util.extensions.goFromRoot
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun BottomNavbar(appUiState: AppUiState) {
-    val navController = LocalNavController.current
-    val isTv = LocalIsAndroidTV.current
-    val navBackStackEntry by navController.currentBackStackEntryAsState()
-
-    val items =
-        listOf(
-            BottomNavItem(
-                name = stringResource(R.string.tunnels),
-                route = Route.Main,
-                icon = Icons.Rounded.Home,
-                onClick = { navController.goFromRoot(Route.Main) },
-            ),
-            BottomNavItem(
-                name = stringResource(R.string.auto_tunnel),
-                route = Route.AutoTunnel,
-                icon = Icons.Rounded.Bolt,
-                onClick = {
-                    val route =
-                        if (appUiState.appState.isLocationDisclosureShown) Route.AutoTunnel
-                        else Route.LocationDisclosure
-                    navController.goFromRoot(route)
-                },
-                active = appUiState.isAutoTunnelActive,
-            ),
-            BottomNavItem(
-                name = stringResource(R.string.settings),
-                route = Route.Settings,
-                icon = Icons.Rounded.Settings,
-                onClick = { navController.goFromRoot(Route.Settings) },
-            ),
-            BottomNavItem(
-                name = stringResource(R.string.support),
-                route = Route.Support,
-                icon = Icons.Rounded.QuestionMark,
-                onClick = { navController.goFromRoot(Route.Support) },
-            ),
-        )
-    // Define ripple configuration based on platform
-    val rippleConfiguration =
-        if (isTv) {
-            RippleConfiguration()
-        } else {
-            null
-        }
-
-    // Apply ripple configuration only if needed
-    CompositionLocalProvider(LocalRippleConfiguration provides rippleConfiguration) {
-        NavigationBar(containerColor = MaterialTheme.colorScheme.surface) {
-            items.forEach { item ->
-                val isSelected = navBackStackEntry.isCurrentRoute(item.route::class)
-                val interactionSource = remember { MutableInteractionSource() }
-
-                NavigationBarItem(
-                    icon = {
-                        if (item.active) {
-                            BadgedBox(
-                                badge = {
-                                    Badge(
-                                        modifier =
-                                            Modifier.offset(x = 8.dp, y = (-8).dp).size(6.dp),
-                                        containerColor = SilverTree,
-                                    )
-                                }
-                            ) {
-                                Icon(imageVector = item.icon, contentDescription = item.name)
-                            }
-                        } else {
-                            Icon(imageVector = item.icon, contentDescription = item.name)
-                        }
-                    },
-                    onClick = { navController.goFromRoot(item.route) },
-                    selected = isSelected,
-                    enabled = true,
-                    label = null,
-                    alwaysShowLabel = false,
-                    colors =
-                        NavigationBarItemDefaults.colors(
-                            selectedIconColor = MaterialTheme.colorScheme.primary,
-                            unselectedIconColor = MaterialTheme.colorScheme.onBackground,
-                            indicatorColor = Color.Transparent,
-                        ),
-                    interactionSource = interactionSource,
-                )
-            }
-        }
-    }
-}
@@ -22,10 +22,8 @@ import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.SectionDivider
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.components.AdvancedSettingsItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.components.NetworkTunnelingItems
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.components.WifiTunnelingItems
@@ -33,6 +31,7 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.Backgr
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.LocationServicesDialog
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.util.extensions.isLocationServicesEnabled
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel

@OptIn(ExperimentalPermissionsApi::class)
@@ -40,7 +39,6 @@ import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 fun AutoTunnelScreen(uiState: AppUiState, viewModel: AppViewModel) {
    val context = LocalContext.current
    val navController = LocalNavController.current
-    val isTv = LocalIsAndroidTV.current
    val fineLocationState = rememberPermissionState(Manifest.permission.ACCESS_FINE_LOCATION)
    var currentText by remember { mutableStateOf("") }
    var isBackgroundLocationGranted by remember { mutableStateOf(true) }
@@ -67,11 +65,12 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AppViewModel) {

    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) checkFineLocationGranted()
    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-        if (isTv && 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
        }
    }

@@ -91,12 +90,12 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AppViewModel) {

    Column(
        horizontalAlignment = Alignment.Start,
-        verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
+        verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
        modifier =
            Modifier.fillMaxSize()
                .verticalScroll(rememberScrollState())
                .padding(vertical = 24.dp)
-                .padding(horizontal = 12.dp),
+                .padding(horizontal = 24.dp),
    ) {
        SurfaceSelectionGroupButton(
            items =
@@ -108,9 +107,7 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AppViewModel) {
                    { isWifiNameReadable() },
                )
        )
-        SectionDivider()
        SurfaceSelectionGroupButton(items = NetworkTunnelingItems(uiState, viewModel))
-        SectionDivider()
        SurfaceSelectionGroupButton(
            items =
                listOf(
@@ -18,12 +18,12 @@ import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 fun AutoTunnelAdvancedScreen(appUiState: AppUiState, viewModel: AppViewModel) {
    Column(
        horizontalAlignment = Alignment.Start,
-        verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
+        verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
        modifier =
            Modifier.fillMaxSize()
                .verticalScroll(rememberScrollState())
-                .padding(vertical = 24.dp)
-                .padding(horizontal = 12.dp),
+                .padding(top = 24.dp)
+                .padding(horizontal = 24.dp),
    ) {
        DebounceDelaySelector(
            currentDelay = appUiState.appSettings.debounceDelaySeconds,
@@ -20,6 +20,7 @@ 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
@@ -27,7 +28,7 @@ import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ClickableIconButton
 import com.zaneschepke.wireguardautotunnel.ui.common.textbox.CustomTextField
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv

@OptIn(ExperimentalLayoutApi::class)
@Composable
@@ -39,7 +40,7 @@ fun TrustedNetworkTextBox(
    onValueChange: (network: String) -> Unit,
    supporting: @Composable () -> Unit,
 ) {
-    val isTv = LocalIsAndroidTV.current
+    val context = LocalContext.current
    Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
        FlowRow(
            modifier = Modifier.fillMaxWidth(),
@@ -48,7 +49,7 @@ fun TrustedNetworkTextBox(
            trustedNetworks.forEach { ssid ->
                ClickableIconButton(
                    onClick = {
-                        if (isTv) {
+                        if (context.isRunningOnTv()) {
                            onDelete(ssid)
                        }
                    },
@@ -5,7 +5,11 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
-import androidx.compose.runtime.*
+import androidx.compose.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.Modifier
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.res.stringResource
@@ -14,8 +18,7 @@ import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
 import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberFileImportLauncherForResult
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.ExportTunnelsBottomSheet
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelImportSheet
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelList
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.UrlImportDialog
@@ -31,6 +34,7 @@ fun MainScreen(appUiState: AppUiState, appViewState: AppViewState, viewModel: Ap
    val navController = LocalNavController.current
    val clipboard = LocalClipboardManager.current

+    var showDeleteTunnelAlertDialog by remember { mutableStateOf(false) }
    var showUrlImportDialog by remember { mutableStateOf(false) }

    val tunnelFileImportResultLauncher =
@@ -59,14 +63,13 @@ fun MainScreen(appUiState: AppUiState, appViewState: AppViewState, viewModel: Ap
            navController.navigate(Route.Scanner)
        }

-    if (appViewState.showModal == AppViewState.ModalType.DELETE) {
+    if (showDeleteTunnelAlertDialog && appViewState.selectedTunnel != null) {
        InfoDialog(
-            onDismiss = {
-                viewModel.handleEvent(AppEvent.SetShowModal(AppViewState.ModalType.NONE))
-            },
+            onDismiss = { showDeleteTunnelAlertDialog = false },
            onAttest = {
-                viewModel.handleEvent(AppEvent.DeleteSelectedTunnels)
-                viewModel.handleEvent(AppEvent.SetShowModal(AppViewState.ModalType.NONE))
+                appViewState.selectedTunnel.let { viewModel.handleEvent(AppEvent.DeleteTunnel(it)) }
+                showDeleteTunnelAlertDialog = false
+                viewModel.handleEvent(AppEvent.SetSelectedTunnel(null))
            },
            title = { Text(text = stringResource(R.string.delete_tunnel)) },
            body = { Text(text = stringResource(R.string.delete_tunnel_message)) },
@@ -74,34 +77,21 @@ fun MainScreen(appUiState: AppUiState, appViewState: AppViewState, viewModel: Ap
        )
    }

-    when (appViewState.bottomSheet) {
-        AppViewState.BottomSheet.EXPORT_TUNNELS -> {
-            ExportTunnelsBottomSheet(viewModel)
-        }
-        AppViewState.BottomSheet.IMPORT_TUNNELS -> {
-            TunnelImportSheet(
-                onDismiss = {
-                    viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
-                },
-                onFileClick = {
-                    tunnelFileImportResultLauncher.launch(Constants.ALLOWED_TV_FILE_TYPES)
-                },
-                onQrClick = {
-                    requestPermissionLauncher.launch(android.Manifest.permission.CAMERA)
-                },
-                onClipboardClick = {
-                    clipboard.getText()?.text?.let {
-                        viewModel.handleEvent(AppEvent.ImportTunnelFromClipboard(it))
-                    }
-                },
-                onManualImportClick = {
-                    navController.navigate(Route.Config(Constants.MANUAL_TUNNEL_CONFIG_ID))
-                },
-                onUrlClick = { showUrlImportDialog = true },
-            )
-        }
-        else -> Unit
-    }
+    TunnelImportSheet(
+        appViewState.showBottomSheet,
+        onDismiss = { viewModel.handleEvent(AppEvent.ToggleBottomSheet) },
+        onFileClick = { tunnelFileImportResultLauncher.launch(Constants.ALLOWED_TV_FILE_TYPES) },
+        onQrClick = { requestPermissionLauncher.launch(android.Manifest.permission.CAMERA) },
+        onClipboardClick = {
+            clipboard.getText()?.text?.let {
+                viewModel.handleEvent(AppEvent.ImportTunnelFromClipboard(it))
+            }
+        },
+        onManualImportClick = {
+            navController.navigate(Route.Config(Constants.MANUAL_TUNNEL_CONFIG_ID))
+        },
+        onUrlClick = { showUrlImportDialog = true },
+    )

    if (showUrlImportDialog) {
        UrlImportDialog(
@@ -115,12 +105,24 @@ fun MainScreen(appUiState: AppUiState, appViewState: AppViewState, viewModel: Ap

    TunnelList(
        appUiState = appUiState,
-        selectedTunnels = appViewState.selectedTunnels,
+        activeTunnels = appUiState.activeTunnels,
+        selectedTunnel = appViewState.selectedTunnel,
+        onSetSelectedTunnel = { viewModel.handleEvent(AppEvent.SetSelectedTunnel(it)) },
+        onDeleteTunnel = {
+            viewModel.handleEvent(AppEvent.SetSelectedTunnel(it))
+            showDeleteTunnelAlertDialog = true
+        },
        onToggleTunnel = { tunnel, checked ->
            if (checked) viewModel.handleEvent(AppEvent.StartTunnel(tunnel))
            else viewModel.handleEvent(AppEvent.StopTunnel(tunnel))
        },
-        modifier = Modifier.fillMaxSize().padding(vertical = 24.dp).padding(horizontal = 12.dp),
+        onExpandStats = { viewModel.handleEvent(AppEvent.ToggleTunnelStatsExpanded) },
+        onCopyTunnel = {
+            viewModel.handleEvent(AppEvent.CopyTunnel(it))
+            viewModel.handleEvent(AppEvent.SetSelectedTunnel(null))
+        },
+        modifier =
+            Modifier.fillMaxSize().padding(top = 12.dp, bottom = 24.dp).padding(horizontal = 12.dp),
        viewModel = viewModel,
    )
 }
@@ -35,12 +35,12 @@ fun TunnelAutoTunnelScreen(

    Column(
        horizontalAlignment = Alignment.Start,
-        verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
+        verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
        modifier =
            Modifier.fillMaxSize()
                .verticalScroll(rememberScrollState())
-                .padding(vertical = 24.dp)
-                .padding(horizontal = 12.dp),
+                .padding(top = 24.dp)
+                .padding(horizontal = 24.dp),
    ) {
        SurfaceSelectionGroupButton(
            items =
@@ -1,130 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.FolderZip
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalBottomSheet
-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.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.enums.ConfigType
-import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberFileExportLauncherForResult
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.AuthorizationPromptWrapper
-import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.hasSAFSupport
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun ExportTunnelsBottomSheet(viewModel: AppViewModel) {
-    val context = LocalContext.current
-    val isTv = LocalIsAndroidTV.current
-
-    var exportConfigType by remember { mutableStateOf(ConfigType.WG) }
-    var showAuthPrompt by remember { mutableStateOf(false) }
-    var isAuthorized by remember { mutableStateOf(false) }
-    var shouldExport by remember { mutableStateOf(false) }
-
-    val selectedTunnelsExportLauncher =
-        rememberFileExportLauncherForResult(
-            mimeType = Constants.ZIP_FILE_MIME_TYPE,
-            onResult = { file ->
-                if (file != null) {
-                    viewModel.handleEvent(AppEvent.ExportSelectedTunnels(exportConfigType, file))
-                } else {
-                    viewModel.handleEvent(AppEvent.ClearSelectedTunnels)
-                    viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
-                }
-            },
-        )
-
-    fun handleFileExport() {
-        if (context.hasSAFSupport(Constants.ZIP_FILE_MIME_TYPE)) {
-            selectedTunnelsExportLauncher.launch(Constants.DEFAULT_EXPORT_FILE_NAME)
-        } else {
-            viewModel.handleEvent(AppEvent.ExportSelectedTunnels(exportConfigType, null))
-        }
-    }
-
-    LaunchedEffect(shouldExport) {
-        if (shouldExport) {
-            handleFileExport()
-            shouldExport = false
-        }
-    }
-
-    if (showAuthPrompt) {
-        AuthorizationPromptWrapper(
-            onDismiss = { showAuthPrompt = false },
-            onSuccess = {
-                showAuthPrompt = false
-                isAuthorized = true
-                shouldExport = true
-            },
-            viewModel = viewModel,
-        )
-    }
-
-    ModalBottomSheet(
-        containerColor = MaterialTheme.colorScheme.surface,
-        onDismissRequest = {
-            viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
-        },
-    ) {
-        ExportOptionRow(
-            label = stringResource(R.string.export_tunnels_amnezia),
-            onClick = {
-                exportConfigType = ConfigType.AMNEZIA
-                if (!isAuthorized && !isTv) {
-                    showAuthPrompt = true
-                } else {
-                    shouldExport = true
-                }
-            },
-        )
-        HorizontalDivider()
-
-        ExportOptionRow(
-            label = stringResource(R.string.export_tunnels_wireguard),
-            onClick = {
-                exportConfigType = ConfigType.WG
-                if (!isAuthorized && !isTv) {
-                    showAuthPrompt = true
-                } else {
-                    shouldExport = true
-                }
-            },
-        )
-    }
-}
-
-@Composable
-private fun ExportOptionRow(label: String, onClick: () -> Unit) {
-    Row(modifier = Modifier.fillMaxWidth().clickable(onClick = onClick).padding(10.dp)) {
-        Icon(
-            imageVector = Icons.Filled.FolderZip,
-            contentDescription = label,
-            modifier = Modifier.padding(10.dp),
-        )
-        Text(text = label, modifier = Modifier.padding(10.dp))
-    }
-}
@@ -23,12 +23,13 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
+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,
@@ -36,49 +37,72 @@ fun TunnelImportSheet(
    onClipboardClick: () -> Unit,
    onUrlClick: () -> Unit,
 ) {
-    val isTv = LocalIsAndroidTV.current
-
    val sheetState = rememberModalBottomSheetState()

    val context = LocalContext.current
-    ModalBottomSheet(
-        containerColor = MaterialTheme.colorScheme.surface,
-        onDismissRequest = { onDismiss() },
-        sheetState = sheetState,
-    ) {
-        Row(
-            modifier =
-                Modifier.fillMaxWidth()
-                    .clickable {
-                        onDismiss()
-                        onFileClick()
-                    }
-                    .padding(10.dp)
+    if (show) {
+        ModalBottomSheet(
+            containerColor = MaterialTheme.colorScheme.surface,
+            onDismissRequest = { onDismiss() },
+            sheetState = sheetState,
        ) {
-            Icon(
-                Icons.Filled.FileOpen,
-                contentDescription = stringResource(id = R.string.open_file),
-                modifier = Modifier.padding(10.dp),
-            )
-            Text(stringResource(id = R.string.add_tunnels_text), modifier = Modifier.padding(10.dp))
-        }
-        if (!isTv) {
-            HorizontalDivider()
            Row(
                modifier =
                    Modifier.fillMaxWidth()
                        .clickable {
                            onDismiss()
-                            onQrClick()
+                            onFileClick()
                        }
                        .padding(10.dp)
            ) {
                Icon(
-                    Icons.Filled.QrCode,
-                    contentDescription = stringResource(id = R.string.qr_scan),
+                    Icons.Filled.FileOpen,
+                    contentDescription = stringResource(id = R.string.open_file),
                    modifier = Modifier.padding(10.dp),
                )
-                Text(stringResource(id = R.string.add_from_qr), modifier = Modifier.padding(10.dp))
+                Text(
+                    stringResource(id = R.string.add_tunnels_text),
+                    modifier = Modifier.padding(10.dp),
+                )
+            }
+            if (!context.isRunningOnTv()) {
+                HorizontalDivider()
+                Row(
+                    modifier =
+                        Modifier.fillMaxWidth()
+                            .clickable {
+                                onDismiss()
+                                onQrClick()
+                            }
+                            .padding(10.dp)
+                ) {
+                    Icon(
+                        Icons.Filled.QrCode,
+                        contentDescription = stringResource(id = R.string.qr_scan),
+                        modifier = Modifier.padding(10.dp),
+                    )
+                    Text(
+                        stringResource(id = R.string.add_from_qr),
+                        modifier = Modifier.padding(10.dp),
+                    )
+                }
+                HorizontalDivider()
+                Row(
+                    modifier =
+                        Modifier.fillMaxWidth()
+                            .clickable {
+                                onDismiss()
+                                onClipboardClick()
+                            }
+                            .padding(10.dp)
+                ) {
+                    val icon = Icons.Filled.ContentPasteGo
+                    Icon(icon, contentDescription = icon.name, modifier = Modifier.padding(10.dp))
+                    Text(
+                        stringResource(id = R.string.add_from_clipboard),
+                        modifier = Modifier.padding(10.dp),
+                    )
+                }
            }
            HorizontalDivider()
            Row(
@@ -86,51 +110,37 @@ fun TunnelImportSheet(
                    Modifier.fillMaxWidth()
                        .clickable {
                            onDismiss()
-                            onClipboardClick()
+                            onUrlClick()
                        }
                        .padding(10.dp)
            ) {
-                val icon = Icons.Filled.ContentPasteGo
-                Icon(icon, contentDescription = icon.name, modifier = Modifier.padding(10.dp))
+                Icon(
+                    Icons.Filled.Link,
+                    contentDescription = stringResource(id = R.string.add_from_url),
+                    modifier = Modifier.padding(10.dp),
+                )
+                Text(stringResource(id = R.string.add_from_url), modifier = Modifier.padding(10.dp))
+            }
+            HorizontalDivider()
+            Row(
+                modifier =
+                    Modifier.fillMaxWidth()
+                        .clickable {
+                            onDismiss()
+                            onManualImportClick()
+                        }
+                        .padding(10.dp)
+            ) {
+                Icon(
+                    Icons.Filled.Create,
+                    contentDescription = stringResource(id = R.string.create_import),
+                    modifier = Modifier.padding(10.dp),
+                )
                Text(
-                    stringResource(id = R.string.add_from_clipboard),
+                    stringResource(id = R.string.create_import),
                    modifier = Modifier.padding(10.dp),
                )
            }
        }
-        HorizontalDivider()
-        Row(
-            modifier =
-                Modifier.fillMaxWidth()
-                    .clickable {
-                        onDismiss()
-                        onUrlClick()
-                    }
-                    .padding(10.dp)
-        ) {
-            Icon(
-                Icons.Filled.Link,
-                contentDescription = stringResource(id = R.string.add_from_url),
-                modifier = Modifier.padding(10.dp),
-            )
-            Text(stringResource(id = R.string.add_from_url), modifier = Modifier.padding(10.dp))
-        }
-        HorizontalDivider()
-        Row(
-            modifier =
-                Modifier.fillMaxWidth()
-                    .clickable {
-                        onDismiss()
-                        onManualImportClick()
-                    }
-                    .padding(10.dp)
-        ) {
-            Icon(
-                Icons.Filled.Create,
-                contentDescription = stringResource(id = R.string.create_import),
-                modifier = Modifier.padding(10.dp),
-            )
-            Text(stringResource(id = R.string.create_import), modifier = Modifier.padding(10.dp))
-        }
    }
 }
@@ -17,12 +17,9 @@ import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.core.tunnel.getValueById
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
-import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 import java.text.Collator
 import java.util.*

@@ -30,13 +27,17 @@ import java.util.*
@Composable
 fun TunnelList(
    appUiState: AppUiState,
-    selectedTunnels: List<TunnelConf>,
-    modifier: Modifier = Modifier,
+    activeTunnels: Map<TunnelConf, TunnelState>,
+    selectedTunnel: TunnelConf?,
+    onSetSelectedTunnel: (TunnelConf?) -> Unit,
+    onDeleteTunnel: (TunnelConf) -> Unit,
    onToggleTunnel: (TunnelConf, Boolean) -> Unit,
+    onExpandStats: () -> Unit,
+    onCopyTunnel: (TunnelConf) -> Unit,
+    modifier: Modifier = Modifier,
    viewModel: AppViewModel,
 ) {
    val context = LocalContext.current
-    val navController = LocalNavController.current
    val collator = Collator.getInstance(Locale.getDefault())
    val sortedTunnels =
        remember(appUiState.tunnels) {
@@ -59,28 +60,19 @@ fun TunnelList(
            item { GettingStartedLabel(onClick = { context.openWebUrl(it) }) }
        }
        items(sortedTunnels, key = { it.id }) { tunnel ->
-            val tunnelState =
-                remember(appUiState.activeTunnels) {
-                    appUiState.activeTunnels.getValueById(tunnel.id) ?: TunnelState()
-                }
-            val selected = remember(selectedTunnels) { selectedTunnels.any { it.id == tunnel.id } }
+            val tunnelState = activeTunnels.getValueById(tunnel.id) ?: TunnelState()
            TunnelRowItem(
-                state = tunnelState,
-                expanded = appUiState.appState.expandedTunnelIds.contains(tunnel.id),
-                isSelected = selected,
+                isActive = tunnelState.status.isUpOrStarting(),
+                expanded = appUiState.appState.isTunnelStatsExpanded,
+                isSelected = selectedTunnel?.id == tunnel.id,
                tunnel = tunnel,
                tunnelState = tunnelState,
-                onClick = {
-                    navController.navigate(Route.TunnelOptions(tunnel.id))
-                    viewModel.handleEvent(AppEvent.ClearSelectedTunnels)
-                },
-                onDoubleClick = {
-                    viewModel.handleEvent(AppEvent.ToggleTunnelStatsExpanded(tunnel.id))
-                },
-                onToggleSelectedTunnel = {
-                    viewModel.handleEvent(AppEvent.ToggleSelectedTunnel(it))
-                },
+                onSetSelectedTunnel = { onSetSelectedTunnel(it) },
+                onClick = onExpandStats,
+                onCopy = { onCopyTunnel(tunnel) },
+                onDelete = { onDeleteTunnel(tunnel) },
                onSwitchClick = { checked -> onToggleTunnel(tunnel, checked) },
+                viewModel = viewModel,
            )
        }
    }
@@ -2,114 +2,221 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.main.components

 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Circle
-import androidx.compose.material.icons.rounded.KeyboardArrowDown
+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.Checkbox
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.minimumInteractiveComponentSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+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.navigation.LocalIsAndroidTV
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.util.StringValue
 import com.zaneschepke.wireguardautotunnel.util.extensions.asColor
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent

@Composable
 fun TunnelRowItem(
-    state: TunnelState,
-    isSelected: Boolean,
+    isActive: Boolean,
    expanded: Boolean,
+    isSelected: Boolean,
    tunnel: TunnelConf,
    tunnelState: TunnelState,
+    onSetSelectedTunnel: (TunnelConf?) -> Unit,
    onClick: () -> Unit,
-    onDoubleClick: () -> Unit,
-    onToggleSelectedTunnel: (TunnelConf) -> Unit,
+    onCopy: () -> Unit,
+    onDelete: () -> Unit,
    onSwitchClick: (Boolean) -> Unit,
+    viewModel: AppViewModel,
 ) {
-    val isTv = LocalIsAndroidTV.current
+    val context = LocalContext.current
+    val navController = LocalNavController.current
+    val haptic = LocalHapticFeedback.current
+    val itemFocusRequester = remember { FocusRequester() }
+    val isTv = context.isRunningOnTv()

-    val leadingIconColor =
-        remember(state) {
-            if (state.status.isUp()) tunnelState.statistics.asColor() else Color.Gray
-        }
+    val leadingIconColor = if (!isActive) Color.Gray else tunnelState.statistics.asColor()

    val (leadingIcon, size) =
-        remember(tunnel) {
-            when {
-                tunnel.isPrimaryTunnel -> Pair(Icons.Rounded.Star, 16.dp)
-                tunnel.isMobileDataTunnel -> Pair(Icons.Rounded.Smartphone, 16.dp)
-                tunnel.isEthernetTunnel -> Pair(Icons.Rounded.SettingsEthernet, 16.dp)
-                else -> Pair(Icons.Rounded.Circle, 14.dp)
-            }
+        when {
+            tunnel.isPrimaryTunnel -> Pair(Icons.Rounded.Star, 16.dp)
+            tunnel.isMobileDataTunnel -> Pair(Icons.Rounded.Smartphone, 16.dp)
+            tunnel.isEthernetTunnel -> Pair(Icons.Rounded.SettingsEthernet, 16.dp)
+            else -> Pair(Icons.Rounded.Circle, 14.dp)
        }

    ExpandingRowListItem(
        leading = {
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(4.dp, Alignment.Start),
-            ) {
-                if (isTv) {
-                    Checkbox(
-                        isSelected,
-                        onCheckedChange = { onToggleSelectedTunnel(tunnel) },
-                        modifier = Modifier.minimumInteractiveComponentSize().size(12.dp),
+            Icon(
+                leadingIcon,
+                stringResource(R.string.status),
+                tint = leadingIconColor,
+                modifier = Modifier.size(size),
+            )
+        },
+        text = tunnel.tunName,
+        onHold = {
+            haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+            onSetSelectedTunnel(tunnel)
+        },
+        onClick = {
+            if (!isTv) {
+                if (isActive) onClick()
+            } else {
+                onSetSelectedTunnel(tunnel)
+                itemFocusRequester.requestFocus()
+            }
+        },
+        isExpanded = expanded && isActive,
+        expanded = {
+            if (isActive && expanded) TunnelStatisticsRow(tunnelState.statistics, tunnel)
+        },
+        trailing = {
+            if (isSelected && !isTv) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceEvenly,
+                ) {
+                    IconButton(
+                        modifier = Modifier.weight(1f),
+                        onClick = {
+                            onSetSelectedTunnel(null)
+                            navController.navigate(Route.TunnelOptions(tunnel.id))
+                        },
+                    ) {
+                        Icon(
+                            Icons.Rounded.Settings,
+                            stringResource(id = R.string.settings),
+                            modifier = Modifier.size(24.dp),
+                        )
+                    }
+                    IconButton(
+                        modifier = Modifier.weight(1f),
+                        onClick = {
+                            onCopy()
+                            onSetSelectedTunnel(null)
+                        },
+                    ) {
+                        Icon(
+                            Icons.Rounded.CopyAll,
+                            stringResource(R.string.copy),
+                            modifier = Modifier.size(24.dp),
+                        )
+                    }
+                    IconButton(
+                        modifier = Modifier.weight(1f),
+                        enabled = !isActive,
+                        onClick = { onDelete() },
+                    ) {
+                        Icon(
+                            Icons.Rounded.Delete,
+                            stringResource(R.string.delete_tunnel),
+                            modifier = Modifier.size(24.dp),
+                        )
+                    }
+                }
+            } else if (isTv) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceEvenly,
+                ) {
+                    IconButton(
+                        modifier = Modifier.weight(1f),
+                        onClick = {
+                            navController.navigate(Route.TunnelOptions(tunnel.id))
+                            onSetSelectedTunnel(null)
+                        },
+                    ) {
+                        Icon(
+                            Icons.Rounded.Settings,
+                            stringResource(id = R.string.settings),
+                            modifier = Modifier.size(24.dp),
+                        )
+                    }
+                    IconButton(
+                        modifier = Modifier.weight(1f),
+                        onClick = {
+                            if (isActive) {
+                                onClick()
+                            } else {
+                                viewModel.handleEvent(
+                                    AppEvent.ShowMessage(
+                                        StringValue.StringResource(R.string.turn_on_tunnel)
+                                    )
+                                )
+                            }
+                        },
+                    ) {
+                        Icon(
+                            Icons.Rounded.Info,
+                            stringResource(R.string.info),
+                            modifier = Modifier.size(24.dp),
+                        )
+                    }
+                    IconButton(modifier = Modifier.weight(1f), onClick = onCopy) {
+                        Icon(
+                            Icons.Rounded.CopyAll,
+                            stringResource(R.string.copy),
+                            modifier = Modifier.size(24.dp),
+                        )
+                    }
+                    IconButton(
+                        modifier = Modifier.weight(1f),
+                        onClick = {
+                            if (isActive) {
+                                viewModel.handleEvent(
+                                    AppEvent.ShowMessage(
+                                        StringValue.StringResource(R.string.turn_off_tunnel)
+                                    )
+                                )
+                            } else {
+                                onDelete()
+                            }
+                        },
+                    ) {
+                        Icon(
+                            Icons.Rounded.Delete,
+                            stringResource(R.string.delete_tunnel),
+                            modifier = Modifier.size(24.dp),
+                        )
+                    }
+                    ScaledSwitch(
+                        modifier = Modifier.focusRequester(itemFocusRequester).weight(1f),
+                        checked = isActive,
+                        onClick = onSwitchClick,
                    )
                }
-                Icon(
-                    leadingIcon,
-                    stringResource(R.string.status),
-                    tint = leadingIconColor,
-                    modifier = Modifier.size(size),
+            } else {
+                ScaledSwitch(
+                    modifier = Modifier.focusRequester(itemFocusRequester),
+                    checked = isActive,
+                    onClick = onSwitchClick,
                )
            }
        },
-        text = tunnel.tunName,
-        onHold = { if (!isTv) onToggleSelectedTunnel(tunnel) },
-        onClick = { if (!isTv) onClick() },
-        onDoubleClick = { if (!isTv) onDoubleClick() },
-        expanded = {
-            if (expanded) {
-                TunnelStatisticsRow(tunnelState.statistics, tunnel)
-            } else null
-        },
-        trailing = {
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
-            ) {
-                if (isTv) {
-                    IconButton(onClick = onDoubleClick) {
-                        Icon(
-                            Icons.Rounded.KeyboardArrowDown,
-                            contentDescription = stringResource(R.string.info),
-                        )
-                    }
-                    IconButton(onClick = onClick) {
-                        Icon(
-                            Icons.Rounded.Settings,
-                            contentDescription = stringResource(R.string.settings),
-                        )
-                    }
-                }
-                ScaledSwitch(checked = state.status.isUpOrStarting(), onClick = onSwitchClick)
-            }
-        },
-        isSelected = isSelected,
    )
 }
@@ -27,10 +27,6 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.state.ConfigUi
@Composable
 fun InterfaceSection(uiState: ConfigUiState, viewModel: ConfigViewModel) {
    var isDropDownExpanded by remember { mutableStateOf(false) }
-    val isAmneziaCompatibilitySet =
-        remember(uiState.configProxy.`interface`) {
-            uiState.configProxy.`interface`.isAmneziaCompatibilityModeSet()
-        }

    Surface(shape = RoundedCornerShape(12.dp), color = MaterialTheme.colorScheme.surface) {
        Column(
@@ -48,7 +44,8 @@ fun InterfaceSection(uiState: ConfigUiState, viewModel: ConfigViewModel) {
                    onExpandedChange = { isDropDownExpanded = it },
                    showScripts = uiState.showScripts,
                    showAmneziaValues = uiState.showAmneziaValues,
-                    isAmneziaCompatibilitySet = isAmneziaCompatibilitySet,
+                    isAmneziaCompatibilitySet =
+                        uiState.configProxy.`interface`.isAmneziaCompatibilityModeSet(),
                    onToggleScripts = viewModel::toggleScripts,
                    onToggleAmneziaValues = viewModel::toggleAmneziaValues,
                    onToggleAmneziaCompatibility = viewModel::toggleAmneziaCompatibility,
@@ -50,7 +50,6 @@ constructor(
        tunnelId?.let { loadInitialState(it) }
    }

-    // TODO improve this loading experience
    private fun loadInitialState(tunnelId: Int) =
        viewModelScope.launch {
            val tunnel = tunnelRepository.getById(tunnelId) ?: return@launch
@@ -109,7 +108,6 @@ constructor(
                    loading = false,
                    tunnelConf = tunnel,
                    tunneledApps = tunneledApps,
-                    queriedApps = tunneledApps,
                    splitOption = splitOption,
                )
            }
@@ -118,14 +116,14 @@ constructor(
    fun onSearchQuery(query: String) {
        val filteredApps =
            if (query.isBlank()) {
-                _uiState.value.tunneledApps
+                allTunneledApps
            } else {
-                _uiState.value.tunneledApps.filter {
+                allTunneledApps.filter {
                    it.first.name.contains(query, ignoreCase = true) ||
                        it.first.`package`.contains(query, ignoreCase = true)
                }
            }
-        _uiState.update { it.copy(searchQuery = query, queriedApps = filteredApps) }
+        _uiState.update { it.copy(searchQuery = query, tunneledApps = filteredApps) }
    }

    fun updateSplitOption(newOption: SplitOption) {
@@ -138,12 +136,7 @@ constructor(
            currentState.tunneledApps.map { (app, selected) ->
                if (app.`package` == packageName) Pair(app, !selected) else Pair(app, selected)
            }
-        val updatedQueryApps =
-            currentState.queriedApps.map { (app, selected) ->
-                if (app.`package` == packageName) Pair(app, !selected) else Pair(app, selected)
-            }
-        _uiState.value =
-            currentState.copy(tunneledApps = updatedApps, queriedApps = updatedQueryApps)
+        _uiState.value = currentState.copy(tunneledApps = updatedApps)
    }

    fun saveChanges() =
@@ -29,7 +29,7 @@ fun SplitTunnelContent(
        )
        if (uiState.splitOption != SplitOption.ALL) {
            AppListSection(
-                apps = uiState.queriedApps,
+                apps = uiState.tunneledApps,
                onAppSelectionToggle = onAppSelectionToggle,
                onQueryChange = onQueryChange,
                uiState.searchQuery,
@@ -6,7 +6,6 @@ data class SplitTunnelUiState(
    val loading: Boolean = true,
    val tunnelConf: TunnelConf? = null,
    val tunneledApps: SplitTunnelApps = emptyList(),
-    val queriedApps: SplitTunnelApps = emptyList(),
    val splitOption: SplitOption = SplitOption.ALL,
    val searchQuery: String = "",
    val success: Boolean? = null,
@@ -7,26 +7,39 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.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.unit.dp
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.ui.common.SectionDivider
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.components.*
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.components.AutoTunnelingItem
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.components.PingConfigItem
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.components.PingRestartItem
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.components.PrimaryTunnelItem
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.components.ServerIpv4Item
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.components.SplitTunnelingItem
+import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel

@Composable
-fun TunnelOptionsScreen(tunnelConf: TunnelConf, viewModel: AppViewModel) {
+fun TunnelOptionsScreen(tunnelConf: TunnelConf, appUiState: AppUiState, viewModel: AppViewModel) {
+    var currentText by remember { mutableStateOf("") }
+
+    LaunchedEffect(tunnelConf.tunnelNetworks) { currentText = "" }

    Column(
        horizontalAlignment = Alignment.Start,
-        verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
+        verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
        modifier =
            Modifier.fillMaxSize()
                .verticalScroll(rememberScrollState())
                .padding(top = 24.dp)
-                .padding(horizontal = 12.dp),
+                .padding(horizontal = 24.dp),
    ) {
        SurfaceSelectionGroupButton(
            items =
@@ -37,7 +50,6 @@ fun TunnelOptionsScreen(tunnelConf: TunnelConf, viewModel: AppViewModel) {
                    SplitTunnelingItem(tunnelConf),
                )
        )
-        SectionDivider()
        SurfaceSelectionGroupButton(
            items =
                buildList {
@@ -11,7 +11,7 @@ import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController

@Composable
 fun AutoTunnelingItem(tunnelConf: TunnelConf): SelectionItem {
@@ -11,7 +11,7 @@ import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController

@Composable
 fun SplitTunnelingItem(tunnelConf: TunnelConf): SelectionItem {
@@ -3,20 +3,21 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.pin
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 import xyz.teamgravity.pin_lock_compose.PinLock

@Composable
 fun PinLockScreen(viewModel: AppViewModel) {
+    val context = LocalContext.current
    val navController = LocalNavController.current
-    val isTv = LocalIsAndroidTV.current
    PinLock(
        title = { pinExists ->
            Text(
@@ -33,7 +34,7 @@ fun PinLockScreen(viewModel: AppViewModel) {
        textColor = MaterialTheme.colorScheme.onSurface,
        onPinCorrect = {
            // pin is correct, navigate or hide pin lock
-            if (isTv) {
+            if (context.isRunningOnTv()) {
                navController.navigate(Route.Main)
            } else {
                val isPopped = navController.popBackStack()
@@ -12,17 +12,17 @@ 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.platform.LocalFocusManager
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.SectionDivider
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.components.AdvancedSettingsItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.AlwaysOnVpnItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.AppShortcutsItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.AppearanceItem
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ExportTunnelsBottomSheet
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.KernelModeItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.KillSwitchItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.LocalLoggingItem
@@ -30,26 +30,33 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.PinLoc
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.ReadLogsItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.RestartAtBootItem
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel

@Composable
-fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
-    val isTv = LocalIsAndroidTV.current
+fun SettingsScreen(uiState: AppUiState, appViewState: AppViewState, viewModel: AppViewModel) {
+    val context = LocalContext.current
    val focusManager = LocalFocusManager.current
    val navController = LocalNavController.current
-
+    val isRunningOnTv = remember { context.isRunningOnTv() }
    val interactionSource = remember { MutableInteractionSource() }

+    if (appViewState.showBottomSheet) {
+        ExportTunnelsBottomSheet(viewModel, isRunningOnTv)
+    }
+
    Column(
        horizontalAlignment = Alignment.Start,
-        verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
+        verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
        modifier =
            Modifier.verticalScroll(rememberScrollState())
                .fillMaxSize()
-                .padding(vertical = 24.dp)
-                .padding(horizontal = 12.dp)
+                .padding(top = 24.dp)
+                .padding(bottom = 40.dp)
+                .padding(horizontal = 24.dp)
                .then(
-                    if (!isTv) {
+                    if (!isRunningOnTv) {
                        Modifier.clickable(
                            indication = null,
                            interactionSource = interactionSource,
@@ -64,12 +71,11 @@ fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
            items =
                buildList {
                    add(AppShortcutsItem(uiState, viewModel))
-                    if (!isTv) add(AlwaysOnVpnItem(uiState, viewModel))
+                    if (!isRunningOnTv) add(AlwaysOnVpnItem(uiState, viewModel))
                    add(KillSwitchItem())
                    add(RestartAtBootItem(uiState, viewModel))
                }
        )
-        SectionDivider()
        SurfaceSelectionGroupButton(
            items =
                buildList {
@@ -79,10 +85,8 @@ fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
                    add(PinLockItem(uiState, viewModel))
                }
        )
-        SectionDivider()
-        if (!isTv) {
+        if (!isRunningOnTv) {
            SurfaceSelectionGroupButton(items = listOf(KernelModeItem(uiState, viewModel)))
-            SectionDivider()
        }
        SurfaceSelectionGroupButton(
            items =
@@ -38,12 +38,12 @@ fun SettingsAdvancedScreen(appUiState: AppUiState, viewModel: AppViewModel) {

    Column(
        horizontalAlignment = Alignment.Start,
-        verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
+        verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
        modifier =
            Modifier.fillMaxSize()
                .verticalScroll(rememberScrollState())
-                .padding(vertical = 24.dp)
-                .padding(horizontal = 12.dp),
+                .padding(top = 24.dp)
+                .padding(horizontal = 24.dp),
    ) {
        SurfaceSelectionGroupButton(listOf(RemoteControlItem(appUiState, viewModel)))
    }
@@ -8,7 +8,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.common.SectionDivider
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.components.DisplayThemeItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.components.LanguageItem
@@ -18,13 +17,11 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.compon
 fun AppearanceScreen() {
    Column(
        horizontalAlignment = Alignment.Start,
-        verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
-        modifier = Modifier.fillMaxSize().padding(vertical = 24.dp).padding(horizontal = 12.dp),
+        verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
+        modifier = Modifier.fillMaxSize().padding(top = 24.dp).padding(horizontal = 24.dp),
    ) {
        SurfaceSelectionGroupButton(items = listOf(LanguageItem()))
-        SectionDivider()
        SurfaceSelectionGroupButton(items = listOf(NotificationsItem()))
-        SectionDivider()
        SurfaceSelectionGroupButton(items = listOf(DisplayThemeItem()))
    }
 }
@@ -10,7 +10,7 @@ import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController

@Composable
 fun DisplayThemeItem(): SelectionItem {
@@ -10,7 +10,7 @@ import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController

@Composable
 fun LanguageItem(): SelectionItem {
@@ -9,7 +9,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language.components.AutomaticLanguageItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language.components.LanguageItem
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
@@ -21,7 +20,6 @@ import java.util.*
@Composable
 fun LanguageScreen(appUiState: AppUiState, viewModel: AppViewModel) {
    val collator = Collator.getInstance(Locale.getDefault())
-    val isTv = LocalIsAndroidTV.current

    val locales =
        LocaleUtil.supportedLocales.map {
@@ -37,11 +35,9 @@ fun LanguageScreen(appUiState: AppUiState, viewModel: AppViewModel) {
    LazyColumn(
        horizontalAlignment = Alignment.CenterHorizontally,
        verticalArrangement = Arrangement.Top,
-        modifier = Modifier.padding(horizontal = 12.dp),
+        modifier = Modifier.padding(horizontal = 24.dp),
    ) {
-        item { AutomaticLanguageItem(appUiState, viewModel, isTv) }
-        items(sortedLocales, key = { it }) { locale ->
-            LanguageItem(locale, appUiState, viewModel, isTv)
-        }
+        item { AutomaticLanguageItem(appUiState, viewModel) }
+        items(sortedLocales, key = { it }) { locale -> LanguageItem(locale, appUiState, viewModel) }
    }
 }
@@ -15,7 +15,7 @@ import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent

@Composable
-fun AutomaticLanguageItem(appUiState: AppUiState, viewModel: AppViewModel, isAndroidTv: Boolean) {
+fun AutomaticLanguageItem(appUiState: AppUiState, viewModel: AppViewModel) {
    Box(modifier = Modifier.padding(top = 24.dp)) {
        SelectionItemButton(
            buttonText = stringResource(R.string.automatic),
@@ -29,7 +29,7 @@ fun AutomaticLanguageItem(appUiState: AppUiState, viewModel: AppViewModel, isAnd
                    }
                }
            },
-            ripple = isAndroidTv,
+            ripple = false,
        )
    }
 }
@@ -9,12 +9,7 @@ import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 import java.util.*

@Composable
-fun LanguageItem(
-    locale: Locale,
-    appUiState: AppUiState,
-    viewModel: AppViewModel,
-    isAndroidTv: Boolean,
-) {
+fun LanguageItem(locale: Locale, appUiState: AppUiState, viewModel: AppViewModel) {
    SelectionItemButton(
        buttonText =
            locale.getDisplayLanguage(locale).replaceFirstChar {
@@ -33,6 +28,6 @@ fun LanguageItem(
                SelectedLabel()
            }
        },
-        ripple = isAndroidTv,
+        ripple = false,
    )
 }
@@ -10,7 +10,7 @@ import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController

@Composable
 fun AppearanceItem(): SelectionItem {
@@ -0,0 +1,104 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.FolderZip
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+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.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.domain.enums.ConfigType
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ExportTunnelsBottomSheet(viewModel: AppViewModel, isRunningOnTv: Boolean) {
+    var showAuthPrompt by remember { mutableStateOf(false) }
+    var isAuthorized by remember { mutableStateOf(false) }
+    var exportType by remember { mutableStateOf(ConfigType.WG) }
+
+    fun handleExport() {
+        viewModel.handleEvent(AppEvent.ToggleBottomSheet)
+        viewModel.handleEvent(AppEvent.ExportTunnels(exportType))
+    }
+
+    if (showAuthPrompt) {
+        AuthorizationPromptWrapper(
+            onDismiss = { showAuthPrompt = false },
+            onSuccess = {
+                showAuthPrompt = false
+                isAuthorized = true
+                handleExport()
+            },
+            viewModel = viewModel,
+        )
+    }
+
+    ModalBottomSheet(
+        containerColor = MaterialTheme.colorScheme.surface,
+        onDismissRequest = { viewModel.handleEvent(AppEvent.ToggleBottomSheet) },
+    ) {
+        Row(
+            modifier =
+                Modifier.fillMaxWidth()
+                    .clickable {
+                        exportType = ConfigType.AMNEZIA
+                        if (!isAuthorized && !isRunningOnTv) {
+                            showAuthPrompt = true
+                            return@clickable
+                        }
+                        handleExport()
+                    }
+                    .padding(10.dp)
+        ) {
+            Icon(
+                Icons.Filled.FolderZip,
+                contentDescription = stringResource(R.string.export_tunnels_amnezia),
+                modifier = Modifier.padding(10.dp),
+            )
+            Text(
+                stringResource(R.string.export_tunnels_amnezia),
+                modifier = Modifier.padding(10.dp),
+            )
+        }
+        HorizontalDivider()
+        Row(
+            modifier =
+                Modifier.fillMaxWidth()
+                    .clickable {
+                        exportType = ConfigType.WG
+                        if (!isAuthorized && !isRunningOnTv) {
+                            showAuthPrompt = true
+                            return@clickable
+                        }
+                        handleExport()
+                    }
+                    .padding(10.dp)
+        ) {
+            Icon(
+                Icons.Filled.FolderZip,
+                contentDescription = stringResource(R.string.export_tunnels_wireguard),
+                modifier = Modifier.padding(10.dp),
+            )
+            Text(
+                stringResource(R.string.export_tunnels_wireguard),
+                modifier = Modifier.padding(10.dp),
+            )
+        }
+    }
+}
@@ -10,7 +10,7 @@ import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController

@Composable
 fun KillSwitchItem(): SelectionItem {
@@ -3,12 +3,10 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ViewHeadline
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItemLabel
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionLabelType
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
@@ -17,15 +15,8 @@ import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 fun LocalLoggingItem(uiState: AppUiState, viewModel: AppViewModel): SelectionItem {
    return SelectionItem(
        leadingIcon = Icons.Outlined.ViewHeadline,
-        title = {
-            SelectionItemLabel(stringResource(R.string.local_logging), SelectionLabelType.TITLE)
-        },
-        description = {
-            SelectionItemLabel(
-                stringResource(R.string.enable_local_logging),
-                SelectionLabelType.DESCRIPTION,
-            )
-        },
+        title = { SelectionItemLabel(R.string.local_logging) },
+        description = { SelectionItemLabel(R.string.enable_local_logging, isDescription = true) },
        trailing = {
            ScaledSwitch(
                checked = uiState.appState.isLocalLogsEnabled,
@@ -11,7 +11,7 @@ import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
@@ -3,23 +3,19 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ViewTimeline
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItemLabel
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionLabelType
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController

@Composable
 fun ReadLogsItem(): SelectionItem {
    val navController = LocalNavController.current
    return SelectionItem(
        leadingIcon = Icons.Filled.ViewTimeline,
-        title = {
-            SelectionItemLabel(stringResource(R.string.read_logs), SelectionLabelType.TITLE)
-        },
+        title = { SelectionItemLabel(R.string.read_logs) },
        trailing = { ForwardButton { navController.navigate(Route.Logs) } },
        onClick = { navController.navigate(Route.Logs) },
    )
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.disclosure

 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -11,10 +11,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.components.AppSettingsItem
-import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.components.LocationDisclosureHeader
-import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.components.SkipItem
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.disclosure.components.AppSettingsItem
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.disclosure.components.LocationDisclosureHeader
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.disclosure.components.SkipItem
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.util.extensions.goFromRoot
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.components
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.disclosure.components

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

 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.components
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.disclosure.components

 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -7,27 +7,26 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.common.SectionDivider
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.components.VpnKillSwitchItem
 import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent

@Composable
 fun KillSwitchScreen(uiState: AppUiState, viewModel: AppViewModel) {
-    val isTv = LocalIsAndroidTV.current
+    val context = LocalContext.current

    Column(
        horizontalAlignment = Alignment.Start,
-        verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
-        modifier = Modifier.fillMaxSize().padding(vertical = 24.dp).padding(horizontal = 12.dp),
+        verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
+        modifier = Modifier.fillMaxSize().padding(top = 24.dp).padding(horizontal = 24.dp),
    ) {
-        if (!isTv) {
+        if (!context.isRunningOnTv()) {
            SurfaceSelectionGroupButton(items = listOf(NativeKillSwitchItem()))
-            SectionDivider()
        }
        SurfaceSelectionGroupButton(
            items =
@@ -1,135 +1,39 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.support

-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.LinearProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.StrokeCap
 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 androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.zaneschepke.wireguardautotunnel.BuildConfig
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.SectionDivider
-import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
 import com.zaneschepke.wireguardautotunnel.ui.common.label.GroupLabel
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.components.ContactSupportOptions
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.components.GeneralSupportOptions
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.components.UpdateSection
-import com.zaneschepke.wireguardautotunnel.util.extensions.canInstallPackages
-import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestInstallPackagesPermission
-import com.zaneschepke.wireguardautotunnel.util.extensions.showToast
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+import com.zaneschepke.wireguardautotunnel.ui.screens.support.components.VersionLabel

@Composable
-fun SupportScreen(viewModel: SupportViewModel = hiltViewModel(), appViewModel: AppViewModel) {
+fun SupportScreen() {
    val context = LocalContext.current

-    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-    var showPermissionDialog by remember { mutableStateOf(false) }
-
-    LaunchedEffect(uiState.error) {
-        uiState.error?.let {
-            viewModel.handleErrorShown()
-            appViewModel.handleEvent(AppEvent.ShowMessage(it))
-            viewModel.handleErrorShown()
-        }
-    }
-
-    LaunchedEffect(uiState.isUptoDate) {
-        if (uiState.isUptoDate == true)
-            return@LaunchedEffect context.showToast(R.string.latest_installed)
-    }
-
-    if (uiState.appUpdate != null) {
-        InfoDialog(
-            onDismiss = { viewModel.handleUpdateShown() },
-            onAttest = {
-                if (BuildConfig.FLAVOR != "full") {
-                    uiState.appUpdate?.apkUrl?.let { context.openWebUrl(it) }
-                    return@InfoDialog
-                }
-                if (context.canInstallPackages()) {
-                    viewModel.handleDownloadAndInstallApk()
-                } else {
-                    showPermissionDialog = true
-                }
-            },
-            title = { Text(stringResource(R.string.update_available)) },
-            body = {
-                Column(
-                    horizontalAlignment = Alignment.Start,
-                    verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
-                    modifier = Modifier.fillMaxWidth(),
-                ) {
-                    Text(uiState.appUpdate?.version ?: "")
-                    Text(uiState.appUpdate?.releaseNotes ?: "")
-                    if (uiState.isLoading) {
-                        LinearProgressIndicator(
-                            progress = { uiState.downloadProgress },
-                            modifier = Modifier.fillMaxWidth().padding(top = 16.dp),
-                            trackColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.1f),
-                            color = MaterialTheme.colorScheme.primary,
-                            strokeCap = StrokeCap.Round,
-                        )
-                    }
-                }
-            },
-            confirmText = {
-                Text(
-                    if (BuildConfig.FLAVOR != "full") stringResource(R.string.download)
-                    else stringResource(R.string.download_and_install)
-                )
-            },
-        )
-    }
-
-    if (showPermissionDialog) {
-        InfoDialog(
-            onDismiss = { showPermissionDialog = false },
-            onAttest = {
-                context.requestInstallPackagesPermission()
-                showPermissionDialog = false
-            },
-            title = { Text(stringResource(R.string.permission_required)) },
-            body = { Text(stringResource(R.string.install_updated_permission)) },
-            confirmText = { Text(stringResource(R.string.allow)) },
-        )
-    }
-
    Column(
        modifier =
            Modifier.fillMaxSize()
-                .padding(vertical = 24.dp)
-                .padding(horizontal = 12.dp)
+                .padding(top = 24.dp)
+                .padding(horizontal = 24.dp)
                .verticalScroll(rememberScrollState()),
        horizontalAlignment = Alignment.Start,
-        verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
+        verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.Top),
    ) {
-        GroupLabel(
-            stringResource(R.string.thank_you),
-            modifier = Modifier.padding(horizontal = 12.dp).padding(bottom = 12.dp),
-        )
-        UpdateSection(
-            onUpdateCheck = {
-                if (BuildConfig.DEBUG || BuildConfig.VERSION_NAME.contains("beta") || BuildConfig.FLAVOR == "google")
-                    return@UpdateSection context.showToast(R.string.update_check_unsupported)
-                context.showToast(R.string.checking_for_update)
-                viewModel.handleUpdateCheck()
-            }
-        )
-        SectionDivider()
+        GroupLabel(stringResource(R.string.thank_you))
        GeneralSupportOptions(context)
-        SectionDivider()
        ContactSupportOptions(context)
+        VersionLabel()
    }
 }
@@ -1,12 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.support
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppUpdate
-import com.zaneschepke.wireguardautotunnel.util.StringValue
-
-data class SupportUiState(
-    val appUpdate: AppUpdate? = null,
-    val isLoading: Boolean = false,
-    val error: StringValue? = null,
-    val isUptoDate: Boolean? = null,
-    val downloadProgress: Float = 0f,
-)
@@ -1,86 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.support
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.zaneschepke.wireguardautotunnel.BuildConfig
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppUpdate
-import com.zaneschepke.wireguardautotunnel.domain.repository.UpdateRepository
-import com.zaneschepke.wireguardautotunnel.util.FileUtils
-import com.zaneschepke.wireguardautotunnel.util.StringValue
-import dagger.hilt.android.lifecycle.HiltViewModel
-import jakarta.inject.Inject
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-
-@HiltViewModel
-class SupportViewModel
-@Inject
-constructor(private val updateRepository: UpdateRepository, private val fileUtils: FileUtils) :
-    ViewModel() {
-
-    private val _uiState = MutableStateFlow(SupportUiState())
-    val uiState = _uiState.asStateFlow()
-
-    fun handleUpdateCheck() =
-        viewModelScope.launch {
-            _uiState.update { it.copy(isLoading = true) }
-            updateRepository
-                .checkForUpdate(BuildConfig.VERSION_NAME)
-                .onSuccess { appUpdate ->
-                    _uiState.update {
-                        it.copy(
-                            appUpdate = appUpdate.sanitized(),
-                            error = null,
-                            isUptoDate = appUpdate == null,
-                        )
-                    }
-                }
-                .onFailure {
-                    _uiState.update {
-                        it.copy(error = StringValue.StringResource(R.string.update_check_failed))
-                    }
-                }
-            _uiState.update { it.copy(isLoading = false) }
-        }
-
-    private fun AppUpdate?.sanitized(): AppUpdate? {
-        return this?.copy(releaseNotes = releaseNotes.substringBefore(CHANGELOG_START))
-    }
-
-    fun handleErrorShown() = _uiState.update { it.copy(error = null) }
-
-    fun handleUpdateShown() = _uiState.update { it.copy(appUpdate = null) }
-
-    fun handleDownloadAndInstallApk() =
-        viewModelScope.launch {
-            with(uiState.value) {
-                if (appUpdate == null) return@launch
-                if (appUpdate.apkUrl == null || appUpdate.apkFileName == null) return@launch
-                _uiState.update { it.copy(isLoading = true) }
-                updateRepository
-                    .downloadApk(appUpdate.apkUrl, appUpdate.apkFileName) { progress ->
-                        _uiState.update { it.copy(downloadProgress = progress) }
-                    }
-                    .onSuccess { apk ->
-                        _uiState.update { it.copy(isLoading = false) }
-                        fileUtils.installApk(apk)
-                    }
-                    .onFailure {
-                        _uiState.update {
-                            it.copy(
-                                isLoading = false,
-                                error = StringValue.StringResource(R.string.update_download_failed),
-                            )
-                        }
-                    }
-            }
-        }
-
-    companion object {
-        private const val CHANGELOG_START =
-            "SHA-256 fingerprint for the 4096-bit signing certificate:"
-    }
-}
@@ -5,14 +5,12 @@ import androidx.compose.material.icons.filled.Favorite
 import androidx.compose.material.icons.filled.Mail
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import com.zaneschepke.wireguardautotunnel.BuildConfig
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItemLabel
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionLabelType
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchSupportEmail
@@ -27,12 +25,7 @@ fun ContactSupportOptions(context: android.content.Context) {
                    listOf(
                        SelectionItem(
                            leadingIcon = ImageVector.vectorResource(R.drawable.matrix),
-                            title = {
-                                SelectionItemLabel(
-                                    stringResource(R.string.join_matrix),
-                                    SelectionLabelType.TITLE,
-                                )
-                            },
+                            title = { SelectionItemLabel(R.string.join_matrix) },
                            trailing = {
                                ForwardButton {
                                    context.openWebUrl(context.getString(R.string.matrix_url))
@@ -42,12 +35,7 @@ fun ContactSupportOptions(context: android.content.Context) {
                        ),
                        SelectionItem(
                            leadingIcon = ImageVector.vectorResource(R.drawable.telegram),
-                            title = {
-                                SelectionItemLabel(
-                                    stringResource(R.string.join_telegram),
-                                    SelectionLabelType.TITLE,
-                                )
-                            },
+                            title = { SelectionItemLabel(R.string.join_telegram) },
                            trailing = {
                                ForwardButton {
                                    context.openWebUrl(context.getString(R.string.telegram_url))
@@ -59,12 +47,7 @@ fun ContactSupportOptions(context: android.content.Context) {
                        ),
                        SelectionItem(
                            leadingIcon = ImageVector.vectorResource(R.drawable.github),
-                            title = {
-                                SelectionItemLabel(
-                                    stringResource(R.string.open_issue),
-                                    SelectionLabelType.TITLE,
-                                )
-                            },
+                            title = { SelectionItemLabel(R.string.open_issue) },
                            trailing = {
                                ForwardButton {
                                    context.openWebUrl(context.getString(R.string.github_url))
@@ -74,12 +57,7 @@ fun ContactSupportOptions(context: android.content.Context) {
                        ),
                        SelectionItem(
                            leadingIcon = Icons.Filled.Mail,
-                            title = {
-                                SelectionItemLabel(
-                                    stringResource(R.string.email_description),
-                                    SelectionLabelType.TITLE,
-                                )
-                            },
+                            title = { SelectionItemLabel(R.string.email_description) },
                            trailing = { ForwardButton { context.launchSupportEmail() } },
                            onClick = { context.launchSupportEmail() },
                        ),
@@ -89,12 +67,7 @@ fun ContactSupportOptions(context: android.content.Context) {
                    add(
                        SelectionItem(
                            leadingIcon = Icons.Filled.Favorite,
-                            title = {
-                                SelectionItemLabel(
-                                    stringResource(R.string.donate),
-                                    SelectionLabelType.TITLE,
-                                )
-                            },
+                            title = { SelectionItemLabel(R.string.donate) },
                            trailing = {
                                ForwardButton {
                                    context.openWebUrl(context.getString(R.string.donate_url))
@@ -1,36 +1,25 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.support.components

 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Balance
 import androidx.compose.material.icons.filled.Book
 import androidx.compose.material.icons.filled.Policy
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.button.ForwardButton
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItemLabel
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionLabelType
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl

@Composable
 fun GeneralSupportOptions(context: android.content.Context) {
-    val navController = LocalNavController.current
    SurfaceSelectionGroupButton(
        items =
            buildList {
                add(
                    SelectionItem(
                        leadingIcon = Icons.Filled.Book,
-                        title = {
-                            SelectionItemLabel(
-                                stringResource(R.string.docs_description),
-                                SelectionLabelType.TITLE,
-                            )
-                        },
+                        title = { SelectionItemLabel(R.string.docs_description) },
                        trailing = {
                            ForwardButton {
                                context.openWebUrl(context.getString(R.string.docs_url))
@@ -42,12 +31,7 @@ fun GeneralSupportOptions(context: android.content.Context) {
                add(
                    SelectionItem(
                        leadingIcon = Icons.Filled.Policy,
-                        title = {
-                            SelectionItemLabel(
-                                stringResource(R.string.privacy_policy),
-                                SelectionLabelType.TITLE,
-                            )
-                        },
+                        title = { SelectionItemLabel(R.string.privacy_policy) },
                        trailing = {
                            ForwardButton {
                                context.openWebUrl(context.getString(R.string.privacy_policy_url))
@@ -58,19 +42,6 @@ fun GeneralSupportOptions(context: android.content.Context) {
                        },
                    )
                )
-                add(
-                    SelectionItem(
-                        leadingIcon = Icons.Filled.Balance,
-                        title = {
-                            SelectionItemLabel(
-                                stringResource(R.string.licenses),
-                                SelectionLabelType.TITLE,
-                            )
-                        },
-                        trailing = { ForwardButton { navController.navigate(Route.License) } },
-                        onClick = { navController.navigate(Route.License) },
-                    )
-                )
            }
    )
 }
@@ -1,48 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.support.components
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.CloudDownload
-import androidx.compose.material.icons.rounded.CloudDownload
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import com.zaneschepke.wireguardautotunnel.BuildConfig
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItem
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItemLabel
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionLabelType
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-
-@Composable
-fun UpdateSection(onUpdateCheck: () -> Unit = {}) {
-    SurfaceSelectionGroupButton(
-        listOf(
-            SelectionItem(
-                leadingIcon = Icons.Filled.CloudDownload,
-                title = {
-                    SelectionItemLabel(
-                        stringResource(R.string.check_for_update),
-                        SelectionLabelType.TITLE,
-                    )
-                },
-                description = {
-                    Column {
-                        SelectionItemLabel(
-                            stringResource(
-                                R.string.version_template,
-                                "v${BuildConfig.VERSION_NAME + 
-                                    if(BuildConfig.DEBUG) "-debug" else "" }",
-                            ),
-                            SelectionLabelType.DESCRIPTION,
-                        )
-                        SelectionItemLabel(
-                            stringResource(R.string.flavor_template, BuildConfig.FLAVOR),
-                            SelectionLabelType.DESCRIPTION,
-                        )
-                    }
-                },
-                onClick = onUpdateCheck,
-            )
-        )
-    )
-}
--- a/Show More
+++ b/Show More