TextInputLayout now supports Material 3

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-07-30 00:12:24 +02:00
parent 0c4513678d
commit 6075191bc5
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B

View File

@ -350,8 +350,7 @@ class ViewThemeUtils @Inject constructor(private val theme: ServerTheme, private
} }
fun colorEditText(editText: EditText) { fun colorEditText(editText: EditText) {
withElementColor(editText) { color -> withScheme(editText) { scheme ->
editText.setTextColor(color)
// TODO check API-level compatibility // TODO check API-level compatibility
// editText.background.setColorFilter(color, PorterDuff.Mode.SRC_ATOP) // editText.background.setColorFilter(color, PorterDuff.Mode.SRC_ATOP)
editText.backgroundTintList = ColorStateList( editText.backgroundTintList = ColorStateList(
@ -360,16 +359,18 @@ class ViewThemeUtils @Inject constructor(private val theme: ServerTheme, private
intArrayOf(android.R.attr.state_focused) intArrayOf(android.R.attr.state_focused)
), ),
intArrayOf( intArrayOf(
Color.GRAY, scheme.outline,
color scheme.primary
) )
) )
editText.setHintTextColor(scheme.onSurfaceVariant)
editText.setTextColor(scheme.onSurface)
} }
} }
fun colorTextInputLayout(textInputLayout: TextInputLayout) { fun colorTextInputLayout(textInputLayout: TextInputLayout) {
withElementColor(textInputLayout) { color -> withScheme(textInputLayout) { scheme ->
val errorColor = Color.GRAY val errorColor = scheme.onSurfaceVariant
val errorColorStateList = ColorStateList( val errorColorStateList = ColorStateList(
arrayOf( arrayOf(
@ -387,8 +388,8 @@ class ViewThemeUtils @Inject constructor(private val theme: ServerTheme, private
intArrayOf(android.R.attr.state_focused) intArrayOf(android.R.attr.state_focused)
), ),
intArrayOf( intArrayOf(
Color.GRAY, scheme.outline,
color scheme.primary
) )
) )