Divide DecorationBox code and fix placeholder

Foundy-LLC · Jan 26, 2024 · 31f33b0 · 31f33b0
1 parent 3c4449a
commit 31f33b0
Showing 1 changed file with 44 additions and 26 deletions.
diff --git a/core/designsystem/src/main/java/io/foundy/core/designsystem/component/TextField.kt b/core/designsystem/src/main/java/io/foundy/core/designsystem/component/TextField.kt
@@ -191,32 +191,13 @@ fun CamstudyTextField(
             visualTransformation = visualTransformation,
             cursorBrush = SolidColor(colorScheme.primary),
             decorationBox = { innerTextField ->
-                Box(
-                    modifier = Modifier
-                        .heightIn(min = 48.dp)
-                        .padding(horizontal = 16.dp)
-                ) {
-                    val verticalAlignmentModifier = Modifier.align(Alignment.CenterStart)
-
-                    if (value.isEmpty() && placeholder != null) {
-                        CamstudyText(
-                            modifier = verticalAlignmentModifier,
-                            text = placeholder,
-                            style = textStyle
-                        )
-                    }
-                    Row(
-                        modifier = verticalAlignmentModifier,
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        if (prefix != null) {
-                            ProvideTextStyle(value = CamstudyTextFieldTextStyle) {
-                                prefix()
-                            }
-                        }
-                        innerTextField()
-                    }
-                }
+                DecorationBox(
+                    value = value,
+                    textStyle = textStyle,
+                    placeholder = placeholder,
+                    prefix = prefix,
+                    innerTextField = innerTextField
+                )
             }
         )
         supportingContent?.invoke()
@@ -230,6 +211,43 @@ fun CamstudyTextField(
     }
 }
 
+@Composable
+private fun DecorationBox(
+    value: String,
+    textStyle: TextStyle,
+    placeholder: String?,
+    prefix: (@Composable () -> Unit)?,
+    innerTextField: @Composable () -> Unit,
+) {
+    Box(
+        modifier = Modifier
+            .heightIn(min = 48.dp)
+            .padding(horizontal = 16.dp)
+    ) {
+        val verticalAlignmentModifier = Modifier.align(Alignment.CenterStart)
+
+        Row(
+            modifier = verticalAlignmentModifier,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            if (prefix != null) {
+                ProvideTextStyle(value = CamstudyTextFieldTextStyle) {
+                    prefix()
+                }
+            }
+            if (value.isEmpty() && placeholder != null) {
+                CamstudyText(
+                    modifier = verticalAlignmentModifier,
+                    text = placeholder,
+                    style = textStyle
+                )
+            } else {
+                innerTextField()
+            }
+        }
+    }
+}
+
 @Preview(showBackground = true)
 @Composable
 fun CamstudyTextFieldPreview() {