From 2833691c34c48daf5bc7d09d7e0f076e9c718da7 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Thu, 25 Oct 2018 13:37:25 +0800
Subject: [PATCH] Adjust text color

---
 .../hippo/ehviewer/ui/GalleryActivity.java    |  2 +-
 .../color/preference_header_title_light.xml   | 24 -------------------
 app/src/main/res/color/primary_text_dark.xml  | 21 ----------------
 app/src/main/res/color/primary_text_light.xml | 21 ----------------
 .../main/res/color/secondary_text_dark.xml    | 21 ----------------
 .../main/res/color/secondary_text_light.xml   | 21 ----------------
 app/src/main/res/layout/activity_gallery.xml  |  6 ++---
 .../main/res/layout/dialog_gallery_menu.xml   | 24 +++++++++----------
 .../main/res/layout/gallery_detail_header.xml |  2 +-
 app/src/main/res/values/attrs.xml             |  1 +
 app/src/main/res/values/colors.xml            | 15 ++++--------
 app/src/main/res/values/themes.xml            |  9 ++++---
 12 files changed, 28 insertions(+), 139 deletions(-)
 delete mode 100644 app/src/main/res/color/preference_header_title_light.xml
 delete mode 100644 app/src/main/res/color/primary_text_dark.xml
 delete mode 100644 app/src/main/res/color/primary_text_light.xml
 delete mode 100644 app/src/main/res/color/secondary_text_dark.xml
 delete mode 100644 app/src/main/res/color/secondary_text_light.xml

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
index 07f061bce..94f2a907d 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
@@ -310,7 +310,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
                 .setPageInfoInterval(resources.getDimensionPixelOffset(R.dimen.gallery_page_info_interval))
                 .setProgressColor(primaryColor)
                 .setProgressSize(resources.getDimensionPixelOffset(R.dimen.gallery_progress_size))
-                .setPageTextColor(resources.getColor(R.color.secondary_text_default_dark))
+                .setPageTextColor(AttrResources.getAttrColor(this, android.R.attr.textColorSecondary))
                 .setPageTextSize(resources.getDimensionPixelOffset(R.dimen.gallery_page_text_size))
                 .setPageTextTypeface(Typeface.DEFAULT)
                 .setErrorTextColor(resources.getColor(R.color.red_500))
diff --git a/app/src/main/res/color/preference_header_title_light.xml b/app/src/main/res/color/preference_header_title_light.xml
deleted file mode 100644
index 4f7807db5..000000000
--- a/app/src/main/res/color/preference_header_title_light.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2015 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_activated="true" android:color="@color/colorPrimary"/>
-    <item android:state_enabled="false" android:color="@color/primary_text_disabled_light"/>
-    <item android:color="@color/primary_text_default_light"/>
-
-</selector>
diff --git a/app/src/main/res/color/primary_text_dark.xml b/app/src/main/res/color/primary_text_dark.xml
deleted file mode 100644
index b225c17d6..000000000
--- a/app/src/main/res/color/primary_text_dark.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2015 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@color/primary_text_disabled_dark"/>
-    <item android:color="@color/primary_text_default_dark"/>
-</selector>
diff --git a/app/src/main/res/color/primary_text_light.xml b/app/src/main/res/color/primary_text_light.xml
deleted file mode 100644
index 6dc9eb3c1..000000000
--- a/app/src/main/res/color/primary_text_light.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2015 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@color/primary_text_disabled_light"/>
-    <item android:color="@color/primary_text_default_light"/>
-</selector>
diff --git a/app/src/main/res/color/secondary_text_dark.xml b/app/src/main/res/color/secondary_text_dark.xml
deleted file mode 100644
index fd8b3f636..000000000
--- a/app/src/main/res/color/secondary_text_dark.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2015 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@color/secondary_text_disabled_dark"/>
-    <item android:color="@color/secondary_text_default_dark"/>
-</selector>
diff --git a/app/src/main/res/color/secondary_text_light.xml b/app/src/main/res/color/secondary_text_light.xml
deleted file mode 100644
index 67b0b4e3e..000000000
--- a/app/src/main/res/color/secondary_text_light.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2015 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@color/secondary_text_disabled_light"/>
-    <item android:color="@color/secondary_text_default_light"/>
-</selector>
diff --git a/app/src/main/res/layout/activity_gallery.xml b/app/src/main/res/layout/activity_gallery.xml
index b77ede285..a4211f372 100644
--- a/app/src/main/res/layout/activity_gallery.xml
+++ b/app/src/main/res/layout/activity_gallery.xml
@@ -33,7 +33,7 @@
         android:layout_gravity="right"
         android:layout_marginTop="@dimen/gallery_widget_margin_v"
         android:layout_marginRight="@dimen/gallery_widget_margin_h"
-        android:textColor="@color/secondary_text_dark"/>
+        android:textColor="?android:attr/textColorSecondary"/>
 
     <TextView
         android:id="@+id/progress"
@@ -41,7 +41,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="@dimen/gallery_widget_margin_v"
-        android:textColor="@color/secondary_text_dark"/>
+        android:textColor="?android:attr/textColorSecondary"/>
 
     <com.hippo.widget.BatteryView
         xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -52,7 +52,7 @@
         android:layout_marginTop="@dimen/gallery_widget_margin_v"
         android:layout_marginLeft="@dimen/gallery_widget_margin_h"
         android:drawablePadding="4dp"
-        app:color="@color/secondary_text_dark"
+        app:color="?android:attr/textColorSecondary"
         app:warningColor="@color/red_500"/>
 
     <com.hippo.ehviewer.widget.SeekBarPanel
diff --git a/app/src/main/res/layout/dialog_gallery_menu.xml b/app/src/main/res/layout/dialog_gallery_menu.xml
index cc1d4bdb3..085ade186 100644
--- a/app/src/main/res/layout/dialog_gallery_menu.xml
+++ b/app/src/main/res/layout/dialog_gallery_menu.xml
@@ -41,7 +41,7 @@
                 android:layout_weight="1"
                 android:layout_gravity="center_vertical"
                 android:text="@string/settings_read_screen_rotation"
-                android:textColor="@color/primary_text_dark"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
             <com.hippo.widget.CuteSpinner
                 android:id="@+id/screen_rotation"
@@ -64,7 +64,7 @@
                 android:layout_weight="1"
                 android:layout_gravity="center_vertical"
                 android:text="@string/settings_read_reading_direction"
-                android:textColor="@color/primary_text_dark"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
             <com.hippo.widget.CuteSpinner
                 android:id="@+id/reading_direction"
@@ -87,7 +87,7 @@
                 android:layout_weight="1"
                 android:layout_gravity="center_vertical"
                 android:text="@string/settings_read_page_scaling"
-                android:textColor="@color/primary_text_dark"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
             <com.hippo.widget.CuteSpinner
                 android:id="@+id/page_scaling"
@@ -110,7 +110,7 @@
                 android:layout_weight="1"
                 android:layout_gravity="center_vertical"
                 android:text="@string/settings_read_start_position"
-                android:textColor="@color/primary_text_dark"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
             <com.hippo.widget.CuteSpinner
                 android:id="@+id/start_position"
@@ -127,56 +127,56 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_read_keep_screen_on"
-            android:textColor="@color/primary_text_dark"/>
+            android:textColor="?android:attr/textColorPrimary"/>
 
         <android.support.v7.widget.SwitchCompat
             android:id="@+id/show_clock"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_read_show_clock"
-            android:textColor="@color/primary_text_dark"/>
+            android:textColor="?android:attr/textColorPrimary"/>
 
         <android.support.v7.widget.SwitchCompat
             android:id="@+id/show_progress"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_read_show_progress"
-            android:textColor="@color/primary_text_dark"/>
+            android:textColor="?android:attr/textColorPrimary"/>
 
         <android.support.v7.widget.SwitchCompat
             android:id="@+id/show_battery"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_read_show_battery"
-            android:textColor="@color/primary_text_dark"/>
+            android:textColor="?android:attr/textColorPrimary"/>
 
         <android.support.v7.widget.SwitchCompat
           android:id="@+id/show_page_interval"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:text="@string/settings_read_show_page_interval"
-          android:textColor="@color/primary_text_dark"/>
+          android:textColor="?android:attr/textColorPrimary"/>
 
         <android.support.v7.widget.SwitchCompat
             android:id="@+id/volume_page"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_read_volume_page"
-            android:textColor="@color/primary_text_dark"/>
+            android:textColor="?android:attr/textColorPrimary"/>
 
         <android.support.v7.widget.SwitchCompat
             android:id="@+id/reading_fullscreen"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_read_reading_fullscreen"
-            android:textColor="@color/primary_text_dark"/>
+            android:textColor="?android:attr/textColorPrimary"/>
 
         <android.support.v7.widget.SwitchCompat
             android:id="@+id/custom_screen_lightness"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_read_custom_screen_lightness"
-            android:textColor="@color/primary_text_dark"/>
+            android:textColor="?android:attr/textColorPrimary"/>
 
         <SeekBar
             android:id="@+id/screen_lightness"
diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
index 1d35e197e..21253316d 100644
--- a/app/src/main/res/layout/gallery_detail_header.xml
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -83,7 +83,7 @@
                 android:layout_below="@id/title"
                 android:layout_marginTop="8dp"
                 android:layout_marginRight="@dimen/keyline_margin"
-                android:textColor="@color/primary_text_dark"
+                android:textColor="?attr/galleryDetailHeaderTitleColor"
                 android:textSize="@dimen/text_little_small"
                 android:singleLine="true"
                 android:ellipsize="end"/>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 018c74895..c037617e0 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -55,6 +55,7 @@
         <attr name="tagGroupBackgroundColor" format="color"/>
         <attr name="tagBackgroundColor" format="color"/>
 
+        <attr name="galleryDetailHeaderTitleColor" format="color"/>
         <attr name="galleryDetailHeaderBackgroundColor" format="color"/>
         <attr name="galleryDetailButtonBackgroundColor" format="color"/>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e2a3bb064..8b28c0e9a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,21 +21,14 @@
     <!-- secondary_drawable_light   26% -->
     <!-- primary_drawable_dark     100% -->
     <!-- secondary_drawable_dark    30% -->
+    <!-- primary_drawable_black     80% -->
+    <!-- secondary_drawable_black   24% -->
     <color name="primary_drawable_light">#8a000000</color>
     <color name="secondary_drawable_light">#42000000</color>
     <color name="primary_drawable_dark">#ffffffff</color>
     <color name="secondary_drawable_dark">#4dffffff</color>
-
-    <!-- Text -->
-    <color name="primary_text_default_light">#de000000</color>
-    <color name="primary_text_default_light_inverse">#ffffffff</color>
-    <color name="primary_text_disabled_dark">#4dffffff</color>
-    <color name="secondary_text_default_light">#8a000000</color>
-    <color name="secondary_text_disabled_dark">#36ffffff</color>
-    <color name="primary_text_default_dark">#deffffff</color>
-    <color name="primary_text_disabled_light">#39000000</color>
-    <color name="secondary_text_default_dark">#61ffffff</color>
-    <color name="secondary_text_disabled_light">#24000000</color>
+    <color name="primary_drawable_black">#ccffffff</color>
+    <color name="secondary_drawable_black">#3dffffff</color>
 
     <color name="background_dark">#ff303030</color>
     <color name="background_light">#fffafafa</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 252d6ffbe..4c8d69dc2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -45,6 +45,7 @@
         <item name="guideTextColor">?android:attr/textColorSecondaryInverse</item>
         <item name="tagGroupBackgroundColor">@color/tag_group_background_light</item>
         <item name="tagBackgroundColor">@color/tag_background_light</item>
+        <item name="galleryDetailHeaderTitleColor">?android:attr/textColorPrimaryInverse</item>
         <item name="galleryDetailHeaderBackgroundColor">?attr/contentColorThemePrimary</item>
         <item name="galleryDetailButtonBackgroundColor">@color/gallery_detail_button_background_light</item>
 
@@ -88,6 +89,7 @@
         <item name="guideTextColor">?android:attr/textColorSecondary</item>
         <item name="tagGroupBackgroundColor">@color/tag_group_background_dark</item>
         <item name="tagBackgroundColor">@color/tag_background_dark</item>
+        <item name="galleryDetailHeaderTitleColor">?android:attr/textColorPrimary</item>
         <item name="galleryDetailHeaderBackgroundColor">?attr/contentColorThemePrimary</item>
         <item name="galleryDetailButtonBackgroundColor">@color/gallery_detail_button_background_dark</item>
 
@@ -120,9 +122,9 @@
         <item name="toolbarColor">@android:color/black</item>
         <item name="textColorThemePrimary">?android:attr/textColorSecondary</item>
         <item name="textColorThemeAccent">?android:attr/textColorSecondary</item>
-        <item name="drawableColorPrimary">@color/primary_drawable_dark</item>
-        <item name="drawableColorSecondary">@color/secondary_drawable_dark</item>
-        <item name="drawableColorThemePrimary">@color/primary_drawable_dark</item>
+        <item name="drawableColorPrimary">@color/primary_drawable_black</item>
+        <item name="drawableColorSecondary">@color/secondary_drawable_black</item>
+        <item name="drawableColorThemePrimary">@color/primary_drawable_black</item>
         <item name="contentColorPrimary">@color/content_black</item>
         <item name="contentColorThemePrimary">?attr/contentColorPrimary</item>
         <item name="contentColorThemeAccent">?attr/contentColorPrimary</item>
@@ -135,6 +137,7 @@
         <item name="guideTextColor">?android:attr/textColorSecondary</item>
         <item name="tagGroupBackgroundColor">@color/tag_group_background_black</item>
         <item name="tagBackgroundColor">@color/tag_background_black</item>
+        <item name="galleryDetailHeaderTitleColor">?android:attr/textColorPrimary</item>
         <item name="galleryDetailHeaderBackgroundColor">@android:color/black</item>
         <item name="galleryDetailButtonBackgroundColor">@color/gallery_detail_button_background_black</item>