feat: Enhanced in-app updates and improved Ukrainian translations

Mihai-Cristian Condrea · Mihai-Cristian Condrea · commit a39e3e74be4c · 2025-01-31T12:17:22.000+02:00
This update brings several improvements to the application, including a refined in-app update process and updates to the Ukrainian translations.

-   Implemented a new in-app update process that now supports immediate and flexible updates based on the staleness of the client version.
-   The app will prompt for an immediate update if the client version is older than 90 days.
-   Introduced a new `updateResultLauncher` to handle the update result more efficiently.
-   Updated Ukrainian string resources to streamline content.
-   Updated AppToolkit library to version 0.0.49.
-   Updated the app build version to 114, and version name to 1.2.0.
-   Added a string resource for the feedback email title.
-   Removed unused code related to update notifications and email sending.
-   Removed unused strings resources.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -20,7 +20,7 @@ android {
         applicationId = "com.d4rk.androidtutorials"
         minSdk = 23
         targetSdk = 35
-        versionCode = 112
+        versionCode = 114
         versionName = "1.2.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         @Suppress("UnstableApiUsage")
@@ -109,7 +109,7 @@ android {
 dependencies {
 
     // App Core
-    implementation(dependencyNotation = "com.github.D4rK7355608:AppToolkit:0.0.48") {
+    implementation(dependencyNotation = "com.github.D4rK7355608:AppToolkit:0.0.49") {
         isTransitive = true
     }
 
diff --git a/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/help/HelpScreen.kt b/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/help/HelpScreen.kt
@@ -59,8 +59,10 @@ import com.d4rk.android.libs.apptoolkit.ui.components.modifiers.bounceClick
 import com.d4rk.android.libs.apptoolkit.ui.components.spacers.LargeHorizontalSpacer
 import com.d4rk.android.libs.apptoolkit.ui.components.spacers.MediumVerticalSpacer
 import com.d4rk.android.libs.apptoolkit.ui.components.spacers.SmallVerticalSpacer
+import com.d4rk.android.libs.apptoolkit.utils.helpers.IntentsHelper
 import com.d4rk.android.libs.apptoolkit.utils.rememberHtmlData
 import com.d4rk.androidtutorials.BuildConfig
+import com.d4rk.androidtutorials.R
 import com.d4rk.androidtutorials.data.model.ui.screens.UiHelpQuestion
 import com.d4rk.androidtutorials.data.model.ui.screens.UiHelpScreen
 import com.d4rk.androidtutorials.ui.components.navigation.TopAppBarScaffoldWithBackButtonAndActions
@@ -131,7 +133,7 @@ fun HelpScreen(activity : Activity , viewModel : HelpViewModel) {
                 MediumVerticalSpacer()
                 ContactUsCard(onClick = {
                     view.playSoundEffect(SoundEffectConstants.CLICK)
-                    viewModel.sendEmailToDeveloper(activity = activity)
+                    IntentsHelper.sendEmailToDeveloper(context = activity , applicationNameRes = R.string.app_name)
                 })
                 Spacer(modifier = Modifier.height(height = 64.dp))
             }
@@ -223,4 +225,4 @@ fun ContactUsCard(onClick : () -> Unit) {
             }
         }
     }
-}
+}
diff --git a/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/help/HelpViewModel.kt b/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/help/HelpViewModel.kt
@@ -53,10 +53,4 @@ class HelpViewModel(application : Application) : BaseViewModel(application) {
             repository.launchReviewFlowRepository(activity = activity , reviewInfo = reviewInfo)
         }
     }
-
-    fun sendEmailToDeveloper(activity: Activity) {
-        viewModelScope.launch(context = coroutineExceptionHandler) {
-            repository.sendEmailToDeveloperRepository(activity = activity)
-        }
-    }
 }
diff --git a/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/help/repository/HelpRepository.kt b/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/help/repository/HelpRepository.kt
@@ -13,8 +13,7 @@ class HelpRepository(application : Application) : HelpRepositoryImplementation(a
         withContext(Dispatchers.IO) {
             val questions = getFAQsImplementation().map { (questionRes , summaryRes) ->
                 UiHelpQuestion(
-                    question = application.getString(questionRes) ,
-                    answer = application.getString(summaryRes)
+                    question = application.getString(questionRes) , answer = application.getString(summaryRes)
                 )
             }.toCollection(destination = ArrayList())
 
@@ -37,10 +36,4 @@ class HelpRepository(application : Application) : HelpRepositoryImplementation(a
             launchReviewFlowImplementation(activity = activity , reviewInfo = reviewInfo)
         }
     }
-
-    suspend fun sendEmailToDeveloperRepository(activity: Activity) {
-        withContext(Dispatchers.IO) {
-            sendEmailToDeveloperImplementation(activity = activity)
-        }
-    }
-}
+}
diff --git a/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/help/repository/HelpRepositoryImplementation.kt b/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/help/repository/HelpRepositoryImplementation.kt
@@ -42,8 +42,7 @@ abstract class HelpRepositoryImplementation(
             }
         }.addOnFailureListener {
             IntentsHelper.openUrl(
-                context = application ,
-                url = "https://play.google.com/store/apps/details?id=$packageName&showAllReviews=true"
+                context = application , url = "https://play.google.com/store/apps/details?id=$packageName&showAllReviews=true"
             )
         }
     }
@@ -52,8 +51,4 @@ abstract class HelpRepositoryImplementation(
         val reviewManager : ReviewManager = ReviewManagerFactory.create(activity)
         reviewManager.launchReviewFlow(activity , reviewInfo)
     }
-
-    fun sendEmailToDeveloperImplementation(activity : Activity) {
-        IntentsHelper.sendEmailToDeveloper(context = activity, applicationName = R.string.app_name)
-    }
 }
diff --git a/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/main/MainActivity.kt b/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/main/MainActivity.kt
@@ -5,6 +5,9 @@ import android.os.Build
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.IntentSenderRequest
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
@@ -14,7 +17,6 @@ import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.d4rk.android.libs.apptoolkit.notifications.managers.AppUpdateNotificationsManager
-import com.d4rk.androidtutorials.R
 import com.d4rk.androidtutorials.data.core.AppCoreManager
 import com.d4rk.androidtutorials.ui.screens.settings.display.theme.style.AppTheme
 import com.google.android.gms.ads.MobileAds
@@ -28,12 +30,13 @@ class MainActivity : AppCompatActivity() {
     private val viewModel : MainViewModel by viewModels()
     private lateinit var appUpdateManager : AppUpdateManager
     private lateinit var appUpdateNotificationsManager : AppUpdateNotificationsManager
+    private lateinit var updateResultLauncher : ActivityResultLauncher<IntentSenderRequest>
 
     override fun onCreate(savedInstanceState : Bundle?) {
         super.onCreate(savedInstanceState)
         installSplashScreen().apply {
             setKeepOnScreenCondition {
-                !(application as AppCoreManager).isAppLoaded()
+                ! (application as AppCoreManager).isAppLoaded()
             }
         }
         enableEdgeToEdge()
@@ -55,7 +58,9 @@ class MainActivity : AppCompatActivity() {
         with(receiver = viewModel) {
             checkAndHandleStartup()
             configureSettings()
-            checkForUpdates(activity = this@MainActivity , appUpdateManager = appUpdateManager)
+            viewModel.checkForUpdates(
+                appUpdateManager = appUpdateManager , updateResultLauncher = updateResultLauncher
+            )
             checkAndScheduleUpdateNotifications(appUpdateNotificationsManager = appUpdateNotificationsManager)
             checkAppUsageNotifications(context = this@MainActivity)
         }
@@ -74,11 +79,10 @@ class MainActivity : AppCompatActivity() {
     @Deprecated("Deprecated in Java")
     @Suppress("DEPRECATION")
     override fun onBackPressed() {
-        MaterialAlertDialogBuilder(this).setTitle(com.d4rk.android.libs.apptoolkit.R.string.close).setMessage(com.d4rk.android.libs.apptoolkit.R.string.summary_close)
-                .setPositiveButton(android.R.string.yes) { _ , _ ->
-                    super.onBackPressed()
-                    moveTaskToBack(true)
-                }.setNegativeButton(android.R.string.no , null).apply { show() }
+        MaterialAlertDialogBuilder(this).setTitle(com.d4rk.android.libs.apptoolkit.R.string.close).setMessage(com.d4rk.android.libs.apptoolkit.R.string.summary_close).setPositiveButton(android.R.string.yes) { _ , _ ->
+            super.onBackPressed()
+            moveTaskToBack(true)
+        }.setNegativeButton(android.R.string.no , null).apply { show() }
     }
 
     /**
@@ -112,8 +116,14 @@ class MainActivity : AppCompatActivity() {
 
     private fun initializeActivityComponents() {
         MobileAds.initialize(this@MainActivity)
+        updateResultLauncher = registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) { result ->
+            when (result.resultCode) {
+                RESULT_OK -> showUpdateSuccessfulSnackbar()
+                else -> showUpdateFailedSnackbar()
+            }
+        }
         appUpdateManager = AppUpdateManagerFactory.create(this@MainActivity)
-        appUpdateNotificationsManager = AppUpdateNotificationsManager(context = this, channelId = "update_channel")
+        appUpdateNotificationsManager = AppUpdateNotificationsManager(context = this , channelId = "update_channel")
     }
 
     private fun showUpdateSuccessfulSnackbar() {
@@ -135,7 +145,7 @@ class MainActivity : AppCompatActivity() {
             findViewById(android.R.id.content) , com.d4rk.android.libs.apptoolkit.R.string.snack_update_failed , Snackbar.LENGTH_LONG
         ).setAction(com.d4rk.android.libs.apptoolkit.R.string.try_again) {
             viewModel.checkForUpdates(
-                activity = this@MainActivity , appUpdateManager = appUpdateManager
+                appUpdateManager = appUpdateManager , updateResultLauncher = updateResultLauncher
             )
         }
         snackbar.show()
diff --git a/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/main/MainViewModel.kt b/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/main/MainViewModel.kt
@@ -1,9 +1,10 @@
 package com.d4rk.androidtutorials.ui.screens.main
 
-import android.app.Activity
 import android.app.Application
 import android.content.Context
 import android.os.Build
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.IntentSenderRequest
 import androidx.annotation.RequiresApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.EventNote
@@ -14,7 +15,6 @@ import androidx.lifecycle.viewModelScope
 import com.d4rk.android.libs.apptoolkit.data.model.ui.navigation.NavigationDrawerItem
 import com.d4rk.android.libs.apptoolkit.notifications.managers.AppUpdateNotificationsManager
 import com.d4rk.android.libs.apptoolkit.utils.helpers.IntentsHelper
-import com.d4rk.androidtutorials.R
 import com.d4rk.androidtutorials.data.core.AppCoreManager
 import com.d4rk.androidtutorials.data.model.ui.navigation.BottomNavigationScreen
 import com.d4rk.androidtutorials.data.model.ui.screens.UiMainScreen
@@ -28,16 +28,15 @@ import kotlinx.coroutines.launch
 
 class MainViewModel(application : Application) : BaseViewModel(application) {
     private val repository = MainRepository(
-        dataStore = AppCoreManager.dataStore ,
-        application = application
+        dataStore = AppCoreManager.dataStore , application = application
     )
     private val _uiState : MutableStateFlow<UiMainScreen> = MutableStateFlow(initializeUiState())
     val uiState : StateFlow<UiMainScreen> = _uiState
 
-    fun checkForUpdates(activity : Activity , appUpdateManager : AppUpdateManager) {
+    fun checkForUpdates(updateResultLauncher : ActivityResultLauncher<IntentSenderRequest> , appUpdateManager : AppUpdateManager) {
         viewModelScope.launch(context = coroutineExceptionHandler) {
             repository.checkForUpdates(
-                appUpdateManager = appUpdateManager , activity = activity
+                appUpdateManager = appUpdateManager , updateResultLauncher = updateResultLauncher
             )
         }
     }
@@ -59,9 +58,7 @@ class MainViewModel(application : Application) : BaseViewModel(application) {
                     selectedIcon = Icons.Outlined.Share ,
                 )
             ) , bottomNavigationItems = listOf(
-                BottomNavigationScreen.Home ,
-                BottomNavigationScreen.StudioBot ,
-                BottomNavigationScreen.Favorites
+                BottomNavigationScreen.Home , BottomNavigationScreen.StudioBot , BottomNavigationScreen.Favorites
             ) , currentBottomNavigationScreen = BottomNavigationScreen.Home
         )
     }
diff --git a/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/main/repository/MainRepository.kt b/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/main/repository/MainRepository.kt
@@ -1,9 +1,10 @@
 package com.d4rk.androidtutorials.ui.screens.main.repository
 
-import android.app.Activity
 import android.app.Application
 import android.content.Context
 import android.os.Build
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.IntentSenderRequest
 import androidx.annotation.RequiresApi
 import com.d4rk.android.libs.apptoolkit.notifications.managers.AppUpdateNotificationsManager
 import com.d4rk.androidtutorials.data.datastore.DataStore
@@ -18,15 +19,14 @@ import kotlinx.coroutines.withContext
  * @property dataStore The data store used to persist settings and startup information.
  * @property application The application context.
  */
-class MainRepository(dataStore : DataStore , application : Application) :
-    MainRepositoryImplementation(application = application , dataStore = dataStore) {
+class MainRepository(dataStore : DataStore , application : Application) : MainRepositoryImplementation(application = application , dataStore = dataStore) {
 
     suspend fun checkForUpdates(
-        activity : Activity ,
+        updateResultLauncher : ActivityResultLauncher<IntentSenderRequest> ,
         appUpdateManager : AppUpdateManager ,
     ) {
         withContext(Dispatchers.IO) {
-            checkForUpdatesImplementation(activity = activity , appUpdateManager = appUpdateManager)
+            checkForUpdatesImplementation(updateResultLauncher = updateResultLauncher , appUpdateManager = appUpdateManager)
         }
     }
 
diff --git a/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/main/repository/MainRepositoryImplementation.kt b/app/src/main/kotlin/com/d4rk/androidtutorials/ui/screens/main/repository/MainRepositoryImplementation.kt
@@ -4,13 +4,16 @@ import android.app.Activity
 import android.app.Application
 import android.content.Context
 import android.os.Build
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.IntentSenderRequest
 import androidx.annotation.RequiresApi
 import com.d4rk.android.libs.apptoolkit.notifications.managers.AppUpdateNotificationsManager
 import com.d4rk.android.libs.apptoolkit.notifications.managers.AppUsageNotificationsManager
 import com.d4rk.androidtutorials.R
 import com.d4rk.androidtutorials.data.datastore.DataStore
 import com.google.android.play.core.appupdate.AppUpdateInfo
 import com.google.android.play.core.appupdate.AppUpdateManager
+import com.google.android.play.core.appupdate.AppUpdateOptions
 import com.google.android.play.core.install.model.ActivityResult
 import com.google.android.play.core.install.model.AppUpdateType
 import com.google.android.play.core.install.model.UpdateAvailability
@@ -26,7 +29,7 @@ import kotlinx.coroutines.tasks.await
  *
  * @property application The application context.
  */
-abstract class MainRepositoryImplementation(val application : Application, val dataStore : DataStore) {
+abstract class MainRepositoryImplementation(val application : Application , val dataStore : DataStore) {
 
     /**
      * Checks if the application is being launched for the first time.
@@ -57,33 +60,34 @@ abstract class MainRepositoryImplementation(val application : Application, val d
     }
 
     suspend fun checkForUpdatesImplementation(
-        activity: Activity,
-        appUpdateManager: AppUpdateManager
-    ): Int {
+        appUpdateManager : AppUpdateManager , updateResultLauncher : ActivityResultLauncher<IntentSenderRequest>
+    ) : Int {
         return runCatching {
-            var updateResult: Int = Activity.RESULT_CANCELED
-            val appUpdateInfo: AppUpdateInfo = appUpdateManager.appUpdateInfo.await()
-
-            if (appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE &&
-                appUpdateInfo.isUpdateTypeAllowed(AppUpdateType.IMMEDIATE) &&
-                appUpdateInfo.updateAvailability() != UpdateAvailability.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS
-            ) {
-                appUpdateInfo.clientVersionStalenessDays()?.let { stalenessDays ->
-                    val updateType =
-                            if (stalenessDays > 90) AppUpdateType.IMMEDIATE else AppUpdateType.FLEXIBLE
-                    @Suppress("DEPRECATION")
-                    appUpdateManager.startUpdateFlowForResult(
-                        appUpdateInfo, updateType, activity, 1
-                    )
-                    updateResult = Activity.RESULT_OK
+            val appUpdateInfo : AppUpdateInfo = appUpdateManager.appUpdateInfo.await()
+            if (appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE) {
+                val stalenessDays = appUpdateInfo.clientVersionStalenessDays() ?: 0
+                val updateType = if (stalenessDays > 90) {
+                    AppUpdateType.IMMEDIATE
+                }
+                else {
+                    AppUpdateType.FLEXIBLE
                 }
+
+                val appUpdateOptions : AppUpdateOptions = AppUpdateOptions.newBuilder(updateType).build()
+
+                val didStart : Boolean = appUpdateManager.startUpdateFlowForResult(
+                    appUpdateInfo , updateResultLauncher , appUpdateOptions
+                )
+
+                if (didStart) return@runCatching Activity.RESULT_OK
             }
-            updateResult
+            Activity.RESULT_CANCELED
         }.getOrElse {
             ActivityResult.RESULT_IN_APP_UPDATE_FAILED
         }
     }
 
+
     @RequiresApi(Build.VERSION_CODES.O)
     fun checkAndScheduleUpdateNotificationsImplementation(appUpdateNotificationsManager : AppUpdateNotificationsManager) {
         appUpdateNotificationsManager.checkAndSendUpdateNotification()
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
diff --git a/app/src/main/res/values/untranslatable_strings.xml b/app/src/main/res/values/untranslatable_strings.xml

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,10 @@ import com.d4rk.android.libs.apptoolkit.ui.components.modifiers.bounceClick`
`59`	`59`	`import com.d4rk.android.libs.apptoolkit.ui.components.spacers.LargeHorizontalSpacer`
`60`	`60`	`import com.d4rk.android.libs.apptoolkit.ui.components.spacers.MediumVerticalSpacer`
`61`	`61`	`import com.d4rk.android.libs.apptoolkit.ui.components.spacers.SmallVerticalSpacer`
	`62`	`+import com.d4rk.android.libs.apptoolkit.utils.helpers.IntentsHelper`
`62`	`63`	`import com.d4rk.android.libs.apptoolkit.utils.rememberHtmlData`
`63`	`64`	`import com.d4rk.androidtutorials.BuildConfig`
	`65`	`+import com.d4rk.androidtutorials.R`
`64`	`66`	`import com.d4rk.androidtutorials.data.model.ui.screens.UiHelpQuestion`
`65`	`67`	`import com.d4rk.androidtutorials.data.model.ui.screens.UiHelpScreen`
`66`	`68`	`import com.d4rk.androidtutorials.ui.components.navigation.TopAppBarScaffoldWithBackButtonAndActions`
`@@ -131,7 +133,7 @@ fun HelpScreen(activity : Activity , viewModel : HelpViewModel) {`
`131`	`133`	`MediumVerticalSpacer()`
`132`	`134`	`ContactUsCard(onClick = {`
`133`	`135`	`view.playSoundEffect(SoundEffectConstants.CLICK)`
`134`		`- viewModel.sendEmailToDeveloper(activity = activity)`
	`136`	`+ IntentsHelper.sendEmailToDeveloper(context = activity , applicationNameRes = R.string.app_name)`
`135`	`137`	`})`
`136`	`138`	`Spacer(modifier = Modifier.height(height = 64.dp))`
`137`	`139`	`}`
`@@ -223,4 +225,4 @@ fun ContactUsCard(onClick : () -> Unit) {`
`223`	`225`	`}`
`224`	`226`	`}`
`225`	`227`	`}`
`226`		`-}`
	`228`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,4 @@ class HelpViewModel(application : Application) : BaseViewModel(application) {`
`53`	`53`	`repository.launchReviewFlowRepository(activity = activity , reviewInfo = reviewInfo)`
`54`	`54`	`}`
`55`	`55`	`}`
`56`		`-`
`57`		`- fun sendEmailToDeveloper(activity: Activity) {`
`58`		`- viewModelScope.launch(context = coroutineExceptionHandler) {`
`59`		`- repository.sendEmailToDeveloperRepository(activity = activity)`
`60`		`- }`
`61`		`- }`
`62`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,7 @@ abstract class HelpRepositoryImplementation(`
`42`	`42`	`}`
`43`	`43`	`}.addOnFailureListener {`
`44`	`44`	`IntentsHelper.openUrl(`
`45`		`- context = application ,`
`46`		`- url = "https://play.google.com/store/apps/details?id=$packageName&showAllReviews=true"`
	`45`	`+ context = application , url = "https://play.google.com/store/apps/details?id=$packageName&showAllReviews=true"`
`47`	`46`	`)`
`48`	`47`	`}`
`49`	`48`	`}`
`@@ -52,8 +51,4 @@ abstract class HelpRepositoryImplementation(`
`52`	`51`	`val reviewManager : ReviewManager = ReviewManagerFactory.create(activity)`
`53`	`52`	`reviewManager.launchReviewFlow(activity , reviewInfo)`
`54`	`53`	`}`
`55`		`-`
`56`		`- fun sendEmailToDeveloperImplementation(activity : Activity) {`
`57`		`- IntentsHelper.sendEmailToDeveloper(context = activity, applicationName = R.string.app_name)`
`58`		`- }`
`59`	`54`	`}`