From 2124283cea1f9fd4c062b498b3d8d7622da3e06d Mon Sep 17 00:00:00 2001 From: Oussama Hassine Date: Tue, 9 Jan 2024 10:05:36 +0100 Subject: [PATCH] chore: remove deprecated accompanist-navigation dependency (#2568) --- app/build.gradle.kts | 1 - .../navigation/TrackingNavController.kt | 25 ++++++++++--------- .../navigation/TrackingNavController.kt | 25 ++++++++++--------- .../navigation/TrackingNavController.kt | 25 ++++++++++--------- .../navigation/TrackingNavController.kt | 7 +++--- .../navigation/TrackingNavController.kt | 25 ++++++++++--------- gradle/libs.versions.toml | 7 +++--- 7 files changed, 58 insertions(+), 57 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8e7f5c7e33..fd3f205785 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -118,7 +118,6 @@ dependencies { // Accompanist implementation(libs.accompanist.systemUI) implementation(libs.accompanist.placeholder) - implementation(libs.accompanist.navAnimation) implementation(libs.androidx.paging3) implementation(libs.androidx.paging3Compose) diff --git a/app/src/beta/kotlin/com/wire/android/navigation/TrackingNavController.kt b/app/src/beta/kotlin/com/wire/android/navigation/TrackingNavController.kt index 0e01baa8d8..a926407b58 100644 --- a/app/src/beta/kotlin/com/wire/android/navigation/TrackingNavController.kt +++ b/app/src/beta/kotlin/com/wire/android/navigation/TrackingNavController.kt @@ -17,22 +17,23 @@ */ package com.wire.android.navigation -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.runtime.Composable import androidx.navigation.NavDestination +import androidx.navigation.compose.rememberNavController import com.datadog.android.compose.ExperimentalTrackingApi import com.datadog.android.compose.NavigationViewTrackingEffect import com.datadog.android.rum.tracking.AcceptAllNavDestinations -import com.google.accompanist.navigation.animation.rememberAnimatedNavController -@OptIn(ExperimentalAnimationApi::class, ExperimentalTrackingApi::class) +@OptIn(ExperimentalTrackingApi::class) @Composable -fun rememberTrackingAnimatedNavController(nameFromRoute: (String) -> String?) = rememberAnimatedNavController().apply { - NavigationViewTrackingEffect( - navController = this, - trackArguments = true, - destinationPredicate = object : AcceptAllNavDestinations() { - override fun getViewName(component: NavDestination): String? = component.route?.let { nameFromRoute(it) } - } - ) -} +fun rememberTrackingAnimatedNavController(nameFromRoute: (String) -> String?) = + rememberNavController().apply { + NavigationViewTrackingEffect( + navController = this, + trackArguments = true, + destinationPredicate = object : AcceptAllNavDestinations() { + override fun getViewName(component: NavDestination): String? = + component.route?.let { nameFromRoute(it) } + } + ) + } diff --git a/app/src/dev/kotlin/com/wire/android/navigation/TrackingNavController.kt b/app/src/dev/kotlin/com/wire/android/navigation/TrackingNavController.kt index 9000a69786..d6f01ea310 100644 --- a/app/src/dev/kotlin/com/wire/android/navigation/TrackingNavController.kt +++ b/app/src/dev/kotlin/com/wire/android/navigation/TrackingNavController.kt @@ -1,21 +1,22 @@ package com.wire.android.navigation -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.runtime.Composable import androidx.navigation.NavDestination +import androidx.navigation.compose.rememberNavController import com.datadog.android.compose.ExperimentalTrackingApi import com.datadog.android.compose.NavigationViewTrackingEffect import com.datadog.android.rum.tracking.AcceptAllNavDestinations -import com.google.accompanist.navigation.animation.rememberAnimatedNavController -@OptIn(ExperimentalAnimationApi::class, ExperimentalTrackingApi::class) +@OptIn(ExperimentalTrackingApi::class) @Composable -fun rememberTrackingAnimatedNavController(nameFromRoute: (String) -> String?) = rememberAnimatedNavController().apply { - NavigationViewTrackingEffect( - navController = this, - trackArguments = true, - destinationPredicate = object : AcceptAllNavDestinations() { - override fun getViewName(component: NavDestination): String? = component.route?.let { nameFromRoute(it) } - } - ) -} +fun rememberTrackingAnimatedNavController(nameFromRoute: (String) -> String?) = + rememberNavController().apply { + NavigationViewTrackingEffect( + navController = this, + trackArguments = true, + destinationPredicate = object : AcceptAllNavDestinations() { + override fun getViewName(component: NavDestination): String? = + component.route?.let { nameFromRoute(it) } + } + ) + } diff --git a/app/src/internal/kotlin/com/wire/android/navigation/TrackingNavController.kt b/app/src/internal/kotlin/com/wire/android/navigation/TrackingNavController.kt index 9000a69786..1f8cdea051 100644 --- a/app/src/internal/kotlin/com/wire/android/navigation/TrackingNavController.kt +++ b/app/src/internal/kotlin/com/wire/android/navigation/TrackingNavController.kt @@ -1,21 +1,22 @@ package com.wire.android.navigation -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.runtime.Composable import androidx.navigation.NavDestination import com.datadog.android.compose.ExperimentalTrackingApi import com.datadog.android.compose.NavigationViewTrackingEffect import com.datadog.android.rum.tracking.AcceptAllNavDestinations -import com.google.accompanist.navigation.animation.rememberAnimatedNavController +import androidx.navigation.compose.rememberNavController -@OptIn(ExperimentalAnimationApi::class, ExperimentalTrackingApi::class) +@OptIn(ExperimentalTrackingApi::class) @Composable -fun rememberTrackingAnimatedNavController(nameFromRoute: (String) -> String?) = rememberAnimatedNavController().apply { - NavigationViewTrackingEffect( - navController = this, - trackArguments = true, - destinationPredicate = object : AcceptAllNavDestinations() { - override fun getViewName(component: NavDestination): String? = component.route?.let { nameFromRoute(it) } - } - ) -} +fun rememberTrackingAnimatedNavController(nameFromRoute: (String) -> String?) = + rememberNavController().apply { + NavigationViewTrackingEffect( + navController = this, + trackArguments = true, + destinationPredicate = object : AcceptAllNavDestinations() { + override fun getViewName(component: NavDestination): String? = + component.route?.let { nameFromRoute(it) } + } + ) + } diff --git a/app/src/prod/kotlin/com/wire/android/navigation/TrackingNavController.kt b/app/src/prod/kotlin/com/wire/android/navigation/TrackingNavController.kt index 709d708385..75bce1ecc2 100644 --- a/app/src/prod/kotlin/com/wire/android/navigation/TrackingNavController.kt +++ b/app/src/prod/kotlin/com/wire/android/navigation/TrackingNavController.kt @@ -1,9 +1,8 @@ package com.wire.android.navigation -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.runtime.Composable -import com.google.accompanist.navigation.animation.rememberAnimatedNavController +import androidx.navigation.compose.rememberNavController -@OptIn(ExperimentalAnimationApi::class) @Composable -fun rememberTrackingAnimatedNavController(nameFromRoute: (String) -> String?) = rememberAnimatedNavController() +fun rememberTrackingAnimatedNavController(nameFromRoute: (String) -> String?) = + rememberNavController() diff --git a/app/src/staging/kotlin/com/wire/android/navigation/TrackingNavController.kt b/app/src/staging/kotlin/com/wire/android/navigation/TrackingNavController.kt index 9000a69786..1f8cdea051 100644 --- a/app/src/staging/kotlin/com/wire/android/navigation/TrackingNavController.kt +++ b/app/src/staging/kotlin/com/wire/android/navigation/TrackingNavController.kt @@ -1,21 +1,22 @@ package com.wire.android.navigation -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.runtime.Composable import androidx.navigation.NavDestination import com.datadog.android.compose.ExperimentalTrackingApi import com.datadog.android.compose.NavigationViewTrackingEffect import com.datadog.android.rum.tracking.AcceptAllNavDestinations -import com.google.accompanist.navigation.animation.rememberAnimatedNavController +import androidx.navigation.compose.rememberNavController -@OptIn(ExperimentalAnimationApi::class, ExperimentalTrackingApi::class) +@OptIn(ExperimentalTrackingApi::class) @Composable -fun rememberTrackingAnimatedNavController(nameFromRoute: (String) -> String?) = rememberAnimatedNavController().apply { - NavigationViewTrackingEffect( - navController = this, - trackArguments = true, - destinationPredicate = object : AcceptAllNavDestinations() { - override fun getViewName(component: NavDestination): String? = component.route?.let { nameFromRoute(it) } - } - ) -} +fun rememberTrackingAnimatedNavController(nameFromRoute: (String) -> String?) = + rememberNavController().apply { + NavigationViewTrackingEffect( + navController = this, + trackArguments = true, + destinationPredicate = object : AcceptAllNavDestinations() { + override fun getViewName(component: NavDestination): String? = + component.route?.let { nameFromRoute(it) } + } + ) + } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 70d2fd0632..699655fbd8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -37,11 +37,11 @@ androidx-browser = "1.5.0" androidx-biometric = "1.1.0" # Compose -composeBom = "2023.10.00" # TODO check if in new version [anchoredDraggable] is available -compose-activity = "1.8.0" +composeBom = "2023.10.01" # TODO check if in new version [anchoredDraggable] is available +compose-activity = "1.8.2" compose-compiler = "1.5.2" compose-constraint = "1.0.1" -compose-navigation = "2.7.3" # adjusted to work with compose-destinations "1.9.54" +compose-navigation = "2.7.6" # adjusted to work with compose-destinations "1.9.54" compose-destinations = "1.9.54" # Hilt @@ -188,7 +188,6 @@ compose-destinations-ksp = { module = "io.github.raamcosta.compose-destinations: # Accompanist accompanist-systemUI = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } accompanist-placeholder = { module = "com.google.accompanist:accompanist-placeholder", version.ref = "accompanist" } -accompanist-navAnimation = { module = "com.google.accompanist:accompanist-navigation-animation", version.ref = "accompanist" } # Image Loading coil-core = { module = "io.coil-kt:coil", version.ref = "coil" }