From 6bf0eaab201a742a3ffb099f8802dd9f2b3b026d Mon Sep 17 00:00:00 2001 From: MODDII Date: Mon, 30 Mar 2026 19:06:04 +0300 Subject: [PATCH 1/2] =?UTF-8?q?ANDR-95-fix-text-field:=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B2=D1=82=D0=BE=D1=80=D0=BE?= =?UTF-8?q?=D0=B9=20modifier=20=D0=B4=D0=BB=D1=8F=20OutlinedTextField.=20?= =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20=D1=88=D1=80=D0=B8?= =?UTF-8?q?=D1=84=D1=82=D1=8B=20=D0=B8=20=D0=BE=D1=82=D1=81=D1=82=D1=83?= =?UTF-8?q?=D0=BF=D1=8B=20=D1=81=D0=BE=D0=B3=D0=BB=D0=B0=D1=81=D0=BD=D0=BE?= =?UTF-8?q?=20=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD=D1=83=20=D0=B2=20=D1=84?= =?UTF-8?q?=D0=B8=D0=B3=D0=BC=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/yeahub/core_ui/component/TextField.kt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/core/ui/src/main/java/ru/yeahub/core_ui/component/TextField.kt b/core/ui/src/main/java/ru/yeahub/core_ui/component/TextField.kt index 2f1b8de4..2be1b716 100644 --- a/core/ui/src/main/java/ru/yeahub/core_ui/component/TextField.kt +++ b/core/ui/src/main/java/ru/yeahub/core_ui/component/TextField.kt @@ -132,6 +132,7 @@ internal fun CoreTextField( value: String, onValueChange: (String) -> Unit, modifier: Modifier = Modifier, + textFieldModifier: Modifier = Modifier, title: String? = null, placeholder: String? = null, error: TextOrResource? = null, @@ -162,18 +163,18 @@ internal fun CoreTextField( Column( modifier = modifier, - verticalArrangement = Arrangement.spacedBy(4.dp) + verticalArrangement = Arrangement.spacedBy(8.dp) ) { if (title != null) { Text( text = title, - style = Theme.typography.body2Accent, + style = Theme.typography.body7, color = colors.titleColor ) } OutlinedTextField( - modifier = Modifier + modifier = textFieldModifier .fillMaxWidth() .onFocusChanged { onFocusChanged(it.isFocused) } .then( @@ -190,13 +191,14 @@ internal fun CoreTextField( onValueChange(newTextFieldValue.text) } }, + textStyle = Theme.typography.body7, enabled = enabled, isError = error != null, visualTransformation = visualTransformation, keyboardOptions = keyboardOptions, keyboardActions = keyboardActions, placeholder = placeholder?.let { - { Text(text = it, style = Theme.typography.body2, color = colors.placeholderColor) } + { Text(text = it, style = Theme.typography.body7, color = colors.placeholderColor) } }, leadingIcon = leadingIcon, trailingIcon = trailingIcon, @@ -264,6 +266,7 @@ fun PrimaryTextField( value: String, onValueChange: (String) -> Unit, modifier: Modifier = Modifier, + textFieldModifier: Modifier = Modifier, title: String? = null, placeholder: String? = null, error: TextOrResource? = null, @@ -284,6 +287,7 @@ fun PrimaryTextField( value = value, onValueChange = onValueChange, modifier = modifier, + textFieldModifier = textFieldModifier, title = title, placeholder = placeholder, error = error, @@ -346,6 +350,7 @@ fun SearchTextField( value: String, onValueChange: (String) -> Unit, modifier: Modifier = Modifier, + textFieldModifier: Modifier = Modifier, title: String? = null, placeholder: String, suggestions: List, @@ -366,6 +371,7 @@ fun SearchTextField( value = value, title = title, onValueChange = onValueChange, + textFieldModifier = textFieldModifier, placeholder = placeholder, enabled = enabled, colors = colors, From 2e1d7b42cfddd5f89c4dbde93ebcd61ab15fe327 Mon Sep 17 00:00:00 2001 From: MODDII Date: Tue, 31 Mar 2026 21:57:01 +0300 Subject: [PATCH 2/2] =?UTF-8?q?ANDR-95-fix-text-field:=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=D0=B5=D0=BD=20=D0=BF=D0=B0=D1=80?= =?UTF-8?q?=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20=D0=BF=D0=BE=20=D1=83=D0=BC?= =?UTF-8?q?=D0=BE=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E=20-=20readOnly:=20Bo?= =?UTF-8?q?olean=20=3D=20false,=20=D0=B8=20=D0=BF=D1=80=D0=BE=D0=B1=D1=80?= =?UTF-8?q?=D0=BE=D1=88=D0=B5=D0=BD=20=D0=B2=20=D0=BE=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D1=84=D1=83=D0=BD=D0=BA=D1=86?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/src/main/java/ru/yeahub/core_ui/component/TextField.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/ui/src/main/java/ru/yeahub/core_ui/component/TextField.kt b/core/ui/src/main/java/ru/yeahub/core_ui/component/TextField.kt index 2be1b716..422a38c0 100644 --- a/core/ui/src/main/java/ru/yeahub/core_ui/component/TextField.kt +++ b/core/ui/src/main/java/ru/yeahub/core_ui/component/TextField.kt @@ -136,6 +136,7 @@ internal fun CoreTextField( title: String? = null, placeholder: String? = null, error: TextOrResource? = null, + readOnly: Boolean = false, leadingIcon: @Composable (() -> Unit)? = null, trailingIcon: @Composable (() -> Unit)? = null, visualTransformation: VisualTransformation = VisualTransformation.None, @@ -192,6 +193,7 @@ internal fun CoreTextField( } }, textStyle = Theme.typography.body7, + readOnly = readOnly, enabled = enabled, isError = error != null, visualTransformation = visualTransformation, @@ -270,6 +272,7 @@ fun PrimaryTextField( title: String? = null, placeholder: String? = null, error: TextOrResource? = null, + readOnly: Boolean = false, leadingIcon: Painter? = null, leadingIconContentDescription: String? = null, trailingIcon: Painter? = null, @@ -290,6 +293,7 @@ fun PrimaryTextField( textFieldModifier = textFieldModifier, title = title, placeholder = placeholder, + readOnly = readOnly, error = error, visualTransformation = visualTransformation, keyboardOptions = keyboardOptions,