Minor Update

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "com.cherret.zaprett"
         minSdk = 30
         targetSdk = 35
-        versionCode = 3
-        versionName = "1.2"
+        versionCode = 4
+        versionName = "1.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/cherret/zaprett/ui/screens/HomeScreen.kt

@@ -62,6 +62,7 @@ fun HomeScreen() {
     val sharedPreferences = remember { context.getSharedPreferences("settings", MODE_PRIVATE) }
     val cardText = remember { mutableStateOf(R.string.status_not_availible) }
     val changeLog = remember { mutableStateOf<String?>(null) }
+    val newVersion = remember { mutableStateOf<String?>(null) }
     val updateAvailable = remember {mutableStateOf(false)}
     val downloadUrl = remember { mutableStateOf<String?>(null) }
     var showUpdateDialog by remember { mutableStateOf(false) }
@@ -75,6 +76,7 @@ fun HomeScreen() {
                     getChangelog(it.changelogUrl.toString()) {
                         changeLog.value = it
                     }
+                    newVersion.value = it.version?.toString()
                     updateAvailable.value = true
                 }
             }
@@ -144,7 +146,7 @@ fun HomeScreen() {
                             defaultElevation = 6.dp
                         ),
                         colors = CardDefaults.cardColors(
-                            containerColor = MaterialTheme.colorScheme.primaryContainer,
+                            containerColor = MaterialTheme.colorScheme.surfaceVariant,
                         ),
                         modifier = Modifier
                             .fillMaxWidth()
@@ -166,7 +168,7 @@ fun HomeScreen() {
                     }
                 }
                 if (showUpdateDialog) {
-                    UpdateDialog(context, downloadUrl.value.toString(), changeLog.value.toString(), onDismiss = { showUpdateDialog = false })
+                    UpdateDialog(context, downloadUrl.value.toString(), changeLog.value.toString(), newVersion, onDismiss = { showUpdateDialog = false })
                 }
                 FilledTonalButton(
                     onClick = { onBtnStartService(context, snackbarHostState, scope) },
@@ -299,10 +301,10 @@ fun onBtnRestart(context: Context, snackbarHostState: SnackbarHostState, scope:
 
 
 @Composable
-fun UpdateDialog(context: Context, downloadUrl: String, changeLog: String, onDismiss: () -> Unit) {
+fun UpdateDialog(context: Context, downloadUrl: String, changeLog: String, newVersion: MutableState<String?>, onDismiss: () -> Unit) {
     AlertDialog(
         title = { Text(text = stringResource(R.string.update_available)) },
-        text = { Text(text = changeLog) },
+        text = { Text(text = "${stringResource(R.string.alert_version)}: ${context.packageManager.getPackageInfo(context.packageName, 0).versionName} —> ${newVersion.value}\n${stringResource(R.string.alert_changelog)}:\n$changeLog") },
         onDismissRequest = onDismiss,
         confirmButton = {
             TextButton(onClick = {
@@ -312,7 +314,7 @@ fun UpdateDialog(context: Context, downloadUrl: String, changeLog: String, onDis
                     installApk(context, uri)
                 }
             }) {
-                Text(stringResource(R.string.btn_continue))
+                Text(stringResource(R.string.btn_update))
             }
         },
         dismissButton = {

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

@@ -4,6 +4,7 @@
     <string name="title_hosts">Хосты</string>
     <string name="title_settings">Настройки</string>
     <string name="btn_continue">Продолжить</string>
+    <string name="btn_update">Обновить</string>
     <string name="btn_dismiss">Отмена</string>
     <string name="text_welcome">Привет в zaprett! Это приложение предназначено для обхода цензуры и иных блокировок. Для полноценной работоспособности необходимо установить Magisk модуль.</string>
     <string name="btn_use_root">Использовать модуль</string>
@@ -25,6 +26,8 @@
     <string name="btn_restart_service">Перезапустить сервис</string>
     <string name="btn_autorestart">Переодически перезапускать сервис</string>
     <string name="btn_autoupdate">Авто обновление</string>
+    <string name="alert_version">Версия</string>
+    <string name="alert_changelog">Список изменений</string>
     <string name="snack_already_started">Сервис уже запущен.</string>
     <string name="snack_starting_service">Запускаем сервис...</string>
     <string name="snack_no_service">Сервис не запущен</string>

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

@@ -4,6 +4,7 @@
     <string name="title_hosts">Hosts</string>
     <string name="title_settings">Settings</string>
     <string name="btn_continue">Continue</string>
+    <string name="btn_update">Update</string>
     <string name="btn_dismiss">Dismiss</string>
     <string name="text_welcome">Hello to zaprett! This application is designed to bypass censorship and other blockages. For full functionality you need to install Magisk module.</string>
     <string name="btn_use_root">Use module</string>
@@ -25,6 +26,8 @@
     <string name="btn_restart_service">Restart service</string>
     <string name="btn_autorestart">Restart service periodicaly</string>
     <string name="btn_autoupdate">Autoupdate</string>
+    <string name="alert_version">Version</string>
+    <string name="alert_changelog">Changelog</string>
     <string name="snack_already_started">Service already started.</string>
     <string name="snack_starting_service">Starting service...</string>
     <string name="snack_no_service">Service is not launched</string>