Fix trailing text color when text field is disabled

Orange-OpenSource · May 12, 2022 · e87ef0e · e87ef0e
1 parent ce38d52
commit e87ef0e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/src/main/java/com/orange/ods/compose/component/textfield/OdsTextField.kt b/lib/src/main/java/com/orange/ods/compose/component/textfield/OdsTextField.kt
@@ -144,7 +144,7 @@ fun OdsTextField(
                         modifier = Modifier.padding(end = dimensionResource(id = R.dimen.ods_spacing_xs)),
                         text = trailingText,
                         style = MaterialTheme.typography.subtitle1,
-                        color = MaterialTheme.colors.trailingTextColor(value.isEmpty())
+                        color = MaterialTheme.colors.trailingTextColor(value.isEmpty(), enabled)
                     )
                 }
             }
@@ -178,8 +178,8 @@ private fun OdsTextFieldIcon(painter: Painter, contentDescription: String?, onCl
 }
 
 @Composable
-private fun Colors.trailingTextColor(isValueEmpty: Boolean = false) =
-    if (isValueEmpty) {
+private fun Colors.trailingTextColor(isValueEmpty: Boolean, isTextFieldEnabled: Boolean) =
+    if (isValueEmpty || !isTextFieldEnabled) {
         MaterialTheme.colors.onSurface.copy(alpha = ContentAlpha.disabled)
     } else {
         MaterialTheme.colors.onSurface