Merge pull request #37 from GSM-MSG/feature/#33_apply_changed_textfield

🔀 :: (#33) - Apply changed Textfield
School-of-Company · Oct 25, 2023 · 2e2986a · 2e2986a
2 parents edd42c6 + e3ec729
commit 2e2986a
Showing 1 changed file with 29 additions and 5 deletions.
diff --git a/...esign-system/src/main/java/com/msg/design_system/component/textfield/BitgoeulTextField.kt b/...esign-system/src/main/java/com/msg/design_system/component/textfield/BitgoeulTextField.kt
@@ -1,5 +1,6 @@
 package com.msg.design_system.component.textfield
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -61,16 +62,18 @@ fun EmailTextField(
                         color = when {
                             isDisabled -> colors.G1
                             isError -> colors.E5
-                            text.isNotEmpty() && !isFocused.value -> colors.BLACK
-                            text.isEmpty() && !isFocused.value -> colors.G1
+                            text.isNotEmpty() -> colors.G1
                             isFocused.value -> colors.P5
                             else -> colors.G1
                         },
                         shape = RoundedCornerShape(8.dp)
                     )
                     .onFocusChanged {
                         isFocused.value = it.isFocused
-                    },
+                    }
+                    .background(
+                        color = if (isDisabled) colors.G9 else Color.Transparent
+                    ),
                 textStyle = typography.bodySmall,
                 colors = TextFieldDefaults.outlinedTextFieldColors(
                     placeholderColor = colors.G2,
@@ -80,6 +83,7 @@ fun EmailTextField(
                     disabledTextColor = colors.G1,
                     cursorColor = colors.P5
                 ),
+                enabled = !isDisabled,
                 placeholder = {
                     Text(text = placeholder, style = typography.bodySmall)
                 },
@@ -152,12 +156,18 @@ fun PasswordTextField(
                         color = when {
                             isDisabled -> colors.G1
                             isError -> colors.E5
-                            text.isNotEmpty()&&!isFocused.value -> colors.BLACK
-                            text.isEmpty()&&!isFocused.value -> colors.G1
+                            text.isNotEmpty() -> colors.G1
                             isFocused.value -> colors.P5
                             else -> colors.G1
                         },
                         shape = RoundedCornerShape(8.dp)
+                    )
+                    .onFocusChanged {
+                        isFocused.value = it.isFocused
+                    }
+                    .background(
+                        color = if (isDisabled) colors.G9 else Color.Transparent,
+                        shape = RoundedCornerShape(8.dp)
                     ),
                 textStyle = typography.bodySmall,
                 colors = TextFieldDefaults.outlinedTextFieldColors(
@@ -168,6 +178,7 @@ fun PasswordTextField(
                     disabledTextColor = colors.G1,
                     cursorColor = colors.P5
                 ),
+                enabled = !isDisabled,
                 visualTransformation = if (showPassword) {
                     VisualTransformation.None
                 } else {
@@ -263,5 +274,18 @@ fun TextFieldPre() {
             linkText = "Sign Up",
             isDisabled = false
         )
+
+        PasswordTextField(
+            modifier = Modifier
+                .width(320.dp)
+                .height(52.dp),
+            placeholder = "Put Password",
+            errorText = "Incorrect Password",
+            onValueChange = {},
+            onClickLink = {},
+            isError = false,
+            isLinked = false,
+            isDisabled = true
+        )
     }
 }