From 84ed520c1c3eb04ecaf3ce7314a18e3ed641567c Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Thu, 18 Oct 2018 14:37:59 +0800
Subject: [PATCH] Change divider color

---
 .../com/hippo/ehviewer/ui/HostsActivity.java   |  3 ++-
 .../ui/scene/GalleryCommentsScene.java         | 10 ++++------
 .../ehviewer/ui/scene/GalleryInfoScene.java    |  9 ++++-----
 .../java/com/hippo/widget/DirExplorer.java     |  5 ++---
 .../res/drawable/divider_gallery_detail.xml    |  2 +-
 .../main/res/layout/dialog_gallery_menu.xml    |  2 +-
 .../main/res/layout/gallery_detail_header.xml  |  2 +-
 app/src/main/res/layout/item_filter.xml        |  2 +-
 .../main/res/layout/item_gallery_info_data.xml |  4 ++--
 .../res/layout/item_gallery_info_header.xml    |  4 ++--
 app/src/main/res/layout/item_label_list.xml    |  2 +-
 .../res/layout/scene_excluded_languages.xml    |  8 ++++----
 app/src/main/res/layout/widget_search_bar.xml  |  4 ++--
 app/src/main/res/values/attrs.xml              |  4 ++++
 app/src/main/res/values/colors.xml             |  2 +-
 app/src/main/res/values/styles.xml             |  6 +-----
 app/src/main/res/values/themes.xml             | 18 +++++++++++++++---
 17 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/HostsActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/HostsActivity.java
index 4c382bec1..b73ac83f4 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/HostsActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/HostsActivity.java
@@ -37,6 +37,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import com.hippo.android.resource.AttrResources;
 import com.hippo.easyrecyclerview.EasyRecyclerView;
 import com.hippo.easyrecyclerview.LinearDividerItemDecoration;
 import com.hippo.ehviewer.EhApplication;
@@ -81,7 +82,7 @@ public class HostsActivity extends ToolbarActivity
     recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
     LinearDividerItemDecoration decoration = new LinearDividerItemDecoration(
         LinearDividerItemDecoration.VERTICAL,
-        getResources().getColor(R.color.divider),
+        AttrResources.getAttrColor(this, R.attr.colorDivider),
         LayoutUtils.dp2pix(this, 1));
     decoration.setShowLastDivider(true);
     recyclerView.addItemDecoration(decoration);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
index 4d4d72e10..64c8257e7 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
@@ -51,7 +51,7 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
-
+import com.hippo.android.resource.AttrResources;
 import com.hippo.easyrecyclerview.EasyRecyclerView;
 import com.hippo.easyrecyclerview.LinearDividerItemDecoration;
 import com.hippo.ehviewer.EhApplication;
@@ -83,11 +83,9 @@ import com.hippo.yorozuya.SimpleAnimatorListener;
 import com.hippo.yorozuya.StringUtils;
 import com.hippo.yorozuya.ViewUtils;
 import com.hippo.yorozuya.collect.IntList;
-
-import junit.framework.Assert;
-
 import java.util.ArrayList;
 import java.util.List;
+import junit.framework.Assert;
 
 public final class GalleryCommentsScene extends ToolbarScene
         implements EasyRecyclerView.OnItemClickListener,
@@ -205,7 +203,7 @@ public final class GalleryCommentsScene extends ToolbarScene
         mRecyclerView.setLayoutManager(new LinearLayoutManager(context,
                 LinearLayoutManager.VERTICAL, false));
         LinearDividerItemDecoration decoration = new LinearDividerItemDecoration(
-                LinearDividerItemDecoration.VERTICAL, context.getResources().getColor(R.color.divider),
+                LinearDividerItemDecoration.VERTICAL, AttrResources.getAttrColor(context, R.attr.colorDivider),
                 LayoutUtils.dp2pix(context, 1));
         decoration.setShowLastDivider(true);
         mRecyclerView.addItemDecoration(decoration);
@@ -338,7 +336,7 @@ public final class GalleryCommentsScene extends ToolbarScene
         });
         rv.setLayoutManager(new LinearLayoutManager(context));
         LinearDividerItemDecoration decoration = new LinearDividerItemDecoration(
-                LinearDividerItemDecoration.VERTICAL, context.getResources().getColor(R.color.divider),
+                LinearDividerItemDecoration.VERTICAL, AttrResources.getAttrColor(context, R.attr.colorDivider),
                 LayoutUtils.dp2pix(context, 1));
         decoration.setPadding(ResourcesUtils.getAttrDimensionPixelOffset(context, R.attr.dialogPreferredPadding));
         rv.addItemDecoration(decoration);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
index 7b109769e..56fce2210 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
@@ -29,7 +29,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-
+import com.hippo.android.resource.AttrResources;
 import com.hippo.easyrecyclerview.EasyRecyclerView;
 import com.hippo.easyrecyclerview.LinearDividerItemDecoration;
 import com.hippo.ehviewer.R;
@@ -40,10 +40,8 @@ import com.hippo.ehviewer.client.data.GalleryDetail;
 import com.hippo.ripple.Ripple;
 import com.hippo.yorozuya.LayoutUtils;
 import com.hippo.yorozuya.ViewUtils;
-
-import junit.framework.Assert;
-
 import java.util.ArrayList;
+import junit.framework.Assert;
 
 public final class GalleryInfoScene extends ToolbarScene implements EasyRecyclerView.OnItemClickListener {
 
@@ -166,7 +164,8 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler
         mRecyclerView.setAdapter(adapter);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false));
         LinearDividerItemDecoration decoration = new LinearDividerItemDecoration(
-                LinearDividerItemDecoration.VERTICAL, context.getResources().getColor(R.color.divider),
+                LinearDividerItemDecoration.VERTICAL,
+                AttrResources.getAttrColor(context, R.attr.colorDivider),
                 LayoutUtils.dp2pix(context, 1));
         decoration.setPadding(context.getResources().getDimensionPixelOffset(R.dimen.keyline_margin));
         mRecyclerView.addItemDecoration(decoration);
diff --git a/app/src/main/java/com/hippo/widget/DirExplorer.java b/app/src/main/java/com/hippo/widget/DirExplorer.java
index b2ade3db9..958e7fe0d 100644
--- a/app/src/main/java/com/hippo/widget/DirExplorer.java
+++ b/app/src/main/java/com/hippo/widget/DirExplorer.java
@@ -24,13 +24,12 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-
+import com.hippo.android.resource.AttrResources;
 import com.hippo.easyrecyclerview.EasyRecyclerView;
 import com.hippo.easyrecyclerview.LinearDividerItemDecoration;
 import com.hippo.ehviewer.R;
 import com.hippo.ripple.Ripple;
 import com.hippo.yorozuya.LayoutUtils;
-
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
@@ -73,7 +72,7 @@ public class DirExplorer extends EasyRecyclerView implements EasyRecyclerView.On
         setAdapter(mAdapter);
         setLayoutManager(new LinearLayoutManager(context));
         LinearDividerItemDecoration decoration = new LinearDividerItemDecoration(
-                LinearDividerItemDecoration.VERTICAL, getResources().getColor(R.color.divider),
+                LinearDividerItemDecoration.VERTICAL, AttrResources.getAttrColor(context, R.attr.colorDivider),
                 LayoutUtils.dp2pix(context, 1));
         decoration.setShowLastDivider(true);
         addItemDecoration(decoration);
diff --git a/app/src/main/res/drawable/divider_gallery_detail.xml b/app/src/main/res/drawable/divider_gallery_detail.xml
index 557dfc2a8..d397661f0 100644
--- a/app/src/main/res/drawable/divider_gallery_detail.xml
+++ b/app/src/main/res/drawable/divider_gallery_detail.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <solid
-        android:color="@color/divider"/>
+        android:color="?attr/colorDivider"/>
 
     <size
         android:height="1dp"/>
diff --git a/app/src/main/res/layout/dialog_gallery_menu.xml b/app/src/main/res/layout/dialog_gallery_menu.xml
index fb2e80b7b..cc1d4bdb3 100644
--- a/app/src/main/res/layout/dialog_gallery_menu.xml
+++ b/app/src/main/res/layout/dialog_gallery_menu.xml
@@ -17,7 +17,7 @@
 
 <com.hippo.widget.IndicatingScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/Indicating.Dark"
+    style="@style/Indicating"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
index 20dfa5b64..96863537e 100644
--- a/app/src/main/res/layout/gallery_detail_header.xml
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -144,7 +144,7 @@
                 <View
                     android:layout_width="1dp"
                     android:layout_height="match_parent"
-                    android:background="@color/divider"
+                    android:background="?attr/colorDivider"
                     android:layout_marginTop="8dp"
                     android:layout_marginBottom="8dp"/>
 
diff --git a/app/src/main/res/layout/item_filter.xml b/app/src/main/res/layout/item_filter.xml
index 4c6ba2635..d0b149180 100644
--- a/app/src/main/res/layout/item_filter.xml
+++ b/app/src/main/res/layout/item_filter.xml
@@ -56,7 +56,7 @@
         <View
             android:layout_width="wrap_content"
             android:layout_height="1dp"
-            android:background="@color/divider"/>
+            android:background="?attr/colorDivider"/>
 
     </com.hippo.widget.ShadowLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/item_gallery_info_data.xml b/app/src/main/res/layout/item_gallery_info_data.xml
index 26c6a58ef..b1a20a013 100644
--- a/app/src/main/res/layout/item_gallery_info_data.xml
+++ b/app/src/main/res/layout/item_gallery_info_data.xml
@@ -27,14 +27,14 @@
         android:id="@+id/key"
         android:layout_width="90dp"
         android:layout_height="wrap_content"
-        android:textColor="@color/primary_text_light"
+        android:textColor="?android:attr/textColorPrimary"
         android:padding="8dp"/>
 
     <TextView
         android:id="@+id/value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/primary_text_light"
+        android:textColor="?android:attr/textColorPrimary"
         android:padding="8dp"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_gallery_info_header.xml b/app/src/main/res/layout/item_gallery_info_header.xml
index 5056366cc..f30497c82 100644
--- a/app/src/main/res/layout/item_gallery_info_header.xml
+++ b/app/src/main/res/layout/item_gallery_info_header.xml
@@ -27,14 +27,14 @@
         android:id="@+id/key"
         android:layout_width="90dp"
         android:layout_height="wrap_content"
-        android:textColor="@color/secondary_text_light"
+        android:textColor="?android:attr/textColorSecondary"
         android:padding="8dp"/>
 
     <TextView
         android:id="@+id/value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/secondary_text_light"
+        android:textColor="?android:attr/textColorSecondary"
         android:padding="8dp"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_label_list.xml b/app/src/main/res/layout/item_label_list.xml
index 2feccfe4d..b3de285c6 100644
--- a/app/src/main/res/layout/item_label_list.xml
+++ b/app/src/main/res/layout/item_label_list.xml
@@ -86,7 +86,7 @@
         <View
             android:layout_width="wrap_content"
             android:layout_height="1dp"
-            android:background="@color/divider"/>
+            android:background="?attr/colorDivider"/>
 
     </com.hippo.widget.ShadowLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/scene_excluded_languages.xml b/app/src/main/res/layout/scene_excluded_languages.xml
index 9fbb3cc5b..e2d87a81b 100644
--- a/app/src/main/res/layout/scene_excluded_languages.xml
+++ b/app/src/main/res/layout/scene_excluded_languages.xml
@@ -43,7 +43,7 @@
             android:layout_height="match_parent"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
-            android:background="@color/divider"/>
+            android:background="?attr/colorDivider"/>
 
         <TextView
             android:id="@+id/ok"
@@ -78,7 +78,7 @@
             android:layout_height="match_parent"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
-            android:background="@color/divider"/>
+            android:background="?attr/colorDivider"/>
 
         <TextView
             android:id="@+id/deselect_all"
@@ -94,7 +94,7 @@
             android:layout_height="match_parent"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
-            android:background="@color/divider"/>
+            android:background="?attr/colorDivider"/>
 
         <TextView
             android:id="@+id/invert_selection"
@@ -148,7 +148,7 @@
         android:layout_height="1dp"
         android:layout_marginLeft="@dimen/keyline_margin"
         android:layout_marginRight="@dimen/keyline_margin"
-        android:background="@color/divider"/>
+        android:background="?attr/colorDivider"/>
 
     <com.hippo.easyrecyclerview.EasyRecyclerView
         android:id="@+id/recycler_view"
diff --git a/app/src/main/res/layout/widget_search_bar.xml b/app/src/main/res/layout/widget_search_bar.xml
index 3c5173a63..6b7c8e851 100644
--- a/app/src/main/res/layout/widget_search_bar.xml
+++ b/app/src/main/res/layout/widget_search_bar.xml
@@ -80,13 +80,13 @@
                 android:id="@+id/list_header"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="@color/divider"/>
+                android:background="?attr/colorDivider"/>
 
             <ListView
                 android:id="@+id/search_bar_list"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:divider="@color/divider"
+                android:divider="?attr/colorDivider"
                 android:dividerHeight="1dp"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 2636a0e67..34f12fa8f 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -17,6 +17,10 @@
 
 <resources>
 
+    <declare-styleable name="Theme">
+        <attr name="colorDivider" format="color"/>
+    </declare-styleable>
+
     <declare-styleable name="ProgressView">
         <attr name="color"/>
         <attr name="indeterminate" format="boolean"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 137058601..a61715c6f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -95,7 +95,7 @@
     <color name="unknown_bg">@android:color/black</color>
 
     <!-- divider -->
-    <color name="divider">#20000000</color>
+    <color name="divider_light">#20000000</color>
     <color name="divider_dark">#20ffffff</color>
 
     <!-- shadow -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 002724b33..dd7e69820 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -113,11 +113,7 @@
 
     <style name="Indicating">
         <item name="indicatorHeight">1dp</item>
-        <item name="indicatorColor">@color/divider</item>
-    </style>
-
-    <style name="Indicating.Dark">
-        <item name="indicatorColor">@color/divider_dark</item>
+        <item name="indicatorColor">?attr/colorDivider</item>
     </style>
 
     <style name="Widget.Design.FloatingActionButton.Mini">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2df583a10..e9e52017f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -68,9 +68,11 @@
     <!-- App Theme -->
     <!-- ========= -->
     <style name="AppTheme.Main" parent="AppTheme.NoActionBar">
+        <item name="colorDivider">@color/divider_light</item>
     </style>
 
     <style name="AppTheme.Main.Dark" parent="AppTheme.Dark.NoActionBar">
+        <item name="colorDivider">@color/divider_dark</item>
     </style>
 
     <style name="AppTheme.Main.Black" parent="AppTheme.Dark.NoActionBar">
@@ -79,30 +81,36 @@
         <item name="colorAccent">@android:color/black</item>
         <item name="android:windowBackground">@android:color/black</item>
         <item name="android:colorBackground">@android:color/black</item>
+        <item name="colorDivider">@color/divider_dark</item>
     </style>
 
     <style name="AppTheme.Toolbar" parent="AppTheme.NoActionBar">
+        <item name="colorDivider">@color/divider_light</item>
     </style>
 
     <style name="AppTheme.Toolbar.Dark" parent="AppTheme.Dark.NoActionBar">
+        <item name="colorDivider">@color/divider_dark</item>
+    </style>
+
+    <style name="AppTheme.Toolbar.Black" parent="AppTheme.Dark.NoActionBar">
         <item name="colorPrimary">@android:color/black</item>
         <item name="colorPrimaryDark">@android:color/black</item>
         <item name="colorAccent">@android:color/black</item>
         <item name="android:windowBackground">@android:color/black</item>
         <item name="android:colorBackground">@android:color/black</item>
-    </style>
-
-    <style name="AppTheme.Toolbar.Black" parent="AppTheme.Dark.NoActionBar">
+        <item name="colorDivider">@color/divider_dark</item>
     </style>
 
     <style name="AppTheme.Gallery" parent="AppTheme.Dark.NoActionBar">
         <item name="colorPrimaryDark">@android:color/black</item>
         <item name="android:windowBackground">@color/gallery_background</item>
+        <item name="colorDivider">@color/divider_dark</item>
     </style>
 
     <style name="AppTheme.Gallery.Dark" parent="AppTheme.Dark.NoActionBar">
         <item name="colorPrimaryDark">@android:color/black</item>
         <item name="android:windowBackground">@color/gallery_background</item>
+        <item name="colorDivider">@color/divider_dark</item>
     </style>
 
     <style name="AppTheme.Gallery.Black" parent="AppTheme.Dark.NoActionBar">
@@ -111,12 +119,15 @@
         <item name="colorAccent">@android:color/black</item>
         <item name="android:windowBackground">@android:color/black</item>
         <item name="android:colorBackground">@android:color/black</item>
+        <item name="colorDivider">@color/divider_dark</item>
     </style>
 
     <style name="AppTheme.Settings" parent="AppTheme">
+        <item name="colorDivider">@color/divider_light</item>
     </style>
 
     <style name="AppTheme.Settings.Dark" parent="AppTheme.Dark">
+        <item name="colorDivider">@color/divider_dark</item>
     </style>
 
     <style name="AppTheme.Settings.Black" parent="AppTheme.Dark">
@@ -125,6 +136,7 @@
         <item name="colorAccent">@android:color/black</item>
         <item name="android:windowBackground">@android:color/black</item>
         <item name="android:colorBackground">@android:color/black</item>
+        <item name="colorDivider">@color/divider_dark</item>
     </style>
 
     <!-- ============ -->