fix: create config not saving

Fixes bug where creating a config from scratch was failing to save

Closes #93 #96 #89

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-ko_fi: zaneschepke
-liberapay: zaneschepke

.github/workflows/android.yml

@@ -1,11 +1,10 @@
 # name of the workflow
-name: Android CI Tag Deployment (Pre-release)
+name: Android CI Tag Deployment
 
 on:
-  workflow_dispatch:
   push:
     tags:
-      - '*.*.*-**'
+      - '*.*.*'
 
 jobs:
   build:
@@ -14,13 +13,10 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
+      KEY_STORE_PATH: ${{ secrets.KEY_STORE_PATH }}
       SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
       SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
       SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-      KEY_STORE_FILE: 'android_keystore.jks'
-      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
-      GH_USER: ${{ secrets.GH_USER }}
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
     steps:
       - uses: actions/checkout@v4
@@ -39,16 +35,10 @@ jobs:
         id: decode_keystore
         uses: timheuer/base64-to-file@v1.2
         with:
-          fileName: ${{ env.KEY_STORE_FILE }}
-          fileDir: ${{ env.KEY_STORE_LOCATION }}
+          fileName: 'android_keystore.jks'
+          fileDir: ${{ github.workspace }}/app/keystore/
           encodedString: ${{ secrets.KEYSTORE }}
 
-      # create keystore path for gradle to read
-      - name: Create keystore path env var
-        run: |
-          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
-          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
-
       - name: Create service_account.json
         id: createServiceAccount
         run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
@@ -62,13 +52,10 @@ jobs:
       - name: Get apk path
         id: apk-path
         run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_OUTPUT
-      - name: Get version code
-        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
+
       # Save the APK after the Build job is complete to publish it as a Github release in the next job
       - name: Upload APK
-        uses: actions/upload-artifact@v4.3.1
+        uses: actions/upload-artifact@v4.0.0
         with:
           name: wgtunnel
           path: ${{ steps.apk-path.outputs.path }}
@@ -83,17 +70,18 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           # fix hardcode changelog file name
-          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt
+          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/33400.txt
           tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
+          name: Release ${{ github.ref_name }}
           draft: false
-          prerelease: true
+          prerelease: false
           files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
       - name: Deploy with fastlane
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.2' # Not needed with a .ruby-version file
           bundler-cache: true
+
       - name: Distribute app to Beta track 🚀
         run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane beta)
 

.github/workflows/release.yml

@@ -1,106 +0,0 @@
-# name of the workflow
-name: Android CI Tag Deployment (Release)
-
-on:
-  workflow_dispatch:
-  push:
-    tags:
-      - '*.*.*'
-      - '!*.*.*-**'
-
-jobs:
-  build:
-    name: Build Signed APK
-
-    runs-on: ubuntu-latest
-
-    env:
-      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-      KEY_STORE_FILE: 'android_keystore.jks'
-      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
-      GH_USER: ${{ secrets.GH_USER }}
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          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 }}
-
-      # create keystore path for gradle to read
-      - name: Create keystore path env var
-        run: |
-          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
-          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
-
-      - name: Create service_account.json
-        id: createServiceAccount
-        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
-
-      # Build and sign APK ("-x test" argument is used to skip tests)
-      # add fdroid flavor for apk upload
-      - name: Build Fdroid Release APK
-        run: ./gradlew :app:assembleFdroidRelease -x test
-
-      # get fdroid flavor release apk path
-      - name: Get apk path
-        id: apk-path
-        run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_OUTPUT
-      - name: Get version code
-        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
-      # Save the APK after the Build job is complete to publish it as a Github release in the next job
-      - name: Upload APK
-        uses: actions/upload-artifact@v4.3.1
-        with:
-          name: wgtunnel
-          path: ${{ steps.apk-path.outputs.path }}
-      - name: Download APK from build
-        uses: actions/download-artifact@v4
-        with:
-          name: wgtunnel
-      - name: Repository Dispatch for my F-Droid repo
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.PAT }}
-          repository: zaneschepke/fdroid
-          event-type: fdroid-update
-      - name: Create Release with Fastlane changelog notes
-        id: create_release
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          # fix hardcode changelog file name
-          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          draft: false
-          prerelease: false
-          files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
-      - name: Deploy with fastlane
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.2' # Not needed with a .ruby-version file
-          bundler-cache: true
-      - name: Distribute app to Prod track 🚀
-        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane production)
-

README.md

@@ -13,9 +13,16 @@ WG Tunnel
 
 
 [![Google Play](https://img.shields.io/badge/Google_Play-414141?style=for-the-badge&logo=google-play&logoColor=white)](https://play.google.com/store/apps/details?id=com.zaneschepke.wireguardautotunnel)
+[![Fire TV](https://img.shields.io/badge/fire%20tv-fc3b2d?style=for-the-badge&logo=amazon%20fire%20tv&logoColor=white)](https://www.amazon.com/gp/product/B0CFGGL7WK)
 [![F-Droid](https://img.shields.io/static/v1?style=for-the-badge&message=F-Droid&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://f-droid.org/packages/com.zaneschepke.wireguardautotunnel/)
 
 
+</div>
+
+<div align="center">
+
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/N4N8NMJN2)
+
 </div>
 
 
@@ -71,31 +78,6 @@ The repository for these docs can be found [here](https://github.com/zaneschepke
 ```
 $ git clone https://github.com/zaneschepke/wgtunnel
 $ cd wgtunnel
-```
-
-Create a personal access token (classic) in GitHuv to be able to pull the wireguard-android github dependencies from GitHub packages
-as documented [here](https://docs.github.com/en/packages/learn-github-packages/introduction-to-github-packages#authenticating-to-github-packages).
-
-Alternatively, you can clone [wireguard-android](https://github.com/zaneschepke/wireguard-android) and run the following command to publish the dependency to your local maven repository (requires you have maven installed). This is the ideal approach
-if you intent to make changes to this lib.
-
-```
-$ git clone https://github.com/zaneschepke/wireguard-android
-$ cd wireguard-android
-$ brew install maven
-$ ./gradlew publishToMavenLocal
-```
-
-The [wireguard-android](https://github.com/zaneschepke/wireguard-android) dependency is a fork of the official [wireguard-android](https://github.com/WireGuard/wireguard-android) library. 
-
-Add the following lines to local.properties file:
-```
-GH_USER=<your github username>
-GH_TOKEN=<the personal access token with read package permission you just created>
-```
-
-And then build the app:
-```
 $ ./gradlew assembleDebug
 ```
 

app/build.gradle.kts

@@ -156,14 +156,13 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.androidx.compose.manifest)
 
-    // get tunnel lib from github packages or mavenLocal
+    // wg
     implementation(libs.tunnel)
     coreLibraryDesugaring(libs.desugar.jdk.libs)
 
     // logging
     implementation(libs.timber)
 
-
     // compose navigation
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.hilt.navigation.compose)
@@ -173,6 +172,7 @@ dependencies {
     ksp(libs.hilt.android.compiler)
 
     // accompanist
+    implementation(libs.accompanist.systemuicontroller)
     implementation(libs.accompanist.permissions)
     implementation(libs.accompanist.flowlayout)
     implementation(libs.accompanist.drawablepainter)

app/src/androidTest/java/com/zaneschepke/wireguardautotunnel/MigrationTest.kt

@@ -4,7 +4,6 @@ import androidx.room.testing.MigrationTestHelper
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
-import com.zaneschepke.wireguardautotunnel.data.Queries
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -27,7 +26,33 @@ class MigrationTest {
         helper.createDatabase(dbName, 4).apply {
             // Database has schema version 1. Insert some data using SQL queries.
             // You can't use DAO classes because they expect the latest schema.
-            execSQL(Queries.createDefaultSettings())
+            execSQL(
+                "INSERT INTO Settings (is_tunnel_enabled," +
+                    "is_tunnel_on_mobile_data_enabled," +
+                    "trusted_network_ssids," +
+                    "default_tunnel," +
+                    "is_always_on_vpn_enabled," +
+                    "is_tunnel_on_ethernet_enabled," +
+                    "is_shortcuts_enabled," +
+                    "is_battery_saver_enabled," +
+                    "is_tunnel_on_wifi_enabled," +
+                    "is_kernel_enabled," +
+                    "is_restore_on_boot_enabled," +
+                    "is_multi_tunnel_enabled)" +
+                    " VALUES " +
+                    "('false'," +
+                    "'false'," +
+                    "'[trustedSSID1,trustedSSID2]'," +
+                    "'defaultTunnel'," +
+                    "'false'," +
+                    "'false'," +
+                    "'false'," +
+                    "'false'," +
+                    "'false'," +
+                    "'false'," +
+                    "'false'," +
+                    "'false')",
+            )
             execSQL(
                 "INSERT INTO TunnelConfig (name, wg_quick)" + " VALUES ('hello', 'hello')",
             )

app/src/main/AndroidManifest.xml

@@ -101,7 +101,7 @@
         <service
             android:name=".service.tile.TunnelControlTile"
             android:exported="true"
-            android:icon="@drawable/ic_launcher"
+            android:icon="@drawable/shield"
             android:label="WG Tunnel"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data

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

@@ -1,21 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data
-
-import androidx.room.RoomDatabase
-import androidx.sqlite.db.SupportSQLiteDatabase
-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())
-            Timber.i("Bootstrapping settings data")
-            setTransactionSuccessful()
-        } catch (e : Exception) {
-            Timber.e(e)
-        } finally {
-            endTransaction()
-        }
-    }
-}

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

@@ -1,33 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data
-
-object Queries {
-    fun createDefaultSettings() : String {
-        return """
-            INSERT INTO Settings (is_tunnel_enabled,
-                    is_tunnel_on_mobile_data_enabled,
-                    trusted_network_ssids,
-                    default_tunnel,
-                    is_always_on_vpn_enabled,
-                    is_tunnel_on_ethernet_enabled,
-                    is_shortcuts_enabled,
-                    is_battery_saver_enabled,
-                    is_tunnel_on_wifi_enabled,
-                    is_kernel_enabled,
-                    is_restore_on_boot_enabled,
-                    is_multi_tunnel_enabled)
-                    VALUES
-                    ('false',
-                    'false',
-                    '[trustedSSID1,trustedSSID2]',
-                     NULL,
-                    'false',
-                    'false',
-                    'false',
-                    'false',
-                    'false',
-                    'false',
-                    'false',
-                    'false')
-        """.trimIndent()
-    }
-}

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

@@ -4,7 +4,6 @@ import android.content.Context
 import androidx.room.Room
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
-import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -24,7 +23,6 @@ class DatabaseModule {
                 context.getString(R.string.db_name),
             )
             .fallbackToDestructiveMigration()
-            .addCallback(DatabaseCallback())
             .build()
     }
 }

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

@@ -4,11 +4,9 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.util.goAsync
 import dagger.hilt.android.AndroidEntryPoint
-import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -16,17 +14,10 @@ class BootReceiver : BroadcastReceiver() {
 
     @Inject lateinit var settingsRepository: SettingsRepository
 
-    @Inject lateinit var tunnelConfigRepository: TunnelConfigRepository
-
     override fun onReceive(context: Context?, intent: Intent?) = goAsync {
         if (Intent.ACTION_BOOT_COMPLETED != intent?.action) return@goAsync
-        val settings = settingsRepository.getSettings()
-        if (settings.isAutoTunnelEnabled) {
-            Timber.i("Starting watcher service from boot")
+        if (settingsRepository.getSettings().isAutoTunnelEnabled) {
             ServiceManager.startWatcherServiceForeground(context!!)
-        } else if(settings.isAlwaysOnVpnEnabled) {
-            Timber.i("Starting tunnel from boot")
-            ServiceManager.startVpnServicePrimaryTunnel(context!!, settings, tunnelConfigRepository.getAll().firstOrNull())
         }
     }
 }

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

@@ -4,8 +4,6 @@ import android.app.Service
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import timber.log.Timber
 
 object ServiceManager {
@@ -79,15 +77,6 @@ object ServiceManager {
         )
     }
 
-    fun startVpnServicePrimaryTunnel(context: Context, settings: Settings, fallbackTunnel: TunnelConfig? = null) {
-        if(settings.defaultTunnel != null) {
-            return startVpnServiceForeground(context, settings.defaultTunnel!!)
-        }
-        if(fallbackTunnel != null) {
-            startVpnServiceForeground(context, fallbackTunnel.toString())
-        }
-    }
-
     fun startWatcherServiceForeground(
         context: Context,
     ) {

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

@@ -152,16 +152,12 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
         wakeLock =
             (getSystemService(Context.POWER_SERVICE) as PowerManager).run {
                 newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
-                    try {
-                        if (isBatterySaverOn) {
-                            Timber.d("Initiating wakelock with timeout")
-                            acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
-                        } else {
-                            Timber.d("Initiating wakelock with zero timeout")
-                            acquire(Constants.DEFAULT_WATCHER_WAKE_LOCK_TIMEOUT)
-                        }
-                    } finally {
-                        release()
+                    if (isBatterySaverOn) {
+                        Timber.d("Initiating wakelock with timeout")
+                        acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
+                    } else {
+                        Timber.d("Initiating wakelock with zero timeout")
+                        acquire(Constants.DEFAULT_WATCHER_WAKE_LOCK_TIMEOUT)
                     }
                 }
             }

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

@@ -94,7 +94,7 @@ class WireGuardNotification @Inject constructor(@ApplicationContext private val
                 .setOngoing(onGoing)
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
                 .setShowWhen(showTimestamp)
-                .setSmallIcon(R.drawable.ic_launcher)
+                .setSmallIcon(R.mipmap.ic_launcher_foreground)
                 .build()
         }
     }

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

@@ -25,7 +25,7 @@ import javax.inject.Inject
 class WireGuardTunnel
 @Inject
 constructor(
-    @Userspace private val userspaceBackend : Backend,
+    @Userspace private val userspaceBackend: Backend,
     @Kernel private val kernelBackend: Backend,
     private val settingsRepository: SettingsRepository
 ) : VpnService {

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

@@ -1,12 +1,13 @@
 package com.zaneschepke.wireguardautotunnel.ui
 
 import androidx.lifecycle.ViewModel
+import com.zaneschepke.wireguardautotunnel.data.SettingsDao
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
 class ActivityViewModel
 @Inject
-constructor() : ViewModel() {
-
-}
+constructor(
+    private val settingsRepo: SettingsDao,
+) : ViewModel() {}

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

@@ -6,13 +6,11 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
-import androidx.activity.SystemBarStyle
+import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.focusable
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarData
@@ -22,13 +20,15 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult
 import androidx.compose.material3.surfaceColorAtElevation
 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.focus.FocusRequester
 import androidx.compose.ui.focus.focusProperties
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -36,6 +36,7 @@ import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
+import com.wireguard.android.backend.GoBackend
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
@@ -47,6 +48,7 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.config.ConfigScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
+import com.zaneschepke.wireguardautotunnel.ui.theme.TransparentSystemBars
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import dagger.hilt.android.AndroidEntryPoint
@@ -69,39 +71,58 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        enableEdgeToEdge(navigationBarStyle = SystemBarStyle.dark(Color.Transparent.toArgb()))
-
         // load preferences into memory and init data
         lifecycleScope.launch {
             try {
                 dataStoreManager.init()
+                if (settingsRepository.getAll().isEmpty()) {
+                    settingsRepository.save(com.zaneschepke.wireguardautotunnel.data.model.Settings())
+                }
                 WireGuardAutoTunnel.requestTileServiceStateUpdate()
             } catch (e: IOException) {
                 Timber.e("Failed to load preferences")
             }
         }
         setContent {
-            //val activityViewModel = hiltViewModel<ActivityViewModel>()
+            //            val activityViewModel = hiltViewModel<ActivityViewModel>()
 
             val navController = rememberNavController()
             val focusRequester = remember { FocusRequester() }
 
             WireguardAutoTunnelTheme {
+                TransparentSystemBars()
 
                 val snackbarHostState = remember { SnackbarHostState() }
 
-                val notificationPermissionState = if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
-                    rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS) else null
+                val notificationPermissionState =
+                    rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS)
 
                 fun requestNotificationPermission() {
-                    if (notificationPermissionState != null && !notificationPermissionState.status.isGranted
+                    if (
+                        !notificationPermissionState.status.isGranted &&
+                            Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
                     ) {
                         notificationPermissionState.launchPermissionRequest()
                     }
                 }
 
-                LaunchedEffect(Unit) {
-                    requestNotificationPermission()
+                var vpnIntent by remember { mutableStateOf(GoBackend.VpnService.prepare(this)) }
+                val vpnActivityResultState =
+                    rememberLauncherForActivityResult(
+                        ActivityResultContracts.StartActivityForResult(),
+                        onResult = {
+                            val accepted = (it.resultCode == RESULT_OK)
+                            if (accepted) {
+                                vpnIntent = null
+                            }
+                        },
+                    )
+                LaunchedEffect(vpnIntent) {
+                    if (vpnIntent != null) {
+                        vpnActivityResultState.launch(vpnIntent)
+                    } else {
+                        requestNotificationPermission()
+                    }
                 }
 
                 fun showSnackBarMessage(message: String) {
@@ -134,11 +155,9 @@ class MainActivity : AppCompatActivity() {
                             )
                         }
                     },
-                    modifier = Modifier
-                        .focusable()
-                        .focusProperties { up = focusRequester },
+                    modifier = Modifier.focusable().focusProperties { up = focusRequester },
                     bottomBar =
-                        if (notificationPermissionState == null || notificationPermissionState.status.isGranted) {
+                        if (vpnIntent == null && notificationPermissionState.status.isGranted) {
                             {
                                 BottomNavBar(
                                     navController,
@@ -153,70 +172,78 @@ class MainActivity : AppCompatActivity() {
                             {}
                         },
                 ) { padding ->
-                        if (notificationPermissionState != null && !notificationPermissionState.status.isGranted) {
-                            Column(modifier = Modifier.padding(padding)) {
-                                PermissionRequestFailedScreen(
-                                    onRequestAgain = {
-                                        val intentSettings =
-                                            Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                                        intentSettings.data =
-                                            Uri.fromParts(
-                                                Constants.URI_PACKAGE_SCHEME,
-                                                this@MainActivity.packageName,
-                                                null,
-                                            )
-                                        startActivity(intentSettings)
-                                    },
-                                    message = getString(R.string.notification_permission_required),
-                                    getString(R.string.open_settings),
-                                )
-                                return@Scaffold
-                            }
-                        }
-                        NavHost(navController, startDestination = Screen.Main.route) {
-                            composable(
-                                Screen.Main.route,
-                            ) {
-                                MainScreen(
-                                    focusRequester = focusRequester,
-                                    showSnackbarMessage = { message -> showSnackBarMessage(message) },
-                                    navController = navController,
-                                )
-                            }
-                            composable(
-                                Screen.Settings.route,
-                            ) {
-                                SettingsScreen(
-                                    padding = padding,
-                                    showSnackbarMessage = { message -> showSnackBarMessage(message) },
-                                    focusRequester = focusRequester,
-                                )
-//
-                            }
-                            composable(
-                                Screen.Support.route,
-                            ) {
-                                SupportScreen(
-                                    padding = padding,
-                                    focusRequester = focusRequester,
-                                    showSnackbarMessage = { message -> showSnackBarMessage(message) },
-                                )
-                            }
-                            composable("${Screen.Config.route}/{id}") {
-                                val id = it.arguments?.getString("id")
-                                if (!id.isNullOrBlank()) {
-                                    ConfigScreen(
-                                        padding = padding,
-                                        navController = navController,
-                                        id = id,
-                                        showSnackbarMessage = { message ->
-                                            showSnackBarMessage(message)
-                                        },
-                                        focusRequester = focusRequester,
+                    if (vpnIntent != null) {
+                        PermissionRequestFailedScreen(
+                            padding = padding,
+                            onRequestAgain = { vpnActivityResultState.launch(vpnIntent) },
+                            message = getString(R.string.vpn_permission_required),
+                            getString(R.string.retry),
+                        )
+                        return@Scaffold
+                    }
+                    if (!notificationPermissionState.status.isGranted) {
+                        PermissionRequestFailedScreen(
+                            padding = padding,
+                            onRequestAgain = {
+                                val intentSettings =
+                                    Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                                intentSettings.data =
+                                    Uri.fromParts(
+                                        Constants.URI_PACKAGE_SCHEME,
+                                        this.packageName,
+                                        null,
                                     )
-                                }
+                                startActivity(intentSettings)
+                            },
+                            message = getString(R.string.notification_permission_required),
+                            getString(R.string.open_settings),
+                        )
+                        return@Scaffold
+                    }
+                    NavHost(navController, startDestination = Screen.Main.route) {
+                        composable(
+                            Screen.Main.route,
+                        ) {
+                            MainScreen(
+                                padding = padding,
+                                focusRequester = focusRequester,
+                                showSnackbarMessage = { message -> showSnackBarMessage(message) },
+                                navController = navController,
+                            )
+                        }
+                        composable(
+                            Screen.Settings.route,
+                        ) {
+                            SettingsScreen(
+                                padding = padding,
+                                showSnackbarMessage = { message -> showSnackBarMessage(message) },
+                                focusRequester = focusRequester,
+                            )
+                        }
+                        composable(
+                            Screen.Support.route,
+                        ) {
+                            SupportScreen(
+                                padding = padding,
+                                focusRequester = focusRequester,
+                                showSnackbarMessage = { message -> showSnackBarMessage(message) },
+                            )
+                        }
+                        composable("${Screen.Config.route}/{id}") {
+                            val id = it.arguments?.getString("id")
+                            if (!id.isNullOrBlank()) {
+                                // https://dagger.dev/hilt/view-model#assisted-injection
+                                ConfigScreen(
+                                    navController = navController,
+                                    id = id,
+                                    showSnackbarMessage = { message ->
+                                        showSnackBarMessage(message)
+                                    },
+                                    focusRequester = focusRequester,
+                                )
                             }
                         }
+                    }
                 }
             }
         }

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

@@ -2,6 +2,7 @@ package com.zaneschepke.wireguardautotunnel.ui.common
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Button
@@ -16,6 +17,7 @@ import kotlinx.coroutines.launch
 
 @Composable
 fun PermissionRequestFailedScreen(
+    padding: PaddingValues,
     onRequestAgain: () -> Unit,
     message: String,
     buttonText: String
@@ -24,7 +26,7 @@ fun PermissionRequestFailedScreen(
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
-        modifier = Modifier.fillMaxSize(),
+        modifier = Modifier.fillMaxSize().padding(padding),
     ) {
         Text(message, textAlign = TextAlign.Center, modifier = Modifier.padding(15.dp))
         Button(

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

@@ -19,6 +19,7 @@ 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.res.stringResource
 import androidx.compose.ui.unit.LayoutDirection
@@ -32,6 +33,7 @@ fun CustomSnackBar(
     isRtl: Boolean = true,
     containerColor: Color = MaterialTheme.colorScheme.surface
 ) {
+    val context = LocalContext.current
     Snackbar(
         containerColor = containerColor,
         modifier =

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

@@ -1,13 +1,13 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.config
 
 import android.annotation.SuppressLint
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.focusGroup
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
@@ -29,7 +29,7 @@ import androidx.compose.material.icons.rounded.ContentCopy
 import androidx.compose.material.icons.rounded.Delete
 import androidx.compose.material.icons.rounded.Refresh
 import androidx.compose.material.icons.rounded.Save
-import androidx.compose.material3.BasicAlertDialog
+import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FabPosition
@@ -51,6 +51,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -62,7 +63,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
@@ -86,11 +86,12 @@ import kotlinx.coroutines.delay
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(
+    ExperimentalComposeUiApi::class,
     ExperimentalMaterial3Api::class,
+    ExperimentalFoundationApi::class,
 )
 @Composable
 fun ConfigScreen(
-    padding: PaddingValues,
     viewModel: ConfigViewModel = hiltViewModel(),
     focusRequester: FocusRequester,
     navController: NavController,
@@ -128,16 +129,13 @@ fun ConfigScreen(
     val fillMaxWidth = .85f
     val screenPadding = 5.dp
 
-    val applicationButtonText = buildAnnotatedString {
-        append(stringResource(id = R.string.tunneling_apps))
-        append(": ")
+    val applicationButtonText = {
+        "Tunneling apps: " +
             if (uiState.isAllApplicationsEnabled) {
-                append(stringResource(id = R.string.all))
+                "all"
             } else {
-                append("${uiState.checkedPackageNames.size} ")
-                    (if (uiState.include) append(stringResource(id = R.string.included)) else append(
-                        stringResource(id = R.string.excluded),
-                    ))
+                "${uiState.checkedPackageNames.size} " +
+                    (if (uiState.include) "included" else "excluded")
             }
     }
 
@@ -147,7 +145,7 @@ fun ConfigScreen(
                 showAuthPrompt = false
                 isAuthenticated = true
             },
-            onError = {
+            onError = { error ->
                 showAuthPrompt = false
                 showSnackbarMessage(Event.Error.AuthenticationFailed.message)
             },
@@ -163,24 +161,20 @@ fun ConfigScreen(
             remember(uiState.packages) {
                 uiState.packages.sortedBy { viewModel.getPackageLabel(it) }
             }
-        BasicAlertDialog(onDismissRequest = { showApplicationsDialog = false }) {
+        AlertDialog(onDismissRequest = { showApplicationsDialog = false }) {
             Surface(
                 tonalElevation = 2.dp,
                 shadowElevation = 2.dp,
                 shape = RoundedCornerShape(12.dp),
                 color = MaterialTheme.colorScheme.surface,
                 modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .fillMaxHeight(if (uiState.isAllApplicationsEnabled) 1 / 5f else 4 / 5f),
+                    Modifier.fillMaxWidth()
+                        .fillMaxHeight(if (uiState.isAllApplicationsEnabled) 1 / 5f else 4 / 5f),
             ) {
-                Column(modifier = Modifier
-                    .fillMaxWidth()) {
+                Column(modifier = Modifier.fillMaxWidth()) {
                     Row(
                         modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 20.dp, vertical = 7.dp),
+                            Modifier.fillMaxWidth().padding(horizontal = 20.dp, vertical = 7.dp),
                         verticalAlignment = Alignment.CenterVertically,
                         horizontalArrangement = Arrangement.SpaceBetween,
                     ) {
@@ -193,9 +187,8 @@ fun ConfigScreen(
                     if (!uiState.isAllApplicationsEnabled) {
                         Row(
                             modifier =
-                            Modifier
-                                .fillMaxWidth()
-                                .padding(horizontal = 20.dp, vertical = 7.dp),
+                                Modifier.fillMaxWidth()
+                                    .padding(horizontal = 20.dp, vertical = 7.dp),
                             verticalAlignment = Alignment.CenterVertically,
                             horizontalArrangement = Arrangement.SpaceBetween,
                         ) {
@@ -226,9 +219,8 @@ fun ConfigScreen(
                         }
                         Row(
                             modifier =
-                            Modifier
-                                .fillMaxWidth()
-                                .padding(horizontal = 20.dp, vertical = 7.dp),
+                                Modifier.fillMaxWidth()
+                                    .padding(horizontal = 20.dp, vertical = 7.dp),
                             verticalAlignment = Alignment.CenterVertically,
                             horizontalArrangement = Arrangement.SpaceBetween,
                         ) {
@@ -244,9 +236,7 @@ fun ConfigScreen(
                                 Row(
                                     verticalAlignment = Alignment.CenterVertically,
                                     horizontalArrangement = Arrangement.SpaceBetween,
-                                    modifier = Modifier
-                                        .fillMaxSize()
-                                        .padding(5.dp),
+                                    modifier = Modifier.fillMaxSize().padding(5.dp),
                                 ) {
                                     Row(modifier = Modifier.fillMaxWidth(fillMaxWidth)) {
                                         val drawable =
@@ -272,9 +262,9 @@ fun ConfigScreen(
                                     Checkbox(
                                         modifier = Modifier.fillMaxSize(),
                                         checked =
-                                        (uiState.checkedPackageNames.contains(
-                                            pack.packageName
-                                        )),
+                                            (uiState.checkedPackageNames.contains(
+                                                pack.packageName
+                                            )),
                                         onCheckedChange = {
                                             if (it) {
                                                 viewModel.onAddCheckedPackage(pack.packageName)
@@ -289,9 +279,7 @@ fun ConfigScreen(
                     }
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(top = 5.dp),
+                        modifier = Modifier.fillMaxSize().padding(top = 5.dp),
                         horizontalArrangement = Arrangement.Center,
                     ) {
                         TextButton(onClick = { showApplicationsDialog = false }) {
@@ -311,7 +299,7 @@ fun ConfigScreen(
             var fobColor by remember { mutableStateOf(secondaryColor) }
             FloatingActionButton(
                 modifier =
-                    Modifier.onFocusChanged {
+                    Modifier.padding(bottom = 90.dp).onFocusChanged {
                         if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
                             fobColor = if (it.isFocused) hoverColor else secondaryColor
                         }
@@ -343,11 +331,7 @@ fun ConfigScreen(
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Top,
                 modifier =
-                Modifier
-                    .verticalScroll(rememberScrollState())
-                    .weight(1f, true)
-                    .fillMaxSize()
-                    .padding(padding),
+                    Modifier.verticalScroll(rememberScrollState()).weight(1f, true).fillMaxSize(),
             ) {
                 Surface(
                     tonalElevation = 2.dp,
@@ -356,20 +340,16 @@ fun ConfigScreen(
                     color = MaterialTheme.colorScheme.surface,
                     modifier =
                         (if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                            Modifier
-                                .fillMaxHeight(fillMaxHeight)
-                                .fillMaxWidth(fillMaxWidth)
+                                Modifier.fillMaxHeight(fillMaxHeight).fillMaxWidth(fillMaxWidth)
                             } else {
                                 Modifier.fillMaxWidth(fillMaxWidth)
                             })
-                            .padding(bottom = 10.dp),
+                            .padding(top = 50.dp, bottom = 10.dp),
                 ) {
                     Column(
                         horizontalAlignment = Alignment.Start,
                         verticalArrangement = Arrangement.Top,
-                        modifier = Modifier
-                            .padding(15.dp)
-                            .focusGroup(),
+                        modifier = Modifier.padding(15.dp).focusGroup(),
                     ) {
                         SectionTitle(
                             stringResource(R.string.interface_),
@@ -381,14 +361,10 @@ fun ConfigScreen(
                             keyboardActions = keyboardActions,
                             label = stringResource(R.string.name),
                             hint = stringResource(R.string.tunnel_name).lowercase(),
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .focusRequester(focusRequester),
+                            modifier = Modifier.fillMaxWidth().focusRequester(focusRequester),
                         )
                         OutlinedTextField(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .clickable { showAuthPrompt = true },
+                            modifier = Modifier.fillMaxWidth().clickable { showAuthPrompt = true },
                             value = uiState.interfaceProxy.privateKey,
                             visualTransformation =
                                 if ((id == Constants.MANUAL_TUNNEL_CONFIG_ID) || isAuthenticated)
@@ -416,9 +392,7 @@ fun ConfigScreen(
                         )
                         OutlinedTextField(
                             modifier =
-                            Modifier
-                                .fillMaxWidth()
-                                .focusRequester(FocusRequester.Default),
+                                Modifier.fillMaxWidth().focusRequester(FocusRequester.Default),
                             value = uiState.interfaceProxy.publicKey,
                             enabled = false,
                             onValueChange = {},
@@ -451,9 +425,7 @@ fun ConfigScreen(
                                 keyboardActions = keyboardActions,
                                 label = stringResource(R.string.addresses),
                                 hint = stringResource(R.string.comma_separated_list),
-                                modifier = Modifier
-                                    .fillMaxWidth(3 / 5f)
-                                    .padding(end = 5.dp),
+                                modifier = Modifier.fillMaxWidth(3 / 5f).padding(end = 5.dp),
                             )
                             ConfigurationTextBox(
                                 value = uiState.interfaceProxy.listenPort,
@@ -471,9 +443,7 @@ fun ConfigScreen(
                                 keyboardActions = keyboardActions,
                                 label = stringResource(R.string.dns_servers),
                                 hint = stringResource(R.string.comma_separated_list),
-                                modifier = Modifier
-                                    .fillMaxWidth(3 / 5f)
-                                    .padding(end = 5.dp),
+                                modifier = Modifier.fillMaxWidth(3 / 5f).padding(end = 5.dp),
                             )
                             ConfigurationTextBox(
                                 value = uiState.interfaceProxy.mtu,
@@ -486,13 +456,11 @@ fun ConfigScreen(
                         }
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier
-                                .fillMaxSize()
-                                .padding(top = 5.dp),
+                            modifier = Modifier.fillMaxSize().padding(top = 5.dp),
                             horizontalArrangement = Arrangement.Center,
                         ) {
                             TextButton(onClick = { showApplicationsDialog = true }) {
-                                Text(applicationButtonText.text)
+                                Text(applicationButtonText())
                             }
                         }
                     }
@@ -505,9 +473,7 @@ fun ConfigScreen(
                         color = MaterialTheme.colorScheme.surface,
                         modifier =
                             (if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                                Modifier
-                                    .fillMaxHeight(fillMaxHeight)
-                                    .fillMaxWidth(fillMaxWidth)
+                                    Modifier.fillMaxHeight(fillMaxHeight).fillMaxWidth(fillMaxWidth)
                                 } else {
                                     Modifier.fillMaxWidth(fillMaxWidth)
                                 })
@@ -516,16 +482,12 @@ fun ConfigScreen(
                         Column(
                             horizontalAlignment = Alignment.Start,
                             verticalArrangement = Arrangement.Top,
-                            modifier = Modifier
-                                .padding(horizontal = 15.dp)
-                                .padding(bottom = 10.dp),
+                            modifier = Modifier.padding(horizontal = 15.dp).padding(bottom = 10.dp),
                         ) {
                             Row(
                                 horizontalArrangement = Arrangement.SpaceBetween,
                                 verticalAlignment = Alignment.CenterVertically,
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .padding(horizontal = 5.dp),
+                                modifier = Modifier.fillMaxWidth().padding(horizontal = 5.dp),
                             ) {
                                 SectionTitle(
                                     stringResource(R.string.peer),
@@ -608,9 +570,7 @@ fun ConfigScreen(
                 Row(
                     horizontalArrangement = Arrangement.SpaceEvenly,
                     verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(bottom = 140.dp),
+                    modifier = Modifier.fillMaxSize().padding(bottom = 140.dp),
                 ) {
                     Row(
                         verticalAlignment = Alignment.CenterVertically,

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

@@ -1,25 +1,25 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
 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.ExperimentalFoundationApi
-import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.focusable
 import androidx.compose.foundation.gestures.ScrollableDefaults
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
@@ -44,10 +44,10 @@ import androidx.compose.material.icons.rounded.Edit
 import androidx.compose.material.icons.rounded.Info
 import androidx.compose.material.icons.rounded.Star
 import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Divider
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FabPosition
 import androidx.compose.material3.FloatingActionButton
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -81,7 +81,6 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -89,7 +88,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanOptions
-import com.wireguard.android.backend.GoBackend
 import com.wireguard.android.backend.Tunnel
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
@@ -109,11 +107,14 @@ import com.zaneschepke.wireguardautotunnel.util.mapPeerStats
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import timber.log.Timber
 
+@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
 @Composable
 fun MainScreen(
     viewModel: MainViewModel = hiltViewModel(),
+    padding: PaddingValues,
     focusRequester: FocusRequester,
     showSnackbarMessage: (String) -> Unit,
     navController: NavController
@@ -131,17 +132,6 @@ fun MainScreen(
     var selectedTunnel by remember { mutableStateOf<TunnelConfig?>(null) }
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
-    var vpnIntent by remember { mutableStateOf(GoBackend.VpnService.prepare(WireGuardAutoTunnel.instance)) }
-    val vpnActivityResultState =
-        rememberLauncherForActivityResult(
-            ActivityResultContracts.StartActivityForResult(),
-            onResult = {
-                val accepted = (it.resultCode == AppCompatActivity.RESULT_OK)
-                if (accepted) {
-                    vpnIntent = null
-                }
-            },
-        )
     LaunchedEffect(uiState.loading) {
         if (!uiState.loading && WireGuardAutoTunnel.isRunningOnAndroidTv()) {
             delay(Constants.FOCUS_REQUEST_DELAY)
@@ -265,9 +255,6 @@ fun MainScreen(
     }
 
     fun onTunnelToggle(checked: Boolean, tunnel: TunnelConfig) {
-        if (vpnIntent != null) {
-            return vpnActivityResultState.launch(vpnIntent)
-        }
         if (checked) viewModel.onTunnelStart(tunnel) else viewModel.onTunnelStop()
     }
 
@@ -289,9 +276,8 @@ fun MainScreen(
                             horizontalArrangement = Arrangement.SpaceBetween,
                             verticalAlignment = Alignment.CenterVertically,
                             modifier =
-                            Modifier
-                                .requiredWidth(LocalConfiguration.current.screenWidthDp.dp)
-                                .padding(end = 5.dp)
+                                Modifier.requiredWidth(LocalConfiguration.current.screenWidthDp.dp)
+                                    .padding(end = 5.dp),
                         ) {
                             Row {
                                 Icon(
@@ -302,15 +288,8 @@ fun MainScreen(
                                         if (uiState.settings.isAutoTunnelPaused) Color.Gray
                                         else mint,
                                 )
-                                val autoTunnelingLabel = buildAnnotatedString {
-                                    append(stringResource(id = R.string.auto_tunneling))
-                                    append(": ")
-                                    if(uiState.settings.isAutoTunnelPaused) append(stringResource(id = R.string.paused)) else append(
-                                        stringResource(id = R.string.active),
-                                    )
-                                }
                                 Text(
-                                    autoTunnelingLabel.text,
+                                    "Auto-tunneling: ${if (uiState.settings.isAutoTunnelPaused) "paused" else "active"}",
                                     style = typography.bodyLarge,
                                     modifier = Modifier.padding(start = 10.dp),
                                 )
@@ -320,14 +299,14 @@ fun MainScreen(
                                     onClick = { viewModel.resumeAutoTunneling() },
                                     modifier = Modifier.padding(end = 10.dp),
                                 ) {
-                                    Text(stringResource(id = R.string.resume))
+                                    Text("Resume")
                                 }
                             else
                                 TextButton(
                                     onClick = { viewModel.pauseAutoTunneling() },
                                     modifier = Modifier.padding(end = 10.dp),
                                 ) {
-                                    Text(stringResource(id = R.string.pause))
+                                    Text("Pause")
                                 }
                         }
                     },
@@ -344,18 +323,18 @@ fun MainScreen(
                 var fobColor by remember { mutableStateOf(secondaryColor) }
                 FloatingActionButton(
                     modifier =
-                    (if (
-                        WireGuardAutoTunnel.isRunningOnAndroidTv() &&
-                        uiState.tunnels.isEmpty()
-                    )
-                        Modifier.focusRequester(focusRequester)
-                    else Modifier)
-                        .padding(bottom = 90.dp)
-                        .onFocusChanged {
-                            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                                fobColor = if (it.isFocused) hoverColor else secondaryColor
-                            }
-                        },
+                        (if (
+                                WireGuardAutoTunnel.isRunningOnAndroidTv() &&
+                                    uiState.tunnels.isEmpty()
+                            )
+                                Modifier.focusRequester(focusRequester)
+                            else Modifier)
+                            .padding(bottom = 90.dp)
+                            .onFocusChanged {
+                                if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                                    fobColor = if (it.isFocused) hoverColor else secondaryColor
+                                }
+                            },
                     onClick = { showBottomSheet = true },
                     containerColor = fobColor,
                     shape = RoundedCornerShape(16.dp),
@@ -373,9 +352,7 @@ fun MainScreen(
             Column(
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Center,
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(innerPadding),
+                modifier = Modifier.fillMaxSize().padding(padding),
             ) {
                 Text(text = stringResource(R.string.no_tunnels), fontStyle = FontStyle.Italic)
             }
@@ -388,13 +365,12 @@ fun MainScreen(
                 // Sheet content
                 Row(
                     modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .clickable {
-                            showBottomSheet = false
-                            tunnelFileImportResultLauncher.launch(Constants.ALLOWED_FILE_TYPES)
-                        }
-                        .padding(10.dp),
+                        Modifier.fillMaxWidth()
+                            .clickable {
+                                showBottomSheet = false
+                                tunnelFileImportResultLauncher.launch(Constants.ALLOWED_FILE_TYPES)
+                            }
+                            .padding(10.dp),
                 ) {
                     Icon(
                         Icons.Filled.FileOpen,
@@ -407,27 +383,26 @@ fun MainScreen(
                     )
                 }
                 if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                    HorizontalDivider()
+                    Divider()
                     Row(
                         modifier =
-                        Modifier
-                            .fillMaxWidth()
-                            .clickable {
-                                scope.launch {
-                                    showBottomSheet = false
-                                    val scanOptions = ScanOptions()
-                                    scanOptions.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
-                                    scanOptions.setOrientationLocked(true)
-                                    scanOptions.setPrompt(
-                                        context.getString(R.string.scanning_qr)
-                                    )
-                                    scanOptions.setBeepEnabled(false)
-                                    scanOptions.captureActivity =
-                                        CaptureActivityPortrait::class.java
-                                    scanLauncher.launch(scanOptions)
+                            Modifier.fillMaxWidth()
+                                .clickable {
+                                    scope.launch {
+                                        showBottomSheet = false
+                                        val scanOptions = ScanOptions()
+                                        scanOptions.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
+                                        scanOptions.setOrientationLocked(true)
+                                        scanOptions.setPrompt(
+                                            context.getString(R.string.scanning_qr)
+                                        )
+                                        scanOptions.setBeepEnabled(false)
+                                        scanOptions.captureActivity =
+                                            CaptureActivityPortrait::class.java
+                                        scanLauncher.launch(scanOptions)
+                                    }
                                 }
-                            }
-                            .padding(10.dp),
+                                .padding(10.dp),
                     ) {
                         Icon(
                             Icons.Filled.QrCode,
@@ -440,18 +415,17 @@ fun MainScreen(
                         )
                     }
                 }
-                HorizontalDivider()
+                Divider()
                 Row(
                     modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .clickable {
-                            showBottomSheet = false
-                            navController.navigate(
-                                "${Screen.Config.route}/${Constants.MANUAL_TUNNEL_CONFIG_ID}",
-                            )
-                        }
-                        .padding(10.dp),
+                        Modifier.fillMaxWidth()
+                            .clickable {
+                                showBottomSheet = false
+                                navController.navigate(
+                                    "${Screen.Config.route}/${Constants.MANUAL_TUNNEL_CONFIG_ID}",
+                                )
+                            }
+                            .padding(10.dp),
                 ) {
                     Icon(
                         Icons.Filled.Create,
@@ -470,11 +444,10 @@ fun MainScreen(
             horizontalAlignment = Alignment.Start,
             verticalArrangement = Arrangement.Top,
             modifier =
-            Modifier
-                .fillMaxWidth()
-                .fillMaxHeight(.90f)
-                .overscroll(ScrollableDefaults.overscrollEffect())
-                .padding(innerPadding),
+                Modifier.fillMaxWidth()
+                    .fillMaxHeight(.90f)
+                    .overscroll(ScrollableDefaults.overscrollEffect())
+                    .padding(innerPadding),
             state = rememberLazyListState(0, uiState.tunnels.count()),
             userScrollEnabled = true,
             reverseLayout = true,
@@ -514,18 +487,14 @@ fun MainScreen(
                                 Icons.Rounded.Star,
                                 stringResource(R.string.status),
                                 tint = leadingIconColor,
-                                modifier = Modifier
-                                    .padding(end = 10.dp)
-                                    .size(20.dp),
+                                modifier = Modifier.padding(end = 10.dp).size(20.dp),
                             )
                         } else {
                             Icon(
                                 Icons.Rounded.Circle,
                                 stringResource(R.string.status),
                                 tint = leadingIconColor,
-                                modifier = Modifier
-                                    .padding(end = 15.dp)
-                                    .size(15.dp),
+                                modifier = Modifier.padding(end = 15.dp).size(15.dp),
                             )
                         }
                     },

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

@@ -94,8 +94,8 @@ import java.io.File
 )
 @Composable
 fun SettingsScreen(
-    padding: PaddingValues,
     viewModel: SettingsViewModel = hiltViewModel(),
+    padding: PaddingValues,
     showSnackbarMessage: (String) -> Unit,
     focusRequester: FocusRequester
 ) {
@@ -127,7 +127,7 @@ fun SettingsScreen(
         rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {
             result: ActivityResult ->
             if (result.resultCode == Activity.RESULT_OK) {
-                result.data
+                val intent = result.data
                 // Handle the Intent
             }
             viewModel.setBatteryOptimizeDisableShown()
@@ -329,7 +329,7 @@ fun SettingsScreen(
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Top,
             modifier =
-                Modifier.fillMaxSize().padding(padding).verticalScroll(scrollState).clickable(
+                Modifier.fillMaxSize().verticalScroll(scrollState).clickable(
                     indication = null,
                     interactionSource = interactionSource,
                 ) {
@@ -347,7 +347,7 @@ fun SettingsScreen(
                                 .fillMaxWidth(fillMaxWidth)
                                 .padding(top = 10.dp)
                         } else {
-                            Modifier.fillMaxWidth(fillMaxWidth).padding(top = 20.dp)
+                            Modifier.fillMaxWidth(fillMaxWidth).padding(top = 60.dp)
                         })
                         .padding(bottom = 10.dp),
             ) {

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

@@ -20,10 +20,10 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.rounded.ArrowForward
+import androidx.compose.material.icons.rounded.ArrowForward
 import androidx.compose.material.icons.rounded.Book
 import androidx.compose.material.icons.rounded.Mail
-import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Divider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
@@ -57,8 +57,8 @@ import com.zaneschepke.wireguardautotunnel.util.Event
 
 @Composable
 fun SupportScreen(
-    padding: PaddingValues,
     viewModel: SupportViewModel = hiltViewModel(),
+    padding: PaddingValues,
     showSnackbarMessage: (String) -> Unit,
     focusRequester: FocusRequester
 ) {
@@ -104,9 +104,10 @@ fun SupportScreen(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Top,
         modifier =
-            Modifier.fillMaxSize().padding(padding)
+            Modifier.fillMaxSize()
                 .verticalScroll(rememberScrollState())
                 .focusable()
+                .padding(padding),
     ) {
         Surface(
             tonalElevation = 2.dp,
@@ -154,16 +155,10 @@ fun SupportScreen(
                                 modifier = Modifier.padding(start = 10.dp),
                             )
                         }
-                        Icon(
-                            Icons.AutoMirrored.Rounded.ArrowForward,
-                            stringResource(id = R.string.go)
-                        )
+                        Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
                     }
                 }
-                HorizontalDivider(
-                    thickness = 0.5.dp,
-                    color = MaterialTheme.colorScheme.onBackground
-                )
+                Divider(color = MaterialTheme.colorScheme.onBackground, thickness = 0.5.dp)
                 TextButton(
                     onClick = { openWebPage(context.resources.getString(R.string.discord_url)) },
                     modifier = Modifier.padding(vertical = 5.dp),
@@ -185,16 +180,10 @@ fun SupportScreen(
                                 modifier = Modifier.padding(start = 10.dp),
                             )
                         }
-                        Icon(
-                            Icons.AutoMirrored.Rounded.ArrowForward,
-                            stringResource(id = R.string.go)
-                        )
+                        Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
                     }
                 }
-                HorizontalDivider(
-                    thickness = 0.5.dp,
-                    color = MaterialTheme.colorScheme.onBackground
-                )
+                Divider(color = MaterialTheme.colorScheme.onBackground, thickness = 0.5.dp)
                 TextButton(
                     onClick = { openWebPage(context.resources.getString(R.string.github_url)) },
                     modifier = Modifier.padding(vertical = 5.dp),
@@ -216,16 +205,10 @@ fun SupportScreen(
                                 modifier = Modifier.padding(start = 10.dp),
                             )
                         }
-                        Icon(
-                            Icons.AutoMirrored.Rounded.ArrowForward,
-                            stringResource(id = R.string.go)
-                        )
+                        Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
                     }
                 }
-                HorizontalDivider(
-                    thickness = 0.5.dp,
-                    color = MaterialTheme.colorScheme.onBackground
-                )
+                Divider(color = MaterialTheme.colorScheme.onBackground, thickness = 0.5.dp)
                 TextButton(
                     onClick = { launchEmail() },
                     modifier = Modifier.padding(vertical = 5.dp),
@@ -243,10 +226,7 @@ fun SupportScreen(
                                 modifier = Modifier.padding(start = 10.dp),
                             )
                         }
-                        Icon(
-                            Icons.AutoMirrored.Rounded.ArrowForward,
-                            stringResource(id = R.string.go)
-                        )
+                        Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
                     }
                 }
             }

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

@@ -0,0 +1,22 @@
+package com.zaneschepke.wireguardautotunnel.ui.theme
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.ui.graphics.Color
+import com.google.accompanist.systemuicontroller.rememberSystemUiController
+
+@Composable
+fun TransparentSystemBars() {
+    val systemUiController = rememberSystemUiController()
+    val useDarkIcons = !isSystemInDarkTheme()
+
+    DisposableEffect(systemUiController, useDarkIcons) {
+        systemUiController.setSystemBarsColor(
+            color = Color.Transparent,
+            darkIcons = useDarkIcons,
+        )
+
+        onDispose {}
+    }
+}

app/src/main/res/drawable-anydpi/ic_launcher.xml

@@ -1,17 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="640"
-    android:viewportHeight="640"
-    android:tint="#FFFFFF">
-  <group android:scaleX="1.0132159"
-      android:scaleY="1.0132159"
-      android:translateX="-4.229075"
-      android:translateY="-4.229075">
-    <path
-        android:pathData="M316.72,80.15C314.94,80.82 312.08,83.95 308.79,88.84C275.66,138.15 157.88,161.96 119.66,127.08C109.97,118.24 101.21,118.84 98.97,128.5C96.01,141.29 98.49,204.07 103.12,233.5C123.71,364.32 186.77,465.69 303.03,554.88C314.06,563.34 316.63,563.42 326.93,555.61C329.91,553.35 336.21,548.63 340.93,545.13C345.64,541.63 350.87,537.46 352.55,535.88C354.23,534.29 357.92,531.53 360.75,529.74C413.56,496.43 481.74,399.04 510.38,316C527.22,267.19 534.86,236.66 539.96,197.9C547.99,136.74 545.31,124.46 526,134.01C469.85,161.74 361.02,137.16 333.39,90.49C327.63,80.75 322.93,77.84 316.72,80.15M307.5,195.34C282.24,203.76 266.16,237.38 269.85,274.04C270.99,285.39 271.18,285 264.63,285C254.13,285 254.15,284.87 255,352.05C255.64,402.94 250.1,397.02 298.5,398.52C352.54,400.2 377.63,400.23 379.23,398.63C381.67,396.18 381.86,392.86 382.46,339.89C383.09,283.93 383.39,286 374.51,286C367.07,286 367.21,286.26 367.77,273.58C369.89,225.38 338.74,184.92 307.5,195.34M308.93,216.98C294.31,224.7 281.68,270.05 290.33,283.75C291.74,285.99 346.85,285.51 347.78,283.25C359.48,254.75 330.62,205.51 308.93,216.98M309.54,317.1C304.18,321.81 304.39,327.76 310.11,332.99C314.78,337.26 314.82,336.51 309.33,349.89C307.44,354.51 306.13,358.89 306.42,359.64C306.96,361.06 329,361.75 329,360.35C329,359.98 327.42,354.82 325.5,348.86C323.58,342.91 322,337.52 322,336.89C322,336.26 323.58,334 325.5,331.87C335.69,320.59 321.02,307.02 309.54,317.1"
-        android:fillColor="#53bdb6"
-        android:fillType="evenOdd"
-        android:strokeColor="#00000000"/>
-  </group>
-</vector>

app/src/main/res/drawable/ic_banner_foreground.xml

@@ -1,45 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="320dp"
-    android:height="180dp"
-    android:viewportWidth="640"
-    android:viewportHeight="640">
-  <group android:scaleX="0.6666667"
-      android:scaleY="0.6666667"
-      android:translateX="106.666664"
-      android:translateY="106.666664">
-    <group android:scaleX="0.315"
-        android:scaleY="0.56"
-        android:translateX="46.4"
-        android:translateY="140.8">
-      <path
-          android:pathData="M316.72,80.15C314.94,80.82 312.08,83.95 308.79,88.84C275.66,138.15 157.88,161.96 119.66,127.08C109.97,118.24 101.21,118.84 98.97,128.5C96.01,141.29 98.49,204.07 103.12,233.5C123.71,364.32 186.77,465.69 303.03,554.88C314.06,563.34 316.63,563.42 326.93,555.61C329.91,553.35 336.21,548.63 340.93,545.13C345.64,541.63 350.87,537.46 352.55,535.88C354.23,534.29 357.92,531.53 360.75,529.74C413.56,496.43 481.74,399.04 510.38,316C527.22,267.19 534.86,236.66 539.96,197.9C547.99,136.74 545.31,124.46 526,134.01C469.85,161.74 361.02,137.16 333.39,90.49C327.63,80.75 322.93,77.84 316.72,80.15M307.5,195.34C282.24,203.76 266.16,237.38 269.85,274.04C270.99,285.39 271.18,285 264.63,285C254.13,285 254.15,284.87 255,352.05C255.64,402.94 250.1,397.02 298.5,398.52C352.54,400.2 377.63,400.23 379.23,398.63C381.67,396.18 381.86,392.86 382.46,339.89C383.09,283.93 383.39,286 374.51,286C367.07,286 367.21,286.26 367.77,273.58C369.89,225.38 338.74,184.92 307.5,195.34M308.93,216.98C294.31,224.7 281.68,270.05 290.33,283.75C291.74,285.99 346.85,285.51 347.78,283.25C359.48,254.75 330.62,205.51 308.93,216.98M309.54,317.1C304.18,321.81 304.39,327.76 310.11,332.99C314.78,337.26 314.82,336.51 309.33,349.89C307.44,354.51 306.13,358.89 306.42,359.64C306.96,361.06 329,361.75 329,360.35C329,359.98 327.42,354.82 325.5,348.86C323.58,342.91 322,337.52 322,336.89C322,336.26 323.58,334 325.5,331.87C335.69,320.59 321.02,307.02 309.54,317.1"
-          android:fillColor="#53bdb6"
-          android:fillType="evenOdd"
-          android:strokeColor="#00000000"/>
-    </group>
-
-    <group android:scaleX="0.52644"
-        android:scaleY="0.20707752"
-        android:translateX="320.4"
-        android:translateY="70.26513">
-      <group android:translateY="132.92308">
-        <path android:pathData="M76.06154,-101.68616L87.95077,-101.68616L72.44308,0L55.606155,0L43.93846,-76.72615L32.196922,0L14.990769,0L0.6646154,-101.68616L13.513846,-101.68616L24.36923,-14.104615L36.553844,-89.870766L52.283077,-89.870766L63.876923,-14.104615Z"
-            android:fillColor="#53BDB6"/>
-        <path android:pathData="M135.30154,1.6984615Q123.11692,1.6984615,114.25539,-4.1723075Q105.393845,-10.0430765,100.55692,-21.821539Q95.72,-33.6,95.72,-50.88Q95.72,-67.643074,101.62769,-79.495384Q107.535385,-91.347694,117.246155,-97.32923Q126.956924,-103.31077,138.25539,-103.31077Q147.78154,-103.31077,154.42769,-100.61539Q161.07385,-97.92,167.35077,-92.16L159.59692,-84.11077Q154.94461,-88.46769,149.77539,-90.535385Q144.60616,-92.60307,138.32922,-92.60307Q130.42769,-92.60307,123.92923,-88.504616Q117.43077,-84.40615,113.44308,-75.10154Q109.45538,-65.79692,109.45538,-50.88Q109.45538,-29.095385,116.175385,-19.089231Q122.895386,-9.0830765,136.48308,-9.0830765Q146.7477,-9.0830765,155.83076,-13.9569235L155.83076,-44.97231L135.81847,-44.97231L134.26768,-55.606155L168.5323,-55.606155L168.5323,-7.163077Q160.70462,-2.88,152.98769,-0.59076923Q145.27077,1.6984615,135.30154,1.6984615Z"
-            android:fillColor="#53BDB6"/>
-        <path android:pathData="M348.30463,-90.683075L317.43692,-90.683075L317.43692,0L304.66153,0L304.66153,-90.683075L272.90768,-90.683075L272.90768,-101.68616L349.63385,-101.68616Z"
-            android:fillColor="#53BDB6"/>
-        <path android:pathData="M383.24924,-22.670769Q383.24924,-15.064615,386.3877,-11.630769Q389.52615,-8.196923,396.32,-8.196923Q402.44922,-8.196923,408.24615,-11.741538Q414.0431,-15.286154,417.36615,-20.52923L417.36615,-77.76L429.7723,-77.76L429.7723,0L419.2123,0L418.17847,-10.486154Q413.67386,-4.726154,406.99078,-1.5138462Q400.30768,1.6984615,393.2923,1.6984615Q382.14154,1.6984615,376.4923,-4.246154Q370.84308,-10.190769,370.84308,-21.193846L370.84308,-77.76L383.24924,-77.76Z"
-            android:fillColor="#53BDB6"/>
-        <path android:pathData="M459.84308,0L459.84308,-77.76L470.40308,-77.76L471.36307,-66.97846Q476.01538,-72.81231,483.0677,-76.098465Q490.12,-79.38461,497.06152,-79.38461Q508.2123,-79.38461,513.56616,-73.47692Q518.92,-67.56923,518.92,-56.49231L518.92,0L506.51385,0L506.51385,-47.335384Q506.51385,-56.049232,505.59076,-60.627693Q504.6677,-65.206154,501.82462,-67.42154Q498.98154,-69.636925,493.22153,-69.636925Q486.9446,-69.636925,481.36923,-65.76Q475.79385,-61.883076,472.24924,-56.64L472.24924,0Z"
-            android:fillColor="#53BDB6"/>
-        <path android:pathData="M548.8431,0L548.8431,-77.76L559.4031,-77.76L560.3631,-66.97846Q565.0154,-72.81231,572.0677,-76.098465Q579.12,-79.38461,586.0615,-79.38461Q597.2123,-79.38461,602.56616,-73.47692Q607.92,-67.56923,607.92,-56.49231L607.92,0L595.51385,0L595.51385,-47.335384Q595.51385,-56.049232,594.59076,-60.627693Q593.66766,-65.206154,590.8246,-67.42154Q587.98157,-69.636925,582.22156,-69.636925Q575.94464,-69.636925,570.3692,-65.76Q564.7938,-61.883076,561.2492,-56.64L561.2492,0Z"
-            android:fillColor="#53BDB6"/>
-        <path android:pathData="M647.59076,-34.486153Q647.88617,-25.772308,650.9877,-19.975384Q654.08923,-14.178461,659.1108,-11.409231Q664.1323,-8.64,670.3354,-8.64Q676.0954,-8.64,680.9323,-10.338462Q685.7692,-12.036923,691.0862,-15.655385L696.92,-7.4584618Q691.4554,-3.1753845,684.4031,-0.73846155Q677.35077,1.6984615,670.1877,1.6984615Q659.0369,1.6984615,650.9877,-3.323077Q642.9385,-8.344615,638.7662,-17.50154Q634.5939,-26.65846,634.5939,-38.76923Q634.5939,-50.51077,638.8031,-59.74154Q643.0123,-68.972305,650.6923,-74.17846Q658.3723,-79.38461,668.56305,-79.38461Q678.3108,-79.38461,685.43695,-74.80615Q692.56305,-70.22769,696.36615,-61.624615Q700.16925,-53.021538,700.16925,-41.28Q700.16925,-37.883076,699.87384,-34.486153ZM668.71075,-69.19385Q659.70154,-69.19385,654.0523,-62.88Q648.4031,-56.566154,647.6646,-44.086155L688.2062,-44.086155Q687.9846,-56.344616,682.81537,-62.76923Q677.6462,-69.19385,668.71075,-69.19385Z"
-            android:fillColor="#53BDB6"/>
-        <path android:pathData="M757.12,-19.2Q757.12,-13.735385,760.55383,-11.187693Q763.9877,-8.64,769.96924,-8.64Q776.24615,-8.64,783.04,-11.372308L786.3631,-2.2892308Q782.8185,-0.51692307,778.0923,0.59076923Q773.36615,1.6984615,767.90155,1.6984615Q761.0339,1.6984615,755.75385,-0.8861538Q750.4738,-3.4707692,747.5939,-8.344615Q744.71387,-13.218462,744.71387,-19.864614L744.71387,-99.24923L720.8615,-99.24923L720.8615,-109.07077L757.12,-109.07077Z"
-            android:fillColor="#53BDB6"/>
-      </group>
-    </group>
-  </group>
-</vector>

app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,16 +1,30 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="640"
-    android:viewportHeight="640">
-  <group android:scaleX="0.6"
-      android:scaleY="0.6"
-      android:translateX="128"
-      android:translateY="128">
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
     <path
-        android:pathData="M316.72,80.15C314.94,80.82 312.08,83.95 308.79,88.84C275.66,138.15 157.88,161.96 119.66,127.08C109.97,118.24 101.21,118.84 98.97,128.5C96.01,141.29 98.49,204.07 103.12,233.5C123.71,364.32 186.77,465.69 303.03,554.88C314.06,563.34 316.63,563.42 326.93,555.61C329.91,553.35 336.21,548.63 340.93,545.13C345.64,541.63 350.87,537.46 352.55,535.88C354.23,534.29 357.92,531.53 360.75,529.74C413.56,496.43 481.74,399.04 510.38,316C527.22,267.19 534.86,236.66 539.96,197.9C547.99,136.74 545.31,124.46 526,134.01C469.85,161.74 361.02,137.16 333.39,90.49C327.63,80.75 322.93,77.84 316.72,80.15M307.5,195.34C282.24,203.76 266.16,237.38 269.85,274.04C270.99,285.39 271.18,285 264.63,285C254.13,285 254.15,284.87 255,352.05C255.64,402.94 250.1,397.02 298.5,398.52C352.54,400.2 377.63,400.23 379.23,398.63C381.67,396.18 381.86,392.86 382.46,339.89C383.09,283.93 383.39,286 374.51,286C367.07,286 367.21,286.26 367.77,273.58C369.89,225.38 338.74,184.92 307.5,195.34M308.93,216.98C294.31,224.7 281.68,270.05 290.33,283.75C291.74,285.99 346.85,285.51 347.78,283.25C359.48,254.75 330.62,205.51 308.93,216.98M309.54,317.1C304.18,321.81 304.39,327.76 310.11,332.99C314.78,337.26 314.82,336.51 309.33,349.89C307.44,354.51 306.13,358.89 306.42,359.64C306.96,361.06 329,361.75 329,360.35C329,359.98 327.42,354.82 325.5,348.86C323.58,342.91 322,337.52 322,336.89C322,336.26 323.58,334 325.5,331.87C335.69,320.59 321.02,307.02 309.54,317.1"
-        android:fillColor="#53bdb6"
-        android:fillType="evenOdd"
-        android:strokeColor="#00000000"/>
-  </group>
-</vector>
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>

app/src/main/res/drawable/shield.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12V5l-9,-4z" />
+</vector>

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

@@ -1,5 +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="@drawable/ic_banner_foreground"/>
+    <background android:drawable="@color/ic_banner_background" />
+    <foreground android:drawable="@mipmap/ic_banner_foreground" />
 </adaptive-icon>

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

@@ -1,7 +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_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <!-- support for adaptive theme icons -->
-    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>

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

@@ -1,7 +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_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <!-- support for adaptive theme icons -->
-    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_banner_background">#1D1A20</color>
+    <color name="ic_banner_background">#121212</color>
 </resources>

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#1D1A20</color>
+    <color name="ic_launcher_background">#1C1B20</color>
 </resources>

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

@@ -6,14 +6,14 @@
     <string name="watcher_channel_id">Watcher Channel</string>
     <string name="watcher_channel_name">Watcher Notification Channel</string>
     <string name="foreground_file">FOREGROUND_FILE</string>
-    <string name="github_url" translatable="false">https://github.com/zaneschepke/wgtunnel/issues</string>
-    <string name="docs_url" translatable="false">https://zaneschepke.com/wgtunnel-docs/overview.html</string>
-    <string name="privacy_policy_url" translatable="false">https://zaneschepke.com/wgtunnel-docs/privacypolicy.html</string>
+    <string name="github_url">https://github.com/zaneschepke/wgtunnel/issues</string>
+    <string name="docs_url">https://zaneschepke.com/wgtunnel-docs/overview.html</string>
+    <string name="privacy_policy_url">https://zaneschepke.com/wgtunnel-docs/privacypolicy.html</string>
     <string name="error_file_extension">File is not a .conf or .zip</string>
     <string name="turn_off_tunnel">Action requires tunnel off</string>
     <string name="no_tunnels">No tunnels added yet!</string>
     <string name="tunnel_exists">Tunnel name already exists</string>
-    <string name="discord_url" translatable="false">https://discord.gg/rbRRNh6H7V</string>
+    <string name="discord_url">https://discord.gg/rbRRNh6H7V</string>
     <string name="watcher_notification_title">Watcher Service</string>
     <string name="watcher_notification_text_active">Monitoring network state changes: active</string>
     <string name="watcher_notification_text_paused">Monitoring network state changes: paused</string>
@@ -39,7 +39,7 @@
     <string name="thank_you">Thank you for using WG Tunnel!</string>
     <string name="trusted_ssid_empty_description">Enter SSID</string>
     <string name="trusted_ssid_value_description">Submit SSID</string>
-    <string name="config_validation" translatable="false">[Interface]</string>
+    <string name="config_validation">[Interface]</string>
     <string name="add_tunnels_text">Add from file or zip</string>
     <string name="open_file">File Open</string>
     <string name="add_from_qr">Add from QR code</string>
@@ -140,15 +140,15 @@
     <string name="exported_configs_message">Exported configs to downloads</string>
     <string name="status">status</string>
     <string name="tunnel_on_wifi">Tunnel on untrusted wifi</string>
-    <string name="my_email" translatable="false">support@zaneschepke.com</string>
+    <string name="my_email">zanecschepke@gmail.com</string>
     <string name="email_subject">WG Tunnel Support</string>
     <string name="email_chooser">Send an email…</string>
     <string name="go">go</string>
     <string name="docs_description">Read the docs (WIP)</string>
     <string name="discord_description">Join the community</string>
-    <string name="discord" translatable="false">Discord</string>
+    <string name="discord">Discord</string>
     <string name="docs">Docs</string>
-    <string name="github" translatable="false">GitHub</string>
+    <string name="github">GitHub</string>
     <string name="email">Email</string>
     <string name="email_description">Send me an email</string>
     <string name="support_help_text">If you are experiencing issues, have improvement ideas, or just want to engage, the following resources are available:</string>
@@ -167,12 +167,4 @@
     <string name="delete_tunnel">Delete tunnel</string>
     <string name="delete_tunnel_message">Are you sure you would like to delete this tunnel?</string>
     <string name="yes">Yes</string>
-    <string name="resume">Resume</string>
-    <string name="pause">Pause</string>
-    <string name="paused">paused</string>
-    <string name="active">active</string>
-    <string name="tunneling_apps">Tunneling apps</string>
-    <string name="included">included</string>
-    <string name="excluded">excluded</string>
-    <string name="all">all</string>
 </resources>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="Theme.WireguardAutoTunnel" parent="@style/Theme.AppCompat.NoActionBar">
         <item name="android:windowBackground">@color/black_background</item>
     </style>

buildSrc/src/main/kotlin/BuildHelper.kt

@@ -1,5 +1,4 @@
 import org.gradle.api.invocation.Gradle
-import java.io.File
 
 object BuildHelper {
     private fun getCurrentFlavor(gradle: Gradle): String {
@@ -22,17 +21,6 @@ object BuildHelper {
         return flavor
     }
 
-    fun getLocalProperty(key: String, file: String = "local.properties"): String? {
-        val properties = java.util.Properties()
-        val localProperties = File(file)
-        if (localProperties.isFile) {
-            java.io.InputStreamReader(java.io.FileInputStream(localProperties), Charsets.UTF_8).use { reader ->
-                properties.load(reader)
-            }
-        } else return null
-        return properties.getProperty(key)
-    }
-
     fun isGeneralFlavor(gradle: Gradle): Boolean {
         return getCurrentFlavor(gradle) == "general"
     }

buildSrc/src/main/kotlin/Constants.kt

@@ -1,7 +1,7 @@
 object Constants {
-    const val VERSION_NAME = "3.3.7"
+    const val VERSION_NAME = "3.3.4"
     const val JVM_TARGET = "17"
-    const val VERSION_CODE = 33700
+    const val VERSION_CODE = 33400
     const val TARGET_SDK = 34
     const val MIN_SDK = 26
     const val APP_ID = "com.zaneschepke.wireguardautotunnel"

fastlane/Fastfile

@@ -2,18 +2,6 @@ default_platform(:android)
 
 platform :android do
 
-  desc 'Deploy a new internal version to the Google Play Store'
-  lane :internal do
-    gradle(task: "clean bundleGeneralRelease")
-    upload_to_play_store(track: 'internal', skip_upload_apk: true)
-  end
-
-  desc "Deploy an alpha version to the Google Play"
-    lane :alpha do
-      gradle(task: "clean bundleGeneralRelease")
-      upload_to_play_store(track: 'alpha', skip_upload_apk: true)
-  end
-
   desc "Deploy a beta version to the Google Play"
   lane :beta do
     gradle(task: "clean bundleGeneralRelease")

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

@@ -1,2 +0,0 @@
-What's new:
-- This is a CI testing version

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

@@ -1,6 +0,0 @@
-What's new:
-- Auto-start on reboot for Always-On VPN kernel mode
-- Support for adaptive theme icons
-- Fix notification icons, tile icon
-- Fix AndroidTV icons
-

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

@@ -1,5 +0,0 @@
-What's new:
-- Improve first launch flow
-- Switch to wireguard lib fork
-- Request VPN permission on first VPN start
-- Bump versions

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

@@ -1,2 +0,0 @@
-What's new:
-- Tunnel display UI bug fix

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-accompanist = "0.34.0"
+accompanist = "0.32.0"
 activityCompose = "1.8.2"
 androidx-junit = "1.1.5"
 appcompat = "1.6.1"
@@ -10,35 +10,36 @@ datastorePreferences = "1.0.0"
 desugar_jdk_libs = "2.0.4"
 espressoCore = "3.5.1"
 firebase-crashlytics-gradle = "2.9.9"
-google-services = "4.4.1"
+google-services = "4.4.0"
 hiltAndroid = "2.50"
 hiltNavigationCompose = "1.1.0"
 junit = "4.13.2"
 kotlinx-serialization-json = "1.6.2"
 lifecycle-runtime-compose = "2.7.0"
-material3 = "1.2.0"
-navigationCompose = "2.7.7"
+material-icons-extended = "1.5.4"
+material3 = "1.1.2"
+navigationCompose = "2.7.6"
 roomVersion = "2.6.1"
 timber = "5.0.1"
-tunnel = "1.1.0"
-androidGradlePlugin = "8.3.0-rc02"
+tunnel = "1.0.20230706"
+androidGradlePlugin = "8.2.1"
 kotlin = "1.9.22"
 ksp = "1.9.22-1.0.16"
-composeBom = "2024.02.00"
-firebaseBom = "32.7.2"
-compose = "1.6.1"
-crashlytics = "18.6.2"
-analytics = "21.5.1"
+composeBom = "2023.10.01"
+firebaseBom = "32.7.0"
+compose = "1.5.4"
+crashlytics = "18.6.0"
+analytics = "21.5.0"
 zxingAndroidEmbedded = "4.3.0"
-zxingCore = "3.5.3"
+zxingCore = "3.5.2"
 
 
 [libraries]
-
 # accompanist
 accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanist" }
 accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" }
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
+accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
 
 #room
 androidx-biometric-ktx = { module = "androidx.biometric:biometric-ktx", version.ref = "biometricKtx" }
@@ -79,10 +80,10 @@ androidx-navigation-compose = { module = "androidx.navigation:navigation-compose
 junit = { module = "junit:junit", version.ref = "junit" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
 lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle-runtime-compose" }
-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" }
+material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "material-icons-extended" }
 
 timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
-tunnel = { module = "com.zaneschepke:wireguard-android", version.ref = "tunnel" }
+tunnel = { module = "com.wireguard.android:tunnel", version.ref = "tunnel" }
 
 #firebase
 google-firebase-crashlytics-ktx = { module = "com.google.firebase:firebase-crashlytics-ktx", version.ref = "crashlytics" }
@@ -93,6 +94,7 @@ google-services = { module = "com.google.gms:google-services", version.ref = "go
 
 zxing-core = { module = "com.google.zxing:core", version.ref = "zxingCore" }
 zxing-android-embedded = { module = "com.journeyapps:zxing-android-embedded", version.ref = "zxingAndroidEmbedded" }
+
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -2,7 +2,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
-distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -2,42 +2,18 @@ pluginManagement {
     repositories {
         google()
         mavenCentral()
-        mavenLocal()
         gradlePluginPortal()
     }
 }
 
-val GITHUB_USER_VAR = "GH_USER"
-val GITHUB_TOKEN_VAR = "GH_TOKEN"
-
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/zaneschepke/wireguard-android")
-            credentials {
-                username = getLocalProperty(GITHUB_USER_VAR) ?: System.getenv(GITHUB_USER_VAR)
-                password = getLocalProperty(GITHUB_TOKEN_VAR) ?: System.getenv(GITHUB_TOKEN_VAR)
-            }
-        }
         google()
         mavenCentral()
-        mavenLocal()
     }
 }
 
-fun getLocalProperty(key: String, file: String = "local.properties"): String? {
-    val properties = java.util.Properties()
-    val localProperties = File(file)
-    if (localProperties.isFile) {
-        java.io.InputStreamReader(java.io.FileInputStream(localProperties), Charsets.UTF_8).use { reader ->
-            properties.load(reader)
-        }
-    } else return null
-    return properties.getProperty(key)
-}
-
 rootProject.name = "WG Tunnel"
 
 include(":app")