From ef9a391caf76cdfe521670e23fa0b620e75a80b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B0=D1=88=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BC?= Date: Sat, 23 Dec 2023 22:01:46 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=20?= =?UTF-8?q?=D1=86=D0=B2=D0=B5=D1=82=D0=B0,=20=D0=BD=D0=B5=20=D1=81=D0=BC?= =?UTF-8?q?=D0=BE=D0=B3=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D1=82=D1=8C?= =?UTF-8?q?=20=D0=BA=D1=83=D1=80=D1=81=D0=BE=D1=80=20:(?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../database/entities/composeui/UserProfile.kt | 7 +++++-- server/data.json | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/myapplication/database/entities/composeui/UserProfile.kt b/app/src/main/java/com/example/myapplication/database/entities/composeui/UserProfile.kt index a6ff373..4956f8f 100644 --- a/app/src/main/java/com/example/myapplication/database/entities/composeui/UserProfile.kt +++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/UserProfile.kt @@ -28,6 +28,7 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel @@ -74,11 +75,12 @@ fun UserProfile( ) BasicTextField( value = username, + textStyle = TextStyle(color = MaterialTheme.colorScheme.background), onValueChange = { newValue -> username = newValue }, modifier = Modifier .fillMaxWidth() .size(36.dp) - .background(MaterialTheme.colorScheme.secondary, RoundedCornerShape(18.dp)) + .background(MaterialTheme.colorScheme.onBackground, RoundedCornerShape(18.dp)) .padding(start = 13.dp, top = 8.dp) ) @@ -88,11 +90,12 @@ fun UserProfile( ) BasicTextField( value = password, + textStyle = TextStyle(color = MaterialTheme.colorScheme.background), onValueChange = { newValue -> password = newValue }, modifier = Modifier .fillMaxWidth() .size(36.dp) - .background(MaterialTheme.colorScheme.secondary, RoundedCornerShape(18.dp)) + .background(MaterialTheme.colorScheme.onBackground, RoundedCornerShape(18.dp)) .padding(start = 13.dp, top = 8.dp), visualTransformation = PasswordVisualTransformation() ) diff --git a/server/data.json b/server/data.json index dd031bd..1425982 100644 --- a/server/data.json +++ b/server/data.json @@ -51,6 +51,11 @@ "id": 8, "login": "ickxkx", "password": "dpldllflfl" + }, + { + "id": 9, + "login": "привет", + "password": "привет" } ], "rents": [