feat: migrate to forked lib

Migrated app to a forked version of wireguard-android to enable development work on features that require changes to the core lib, like #107 #104 #87 #52 #6

Improved first launch flow by change vpn permission to only launch on first tunnel start

Changed to proper database seeding strategy

Updated README to account for GitHub packages auth requirement

Migrated from deprecated UI components and libs

Bump versions

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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,33 @@
+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,6 +4,7 @@ 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
@@ -23,6 +24,7 @@ class DatabaseModule {
                 context.getString(R.string.db_name),
             )
             .fallbackToDestructiveMigration()
+            .addCallback(DatabaseCallback())
             .build()
     }
 }

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

@@ -8,6 +8,7 @@ import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepositor
 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
@@ -21,8 +22,10 @@ class BootReceiver : BroadcastReceiver() {
         if (Intent.ACTION_BOOT_COMPLETED != intent?.action) return@goAsync
         val settings = settingsRepository.getSettings()
         if (settings.isAutoTunnelEnabled) {
+            Timber.i("Starting watcher service from boot")
             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/WireGuardConnectivityWatcherService.kt

@@ -152,12 +152,16 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
         wakeLock =
             (getSystemService(Context.POWER_SERVICE) as PowerManager).run {
                 newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
-                    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)
+                    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()
                     }
                 }
             }

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,13 +1,12 @@
 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(
-    private val settingsRepo: SettingsDao,
-) : ViewModel() {}
+constructor() : ViewModel() {
+
+}

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

@@ -6,11 +6,13 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
-import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
-import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.enableEdgeToEdge
 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
@@ -20,13 +22,12 @@ 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.lifecycleScope
 import androidx.navigation.compose.NavHost
@@ -35,7 +36,6 @@ 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,7 +47,6 @@ 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
@@ -70,6 +69,8 @@ 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 {
@@ -80,13 +81,12 @@ class MainActivity : AppCompatActivity() {
             }
         }
         setContent {
-            //            val activityViewModel = hiltViewModel<ActivityViewModel>()
+            //val activityViewModel = hiltViewModel<ActivityViewModel>()
 
             val navController = rememberNavController()
             val focusRequester = remember { FocusRequester() }
 
             WireguardAutoTunnelTheme {
-                TransparentSystemBars()
 
                 val snackbarHostState = remember { SnackbarHostState() }
 
@@ -134,9 +134,11 @@ class MainActivity : AppCompatActivity() {
                             )
                         }
                     },
-                    modifier = Modifier.focusable().focusProperties { up = focusRequester },
+                    modifier = Modifier
+                        .focusable()
+                        .focusProperties { up = focusRequester },
                     bottomBar =
-                        if (notificationPermissionState != null && notificationPermissionState.status.isGranted) {
+                        if (notificationPermissionState == null || notificationPermissionState.status.isGranted) {
                             {
                                 BottomNavBar(
                                     navController,
@@ -151,66 +153,64 @@ class MainActivity : AppCompatActivity() {
                             {}
                         },
                 ) { padding ->
-                    if (notificationPermissionState != null && !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,
+                    Column(modifier = Modifier.padding(padding)) {
+                        if (notificationPermissionState != null && !notificationPermissionState.status.isGranted) {
+                            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
                         }
-                        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(
+                        NavHost(navController, startDestination = Screen.Main.route) {
+                            composable(
+                                Screen.Main.route,
+                            ) {
+                                MainScreen(
+                                    focusRequester = focusRequester,
+                                    showSnackbarMessage = { message -> showSnackBarMessage(message) },
                                     navController = navController,
-                                    id = id,
-                                    showSnackbarMessage = { message ->
-                                        showSnackBarMessage(message)
-                                    },
+                                )
+                            }
+                            composable(
+                                Screen.Settings.route,
+                            ) {
+                                SettingsScreen(
+                                    showSnackbarMessage = { message -> showSnackBarMessage(message) },
                                     focusRequester = focusRequester,
                                 )
                             }
+                            composable(
+                                Screen.Support.route,
+                            ) {
+                                SupportScreen(
+                                    focusRequester = focusRequester,
+                                    showSnackbarMessage = { message -> showSnackBarMessage(message) },
+                                )
+                            }
+                            composable("${Screen.Config.route}/{id}") {
+                                val id = it.arguments?.getString("id")
+                                if (!id.isNullOrBlank()) {
+                                    ConfigScreen(
+                                        navController = navController,
+                                        id = id,
+                                        showSnackbarMessage = { message ->
+                                            showSnackBarMessage(message)
+                                        },
+                                        focusRequester = focusRequester,
+                                    )
+                                }
+                            }
                         }
                     }
                 }

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

@@ -2,7 +2,6 @@ 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
@@ -17,7 +16,6 @@ import kotlinx.coroutines.launch
 
 @Composable
 fun PermissionRequestFailedScreen(
-    padding: PaddingValues,
     onRequestAgain: () -> Unit,
     message: String,
     buttonText: String
@@ -26,7 +24,7 @@ fun PermissionRequestFailedScreen(
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
-        modifier = Modifier.fillMaxSize().padding(padding),
+        modifier = Modifier.fillMaxSize(),
     ) {
         Text(message, textAlign = TextAlign.Center, modifier = Modifier.padding(15.dp))
         Button(

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

@@ -19,7 +19,6 @@ 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
@@ -33,7 +32,6 @@ 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,7 +1,6 @@
 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
@@ -29,7 +28,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.AlertDialog
+import androidx.compose.material3.BasicAlertDialog
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FabPosition
@@ -51,7 +50,6 @@ 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
@@ -86,9 +84,7 @@ import kotlinx.coroutines.delay
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(
-    ExperimentalComposeUiApi::class,
     ExperimentalMaterial3Api::class,
-    ExperimentalFoundationApi::class,
 )
 @Composable
 fun ConfigScreen(
@@ -145,7 +141,7 @@ fun ConfigScreen(
                 showAuthPrompt = false
                 isAuthenticated = true
             },
-            onError = { error ->
+            onError = {
                 showAuthPrompt = false
                 showSnackbarMessage(Event.Error.AuthenticationFailed.message)
             },
@@ -161,20 +157,20 @@ fun ConfigScreen(
             remember(uiState.packages) {
                 uiState.packages.sortedBy { viewModel.getPackageLabel(it) }
             }
-        AlertDialog(onDismissRequest = { showApplicationsDialog = false }) {
+        BasicAlertDialog(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()) {
                     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,
                     ) {
@@ -187,8 +183,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,
                         ) {
@@ -219,8 +215,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,
                         ) {
@@ -262,9 +258,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)
@@ -299,7 +295,7 @@ fun ConfigScreen(
             var fobColor by remember { mutableStateOf(secondaryColor) }
             FloatingActionButton(
                 modifier =
-                    Modifier.padding(bottom = 90.dp).onFocusChanged {
+                    Modifier.onFocusChanged {
                         if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
                             fobColor = if (it.isFocused) hoverColor else secondaryColor
                         }

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

@@ -1,6 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -20,7 +19,6 @@ 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
@@ -45,10 +43,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
@@ -110,12 +108,10 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
-@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
 @Composable
 fun MainScreen(
     viewModel: MainViewModel = hiltViewModel(),
-    padding: PaddingValues,
     focusRequester: FocusRequester,
     showSnackbarMessage: (String) -> Unit,
     navController: NavController
@@ -344,7 +340,6 @@ fun MainScreen(
                             )
                                 Modifier.focusRequester(focusRequester)
                             else Modifier)
-                            .padding(bottom = 90.dp)
                             .onFocusChanged {
                                 if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
                                     fobColor = if (it.isFocused) hoverColor else secondaryColor
@@ -367,7 +362,7 @@ fun MainScreen(
             Column(
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Center,
-                modifier = Modifier.fillMaxSize().padding(padding),
+                modifier = Modifier.fillMaxSize().padding(innerPadding),
             ) {
                 Text(text = stringResource(R.string.no_tunnels), fontStyle = FontStyle.Italic)
             }
@@ -398,7 +393,7 @@ fun MainScreen(
                     )
                 }
                 if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                    Divider()
+                    HorizontalDivider()
                     Row(
                         modifier =
                             Modifier.fillMaxWidth()
@@ -430,7 +425,7 @@ fun MainScreen(
                         )
                     }
                 }
-                Divider()
+                HorizontalDivider()
                 Row(
                     modifier =
                         Modifier.fillMaxWidth()
@@ -461,8 +456,7 @@ fun MainScreen(
             modifier =
                 Modifier.fillMaxWidth()
                     .fillMaxHeight(.90f)
-                    .overscroll(ScrollableDefaults.overscrollEffect())
-                    .padding(innerPadding),
+                    .overscroll(ScrollableDefaults.overscrollEffect()),
             state = rememberLazyListState(0, uiState.tunnels.count()),
             userScrollEnabled = true,
             reverseLayout = true,

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

@@ -20,7 +20,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -95,7 +94,6 @@ import java.io.File
 @Composable
 fun SettingsScreen(
     viewModel: SettingsViewModel = hiltViewModel(),
-    padding: PaddingValues,
     showSnackbarMessage: (String) -> Unit,
     focusRequester: FocusRequester
 ) {
@@ -127,7 +125,7 @@ fun SettingsScreen(
         rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {
             result: ActivityResult ->
             if (result.resultCode == Activity.RESULT_OK) {
-                val intent = result.data
+                result.data
                 // Handle the Intent
             }
             viewModel.setBatteryOptimizeDisableShown()
@@ -248,7 +246,7 @@ fun SettingsScreen(
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Top,
-            modifier = Modifier.fillMaxSize().verticalScroll(scrollState).padding(padding),
+            modifier = Modifier.fillMaxSize().verticalScroll(scrollState),
         ) {
             Icon(
                 Icons.Rounded.LocationOff,
@@ -314,7 +312,7 @@ fun SettingsScreen(
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center,
-            modifier = Modifier.fillMaxSize().padding(padding),
+            modifier = Modifier.fillMaxSize(),
         ) {
             Text(
                 stringResource(R.string.one_tunnel_required),
@@ -347,7 +345,7 @@ fun SettingsScreen(
                                 .fillMaxWidth(fillMaxWidth)
                                 .padding(top = 10.dp)
                         } else {
-                            Modifier.fillMaxWidth(fillMaxWidth).padding(top = 60.dp)
+                            Modifier.fillMaxWidth(fillMaxWidth).padding(top = 20.dp)
                         })
                         .padding(bottom = 10.dp),
             ) {

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

@@ -8,7 +8,6 @@ import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -20,10 +19,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.rounded.ArrowForward
+import androidx.compose.material.icons.automirrored.rounded.ArrowForward
 import androidx.compose.material.icons.rounded.Book
 import androidx.compose.material.icons.rounded.Mail
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
@@ -58,7 +57,6 @@ import com.zaneschepke.wireguardautotunnel.util.Event
 @Composable
 fun SupportScreen(
     viewModel: SupportViewModel = hiltViewModel(),
-    padding: PaddingValues,
     showSnackbarMessage: (String) -> Unit,
     focusRequester: FocusRequester
 ) {
@@ -107,7 +105,6 @@ fun SupportScreen(
             Modifier.fillMaxSize()
                 .verticalScroll(rememberScrollState())
                 .focusable()
-                .padding(padding),
     ) {
         Surface(
             tonalElevation = 2.dp,
@@ -155,10 +152,16 @@ fun SupportScreen(
                                 modifier = Modifier.padding(start = 10.dp),
                             )
                         }
-                        Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
+                        Icon(
+                            Icons.AutoMirrored.Rounded.ArrowForward,
+                            stringResource(id = R.string.go)
+                        )
                     }
                 }
-                Divider(color = MaterialTheme.colorScheme.onBackground, thickness = 0.5.dp)
+                HorizontalDivider(
+                    thickness = 0.5.dp,
+                    color = MaterialTheme.colorScheme.onBackground
+                )
                 TextButton(
                     onClick = { openWebPage(context.resources.getString(R.string.discord_url)) },
                     modifier = Modifier.padding(vertical = 5.dp),
@@ -180,10 +183,16 @@ fun SupportScreen(
                                 modifier = Modifier.padding(start = 10.dp),
                             )
                         }
-                        Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
+                        Icon(
+                            Icons.AutoMirrored.Rounded.ArrowForward,
+                            stringResource(id = R.string.go)
+                        )
                     }
                 }
-                Divider(color = MaterialTheme.colorScheme.onBackground, thickness = 0.5.dp)
+                HorizontalDivider(
+                    thickness = 0.5.dp,
+                    color = MaterialTheme.colorScheme.onBackground
+                )
                 TextButton(
                     onClick = { openWebPage(context.resources.getString(R.string.github_url)) },
                     modifier = Modifier.padding(vertical = 5.dp),
@@ -205,10 +214,16 @@ fun SupportScreen(
                                 modifier = Modifier.padding(start = 10.dp),
                             )
                         }
-                        Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
+                        Icon(
+                            Icons.AutoMirrored.Rounded.ArrowForward,
+                            stringResource(id = R.string.go)
+                        )
                     }
                 }
-                Divider(color = MaterialTheme.colorScheme.onBackground, thickness = 0.5.dp)
+                HorizontalDivider(
+                    thickness = 0.5.dp,
+                    color = MaterialTheme.colorScheme.onBackground
+                )
                 TextButton(
                     onClick = { launchEmail() },
                     modifier = Modifier.padding(vertical = 5.dp),
@@ -226,7 +241,10 @@ fun SupportScreen(
                                 modifier = Modifier.padding(start = 10.dp),
                             )
                         }
-                        Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
+                        Icon(
+                            Icons.AutoMirrored.Rounded.ArrowForward,
+                            stringResource(id = R.string.go)
+                        )
                     }
                 }
             }

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

@@ -1,22 +0,0 @@
-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 {}
-    }
-}