Fix darkmode issue with Country dropdown (#1474)

The Country adapter's dropdown views had illegible text. Fix this by using the correct `textColorSecondary` color in darkmode.
stripe · Sep 4, 2019 · 834790c · 834790c
1 parent daf4de0
commit 834790c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/stripe/res/layout/menu_text_view.xml → stripe/res/layout/country_text_view.xml b/stripe/res/layout/menu_text_view.xml → stripe/res/layout/country_text_view.xml
diff --git a/stripe/res/values-night/colors.xml b/stripe/res/values-night/colors.xml
@@ -6,4 +6,6 @@
     <color name="color_text_unselected_primary_default">#e1e1e1</color>
     <color name="toolbar_color_default">#1f1f1f</color>
     <color name="toolbar_color_default_dark">#000000</color>
+
+    <color name="text_color_secondary">@android:color/secondary_text_dark</color>
 </resources>
diff --git a/stripe/res/values/colors.xml b/stripe/res/values/colors.xml
@@ -10,4 +10,7 @@
     <color name="slate_50">#3332325d</color>
     <color name="toolbar_color_default">#ff3f51b5</color>
     <color name="toolbar_color_default_dark">#ff324090</color>
+
+    <color name="title_text_color">@android:color/white</color>
+    <color name="text_color_secondary">@android:color/secondary_text_light</color>
 </resources>
diff --git a/stripe/res/values/styles.xml b/stripe/res/values/styles.xml
@@ -5,8 +5,8 @@
         <item name="colorControlNormal">@color/control_normal_color_default</item>
         <item name="colorPrimary">@color/toolbar_color_default</item>
         <item name="colorPrimaryDark">@color/toolbar_color_default_dark</item>
-        <item name="titleTextColor">@android:color/white</item>
-        <item name="android:textColorSecondary">@android:color/secondary_text_light</item>
+        <item name="titleTextColor">@color/title_text_color</item>
+        <item name="android:textColorSecondary">@color/text_color_secondary</item>
     </style>
 
     <style name="StripeToolBarStyle" parent="@style/ThemeOverlay.AppCompat">

diff --git a/stripe/src/main/java/com/stripe/android/view/CountryAdapter.kt b/stripe/src/main/java/com/stripe/android/view/CountryAdapter.kt
@@ -16,7 +16,7 @@ import java.util.Locale
 internal class CountryAdapter(
     context: Context,
     private val initialCountries: List<String>
-) : ArrayAdapter<String>(context, R.layout.menu_text_view) {
+) : ArrayAdapter<String>(context, R.layout.country_text_view) {
     private val countryFilter: Filter = createFilter()
     private var suggestions: List<String>? = initialCountries
 
@@ -38,7 +38,7 @@ internal class CountryAdapter(
             view
         } else {
             val countryText = LayoutInflater.from(context).inflate(
-                R.layout.menu_text_view, viewGroup, false) as TextView
+                R.layout.country_text_view, viewGroup, false) as TextView
             countryText.text = getItem(i)
             countryText
         }