fix: readable push notification settings on device screen (0.4.6)
Use explicit onSurface/primary text colors and a themed Surface background. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -13,8 +13,8 @@ android {
|
|||||||
applicationId = "ru.kalinamall.seaca"
|
applicationId = "ru.kalinamall.seaca"
|
||||||
minSdk = 26
|
minSdk = 26
|
||||||
targetSdk = 35
|
targetSdk = 35
|
||||||
versionCode = 9
|
versionCode = 10
|
||||||
versionName = "0.4.5"
|
versionName = "0.4.6"
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import androidx.compose.material3.Button
|
|||||||
import androidx.compose.material3.CircularProgressIndicator
|
import androidx.compose.material3.CircularProgressIndicator
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.RadioButton
|
import androidx.compose.material3.RadioButton
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
@@ -212,6 +213,10 @@ fun DeviceScreen(repo: SacRepository, onLogout: () -> Unit) {
|
|||||||
deviceId = repo.session.getDeviceId()
|
deviceId = repo.session.getDeviceId()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Surface(
|
||||||
|
modifier = Modifier.fillMaxSize(),
|
||||||
|
color = MaterialTheme.colorScheme.background,
|
||||||
|
) {
|
||||||
Column(
|
Column(
|
||||||
Modifier
|
Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
@@ -220,7 +225,11 @@ fun DeviceScreen(repo: SacRepository, onLogout: () -> Unit) {
|
|||||||
.navigationBarsPadding(),
|
.navigationBarsPadding(),
|
||||||
verticalArrangement = Arrangement.spacedBy(8.dp),
|
verticalArrangement = Arrangement.spacedBy(8.dp),
|
||||||
) {
|
) {
|
||||||
Text("Моё устройство", style = MaterialTheme.typography.titleLarge)
|
Text(
|
||||||
|
"Моё устройство",
|
||||||
|
style = MaterialTheme.typography.titleLarge,
|
||||||
|
color = MaterialTheme.colorScheme.onSurface,
|
||||||
|
)
|
||||||
Field("Сервер", baseUrl ?: "—")
|
Field("Сервер", baseUrl ?: "—")
|
||||||
Field("Пользователь", username ?: "—")
|
Field("Пользователь", username ?: "—")
|
||||||
Field("Роль", role ?: "—")
|
Field("Роль", role ?: "—")
|
||||||
@@ -230,6 +239,7 @@ fun DeviceScreen(repo: SacRepository, onLogout: () -> Unit) {
|
|||||||
Text(
|
Text(
|
||||||
stringResource(R.string.notification_mode_title),
|
stringResource(R.string.notification_mode_title),
|
||||||
style = MaterialTheme.typography.titleMedium,
|
style = MaterialTheme.typography.titleMedium,
|
||||||
|
color = MaterialTheme.colorScheme.primary,
|
||||||
modifier = Modifier.padding(top = 8.dp),
|
modifier = Modifier.padding(top = 8.dp),
|
||||||
)
|
)
|
||||||
NotificationMode.entries.forEach { mode ->
|
NotificationMode.entries.forEach { mode ->
|
||||||
@@ -249,6 +259,7 @@ fun DeviceScreen(repo: SacRepository, onLogout: () -> Unit) {
|
|||||||
mode.label,
|
mode.label,
|
||||||
modifier = Modifier.padding(start = 8.dp),
|
modifier = Modifier.padding(start = 8.dp),
|
||||||
style = MaterialTheme.typography.bodyMedium,
|
style = MaterialTheme.typography.bodyMedium,
|
||||||
|
color = MaterialTheme.colorScheme.onSurface,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -264,6 +275,7 @@ fun DeviceScreen(repo: SacRepository, onLogout: () -> Unit) {
|
|||||||
) { Text("Выйти") }
|
) { Text("Выйти") }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun DetailFrame(
|
private fun DetailFrame(
|
||||||
|
|||||||
Reference in New Issue
Block a user