diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/account/AccountNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/account/AccountNav.kt index d820d67c52..0353789f42 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/account/AccountNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/account/AccountNav.kt @@ -1,5 +1,8 @@ package com.babylon.wallet.android.presentation.account +import androidx.compose.animation.AnimatedContentTransitionScope +import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.SavedStateHandle import androidx.navigation.NavController @@ -45,7 +48,19 @@ fun NavGraphBuilder.account( navArgument(ARG_ACCOUNT_ADDRESS) { type = NavType.StringType } - ) + ), + enterTransition = { + slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Left) + }, + exitTransition = { + ExitTransition.None + }, + popEnterTransition = { + EnterTransition.None + }, + popExitTransition = { + slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) + } ) { AccountScreen( viewModel = hiltViewModel(), diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/account/createaccount/CreateAccountNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/account/createaccount/CreateAccountNav.kt index c58c8b6886..f310c6a50d 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/account/createaccount/CreateAccountNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/account/createaccount/CreateAccountNav.kt @@ -4,6 +4,8 @@ import android.os.Build import android.os.Bundle import androidx.annotation.VisibleForTesting import androidx.compose.animation.AnimatedContentTransitionScope +import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition import androidx.core.os.BundleCompat import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.SavedStateHandle @@ -108,7 +110,13 @@ fun NavGraphBuilder.createAccountScreen( } }, exitTransition = { - if (requiresHorizontalTransition(targetState.arguments)) { + ExitTransition.None + }, + popEnterTransition = { + EnterTransition.None + }, + popExitTransition = { + if (requiresHorizontalTransition(initialState.arguments)) { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) } else { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/account/history/HistoryNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/account/history/HistoryNav.kt index 9c71e6c457..5e51fa8c25 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/account/history/HistoryNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/account/history/HistoryNav.kt @@ -1,6 +1,8 @@ package com.babylon.wallet.android.presentation.account.history import androidx.compose.animation.AnimatedContentTransitionScope +import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.SavedStateHandle import androidx.navigation.NavController @@ -41,13 +43,13 @@ fun NavGraphBuilder.history( slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) }, exitTransition = { - null + ExitTransition.None }, popExitTransition = { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) }, popEnterTransition = { - null + EnterTransition.None } ) { HistoryScreen( diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/account/settings/AccountSettingsNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/account/settings/AccountSettingsNav.kt index a6123d830c..df77b26587 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/account/settings/AccountSettingsNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/account/settings/AccountSettingsNav.kt @@ -3,6 +3,7 @@ package com.babylon.wallet.android.presentation.account.settings import androidx.annotation.VisibleForTesting import androidx.compose.animation.AnimatedContentTransitionScope import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.SavedStateHandle import androidx.navigation.NavController @@ -44,16 +45,16 @@ fun NavGraphBuilder.accountSettings( navArgument(ARG_ACCOUNT_SETTINGS_ADDRESS) { type = NavType.StringType } ), enterTransition = { - slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) + slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Left) }, exitTransition = { - null - }, - popExitTransition = { - slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) + ExitTransition.None }, popEnterTransition = { EnterTransition.None + }, + popExitTransition = { + slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) } ) { AccountSettingsScreen( diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/account/settings/devsettings/DevSettingsNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/account/settings/devsettings/DevSettingsNav.kt index 9ef33c048e..ec7b9125ec 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/account/settings/devsettings/DevSettingsNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/account/settings/devsettings/DevSettingsNav.kt @@ -2,6 +2,7 @@ package com.babylon.wallet.android.presentation.account.settings.devsettings import androidx.annotation.VisibleForTesting import androidx.compose.animation.AnimatedContentTransitionScope +import androidx.compose.animation.EnterTransition import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.SavedStateHandle import androidx.navigation.NavController @@ -42,11 +43,11 @@ fun NavGraphBuilder.devSettings( exitTransition = { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) }, - popExitTransition = { - slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Left) - }, popEnterTransition = { - slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Right) + EnterTransition.None + }, + popExitTransition = { + slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) } ) { DevSettingsScreen( diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/main/MainScreenNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/main/MainScreenNav.kt index 31332e6372..51258170cf 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/main/MainScreenNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/main/MainScreenNav.kt @@ -1,5 +1,7 @@ package com.babylon.wallet.android.presentation.main +import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable import com.radixdlt.sargon.Account @@ -21,7 +23,13 @@ fun NavGraphBuilder.main( onNavigateToConnectCloudBackup: () -> Unit, onNavigateToLinkConnector: () -> Unit, ) { - composable(route = MAIN_ROUTE) { + composable( + route = MAIN_ROUTE, + enterTransition = { EnterTransition.None }, + exitTransition = { ExitTransition.None }, + popEnterTransition = { EnterTransition.None }, + popExitTransition = { ExitTransition.None } + ) { MainScreen( mainUiState = mainUiState, onMenuClick = onMenuClick, diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/cloudbackup/ConnectCloudBackupNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/cloudbackup/ConnectCloudBackupNav.kt index 8a589f476e..47fd7f769f 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/cloudbackup/ConnectCloudBackupNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/cloudbackup/ConnectCloudBackupNav.kt @@ -1,6 +1,9 @@ package com.babylon.wallet.android.presentation.onboarding.cloudbackup +import android.os.Bundle import androidx.compose.animation.AnimatedContentTransitionScope +import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.SavedStateHandle import androidx.navigation.NavController @@ -43,10 +46,24 @@ fun NavGraphBuilder.connectCloudBackupScreen( } ), enterTransition = { - slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) + if (requiresHorizontalTransition(targetState.arguments)) { + slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Left) + } else { + slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) + } + }, + popEnterTransition = { + EnterTransition.None }, exitTransition = { - slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) + ExitTransition.None + }, + popExitTransition = { + if (requiresHorizontalTransition(initialState.arguments)) { + slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) + } else { + slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) + } } ) { ConnectCloudBackupScreen( @@ -56,3 +73,9 @@ fun NavGraphBuilder.connectCloudBackupScreen( ) } } + +private fun requiresHorizontalTransition(arguments: Bundle?): Boolean { + arguments ?: return false + val connectMode = arguments.getString(ARG_CONNECT_MODE)?.let { ConnectCloudBackupViewModel.ConnectMode.valueOf(it) } + return connectMode == ConnectCloudBackupViewModel.ConnectMode.RestoreWallet +} diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/eula/EulaNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/eula/EulaNav.kt index f460006a02..594916a7e3 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/eula/EulaNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/eula/EulaNav.kt @@ -1,5 +1,8 @@ package com.babylon.wallet.android.presentation.onboarding.eula +import androidx.compose.animation.AnimatedContentTransitionScope +import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder @@ -16,7 +19,11 @@ fun NavGraphBuilder.eulaScreen( onAccepted: (isWithCloudBackupEnabled: Boolean) -> Unit ) { composable( - route = ROUTE_EULA_SCREEN + route = ROUTE_EULA_SCREEN, + enterTransition = { slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) }, + exitTransition = { ExitTransition.None }, + popEnterTransition = { EnterTransition.None }, + popExitTransition = { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) } ) { EulaScreen( viewModel = hiltViewModel(), diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/restore/backup/RestoreFromBackupNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/restore/backup/RestoreFromBackupNav.kt index 08c4ab8576..5d48a33d38 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/restore/backup/RestoreFromBackupNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/restore/backup/RestoreFromBackupNav.kt @@ -2,6 +2,7 @@ package com.babylon.wallet.android.presentation.onboarding.restore.backup import androidx.compose.animation.AnimatedContentTransitionScope import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder @@ -22,13 +23,13 @@ fun NavGraphBuilder.restoreFromBackupScreen( composable( route = ROUTE_RESTORE_FROM_BACKUP, enterTransition = { - slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) + slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Left) }, exitTransition = { - null + ExitTransition.None }, popExitTransition = { - slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) + slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) }, popEnterTransition = { EnterTransition.None diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/restore/withoutbackup/RestoreWithoutBackupNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/restore/withoutbackup/RestoreWithoutBackupNav.kt index c37000b00b..2d78dae334 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/restore/withoutbackup/RestoreWithoutBackupNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/onboarding/restore/withoutbackup/RestoreWithoutBackupNav.kt @@ -1,6 +1,8 @@ package com.babylon.wallet.android.presentation.onboarding.restore.withoutbackup import androidx.compose.animation.AnimatedContentTransitionScope +import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder @@ -20,10 +22,16 @@ fun NavGraphBuilder.restoreWithoutBackupScreen( composable( route = ROUTE_RESTORE_WITHOUT_BACKUP, enterTransition = { - slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) + slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Left) }, exitTransition = { - slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) + ExitTransition.None + }, + popEnterTransition = { + EnterTransition.None + }, + popExitTransition = { + slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) } ) { RestoreWithoutBackupScreen( diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/settings/SettingsNavGraph.kt b/app/src/main/java/com/babylon/wallet/android/presentation/settings/SettingsNavGraph.kt index 89b31f13dc..5ecaaefab4 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/settings/SettingsNavGraph.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/settings/SettingsNavGraph.kt @@ -1,5 +1,8 @@ package com.babylon.wallet.android.presentation.settings +import androidx.compose.animation.AnimatedContentTransitionScope +import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder @@ -67,7 +70,19 @@ fun NavGraphBuilder.settingsNavGraph( private fun NavGraphBuilder.settingsAll(navController: NavController) { composable( - route = Screen.SettingsAllDestination.route + route = Screen.SettingsAllDestination.route, + enterTransition = { + slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Left) + }, + exitTransition = { + ExitTransition.None + }, + popEnterTransition = { + EnterTransition.None + }, + popExitTransition = { + slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) + } ) { SettingsScreen( viewModel = hiltViewModel(), diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/createpersona/CreatePersonaNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/createpersona/CreatePersonaNav.kt index 855b855012..61dc54fac8 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/createpersona/CreatePersonaNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/createpersona/CreatePersonaNav.kt @@ -2,6 +2,7 @@ package com.babylon.wallet.android.presentation.settings.personas.createpersona import androidx.compose.animation.AnimatedContentTransitionScope import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder @@ -50,13 +51,13 @@ fun NavGraphBuilder.personaInfoScreen( slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Left) }, exitTransition = { - null - }, - popExitTransition = { - slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) + ExitTransition.None }, popEnterTransition = { EnterTransition.None + }, + popExitTransition = { + slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) } ) { CreatePersonaInfoScreen( @@ -78,13 +79,13 @@ fun NavGraphBuilder.createPersonaScreen( slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Left) }, exitTransition = { - null - }, - popExitTransition = { - slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) + ExitTransition.None }, popEnterTransition = { EnterTransition.None + }, + popExitTransition = { + slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) } ) { CreatePersonaScreen( @@ -108,7 +109,7 @@ fun NavGraphBuilder.personasScreen( }, exitTransition = { when (targetState.destination.route) { - ROUTE_PERSONAS, ROUTE_PERSONA_DETAIL, ROUTE_CREATE_PERSONA, ROUTE_PERSONA_INFO -> null + ROUTE_PERSONAS, ROUTE_PERSONA_DETAIL, ROUTE_CREATE_PERSONA, ROUTE_PERSONA_INFO -> ExitTransition.None else -> slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) } }, diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/createpersona/CreatePersonaScreen.kt b/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/createpersona/CreatePersonaScreen.kt index 3c422d6f5e..68a237bc2c 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/createpersona/CreatePersonaScreen.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/createpersona/CreatePersonaScreen.kt @@ -33,6 +33,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -274,7 +275,11 @@ private fun CreatePersonaContentList( } else { null }, - keyboardOptions = KeyboardOptions(capitalization = KeyboardCapitalization.Sentences) + keyboardOptions = KeyboardOptions( + capitalization = KeyboardCapitalization.Words, + imeAction = ImeAction.Done + ), + singleLine = true, ) Spacer(modifier = Modifier.height(dimensions.paddingMedium)) Text( diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/personadetail/PersonaDetailNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/personadetail/PersonaDetailNav.kt index c814cd57cf..f0eac1d90e 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/personadetail/PersonaDetailNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/personadetail/PersonaDetailNav.kt @@ -2,7 +2,6 @@ package com.babylon.wallet.android.presentation.settings.personas.personadetail import androidx.annotation.VisibleForTesting import androidx.compose.animation.AnimatedContentTransitionScope -import androidx.compose.animation.EnterTransition import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.SavedStateHandle import androidx.navigation.NavController @@ -52,7 +51,7 @@ fun NavGraphBuilder.personaDetailScreen( slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) }, popEnterTransition = { - EnterTransition.None + null }, arguments = listOf( navArgument(ARG_PERSONA_ADDRESS) { diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/personaedit/PersonaEditNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/personaedit/PersonaEditNav.kt index da5f4e48f9..6923bb05f7 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/personaedit/PersonaEditNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/personaedit/PersonaEditNav.kt @@ -4,6 +4,7 @@ import android.net.Uri import androidx.annotation.VisibleForTesting import androidx.compose.animation.AnimatedContentTransitionScope import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.SavedStateHandle import androidx.navigation.NavController @@ -52,16 +53,16 @@ fun NavGraphBuilder.personaEditScreen( composable( route = ROUTE_EDIT_PERSONA, enterTransition = { - slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Left) + slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) }, exitTransition = { when (targetState.destination.route) { - ROUTE_EDIT_PERSONA -> null - else -> slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) + ROUTE_EDIT_PERSONA -> ExitTransition.None + else -> slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) } }, popExitTransition = { - slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) + slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) }, popEnterTransition = { EnterTransition.None diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/settings/securitycenter/SecurityCenterNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/settings/securitycenter/SecurityCenterNav.kt index d12a8df119..70f768f055 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/settings/securitycenter/SecurityCenterNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/settings/securitycenter/SecurityCenterNav.kt @@ -2,6 +2,7 @@ package com.babylon.wallet.android.presentation.settings.securitycenter import androidx.compose.animation.AnimatedContentTransitionScope import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable @@ -37,7 +38,7 @@ fun NavGraphBuilder.securityCenterNavGraph( slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Left) }, exitTransition = { - null + ExitTransition.None }, popExitTransition = { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Right) diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/settings/troubleshooting/accountrecoveryscan/scan/AccountRecoveryScanNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/settings/troubleshooting/accountrecoveryscan/scan/AccountRecoveryScanNav.kt index e4e81f0c59..b5b863f179 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/settings/troubleshooting/accountrecoveryscan/scan/AccountRecoveryScanNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/settings/troubleshooting/accountrecoveryscan/scan/AccountRecoveryScanNav.kt @@ -2,6 +2,8 @@ package com.babylon.wallet.android.presentation.settings.troubleshooting.account import androidx.annotation.VisibleForTesting import androidx.compose.animation.AnimatedContentTransitionScope +import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder @@ -52,9 +54,15 @@ fun NavGraphBuilder.accountRecoveryScan( composable( route = ROUTE, enterTransition = { - slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) + slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Left) }, exitTransition = { + ExitTransition.None + }, + popEnterTransition = { + EnterTransition.None + }, + popExitTransition = { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) }, arguments = listOf( diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/transaction/TransactionReviewNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/transaction/TransactionReviewNav.kt index 5208f9b9c3..e0fe870770 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/transaction/TransactionReviewNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/transaction/TransactionReviewNav.kt @@ -1,6 +1,9 @@ package com.babylon.wallet.android.presentation.transaction import androidx.annotation.VisibleForTesting +import androidx.compose.animation.AnimatedContentTransitionScope +import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.SavedStateHandle import androidx.navigation.NavController @@ -40,7 +43,19 @@ fun NavGraphBuilder.transactionReviewScreen( route = ROUTE_TRANSACTION_REVIEW, arguments = listOf( navArgument(ARG_TRANSACTION_REQUEST_ID) { type = NavType.StringType } - ) + ), + enterTransition = { + slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) + }, + exitTransition = { + slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) + }, + popEnterTransition = { + EnterTransition.None + }, + popExitTransition = { + ExitTransition.None + } ) { TransactionReviewScreen( viewModel = hiltViewModel(), diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/transfer/TransferNav.kt b/app/src/main/java/com/babylon/wallet/android/presentation/transfer/TransferNav.kt index f5de89bc0e..cfd42a7619 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/transfer/TransferNav.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/transfer/TransferNav.kt @@ -1,5 +1,7 @@ package com.babylon.wallet.android.presentation.transfer +import androidx.compose.animation.AnimatedContentTransitionScope +import androidx.compose.animation.EnterTransition import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.SavedStateHandle import androidx.navigation.NavController @@ -37,7 +39,19 @@ fun NavGraphBuilder.transferScreen( route = ROUTE_TRANSFER, arguments = listOf( navArgument(ARG_ACCOUNT_ID) { type = NavType.StringType }, - ) + ), + enterTransition = { + slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) + }, + exitTransition = { + slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) + }, + popEnterTransition = { + EnterTransition.None + }, + popExitTransition = { + slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) + } ) { TransferScreen( viewModel = hiltViewModel(), diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/persona/AddFieldSheet.kt b/app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/persona/AddFieldSheet.kt index 612e89cce9..03ff4b5b91 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/persona/AddFieldSheet.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/persona/AddFieldSheet.kt @@ -38,6 +38,7 @@ import com.babylon.wallet.android.designsystem.theme.RadixWalletTheme import com.babylon.wallet.android.presentation.model.PersonaFieldWrapper import com.babylon.wallet.android.presentation.model.empty import com.babylon.wallet.android.presentation.model.toDisplayResource +import com.babylon.wallet.android.presentation.ui.composables.BackIconType import com.babylon.wallet.android.presentation.ui.composables.DSR import com.babylon.wallet.android.presentation.ui.composables.RadixBottomBar import com.babylon.wallet.android.presentation.ui.composables.RadixCenteredTopAppBar @@ -63,6 +64,7 @@ fun AddFieldSheet( title = stringResource(id = R.string.editPersona_addAField_title), onBackClick = onBackClick, contentColor = RadixTheme.colors.gray1, + backIconType = BackIconType.Close ) HorizontalDivider(color = RadixTheme.colors.gray4) }