diff --git a/android/app/build.gradle b/android/app/build.gradle index c0d30f4bf2..a668f0c272 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -321,7 +321,6 @@ publishing { dependencies { api project(":navi-payment") - api libs.android.play.core.ktx implementation project(":finoramic-androidx-sdk") implementation project(":navi-amc") diff --git a/android/app/src/main/java/com/naviapp/common/viewmodel/InAppUpdateVM.kt b/android/app/src/main/java/com/naviapp/common/viewmodel/InAppUpdateVM.kt index dfa2eb0ca0..6ddf273188 100644 --- a/android/app/src/main/java/com/naviapp/common/viewmodel/InAppUpdateVM.kt +++ b/android/app/src/main/java/com/naviapp/common/viewmodel/InAppUpdateVM.kt @@ -11,13 +11,13 @@ import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData +import com.google.android.gms.tasks.Task import com.google.android.play.core.appupdate.AppUpdateInfo import com.google.android.play.core.appupdate.AppUpdateManager import com.google.android.play.core.appupdate.AppUpdateManagerFactory import com.google.android.play.core.install.InstallStateUpdatedListener import com.google.android.play.core.install.model.InstallStatus import com.google.android.play.core.install.model.UpdateAvailability -import com.google.android.play.core.tasks.Task import com.navi.base.sharedpref.PreferenceManager import com.navi.common.utils.CommonNaviAnalytics import com.navi.naviwidgets.utils.CURRENT_VERSION_IN_STORE diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index eb6613cb7f..fb42446196 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -13,7 +13,9 @@ android-gms-playServicesMaps = "17.0.0" android-installreferrer = "2.2" android-material = "1.9.0" android-places = "2.6.0" -android-play-core-ktx = "1.8.1" +android-play-appUpdateKtx = "2.1.0" +android-play-featureDeliveryKtx = "2.1.0" +android-play-reviewKtx = "2.0.1" androidGradlePlugin = "8.5.0" androidx-activityCompose = "1.8.2" androidx-annotation = "1.7.1" @@ -144,7 +146,9 @@ android-material = { module = "com.google.android.material:material", version.re android-places = { module = "com.google.android.libraries.places:places", version.ref = "android-places" } -android-play-core-ktx = { module = "com.google.android.play:core-ktx", version.ref = "android-play-core-ktx" } +android-play-appUpdateKtx = { module = "com.google.android.play:app-update-ktx", version.ref = "android-play-appUpdateKtx" } +android-play-featureDeliveryKtx = { module = "com.google.android.play:feature-delivery-ktx", version.ref = "android-play-featureDeliveryKtx" } +android-play-reviewKtx = { module = "com.google.android.play:review-ktx", version.ref = "android-play-reviewKtx" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" } diff --git a/android/navi-base/build.gradle b/android/navi-base/build.gradle index 43b4bbc3fe..d164a0dedb 100644 --- a/android/navi-base/build.gradle +++ b/android/navi-base/build.gradle @@ -72,6 +72,9 @@ android { dependencies { api platform(libs.firebase.bom) api platform(libs.okhttp.bom) + api libs.android.play.appUpdateKtx + api libs.android.play.featureDeliveryKtx + api libs.android.play.reviewKtx api libs.firebase.analytics api libs.firebase.firestore api libs.gson @@ -80,7 +83,6 @@ dependencies { api libs.okhttp.brotli api libs.okhttp.loggingIntercepter - implementation libs.android.play.core.ktx implementation libs.androidx.room.ktx implementation libs.androidx.room.runtime implementation libs.androidx.security.crypto.ktx diff --git a/android/navi-bbps/build.gradle b/android/navi-bbps/build.gradle index fcabdaedbc..51ef4f017f 100644 --- a/android/navi-bbps/build.gradle +++ b/android/navi-bbps/build.gradle @@ -75,7 +75,6 @@ dependencies { implementation libs.accompanist.permissions implementation libs.accompanist.systemuicontroller implementation libs.android.material - implementation libs.android.play.core.ktx implementation libs.androidx.appcompat implementation libs.androidx.camera.mlkit.vision implementation libs.androidx.compose.material3 diff --git a/android/navi-common/build.gradle b/android/navi-common/build.gradle index 5ac3c2fbd4..6440052ed3 100644 --- a/android/navi-common/build.gradle +++ b/android/navi-common/build.gradle @@ -109,7 +109,6 @@ dependencies { }) implementation libs.android.material - implementation libs.android.play.core.ktx implementation libs.androidx.appcompat implementation libs.androidx.constraintlayout implementation libs.androidx.core.ktx diff --git a/android/navi-common/src/main/java/com/navi/common/utils/PlayStoreInAppRatingHelper.kt b/android/navi-common/src/main/java/com/navi/common/utils/PlayStoreInAppRatingHelper.kt index 7bb1da4d61..a2099a2e5b 100644 --- a/android/navi-common/src/main/java/com/navi/common/utils/PlayStoreInAppRatingHelper.kt +++ b/android/navi-common/src/main/java/com/navi/common/utils/PlayStoreInAppRatingHelper.kt @@ -1,6 +1,6 @@ /* * - * * Copyright © 2020-2023 by Navi Technologies Limited + * * Copyright © 2020-2024 by Navi Technologies Limited * * All rights reserved. Strictly confidential * */ @@ -24,7 +24,7 @@ class PlayStoreInAppRatingHelper(context: Context, var source: String? = EMPTY) private var reviewInfo: ReviewInfo? = null private var playStoreReviewManager: ReviewManager? = null - private val playstoreRatingEventTracker = + private val playStoreRatingEventTracker = CommonNaviAnalytics.naviAnalytics.PlayStoreRatingEventTracker() init { @@ -73,7 +73,7 @@ class PlayStoreInAppRatingHelper(context: Context, var source: String? = EMPTY) } private fun callEventTracker(eventName: String, data: String?) { - playstoreRatingEventTracker.onInJourneyEvent( + playStoreRatingEventTracker.onInJourneyEvent( eventName = eventName, source = source, data = data.orEmpty() diff --git a/android/navi-insurance/build.gradle b/android/navi-insurance/build.gradle index 42ed4a8e2e..1c8d565f85 100644 --- a/android/navi-insurance/build.gradle +++ b/android/navi-insurance/build.gradle @@ -101,7 +101,6 @@ dependencies { implementation libs.android.flexbox implementation libs.android.material implementation libs.android.places - implementation libs.android.play.core.ktx implementation libs.androidx.appcompat implementation libs.androidx.constraintlayout implementation libs.androidx.core.ktx diff --git a/android/navi-pay/build.gradle b/android/navi-pay/build.gradle index b6994c5be7..2ae805ffd5 100644 --- a/android/navi-pay/build.gradle +++ b/android/navi-pay/build.gradle @@ -75,7 +75,6 @@ dependencies { implementation libs.accompanist.permissions implementation libs.accompanist.systemuicontroller implementation libs.android.material - implementation libs.android.play.core.ktx implementation libs.androidx.appcompat implementation libs.androidx.camera.mlkit.vision implementation libs.androidx.compose.runtime.livedata