bump deps

closes #322

.github/ISSUE_TEMPLATE/bug_report.md

@@ -15,6 +15,7 @@ A clear and concise description of what the bug is.
 - Device: [e.g. Pixel 4a]
 - Android Version: [e.g. Android 13]
 - App Version [e.g. 3.3.3]
+- Backend: [e.g. Kernel, Userspace]
 
 **To Reproduce**
 Steps to reproduce the behavior:

.github/workflows/release.yml

@@ -33,25 +33,30 @@ on:
   workflow_call:
 
 jobs:
-  check_date:
+  check_commits:
     runs-on: ubuntu-latest
-    name: Check latest commit
-    outputs:
-      should_run: ${{ steps.should_run.outputs.should_run }}
     steps:
-    - uses: actions/checkout@v4
-    - name: print latest_commit
-      run: echo ${{ github.sha }}
-    - id: should_run
-      continue-on-error: true
-      name: check latest commit is less than a day
-      if: ${{ github.event_name == 'schedule' }}
-      run: test -z $(git rev-list --after="23 hours" ${{ github.sha }}) && echo "::set-output name=should_run::false"
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Check for new commits in the last 23 hours
+        id: check_commits
+        run: |
+          # Get the current time and the time 23 hours ago in ISO 8601 format
+          now=$(date --utc +%Y-%m-%dT%H:%M:%SZ)
+          past=$(date --utc --date='23 hours ago' +%Y-%m-%dT%H:%M:%SZ)
+
+          # Fetch commit history and check for commits in the last 23 hours
+          if git rev-list --since="$past" --count HEAD > /dev/null; then
+            echo "New commits found in the last 23 hours."
+            echo "::set-output name=new_commits::true"
+          else
+            echo "No new commits found in the last 23 hours."
+            echo "::set-output name=new_commits::false"
+          fi
   build:
-    needs: check_date
-    if: |
-        github.event_name != 'schedule' ||
-        (needs.check_date.outputs.should_run == 'true' && github.event_name == 'schedule')
+    needs: check_commits
+    if: ${{ needs.check_commits.outputs.new_commits == 'true' || github.event_name != 'schedule'}}
     name: Build Signed APK
     runs-on: ubuntu-latest
     env:
@@ -144,7 +149,7 @@ jobs:
 
       # 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.4.0
+        uses: actions/upload-artifact@v4.4.3
         with:
           name: wgtunnel
           path: ${{ env.APK_PATH }}

app/build.gradle.kts

@@ -72,12 +72,14 @@ android {
 				"proguard-rules.pro",
 			)
 			signingConfig = signingConfigs.getByName(Constants.RELEASE)
+			resValue("string", "provider", "\"${Constants.APP_NAME}.provider\"")
 		}
 		debug {
 			applicationIdSuffix = ".debug"
 			versionNameSuffix = "-debug"
 			resValue("string", "app_name", "WG Tunnel - Debug")
 			isDebuggable = true
+			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.debug\"")
 		}
 
 		create(Constants.PRERELEASE) {
@@ -85,6 +87,7 @@ android {
 			applicationIdSuffix = ".prerelease"
 			versionNameSuffix = "-pre"
 			resValue("string", "app_name", "WG Tunnel - Pre")
+			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.pre\"")
 		}
 
 		create(Constants.NIGHTLY) {
@@ -92,6 +95,7 @@ android {
 			applicationIdSuffix = ".nightly"
 			versionNameSuffix = "-nightly"
 			resValue("string", "app_name", "WG Tunnel - Nightly")
+			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.nightly\"")
 		}
 
 		applicationVariants.all {
@@ -129,8 +133,6 @@ android {
 	packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
 }
 
-val generalImplementation by configurations
-
 dependencies {
 
 	implementation(project(":logcatter"))

app/src/main/AndroidManifest.xml

@@ -66,12 +66,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.AppSplashScreen"
+        android:theme="@style/Theme.App.Start"
         tools:targetApi="tiramisu">
         <activity
-            android:name=".ui.SplashActivity"
+            android:name=".ui.MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.AppSplashScreen">
+            android:theme="@style/Theme.WireguardAutoTunnel">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -83,11 +83,6 @@
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
-        <activity
-            android:name=".ui.MainActivity"
-            android:exported="true"
-            android:theme="@style/Theme.WireguardAutoTunnel">
-        </activity>
         <activity
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
             android:screenOrientation="portrait"
@@ -103,6 +98,16 @@
 			android:launchMode="singleInstance"
             android:theme="@android:style/Theme.NoDisplay" />
 
+		<provider
+			android:name="androidx.core.content.FileProvider"
+			android:authorities="@string/provider"
+			android:exported="false"
+			android:grantUriPermissions="true">
+			<meta-data
+				android:name="android.support.FILE_PROVIDER_PATHS"
+				android:resource="@xml/file_paths" />
+		</provider>
+
         <service
             android:name=".service.tile.TunnelControlTile"
             android:exported="true"

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

@@ -3,7 +3,7 @@ package com.zaneschepke.wireguardautotunnel
 import android.app.Application
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
-import com.zaneschepke.logcatter.LocalLogCollector
+import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
@@ -23,7 +23,7 @@ class WireGuardAutoTunnel : Application() {
 	lateinit var applicationScope: CoroutineScope
 
 	@Inject
-	lateinit var localLogCollector: LocalLogCollector
+	lateinit var logReader: LogReader
 
 	@Inject
 	@IoDispatcher
@@ -47,7 +47,7 @@ class WireGuardAutoTunnel : Application() {
 		}
 		if (!isRunningOnTv()) {
 			applicationScope.launch(ioDispatcher) {
-				localLogCollector.start()
+				logReader.start()
 			}
 		}
 	}

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

@@ -25,6 +25,7 @@ class DataStoreManager(
 		val BATTERY_OPTIMIZE_DISABLE_SHOWN = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
 		val CURRENT_SSID = stringPreferencesKey("CURRENT_SSID")
 		val IS_PIN_LOCK_ENABLED = booleanPreferencesKey("PIN_LOCK_ENABLED")
+		val IS_TUNNEL_STATS_EXPANDED = booleanPreferencesKey("TUNNEL_STATS_EXPANDED")
 	}
 
 	// preferences

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

@@ -4,10 +4,12 @@ data class GeneralState(
 	val isLocationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
 	val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
 	val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
+	val isTunnelStatsExpanded: Boolean = IS_TUNNEL_STATS_EXPANDED,
 ) {
 	companion object {
 		const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
 		const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
 		const val PIN_LOCK_ENABLED_DEFAULT = false
+		const val IS_TUNNEL_STATS_EXPANDED = false
 	}
 }

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

@@ -20,5 +20,9 @@ interface AppStateRepository {
 
 	suspend fun setCurrentSsid(ssid: String)
 
+	suspend fun isTunnelStatsExpanded(): Boolean
+
+	suspend fun setTunnelStatsExpanded(expanded: Boolean)
+
 	val generalStateFlow: Flow<GeneralState>
 }

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

@@ -45,6 +45,15 @@ class DataStoreAppStateRepository(
 		dataStoreManager.saveToDataStore(DataStoreManager.CURRENT_SSID, ssid)
 	}
 
+	override suspend fun isTunnelStatsExpanded(): Boolean {
+		return dataStoreManager.getFromStore(DataStoreManager.IS_TUNNEL_STATS_EXPANDED)
+			?: GeneralState.IS_TUNNEL_STATS_EXPANDED
+	}
+
+	override suspend fun setTunnelStatsExpanded(expanded: Boolean) {
+		dataStoreManager.saveToDataStore(DataStoreManager.IS_TUNNEL_STATS_EXPANDED, expanded)
+	}
+
 	override val generalStateFlow: Flow<GeneralState> =
 		dataStoreManager.preferencesFlow.map { prefs ->
 			prefs?.let { pref ->
@@ -59,6 +68,7 @@ class DataStoreAppStateRepository(
 						isPinLockEnabled =
 						pref[DataStoreManager.IS_PIN_LOCK_ENABLED]
 							?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
+						isTunnelStatsExpanded = pref[DataStoreManager.IS_TUNNEL_STATS_EXPANDED] ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
 					)
 				} catch (e: IllegalArgumentException) {
 					Timber.e(e)

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

@@ -1,8 +1,8 @@
 package com.zaneschepke.wireguardautotunnel.module
 
 import android.content.Context
-import com.zaneschepke.logcatter.LocalLogCollector
-import com.zaneschepke.logcatter.LogcatUtil
+import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.logcatter.LogcatCollector
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -24,7 +24,7 @@ class AppModule {
 
 	@Singleton
 	@Provides
-	fun provideLogCollect(@ApplicationContext context: Context): LocalLogCollector {
-		return LogcatUtil.init(context = context)
+	fun provideLogCollect(@ApplicationContext context: Context): LogReader {
+		return LogcatCollector.init(context = context)
 	}
 }

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

@@ -1,22 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import android.content.Context
-import androidx.navigation.NavHostController
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.NavigationService
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ActivityRetainedComponent
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.android.scopes.ActivityRetainedScoped
-
-@Module
-@InstallIn(ActivityRetainedComponent::class)
-object NavigationModule {
-
-	@Provides
-	@ActivityRetainedScoped
-	fun provideNestedNavController(@ApplicationContext context: Context): NavHostController {
-		return NavigationService(context).navController
-	}
-}

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

@@ -2,11 +2,13 @@ package com.zaneschepke.wireguardautotunnel.service.foreground
 
 import android.content.Context
 import android.content.Intent
+import android.net.NetworkCapabilities
 import android.os.IBinder
 import android.os.PowerManager
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.lifecycleScope
+import com.wireguard.android.util.RootShell
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
@@ -23,6 +25,7 @@ import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
+import com.zaneschepke.wireguardautotunnel.util.extensions.getCurrentWifiName
 import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
 import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
 import com.zaneschepke.wireguardautotunnel.util.extensions.onNotRunning
@@ -46,6 +49,9 @@ import javax.inject.Provider
 class AutoTunnelService : LifecycleService() {
 	private val foregroundId = 122
 
+	@Inject
+	lateinit var rootShell: Provider<RootShell>
+
 	@Inject
 	lateinit var wifiService: NetworkService<WifiService>
 
@@ -397,6 +403,14 @@ class AutoTunnelService : LifecycleService() {
 		}
 	}
 
+	private fun updateWifi(connected: Boolean) {
+		autoTunnelStateFlow.update {
+			it.copy(
+				isWifiConnected = connected,
+			)
+		}
+	}
+
 	private suspend fun watchForEthernetConnectivityChanges() {
 		withContext(ioDispatcher) {
 			Timber.i("Starting ethernet data watcher")
@@ -428,21 +442,13 @@ class AutoTunnelService : LifecycleService() {
 				when (status) {
 					is NetworkStatus.Available -> {
 						Timber.i("Gained Wi-Fi connection")
-						autoTunnelStateFlow.update {
-							it.copy(
-								isWifiConnected = true,
-							)
-						}
+						updateWifi(true)
 					}
 
 					is NetworkStatus.CapabilitiesChanged -> {
 						Timber.i("Wifi capabilities changed")
-						autoTunnelStateFlow.update {
-							it.copy(
-								isWifiConnected = true,
-							)
-						}
-						val ssid = wifiService.getNetworkName(status.networkCapabilities)
+						updateWifi(true)
+						val ssid = getWifiSSID(status.networkCapabilities)
 						ssid?.let { name ->
 							if (name.contains(Constants.UNREADABLE_SSID)) {
 								Timber.w("SSID unreadable: missing permissions")
@@ -459,11 +465,7 @@ class AutoTunnelService : LifecycleService() {
 					}
 
 					is NetworkStatus.Unavailable -> {
-						autoTunnelStateFlow.update {
-							it.copy(
-								isWifiConnected = false,
-							)
-						}
+						updateWifi(false)
 						Timber.i("Lost Wi-Fi connection")
 					}
 				}
@@ -471,6 +473,16 @@ class AutoTunnelService : LifecycleService() {
 		}
 	}
 
+	private suspend fun getWifiSSID(networkCapabilities: NetworkCapabilities): String? {
+		return withContext(ioDispatcher) {
+			try {
+				rootShell.get().getCurrentWifiName()
+			} catch (_: Exception) {
+				wifiService.getNetworkName(networkCapabilities)
+			}
+		}
+	}
+
 	private suspend fun getMobileDataTunnel(): TunnelConfig? {
 		return appDataRepository.tunnels.findByMobileDataTunnel().firstOrNull()
 	}

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

@@ -5,8 +5,6 @@ import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
-import android.net.wifi.SupplicantState
-import android.net.wifi.WifiInfo
 import android.net.wifi.WifiManager
 import android.os.Build
 import kotlinx.coroutines.channels.awaitClose
@@ -21,7 +19,7 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 	private val connectivityManager =
 		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
-	private val wifiManager =
+	val wifiManager =
 		context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
 
 	override val networkStatus =
@@ -83,30 +81,6 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 
 			awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
 		}
-
-	override fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
-		var ssid: String? = getWifiNameFromCapabilities(networkCapabilities)
-		if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
-			val info = wifiManager.connectionInfo
-			if (info.supplicantState === SupplicantState.COMPLETED) {
-				ssid = info.ssid
-			}
-		}
-		return ssid?.trim('"')
-	}
-
-	companion object {
-		private fun getWifiNameFromCapabilities(networkCapabilities: NetworkCapabilities): String? {
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-				val info: WifiInfo
-				if (networkCapabilities.transportInfo is WifiInfo) {
-					info = networkCapabilities.transportInfo as WifiInfo
-					return info.ssid
-				}
-			}
-			return null
-		}
-	}
 }
 
 inline fun <Result> Flow<NetworkStatus>.map(

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

@@ -10,4 +10,9 @@ class EthernetService
 constructor(
 	@ApplicationContext context: Context,
 ) :
-	BaseNetworkService<EthernetService>(context, NetworkCapabilities.TRANSPORT_ETHERNET)
+	BaseNetworkService<EthernetService>(context, NetworkCapabilities.TRANSPORT_ETHERNET) {
+
+	override fun isNetworkSecure(): Boolean {
+		return true
+	}
+}

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

@@ -10,4 +10,8 @@ class MobileDataService
 constructor(
 	@ApplicationContext context: Context,
 ) :
-	BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR)
+	BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR) {
+	override fun isNetworkSecure(): Boolean {
+		return false
+	}
+}

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

@@ -0,0 +1,16 @@
+package com.zaneschepke.wireguardautotunnel.service.network
+
+import android.net.NetworkCapabilities
+import android.net.wifi.WifiInfo
+import android.os.Build
+
+fun NetworkCapabilities.getWifiName(): String? {
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+		val info: WifiInfo
+		if (transportInfo is WifiInfo) {
+			info = transportInfo as WifiInfo
+			return info.ssid
+		}
+	}
+	return null
+}

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

@@ -4,7 +4,11 @@ import android.net.NetworkCapabilities
 import kotlinx.coroutines.flow.Flow
 
 interface NetworkService<T> {
-	fun getNetworkName(networkCapabilities: NetworkCapabilities): String?
+	fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
+		return null
+	}
+
+	fun isNetworkSecure(): Boolean
 
 	val networkStatus: Flow<NetworkStatus>
 }

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

@@ -2,6 +2,8 @@ package com.zaneschepke.wireguardautotunnel.service.network
 
 import android.content.Context
 import android.net.NetworkCapabilities
+import android.net.wifi.SupplicantState
+import android.os.Build
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
@@ -10,4 +12,21 @@ class WifiService
 constructor(
 	@ApplicationContext context: Context,
 ) :
-	BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI)
+	BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI) {
+
+	override fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
+		var ssid = networkCapabilities.getWifiName()
+		if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
+			val info = wifiManager.connectionInfo
+			if (info.supplicantState === SupplicantState.COMPLETED) {
+				ssid = info.ssid
+			}
+		}
+		return ssid?.trim('"')
+	}
+
+	override fun isNetworkSecure(): Boolean {
+		// TODO
+		return false
+	}
+}

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

@@ -9,7 +9,7 @@ import android.content.Intent
 import android.graphics.Color
 import androidx.core.app.NotificationCompat
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.SplashActivity
+import com.zaneschepke.wireguardautotunnel.ui.MainActivity
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
@@ -63,7 +63,7 @@ constructor(
 				}
 		notificationManager.createNotificationChannel(channel)
 		val pendingIntent: PendingIntent =
-			Intent(context, SplashActivity::class.java).let { notificationIntent ->
+			Intent(context, MainActivity::class.java).let { notificationIntent ->
 				PendingIntent.getActivity(
 					context,
 					0,

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

@@ -2,30 +2,36 @@ package com.zaneschepke.wireguardautotunnel.ui
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import androidx.navigation.NavHostController
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
 import xyz.teamgravity.pin_lock_compose.PinManager
 import javax.inject.Inject
+import javax.inject.Provider
 
 @HiltViewModel
 class AppViewModel
 @Inject
 constructor(
 	private val appDataRepository: AppDataRepository,
-	tunnelService: TunnelService,
-	val navHostController: NavHostController,
+	private val tunnelService: Provider<TunnelService>,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
 
@@ -35,7 +41,7 @@ constructor(
 		combine(
 			appDataRepository.settings.getSettingsFlow(),
 			appDataRepository.tunnels.getTunnelConfigsFlow(),
-			tunnelService.vpnState,
+			tunnelService.get().vpnState,
 			appDataRepository.appState.generalStateFlow,
 		) { settings, tunnels, tunnelState, generalState ->
 			AppUiState(
@@ -44,12 +50,51 @@ constructor(
 				tunnelState,
 				generalState,
 			)
+		}.stateIn(
+			viewModelScope + ioDispatcher,
+			SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+			_appUiState.value,
+		)
+
+	private val _isAppReady = MutableStateFlow<Boolean>(false)
+	val isAppReady = _isAppReady.asStateFlow()
+
+	init {
+
+		viewModelScope.launch {
+			initPin()
+			initAutoTunnel()
+			initTunnel()
+			appReadyCheck()
 		}
-			.stateIn(
-				viewModelScope + ioDispatcher,
-				SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
-				_appUiState.value,
-			)
+	}
+
+	private suspend fun appReadyCheck() {
+		val tunnelCount = appDataRepository.tunnels.count()
+		uiState.takeWhile { it.tunnels.size != tunnelCount }.onCompletion {
+			_isAppReady.emit(true)
+		}.collect()
+	}
+
+	private suspend fun initTunnel() {
+		if (tunnelService.get().getState() == TunnelState.UP) tunnelService.get().startStatsJob()
+		val activeTunnels = appDataRepository.tunnels.getActive()
+		if (activeTunnels.isNotEmpty() &&
+			tunnelService.get().getState() == TunnelState.DOWN
+		) {
+			tunnelService.get().startTunnel(activeTunnels.first())
+		}
+	}
+
+	private suspend fun initPin() {
+		val isPinEnabled = appDataRepository.appState.isPinLockEnabled()
+		if (isPinEnabled) PinManager.initialize(WireGuardAutoTunnel.instance)
+	}
+
+	private suspend fun initAutoTunnel() {
+		val settings = appDataRepository.settings.getSettings()
+		if (settings.isAutoTunnelEnabled) ServiceManager.startWatcherService(WireGuardAutoTunnel.instance)
+	}
 
 	fun setTunnels(tunnels: TunnelConfigs) = viewModelScope.launch(ioDispatcher) {
 		_appUiState.emit(

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

@@ -4,11 +4,13 @@ import android.os.Bundle
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.focusable
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
@@ -19,8 +21,8 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarData
 import androidx.compose.material3.SnackbarHost
-import androidx.compose.material3.Surface
 import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -31,11 +33,12 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
@@ -44,6 +47,7 @@ import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.isCurrentRoute
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.CustomSnackBar
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarControllerProvider
@@ -56,6 +60,7 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.logs.LogsScreen
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -68,11 +73,10 @@ class MainActivity : AppCompatActivity() {
 	@Inject
 	lateinit var tunnelService: TunnelService
 
+	private val viewModel by viewModels<AppViewModel>()
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-
-		val isPinLockEnabled = intent.extras?.getBoolean(SplashActivity.IS_PIN_LOCK_ENABLED_KEY)
-
 		enableEdgeToEdge(
 			navigationBarStyle = SystemBarStyle.auto(
 				lightScrim = Color.Transparent.toArgb(),
@@ -80,10 +84,15 @@ class MainActivity : AppCompatActivity() {
 			),
 		)
 
+		installSplashScreen().apply {
+			setKeepOnScreenCondition {
+				!viewModel.isAppReady.value
+			}
+		}
+
 		setContent {
-			val appViewModel = hiltViewModel<AppViewModel>()
-			val appUiState by appViewModel.uiState.collectAsStateWithLifecycle(lifecycle = this.lifecycle)
-			val navController = appViewModel.navHostController
+			val appUiState by viewModel.uiState.collectAsStateWithLifecycle(lifecycle = this.lifecycle)
+			val navController = rememberNavController()
 			val navBackStackEntry by navController.currentBackStackEntryAsState()
 
 			LaunchedEffect(appUiState.vpnState.status) {
@@ -95,109 +104,111 @@ class MainActivity : AppCompatActivity() {
 				context.requestTunnelTileServiceStateUpdate()
 			}
 
-			SnackbarControllerProvider { host ->
-				WireguardAutoTunnelTheme {
-					val focusRequester = remember { FocusRequester() }
-					Scaffold(
-						snackbarHost = {
-							SnackbarHost(host) { snackbarData: SnackbarData ->
-								CustomSnackBar(
-									snackbarData.visuals.message,
-									isRtl = false,
-									containerColor =
-									MaterialTheme.colorScheme.surfaceColorAtElevation(
-										2.dp,
-									),
-								)
-							}
-						},
-						containerColor = MaterialTheme.colorScheme.background,
-						modifier =
-						Modifier
-							.focusable()
-							.focusProperties {
-								if (navBackStackEntry?.isCurrentRoute(Route.Lock) == true) {
-									Unit
-								} else {
-									up = focusRequester
+			with(appUiState.settings) {
+				LaunchedEffect(isAutoTunnelPaused, isAutoTunnelEnabled) {
+					this@MainActivity.requestAutoTunnelTileServiceUpdate()
+				}
+			}
+
+			CompositionLocalProvider(LocalNavController provides navController) {
+				SnackbarControllerProvider { host ->
+					WireguardAutoTunnelTheme {
+						val focusRequester = remember { FocusRequester() }
+						Scaffold(
+							snackbarHost = {
+								SnackbarHost(host) { snackbarData: SnackbarData ->
+									CustomSnackBar(
+										snackbarData.visuals.message,
+										isRtl = false,
+										containerColor =
+										MaterialTheme.colorScheme.surfaceColorAtElevation(
+											2.dp,
+										),
+									)
 								}
 							},
-						bottomBar = {
-							BottomNavBar(
-								navController,
-								listOf(
-									BottomNavItem(
-										name = stringResource(R.string.tunnels),
-										route = Route.Main,
-										icon = Icons.Rounded.Home,
+							modifier =
+							Modifier
+								.focusable()
+								.focusProperties {
+									if (navBackStackEntry?.isCurrentRoute(Route.Lock) == true) {
+										Unit
+									} else {
+										up = focusRequester
+									}
+								},
+							bottomBar = {
+								BottomNavBar(
+									navController,
+									listOf(
+										BottomNavItem(
+											name = stringResource(R.string.tunnels),
+											route = Route.Main,
+											icon = Icons.Rounded.Home,
+										),
+										BottomNavItem(
+											name = stringResource(R.string.settings),
+											route = Route.Settings,
+											icon = Icons.Rounded.Settings,
+										),
+										BottomNavItem(
+											name = stringResource(R.string.support),
+											route = Route.Support,
+											icon = Icons.Rounded.QuestionMark,
+										),
 									),
-									BottomNavItem(
-										name = stringResource(R.string.settings),
-										route = Route.Settings,
-										icon = Icons.Rounded.Settings,
-									),
-									BottomNavItem(
-										name = stringResource(R.string.support),
-										route = Route.Support,
-										icon = Icons.Rounded.QuestionMark,
-									),
-								),
-							)
-						},
-					) { padding ->
-						Surface(modifier = Modifier.fillMaxSize().padding(padding)) {
-							NavHost(
-								navController,
-								enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
-								exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
-								startDestination = (if (isPinLockEnabled == true) Route.Lock else Route.Main),
-							) {
-								composable<Route.Main> {
-									MainScreen(
-										focusRequester = focusRequester,
-										uiState = appUiState,
-										navController = navController,
-									)
-								}
-								composable<Route.Settings> {
-									SettingsScreen(
-										appViewModel = appViewModel,
-										uiState = appUiState,
-										navController = navController,
-										focusRequester = focusRequester,
-									)
-								}
-								composable<Route.Support> {
-									SupportScreen(
-										focusRequester = focusRequester,
-										navController = navController,
-										appUiState = appUiState,
-									)
-								}
-								composable<Route.Logs> {
-									LogsScreen()
-								}
-								composable<Route.Config> {
-									val args = it.toRoute<Route.Config>()
-									ConfigScreen(
-										focusRequester = focusRequester,
-										tunnelId = args.id,
-									)
-								}
-								composable<Route.Option> {
-									val args = it.toRoute<Route.Option>()
-									OptionsScreen(
-										navController = navController,
-										tunnelId = args.id,
-										focusRequester = focusRequester,
-										appUiState = appUiState,
-									)
-								}
-								composable<Route.Lock> {
-									PinLockScreen(
-										navController = navController,
-										appViewModel = appViewModel,
-									)
+								)
+							},
+						) { padding ->
+							Box(modifier = Modifier.fillMaxSize().padding(padding)) {
+								NavHost(
+									navController,
+									enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
+									exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
+									startDestination = (if (appUiState.generalState.isPinLockEnabled == true) Route.Lock else Route.Main),
+								) {
+									composable<Route.Main> {
+										MainScreen(
+											focusRequester = focusRequester,
+											uiState = appUiState,
+										)
+									}
+									composable<Route.Settings> {
+										SettingsScreen(
+											appViewModel = viewModel,
+											uiState = appUiState,
+											focusRequester = focusRequester,
+										)
+									}
+									composable<Route.Support> {
+										SupportScreen(
+											focusRequester = focusRequester,
+											appUiState = appUiState,
+										)
+									}
+									composable<Route.Logs> {
+										LogsScreen()
+									}
+									composable<Route.Config> {
+										val args = it.toRoute<Route.Config>()
+										ConfigScreen(
+											focusRequester = focusRequester,
+											tunnelId = args.id,
+										)
+									}
+									composable<Route.Option> {
+										val args = it.toRoute<Route.Option>()
+										OptionsScreen(
+											tunnelId = args.id,
+											focusRequester = focusRequester,
+											appUiState = appUiState,
+										)
+									}
+									composable<Route.Lock> {
+										PinLockScreen(
+											appViewModel = viewModel,
+										)
+									}
 								}
 							}
 						}

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

@@ -1,87 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-import android.annotation.SuppressLint
-import android.content.Intent
-import android.os.Build
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.viewModels
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
-import xyz.teamgravity.pin_lock_compose.PinManager
-import javax.inject.Inject
-import javax.inject.Provider
-
-@SuppressLint("CustomSplashScreen")
-@AndroidEntryPoint
-class SplashActivity : ComponentActivity() {
-	@Inject
-	lateinit var appStateRepository: AppStateRepository
-
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	private val appViewModel: AppViewModel by viewModels()
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-			val splashScreen = installSplashScreen()
-			splashScreen.setKeepOnScreenCondition { true }
-		}
-		super.onCreate(savedInstanceState)
-
-		lifecycleScope.launch {
-			repeatOnLifecycle(Lifecycle.State.CREATED) {
-				val pinLockEnabled = async {
-					appStateRepository.isPinLockEnabled().also {
-						if (it) PinManager.initialize(WireGuardAutoTunnel.instance)
-					}
-				}.await()
-				async {
-					val settings = appDataRepository.settings.getSettings()
-					if (settings.isAutoTunnelEnabled) ServiceManager.startWatcherService(application.applicationContext)
-					if (tunnelService.get().getState() == TunnelState.UP) tunnelService.get().startStatsJob()
-					val activeTunnels = appDataRepository.tunnels.getActive()
-					if (activeTunnels.isNotEmpty() &&
-						tunnelService.get().getState() == TunnelState.DOWN
-					) {
-						tunnelService.get().startTunnel(activeTunnels.first())
-					}
-				}.await()
-
-				async {
-					val tunnels = appDataRepository.tunnels.getAll()
-					appViewModel.setTunnels(tunnels)
-				}.await()
-
-				requestAutoTunnelTileServiceUpdate()
-
-				val intent =
-					Intent(this@SplashActivity, MainActivity::class.java).apply {
-						putExtra(IS_PIN_LOCK_ENABLED_KEY, pinLockEnabled)
-					}
-				startActivity(intent)
-				finish()
-			}
-		}
-	}
-
-	companion object {
-		const val IS_PIN_LOCK_ENABLED_KEY = "is_pin_lock_enabled"
-	}
-}

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

@@ -0,0 +1,69 @@
+package com.zaneschepke.wireguardautotunnel.ui.common
+
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun ExpandingRowListItem(
+	leading: @Composable () -> Unit,
+	text: String,
+	onHold: () -> Unit = {},
+	onClick: () -> Unit,
+	trailing: @Composable () -> Unit,
+	isExpanded: Boolean,
+	expanded: @Composable () -> Unit = {},
+	focusRequester: FocusRequester,
+) {
+	Box(
+		modifier =
+		Modifier
+			.focusRequester(focusRequester)
+			.animateContentSize()
+			.clip(RoundedCornerShape(30.dp))
+			.combinedClickable(
+				onClick = { onClick() },
+				onLongClick = { onHold() },
+			),
+	) {
+		Column {
+			Row(
+				modifier =
+				Modifier
+					.fillMaxWidth()
+					.padding(horizontal = 15.dp),
+				verticalAlignment = Alignment.CenterVertically,
+				horizontalArrangement = Arrangement.SpaceBetween,
+			) {
+				Row(
+					verticalAlignment = Alignment.CenterVertically,
+					horizontalArrangement = Arrangement.spacedBy(15.dp),
+					modifier = Modifier.fillMaxWidth(13 / 20f),
+				) {
+					leading()
+					Text(text, maxLines = 1, overflow = TextOverflow.Ellipsis, style = MaterialTheme.typography.labelLarge)
+				}
+				trailing()
+			}
+			if (isExpanded) expanded()
+		}
+	}
+}

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

@@ -0,0 +1,13 @@
+package com.zaneschepke.wireguardautotunnel.ui.common
+
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import androidx.compose.ui.input.nestedscroll.NestedScrollSource
+
+class NestedScrollListener(val onUp: () -> Unit, val onDown: () -> Unit) : NestedScrollConnection {
+	override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
+		if (available.y < -1) onDown()
+		if (available.y > 1) onUp()
+		return Offset.Zero
+	}
+}

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

@@ -1,99 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common
-
-import androidx.compose.animation.animateContentSize
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.util.NumberUtils
-import com.zaneschepke.wireguardautotunnel.util.extensions.toThreeDecimalPlaceString
-
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-fun RowListItem(
-	icon: @Composable () -> Unit,
-	text: String,
-	onHold: () -> Unit,
-	onClick: () -> Unit,
-	rowButton: @Composable () -> Unit,
-	expanded: Boolean,
-	statistics: TunnelStatistics?,
-	focusRequester: FocusRequester,
-) {
-	Box(
-		modifier =
-		Modifier
-			.focusRequester(focusRequester)
-			.animateContentSize()
-			.clip(RoundedCornerShape(30.dp))
-			.combinedClickable(
-				onClick = { onClick() },
-				onLongClick = { onHold() },
-			),
-	) {
-		Column {
-			Row(
-				modifier =
-				Modifier
-					.fillMaxWidth()
-					.padding(horizontal = 15.dp, vertical = 5.dp),
-				verticalAlignment = Alignment.CenterVertically,
-				horizontalArrangement = Arrangement.SpaceBetween,
-			) {
-				Row(
-					verticalAlignment = Alignment.CenterVertically,
-					modifier = Modifier.fillMaxWidth(13 / 20f),
-				) {
-					icon()
-					Text(text, maxLines = 1, overflow = TextOverflow.Ellipsis)
-				}
-				rowButton()
-			}
-			if (expanded) {
-				statistics?.getPeers()?.forEach {
-					Row(
-						modifier =
-						Modifier
-							.fillMaxWidth()
-							.padding(end = 10.dp, bottom = 10.dp, start = 10.dp),
-						verticalAlignment = Alignment.CenterVertically,
-						horizontalArrangement = Arrangement.SpaceEvenly,
-					) {
-						// TODO change these to string resources
-						val handshakeEpoch = statistics.peerStats(it)!!.latestHandshakeEpochMillis
-						val peerTx = statistics.peerStats(it)!!.txBytes
-						val peerRx = statistics.peerStats(it)!!.rxBytes
-						val peerId = it.toBase64().subSequence(0, 3).toString() + "***"
-						val handshakeSec =
-							NumberUtils.getSecondsBetweenTimestampAndNow(handshakeEpoch)
-						val handshake =
-							if (handshakeSec == null) "never" else "$handshakeSec secs ago"
-						val peerTxMB = NumberUtils.bytesToMB(peerTx).toThreeDecimalPlaceString()
-						val peerRxMB = NumberUtils.bytesToMB(peerRx).toThreeDecimalPlaceString()
-						val fontSize = 9.sp
-						Text("peer: $peerId", fontSize = fontSize)
-						Text("handshake: $handshake", fontSize = fontSize)
-						Text("tx: $peerTxMB MB", fontSize = fontSize)
-						Text("rx: $peerRxMB MB", fontSize = fontSize)
-					}
-				}
-			}
-		}
-	}
-}

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

@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -32,6 +33,7 @@ fun ConfigurationToggle(
 		Text(
 			label,
 			textAlign = TextAlign.Start,
+			style = MaterialTheme.typography.labelLarge,
 			modifier =
 			Modifier
 				.weight(

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

@@ -10,13 +10,20 @@ import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.Composable
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 
 @Composable
 fun rememberFileImportLauncherForResult(onNoFileExplorer: () -> Unit, onData: (data: Uri) -> Unit): ManagedActivityResultLauncher<String, Uri?> {
 	return rememberLauncherForActivityResult(
 		object : ActivityResultContracts.GetContent() {
 			override fun createIntent(context: Context, input: String): Intent {
-				val intent = super.createIntent(context, input)
+				val intent = super.createIntent(context, input).apply {
+					type = if (context.isRunningOnTv()) {
+						Constants.ALLOWED_TV_FILE_TYPES
+					} else {
+						Constants.ALL_FILE_TYPES
+					}
+				}
 
 				/* AndroidTV now comes with stubs that do nothing but display a Toast less helpful than
 				 * what we can do, so detect this and throw an exception that we can catch later. */

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

@@ -10,10 +10,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.text.font.FontWeight
 import androidx.navigation.NavController
-import androidx.navigation.NavDestination.Companion.hasRoute
-import androidx.navigation.NavDestination.Companion.hierarchy
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.compose.currentBackStackEntryAsState
 
@@ -22,11 +19,9 @@ fun BottomNavBar(navController: NavController, bottomNavItems: List<BottomNavIte
 	var showBottomBar by rememberSaveable { mutableStateOf(true) }
 	val navBackStackEntry by navController.currentBackStackEntryAsState()
 
-	showBottomBar = bottomNavItems.firstOrNull {
-		navBackStackEntry?.destination?.hierarchy?.any { dest ->
-			bottomNavItems.map { dest.hasRoute(route = it.route::class) }.contains(true)
-		} == true
-	} != null
+	showBottomBar = bottomNavItems.any {
+		navBackStackEntry?.isCurrentRoute(it.route) == true
+	}
 
 	if (showBottomBar) {
 		NavigationBar(
@@ -53,7 +48,7 @@ fun BottomNavBar(navController: NavController, bottomNavItems: List<BottomNavIte
 					label = {
 						Text(
 							text = item.name,
-							fontWeight = FontWeight.SemiBold,
+							style = MaterialTheme.typography.labelMedium,
 						)
 					},
 					icon = {

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

@@ -1,10 +1,12 @@
 package com.zaneschepke.wireguardautotunnel.ui.common.navigation
 
+import android.annotation.SuppressLint
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavDestination.Companion.hasRoute
 import androidx.navigation.NavDestination.Companion.hierarchy
 import com.zaneschepke.wireguardautotunnel.ui.Route
 
+@SuppressLint("RestrictedApi")
 fun NavBackStackEntry?.isCurrentRoute(route: Route): Boolean {
 	return this?.destination?.hierarchy?.any {
 		it.hasRoute(route = route::class)

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

@@ -0,0 +1,8 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.navigation
+
+import androidx.compose.runtime.compositionLocalOf
+import androidx.navigation.NavHostController
+
+val LocalNavController = compositionLocalOf<NavHostController> {
+	error("NavController was not provided")
+}

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

@@ -1,15 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.navigation
-
-import android.content.Context
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.ComposeNavigator
-import androidx.navigation.compose.DialogNavigator
-
-class NavigationService constructor(
-	context: Context,
-) {
-	val navController = NavHostController(context).apply {
-		navigatorProvider.addNavigator(ComposeNavigator())
-		navigatorProvider.addNavigator(DialogNavigator())
-	}
-}

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

@@ -1,22 +1,20 @@
 package com.zaneschepke.wireguardautotunnel.ui.common.text
 
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 
 @Composable
 fun SectionTitle(title: String, padding: Dp) {
 	Text(
 		title,
 		textAlign = TextAlign.Start,
-		style = TextStyle(fontSize = 18.sp, fontWeight = FontWeight.ExtraBold),
+		style = MaterialTheme.typography.titleMedium,
 		modifier = Modifier.padding(padding, bottom = 5.dp, top = 5.dp),
 	)
 }

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

@@ -56,8 +56,10 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
 import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationToggle
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
@@ -78,12 +80,21 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 	val snackbar = SnackbarController.current
 	val clipboardManager: ClipboardManager = LocalClipboardManager.current
 	val keyboardController = LocalSoftwareKeyboardController.current
+	val navController = LocalNavController.current
+
 	var showApplicationsDialog by remember { mutableStateOf(false) }
 	var showAuthPrompt by remember { mutableStateOf(false) }
 	var isAuthenticated by remember { mutableStateOf(false) }
 	var configType by remember { mutableStateOf(ConfigType.WIREGUARD) }
 
 	val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+	val saved by viewModel.saved.collectAsStateWithLifecycle(null)
+
+	LaunchedEffect(saved) {
+		if (saved == true) {
+			navController.navigate(Route.Main)
+		}
+	}
 
 	LaunchedEffect(Unit) {
 		if (!uiState.loading && context.isRunningOnTv()) {

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

@@ -6,7 +6,6 @@ import android.content.pm.PackageManager
 import android.os.Build
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import androidx.navigation.NavHostController
 import com.wireguard.config.Config
 import com.wireguard.config.Interface
 import com.wireguard.config.Peer
@@ -17,7 +16,6 @@ import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.ui.screens.config.model.PeerProxy
 import com.zaneschepke.wireguardautotunnel.util.Constants
@@ -30,8 +28,10 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
@@ -44,12 +44,14 @@ class ConfigViewModel
 @AssistedInject
 constructor(
 	private val appDataRepository: AppDataRepository,
-	private val navController: NavHostController,
 	@Assisted val id: Int,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
 	private val packageManager = WireGuardAutoTunnel.instance.packageManager
 
+	private val _saved = MutableSharedFlow<Boolean>()
+	val saved = _saved.asSharedFlow()
+
 	private val _uiState = MutableStateFlow(ConfigUiState())
 	val uiState = _uiState.onStart {
 		appDataRepository.tunnels.getById(id)?.let {
@@ -335,7 +337,7 @@ constructor(
 			SnackbarController.showMessage(
 				StringValue.StringResource(R.string.config_changes_saved),
 			)
-			navController.navigate(Route.Main)
+			_saved.emit(true)
 		}.onFailure {
 			Timber.e(it)
 			val message = it.message?.substringAfter(":", missingDelimiterValue = "")

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

@@ -44,7 +44,7 @@ data class InterfaceProxy(
 				publicKey = i.keyPair.publicKey.toBase64().trim(),
 				privateKey = i.keyPair.privateKey.toBase64().trim(),
 				addresses = i.addresses.joinToString(", ").trim(),
-				dnsServers = i.dnsServers.joinToString(", ").replace("/", "").trim(),
+				dnsServers = (i.dnsServers + i.dnsSearchDomains).joinToString(", ").replace("/", "").trim(),
 				listenPort =
 				if (i.listenPort.isPresent) {
 					i.listenPort.get().toString().trim()

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

@@ -1,40 +1,26 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main
 
 import android.annotation.SuppressLint
+import android.net.VpnService
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity.RESULT_OK
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.focusable
 import androidx.compose.foundation.gestures.ScrollableDefaults
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.overscroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.rounded.Bolt
-import androidx.compose.material.icons.rounded.Circle
-import androidx.compose.material.icons.rounded.CopyAll
-import androidx.compose.material.icons.rounded.Delete
-import androidx.compose.material.icons.rounded.Info
-import androidx.compose.material.icons.rounded.Settings
-import androidx.compose.material.icons.rounded.Smartphone
-import androidx.compose.material.icons.rounded.Star
 import androidx.compose.material3.FabPosition
 import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -45,97 +31,64 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.hapticfeedback.HapticFeedbackType
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.input.pointer.pointerInput
 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.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.navigation.NavController
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanOptions
-import com.wireguard.android.backend.GoBackend
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.tunnel.HandshakeStatus
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
 import com.zaneschepke.wireguardautotunnel.ui.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.RowListItem
+import com.zaneschepke.wireguardautotunnel.ui.common.NestedScrollListener
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
 import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberFileImportLauncherForResult
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.AutoTunnelRowItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.GettingStartedLabel
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.ScrollDismissFab
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelImportSheet
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelRowItem
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.VpnDeniedDialog
-import com.zaneschepke.wireguardautotunnel.ui.theme.corn
-import com.zaneschepke.wireguardautotunnel.ui.theme.mint
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.handshakeStatus
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
-import com.zaneschepke.wireguardautotunnel.util.extensions.mapPeerStats
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 import com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
 import kotlinx.coroutines.delay
-import timber.log.Timber
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState, focusRequester: FocusRequester, navController: NavController) {
-	val haptic = LocalHapticFeedback.current
+fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState, focusRequester: FocusRequester) {
 	val context = LocalContext.current
+	val navController = LocalNavController.current
 	val snackbar = SnackbarController.current
 
 	var showBottomSheet by remember { mutableStateOf(false) }
 	var showVpnPermissionDialog by remember { mutableStateOf(false) }
-	val isVisible = rememberSaveable { mutableStateOf(true) }
+	var isFabVisible by rememberSaveable { mutableStateOf(true) }
 	var showDeleteTunnelAlertDialog by remember { mutableStateOf(false) }
 	var selectedTunnel by remember { mutableStateOf<TunnelConfig?>(null) }
 
-	val nestedScrollConnection =
-		remember {
-			object : NestedScrollConnection {
-				override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
-					// Hide FAB
-					if (available.y < -1) {
-						isVisible.value = false
-					}
-					// Show FAB
-					if (available.y > 1) {
-						isVisible.value = true
-					}
-					return Offset.Zero
-				}
-			}
-		}
+	val nestedScrollConnection = remember {
+		NestedScrollListener({ isFabVisible = false }, { isFabVisible = true })
+	}
 
 	val vpnActivityResultState =
 		rememberLauncherForActivityResult(
 			ActivityResultContracts.StartActivityForResult(),
 			onResult = {
-				val accepted = (it.resultCode == RESULT_OK)
-				if (accepted) {
-					Timber.d("VPN permission granted")
-				} else {
-					showVpnPermissionDialog = true
-				}
+				if (it.resultCode != RESULT_OK) showVpnPermissionDialog = true
 			},
 		)
 
 	LaunchedEffect(Unit) {
 		if (context.isRunningOnTv()) {
 			delay(Constants.FOCUS_REQUEST_DELAY)
-			kotlin.runCatching {
+			runCatching {
 				focusRequester.requestFocus()
 			}.onFailure {
 				delay(Constants.FOCUS_REQUEST_DELAY)
@@ -179,16 +132,13 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 	}
 
 	fun onTunnelToggle(checked: Boolean, tunnel: TunnelConfig) {
-		if (checked) {
-			if (uiState.settings.isKernelEnabled) {
-				context.startTunnelBackground(tunnel.id)
-			} else {
-				viewModel.onTunnelStart(tunnel)
-			}
+		val intent = if (uiState.settings.isKernelEnabled) null else VpnService.prepare(context)
+		if (intent != null) return vpnActivityResultState.launch(intent)
+		if (!checked) viewModel.onTunnelStop(tunnel).also { return }
+		if (uiState.settings.isKernelEnabled) {
+			context.startTunnelBackground(tunnel.id)
 		} else {
-			viewModel.onTunnelStop(
-				tunnel,
-			)
+			viewModel.onTunnelStart(tunnel)
 		}
 	}
 
@@ -206,24 +156,23 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 	Scaffold(
 		modifier =
 		Modifier.pointerInput(Unit) {
-			if (uiState.tunnels.isNotEmpty()) {
-				detectTapGestures(
-					onTap = {
-						selectedTunnel = null
-					},
-				)
-			}
+			if (uiState.tunnels.isEmpty()) return@pointerInput
+			detectTapGestures(
+				onTap = {
+					selectedTunnel = null
+				},
+			)
 		},
 		floatingActionButtonPosition = FabPosition.End,
 		floatingActionButton = {
-			ScrollDismissFab(icon = {
+			ScrollDismissFab({
 				val icon = Icons.Filled.Add
 				Icon(
 					imageVector = icon,
 					contentDescription = icon.name,
 					tint = MaterialTheme.colorScheme.onPrimary,
 				)
-			}, focusRequester, isVisible = isVisible.value, onClick = {
+			}, focusRequester, isVisible = isFabVisible, onClick = {
 				showBottomSheet = true
 			})
 		},
@@ -231,7 +180,7 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 		TunnelImportSheet(
 			showBottomSheet,
 			onDismiss = { showBottomSheet = false },
-			onFileClick = { tunnelFileImportResultLauncher.launch(Constants.ALLOWED_FILE_TYPES) },
+			onFileClick = { tunnelFileImportResultLauncher.launch(Constants.ALLOWED_TV_FILE_TYPES) },
 			onQrClick = { launchQrScanner() },
 			onManualImportClick = {
 				navController.navigate(
@@ -257,69 +206,9 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 					GettingStartedLabel(onClick = { context.openWebUrl(it) })
 				}
 			}
-			item {
-				if (uiState.settings.isAutoTunnelEnabled) {
-					val itemFocusRequester = remember { FocusRequester() }
-					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),
-								)
-							}
-						}
-					RowListItem(
-						icon = {
-							val icon = Icons.Rounded.Bolt
-							Icon(
-								icon,
-								icon.name,
-								modifier =
-								Modifier
-									.padding(end = 8.5.dp)
-									.size(25.dp),
-								tint =
-								if (uiState.settings.isAutoTunnelPaused) {
-									Color.Gray
-								} else {
-									mint
-								},
-							)
-						},
-						text = autoTunnelingLabel.text,
-						rowButton = {
-							if (uiState.settings.isAutoTunnelPaused) {
-								TextButton(
-									modifier = Modifier.focusRequester(itemFocusRequester),
-									onClick = { viewModel.resumeAutoTunneling() },
-								) {
-									Text(stringResource(id = R.string.resume))
-								}
-							} else {
-								TextButton(
-									modifier = Modifier.focusRequester(itemFocusRequester),
-									onClick = { viewModel.pauseAutoTunneling() },
-								) {
-									Text(stringResource(id = R.string.pause))
-								}
-							}
-						},
-						onClick = {
-							if (context.isRunningOnTv()) {
-								itemFocusRequester.requestFocus()
-							}
-						},
-						onHold = {},
-						expanded = false,
-						statistics = null,
-						focusRequester = focusRequester,
-					)
+			if (uiState.settings.isAutoTunnelEnabled) {
+				item {
+					AutoTunnelRowItem(uiState.settings, { viewModel.onToggleAutoTunnelingPause() }, focusRequester)
 				}
 			}
 			items(
@@ -330,195 +219,19 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 					it.id == tunnel.id &&
 						it.isActive
 				}
-				val leadingIconColor =
-					(
-						if (
-							isActive && uiState.vpnState.statistics != null
-						) {
-							uiState.vpnState.statistics.mapPeerStats()
-								.map { it.value?.handshakeStatus() }
-								.let { statuses ->
-									when {
-										statuses.all { it == HandshakeStatus.HEALTHY } -> mint
-										statuses.any { it == HandshakeStatus.STALE } -> corn
-										statuses.all { it == HandshakeStatus.NOT_STARTED } ->
-											Color.Gray
-
-										else -> {
-											Color.Gray
-										}
-									}
-								}
-						} else {
-							Color.Gray
-						}
-						)
-				val itemFocusRequester = remember { FocusRequester() }
-				val expanded = remember { mutableStateOf(false) }
-				RowListItem(
-					icon = {
-						val circleIcon = Icons.Rounded.Circle
-						val icon =
-							if (tunnel.isPrimaryTunnel) {
-								Icons.Rounded.Star
-							} else if (tunnel.isMobileDataTunnel) {
-								Icons.Rounded.Smartphone
-							} else {
-								circleIcon
-							}
-						Icon(
-							icon,
-							icon.name,
-							tint = leadingIconColor,
-							modifier =
-							Modifier
-								.padding(
-									end = if (icon == circleIcon) 12.5.dp else 10.dp,
-									start = if (icon == circleIcon) 2.5.dp else 0.dp,
-								)
-								.size(if (icon == circleIcon) 15.dp else 20.dp),
-						)
-					},
-					text = tunnel.name,
-					onHold = {
-						haptic.performHapticFeedback(HapticFeedbackType.LongPress)
-						selectedTunnel = tunnel
-					},
-					onClick = {
-						if (!context.isRunningOnTv()) {
-							if (
-								isActive
-							) {
-								expanded.value = !expanded.value
-							}
-						} else {
-							selectedTunnel = tunnel
-							itemFocusRequester.requestFocus()
-						}
-					},
-					statistics = uiState.vpnState.statistics,
-					expanded = expanded.value,
+				val expanded = uiState.generalState.isTunnelStatsExpanded
+				TunnelRowItem(
+					isActive,
+					expanded,
+					selectedTunnel?.id == tunnel.id,
+					tunnel,
+					vpnState = uiState.vpnState,
+					{ selectedTunnel = tunnel },
+					{ viewModel.onExpandedChanged(!expanded) },
+					onDelete = { showDeleteTunnelAlertDialog = true },
+					onCopy = { viewModel.onCopyTunnel(tunnel) },
+					onSwitchClick = { onTunnelToggle(it, tunnel) },
 					focusRequester = focusRequester,
-					rowButton = {
-						if (
-							tunnel.id == selectedTunnel?.id &&
-							!context.isRunningOnTv()
-						) {
-							Row {
-								IconButton(
-									onClick = {
-										selectedTunnel?.let {
-											navController.navigate(
-												Route.Option(it.id),
-											)
-										}
-									},
-								) {
-									val icon = Icons.Rounded.Settings
-									Icon(
-										icon,
-										icon.name,
-									)
-								}
-								IconButton(
-									modifier = Modifier.focusable(),
-									onClick = { viewModel.onCopyTunnel(selectedTunnel) },
-								) {
-									val icon = Icons.Rounded.CopyAll
-									Icon(icon, icon.name)
-								}
-								IconButton(
-									enabled = !isActive,
-									modifier = Modifier.focusable(),
-									onClick = { showDeleteTunnelAlertDialog = true },
-								) {
-									val icon = Icons.Rounded.Delete
-									Icon(icon, icon.name)
-								}
-							}
-						} else {
-							if (!isActive) expanded.value = false
-							@Composable
-							fun TunnelSwitch() = Switch(
-								modifier = Modifier.focusRequester(itemFocusRequester),
-								checked = isActive,
-								onCheckedChange = { checked ->
-									if (!checked) expanded.value = false
-									val intent = if (uiState.settings.isKernelEnabled) null else GoBackend.VpnService.prepare(context)
-									if (intent != null) return@Switch vpnActivityResultState.launch(intent)
-									onTunnelToggle(checked, tunnel)
-								},
-							)
-							if (context.isRunningOnTv()) {
-								Row {
-									IconButton(
-										onClick = {
-											selectedTunnel = tunnel
-											selectedTunnel?.let {
-												navController.navigate(
-													Route.Option(it.id),
-												)
-											}
-										},
-									) {
-										val icon = Icons.Rounded.Settings
-										Icon(
-											icon,
-											icon.name,
-										)
-									}
-									IconButton(
-										modifier = Modifier.focusRequester(focusRequester),
-										onClick = {
-											if (
-												uiState.vpnState.status == TunnelState.UP &&
-												(uiState.vpnState.tunnelConfig?.name == tunnel.name)
-											) {
-												expanded.value = !expanded.value
-											} else {
-												snackbar.showMessage(
-													context.getString(R.string.turn_on_tunnel),
-												)
-											}
-										},
-									) {
-										val icon = Icons.Rounded.Info
-										Icon(icon, icon.name)
-									}
-									IconButton(
-										onClick = { viewModel.onCopyTunnel(tunnel) },
-									) {
-										val icon = Icons.Rounded.CopyAll
-										Icon(icon, icon.name)
-									}
-									IconButton(
-										onClick = {
-											if (
-												uiState.vpnState.status == TunnelState.UP &&
-												tunnel.name == uiState.vpnState.tunnelConfig?.name
-											) {
-												snackbar.showMessage(
-													context.getString(R.string.turn_off_tunnel),
-												)
-											} else {
-												selectedTunnel = tunnel
-												showDeleteTunnelAlertDialog = true
-											}
-										},
-									) {
-										val icon = Icons.Rounded.Delete
-										Icon(
-											icon,
-											icon.name,
-										)
-									}
-									TunnelSwitch()
-								}
-							} else {
-								TunnelSwitch()
-							}
-						}
-					},
 				)
 			}
 		}

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

@@ -63,6 +63,10 @@ constructor(
 		)
 	}
 
+	fun onExpandedChanged(expanded: Boolean) = viewModelScope.launch {
+		appDataRepository.appState.setTunnelStatsExpanded(expanded)
+	}
+
 	fun onTunnelStart(tunnelConfig: TunnelConfig) = viewModelScope.launch {
 		Timber.i("Starting tunnel ${tunnelConfig.name}")
 		tunnelService.startTunnel(tunnelConfig)
@@ -190,17 +194,10 @@ constructor(
 		saveTunnelConfigFromStream(stream, name)
 	}
 
-	fun pauseAutoTunneling() = viewModelScope.launch {
+	fun onToggleAutoTunnelingPause() = viewModelScope.launch {
 		val settings = appDataRepository.settings.getSettings()
 		appDataRepository.settings.save(
-			settings.copy(isAutoTunnelPaused = true),
-		)
-	}
-
-	fun resumeAutoTunneling() = viewModelScope.launch {
-		val settings = appDataRepository.settings.getSettings()
-		appDataRepository.settings.save(
-			settings.copy(isAutoTunnelPaused = false),
+			settings.copy(isAutoTunnelPaused = !settings.isAutoTunnelPaused),
 		)
 	}
 

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

@@ -0,0 +1,78 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
+
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Bolt
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.buildAnnotatedString
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
+import com.zaneschepke.wireguardautotunnel.ui.common.ExpandingRowListItem
+import com.zaneschepke.wireguardautotunnel.ui.theme.SilverTree
+import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+
+@Composable
+fun AutoTunnelRowItem(settings: Settings, onToggle: () -> Unit, focusRequester: FocusRequester) {
+	val context = LocalContext.current
+	val itemFocusRequester = remember { FocusRequester() }
+	val autoTunnelingLabel =
+		buildAnnotatedString {
+			append(stringResource(id = R.string.auto_tunneling))
+			append(": ")
+			if (settings.isAutoTunnelPaused) {
+				append(
+					stringResource(id = R.string.paused),
+				)
+			} else {
+				append(
+					stringResource(id = R.string.active),
+				)
+			}
+		}
+	ExpandingRowListItem(
+		leading = {
+			val icon = Icons.Rounded.Bolt
+			Icon(
+				icon,
+				icon.name,
+				modifier =
+				Modifier
+					.size(iconSize).scale(1.5f),
+				tint =
+				if (settings.isAutoTunnelPaused) {
+					Color.Gray
+				} else {
+					SilverTree
+				},
+			)
+		},
+		text = autoTunnelingLabel.text,
+		trailing = {
+			TextButton(
+				modifier = Modifier.focusRequester(itemFocusRequester),
+				onClick = { onToggle() },
+			) {
+				Text(stringResource(id = if (settings.isAutoTunnelPaused) R.string.resume else R.string.pause))
+			}
+		},
+		onClick = {
+			if (context.isRunningOnTv()) {
+				itemFocusRequester.requestFocus()
+			}
+		},
+		isExpanded = false,
+		focusRequester = focusRequester,
+	)
+}

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

@@ -0,0 +1,204 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
+
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Circle
+import androidx.compose.material.icons.rounded.CopyAll
+import androidx.compose.material.icons.rounded.Delete
+import androidx.compose.material.icons.rounded.Info
+import androidx.compose.material.icons.rounded.Settings
+import androidx.compose.material.icons.rounded.Smartphone
+import androidx.compose.material.icons.rounded.Star
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Switch
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalHapticFeedback
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
+import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.ExpandingRowListItem
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
+import com.zaneschepke.wireguardautotunnel.util.extensions.asColor
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+
+@Composable
+fun TunnelRowItem(
+	isActive: Boolean,
+	expanded: Boolean,
+	isSelected: Boolean,
+	tunnel: TunnelConfig,
+	vpnState: VpnState,
+	onHold: () -> Unit,
+	onClick: () -> Unit,
+	onCopy: () -> Unit,
+	onDelete: () -> Unit,
+	onSwitchClick: (checked: Boolean) -> Unit,
+	focusRequester: FocusRequester,
+) {
+	val leadingIconColor = if (!isActive) Color.Gray else vpnState.statistics.asColor()
+	val context = LocalContext.current
+	val snackbar = SnackbarController.current
+	val navController = LocalNavController.current
+	val haptic = LocalHapticFeedback.current
+	val itemFocusRequester = remember { FocusRequester() }
+	ExpandingRowListItem(
+		leading = {
+			val circleIcon = Icons.Rounded.Circle
+			val icon =
+				if (tunnel.isPrimaryTunnel) {
+					Icons.Rounded.Star
+				} else if (tunnel.isMobileDataTunnel) {
+					Icons.Rounded.Smartphone
+				} else {
+					circleIcon
+				}
+			Icon(
+				icon,
+				icon.name,
+				tint = leadingIconColor,
+				modifier = Modifier.size(iconSize),
+			)
+		},
+		text = tunnel.name,
+		onHold = {
+			haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+			onHold()
+		},
+		onClick = {
+			if (!context.isRunningOnTv()) {
+				if (isActive) {
+					onClick()
+				}
+			} else {
+				onHold()
+				itemFocusRequester.requestFocus()
+			}
+		},
+		isExpanded = expanded && isActive,
+		expanded = { if (isActive && expanded) TunnelStatisticsRow(vpnState.statistics, tunnel) },
+		focusRequester = focusRequester,
+		trailing = {
+			if (
+				isSelected &&
+				!context.isRunningOnTv()
+			) {
+				Row {
+					IconButton(
+						onClick = {
+							navController.navigate(
+								Route.Option(tunnel.id),
+							)
+						},
+					) {
+						val icon = Icons.Rounded.Settings
+						Icon(
+							icon,
+							icon.name,
+						)
+					}
+					IconButton(
+						modifier = Modifier.focusable(),
+						onClick = { onCopy() },
+					) {
+						val icon = Icons.Rounded.CopyAll
+						Icon(icon, icon.name)
+					}
+					IconButton(
+						enabled = !isActive,
+						modifier = Modifier.focusable(),
+						onClick = { onDelete() },
+					) {
+						val icon = Icons.Rounded.Delete
+						Icon(icon, icon.name)
+					}
+				}
+			} else {
+				if (context.isRunningOnTv()) {
+					Row {
+						IconButton(
+							onClick = {
+								onHold()
+								navController.navigate(
+									Route.Option(tunnel.id),
+								)
+							},
+						) {
+							val icon = Icons.Rounded.Settings
+							Icon(
+								icon,
+								icon.name,
+							)
+						}
+						IconButton(
+							modifier = Modifier.focusRequester(focusRequester),
+							onClick = {
+								if (isActive) {
+									onClick()
+								} else {
+									snackbar.showMessage(
+										context.getString(R.string.turn_on_tunnel),
+									)
+								}
+							},
+						) {
+							val icon = Icons.Rounded.Info
+							Icon(icon, icon.name)
+						}
+						IconButton(
+							onClick = { onCopy() },
+						) {
+							val icon = Icons.Rounded.CopyAll
+							Icon(icon, icon.name)
+						}
+						IconButton(
+							onClick = {
+								if (isActive) {
+									snackbar.showMessage(
+										context.getString(R.string.turn_off_tunnel),
+									)
+								} else {
+									onHold()
+									onDelete()
+								}
+							},
+						) {
+							val icon = Icons.Rounded.Delete
+							Icon(
+								icon,
+								icon.name,
+							)
+						}
+						Switch(
+							modifier = Modifier.focusRequester(itemFocusRequester),
+							checked = isActive,
+							onCheckedChange = { checked ->
+								onSwitchClick(checked)
+							},
+						)
+					}
+				} else {
+					Switch(
+						modifier = Modifier.focusRequester(itemFocusRequester),
+						checked = isActive,
+						onCheckedChange = { checked ->
+							onSwitchClick(checked)
+						},
+					)
+				}
+			}
+		},
+	)
+}

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

@@ -0,0 +1,60 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
+import com.zaneschepke.wireguardautotunnel.util.NumberUtils
+import com.zaneschepke.wireguardautotunnel.util.extensions.toThreeDecimalPlaceString
+
+@Composable
+fun TunnelStatisticsRow(statistics: TunnelStatistics?, tunnelConfig: TunnelConfig) {
+	val config = TunnelConfig.configFromAmQuick(tunnelConfig.wgQuick)
+
+	Row(
+		modifier =
+		Modifier
+			.fillMaxWidth()
+			.padding(end = 10.dp, bottom = 10.dp, start = 45.dp),
+		verticalAlignment = Alignment.CenterVertically,
+		horizontalArrangement = Arrangement.spacedBy(30.dp, Alignment.Start),
+	) {
+		config.peers.forEach {
+			val peerId = it.publicKey.toBase64().subSequence(0, 3).toString() + "***"
+			val peerRx = statistics?.peerStats(it.publicKey)?.rxBytes ?: 0
+			val peerTx = statistics?.peerStats(it.publicKey)?.txBytes ?: 0
+			val peerTxMB = NumberUtils.bytesToMB(peerTx).toThreeDecimalPlaceString()
+			val peerRxMB = NumberUtils.bytesToMB(peerRx).toThreeDecimalPlaceString()
+			val handshake = statistics?.peerStats(it.publicKey)?.latestHandshakeEpochMillis?.let {
+				if (it == 0L) {
+					stringResource(R.string.never)
+				} else {
+					"${NumberUtils.getSecondsBetweenTimestampAndNow(it)} ${stringResource(R.string.sec)}"
+				}
+			} ?: stringResource(R.string.never)
+			Column(
+				verticalArrangement = Arrangement.spacedBy(10.dp),
+			) {
+				Text(stringResource(R.string.peer).lowercase() + ": $peerId", style = MaterialTheme.typography.bodySmall)
+				Text("tx: $peerTxMB MB", style = MaterialTheme.typography.bodySmall)
+			}
+			Column(
+				verticalArrangement = Arrangement.spacedBy(10.dp),
+			) {
+				Text(stringResource(R.string.handshake) + ": $handshake", style = MaterialTheme.typography.bodySmall)
+				Text("rx: $peerRxMB MB", style = MaterialTheme.typography.bodySmall)
+			}
+		}
+	}
+}

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

@@ -47,13 +47,13 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.navigation.NavController
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.ClickableIconButton
 import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationToggle
 import com.zaneschepke.wireguardautotunnel.ui.common.config.SubmitConfigurationTextBox
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.ScrollDismissFab
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.WildcardSupportingLabel
@@ -66,15 +66,10 @@ import kotlinx.coroutines.delay
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-fun OptionsScreen(
-	optionsViewModel: OptionsViewModel = hiltViewModel(),
-	navController: NavController,
-	focusRequester: FocusRequester,
-	appUiState: AppUiState,
-	tunnelId: Int,
-) {
+fun OptionsScreen(optionsViewModel: OptionsViewModel = hiltViewModel(), focusRequester: FocusRequester, appUiState: AppUiState, tunnelId: Int) {
 	val scrollState = rememberScrollState()
 	val context = LocalContext.current
+	val navController = LocalNavController.current
 	val config = appUiState.tunnels.first { it.id == tunnelId }
 
 	val interactionSource = remember { MutableInteractionSource() }

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

@@ -5,23 +5,24 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.navigation.NavController
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
 import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import xyz.teamgravity.pin_lock_compose.PinLock
 
 @Composable
-fun PinLockScreen(navController: NavController, appViewModel: AppViewModel) {
+fun PinLockScreen(appViewModel: AppViewModel) {
 	val context = LocalContext.current
+	val navController = LocalNavController.current
 	val snackbar = SnackbarController.current
 	PinLock(
 		title = { pinExists ->
 			Text(
-				color = MaterialTheme.colorScheme.onSecondary,
+				color = MaterialTheme.colorScheme.onSurface,
 				text =
 				if (pinExists) {
 					stringResource(id = R.string.enter_pin)
@@ -32,7 +33,8 @@ fun PinLockScreen(navController: NavController, appViewModel: AppViewModel) {
 				},
 			)
 		},
-		color = MaterialTheme.colorScheme.secondary,
+		backgroundColor = MaterialTheme.colorScheme.surface,
+		textColor = MaterialTheme.colorScheme.onSurface,
 		onPinCorrect = {
 			// pin is correct, navigate or hide pin lock
 			if (context.isRunningOnTv()) {

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

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.settings
 
 import android.Manifest
-import android.app.Activity
 import android.content.Context.POWER_SERVICE
 import android.content.Intent
 import android.net.Uri
@@ -60,7 +59,6 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.NavController
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
@@ -72,6 +70,7 @@ import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.ClickableIconButton
 import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationToggle
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
@@ -91,21 +90,17 @@ import xyz.teamgravity.pin_lock_compose.PinManager
 	ExperimentalLayoutApi::class,
 )
 @Composable
-fun SettingsScreen(
-	viewModel: SettingsViewModel = hiltViewModel(),
-	appViewModel: AppViewModel,
-	uiState: AppUiState,
-	navController: NavController,
-	focusRequester: FocusRequester,
-) {
+fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel: AppViewModel, uiState: AppUiState, focusRequester: FocusRequester) {
 	val context = LocalContext.current
+	val navController = LocalNavController.current
 	val focusManager = LocalFocusManager.current
 	val snackbar = SnackbarController.current
+
 	val scrollState = rememberScrollState()
 	val interactionSource = remember { MutableInteractionSource() }
 	val isRunningOnTv = context.isRunningOnTv()
 
-	val kernelSupport by viewModel.kernelSupport.collectAsStateWithLifecycle()
+	val settingsUiState by viewModel.uiState.collectAsStateWithLifecycle()
 
 	val fineLocationState = rememberPermissionState(Manifest.permission.ACCESS_FINE_LOCATION)
 	var currentText by remember { mutableStateOf("") }
@@ -119,10 +114,6 @@ fun SettingsScreen(
 	val screenPadding = 5.dp
 	val fillMaxWidth = .85f
 
-	LaunchedEffect(Unit) {
-		viewModel.checkKernelSupport()
-	}
-
 	LaunchedEffect(uiState.settings.trustedNetworkSSIDs) {
 		currentText = ""
 	}
@@ -131,7 +122,7 @@ fun SettingsScreen(
 		rememberLauncherForActivityResult(
 			ActivityResultContracts.StartActivityForResult(),
 		) { result: ActivityResult ->
-			if (result.resultCode == Activity.RESULT_OK) {
+			if (result.resultCode == RESULT_OK) {
 				result.data
 				// Handle the Intent
 			}
@@ -266,6 +257,18 @@ fun SettingsScreen(
 		)
 	}
 
+	fun onAutoTunnelWifiChecked() {
+		when (false) {
+			isBackgroundLocationGranted -> showLocationDialog = true
+			fineLocationState.status.isGranted -> showLocationDialog = true
+			viewModel.isLocationEnabled(context) ->
+				showLocationServicesAlertDialog = true
+			else -> {
+				viewModel.onToggleTunnelOnWifi()
+			}
+		}
+	}
+
 	Column(
 		horizontalAlignment = Alignment.CenterHorizontally,
 		verticalArrangement = Arrangement.Top,
@@ -315,18 +318,8 @@ fun SettingsScreen(
 					checked = uiState.settings.isTunnelOnWifiEnabled,
 					padding = screenPadding,
 					onCheckChanged = { checked ->
-						if (!checked) viewModel.onToggleTunnelOnWifi()
-						if (checked) {
-							when (false) {
-								isBackgroundLocationGranted -> showLocationDialog = true
-								fineLocationState.status.isGranted -> showLocationDialog = true
-								viewModel.isLocationEnabled(context) ->
-									showLocationServicesAlertDialog = true
-								else -> {
-									viewModel.onToggleTunnelOnWifi()
-								}
-							}
-						}
+						if (!checked || settingsUiState.isRooted) viewModel.onToggleTunnelOnWifi().also { return@ConfigurationToggle }
+						onAutoTunnelWifiChecked()
 					},
 					modifier =
 					if (uiState.settings.isAutoTunnelEnabled) {
@@ -495,7 +488,7 @@ fun SettingsScreen(
 						uiState.settings.isAutoTunnelEnabled ||
 							uiState.settings.isAlwaysOnVpnEnabled ||
 							(uiState.vpnState.status == TunnelState.UP) ||
-							!kernelSupport
+							!settingsUiState.isKernelAvailable
 						),
 					checked = uiState.settings.isKernelEnabled,
 					padding = screenPadding,
@@ -545,9 +538,12 @@ fun SettingsScreen(
 					ConfigurationToggle(
 						stringResource(R.string.always_on_vpn_support),
 						enabled = !(
-							uiState.settings.isTunnelOnWifiEnabled ||
+							(
 								uiState.settings.isTunnelOnWifiEnabled ||
-								uiState.settings.isTunnelOnMobileDataEnabled
+									uiState.settings.isTunnelOnEthernetEnabled ||
+									uiState.settings.isTunnelOnMobileDataEnabled
+								) &&
+								uiState.settings.isAutoTunnelEnabled
 							),
 						checked = uiState.settings.isAlwaysOnVpnEnabled,
 						padding = screenPadding,

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

@@ -0,0 +1,6 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings
+
+data class SettingsUiState(
+	val isRooted: Boolean = false,
+	val isKernelAvailable: Boolean = false,
+)

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

@@ -13,13 +13,14 @@ import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.FileUtils
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
@@ -38,8 +39,16 @@ constructor(
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
 
-	private val _kernelSupport = MutableStateFlow(false)
-	val kernelSupport = _kernelSupport.asStateFlow()
+	private val _uiState = MutableStateFlow(SettingsUiState())
+	val uiState = _uiState.onStart {
+		_uiState.update {
+			it.copy(isKernelAvailable = isKernelSupported(), isRooted = isRooted())
+		}
+	}.stateIn(
+		viewModelScope,
+		SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+		SettingsUiState(),
+	)
 	private val settings = appDataRepository.settings.getSettingsFlow()
 		.stateIn(viewModelScope, SharingStarted.Eagerly, Settings())
 
@@ -211,13 +220,9 @@ constructor(
 		}
 	}
 
-	fun checkKernelSupport() = viewModelScope.launch {
-		val kernelSupport =
-			withContext(ioDispatcher) {
-				WgQuickBackend.hasKernelSupport()
-			}
-		_kernelSupport.update {
-			kernelSupport
+	private suspend fun isKernelSupported(): Boolean {
+		return withContext(ioDispatcher) {
+			WgQuickBackend.hasKernelSupport()
 		}
 	}
 
@@ -231,6 +236,17 @@ constructor(
 		}
 	}
 
+	private suspend fun isRooted(): Boolean {
+		return try {
+			withContext(ioDispatcher) {
+				rootShell.get().start()
+			}
+			true
+		} catch (_: Exception) {
+			false
+		}
+	}
+
 	private suspend fun requestRoot(): Result<Unit> {
 		return withContext(ioDispatcher) {
 			kotlin.runCatching {

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

@@ -42,18 +42,19 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.navigation.NavController
 import com.zaneschepke.wireguardautotunnel.BuildConfig
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchSupportEmail
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 
 @Composable
-fun SupportScreen(navController: NavController, focusRequester: FocusRequester, appUiState: AppUiState) {
+fun SupportScreen(focusRequester: FocusRequester, appUiState: AppUiState) {
 	val context = LocalContext.current
+	val navController = LocalNavController.current
 	val fillMaxWidth = .85f
 
 	Column(

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

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.support.logs
 
 import android.annotation.SuppressLint
-import android.widget.Toast
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
@@ -13,7 +12,7 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Save
+import androidx.compose.material.icons.filled.Share
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -21,8 +20,12 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -35,9 +38,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.zaneschepke.logcatter.model.LogMessage
-import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.common.text.LogTypeLabel
-import kotlinx.coroutines.launch
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @Composable
@@ -45,35 +46,52 @@ fun LogsScreen(viewModel: LogsViewModel = hiltViewModel()) {
 	val logs = viewModel.logs
 
 	val context = LocalContext.current
+	val clipboardManager: ClipboardManager = LocalClipboardManager.current
 
 	val lazyColumnListState = rememberLazyListState()
-	val clipboardManager: ClipboardManager = LocalClipboardManager.current
-	val scope = rememberCoroutineScope()
+	var isAutoScrolling by remember { mutableStateOf(true) }
+	var lastScrollPosition by remember { mutableIntStateOf(0) }
 
-	LaunchedEffect(logs.size) {
-		scope.launch {
+	LaunchedEffect(isAutoScrolling) {
+		if (isAutoScrolling) {
 			lazyColumnListState.animateScrollToItem(logs.size)
 		}
 	}
 
+	LaunchedEffect(logs.size) {
+		if (isAutoScrolling) {
+			lazyColumnListState.animateScrollToItem(logs.size)
+		}
+	}
+
+	LaunchedEffect(lazyColumnListState) {
+		snapshotFlow { lazyColumnListState.firstVisibleItemIndex }
+			.collect { currentScrollPosition ->
+				if (currentScrollPosition < lastScrollPosition && isAutoScrolling) {
+					isAutoScrolling = false
+				}
+				val visible = lazyColumnListState.layoutInfo.visibleItemsInfo
+				if (visible.isNotEmpty()) {
+					if (visible.last().index
+						== lazyColumnListState.layoutInfo.totalItemsCount - 1 && !isAutoScrolling
+					) {
+						isAutoScrolling = true
+					}
+				}
+				lastScrollPosition = currentScrollPosition
+			}
+	}
+
 	Scaffold(
 		floatingActionButton = {
 			FloatingActionButton(
 				onClick = {
-					scope.launch {
-						viewModel.saveLogsToFile().onSuccess {
-							Toast.makeText(
-								context,
-								context.getString(R.string.logs_saved),
-								Toast.LENGTH_SHORT,
-							).show()
-						}
-					}
+					viewModel.shareLogs(context)
 				},
 				shape = RoundedCornerShape(16.dp),
 				containerColor = MaterialTheme.colorScheme.primary,
 			) {
-				val icon = Icons.Filled.Save
+				val icon = Icons.Filled.Share
 				Icon(
 					imageVector = icon,
 					contentDescription = icon.name,

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

@@ -1,19 +1,25 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.support.logs
 
+import android.content.Context
 import androidx.compose.runtime.mutableStateListOf
+import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.zaneschepke.logcatter.LocalLogCollector
+import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.logcatter.model.LogMessage
+import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.module.MainDispatcher
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.FileUtils
 import com.zaneschepke.wireguardautotunnel.util.extensions.chunked
+import com.zaneschepke.wireguardautotunnel.util.extensions.launchShareFile
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.File
 import java.time.Duration
 import java.time.Instant
 import javax.inject.Inject
@@ -22,8 +28,7 @@ import javax.inject.Inject
 class LogsViewModel
 @Inject
 constructor(
-	private val localLogCollector: LocalLogCollector,
-	private val fileUtils: FileUtils,
+	private val localLogCollector: LogReader,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 	@MainDispatcher private val mainDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
@@ -44,13 +49,19 @@ constructor(
 		}
 	}
 
-	suspend fun saveLogsToFile(): Result<Unit> {
-		val file =
-			localLogCollector.getLogFile().getOrElse {
-				return Result.failure(it)
-			}
-		val fileContent = fileUtils.readBytesFromFile(file)
-		val fileName = "${Constants.BASE_LOG_FILE_NAME}-${Instant.now().epochSecond}.txt"
-		return fileUtils.saveByteArrayToDownloads(fileContent, fileName)
+	fun shareLogs(context: Context): Job = viewModelScope.launch(ioDispatcher) {
+		runCatching {
+			val sharePath = File(context.filesDir, "external_files")
+			if (sharePath.exists()) sharePath.delete()
+			sharePath.mkdir()
+			val file = File("${sharePath.path + "/" + Constants.BASE_LOG_FILE_NAME}-${Instant.now().epochSecond}.zip")
+			if (file.exists()) file.delete()
+			file.createNewFile()
+			localLogCollector.zipLogFiles(file.absolutePath)
+			val uri = FileProvider.getUriForFile(context, context.getString(R.string.provider), file)
+			context.launchShareFile(uri)
+		}.onFailure {
+			Timber.e(it)
+		}
 	}
 }

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

@@ -2,17 +2,37 @@ package com.zaneschepke.wireguardautotunnel.ui.theme
 
 import androidx.compose.ui.graphics.Color
 
-val Purple80 = Color(0xFFD0BCFF)
-val PurpleGrey80 = Color(0xFFCCC2DC)
-val Pink80 = Color(0xFF492532)
-val virdigris = Color(0xFF5BC0BE)
+val OffWhite = Color(0xFFE5E1E5)
+val LightGrey = Color(0xFF8D9D9F)
+val Aqua = Color(0xFF76BEBD)
+val SilverTree = Color(0xFF6DB58B)
+val Plantation = Color(0xFF264A49)
+val Shark = Color(0xFF21272A)
+val BalticSea = Color(0xFF1C1B1F)
+val Brick = Color(0xFFCE4257)
+val Corn = Color(0xFFFBEC5D)
 
-val Purple40 = Color(0xFF6650a4)
-val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFFFFFFFF)
+sealed class ThemeColors(
+	val background: Color,
+	val surface: Color,
+	val primary: Color,
+	val secondary: Color,
+	val onSurface: Color,
+) {
+	// TODO fix light theme colors
+	data object Light : ThemeColors(
+		background = LightGrey,
+		surface = OffWhite,
+		primary = Plantation,
+		secondary = OffWhite,
+		onSurface = BalticSea,
+	)
 
-// status colors
-val brickRed = Color(0xFFCE4257)
-val corn = Color(0xFFFBEC5D)
-val pinkRed = Color(0xFFEF476F)
-val mint = Color(0xFF52B788)
+	data object Dark : ThemeColors(
+		background = BalticSea,
+		surface = Shark,
+		primary = Aqua,
+		secondary = Plantation,
+		onSurface = OffWhite,
+	)
+}

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

@@ -18,30 +18,22 @@ import androidx.core.view.WindowCompat
 
 private val DarkColorScheme =
 	darkColorScheme(
-		// primary = Purple80,
-		primary = virdigris,
-		secondary = PurpleGrey40,
-		// secondary = PurpleGrey80,
-		tertiary = Pink40,
-		surfaceTint = Pink80,
-		// tertiary = Pink80
+		primary = ThemeColors.Dark.primary,
+		surface = ThemeColors.Dark.surface,
+		background = ThemeColors.Dark.background,
+		secondaryContainer = ThemeColors.Dark.secondary,
+		onSurface = ThemeColors.Dark.onSurface,
+		onSecondaryContainer = ThemeColors.Dark.primary,
 	)
 
 private val LightColorScheme =
 	lightColorScheme(
-		primary = Purple40,
-		secondary = PurpleGrey40,
-		tertiary = Pink40,
-		surfaceTint = Pink80,
-        /* Other default colors to override
-        background = Color(0xFFFFFBFE),
-        surface = Color(0xFFFFFBFE),
-        onPrimary = Color.White,
-        onSecondary = Color.White,
-        onTertiary = Color.White,
-        onBackground = Color(0xFF1C1B1F),
-        onSurface = Color(0xFF1C1B1F),
-         */
+		primary = ThemeColors.Light.primary,
+		surface = ThemeColors.Light.surface,
+		background = ThemeColors.Light.background,
+		secondaryContainer = ThemeColors.Light.secondary,
+		onSurface = ThemeColors.Light.onSurface,
+		onSecondaryContainer = ThemeColors.Light.primary,
 	)
 
 @Composable
@@ -60,7 +52,8 @@ fun WireguardAutoTunnelTheme(
 			}
 		}
 		useDarkTheme -> DarkColorScheme
-		else -> LightColorScheme
+		// TODO force dark theme for now until light theme designed
+		else -> DarkColorScheme
 	}
 	val view = LocalView.current
 	if (!view.isInEditMode) {

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

@@ -2,35 +2,58 @@ package com.zaneschepke.wireguardautotunnel.ui.theme
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.zaneschepke.wireguardautotunnel.R
 
 // Set of Material typography styles to start with
+
+val inter = FontFamily(
+	Font(R.font.inter),
+)
+
 val Typography =
 	Typography(
 		bodyLarge =
 		TextStyle(
-			fontFamily = FontFamily.Default,
+			fontFamily = inter,
 			fontWeight = FontWeight.Normal,
 			fontSize = 16.sp,
 			lineHeight = 24.sp,
 			letterSpacing = 0.5.sp,
 		),
-        /* Other default text styles to override
-        titleLarge = TextStyle(
-            fontFamily = FontFamily.Default,
-            fontWeight = FontWeight.Normal,
-            fontSize = 22.sp,
-            lineHeight = 28.sp,
-            letterSpacing = 0.sp
-        ),
-        labelSmall = TextStyle(
-            fontFamily = FontFamily.Default,
-            fontWeight = FontWeight.Medium,
-            fontSize = 11.sp,
-            lineHeight = 16.sp,
-            letterSpacing = 0.5.sp
-        )
-         */
+		bodySmall = TextStyle(
+			fontFamily = inter,
+			fontWeight = FontWeight.Normal,
+			fontSize = 13.sp,
+			lineHeight = 20.sp,
+			letterSpacing = 1.sp,
+			color = LightGrey,
+		),
+		labelLarge = TextStyle(
+			fontFamily = inter,
+			fontWeight = FontWeight.Normal,
+			fontSize = 15.sp,
+			lineHeight = 18.sp,
+			letterSpacing = 0.sp,
+		),
+		labelMedium = TextStyle(
+			fontFamily = inter,
+			fontWeight = FontWeight.SemiBold,
+			fontSize = 12.sp,
+			lineHeight = 16.sp,
+			letterSpacing = 0.5.sp,
+		),
+		titleMedium = TextStyle(
+			fontFamily = inter,
+			fontWeight = FontWeight.Bold,
+			fontSize = 17.sp,
+			lineHeight = 21.sp,
+			letterSpacing = 0.sp,
+		),
 	)
+
+val iconSize = 15.dp

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

@@ -11,13 +11,13 @@ object Constants {
 	const val CONF_FILE_EXTENSION = ".conf"
 	const val ZIP_FILE_EXTENSION = ".zip"
 	const val URI_CONTENT_SCHEME = "content"
-	const val ALLOWED_FILE_TYPES = "*/*"
 	const val TEXT_MIME_TYPE = "text/plain"
 	const val ZIP_FILE_MIME_TYPE = "application/zip"
+	const val ALLOWED_TV_FILE_TYPES = "${TEXT_MIME_TYPE}|${ZIP_FILE_MIME_TYPE}"
+	const val ALL_FILE_TYPES = "*/*"
 	const val GOOGLE_TV_EXPLORER_STUB = "com.google.android.tv.frameworkpackagestubs"
 	const val ANDROID_TV_EXPLORER_STUB = "com.android.tv.frameworkpackagestubs"
 	const val VPN_SETTINGS_PACKAGE = "android.net.vpn.SETTINGS"
-	const val EMAIL_MIME_TYPE = "plain/text"
 	const val SYSTEM_EXEMPT_SERVICE_TYPE_ID = 1024
 
 	const val SUBSCRIPTION_TIMEOUT = 5_000L

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

@@ -12,8 +12,6 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
 import java.io.OutputStream
 import java.time.Instant
 import java.util.zip.ZipEntry
@@ -23,23 +21,6 @@ class FileUtils(
 	private val context: Context,
 	private val ioDispatcher: CoroutineDispatcher,
 ) {
-	suspend fun readBytesFromFile(file: File): ByteArray {
-		return withContext(ioDispatcher) {
-			FileInputStream(file).use {
-				it.readBytes()
-			}
-		}
-	}
-
-	suspend fun readTextFromFileName(fileName: String): String {
-		return withContext(ioDispatcher) {
-			context.assets.open(fileName).use { stream ->
-				stream.bufferedReader(Charsets.UTF_8).use {
-					it.readText()
-				}
-			}
-		}
-	}
 
 	fun createWgFiles(tunnels: TunnelConfigs): List<File> {
 		return tunnels.map { config ->
@@ -61,43 +42,6 @@ class FileUtils(
 		}
 	}
 
-	suspend fun saveByteArrayToDownloads(content: ByteArray, fileName: String): Result<Unit> {
-		return withContext(ioDispatcher) {
-			try {
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-					val contentValues =
-						ContentValues().apply {
-							put(MediaColumns.DISPLAY_NAME, fileName)
-							put(MediaColumns.MIME_TYPE, Constants.TEXT_MIME_TYPE)
-							put(MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS)
-						}
-					val resolver = context.contentResolver
-					val uri =
-						resolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, contentValues)
-					if (uri != null) {
-						resolver.openOutputStream(uri).use { output ->
-							output?.write(content)
-						}
-					}
-				} else {
-					val target =
-						File(
-							Environment.getExternalStoragePublicDirectory(
-								Environment.DIRECTORY_DOWNLOADS,
-							),
-							fileName,
-						)
-					FileOutputStream(target).use { output ->
-						output.write(content)
-					}
-				}
-				Result.success(Unit)
-			} catch (e: Exception) {
-				Result.failure(e)
-			}
-		}
-	}
-
 	suspend fun saveFilesToZip(files: List<File>): Result<Unit> {
 		return withContext(ioDispatcher) {
 			try {
@@ -124,7 +68,7 @@ class FileUtils(
 	}
 
 	// TODO issue with android 9
-	private fun createDownloadsFileOutputStream(fileName: String, mimeType: String = Constants.ALLOWED_FILE_TYPES): OutputStream? {
+	private fun createDownloadsFileOutputStream(fileName: String, mimeType: String = Constants.ALL_FILE_TYPES): OutputStream? {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
 			val resolver = context.contentResolver
 			val contentValues =

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

@@ -26,6 +26,16 @@ fun Context.openWebUrl(url: String): Result<Unit> {
 	}
 }
 
+fun Context.launchShareFile(file: Uri) {
+	val shareIntent = Intent().apply {
+		setAction(Intent.ACTION_SEND)
+		setType("*/*")
+		putExtra(Intent.EXTRA_STREAM, file)
+		addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+	}
+	this.startActivity(Intent.createChooser(shareIntent, ""))
+}
+
 fun Context.showToast(resId: Int) {
 	Toast.makeText(
 		this,
@@ -34,21 +44,21 @@ fun Context.showToast(resId: Int) {
 	).show()
 }
 
-fun Context.launchSupportEmail(): Result<Unit> {
-	return runCatching {
-		val intent =
-			Intent(Intent.ACTION_SENDTO).apply {
-				type = Constants.EMAIL_MIME_TYPE
-				putExtra(Intent.EXTRA_EMAIL, arrayOf(getString(R.string.my_email)))
-				putExtra(Intent.EXTRA_SUBJECT, getString(R.string.email_subject))
-				addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-			}
+fun Context.launchSupportEmail() {
+	val intent =
+		Intent(Intent.ACTION_SENDTO).apply {
+			data = Uri.parse("mailto:")
+			putExtra(Intent.EXTRA_EMAIL, arrayOf(getString(R.string.my_email)))
+			putExtra(Intent.EXTRA_SUBJECT, getString(R.string.email_subject))
+			addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+		}
+	if (intent.resolveActivity(packageManager) != null) {
 		startActivity(
 			Intent.createChooser(intent, getString(R.string.email_chooser)).apply {
 				addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
 			},
 		)
-	}.onFailure {
+	} else {
 		showToast(R.string.no_email_detected)
 	}
 }

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

@@ -1,8 +1,12 @@
 package com.zaneschepke.wireguardautotunnel.util.extensions
 
+import androidx.compose.ui.graphics.Color
+import com.wireguard.android.util.RootShell
 import com.wireguard.config.Peer
 import com.zaneschepke.wireguardautotunnel.service.tunnel.HandshakeStatus
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
+import com.zaneschepke.wireguardautotunnel.ui.theme.Corn
+import com.zaneschepke.wireguardautotunnel.ui.theme.SilverTree
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import org.amnezia.awg.config.Config
@@ -48,6 +52,19 @@ fun Peer.isReachable(): Boolean {
 	return reachable
 }
 
+fun TunnelStatistics?.asColor(): Color {
+	return this?.mapPeerStats()
+		?.map { it.value?.handshakeStatus() }
+		?.let { statuses ->
+			when {
+				statuses.all { it == HandshakeStatus.HEALTHY } -> SilverTree
+				statuses.any { it == HandshakeStatus.STALE } -> Corn
+				statuses.all { it == HandshakeStatus.NOT_STARTED } -> Color.Gray
+				else -> Color.Gray
+			}
+		} ?: Color.Gray
+}
+
 fun Config.toWgQuickString(): String {
 	val amQuick = toAwgQuickString(true)
 	val lines = amQuick.lines().toMutableList()
@@ -62,3 +79,9 @@ fun Config.toWgQuickString(): String {
 	}
 	return lines.joinToString(System.lineSeparator())
 }
+
+fun RootShell.getCurrentWifiName(): String? {
+	val response = mutableListOf<String>()
+	this.run(response, "dumpsys wifi | grep -o \"SSID: [^,]*\" | cut -d ' ' -f2- | tr -d '\"'")
+	return response.lastOrNull()
+}

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/main/res/values-pt-rPT/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

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

@@ -196,4 +196,7 @@
     <string name="wildcard_supported">Learn about supported wildcards.</string>
 	<string name="details">details</string>
 	<string name="show_amnezia_properties">Show Amnezia properties</string>
+	<string name="never">never</string>
+	<string name="sec">sec</string>
+	<string name="handshake">handshake</string>
 </resources>

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

@@ -5,11 +5,9 @@
         <item name="android:windowBackground">@color/black_background</item>
     </style>
 
-    <style name="Theme.AppSplashScreen" parent="Theme.SplashScreen">
-        <!--<item name="windowSplashScreenBackground">@color/white</item>-->
-        <!-- icon has to be a circle -->
+    <style name="Theme.App.Start" parent="@style/Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/black_background</item>
         <item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher</item>
-        <item name="windowSplashScreenAnimationDuration">500</item>
         <item name="postSplashScreenTheme">@style/Theme.WireguardAutoTunnel</item>
     </style>
 </resources>

app/src/main/res/xml/file_paths.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+	<files-path
+		name="share"
+		path="external_files/"/>
+</paths>

buildSrc/src/main/kotlin/Constants.kt

@@ -1,7 +1,7 @@
 object Constants {
-	const val VERSION_NAME = "3.5.2"
+	const val VERSION_NAME = "3.5.3"
     const val JVM_TARGET = "17"
-    const val VERSION_CODE = 35200
+    const val VERSION_CODE = 35300
     const val TARGET_SDK = 34
     const val MIN_SDK = 26
     const val APP_ID = "com.zaneschepke.wireguardautotunnel"

fastlane/metadata/android/de-DE/changelogs/34700.txt

@@ -0,0 +1,6 @@
+Was ist Neu:
+- Abstürze behoben
+- Leistung der Kacheln verbessert
+- Reaktivieren von PIN-Sperren
+- "Beim Hochfahren starten" zur Einstellung gemacht
+- verschiedene Leistungsanpassungen und Bugs behoben

fastlane/metadata/android/de-DE/changelogs/34800.txt

@@ -0,0 +1,5 @@
+Was ist neu:
+- Verbesserungen der Tunnelsteuerung in der AndroidTV Benutzeroberfläche
+- Fehler beim Sperren im Portrait-Modus behoben
+- Fehler welcher eine Umgehung der PIN-Sperre ermöglichte behoben
+- Fehler in der Auot-Tunnel Kachel behoben

fastlane/metadata/android/de-DE/changelogs/35000.txt

@@ -0,0 +1,6 @@
+Was ist neu?
+- Verbesserte Zuverlässigkeit des automatischen Tunnels
+- Unterstützung für hell/dunkel/dynamisches Theming hinzugefügt
+- Unterstützung für Pre-/Post-Up-/Down-Skripte hinzugefügt
+- Entfernen der Benachrichtigung über das Fortbestehen des Tunnels
+- Verschiedene andere Korrekturen und Verbesserungen

fastlane/metadata/android/de-DE/changelogs/35100.txt

@@ -0,0 +1,5 @@
+Was ist neu?
+- Behebung von Problemen beim Starten von Tunneln im Hintergrund
+- Unterstützung für den Neustart von Diensten nach dem Update hinzugefügt
+- Verbesserungen der UI-Animationsgeschwindigkeit
+- Andere Optimierungen

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

@@ -1,5 +1,6 @@
 What's new:
 - Added wildcard support for wifi names
+- Live edit of tunnel/auto-tunnel settings while active
 - Fix slowness on mobile data
 - Various bug fixes and improvements
 - UI optimizations

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

@@ -0,0 +1,6 @@
+What's new:
+- Rooted devices now get wifi name without location
+- Logs screen scroll and sharing improvements
+- Tunnel import bug fixes for AndroidTV 14
+- Tunnel statistics UI enhancements
+- Other bug fixes and improvements

fastlane/metadata/android/es-ES/changelogs/32400.txt

@@ -1,2 +1,5 @@
 Mejoras:
 - Añadida compatiblidad básica de Kernel WireGuard
+- Flujo de divulgación de ubicación mejorada
+- Corregido el fallo ede los persmisos del túnel automático
+- Correcciones y mejoras varias

fastlane/metadata/android/es-ES/changelogs/34200.txt

@@ -0,0 +1,5 @@
+Novedades:
+- Corrección de la regresión del túnel de parada
+- Añadir ofuscación de registros
+- Añadir ocultar FAB en scroll
+- Añadir localización turca

fastlane/metadata/android/es-ES/changelogs/34202.txt

@@ -0,0 +1,3 @@
+Novedades:
+- Agregue Amnezia junto con WireGuard
+- Se corrigió el error de los accesos directos de la aplicación

fastlane/metadata/android/es-ES/changelogs/34300.txt

@@ -0,0 +1,6 @@
+Novedades:
+- Soporte oficial para AmneziaWG
+- Importación/exportación de configuraciones de Amnezia
+- El túnel automático se activará solo una vez por cambio de red
+- Soporte para idiomas adicionales
+- Otras correcciones de errores y mejoras

fastlane/metadata/android/es-ES/changelogs/34400.txt

@@ -0,0 +1,5 @@
+Novedades:
+- Mejorar la denominación de las importaciones de túneles
+- Se solucionó el error del estado inicial de tunelización automática
+- Manejo de errores mejorado
+- Se solucionó el error de importación del zip de Amnezia

fastlane/metadata/android/es-ES/changelogs/34500.txt

@@ -0,0 +1,5 @@
+Novedades:
+- Soporte de idiomas adicionales
+- Corrección de errores en la tunelización automática de datos móviles
+- Corrección del botón de acción flotante de AndroidTV
+- Otras optimizaciones y mejoras

fastlane/metadata/android/es-ES/changelogs/34600.txt

@@ -0,0 +1,4 @@
+Novedades:
+- Se corrigieron problemas con la operación del túnel automático.
+- Se solucionó el problema con la copia de seguridad de Android.
+- Mayor número de versiones

fastlane/metadata/android/es-ES/changelogs/34700.txt

@@ -0,0 +1,6 @@
+Novedades:
+- Solucionar problemas de bloqueo
+- Mejorar el rendimiento de los mosaicos
+- Volver a habilitar el bloqueo del PIN
+- Hacer que reiniciar al arrancar sea una configuración
+- Varias correcciones de errores y rendimiento

fastlane/metadata/android/es-ES/changelogs/34800.txt

@@ -0,0 +1,5 @@
+Novedades:
+- Correcciones para el control del túnel de la interfaz de usuario de AndroidTV
+- Corrige el error de bloqueo de retrato.
+- Corrige el error de omisión del bloqueo del PIN
+- Corrige el error de mosaico de túnel automático

fastlane/metadata/android/es-ES/changelogs/35000.txt

@@ -0,0 +1,6 @@
+Lo nuevo:
+- Fiabilidad del túnel automático mejorada
+- Compatible con tema claro/oscuro/dinámico
+- Compatible con scripts pre/post up/down
+- Notificación persistente del túnel quitada
+- Correcciones y mejoras varias

fastlane/metadata/android/es-ES/changelogs/35100.txt

@@ -0,0 +1,5 @@
+Lo nuevo:
+- Inicio de túneles en segundo plano corregido
+- Podibilidad de reiniciar los servicios tras una actualización
+- Mojorada la velocidad de las animaciones del UI
+- Otras mejoras

fastlane/metadata/android/es-ES/full_description.txt

@@ -1,6 +1,6 @@
 Características
 
-- Añade túneles a través de un archivo .conf, zip, entrada manual o código QR
+- Añade túneles mediante archivo .conf, zip, entrada manual o código QR
 - Conexión automática a VPN basada en Wi-Fi SSID, ethernet o datos móviles
 - Túneles divididos por aplicación con búsqueda
 - Soporte de WireGuard para los modos kernel y espacio de usuario
@@ -11,4 +11,4 @@ Características
 - Soporte de accesos directos estáticos para el túnel principal para la integración de automatización.
 - Soporte de automatización de intenciones para todos los túneles
 - Reinicio automático del servicio tras reiniciar
-- Medidas de conservación de la batería
+- Medidas de ahorro de la batería

fastlane/metadata/android/nl-NL/short_description.txt

@@ -0,0 +1 @@
+Een alternatieve VPN client app voor Wireguard met extra functies

fastlane/metadata/android/nl-NL/title.txt

@@ -0,0 +1 @@
+WG Tunnel

fastlane/metadata/android/pl-PL/changelogs/32100.txt

@@ -0,0 +1,3 @@
+Usprawnienia:
+- naprawiono błąd uprawnień na Android 9
+- Inne optymalizacje

fastlane/metadata/android/ru-RU/changelogs/34700.txt

@@ -0,0 +1,6 @@
+Что нового:
+- Исправлены проблемы со сбоями
+- Улучшена производительность плиток
+- Возвращена блокировка PIN-кодом
+- Добавлена функция перезапуска при загрузке
+- Различные исправления производительности и ошибок

fastlane/metadata/android/ru-RU/changelogs/34800.txt

@@ -0,0 +1,5 @@
+Что нового:
+- Исправления интерфейса управления туннелем на AndroidTV
+- Исправление ошибки блокировки в портретной ориентации
+- Исправлена ошибка обхода блокировки PIN-кодом
+- Исправлена ошибка с плиткой авто-туннеля

fastlane/metadata/android/ru-RU/changelogs/35000.txt

@@ -0,0 +1,6 @@
+Что нового:
+- Повышена надежность авто-туннелирования
+- Добавлена поддержка светлых/темных/динамических тем
+- Добавлена поддержка сценариев до/после запуска/остановки интерфейса
+- Удалено постоянное уведомление о туннеле
+- Различные другие исправления и улучшения

fastlane/metadata/android/ru-RU/changelogs/35100.txt

@@ -0,0 +1,5 @@
+Что нового:
+- Исправлены ошибки, из-за которых туннели не запускались в фоновом режиме
+- Добавлена поддержка перезапуска служб после обновления
+- Улучшена скорость анимации интерфейса
+- Другие оптимизации

fastlane/metadata/android/ru-RU/full_description.txt

@@ -1,6 +1,6 @@
 Возможности
 
-- Добавление туннелей через файлы .conf, .zip, вводом вручную, или через QR-код
+- Добавление туннелей через файлы .conf, .zip, вводом вручную или через QR-код
 - Автоматическое подключение к VPN основываясь на имени сети Wi-Fi, подключению по Ethernet или мобильных данных
 - Разделение туннелирования по приложениям с поиском
 - Поддержка WireGuard в режимах ядра и пользовательского пространства

fastlane/metadata/android/zh-CN/changelogs/32100.txt

@@ -0,0 +1,3 @@
+增强：
+- 修复 < Android 9 权限问题
+- 其他优化

fastlane/metadata/android/zh-CN/changelogs/32200.txt

@@ -0,0 +1,5 @@
+增强：
+- 在主屏幕上添加隧道统计信息
+- 改进设置屏幕的 Android TV 导航
+- 移除通知振动
+- 修复各种其他错误

fastlane/metadata/android/zh-CN/changelogs/32300.txt

@@ -0,0 +1,5 @@
+增强：
+- 添加仅移动数据开启自动隧道
+- 改进支持屏幕的用户界面
+- 更新资源链接
+- 修复各种其他错误

fastlane/metadata/android/zh-CN/changelogs/32400.txt

@@ -0,0 +1,5 @@
+增强：
+- 添加基础的 WireGuard 内核支持
+- 改进位置共享流程
+- 修复自动隧道权限的错误
+- 修复各种其他 UI 错误

fastlane/metadata/android/zh-CN/changelogs/32500.txt

@@ -0,0 +1,2 @@
+修复：
+- Android 14 前台权限异常

fastlane/metadata/android/zh-CN/changelogs/33000.txt

@@ -0,0 +1,7 @@
+增强：
+- 重构状态管理
+- 改进 Android TV 导航
+- 提高自动隧道效率
+- 优化导航体验
+- 添加自动隧道暂停功能
+- 修复多项错误

fastlane/metadata/android/zh-CN/changelogs/33100.txt

@@ -0,0 +1,7 @@
+增强：
+- 重构状态管理
+- 改进 Android TV 导航
+- 提高自动隧道效率
+- 优化整体导航体验
+- 增加自动隧道暂停功能
+- 修复多项错误

fastlane/metadata/android/zh-CN/changelogs/33200.txt

@@ -0,0 +1,7 @@
+增强：
+- 重构状态管理
+- 改进 Android TV 导航
+- 提高自动隧道效率
+- 优化整体导航体验
+- 增加自动隧道暂停功能
+- 修复多项错误

fastlane/metadata/android/zh-CN/changelogs/33300.txt

@@ -0,0 +1,7 @@
+增强：
+- 增加删除隧道确认提示
+- 添加电池后台权限设置
+修复：
+- 修复隧道禁用冻结的问题
+- 修复 Email 字段的错误
+- 修复配置编辑时 DNS 为空的问题

fastlane/metadata/android/zh-CN/changelogs/33400.txt

@@ -0,0 +1,3 @@
+增强：
+- 修复创建配置文件后未保存异常
+- 升级版本

fastlane/metadata/android/zh-CN/changelogs/33401.txt

@@ -0,0 +1,2 @@
+更新：
+- 这是一个 CI 测试版本