From 77893ec69972dadf0b21df825a3b956a83f70d6f Mon Sep 17 00:00:00 2001 From: Oussama Hassine Date: Fri, 5 Jan 2024 18:21:39 +0100 Subject: [PATCH 1/2] chore: remove deprecated accompanist-navigation dependency --- app/build.gradle.kts | 1 - .../navigation/TrackingNavController.kt | 25 ++++++++++--------- .../navigation/TrackingNavController.kt | 25 ++++++++++--------- .../navigation/TrackingNavController.kt | 24 ++++++++++-------- .../navigation/TrackingNavController.kt | 7 +++--- .../navigation/TrackingNavController.kt | 25 ++++++++++--------- gradle/libs.versions.toml | 7 +++--- 7 files changed, 58 insertions(+), 56 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9e8839d5ac8..60d8c0564da 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -120,7 +120,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 9000a69786e..d6f01ea310a 100644 --- a/app/src/beta/kotlin/com/wire/android/navigation/TrackingNavController.kt +++ b/app/src/beta/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/dev/kotlin/com/wire/android/navigation/TrackingNavController.kt b/app/src/dev/kotlin/com/wire/android/navigation/TrackingNavController.kt index 9000a69786e..d6f01ea310a 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 9000a69786e..c0bb078e1e9 100644 --- a/app/src/internal/kotlin/com/wire/android/navigation/TrackingNavController.kt +++ b/app/src/internal/kotlin/com/wire/android/navigation/TrackingNavController.kt @@ -6,16 +6,18 @@ 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 709d7083856..75bce1ecc2e 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 9000a69786e..1f8cdea0516 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 70d2fd06322..699655fbd8b 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" } From 0834dc82afa5182ea2a655d8b6a9a6c946289be7 Mon Sep 17 00:00:00 2001 From: Oussama Hassine Date: Tue, 9 Jan 2024 09:34:36 +0100 Subject: [PATCH 2/2] chore: unused import --- .../kotlin/com/wire/android/navigation/TrackingNavController.kt | 1 - 1 file changed, 1 deletion(-) 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 c0bb078e1e9..1f8cdea0516 100644 --- a/app/src/internal/kotlin/com/wire/android/navigation/TrackingNavController.kt +++ b/app/src/internal/kotlin/com/wire/android/navigation/TrackingNavController.kt @@ -1,6 +1,5 @@ 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