Allow the user to set the default EditText color.

stripe/api/stripe.api

@@ -5872,6 +5872,8 @@ public class com/stripe/android/view/StripeEditText : com/google/android/materia
 	public final fun setErrorMessageListener (Lcom/stripe/android/view/StripeEditText$ErrorMessageListener;)V
 	protected final fun setLastKeyDelete (Z)V
 	public final fun setShouldShowError (Z)V
+	public fun setTextColor (I)V
+	public fun setTextColor (Landroid/content/res/ColorStateList;)V
 }
 
 public abstract interface class com/stripe/android/view/StripeEditText$AfterTextChangedListener {

stripe/src/main/java/com/stripe/android/view/StripeEditText.kt

@@ -9,6 +9,7 @@ import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputConnection
 import android.view.inputmethod.InputConnectionWrapper
 import androidx.annotation.ColorInt
+import androidx.annotation.VisibleForTesting
 import androidx.core.content.ContextCompat
 import androidx.core.widget.doAfterTextChanged
 import com.google.android.material.textfield.TextInputEditText
@@ -30,8 +31,18 @@ open class StripeEditText @JvmOverloads constructor(
 
     private var afterTextChangedListener: AfterTextChangedListener? = null
     private var deleteEmptyListener: DeleteEmptyListener? = null
-    var cachedColorStateList: ColorStateList? = null
-        private set
+
+    internal var defaultColorStateList: ColorStateList
+        @VisibleForTesting
+        internal set
+    @Deprecated("Will be removed in upcoming major release.")
+    val cachedColorStateList: ColorStateList
+        get() = defaultColorStateList
+    private var externalColorStateList: ColorStateList? = null
+    @ColorInt
+    private var defaultErrorColor: Int = 0
+    @ColorInt
+    private var externalErrorColor: Int? = null
 
     /**
      * Gets whether or not the text should be displayed in error mode.
@@ -48,9 +59,9 @@ open class StripeEditText @JvmOverloads constructor(
             if (field != shouldShowError) {
                 // only update the view's UI if the property's value is changing
                 if (shouldShowError) {
-                    setTextColor(errorColor ?: defaultErrorColor)
+                    super.setTextColor(externalErrorColor ?: defaultErrorColor)
                 } else {
-                    setTextColor(cachedColorStateList)
+                    super.setTextColor(externalColorStateList ?: defaultColorStateList)
                 }
                 refreshDrawableState()
             }
@@ -65,12 +76,6 @@ open class StripeEditText @JvmOverloads constructor(
             return text?.toString().orEmpty()
         }
 
-    @ColorInt
-    private var defaultErrorColor: Int = 0
-
-    @ColorInt
-    private var errorColor: Int? = null
-
     private var errorMessageListener: ErrorMessageListener? = null
 
     /**
@@ -89,12 +94,21 @@ open class StripeEditText @JvmOverloads constructor(
         maxLines = 1
         listenForTextChanges()
         listenForDeleteEmpty()
+        defaultColorStateList = textColors
         determineDefaultErrorColor()
-        cachedColorStateList = textColors
     }
 
     protected open val accessibilityText: String? = null
 
+    override fun setTextColor(colors: ColorStateList?) {
+        super.setTextColor(colors)
+
+        // This will only use textColors and not colors because textColor is never null
+        externalColorStateList = textColors
+    }
+
+    override fun setTextColor(color: Int) = setTextColor(ColorStateList.valueOf(color))
+
     override fun onCreateInputConnection(outAttrs: EditorInfo): InputConnection? {
         val inputConnection = super.onCreateInputConnection(outAttrs)
         return inputConnection?.let {
@@ -135,7 +149,7 @@ open class StripeEditText @JvmOverloads constructor(
      * @param errorColor a [ColorInt]
      */
     fun setErrorColor(@ColorInt errorColor: Int) {
-        this.errorColor = errorColor
+        this.externalErrorColor = errorColor
     }
 
     override fun onInitializeAccessibilityNodeInfo(info: AccessibilityNodeInfo) {
@@ -146,10 +160,9 @@ open class StripeEditText @JvmOverloads constructor(
     }
 
     private fun determineDefaultErrorColor() {
-        cachedColorStateList = textColors
         defaultErrorColor = ContextCompat.getColor(
             context,
-            if (StripeColorUtils.isColorDark(textColors.defaultColor)) {
+            if (StripeColorUtils.isColorDark(defaultColorStateList.defaultColor)) {
                 // Note: if the _text_ color is dark, then this is a
                 // light theme, and vice-versa.
                 R.color.stripe_error_text_light_theme

stripe/src/test/java/com/stripe/android/view/StripeEditTextTest.kt

@@ -1,6 +1,7 @@
 package com.stripe.android.view
 
 import android.content.Context
+import android.content.res.ColorStateList
 import androidx.annotation.ColorInt
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.content.ContextCompat
@@ -81,7 +82,7 @@ internal class StripeEditTextTest {
 
     @Test
     fun getDefaultErrorColorInt_onDarkTheme_returnsDarkError() {
-        editText.setTextColor(ContextCompat.getColor(context, android.R.color.primary_text_dark))
+        editText.defaultColorStateList = ColorStateList.valueOf(ContextCompat.getColor(context, android.R.color.primary_text_dark))
         assertThat(editText.defaultErrorColorInt)
             .isEqualTo(ContextCompat.getColor(context, R.color.stripe_error_text_dark_theme))
     }
@@ -104,9 +105,35 @@ internal class StripeEditTextTest {
             .isEqualTo(blueError)
     }
 
+    @Test
+    fun setTextColor() {
+        editText.setTextColor(
+            ColorStateList.valueOf(
+                ContextCompat.getColor(
+                    context,
+                    android.R.color.holo_red_dark
+                )
+            )
+        )
+
+        // The field state must be toggled to show an error
+        editText.shouldShowError = true
+        editText.shouldShowError = false
+
+        assertThat(editText.textColors)
+            .isEqualTo(
+                ColorStateList.valueOf(
+                    ContextCompat.getColor(
+                        context,
+                        android.R.color.holo_red_dark
+                    )
+                )
+            )
+    }
+
     @Test
     fun getCachedColorStateList_afterInit_returnsNotNull() {
-        assertThat(editText.cachedColorStateList)
+        assertThat(editText.defaultColorStateList)
             .isNotNull()
     }