fix: improve navigation animation speed

Fixes possible crashes on slow androidTVs

Closes #49

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

@@ -56,9 +56,18 @@ constructor(
 		return runCatching {
 			when (val backend = backend()) {
 				is Backend -> backend.setState(this, tunnelState.toWgState(), TunnelConfig.configFromWgQuick(tunnelConfig.wgQuick)).let { TunnelState.from(it) }
-				is org.amnezia.awg.backend.Backend -> backend.setState(this, tunnelState.toAmState(), TunnelConfig.configFromAmQuick(tunnelConfig.amQuick)).let {
+				is org.amnezia.awg.backend.Backend -> {
+					val config = if (tunnelConfig.amQuick.isBlank()) {
+						TunnelConfig.configFromAmQuick(
+							tunnelConfig.wgQuick,
+						)
+					} else {
+						TunnelConfig.configFromAmQuick(tunnelConfig.amQuick)
+					}
+					backend.setState(this, tunnelState.toAmState(), config).let {
 						TunnelState.from(it)
 					}
+				}
 				else -> throw NotImplementedError()
 			}
 		}.onFailure {

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

@@ -5,6 +5,9 @@ import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 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.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -15,6 +18,7 @@ import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult
+import androidx.compose.material3.Surface
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -48,6 +52,7 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
 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.StringValue
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
@@ -127,7 +132,7 @@ class MainActivity : AppCompatActivity() {
 							)
 						}
 					},
-					// TODO refactor
+					containerColor = MaterialTheme.colorScheme.background,
 					modifier =
 					Modifier
 						.focusable()
@@ -148,13 +153,12 @@ class MainActivity : AppCompatActivity() {
 						)
 					},
 				) { 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) Screen.Lock.route else Screen.Main.route),
-						modifier =
-						Modifier
-							.padding(padding)
-							.fillMaxSize(),
 						) {
 							composable(
 								Screen.Main.route,
@@ -236,4 +240,5 @@ class MainActivity : AppCompatActivity() {
 				}
 			}
 		}
+	}
 }

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

@@ -10,37 +10,29 @@ 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.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.navigation.NavController
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.compose.currentBackStackEntryAsState
-import com.zaneschepke.wireguardautotunnel.ui.Screen
 
 @Composable
 fun BottomNavBar(navController: NavController, bottomNavItems: List<BottomNavItem>) {
-	val backStackEntry = navController.currentBackStackEntryAsState()
-
 	var showBottomBar by rememberSaveable { mutableStateOf(true) }
 	val navBackStackEntry by navController.currentBackStackEntryAsState()
 
-	// TODO find a better way to hide nav bar
+	showBottomBar = bottomNavItems.firstOrNull { navBackStackEntry?.destination?.route?.contains(it.route) == true } != null
-	showBottomBar =
-		when (navBackStackEntry?.destination?.route) {
-			Screen.Lock.route -> false
-			else -> true
-		}
 
+	if(showBottomBar) {
 		NavigationBar(
-		containerColor = if (!showBottomBar) Color.Transparent else MaterialTheme.colorScheme.background,
+			containerColor = MaterialTheme.colorScheme.surface,
 		) {
-		if (showBottomBar) {
 			bottomNavItems.forEach { item ->
-				val selected = item.route == backStackEntry.value?.destination?.route
+				val selected = navBackStackEntry?.destination?.route?.contains(item.route) == true
 
 				NavigationBarItem(
 					selected = selected,
 					onClick = {
+						if(navBackStackEntry?.destination?.route == item.route) return@NavigationBarItem
 						navController.navigate(item.route) {
 							// Pop up to the start destination of the graph to
 							// avoid building up a large stack of destinations

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

@@ -110,7 +110,12 @@ fun ConfigScreen(
 	LaunchedEffect(uiState.loading) {
 		if (!uiState.loading && context.isRunningOnTv()) {
 			delay(Constants.FOCUS_REQUEST_DELAY)
+			kotlin.runCatching {
 				focusRequester.requestFocus()
+			}.onFailure {
+				delay(Constants.FOCUS_REQUEST_DELAY)
+				focusRequester.requestFocus()
+			}
 		}
 	}
 

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

@@ -296,7 +296,7 @@ constructor(
 			val wgQuick = buildConfig().toWgQuickString(true)
 			val amQuick =
 				if (configType == ConfigType.AMNEZIA) {
-					buildAmConfig().toAwgQuickString()
+					buildAmConfig().toAwgQuickString(true)
 				} else {
 					TunnelConfig.AM_QUICK_DEFAULT
 				}

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

@@ -4,9 +4,6 @@ import android.annotation.SuppressLint
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity.RESULT_OK
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.focusable
 import androidx.compose.foundation.gestures.ScrollableDefaults
@@ -147,7 +144,12 @@ fun MainScreen(
 	LaunchedEffect(Unit) {
 		if (context.isRunningOnTv()) {
 			delay(Constants.FOCUS_REQUEST_DELAY)
+			kotlin.runCatching {
 				focusRequester.requestFocus()
+			}.onFailure {
+				delay(Constants.FOCUS_REQUEST_DELAY)
+				focusRequester.requestFocus()
+			}
 		}
 	}
 
@@ -265,12 +267,8 @@ fun MainScreen(
 			reverseLayout = false,
 			flingBehavior = ScrollableDefaults.flingBehavior(),
 		) {
+			if (uiState.tunnels.isEmpty()) {
 				item {
-				AnimatedVisibility(
-					uiState.tunnels.isEmpty(),
-					exit = fadeOut(),
-					enter = fadeIn(),
-				) {
 					GettingStartedLabel(onClick = { context.openWebUrl(it) })
 				}
 			}

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

@@ -179,7 +179,7 @@ constructor(
 				when (type) {
 					ConfigType.AMNEZIA -> {
 						val config = org.amnezia.awg.config.Config.parse(it)
-						amQuick = config.toAwgQuickString()
+						amQuick = config.toAwgQuickString(true)
 						config.toWgQuickString()
 					}
 
@@ -252,7 +252,7 @@ constructor(
 												org.amnezia.awg.config.Config.parse(
 													zip,
 												)
-											amQuick = config.toAwgQuickString()
+											amQuick = config.toAwgQuickString(true)
 											config.toWgQuickString()
 										}
 

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

@@ -88,7 +88,12 @@ fun OptionsScreen(
 		optionsViewModel.init(tunnelId)
 		if (context.isRunningOnTv()) {
 			delay(Constants.FOCUS_REQUEST_DELAY)
+			kotlin.runCatching {
 				focusRequester.requestFocus()
+			}.onFailure {
+				delay(Constants.FOCUS_REQUEST_DELAY)
+				focusRequester.requestFocus()
+			}
 		}
 	}
 

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

@@ -269,7 +269,7 @@ fun SettingsScreen(
 	if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
 		checkFineLocationGranted()
 	}
-	if(!uiState.isLocationDisclosureShown) {
+	if (!uiState.isLocationDisclosureShown) {
 		BackgroundLocationDisclosure(
 			onDismiss = { viewModel.setLocationDisclosureShown() },
 			onAttest = {
@@ -282,7 +282,6 @@ fun SettingsScreen(
 		return
 	}
 
-
 	BackgroundLocationDialog(
 		showLocationDialog,
 		onDismiss = { showLocationDialog = false },
@@ -630,7 +629,7 @@ fun SettingsScreen(
 				Modifier
 					.fillMaxWidth(fillMaxWidth)
 					.padding(vertical = 10.dp)
-					.padding(bottom = 140.dp),
+					.padding(bottom = 10.dp),
 			) {
 				Column(
 					horizontalAlignment = Alignment.Start,

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

@@ -28,12 +28,7 @@ import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 
 @Composable
-fun BackgroundLocationDisclosure(
+fun BackgroundLocationDisclosure(onDismiss: () -> Unit, onAttest: () -> Unit, scrollState: ScrollState, focusRequester: FocusRequester) {
-	onDismiss: () -> Unit,
-	onAttest: () -> Unit,
-	scrollState: ScrollState,
-	focusRequester: FocusRequester,
-) {
 	val context = LocalContext.current
 	Column(
 		horizontalAlignment = Alignment.CenterHorizontally,

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

@@ -20,9 +20,10 @@ private val DarkColorScheme =
 	darkColorScheme(
 		// primary = Purple80,
 		primary = virdigris,
-		secondary = virdigris,
+		secondary = PurpleGrey40,
 		// secondary = PurpleGrey80,
-		tertiary = virdigris,
+		tertiary = Pink40,
+		surfaceTint = Pink80,
 		// tertiary = Pink80
 	)
 
@@ -31,6 +32,7 @@ private val LightColorScheme =
 		primary = Purple40,
 		secondary = PurpleGrey40,
 		tertiary = Pink40,
+		surfaceTint = Pink80,
         /* Other default colors to override
         background = Color(0xFFFFFBFE),
         surface = Color(0xFFFFFBFE),

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

@@ -24,6 +24,8 @@ object Constants {
 	const val SUBSCRIPTION_TIMEOUT = 5_000L
 	const val FOCUS_REQUEST_DELAY = 500L
 
+	const val TRANSITION_ANIMATION_TIME = 200
+
 	const val DEFAULT_PING_IP = "1.1.1.1"
 	const val PING_TIMEOUT = 5_000L
 	const val VPN_RESTART_DELAY = 1_000L

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

@@ -29,7 +29,7 @@ fun TunnelStatistics.PeerStats.handshakeStatus(): HandshakeStatus {
 }
 
 fun Config.toWgQuickString(): String {
-	val amQuick = toAwgQuickString()
+	val amQuick = toAwgQuickString(true)
 	val lines = amQuick.lines().toMutableList()
 	val linesIterator = lines.iterator()
 	while (linesIterator.hasNext()) {

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 accompanist = "0.34.0"
 activityCompose = "1.9.1"
-amneziawgAndroid = "1.2.1"
+amneziawgAndroid = "1.2.2"
 androidx-junit = "1.2.1"
 appcompat = "1.7.0"
 biometricKtx = "1.2.0-alpha05"
@@ -16,13 +16,13 @@ junit = "4.13.2"
 kotlinx-serialization-json = "1.7.1"
 lifecycle-runtime-compose = "2.8.4"
 material3 = "1.2.1"
-multifabVersion = "1.1.0"
+multifabVersion = "1.1.1"
 navigationCompose = "2.7.7"
 pinLockCompose = "1.0.3"
 roomVersion = "2.6.1"
 timber = "5.0.1"
 tunnel = "1.2.1"
-androidGradlePlugin = "8.7.0-alpha07"
+androidGradlePlugin = "8.6.0-rc01"
 kotlin = "2.0.10"
 ksp = "2.0.10-1.0.24"
 composeBom = "2024.06.00"