Merge pull request #10593 from woocommerce/bump_navigation_safeargs_2…

…_6_0 Bump `navigation.safeargs` to `2.6.0`
woocommerce · Jan 24, 2024 · 31b91c4 · 31b91c4
2 parents 099d3af + 3d08887
commit 31b91c4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle
@@ -280,7 +280,8 @@ dependencies {
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     kapt "com.github.bumptech.glide:compiler:$glideVersion"
     implementation "com.github.bumptech.glide:volley-integration:$glideVersion@aar"
-    implementation "com.google.android.play:core:$googlePlayCoreVersion"
+    implementation 'com.google.android.play:app-update-ktx:2.1.0'
+    implementation 'com.google.android.play:review-ktx:2.0.1'
 
     implementation 'com.google.android.gms:play-services-code-scanner:16.0.0-beta3'
 

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/AppUpgradeActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/AppUpgradeActivity.kt
@@ -206,6 +206,7 @@ abstract class AppUpgradeActivity :
 
     private fun requestAppUpdate(appUpdateInfo: AppUpdateInfo) {
         try {
+            @Suppress("DEPRECATION")
             appUpdateManager.startUpdateFlowForResult(
                 appUpdateInfo,
                 inAppUpdateType,

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ProductDetailFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ProductDetailFragment.kt
@@ -10,12 +10,14 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
+import androidx.annotation.IdRes
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.core.view.MenuProvider
 import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -125,7 +127,7 @@ class ProductDetailFragment :
 
     override val activityAppBarStatus: AppBarStatus
         get() {
-            val navigationIcon = if (findNavController().backQueue.any { it.destination.id == R.id.products }) {
+            val navigationIcon = if (findNavController().hasBackStackEntry(R.id.products)) {
                 R.drawable.ic_back_24dp
             } else {
                 R.drawable.ic_gridicons_cross_24dp
@@ -135,6 +137,10 @@ class ProductDetailFragment :
             )
         }
 
+    private fun NavController.hasBackStackEntry(@IdRes destinationId: Int) = runCatching {
+        getBackStackEntry(destinationId)
+    }.isSuccess
+
     @Inject lateinit var crashLogging: CrashLogging
 
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/settings.gradle b/settings.gradle
@@ -5,7 +5,7 @@ pluginManagement {
     gradle.ext.detektVersion = '1.19.0'
     gradle.ext.kotlinVersion = '1.8.21'
     gradle.ext.measureBuildsVersion = '2.0.3'
-    gradle.ext.navigationVersion = '2.5.3'
+    gradle.ext.navigationVersion = '2.6.0'
     gradle.ext.sentryVersion = '3.5.0'
     gradle.ext.violationCommentsVersion = '1.69.0'