Merge pull request #503 from kiwicom/renovate/androidx

fix(deps): update dependency androidx.navigation:navigation-compose to v2.7.0

Author: hrach

catalog/src/main/java/kiwi/orbit/compose/catalog/CatalogApplication.kt

@@ -1,5 +1,14 @@
 package kiwi.orbit.compose.catalog
 
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.core.FastOutLinearInEasing
+import androidx.compose.animation.core.LinearOutSlowInEasing
+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.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
@@ -8,6 +17,9 @@ 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.platform.LocalDensity
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.dp
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
@@ -86,11 +98,16 @@ fun CatalogApplication() {
 private fun NavGraph(
     onToggleTheme: () -> Unit,
 ) {
+    val density = LocalDensity.current
     val navController = rememberNavController()
 
     NavHost(
         navController = navController,
         startDestination = createRoutePattern<Destinations.Main>(),
+        enterTransition = { SharedXAxisEnterTransition(density) },
+        exitTransition = { SharedXAxisExitTransition(density) },
+        popEnterTransition = { SharedXAxisPopEnterTransition(density) },
+        popExitTransition = { SharedXAxisPopExitTransition(density) },
     ) {
         composable<Destinations.Main> { MainScreen(navController::navigate, onToggleTheme) }
 
@@ -137,3 +154,31 @@ private fun NavGraph(
         topAppBarNavigation<Destinations.TopAppBar>(navController)
     }
 }
+
+private val SharedXAxisEnterTransition: (Density) -> EnterTransition = { density ->
+    fadeIn(animationSpec = tween(durationMillis = 210, delayMillis = 90, easing = LinearOutSlowInEasing)) +
+        slideInHorizontally(animationSpec = tween(durationMillis = 300)) {
+            with(density) { 30.dp.roundToPx() }
+        }
+}
+
+private val SharedXAxisPopEnterTransition: (Density) -> EnterTransition = { density ->
+    fadeIn(animationSpec = tween(durationMillis = 210, delayMillis = 90, easing = LinearOutSlowInEasing)) +
+        slideInHorizontally(animationSpec = tween(durationMillis = 300)) {
+            with(density) { (-30).dp.roundToPx() }
+        }
+}
+
+private val SharedXAxisExitTransition: (Density) -> ExitTransition = { density ->
+    fadeOut(animationSpec = tween(durationMillis = 90, easing = FastOutLinearInEasing)) +
+        slideOutHorizontally(animationSpec = tween(durationMillis = 300)) {
+            with(density) { (-30).dp.roundToPx() }
+        }
+}
+
+private val SharedXAxisPopExitTransition: (Density) -> ExitTransition = { density ->
+    fadeOut(animationSpec = tween(durationMillis = 90, easing = FastOutLinearInEasing)) +
+        slideOutHorizontally(animationSpec = tween(durationMillis = 300)) {
+            with(density) { 30.dp.roundToPx() }
+        }
+}

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 
-compileSdk = "33"
+compileSdk = "34"
 targetSdk = "33"
 minSdk = "23"
 
@@ -50,7 +50,7 @@ compose-material = { module = "androidx.compose.material:material" }
 compose-material3 = "androidx.compose.material3:material3:1.1.1"
 compose-materialRipple = { module = "androidx.compose.material:material-ripple" }
 compose-materialIconsExtended = { module = "androidx.compose.material:material-icons-extended" }
-compose-navigation = { module = "androidx.navigation:navigation-compose", version = "2.6.0" }
+compose-navigation = { module = "androidx.navigation:navigation-compose", version = "2.7.0" }
 compose-runtime = { module = "androidx.compose.runtime:runtime" }
 compose-runtimeLivedata = { module = "androidx.compose.runtime:runtime-livedata" }
 compose-tooling = { module = "androidx.compose.ui:ui-tooling" }
@@ -62,7 +62,7 @@ compose-uiTestManifest = { module = "androidx.compose.ui:ui-test-manifest" }
 compose-uiUtil = { module = "androidx.compose.ui:ui-util" }
 compose-viewBinding = { module = "androidx.compose.ui:ui-viewbinding" }
 hamcrest = { module = "org.hamcrest:hamcrest-all", version = "1.3" }
-javaJq = { module = "net.thisptr:jackson-jq", version="1.0.0-preview.20230409" }
+javaJq = { module = "net.thisptr:jackson-jq", version = "1.0.0-preview.20230409" }
 junit = { module = "junit:junit", version = "4.13.2" }
 kiwi-navigationComposeTyped = { module = "com.kiwi.navigation-compose.typed:core", version = "0.6.2" }
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }