mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-02-16 20:09:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

BIT-1671: Fix transition jank (#984)

Browse source
This commit is contained in:
David Perez 2024-02-08 10:50:37 -06:00 • committed by Álison Fernandes
parent 673972c0be
commit ec0df1d2a1
3 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/resetpassword/ResetPasswordNavigation.kt
View file

@ -3,7 +3,7 @@ package com.x8bit.bitwarden.ui.auth.feature.resetpassword
import androidx.navigation.NavController
import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavOptions
import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions
import androidx.navigation.compose.composable
const val RESET_PASSWORD_ROUTE: String = "reset_password"
@ -11,7 +11,7 @@ const val RESET_PASSWORD_ROUTE: String = "reset_password"
* Add the Reset Password screen to the nav graph.
*/
fun NavGraphBuilder.resetPasswordDestination() {
composableWithSlideTransitions(
composable(
route = RESET_PASSWORD_ROUTE,
) {
ResetPasswordScreen()

4
app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockNavigation.kt
View file

@ -3,7 +3,7 @@ package com.x8bit.bitwarden.ui.auth.feature.vaultunlock
import androidx.navigation.NavController
import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavOptions
import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions
import androidx.navigation.compose.composable
const val VAULT_UNLOCK_ROUTE: String = "vault_unlock"
@ -20,7 +20,7 @@ fun NavController.navigateToVaultUnlock(
* Add the Vault Unlock screen to the nav graph.
*/
fun NavGraphBuilder.vaultUnlockDestination() {
composableWithSlideTransitions(
composable(
route = VAULT_UNLOCK_ROUTE,
) {
VaultUnlockScreen()

38
app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavScreen.kt
View file

@ -1,11 +1,13 @@
package com.x8bit.bitwarden.ui.platform.feature.rootnav
import androidx.compose.animation.AnimatedContentTransitionScope
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavBackStackEntry
import androidx.navigation.NavDestination
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
@ -70,10 +72,10 @@ fun RootNavScreen(
NavHost(
navController = navController,
startDestination = SPLASH_ROUTE,
enterTransition = { this.targetState.destination.route.toEnterTransition()(this) },
exitTransition = { this.targetState.destination.route.toExitTransition()(this) },
popEnterTransition = { this.targetState.destination.route.toEnterTransition()(this) },
popExitTransition = { this.targetState.destination.route.toExitTransition()(this) },
enterTransition = { toEnterTransition()(this) },
exitTransition = { toExitTransition()(this) },
popEnterTransition = { toEnterTransition()(this) },
popExitTransition = { toExitTransition()(this) },
) {
splashDestination()
authGraph(navController)
@ -177,15 +179,27 @@ private fun NavDestination?.rootLevelRoute(): String? {
/**
* Define the enter transition for each route.
*/
private fun String?.toEnterTransition(): NonNullEnterTransitionProvider = when (this) {
RESET_PASSWORD_ROUTE -> RootTransitionProviders.Enter.slideUp
else -> RootTransitionProviders.Enter.fadeIn
}
@Suppress("MaxLineLength")
private fun AnimatedContentTransitionScope<NavBackStackEntry>.toEnterTransition(): NonNullEnterTransitionProvider =
when (targetState.destination.rootLevelRoute()) {
RESET_PASSWORD_ROUTE -> RootTransitionProviders.Enter.slideUp
else -> when (initialState.destination.rootLevelRoute()) {
// The RESET_PASSWORD_ROUTE animation should be stay but due to an issue when combining
// certain animations, we are just using a fadeIn instead.
RESET_PASSWORD_ROUTE -> RootTransitionProviders.Enter.fadeIn
else -> RootTransitionProviders.Enter.fadeIn
}
}
/**
* Define the exit transition for each route.
*/
private fun String?.toExitTransition(): NonNullExitTransitionProvider = when (this) {
RESET_PASSWORD_ROUTE -> RootTransitionProviders.Exit.slideDown
else -> RootTransitionProviders.Exit.fadeOut
}
@Suppress("MaxLineLength")
private fun AnimatedContentTransitionScope<NavBackStackEntry>.toExitTransition(): NonNullExitTransitionProvider =
when (initialState.destination.rootLevelRoute()) {
RESET_PASSWORD_ROUTE -> RootTransitionProviders.Exit.slideDown
else -> when (targetState.destination.rootLevelRoute()) {
RESET_PASSWORD_ROUTE -> RootTransitionProviders.Exit.stay
else -> RootTransitionProviders.Exit.fadeOut
}
}