fix(text-inputs): fix input text disabled color (#141)

Decathlon · Apr 20, 2023 · 38bb2ff · 38bb2ff
1 parent 7b3b043
commit 38bb2ff
Show file tree

Hide file tree

Showing 26 changed files with 37 additions and 2 deletions.
diff --git a/text-inputs/src/main/java/com/decathlon/vitamin/compose/textinputs/VitaminTextInputs.kt b/text-inputs/src/main/java/com/decathlon/vitamin/compose/textinputs/VitaminTextInputs.kt
@@ -96,7 +96,7 @@ object VitaminTextInputs {
                         cursorColor = VitaminTheme.colors.vtmnContentAction,
                         errorCursorColor = VitaminTheme.colors.vtmnContentNegative,
                         textColor = VitaminTheme.colors.vtmnContentPrimary,
-                        disabledTextColor = VitaminTheme.colors.vtmnActiveTertiary.copy(ContentAlpha.disabled),
+                        disabledTextColor = VitaminTheme.colors.vtmnContentTertiary.copy(ContentAlpha.disabled),
                         focusedBorderColor = colors.focusBorderColor,
                         unfocusedBorderColor = colors.borderColor,
                         disabledBorderColor = VitaminTheme.colors.vtmnActiveTertiary.copy(
@@ -265,7 +265,7 @@ object VitaminTextInputs {
                         cursorColor = VitaminTheme.colors.vtmnContentAction,
                         errorCursorColor = VitaminTheme.colors.vtmnContentNegative,
                         textColor = VitaminTheme.colors.vtmnContentPrimary,
-                        disabledTextColor = VitaminTheme.colors.vtmnActiveTertiary.copy(ContentAlpha.disabled),
+                        disabledTextColor = VitaminTheme.colors.vtmnContentTertiary.copy(ContentAlpha.disabled),
                         focusedIndicatorColor = colors.focusBorderColor,
                         unfocusedIndicatorColor = colors.borderColor,
                         disabledIndicatorColor = VitaminTheme.colors.vtmnActiveTertiary.copy(

diff --git a/.../src/test/kotlin/com/decathlon/vitamin/compose/textinputs/VitaminTextInputsPrimaryTest.kt b/.../src/test/kotlin/com/decathlon/vitamin/compose/textinputs/VitaminTextInputsPrimaryTest.kt
@@ -57,6 +57,13 @@ class VitaminTextInputsPrimaryTest(
                             colors = TextInputsState.normal(),
                             enabled = false
                         )
+                        TextInputVariantsFactory.TextInput(
+                            modifier = Modifier.fillMaxWidth(),
+                            variant = variant,
+                            colors = TextInputsState.normal(),
+                            enabled = false,
+                            value = "input"
+                        )
                         TextInputVariantsFactory.TextInput(
                             modifier = Modifier.fillMaxWidth(),
                             variant = variant,
@@ -82,6 +89,20 @@ class VitaminTextInputsPrimaryTest(
                             },
                             enabled = false
                         )
+                        TextInputVariantsFactory.TextInput(
+                            modifier = Modifier.fillMaxWidth(),
+                            variant = variant,
+                            colors = TextInputsState.normal(),
+                            icon = {
+                                Icon(
+                                    painter = painter,
+                                    contentDescription = null
+                                )
+
+                            },
+                            enabled = false,
+                            value = "input"
+                        )
                     }
                 }
             }
@@ -111,6 +132,13 @@ class VitaminTextInputsPrimaryTest(
                             colors = TextInputsState.success(),
                             enabled = false
                         )
+                        TextInputVariantsFactory.TextInput(
+                            modifier = Modifier.fillMaxWidth(),
+                            variant = variant,
+                            colors = TextInputsState.success(),
+                            enabled = false,
+                            value = "input"
+                        )
                     }
                 }
             }
@@ -140,6 +168,13 @@ class VitaminTextInputsPrimaryTest(
                             colors = TextInputsState.error(),
                             enabled = false
                         )
+                        TextInputVariantsFactory.TextInput(
+                            modifier = Modifier.fillMaxWidth(),
+                            variant = variant,
+                            colors = TextInputsState.error(),
+                            enabled = false,
+                            value = "input"
+                        )
                     }
                 }
             }

diff --git a/....vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_error[Filled,Dark].png b/....vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_error[Filled,Dark].png
diff --git a/...vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_error[Filled,Light].png b/...vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_error[Filled,Light].png
diff --git a/....compose.textinputs_VitaminTextInputsPrimaryTest_error[FilledDropdown,Dark].png b/....compose.textinputs_VitaminTextInputsPrimaryTest_error[FilledDropdown,Dark].png
diff --git a/...compose.textinputs_VitaminTextInputsPrimaryTest_error[FilledDropdown,Light].png b/...compose.textinputs_VitaminTextInputsPrimaryTest_error[FilledDropdown,Light].png
diff --git a/...itamin.compose.textinputs_VitaminTextInputsPrimaryTest_error[Outlined,Dark].png b/...itamin.compose.textinputs_VitaminTextInputsPrimaryTest_error[Outlined,Dark].png
diff --git a/...tamin.compose.textinputs_VitaminTextInputsPrimaryTest_error[Outlined,Light].png b/...tamin.compose.textinputs_VitaminTextInputsPrimaryTest_error[Outlined,Light].png
diff --git a/...ompose.textinputs_VitaminTextInputsPrimaryTest_error[OutlinedDropdown,Dark].png b/...ompose.textinputs_VitaminTextInputsPrimaryTest_error[OutlinedDropdown,Dark].png
diff --git a/...mpose.textinputs_VitaminTextInputsPrimaryTest_error[OutlinedDropdown,Light].png b/...mpose.textinputs_VitaminTextInputsPrimaryTest_error[OutlinedDropdown,Light].png
diff --git a/...vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Filled,Dark].png b/...vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Filled,Dark].png
diff --git a/...itamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Filled,Light].png b/...itamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Filled,Light].png
diff --git a/...compose.textinputs_VitaminTextInputsPrimaryTest_normal[FilledDropdown,Dark].png b/...compose.textinputs_VitaminTextInputsPrimaryTest_normal[FilledDropdown,Dark].png
diff --git a/...ompose.textinputs_VitaminTextInputsPrimaryTest_normal[FilledDropdown,Light].png b/...ompose.textinputs_VitaminTextInputsPrimaryTest_normal[FilledDropdown,Light].png
diff --git a/...tamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Dark].png b/...tamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Dark].png
diff --git a/...amin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Light].png b/...amin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Light].png
diff --git a/...mpose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Dark].png b/...mpose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Dark].png
diff --git a/...pose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Light].png b/...pose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Light].png
diff --git a/...itamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Filled,Dark].png b/...itamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Filled,Dark].png
diff --git a/...tamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Filled,Light].png b/...tamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Filled,Light].png
diff --git a/...ompose.textinputs_VitaminTextInputsPrimaryTest_success[FilledDropdown,Dark].png b/...ompose.textinputs_VitaminTextInputsPrimaryTest_success[FilledDropdown,Dark].png
diff --git a/...mpose.textinputs_VitaminTextInputsPrimaryTest_success[FilledDropdown,Light].png b/...mpose.textinputs_VitaminTextInputsPrimaryTest_success[FilledDropdown,Light].png
diff --git a/...amin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Outlined,Dark].png b/...amin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Outlined,Dark].png
diff --git a/...min.compose.textinputs_VitaminTextInputsPrimaryTest_success[Outlined,Light].png b/...min.compose.textinputs_VitaminTextInputsPrimaryTest_success[Outlined,Light].png
diff --git a/...pose.textinputs_VitaminTextInputsPrimaryTest_success[OutlinedDropdown,Dark].png b/...pose.textinputs_VitaminTextInputsPrimaryTest_success[OutlinedDropdown,Dark].png
diff --git a/...ose.textinputs_VitaminTextInputsPrimaryTest_success[OutlinedDropdown,Light].png b/...ose.textinputs_VitaminTextInputsPrimaryTest_success[OutlinedDropdown,Light].png