fmt

Currently translated at 57.1% (136 of 238 strings)

Translation: WG Tunnel/strings
Translate-URL: https://hosted.weblate.org/projects/wg-tunnel/strings/zh_Hant/

.github/workflows/build.yml

@@ -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
 
@@ -63,17 +48,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+      SIGNING_KEY_ALIAS: ${{ secrets.ANDROID_SIGNING_KEY_ALIAS }}
-      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+      SIGNING_KEY_PASSWORD: ${{ secrets.ANDROID_SIGNING_KEY_PASSWORD }}
-      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+      SIGNING_STORE_PASSWORD: ${{ secrets.ANDROID_SIGNING_STORE_PASSWORD }}
       KEY_STORE_FILE: 'android_keystore.jks'
       KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
     outputs:
       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,46 +65,61 @@ 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
         with:
           fileName: ${{ env.KEY_STORE_FILE }}
           fileDir: ${{ env.KEY_STORE_LOCATION }}
-          encodedString: ${{ secrets.KEYSTORE }}
+          encodedString: ${{ secrets.ANDROID_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
+        run: echo '${{ secrets.ANDROID_SERVICE_ACCOUNT_JSON }}' > service_account.json
-      - name: Build APK
+
+      - 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 }}
+          git config --global user.name 'GitHub Actions'
-          build_type=${{ inputs.build_type }}
+          git config --global user.email 'actions@github.com'
-          case $build_type in
+          git add versionCode.txt
-            "release")
+          git commit -m "Automated build update"
-              ./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
       - 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 }}
+          path: ${{github.workspace}}/${{ steps.apk-path.outputs.path }}
           retention-days: 1

.github/workflows/publish.yml

@@ -7,7 +7,7 @@ on:
     inputs:
       track:
         type: choice
-        description: "Google Play release track"
+        description: "Google play release track"
         options:
           - none
           - internal
@@ -30,28 +30,12 @@ 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:
@@ -59,73 +43,66 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       has_new_commits: ${{ steps.check.outputs.new_commits }}
+
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
         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 }}
         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:
+  build:
-    if: ${{ inputs.release_type == 'release' || inputs.flavor == 'fdroid' }}
+    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.PAT_USERNAME }}
+      # GH needed for gh cli
+      GH_TOKEN: ${{ secrets.PAT }}
+      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: |
+      # update latest tag
-          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
       - 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 +110,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.PAT }}
+          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/${{ env.VERSION_CODE }}.txt)"
-          RELEASE_NOTES="$(cat ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${VERSION_NAME}.txt || echo "No changelog found for ${VERSION_NAME}")"
           echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
           echo "$RELEASE_NOTES" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
@@ -154,40 +152,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
+      - name: Get checksum
-        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
         id: checksum
         run: |
-          checksums=""
+          file_path=$(find ${{ github.workspace }}/temp -type f -iname "*.apk" | tail -n1)
-          for file_path in $(find ${{ github.workspace }}/temp -type f -iname "*.apk"); do
+          echo "checksum=$(apksigner verify -print-certs $file_path | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
-            checksum=$(apksigner verify -print-certs $file_path | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")
+
-            checksums="$checksums\n$file_path: $checksum"
+
-          done
+      - name: Create Release with Fastlane changelog notes
-          echo "checksum<<EOF" >> $GITHUB_OUTPUT
-          echo -e "$checksums" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-      - name: Create Release
         id: create_release
         uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_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 +196,18 @@ jobs:
           make_latest: ${{ inputs.release_type == 'release' }}
           files: |
             ${{ github.workspace }}/temp/*
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  publish-fdroid-public:
+  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 }}
+          token: ${{ secrets.PAT }}
-          repository: wgtunnel/fdroid
+          repository: zaneschepke/fdroid
           event-type: fdroid-update
 
   publish-play:
@@ -228,11 +216,13 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+      SIGNING_KEY_ALIAS: ${{ secrets.ANDROID_SIGNING_KEY_ALIAS }}
-      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+      SIGNING_KEY_PASSWORD: ${{ secrets.ANDROID_SIGNING_KEY_PASSWORD }}
-      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+      SIGNING_STORE_PASSWORD: ${{ secrets.ANDROID_SIGNING_STORE_PASSWORD }}
       KEY_STORE_FILE: 'android_keystore.jks'
       KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
+      GH_USER: ${{ secrets.PAT_USERNAME }}
+      GH_TOKEN: ${{ secrets.PAT }}
 
     steps:
       - uses: actions/checkout@v4
@@ -254,7 +244,7 @@ jobs:
         with:
           fileName: ${{ env.KEY_STORE_FILE }}
           fileDir: ${{ env.KEY_STORE_LOCATION }}
-          encodedString: ${{ secrets.KEYSTORE }}
+          encodedString: ${{ secrets.ANDROID_KEYSTORE }}
 
       # create keystore path for gradle to read
       - name: Create keystore path env var
@@ -274,3 +264,4 @@ jobs:
 
       - name: Distribute app to Prod track 🚀
         run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane ${{ inputs.track }})
+

.gitignore

@@ -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/

app/.gitignore

@@ -1,3 +1,2 @@
 /build
 /release
-/src/main/assets/licenses.json

app/build.gradle.kts

@@ -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()
+        versionCode = Constants.VERSION_CODE + versionCodeIncrement
-        versionName = computeVersionName()
+        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")
+            storeFile = getStoreFile()
-            storePassword =
+            storePassword = getSigningProperty(Constants.STORE_PASS_VAR)
-                LocalProperties.get("SIGNING_STORE_PASSWORD")
+            keyAlias = getSigningProperty(Constants.KEY_ALIAS_VAR)
-                    ?: System.getenv("SIGNING_STORE_PASSWORD")
+            keyPassword = getSigningProperty(Constants.KEY_PASS_VAR)
-            keyAlias =
-                LocalProperties.get("SIGNING_KEY_ALIAS") ?: System.getenv("SIGNING_KEY_ALIAS")
-            keyPassword =
-                LocalProperties.get("SIGNING_KEY_PASSWORD") ?: System.getenv("SIGNING_KEY_PASSWORD")
         }
     }
 
     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"
+            dimension = Constants.TYPE
-            buildConfigField("String", "FLAVOR", "\"fdroid\"")
+            proguardFile("fdroid-rules.pro")
         }
-        create("google") {
+        create("general") { dimension = Constants.TYPE }
-            dimension = "type"
-            buildConfigField("String", "FLAVOR", "\"google\"")
     }
-        create("full") { dimension = "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") {
+fun determineVersionName(): String {
-    dependsOn("licensee")
+    return with(getBuildTaskName().lowercase()) {
-    val outputAssets = layout.projectDirectory.dir("src/main/assets")
+        when {
-    from(layout.buildDirectory.file("reports/licensee/androidFdroidRelease/artifacts.json")) {
+            contains(Constants.NIGHTLY) || contains(Constants.PRERELEASE) ->
-        rename("artifacts.json", "licenses.json")
+                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)
+    }
+}

app/src/full/AndroidManifest.xml

@@ -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>

app/src/main/AndroidManifest.xml

@@ -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"
@@ -65,6 +66,7 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
+			android:banner="@mipmap/ic_banner"
 			android:windowSoftInputMode="adjustNothing"
             android:theme="@style/Theme.WireguardAutoTunnel"
 			android:configChanges="orientation|screenSize|keyboardHidden"
@@ -169,8 +171,7 @@
             android:exported="false"
 			android:directBootAware="true">
             <intent-filter>
-				<action android:name="android.intent.action.SCREEN_ON" />
+                <category android:name="android.intent.category.DEFAULT" />
-				<action android:name="android.intent.action.USER_PRESENT" />
                 <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" />

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

@@ -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.material3.MaterialTheme
-import androidx.compose.runtime.*
+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.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,14 +218,13 @@ 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(
@@ -221,7 +236,7 @@ class MainActivity : AppCompatActivity() {
                         modifier =
                             Modifier.pointerInput(Unit) {
                                 detectTapGestures {
-                                        viewModel.handleEvent(AppEvent.ClearSelectedTunnels)
+                                    viewModel.handleEvent(AppEvent.SetSelectedTunnel(null))
                                 }
                             },
                         snackbarHost = {
@@ -241,7 +256,45 @@ class MainActivity : AppCompatActivity() {
                                 enter = slideInVertically(initialOffsetY = { it }),
                                 exit = slideOutVertically(targetOffsetY = { it }),
                             ) {
-                                    BottomNavbar(appUiState = appUiState)
+                                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 ->
@@ -263,7 +316,7 @@ class MainActivity : AppCompatActivity() {
                                     MainScreen(appUiState, appViewState, viewModel)
                                 }
                                 composable<Route.Settings> {
-                                        SettingsScreen(appUiState, viewModel)
+                                    SettingsScreen(appUiState, appViewState, viewModel)
                                 }
                                 composable<Route.SettingsAdvanced> {
                                     SettingsAdvancedScreen(appUiState, viewModel)
@@ -275,24 +328,16 @@ class MainActivity : AppCompatActivity() {
                                     AutoTunnelScreen(appUiState, viewModel)
                                 }
                                 composable<Route.Appearance> { AppearanceScreen() }
-                                    composable<Route.Language> {
+                                composable<Route.Language> { LanguageScreen(appUiState, viewModel) }
-                                        LanguageScreen(appUiState, viewModel)
+                                composable<Route.Display> { DisplayScreen(appUiState, viewModel) }
-                                    }
+                                composable<Route.Support> { SupportScreen() }
-                                    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 =
+                                    val config = appUiState.tunnels.firstOrNull { it.id == args.id }
-                                            appUiState.tunnels.firstOrNull { it.id == args.id }
                                     ConfigScreen(config, viewModel)
                                 }
                                 composable<Route.TunnelOptions> { backStack ->
@@ -300,7 +345,7 @@ class MainActivity : AppCompatActivity() {
                                     appUiState.tunnels
                                         .firstOrNull { it.id == args.id }
                                         ?.let { config ->
-                                                TunnelOptionsScreen(config, viewModel)
+                                            TunnelOptionsScreen(config, appUiState, viewModel)
                                         }
                                 }
                                 composable<Route.Lock> { PinLockScreen(viewModel) }
@@ -328,7 +373,6 @@ class MainActivity : AppCompatActivity() {
             }
         }
     }
-    }
 
     override fun onResume() {
         super.onResume()

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/broadcast/RestartReceiver.kt

@@ -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) {

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

@@ -25,7 +25,7 @@ class DataStoreManager(
         val locationDisclosureShown = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
         val batteryDisableShown = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
         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")

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

@@ -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())

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

@@ -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,
-)

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

@@ -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,7 +20,7 @@ data class GeneralState(
             isLocationDisclosureShown,
             isBatteryOptimizationDisableShown,
             isPinLockEnabled,
-            expandedTunnelIds,
+            isTunnelStatsExpanded,
             isLocalLogsEnabled,
             isRemoteControlEnabled,
             remoteKey,
@@ -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
     }

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

@@ -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,
-        )
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/network/GitHubApi.kt

@@ -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>
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/network/KtorClient.kt

@@ -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
-            }
-        }
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/network/KtorGitHubApi.kt

@@ -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)
-        }
-    }
-}

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

@@ -38,36 +38,13 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
         dataStoreManager.saveToDataStore(DataStoreManager.batteryDisableShown, shown)
     }
 
-    override suspend fun setTunnelExpanded(id: Int) {
+    override suspend fun isTunnelStatsExpanded(): Boolean {
-        val ids =
+        return dataStoreManager.getFromStore(DataStoreManager.tunnelStatsExpanded)
-            dataStoreManager
+            ?: GeneralState.IS_TUNNEL_STATS_EXPANDED
-                .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 removeTunnelExpanded(id: Int) {
+    override suspend fun setTunnelStatsExpanded(expanded: Boolean) {
-        val ids =
+        dataStoreManager.saveToDataStore(DataStoreManager.tunnelStatsExpanded, expanded)
-            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 setTheme(theme: Theme) {
@@ -133,10 +110,9 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
                             isPinLockEnabled =
                                 pref[DataStoreManager.pinLockEnabled]
                                     ?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
-                            expandedTunnelIds =
+                            isTunnelStatsExpanded =
-                                pref[DataStoreManager.expandedTunnelIds]?.split(",")?.mapNotNull {
+                                pref[DataStoreManager.tunnelStatsExpanded]
-                                    it.toIntOrNull()
+                                    ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
-                                } ?: emptyList(),
                             isLocalLogsEnabled =
                                 pref[DataStoreManager.isLocalLogsEnabled]
                                     ?: GeneralState.IS_LOGS_ENABLED_DEFAULT,

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

@@ -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)
-            }
-        }
-}

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

@@ -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,
-        )
-    }
 }

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

@@ -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?,

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/entity/AppUpdate.kt

@@ -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?,
-)

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

@@ -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)
 

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

@@ -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>
-}

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

@@ -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

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

@@ -3,73 +3,39 @@ 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.layout.Arrangement
-import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.interaction.PressInteraction
+import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.*
+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,
+    isExpanded: Boolean,
-    expanded: (@Composable () -> Unit)?,
+    expanded: @Composable () -> Unit = {},
 ) {
-    val isTv = LocalIsAndroidTV.current
-    val haptic = LocalHapticFeedback.current
-    val interactionSource = remember { MutableInteractionSource() }
-
     Box(
         modifier =
             Modifier.animateContentSize()
                 .clip(RoundedCornerShape(8.dp))
-                .then(
+                .combinedClickable(onClick = { onClick() }, onLongClick = { onHold() })
-                    if (!isTv) {
-                        Modifier.combinedClickable(
-                                onClick = onClick,
-                                onLongClick = {
-                                    haptic.performHapticFeedback(HapticFeedbackType.LongPress)
-                                    onHold()
-                                },
-                                onDoubleClick = onDoubleClick,
-                            )
-                            .indication(
-                                interactionSource = interactionSource,
-                                indication = ripple(),
-                            )
-                    } else Modifier
-                )
     ) {
-        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),
@@ -92,7 +58,7 @@ fun ExpandingRowListItem(
                 }
                 trailing()
             }
-            expanded?.invoke()
+            if (isExpanded) expanded()
         }
     }
 }

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

@@ -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),
-    )
-}

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

@@ -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) {
+fun SelectionItemLabel(
-
+    textResId: Int,
-    val style =
+    style: androidx.compose.ui.text.TextStyle = MaterialTheme.typography.bodyMedium,
-        when (labelType) {
+    isDescription: Boolean = false,
-            SelectionLabelType.DESCRIPTION ->
+) {
-                MaterialTheme.typography.bodySmall.copy(color = MaterialTheme.colorScheme.outline)
+    Text(
-            SelectionLabelType.TITLE ->
+        text = stringResource(textResId),
-                MaterialTheme.typography.bodyMedium.copy(
+        style =
-                    color = MaterialTheme.colorScheme.onSurface
+            style.copy(
+                color =
+                    if (isDescription) MaterialTheme.colorScheme.outline
+                    else MaterialTheme.colorScheme.onSurface
+            ),
     )
-        }
-
-    Text(text = text, style = style, modifier = modifier)
-}
-
-enum class SelectionLabelType {
-    DESCRIPTION,
-    TITLE,
 }

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

@@ -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)
-    }
-}

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

@@ -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),
+                    )
+                }
+            }
+        }
+    }
+}

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

@@ -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

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

@@ -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)),
+                    ),
+            )
+        }
+    }
+}

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

@@ -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

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

@@ -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 }

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

@@ -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") }

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

@@ -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() =
+    return produceState(initialValue = NavBarState(), key1 = backStackEntry, key2 = uiState) {
-        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,
-    ) {
         value =
             when {
                 backStackEntry.isCurrentRoute(Route.Main::class) -> {
                     NavBarState(
                         showTop = true,
                         showBottom = true,
-                        topTitle = { Text(stringResource(R.string.tunnels)) },
+                        { Text(stringResource(R.string.tunnels)) },
-                        topTrailing = { TunnelActionBar() },
+                        {
+                            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)) },
+                        { Text(stringResource(R.string.auto_tunnel)) },
-                        topTrailing = {
+                        {
                             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),
+                                    stringResource(description),
-                                    tint = tint,
+                                    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)) },
+                        { Text(stringResource(R.string.logs)) },
-                        topTrailing = {
+                        {
-                            ActionIconButton(Icons.Rounded.Menu, R.string.quick_actions) {
+                            IconButton(
-                                viewModel.handleEvent(
+                                onClick = { viewModel.handleEvent(AppEvent.ToggleBottomSheet) }
-                                    AppEvent.SetBottomSheet(AppViewState.BottomSheet.LOGS)
+                            ) {
+                                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) } },
+                        { tunnel?.name?.let { Text(it) } },
-                        topTrailing = {
+                        {
-                            ActionIconButton(Icons.Rounded.Edit, R.string.edit_tunnel) {
+                            IconButton(
-                                tunnel?.id?.let { navController.navigate(Route.Config(it)) }
+                                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) } },
+                        { name?.let { Text(it) } },
-                        topTrailing = {
+                        {
-                            ActionIconButton(Icons.Rounded.Save, R.string.save) {
+                            IconButton(
-                                viewModel.handleEvent(AppEvent.InvokeScreenAction)
+                                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) } },
+                        { name?.let { Text(it) } },
-                        topTrailing = {
+                        {
-                            ActionIconButton(Icons.Rounded.Save, R.string.save) {
+                            IconButton(
-                                viewModel.handleEvent(AppEvent.InvokeScreenAction)
+                                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)
             }
     }

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

@@ -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(

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/enums/InterfaceActions.kt

@@ -0,0 +1,7 @@
+package com.zaneschepke.wireguardautotunnel.ui.enums
+
+enum class InterfaceActions {
+    TOGGLE_AMNEZIA_VALUES,
+    SET_AMNEZIA_COMPATIBILITY,
+    TOGGLE_SHOW_SCRIPTS,
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/enums/PeerActions.kt

@@ -0,0 +1,5 @@
+package com.zaneschepke.wireguardautotunnel.ui.enums
+
+enum class PeerActions {
+    EXCLUDE_LAN
+}

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

@@ -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,
-                )
-            }
-        }
-    }
-}

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

@@ -8,6 +8,8 @@ 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.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -22,10 +24,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.common.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.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 +33,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 +41,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 +67,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
         }
     }
 
@@ -108,9 +109,9 @@ fun AutoTunnelScreen(uiState: AppUiState, viewModel: AppViewModel) {
                     { isWifiNameReadable() },
                 )
         )
-        SectionDivider()
+        HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(0.30f))
         SurfaceSelectionGroupButton(items = NetworkTunnelingItems(uiState, viewModel))
-        SectionDivider()
+        HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(0.30f))
         SurfaceSelectionGroupButton(
             items =
                 listOf(

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

@@ -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)
                         }
                     },

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

@@ -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.common.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.ExportTunnelsBottomSheet
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelImportSheet
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelList
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.UrlImportDialog
@@ -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 = {
+            onDismiss = { showDeleteTunnelAlertDialog = false },
-                viewModel.handleEvent(AppEvent.SetShowModal(AppViewState.ModalType.NONE))
-            },
             onAttest = {
-                viewModel.handleEvent(AppEvent.DeleteSelectedTunnels)
+                appViewState.selectedTunnel.let { viewModel.handleEvent(AppEvent.DeleteTunnel(it)) }
-                viewModel.handleEvent(AppEvent.SetShowModal(AppViewState.ModalType.NONE))
+                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,21 +77,11 @@ fun MainScreen(appUiState: AppUiState, appViewState: AppViewState, viewModel: Ap
         )
     }
 
-    when (appViewState.bottomSheet) {
-        AppViewState.BottomSheet.EXPORT_TUNNELS -> {
-            ExportTunnelsBottomSheet(viewModel)
-        }
-        AppViewState.BottomSheet.IMPORT_TUNNELS -> {
     TunnelImportSheet(
-                onDismiss = {
+        appViewState.showBottomSheet,
-                    viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
+        onDismiss = { viewModel.handleEvent(AppEvent.ToggleBottomSheet) },
-                },
+        onFileClick = { tunnelFileImportResultLauncher.launch(Constants.ALLOWED_TV_FILE_TYPES) },
-                onFileClick = {
+        onQrClick = { requestPermissionLauncher.launch(android.Manifest.permission.CAMERA) },
-                    tunnelFileImportResultLauncher.launch(Constants.ALLOWED_TV_FILE_TYPES)
-                },
-                onQrClick = {
-                    requestPermissionLauncher.launch(android.Manifest.permission.CAMERA)
-                },
         onClipboardClick = {
             clipboard.getText()?.text?.let {
                 viewModel.handleEvent(AppEvent.ImportTunnelFromClipboard(it))
@@ -99,9 +92,6 @@ fun MainScreen(appUiState: AppUiState, appViewState: AppViewState, viewModel: Ap
         },
         onUrlClick = { showUrlImportDialog = true },
     )
-        }
-        else -> Unit
-    }
 
     if (showUrlImportDialog) {
         UrlImportDialog(
@@ -115,11 +105,22 @@ 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))
         },
+        onExpandStats = { viewModel.handleEvent(AppEvent.ToggleTunnelStatsExpanded) },
+        onCopyTunnel = {
+            viewModel.handleEvent(AppEvent.CopyTunnel(it))
+            viewModel.handleEvent(AppEvent.SetSelectedTunnel(null))
+        },
         modifier = Modifier.fillMaxSize().padding(vertical = 24.dp).padding(horizontal = 12.dp),
         viewModel = viewModel,
     )

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

@@ -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))
-    }
-}

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

@@ -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,11 +37,10 @@ fun TunnelImportSheet(
     onClipboardClick: () -> Unit,
     onUrlClick: () -> Unit,
 ) {
-    val isTv = LocalIsAndroidTV.current
-
     val sheetState = rememberModalBottomSheetState()
 
     val context = LocalContext.current
+    if (show) {
         ModalBottomSheet(
             containerColor = MaterialTheme.colorScheme.surface,
             onDismissRequest = { onDismiss() },
@@ -60,9 +60,12 @@ fun TunnelImportSheet(
                     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))
+                Text(
+                    stringResource(id = R.string.add_tunnels_text),
+                    modifier = Modifier.padding(10.dp),
+                )
             }
-        if (!isTv) {
+            if (!context.isRunningOnTv()) {
                 HorizontalDivider()
                 Row(
                     modifier =
@@ -78,7 +81,10 @@ fun TunnelImportSheet(
                         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))
+                    Text(
+                        stringResource(id = R.string.add_from_qr),
+                        modifier = Modifier.padding(10.dp),
+                    )
                 }
                 HorizontalDivider()
                 Row(
@@ -130,7 +136,11 @@ fun TunnelImportSheet(
                     contentDescription = stringResource(id = R.string.create_import),
                     modifier = Modifier.padding(10.dp),
                 )
-            Text(stringResource(id = R.string.create_import), modifier = Modifier.padding(10.dp))
+                Text(
+                    stringResource(id = R.string.create_import),
+                    modifier = Modifier.padding(10.dp),
+                )
+            }
         }
     }
 }

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

@@ -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>,
+    activeTunnels: Map<TunnelConf, TunnelState>,
-    modifier: Modifier = Modifier,
+    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 =
+            val tunnelState = activeTunnels.getValueById(tunnel.id) ?: TunnelState()
-                remember(appUiState.activeTunnels) {
-                    appUiState.activeTunnels.getValueById(tunnel.id) ?: TunnelState()
-                }
-            val selected = remember(selectedTunnels) { selectedTunnels.any { it.id == tunnel.id } }
             TunnelRowItem(
-                state = tunnelState,
+                isActive = tunnelState.status.isUpOrStarting(),
-                expanded = appUiState.appState.expandedTunnelIds.contains(tunnel.id),
+                expanded = appUiState.appState.isTunnelStatsExpanded,
-                isSelected = selected,
+                isSelected = selectedTunnel?.id == tunnel.id,
                 tunnel = tunnel,
                 tunnelState = tunnelState,
-                onClick = {
+                onSetSelectedTunnel = { onSetSelectedTunnel(it) },
-                    navController.navigate(Route.TunnelOptions(tunnel.id))
+                onClick = onExpandStats,
-                    viewModel.handleEvent(AppEvent.ClearSelectedTunnels)
+                onCopy = { onCopyTunnel(tunnel) },
-                },
+                onDelete = { onDeleteTunnel(tunnel) },
-                onDoubleClick = {
-                    viewModel.handleEvent(AppEvent.ToggleTunnelStatsExpanded(tunnel.id))
-                },
-                onToggleSelectedTunnel = {
-                    viewModel.handleEvent(AppEvent.ToggleSelectedTunnel(it))
-                },
                 onSwitchClick = { checked -> onToggleTunnel(tunnel, checked) },
+                viewModel = viewModel,
             )
         }
     }

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

@@ -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,
+    isActive: Boolean,
-    isSelected: Boolean,
     expanded: Boolean,
+    isSelected: Boolean,
     tunnel: TunnelConf,
     tunnelState: TunnelState,
+    onSetSelectedTunnel: (TunnelConf?) -> Unit,
     onClick: () -> Unit,
-    onDoubleClick: () -> Unit,
+    onCopy: () -> Unit,
-    onToggleSelectedTunnel: (TunnelConf) -> 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 =
+    val leadingIconColor = if (!isActive) Color.Gray else tunnelState.statistics.asColor()
-        remember(state) {
-            if (state.status.isUp()) tunnelState.statistics.asColor() else Color.Gray
-        }
 
     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)
         }
-        }
 
     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 = { if (!isTv) onToggleSelectedTunnel(tunnel) },
+        onHold = {
-        onClick = { if (!isTv) onClick() },
+            haptic.performHapticFeedback(HapticFeedbackType.LongPress)
-        onDoubleClick = { if (!isTv) onDoubleClick() },
+            onSetSelectedTunnel(tunnel)
+        },
+        onClick = {
+            if (!isTv) {
+                if (isActive) onClick()
+            } else {
+                onSetSelectedTunnel(tunnel)
+                itemFocusRequester.requestFocus()
+            }
+        },
+        isExpanded = expanded && isActive,
         expanded = {
-            if (expanded) {
+            if (isActive && expanded) TunnelStatisticsRow(tunnelState.statistics, tunnel)
-                TunnelStatisticsRow(tunnelState.statistics, tunnel)
-            } else null
         },
         trailing = {
+            if (isSelected && !isTv) {
                 Row(
-                verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
+                    horizontalArrangement = Arrangement.SpaceEvenly,
+                ) {
+                    IconButton(
+                        modifier = Modifier.weight(1f),
+                        onClick = {
+                            onSetSelectedTunnel(null)
+                            navController.navigate(Route.TunnelOptions(tunnel.id))
+                        },
                     ) {
-                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),
+                            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),
                         )
                     }
                 }
-                ScaledSwitch(checked = state.status.isUpOrStarting(), onClick = onSwitchClick)
+            } 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,
+                    )
+                }
+            } else {
+                ScaledSwitch(
+                    modifier = Modifier.focusRequester(itemFocusRequester),
+                    checked = isActive,
+                    onClick = onSwitchClick,
+                )
             }
         },
-        isSelected = isSelected,
     )
 }

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

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

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

@@ -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 =
+        _uiState.value = currentState.copy(tunneledApps = updatedApps)
-            currentState.queriedApps.map { (app, selected) ->
-                if (app.`package` == packageName) Pair(app, !selected) else Pair(app, selected)
-            }
-        _uiState.value =
-            currentState.copy(tunneledApps = updatedApps, queriedApps = updatedQueryApps)
     }
 
     fun saveChanges() =

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

@@ -29,7 +29,7 @@ fun SplitTunnelContent(
         )
         if (uiState.splitOption != SplitOption.ALL) {
             AppListSection(
-                apps = uiState.queriedApps,
+                apps = uiState.tunneledApps,
                 onAppSelectionToggle = onAppSelectionToggle,
                 onQueryChange = onQueryChange,
                 uiState.searchQuery,

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

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

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

@@ -6,18 +6,33 @@ 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.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
 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,
@@ -37,7 +52,7 @@ fun TunnelOptionsScreen(tunnelConf: TunnelConf, viewModel: AppViewModel) {
                     SplitTunnelingItem(tunnelConf),
                 )
         )
-        SectionDivider()
+        HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(0.30f))
         SurfaceSelectionGroupButton(
             items =
                 buildList {

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

@@ -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 {

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

@@ -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 {

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

@@ -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.common.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.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()

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

@@ -8,21 +8,23 @@ 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.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
 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.common.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.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,16 +32,22 @@ 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) {
+fun SettingsScreen(uiState: AppUiState, appViewState: AppViewState, viewModel: AppViewModel) {
-    val isTv = LocalIsAndroidTV.current
+    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),
@@ -49,7 +57,7 @@ fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
                 .padding(vertical = 24.dp)
                 .padding(horizontal = 12.dp)
                 .then(
-                    if (!isTv) {
+                    if (!isRunningOnTv) {
                         Modifier.clickable(
                             indication = null,
                             interactionSource = interactionSource,
@@ -64,12 +72,12 @@ 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()
+        HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(0.30f))
         SurfaceSelectionGroupButton(
             items =
                 buildList {
@@ -79,10 +87,10 @@ fun SettingsScreen(uiState: AppUiState, viewModel: AppViewModel) {
                     add(PinLockItem(uiState, viewModel))
                 }
         )
-        SectionDivider()
+        HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(0.30f))
-        if (!isTv) {
+        if (!isRunningOnTv) {
             SurfaceSelectionGroupButton(items = listOf(KernelModeItem(uiState, viewModel)))
-            SectionDivider()
+            HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(0.30f))
         }
         SurfaceSelectionGroupButton(
             items =

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

@@ -4,11 +4,12 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.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
@@ -22,9 +23,9 @@ fun AppearanceScreen() {
         modifier = Modifier.fillMaxSize().padding(vertical = 24.dp).padding(horizontal = 12.dp),
     ) {
         SurfaceSelectionGroupButton(items = listOf(LanguageItem()))
-        SectionDivider()
+        HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(0.30f))
         SurfaceSelectionGroupButton(items = listOf(NotificationsItem()))
-        SectionDivider()
+        HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(0.30f))
         SurfaceSelectionGroupButton(items = listOf(DisplayThemeItem()))
     }
 }

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

@@ -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 {

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

@@ -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 {

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

@@ -8,12 +8,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
-import com.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
 import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import java.text.Collator
 import java.util.*
@@ -21,7 +22,9 @@ import java.util.*
 @Composable
 fun LanguageScreen(appUiState: AppUiState, viewModel: AppViewModel) {
     val collator = Collator.getInstance(Locale.getDefault())
-    val isTv = LocalIsAndroidTV.current
+
+    val context = LocalContext.current
+    val isAndroidTv = remember { context.isRunningOnTv() }
 
     val locales =
         LocaleUtil.supportedLocales.map {
@@ -39,9 +42,9 @@ fun LanguageScreen(appUiState: AppUiState, viewModel: AppViewModel) {
         verticalArrangement = Arrangement.Top,
         modifier = Modifier.padding(horizontal = 12.dp),
     ) {
-        item { AutomaticLanguageItem(appUiState, viewModel, isTv) }
+        item { AutomaticLanguageItem(appUiState, viewModel, isAndroidTv) }
         items(sortedLocales, key = { it }) { locale ->
-            LanguageItem(locale, appUiState, viewModel, isTv)
+            LanguageItem(locale, appUiState, viewModel, isAndroidTv)
         }
     }
 }

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

@@ -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 {

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

@@ -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),
+            )
+        }
+    }
+}

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

@@ -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 {

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

@@ -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 = {
+        title = { SelectionItemLabel(R.string.local_logging) },
-            SelectionItemLabel(stringResource(R.string.local_logging), SelectionLabelType.TITLE)
+        description = { SelectionItemLabel(R.string.enable_local_logging, isDescription = true) },
-        },
-        description = {
-            SelectionItemLabel(
-                stringResource(R.string.enable_local_logging),
-                SelectionLabelType.DESCRIPTION,
-            )
-        },
         trailing = {
             ScaledSwitch(
                 checked = uiState.appState.isLocalLogsEnabled,

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

@@ -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

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

@@ -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.common.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
 
 @Composable
 fun ReadLogsItem(): SelectionItem {
     val navController = LocalNavController.current
     return SelectionItem(
         leadingIcon = Icons.Filled.ViewTimeline,
-        title = {
+        title = { SelectionItemLabel(R.string.read_logs) },
-            SelectionItemLabel(stringResource(R.string.read_logs), SelectionLabelType.TITLE)
-        },
         trailing = { ForwardButton { navController.navigate(Route.Logs) } },
         onClick = { navController.navigate(Route.Logs) },
     )

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

@@ -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.common.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.components.AppSettingsItem
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.disclosure.components.AppSettingsItem
-import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.components.LocationDisclosureHeader
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.disclosure.components.LocationDisclosureHeader
-import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.components.SkipItem
+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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -4,30 +4,32 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
 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),
     ) {
-        if (!isTv) {
+        if (!context.isRunningOnTv()) {
             SurfaceSelectionGroupButton(items = listOf(NativeKillSwitchItem()))
-            SectionDivider()
+            HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(0.30f))
         }
         SurfaceSelectionGroupButton(
             items =

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

@@ -65,12 +65,9 @@ fun LogsScreen(appViewState: AppViewState, viewModel: AppViewModel) {
             }
     }
 
-    when (appViewState.bottomSheet) {
+    if (appViewState.showBottomSheet) {
-        AppViewState.BottomSheet.LOGS -> {
         LogsBottomSheet(viewModel)
     }
-        else -> Unit
-    }
 
     if (logs.isEmpty()) {
         return Box(

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

@@ -18,7 +18,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
@@ -27,17 +26,13 @@ import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 fun LogsBottomSheet(viewModel: AppViewModel) {
     ModalBottomSheet(
         containerColor = MaterialTheme.colorScheme.surface,
-        onDismissRequest = {
+        onDismissRequest = { viewModel.handleEvent(AppEvent.ToggleBottomSheet) },
-            viewModel.handleEvent(AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE))
-        },
     ) {
         Row(
             modifier =
                 Modifier.fillMaxWidth()
                     .clickable {
-                        viewModel.handleEvent(
+                        viewModel.handleEvent(AppEvent.ToggleBottomSheet)
-                            AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE)
-                        )
                         viewModel.handleEvent(AppEvent.ExportLogs)
                     }
                     .padding(10.dp)
@@ -54,9 +49,7 @@ fun LogsBottomSheet(viewModel: AppViewModel) {
             modifier =
                 Modifier.fillMaxWidth()
                     .clickable {
-                        viewModel.handleEvent(
+                        viewModel.handleEvent(AppEvent.ToggleBottomSheet)
-                            AppEvent.SetBottomSheet(AppViewState.BottomSheet.NONE)
-                        )
                         viewModel.handleEvent(AppEvent.DeleteLogs)
                     }
                     .padding(10.dp)

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

@@ -1,111 +1,29 @@
 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.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
-import androidx.compose.runtime.*
 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.ui.screens.support.components.VersionLabel
-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
 
 @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()
@@ -117,19 +35,11 @@ fun SupportScreen(viewModel: SupportViewModel = hiltViewModel(), appViewModel: A
     ) {
         GroupLabel(
             stringResource(R.string.thank_you),
-            modifier = Modifier.padding(horizontal = 12.dp).padding(bottom = 12.dp),
+            modifier = Modifier.padding(horizontal = 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()
         GeneralSupportOptions(context)
-        SectionDivider()
+        HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(0.30f))
         ContactSupportOptions(context)
+        VersionLabel()
     }
 }

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

@@ -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,
-)

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

@@ -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:"
-    }
-}

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

@@ -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 = {
+                            title = { SelectionItemLabel(R.string.join_matrix) },
-                                SelectionItemLabel(
-                                    stringResource(R.string.join_matrix),
-                                    SelectionLabelType.TITLE,
-                                )
-                            },
                             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 = {
+                            title = { SelectionItemLabel(R.string.join_telegram) },
-                                SelectionItemLabel(
-                                    stringResource(R.string.join_telegram),
-                                    SelectionLabelType.TITLE,
-                                )
-                            },
                             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 = {
+                            title = { SelectionItemLabel(R.string.open_issue) },
-                                SelectionItemLabel(
-                                    stringResource(R.string.open_issue),
-                                    SelectionLabelType.TITLE,
-                                )
-                            },
                             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 = {
+                            title = { SelectionItemLabel(R.string.email_description) },
-                                SelectionItemLabel(
-                                    stringResource(R.string.email_description),
-                                    SelectionLabelType.TITLE,
-                                )
-                            },
                             trailing = { ForwardButton { context.launchSupportEmail() } },
                             onClick = { context.launchSupportEmail() },
                         ),
@@ -89,12 +67,7 @@ fun ContactSupportOptions(context: android.content.Context) {
                     add(
                         SelectionItem(
                             leadingIcon = Icons.Filled.Favorite,
-                            title = {
+                            title = { SelectionItemLabel(R.string.donate) },
-                                SelectionItemLabel(
-                                    stringResource(R.string.donate),
-                                    SelectionLabelType.TITLE,
-                                )
-                            },
                             trailing = {
                                 ForwardButton {
                                     context.openWebUrl(context.getString(R.string.donate_url))

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

@@ -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 = {
+                        title = { SelectionItemLabel(R.string.docs_description) },
-                            SelectionItemLabel(
-                                stringResource(R.string.docs_description),
-                                SelectionLabelType.TITLE,
-                            )
-                        },
                         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 = {
+                        title = { SelectionItemLabel(R.string.privacy_policy) },
-                            SelectionItemLabel(
-                                stringResource(R.string.privacy_policy),
-                                SelectionLabelType.TITLE,
-                            )
-                        },
                         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) },
-                    )
-                )
             }
     )
 }

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

@@ -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,
-            )
-        )
-    )
-}

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

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

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

@@ -1,15 +0,0 @@
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class LicenseFileEntry(
-    val groupId: String,
-    val artifactId: String,
-    val version: String,
-    val name: String,
-    val spdxLicenses: List<SpdxLicense> = emptyList(),
-    val scm: Scm? = null,
-)
-
-@Serializable data class SpdxLicense(val identifier: String, val name: String, val url: String)
-
-@Serializable data class Scm(val url: String)

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

@@ -1,45 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.support.license
-
-import LicenseFileEntry
-import android.content.Context
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.license.components.LicenseList
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import kotlinx.serialization.json.Json
-
-@Composable
-fun LicenseScreen() {
-    val context = LocalContext.current
-    var licenses by remember { mutableStateOf<List<LicenseFileEntry>>(emptyList()) }
-
-    LaunchedEffect(Unit) { licenses = loadLicenseeJson(context) }
-
-    if (licenses.isEmpty()) {
-        Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-            CircularProgressIndicator()
-        }
-    } else {
-        LicenseList(licenses)
-    }
-}
-
-suspend fun loadLicenseeJson(context: Context): List<LicenseFileEntry> {
-    return withContext(Dispatchers.IO) {
-        val json = Json { ignoreUnknownKeys = true }
-
-        val jsonResult = context.assets.open("licenses.json").bufferedReader().use { it.readText() }
-        json.decodeFromString(jsonResult)
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/license/components/LicenseList.kt

@@ -1,44 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.support.license.components
-
-import LicenseFileEntry
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun LicenseList(licenses: List<LicenseFileEntry>) {
-    LazyColumn(modifier = Modifier.fillMaxSize().padding(16.dp)) {
-        items(licenses) { entry ->
-            Column(modifier = Modifier.padding(bottom = 12.dp)) {
-                Text(
-                    text = "${entry.name} (${entry.version})",
-                    style = MaterialTheme.typography.titleSmall,
-                )
-
-                entry.spdxLicenses.forEach { license ->
-                    Text(
-                        text = license.name,
-                        style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.primary,
-                    )
-                }
-
-                entry.scm?.url?.let { scmUrl ->
-                    Text(
-                        text = scmUrl,
-                        style = MaterialTheme.typography.labelSmall,
-                        modifier = Modifier.padding(top = 4.dp),
-                        color = MaterialTheme.colorScheme.secondary,
-                    )
-                }
-            }
-        }
-    }
-}

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

@@ -15,5 +15,6 @@ data class AppUiState(
     val isAutoTunnelActive: Boolean = false,
     val appConfigurationChange: Boolean = false,
     val isAppLoaded: Boolean = false,
+    val selectedTunnel: TunnelConf? = null,
     val networkStatus: NetworkStatus? = null,
 )

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/state/AppViewState.kt

@@ -8,22 +8,8 @@ data class AppViewState(
     val errorMessage: StringValue? = null,
     val popBackStack: Boolean = false,
     val isAppReady: Boolean = false,
-    val bottomSheet: BottomSheet = BottomSheet.NONE,
+    val showBottomSheet: Boolean = false,
-    val selectedTunnels: List<TunnelConf> = emptyList(),
+    val selectedTunnel: TunnelConf? = null,
     val requestVpnPermission: Boolean = false,
     val requestBatteryPermission: Boolean = false,
-    val showModal: ModalType = ModalType.NONE,
+)
-) {
-    enum class ModalType {
-        NONE,
-        DELETE,
-        INFO,
-    }
-
-    enum class BottomSheet {
-        EXPORT_TUNNELS,
-        IMPORT_TUNNELS,
-        LOGS,
-        NONE,
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/state/InterfaceProxy.kt

@@ -75,7 +75,10 @@ data class InterfaceProxy(
     }
 
     fun isAmneziaCompatibilityModeSet(): Boolean {
-        return with(initPacketJunkSize.toIntOrNull()) { this == 0 || this == null } &&
+        return junkPacketCount.toIntOrNull() in 3..<5 &&
+            junkPacketMinSize.toIntOrNull() == 40 &&
+            junkPacketMaxSize.toIntOrNull() == 70 &&
+            with(initPacketJunkSize.toIntOrNull()) { this == 0 || this == null } &&
             with(responsePacketJunkSize.toIntOrNull()) { this == 0 || this == null } &&
             initPacketMagicHeader.toLongOrNull() == 1L &&
             responsePacketMagicHeader.toLongOrNull() == 2L &&

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/state/NavBarState.kt

@@ -1,12 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.state
-
-import androidx.compose.runtime.Composable
-import com.zaneschepke.wireguardautotunnel.ui.Route
-
-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,
-)

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

@@ -78,7 +78,6 @@ fun WireguardAutoTunnelTheme(theme: Theme = Theme.AUTOMATIC, content: @Composabl
 
     val view = LocalView.current
     if (!view.isInEditMode) {
-        @Suppress("DEPRECATION")
         SideEffect {
             val window = (view.context as Activity).window
             WindowCompat.setDecorFitsSystemWindows(window, false)

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

@@ -14,7 +14,7 @@ object Constants {
     const val ZIP_FILE_EXTENSION = ".zip"
     const val URI_CONTENT_SCHEME = "content"
     private const val TEXT_MIME_TYPE = "text/plain"
-    const val ZIP_FILE_MIME_TYPE = "application/zip"
+    private const val ZIP_FILE_MIME_TYPE = "application/zip"
     const val ALLOWED_TV_FILE_TYPES = "${TEXT_MIME_TYPE}|${ZIP_FILE_MIME_TYPE}"
     const val ALL_FILE_TYPES = "*/*"
     const val GOOGLE_TV_EXPLORER_STUB = "com.google.android.tv.frameworkpackagestubs"
@@ -22,8 +22,6 @@ object Constants {
     const val VPN_SETTINGS_PACKAGE = "android.net.vpn.SETTINGS"
     const val SYSTEM_EXEMPT_SERVICE_TYPE_ID = 1024
 
-    const val DEFAULT_EXPORT_FILE_NAME = "wgtunnel-export.zip"
-
     const val SUBSCRIPTION_TIMEOUT = 5_000L
 
     const val DEFAULT_PING_IP = "1.1.1.1"

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

@@ -1,22 +1,19 @@
 package com.zaneschepke.wireguardautotunnel.util
 
-import android.content.ContentValues
 import android.content.Context
 import android.database.Cursor
 import android.net.Uri
-import android.os.Build
-import android.provider.MediaStore
 import android.provider.OpenableColumns
-import androidx.annotation.RequiresApi
 import androidx.core.content.FileProvider
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.util.extensions.getInputStreamFromUri
-import com.zaneschepke.wireguardautotunnel.util.extensions.installApk
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchShareFile
 import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
-import java.io.*
+import java.io.BufferedOutputStream
+import java.io.File
+import java.io.FileOutputStream
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import java.util.zip.ZipOutputStream
@@ -29,118 +26,53 @@ class FileUtils(private val context: Context, private val ioDispatcher: Coroutin
 
     suspend fun createWgFiles(tunnels: List<TunnelConf>): List<File> =
         withContext(ioDispatcher) {
-            tunnels.mapNotNull { config ->
+            tunnels.map { config ->
-                if (config.wgQuick.isBlank()) {
-                    Timber.w("Skipping tunnel ${config.tunName}: empty wgQuick config")
-                    return@mapNotNull null
-                }
                 val file = File(context.cacheDir, "${config.tunName}-wg.conf")
                 file.outputStream().use { it.write(config.wgQuick.toByteArray()) }
-                Timber.d("Created WG file: ${file.path}, size: ${file.length()} bytes")
-                if (file.length() == 0L) {
-                    Timber.w("WG file ${file.path} is empty")
-                    null
-                } else {
                 file
             }
         }
-        }
 
     suspend fun createAmFiles(tunnels: List<TunnelConf>): List<File> =
         withContext(ioDispatcher) {
             tunnels
-                .filter { it.amQuick != TunnelConfig.AM_QUICK_DEFAULT && it.amQuick.isNotBlank() }
+                .filter { it.amQuick != TunnelConfig.AM_QUICK_DEFAULT }
-                .mapNotNull { config ->
+                .map { config ->
                     val file = File(context.cacheDir, "${config.tunName}-am.conf")
                     file.outputStream().use { it.write(config.amQuick.toByteArray()) }
-                    Timber.d("Created AM file: ${file.path}, size: ${file.length()} bytes")
-                    if (file.length() == 0L) {
-                        Timber.w("AM file ${file.path} is empty")
-                        null
-                    } else {
                     file
                 }
         }
-        }
 
     suspend fun zipAll(zipFile: File, files: List<File>) =
         withContext(ioDispatcher) {
             ZipOutputStream(BufferedOutputStream(FileOutputStream(zipFile))).use { zos ->
                 files.forEach { file ->
-                    if (!file.exists() || file.length() == 0L) {
+                    val zipFileName =
-                        Timber.w("Skipping file ${file.path}: does not exist or empty")
+                        (file.parentFile?.let { parent ->
-                        return@forEach
+                                file.absolutePath.removePrefix(parent.absolutePath)
-                    }
+                            } ?: file.absolutePath)
-                    val entryName = file.name // Use file name only, avoid complex path logic
+                            .removePrefix("/")
-                    val entry = ZipEntry(entryName)
+                    val entry = ZipEntry("$zipFileName${(if (file.isDirectory) "/" else "")}")
                     zos.putNextEntry(entry)
-                    FileInputStream(file).use { fis ->
+                    if (file.isFile) {
-                        fis.copyTo(zos)
+                        file.inputStream().use { it.copyTo(zos) }
-                        Timber.d(
-                            "Added ${file.path} to zip as $entryName, size: ${file.length()} bytes"
-                        )
                     }
-                    zos.closeEntry()
                 }
-                zos.flush()
-                Timber.d("Finished zipping: ${zipFile.path}, size: ${zipFile.length()} bytes")
             }
         }
 
     suspend fun createNewShareFile(name: String): File =
         withContext(ioDispatcher) {
             val sharePath = File(context.filesDir, "external_files")
-            if (sharePath.exists()) sharePath.deleteRecursively()
+            if (sharePath.exists()) sharePath.delete()
-            sharePath.mkdirs()
+            sharePath.mkdir()
-            val file = File(sharePath, name)
+            val file = File("${sharePath.path}/$name")
             if (file.exists()) file.delete()
             file.createNewFile()
-            Timber.d("Created share file: ${file.path}")
             file
         }
 
-    suspend fun copyFileToUri(sourceFile: File, destinationUri: Uri): Result<Unit> =
-        withContext(ioDispatcher) {
-            try {
-                if (!sourceFile.exists()) {
-                    Timber.e("Source file does not exist: ${sourceFile.path}")
-                    return@withContext Result.failure(IOException("Source file does not exist"))
-                }
-                if (!sourceFile.canRead()) {
-                    Timber.e("Source file is not readable: ${sourceFile.path}")
-                    return@withContext Result.failure(IOException("Source file is not readable"))
-                }
-                if (sourceFile.length() == 0L) {
-                    Timber.e("Source file is empty: ${sourceFile.path}")
-                    return@withContext Result.failure(IOException("Source file is empty"))
-                }
-
-                Timber.d("Copying file: ${sourceFile.path}, size: ${sourceFile.length()} bytes")
-                var bytesCopied = 0L
-                FileInputStream(sourceFile).use { inputStream ->
-                    context.contentResolver.openOutputStream(destinationUri)?.use { outputStream ->
-                        val buffer = ByteArray(1024 * 1024) // 1MB buffer
-                        var bytesRead: Int
-                        while (inputStream.read(buffer).also { bytesRead = it } != -1) {
-                            outputStream.write(buffer, 0, bytesRead)
-                            bytesCopied += bytesRead
-                            Timber.d("Copied $bytesCopied bytes so far")
-                        }
-                        outputStream.flush()
-                        Timber.d("Total bytes copied: $bytesCopied")
-                        Result.success(Unit)
-                    }
-                        ?: run {
-                            Timber.e("Failed to open OutputStream for Uri: $destinationUri")
-                            Result.failure(IOException("Failed to open OutputStream for Uri"))
-                        }
-                }
-            } catch (e: IOException) {
-                Timber.e(e, "Error copying file to Uri: ${e.message}")
-                Result.failure(e)
-            }
-        }
-
     private fun getDisplayNameColumnIndex(cursor: Cursor): Int? {
         val columnIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
         if (columnIndex == -1) return null
@@ -229,33 +161,4 @@ class FileUtils(private val context: Context, private val ioDispatcher: Coroutin
             FileProvider.getUriForFile(context, context.getString(R.string.provider), shareFile)
         context.launchShareFile(uri)
     }
-
-    @RequiresApi(Build.VERSION_CODES.Q)
-    suspend fun saveToDownloadsWithMediaStore(file: File, mimeType: String): Uri? =
-        withContext(ioDispatcher) {
-            val contentValues =
-                ContentValues().apply {
-                    put(MediaStore.Downloads.DISPLAY_NAME, file.name)
-                    put(MediaStore.Downloads.MIME_TYPE, mimeType)
-                    put(MediaStore.Downloads.IS_PENDING, 1)
-                }
-
-            val resolver = context.contentResolver
-            val collection = MediaStore.Downloads.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
-            val itemUri = resolver.insert(collection, contentValues) ?: return@withContext null
-
-            resolver.openOutputStream(itemUri)?.use { output ->
-                file.inputStream().use { input -> input.copyTo(output) }
-            }
-            // Mark as finished
-            contentValues.clear()
-            contentValues.put(MediaStore.Downloads.IS_PENDING, 0)
-            resolver.update(itemUri, contentValues, null, null)
-
-            return@withContext itemUri
-        }
-
-    fun installApk(file: File) {
-        context.installApk(file)
-    }
 }

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

@@ -1,11 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.util
 
-import com.vdurmont.semver4j.Semver
 import java.math.BigDecimal
 import java.time.Duration
 import java.time.Instant
 import kotlin.math.pow
-import timber.log.Timber
 
 object NumberUtils {
     private const val BYTES_IN_KB = 1024.0
@@ -40,15 +38,4 @@ object NumberUtils {
             null
         }
     }
-
-    fun compareVersions(newVersion: String, currentVersion: String): Int {
-        try {
-            val newSemver = Semver(newVersion, Semver.SemverType.LOOSE)
-            val currentSemver = Semver(currentVersion, Semver.SemverType.LOOSE)
-            return newSemver.compareTo(currentSemver)
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to compare versions $newVersion and $currentVersion")
-            return 0
-        }
-    }
 }

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

@@ -14,21 +14,24 @@ import android.os.PowerManager
 import android.provider.Settings
 import android.service.quicksettings.TileService
 import android.widget.Toast
-import androidx.core.content.FileProvider
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
 import androidx.core.location.LocationManagerCompat
-import androidx.core.net.toUri
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.service.tile.AutoTunnelControlTile
 import com.zaneschepke.wireguardautotunnel.core.service.tile.TunnelControlTile
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import java.io.File
 import java.io.InputStream
-import timber.log.Timber
+
+private const val BASELINE_HEIGHT = 2201
+private const val BASELINE_WIDTH = 1080
+private const val BASELINE_DENSITY = 2.625
+private const val ANDROID_TV_SIZE_MULTIPLIER = 1.5f
 
 fun Context.openWebUrl(url: String): Result<Unit> {
     return kotlin
         .runCatching {
-            val webpage: Uri = url.toUri()
+            val webpage: Uri = Uri.parse(url)
             val intent =
                 Intent(Intent.ACTION_VIEW, webpage).apply {
                     addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
@@ -49,6 +52,37 @@ val Context.actionBarSize
             attrs.getDimension(0, 0F).toInt().also { attrs.recycle() }
         }
 
+fun Context.resizeHeight(dp: Dp): Dp {
+    val displayMetrics = resources.displayMetrics
+    val density = displayMetrics.density
+    val height =
+        (displayMetrics.heightPixels - this.actionBarSize) *
+            (if (isRunningOnTv()) ANDROID_TV_SIZE_MULTIPLIER else 1f)
+    val resizeHeightPercentage =
+        (height.toFloat() / BASELINE_HEIGHT) * (BASELINE_DENSITY.toFloat() / density)
+    return dp * resizeHeightPercentage
+}
+
+fun Context.resizeHeight(textUnit: TextUnit): TextUnit {
+    val displayMetrics = resources.displayMetrics
+    val density = displayMetrics.density
+    val height =
+        (displayMetrics.heightPixels - actionBarSize) *
+            (if (isRunningOnTv()) ANDROID_TV_SIZE_MULTIPLIER else 1f)
+    val resizeHeightPercentage =
+        (height.toFloat() / BASELINE_HEIGHT) * (BASELINE_DENSITY.toFloat() / density)
+    return textUnit * resizeHeightPercentage * 1.1
+}
+
+fun Context.resizeWidth(dp: Dp): Dp {
+    val displayMetrics = resources.displayMetrics
+    val density = displayMetrics.density
+    val width = displayMetrics.widthPixels
+    val resizeWidthPercentage =
+        (width.toFloat() / BASELINE_WIDTH) * (BASELINE_DENSITY.toFloat() / density)
+    return dp * resizeWidthPercentage
+}
+
 fun Context.launchNotificationSettings() {
     if (isRunningOnTv()) return launchAppSettings()
     val settingsIntent: Intent =
@@ -58,43 +92,6 @@ fun Context.launchNotificationSettings() {
     this.startActivity(settingsIntent)
 }
 
-fun Context.hasSAFSupport(mimeType: String): Boolean {
-    val intent =
-        Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
-            type = mimeType
-            addCategory(Intent.CATEGORY_OPENABLE)
-        }
-    val activitiesToResolveIntent =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            packageManager.queryIntentActivities(
-                intent,
-                PackageManager.ResolveInfoFlags.of(PackageManager.MATCH_DEFAULT_ONLY.toLong()),
-            )
-        } else {
-            packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY)
-        }
-    Timber.d(
-        "Found ${activitiesToResolveIntent.size} activities: ${activitiesToResolveIntent.map { it.activityInfo.packageName }}"
-    )
-
-    return if (activitiesToResolveIntent.isEmpty()) {
-        Timber.w("No activities found to handle SAF intent")
-        false
-    } else if (
-        isRunningOnTv() &&
-            activitiesToResolveIntent.all {
-                val name = it.activityInfo.packageName
-                name.startsWith(Constants.GOOGLE_TV_EXPLORER_STUB) ||
-                    name.startsWith(Constants.ANDROID_TV_EXPLORER_STUB)
-            }
-    ) {
-        Timber.w("Only stub file explorers found on TV")
-        false
-    } else {
-        true
-    }
-}
-
 fun Context.launchShareFile(file: Uri) {
     val shareIntent =
         Intent().apply {
@@ -102,7 +99,6 @@ fun Context.launchShareFile(file: Uri) {
             type = Constants.ALL_FILE_TYPES
             putExtra(Intent.EXTRA_STREAM, file)
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
         }
     val chooserIntent =
         Intent.createChooser(shareIntent, "").apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) }
@@ -121,7 +117,7 @@ fun Context.showToast(resId: Int) {
 fun Context.launchSupportEmail() {
     val intent =
         Intent(Intent.ACTION_SENDTO).apply {
-            data = "mailto:".toUri()
+            data = Uri.parse("mailto:")
             putExtra(Intent.EXTRA_EMAIL, arrayOf(getString(R.string.my_email)))
             putExtra(Intent.EXTRA_SUBJECT, getString(R.string.email_subject))
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
@@ -201,27 +197,3 @@ fun Context.getAllInternetCapablePackages(): List<PackageInfo> {
         packageManager.getPackagesHoldingPermissions(permissions, 0)
     }
 }
-
-fun Context.canInstallPackages(): Boolean {
-    return packageManager.canRequestPackageInstalls()
-}
-
-fun Context.requestInstallPackagesPermission() {
-    val intent =
-        Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES).apply {
-            data = "package:${packageName}".toUri()
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK
-        }
-    startActivity(intent)
-}
-
-fun Context.installApk(apkFile: File) {
-    val apkUri = FileProvider.getUriForFile(this, getString(R.string.provider), apkFile)
-    val intent =
-        Intent(Intent.ACTION_VIEW).apply {
-            setDataAndType(apkUri, "application/vnd.android.package-archive")
-            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        }
-    startActivity(intent)
-}

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

@@ -20,7 +20,3 @@ typealias Tunnels = List<TunnelConf>
 typealias TunnelConfigs = List<TunnelConfig>
 
 typealias Packages = List<PackageInfo>
-
-fun <T> MutableList<T>.addAllUnique(elements: Collection<T>, comparator: (T, T) -> Boolean) {
-    addAll(elements.filterNot { new -> this.any { existing -> comparator(existing, new) } })
-}

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

@@ -2,7 +2,7 @@ package com.zaneschepke.wireguardautotunnel.util.extensions
 
 import androidx.navigation.NavController
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.navigation.isCurrentRoute
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.isCurrentRoute
 
 fun NavController.goFromRoot(route: Route) {
     if (currentBackStackEntry?.isCurrentRoute(route::class) == true) return

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

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.viewmodel
 
 import android.net.Uri
-import android.os.Build
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wireguard.android.backend.WgQuickBackend
@@ -29,11 +28,9 @@ import com.zaneschepke.wireguardautotunnel.ui.state.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import com.zaneschepke.wireguardautotunnel.util.*
-import com.zaneschepke.wireguardautotunnel.util.extensions.addAllUnique
 import com.zaneschepke.wireguardautotunnel.util.extensions.withFirstState
 import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
-import java.io.IOException
 import java.net.URL
 import java.time.Instant
 import java.util.*
@@ -131,8 +128,8 @@ constructor(
                         handleToggleLocalLogging(state.appState.isLocalLogsEnabled)
                     is AppEvent.SetDebounceDelay ->
                         handleSetDebounceDelay(state.appSettings, event.delay)
-                    is AppEvent.CopySelectedTunnel -> handleCopySelectedTunnel(state.tunnels)
+                    is AppEvent.CopyTunnel -> handleCopyTunnel(event.tunnel, state.tunnels)
-                    is AppEvent.DeleteSelectedTunnels -> handleDeleteSelectedTunnels()
+                    is AppEvent.DeleteTunnel -> handleDeleteTunnel(event.tunnel, state)
                     is AppEvent.ImportTunnelFromClipboard ->
                         handleClipboardImport(event.text, state.tunnels)
                     is AppEvent.ImportTunnelFromFile ->
@@ -145,8 +142,8 @@ constructor(
                     is AppEvent.StartTunnel -> handleStartTunnel(event.tunnel, state.appSettings)
                     is AppEvent.StopTunnel -> handleStopTunnel(event.tunnel)
                     AppEvent.ToggleAutoTunnel -> handleToggleAutoTunnel(state)
-                    is AppEvent.ToggleTunnelStatsExpanded ->
+                    AppEvent.ToggleTunnelStatsExpanded ->
-                        handleToggleTunnelStats(event.tunnelId, state.appState)
+                        handleToggleExpandTunnelStats(state.appState.isTunnelStatsExpanded)
                     AppEvent.ToggleAlwaysOn -> handleToggleAlwaysOnVPN(state.appSettings)
                     AppEvent.TogglePinLock -> handlePinLockToggled(state.appState.isPinLockEnabled)
                     AppEvent.SetLocationDisclosureShown -> setLocationDisclosureShown()
@@ -186,21 +183,19 @@ constructor(
                         handleToggleStopKillSwitchOnTrusted(state.appSettings)
                     AppEvent.ToggleStopTunnelOnNoInternet ->
                         handleToggleStopOnNoInternet(state.appSettings)
-                    is AppEvent.ExportSelectedTunnels ->
+                    is AppEvent.ExportTunnels ->
-                        handleExportSelectedTunnels(event.configType, event.uri)
+                        handleExportTunnels(event.configType, state.tunnels)
-
                     AppEvent.ExportLogs -> handleExportLogs()
                     AppEvent.MessageShown -> handleErrorShown()
                     is AppEvent.TogglePingTunnelEnabled -> handleTogglePingTunnel(event.tunnel)
                     is AppEvent.SetTunnelPingIp ->
                         handleTunnelPingIpChange(event.tunnelConf, event.ip)
-                    is AppEvent.SetBottomSheet -> handleSetBottomSheet(event.showSheet)
+                    AppEvent.ToggleBottomSheet -> handleToggleBottomSheet()
                     AppEvent.DeleteLogs -> handleDeleteLogs()
                     is AppEvent.SetScreenAction -> _screenCallback.update { event.callback }
                     AppEvent.InvokeScreenAction -> _screenCallback.value?.invoke()
-                    is AppEvent.ToggleSelectedTunnel -> handleToggleSelectedTunnel(event.tunnel)
+                    is AppEvent.SetSelectedTunnel ->
-                    is AppEvent.ToggleSelectAllTunnels ->
+                        _appViewState.update { it.copy(selectedTunnel = event.tunnel) }
-                        handleToggleSelectAllTunnels(state.tunnels)
                     AppEvent.VpnPermissionRequested -> requestVpnPermission(false)
                     is AppEvent.AppReadyCheck -> handleAppReadyCheck(event.tunnels)
                     is AppEvent.ShowMessage -> handleShowMessage(event.message)
@@ -208,43 +203,10 @@ constructor(
                         _appViewState.update { it.copy(popBackStack = event.pop) }
                     is AppEvent.ClearTunnelError -> tunnelManager.clearError(event.tunnel)
                     AppEvent.ToggleRemoteControl -> handleToggleRemoteControl(state.appState)
-                    AppEvent.ClearSelectedTunnels -> clearSelectedTunnels()
-                    is AppEvent.SetShowModal ->
-                        _appViewState.update { it.copy(showModal = event.modalType) }
                 }
             }
         }
 
-    private fun handleToggleSelectAllTunnels(tunnels: List<TunnelConf>) =
-        _appViewState.update { it ->
-            val remove = tunnels.size == it.selectedTunnels.size
-            it.copy(
-                selectedTunnels =
-                    it.selectedTunnels.toMutableList().apply {
-                        if (remove) removeAll(tunnels)
-                        else addAllUnique(tunnels) { existing, new -> existing.id == new.id }
-                    }
-            )
-        }
-
-    private fun handleToggleSelectedTunnel(tunnel: TunnelConf) =
-        _appViewState.update {
-            it.copy(
-                selectedTunnels =
-                    it.selectedTunnels.toMutableList().apply {
-                        if (it.selectedTunnels.contains(tunnel)) remove(tunnel) else add(tunnel)
-                    }
-            )
-        }
-
-    private suspend fun handleToggleTunnelStats(tunnelId: Int, appState: AppState) {
-        if (appState.expandedTunnelIds.contains(tunnelId)) {
-            appDataRepository.appState.removeTunnelExpanded(tunnelId)
-        } else {
-            appDataRepository.appState.setTunnelExpanded(tunnelId)
-        }
-    }
-
     private suspend fun handleToggleRemoteControl(appState: AppState) {
         val enabled = !appState.isRemoteControlEnabled
         if (enabled) appDataRepository.appState.setRemoteKey(UUID.randomUUID().toString())
@@ -271,8 +233,8 @@ constructor(
         }
     }
 
-    private fun handleSetBottomSheet(bottomSheet: AppViewState.BottomSheet) =
+    private fun handleToggleBottomSheet() =
-        _appViewState.update { it.copy(bottomSheet = bottomSheet) }
+        _appViewState.update { it.copy(showBottomSheet = !it.showBottomSheet) }
 
     private suspend fun handleTunnelPingIpChange(tunnelConf: TunnelConf, ip: String) =
         saveTunnel(tunnelConf.copy(pingIp = ip))
@@ -299,8 +261,7 @@ constructor(
     private suspend fun handleSetDebounceDelay(appSettings: AppSettings, delay: Int) =
         saveSettings(appSettings.copy(debounceDelaySeconds = delay))
 
-    private suspend fun handleCopySelectedTunnel(existingTunnels: List<TunnelConf>) {
+    private suspend fun handleCopyTunnel(tunnel: TunnelConf, existingTunnels: List<TunnelConf>) =
-        val tunnel = _appViewState.value.selectedTunnels.firstOrNull() ?: return
         saveTunnel(
             TunnelConf(
                 tunName = tunnel.generateUniqueName(existingTunnels.map { it.tunName }),
@@ -308,21 +269,13 @@ constructor(
                 amQuick = tunnel.amQuick,
             )
         )
-        clearSelectedTunnels()
-    }
 
-    private fun clearSelectedTunnels() =
+    private suspend fun handleDeleteTunnel(tunnel: TunnelConf, state: AppUiState) {
-        _appViewState.update {
+        if (state.tunnels.size == 1 || tunnel.isPrimaryTunnel) {
-            it.copy(selectedTunnels = it.selectedTunnels.toMutableList().apply { clear() })
+            serviceManager.stopAutoTunnel()
         }
-
+        appDataRepository.tunnels.delete(tunnel)
-    private suspend fun handleDeleteSelectedTunnels() =
-        _appViewState.value.selectedTunnels
-            .forEach {
-                appDataRepository.tunnels.delete(it)
-                appDataRepository.appState.removeTunnelExpanded(it.id)
     }
-            .also { clearSelectedTunnels() }
 
     private fun requestVpnPermission(request: Boolean) =
         _appViewState.update { it.copy(requestVpnPermission = request) }
@@ -331,7 +284,6 @@ constructor(
         _appViewState.update { it.copy(requestBatteryPermission = request) }
 
     private suspend fun handleStartTunnel(tunnel: TunnelConf, appSettings: AppSettings) {
-        clearSelectedTunnels()
         tunControlMutex.withLock {
             if (!tunnelManager.hasVpnPermission() && !appSettings.isKernelEnabled)
                 return@withLock requestVpnPermission(true)
@@ -340,7 +292,6 @@ constructor(
     }
 
     private suspend fun handleStopTunnel(tunnel: TunnelConf) {
-        clearSelectedTunnels()
         tunControlMutex.withLock { tunnelManager.stopTunnel(tunnel) }
     }
 
@@ -359,6 +310,10 @@ constructor(
         }
     }
 
+    private suspend fun handleToggleExpandTunnelStats(currentlyEnabled: Boolean) {
+        appDataRepository.appState.setTunnelStatsExpanded(!currentlyEnabled)
+    }
+
     private fun handleErrorShown() {
         _appViewState.update { it.copy(errorMessage = null) }
     }
@@ -680,58 +635,30 @@ constructor(
             tunnelMutex.withLock { appDataRepository.tunnels.save(tunnel) }
         }
 
-    private suspend fun handleExportSelectedTunnels(configType: ConfigType, uri: Uri?) {
+    private suspend fun handleExportTunnels(configType: ConfigType, tunnels: List<TunnelConf>) {
-        val tunnels = _appViewState.value.selectedTunnels
+        runCatching {
-        try {
-            if (tunnels.isEmpty()) return
                 val (files, shareFileName) =
                     when (configType) {
                         ConfigType.AMNEZIA -> {
-                        val amFiles = fileUtils.createAmFiles(tunnels)
+                            Pair(
-                        if (amFiles.isEmpty()) {
+                                fileUtils.createAmFiles(tunnels),
-                            throw IOException("No valid Amnezia config files created")
+                                "am-export_${Instant.now().epochSecond}.zip",
-                        }
+                            )
-                        Pair(amFiles, "am-export_${Instant.now().epochSecond}.zip")
                         }
                         ConfigType.WG -> {
-                        val wgFiles = fileUtils.createWgFiles(tunnels)
+                            Pair(
-                        if (wgFiles.isEmpty()) {
+                                fileUtils.createWgFiles(tunnels),
-                            throw IOException("No valid WireGuard config files created")
+                                "wg-export_${Instant.now().epochSecond}.zip",
-                        }
+                            )
-                        Pair(wgFiles, "wg-export_${Instant.now().epochSecond}.zip")
                         }
                     }
-
                 val shareFile = fileUtils.createNewShareFile(shareFileName)
                 fileUtils.zipAll(shareFile, files)
-            if (!shareFile.exists() || shareFile.length() == 0L) {
+                fileUtils.shareFile(shareFile)
-                throw IOException("Zip file is empty or not created: ${shareFile.path}")
             }
-
+            .onFailure {
-            // fall back to save to downloads for older devices
+                Timber.e(it)
-            if (uri != null) {
-                val copyResult = fileUtils.copyFileToUri(shareFile, uri)
-                copyResult.fold(
-                    onSuccess = {
-                        handleShowMessage(StringValue.StringResource(R.string.export_success))
-                    },
-                    onFailure = { error ->
-                        Timber.w("User likely cancelled or file write failed: ${error.message}")
                 handleShowMessage(StringValue.StringResource(R.string.export_failed))
-                    },
-                )
-            } else {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    fileUtils.saveToDownloadsWithMediaStore(shareFile, Constants.ZIP_FILE_MIME_TYPE)
-                    handleShowMessage(StringValue.StringResource(R.string.export_success))
-                } else throw IOException("File exporting not supported on this device")
-            }
-        } catch (e: Exception) {
-            Timber.e(e, "Export failed")
-            handleShowMessage(StringValue.StringResource(R.string.export_failed))
-        } finally {
-            handleSetBottomSheet(AppViewState.BottomSheet.NONE)
-            clearSelectedTunnels()
             }
     }
 

app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/event/AppEvent.kt

@@ -3,7 +3,6 @@ package com.zaneschepke.wireguardautotunnel.viewmodel.event
 import android.net.Uri
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.ConfigType
-import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 
@@ -56,9 +55,9 @@ sealed class AppEvent {
 
     data class StopTunnel(val tunnel: TunnelConf) : AppEvent()
 
-    data object DeleteSelectedTunnels : AppEvent()
+    data class DeleteTunnel(val tunnel: TunnelConf) : AppEvent()
 
-    data object CopySelectedTunnel : AppEvent()
+    data class CopyTunnel(val tunnel: TunnelConf) : AppEvent()
 
     data class ImportTunnelFromFile(val data: Uri) : AppEvent()
 
@@ -68,7 +67,7 @@ sealed class AppEvent {
 
     data class ImportTunnelFromQrCode(val qrCode: String) : AppEvent()
 
-    data class ToggleTunnelStatsExpanded(val tunnelId: Int) : AppEvent()
+    data object ToggleTunnelStatsExpanded : AppEvent()
 
     data object SetBatteryOptimizeDisableShown : AppEvent()
 
@@ -96,7 +95,7 @@ sealed class AppEvent {
 
     data class SaveTrustedSSID(val ssid: String) : AppEvent()
 
-    data class ExportSelectedTunnels(val configType: ConfigType, val uri: Uri?) : AppEvent()
+    data class ExportTunnels(val configType: ConfigType) : AppEvent()
 
     data object ExportLogs : AppEvent()
 
@@ -110,19 +109,13 @@ sealed class AppEvent {
 
     data class PopBackStack(val pop: Boolean) : AppEvent()
 
-    data class SetBottomSheet(val showSheet: AppViewState.BottomSheet) : AppEvent()
+    data object ToggleBottomSheet : AppEvent()
 
-    data class ToggleSelectedTunnel(val tunnel: TunnelConf) : AppEvent()
+    data class SetSelectedTunnel(val tunnel: TunnelConf?) : AppEvent()
-
-    data object ClearSelectedTunnels : AppEvent()
 
     data object VpnPermissionRequested : AppEvent()
 
     data class AppReadyCheck(val tunnels: List<TunnelConf>) : AppEvent()
 
     data object ToggleRemoteControl : AppEvent()
-
-    data class SetShowModal(val modalType: AppViewState.ModalType) : AppEvent()
-
-    data object ToggleSelectAllTunnels : AppEvent()
 }

app/src/main/res/mipmap-anydpi-v26/ic_banner.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_banner_background"/>
+    <foreground android:drawable="@mipmap/ic_banner_foreground"/>
+</adaptive-icon>