diff --git a/app/src/main/java/com/surrus/peopleinspace/ui/MainActivity.kt b/app/src/main/java/com/surrus/peopleinspace/ui/MainActivity.kt index 608a75e4..02fb49d1 100644 --- a/app/src/main/java/com/surrus/peopleinspace/ui/MainActivity.kt +++ b/app/src/main/java/com/surrus/peopleinspace/ui/MainActivity.kt @@ -3,12 +3,8 @@ package com.surrus.peopleinspace.ui import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent -import androidx.compose.animation.ExperimentalAnimationApi +import androidx.compose.animation.* import androidx.compose.animation.core.tween -import androidx.compose.animation.fadeIn -import androidx.compose.animation.fadeOut -import androidx.compose.animation.slideInHorizontally -import androidx.compose.animation.slideOutHorizontally import androidx.compose.material.BottomNavigation import androidx.compose.material.BottomNavigationItem import androidx.compose.material.Icon @@ -99,11 +95,11 @@ fun MainLayout() { AnimatedNavHost(navController, startDestination = Screen.PersonList.title) { composable( route = Screen.PersonList.title, - exitTransition = { _, target -> + exitTransition = { slideOutHorizontally() + fadeOut(animationSpec = tween(1000)) }, - popEnterTransition = { _, _ -> + popEnterTransition = { slideInHorizontally() } ) { @@ -116,11 +112,11 @@ fun MainLayout() { } composable( route = Screen.PersonDetails.title + "/{person}", - enterTransition = { _, _ -> + enterTransition = { slideInHorizontally() + fadeIn(animationSpec = tween(1000)) }, - popExitTransition = { _, _ -> + popExitTransition = { slideOutHorizontally() } ) { backStackEntry -> diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 4dc07dd8..08dd871e 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -13,7 +13,7 @@ object Versions { const val composeCompiler = "1.1.0-rc02" const val wearCompose = "1.0.0-alpha13" const val navCompose = "2.4.0-rc01" - const val accompanist = "0.21.0-beta" + const val accompanist = "0.22.0-rc" const val junit = "4.12" const val androidXTestJUnit = "1.1.3"