diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 902eb8b..308a95c 100644 --- a/app/build.gradle.kts +++ b/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" } diff --git a/app/src/main/java/com/cherret/zaprett/ui/screens/HomeScreen.kt b/app/src/main/java/com/cherret/zaprett/ui/screens/HomeScreen.kt index 4465927..6ba200d 100644 --- a/app/src/main/java/com/cherret/zaprett/ui/screens/HomeScreen.kt +++ b/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(null) } + val newVersion = remember { mutableStateOf(null) } val updateAvailable = remember {mutableStateOf(false)} val downloadUrl = remember { mutableStateOf(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, 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 = { diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 281ae80..500ce56 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -4,6 +4,7 @@ Хосты Настройки Продолжить + Обновить Отмена Привет в zaprett! Это приложение предназначено для обхода цензуры и иных блокировок. Для полноценной работоспособности необходимо установить Magisk модуль. Использовать модуль @@ -25,6 +26,8 @@ Перезапустить сервис Переодически перезапускать сервис Авто обновление + Версия + Список изменений Сервис уже запущен. Запускаем сервис... Сервис не запущен diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9c02e62..3182c71 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,6 +4,7 @@ Hosts Settings Continue + Update Dismiss Hello to zaprett! This application is designed to bypass censorship and other blockages. For full functionality you need to install Magisk module. Use module @@ -25,6 +26,8 @@ Restart service Restart service periodicaly Autoupdate + Version + Changelog Service already started. Starting service... Service is not launched