Toast on up to date

* Update confirm dialog button texts

Author: paulcoding810

app/src/main/java/com/paulcoding/hviewer/network/Github.kt

@@ -159,7 +159,7 @@ sealed class SiteConfigsState {
 
     fun getToastMessage() = when (this) {
         is NewConfigsInstall -> R.string.scripts_installed
-        is UpToDate -> R.string.up_to_Date
+        is UpToDate -> R.string.up_to_date
         is Updated -> R.string.scripts_updated
     }
 }

app/src/main/java/com/paulcoding/hviewer/ui/component/ConfirmDialog.kt

@@ -17,6 +17,8 @@ fun ConfirmDialog(
     text: String = "",
     confirmColor: Color? = null,
     dismissColor: Color? = null,
+    confirmText: String? = null,
+    dismissText: String? = null,
     onDismiss: () -> Unit,
     onConfirm: () -> Unit
 ) {
@@ -28,15 +30,15 @@ fun ConfirmDialog(
             confirmButton = {
                 TextButton(onClick = { onConfirm() }) {
                     Text(
-                        stringResource(R.string.confirm),
+                        confirmText ?: stringResource(R.string.confirm),
                         color = confirmColor ?: MaterialTheme.colorScheme.error
                     )
                 }
             },
             dismissButton = {
                 TextButton(onClick = { onDismiss() }) {
                     Text(
-                        stringResource(R.string.cancel),
+                        dismissText ?: stringResource(R.string.cancel),
                         color = dismissColor ?: MaterialTheme.colorScheme.onBackground
                     )
                 }

app/src/main/java/com/paulcoding/hviewer/ui/page/AppViewModel.kt

@@ -2,6 +2,7 @@ package com.paulcoding.hviewer.ui.page
 
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -190,10 +191,18 @@ class AppViewModel : ViewModel() {
         }
     }
 
-    fun checkForUpdate(currentVersion: String, onUpdateAvailable: (String, String) -> Unit) {
+    fun checkForUpdate(
+        currentVersion: String,
+        onUpToDate: () -> Unit,
+        onUpdateAvailable: (String, String) -> Unit
+    ) {
         viewModelScope.launch {
             _stateFlow.update { it.copy(updatingApk = true) }
-            Github.checkForUpdate(currentVersion, onUpdateAvailable)
+            val release = Github.checkForUpdate(currentVersion)
+            if (release != null)
+                onUpdateAvailable(release.version, release.downloadUrl)
+            else
+                onUpToDate()
             _stateFlow.update { it.copy(updatingApk = false) }
         }
     }
@@ -207,13 +216,17 @@ class AppViewModel : ViewModel() {
                     "${context.packageName}.fileprovider",
                     file
                 )
-                val intent = Intent(Intent.ACTION_VIEW).apply {
-                    setDataAndType(uri, "application/vnd.android.package-archive")
-                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION
-                }
-                context.startActivity(intent)
+                installApk(context, uri)
             }
             _stateFlow.update { it.copy(updatingApk = false) }
         }
     }
+
+    fun installApk(context: Context, uri: Uri) {
+        val intent = Intent(Intent.ACTION_VIEW).apply {
+            setDataAndType(uri, "application/vnd.android.package-archive")
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION
+        }
+        context.startActivity(intent)
+    }
 }

app/src/main/java/com/paulcoding/hviewer/ui/page/settings/SettingsPage.kt

@@ -166,10 +166,14 @@ fun SettingsPage(
                     appViewModel.setDevMode(it)
                 }
                 HIcon(Icons.Outlined.Update, tint = MaterialTheme.colorScheme.primary) {
-                    appViewModel.checkForUpdate(BuildConfig.VERSION_NAME) { version, url ->
-                        newVersion = version
-                        downloadUrl = url
-                    }
+                    appViewModel.checkForUpdate(BuildConfig.VERSION_NAME,
+                        onUpToDate = {
+                            makeToast(R.string.up_to_date)
+                        },
+                        onUpdateAvailable = { version, url ->
+                            newVersion = version
+                            downloadUrl = url
+                        })
                 }
             }
         }
@@ -194,9 +198,10 @@ fun SettingsPage(
 
     ConfirmDialog(
         showDialog = newVersion.isNotEmpty(),
-        title = "Update Available",
+        title = stringResource(R.string.update_available),
         text = newVersion,
         confirmColor = MaterialTheme.colorScheme.primary,
+        confirmText = stringResource(R.string.install_now),
         dismissColor = MaterialTheme.colorScheme.onBackground,
         onDismiss = {
             newVersion = ""

app/src/main/res/values/strings.xml

@@ -42,7 +42,7 @@
     <string name="version_">Version %1$s</string>
     <string name="scripts_installed">Scripts Installed</string>
     <string name="from_repo_">From repo %1$s</string>
-    <string name="up_to_Date">Up to date</string>
+    <string name="up_to_date">Up to date</string>
     <string name="h_viewer_scripts_url">https://github.com/paulcoding810/h-viewer-scripts</string>
     <string name="branch">Branch</string>
     <string name="clear_history">Clear history</string>
@@ -52,4 +52,5 @@
     <string name="install_now">Install now</string>
     <string name="error">Error</string>
     <string name="install">Install</string>
+    <string name="update_available">Update Available</string>
 </resources>