From bcc120056ca2db8384c16c28df432a5c649d38c2 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Tue, 6 Apr 2021 11:23:39 -0400
Subject: [PATCH] Make reader spinner colors a bit more consistent

(cherry picked from commit 7504621a24597340f47edb140fee939ac79fb5ec)

# Conflicts:
#	app/src/main/res/layout/reader_general_settings.xml
---
 app/src/main/res/layout/reader_general_settings.xml | 12 +++++++++++-
 app/src/main/res/layout/reader_pager_settings.xml   |  7 +++++--
 app/src/main/res/layout/reader_webtoon_settings.xml |  7 +++++--
 app/src/main/res/layout/spinner_preference.xml      |  4 ++--
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/reader_general_settings.xml b/app/src/main/res/layout/reader_general_settings.xml
index 78cb37a48..5a2b58473 100644
--- a/app/src/main/res/layout/reader_general_settings.xml
+++ b/app/src/main/res/layout/reader_general_settings.xml
@@ -30,6 +30,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:textColor="?android:attr/textColorSecondary"
             android:text="@string/pref_show_page_number" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
@@ -38,6 +39,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:textColor="?android:attr/textColorSecondary"
             android:text="@string/pref_force_horz_seekbar" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
@@ -46,6 +48,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:textColor="?android:attr/textColorSecondary"
             android:text="@string/pref_show_vert_seekbar_landscape" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
@@ -54,6 +57,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:textColor="?android:attr/textColorSecondary"
             android:text="@string/pref_left_handed_vertical_seekbar" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
@@ -62,15 +66,17 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:textColor="?android:attr/textColorSecondary"
             android:text="@string/pref_fullscreen" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/cutout_short"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/pref_cutout_short"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:textColor="?android:attr/textColorSecondary"
+            android:text="@string/pref_cutout_short"
             android:visibility="gone"
             tools:visibility="visible" />
 
@@ -80,6 +86,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:textColor="?android:attr/textColorSecondary"
             android:text="@string/pref_keep_screen_on" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
@@ -88,6 +95,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:textColor="?android:attr/textColorSecondary"
             android:text="@string/pref_read_with_long_tap" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
@@ -96,6 +104,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:textColor="?android:attr/textColorSecondary"
             android:text="@string/pref_always_show_chapter_transition" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
@@ -104,6 +113,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
+            android:textColor="?android:attr/textColorSecondary"
             android:text="@string/auto_webtoon_mode" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/reader_pager_settings.xml b/app/src/main/res/layout/reader_pager_settings.xml
index 9d750df1f..80d297d7b 100644
--- a/app/src/main/res/layout/reader_pager_settings.xml
+++ b/app/src/main/res/layout/reader_pager_settings.xml
@@ -49,15 +49,17 @@
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
+        android:textColor="?android:attr/textColorSecondary"
         android:text="@string/pref_crop_borders" />
 
     <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/dual_page_split"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/pref_dual_page_split"
         android:paddingStart="16dp"
-        android:paddingEnd="16dp" />
+        android:paddingEnd="16dp"
+        android:textColor="?android:attr/textColorSecondary"
+        android:text="@string/pref_dual_page_split" />
 
     <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/dual_page_invert"
@@ -65,6 +67,7 @@
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
+        android:textColor="?android:attr/textColorSecondary"
         android:text="@string/pref_dual_page_invert"
         android:visibility="gone"
         tools:visibility="visible" />
diff --git a/app/src/main/res/layout/reader_webtoon_settings.xml b/app/src/main/res/layout/reader_webtoon_settings.xml
index 78c0497db..597286bc1 100644
--- a/app/src/main/res/layout/reader_webtoon_settings.xml
+++ b/app/src/main/res/layout/reader_webtoon_settings.xml
@@ -40,9 +40,10 @@
         android:id="@+id/crop_borders_webtoon"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/pref_crop_borders"
         android:paddingStart="16dp"
-        android:paddingEnd="16dp" />
+        android:paddingEnd="16dp"
+        android:textColor="?android:attr/textColorSecondary"
+        android:text="@string/pref_crop_borders" />
 
     <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/page_transitions_webtoon"
@@ -66,6 +67,7 @@
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
+        android:textColor="?android:attr/textColorSecondary"
         android:text="@string/pref_dual_page_split" />
 
     <com.google.android.material.switchmaterial.SwitchMaterial
@@ -74,6 +76,7 @@
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:layout_height="wrap_content"
+        android:textColor="?android:attr/textColorSecondary"
         android:text="@string/pref_dual_page_invert"
         android:visibility="gone"
         tools:visibility="visible" />
diff --git a/app/src/main/res/layout/spinner_preference.xml b/app/src/main/res/layout/spinner_preference.xml
index 0918e46e9..000afb2ea 100644
--- a/app/src/main/res/layout/spinner_preference.xml
+++ b/app/src/main/res/layout/spinner_preference.xml
@@ -15,7 +15,7 @@
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="?android:attr/textColorSecondary"
         android:paddingEnd="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -30,7 +30,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:maxLines="1"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/dropdown_caret"
         app:layout_constraintHorizontal_bias="0.0"