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..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 @@ -132,9 +132,11 @@ internal fun CoreTextField( value: String, onValueChange: (String) -> Unit, modifier: Modifier = Modifier, + textFieldModifier: Modifier = Modifier, title: String? = null, placeholder: String? = null, error: TextOrResource? = null, + readOnly: Boolean = false, leadingIcon: @Composable (() -> Unit)? = null, trailingIcon: @Composable (() -> Unit)? = null, visualTransformation: VisualTransformation = VisualTransformation.None, @@ -162,18 +164,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 +192,15 @@ internal fun CoreTextField( onValueChange(newTextFieldValue.text) } }, + textStyle = Theme.typography.body7, + readOnly = readOnly, 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,9 +268,11 @@ fun PrimaryTextField( value: String, onValueChange: (String) -> Unit, modifier: Modifier = Modifier, + textFieldModifier: Modifier = Modifier, title: String? = null, placeholder: String? = null, error: TextOrResource? = null, + readOnly: Boolean = false, leadingIcon: Painter? = null, leadingIconContentDescription: String? = null, trailingIcon: Painter? = null, @@ -284,8 +290,10 @@ fun PrimaryTextField( value = value, onValueChange = onValueChange, modifier = modifier, + textFieldModifier = textFieldModifier, title = title, placeholder = placeholder, + readOnly = readOnly, error = error, visualTransformation = visualTransformation, keyboardOptions = keyboardOptions, @@ -346,6 +354,7 @@ fun SearchTextField( value: String, onValueChange: (String) -> Unit, modifier: Modifier = Modifier, + textFieldModifier: Modifier = Modifier, title: String? = null, placeholder: String, suggestions: List, @@ -366,6 +375,7 @@ fun SearchTextField( value = value, title = title, onValueChange = onValueChange, + textFieldModifier = textFieldModifier, placeholder = placeholder, enabled = enabled, colors = colors,