From 2aaea30468b2c0b7dbc684c0da8906585a5496db Mon Sep 17 00:00:00 2001 From: PTah Date: Sun, 14 Jun 2026 17:51:11 +1000 Subject: [PATCH] =?UTF-8?q?chore:=20dev-=D0=B7=D0=B0=D0=B3=D0=BB=D1=83?= =?UTF-8?q?=D1=88=D0=BA=D0=B8=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BE=D0=B1=D0=BA=D0=B0=D1=82=D0=BA=D0=B8?= =?UTF-8?q?=20(0.5.2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prefill URL, логина, пароля и имени устройства только в debug-сборке. --- app/build.gradle.kts | 4 ++-- .../seaca/ui/screens/ConnectScreen.kt | 18 ++++++++++++++---- .../seaca/ui/screens/DevConnectDefaults.kt | 12 ++++++++++++ 3 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 app/src/main/java/ru/kalinamall/seaca/ui/screens/DevConnectDefaults.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 30ef0c8..48aba64 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,8 +13,8 @@ android { applicationId = "ru.kalinamall.seaca" minSdk = 26 targetSdk = 35 - versionCode = 15 - versionName = "0.5.1" + versionCode = 16 + versionName = "0.5.2" } buildTypes { diff --git a/app/src/main/java/ru/kalinamall/seaca/ui/screens/ConnectScreen.kt b/app/src/main/java/ru/kalinamall/seaca/ui/screens/ConnectScreen.kt index 6ba30af..39a84ce 100644 --- a/app/src/main/java/ru/kalinamall/seaca/ui/screens/ConnectScreen.kt +++ b/app/src/main/java/ru/kalinamall/seaca/ui/screens/ConnectScreen.kt @@ -22,6 +22,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch +import ru.kalinamall.seaca.BuildConfig import ru.kalinamall.seaca.data.SacRepository @Composable @@ -29,11 +30,20 @@ fun ConnectScreen( repo: SacRepository, onConnected: () -> Unit, ) { - var serverUrl by remember { mutableStateOf("") } + val devDefaults = BuildConfig.DEBUG + var serverUrl by remember { + mutableStateOf(if (devDefaults) DevConnectDefaults.SERVER_URL else "") + } var enrollmentCode by remember { mutableStateOf("") } - var username by remember { mutableStateOf("") } - var password by remember { mutableStateOf("") } - var displayName by remember { mutableStateOf(android.os.Build.MODEL) } + var username by remember { + mutableStateOf(if (devDefaults) DevConnectDefaults.USERNAME else "") + } + var password by remember { + mutableStateOf(if (devDefaults) DevConnectDefaults.PASSWORD else "") + } + var displayName by remember { + mutableStateOf(if (devDefaults) DevConnectDefaults.DISPLAY_NAME else android.os.Build.MODEL) + } var trustCert by remember { mutableStateOf(false) } var loading by remember { mutableStateOf(false) } var error by remember { mutableStateOf(null) } diff --git a/app/src/main/java/ru/kalinamall/seaca/ui/screens/DevConnectDefaults.kt b/app/src/main/java/ru/kalinamall/seaca/ui/screens/DevConnectDefaults.kt new file mode 100644 index 0000000..57962ef --- /dev/null +++ b/app/src/main/java/ru/kalinamall/seaca/ui/screens/DevConnectDefaults.kt @@ -0,0 +1,12 @@ +package ru.kalinamall.seaca.ui.screens + +/** + * Временные значения для обкатки. Удалить перед релизом. + * Используются только в debug-сборке ([ru.kalinamall.seaca.BuildConfig.DEBUG]). + */ +internal object DevConnectDefaults { + const val SERVER_URL = "https://sac-api.kalinamall.ru" + const val USERNAME = "admin" + const val PASSWORD = "R3tt3tnatur" + const val DISPLAY_NAME = "papas s25" +}