From 12beeedf2997b00cf435c75f1bc3510609e2efc8 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Thu, 18 Oct 2018 20:06:11 +0800
Subject: [PATCH] Rename colorPrimaryDrawable to colorOppositeDrawable

---
 .../java/com/hippo/ehviewer/ui/scene/FavoritesScene.java    | 2 +-
 .../java/com/hippo/ehviewer/ui/scene/GalleryListScene.java  | 4 ++--
 app/src/main/res/values/attrs.xml                           | 2 +-
 app/src/main/res/values/themes.xml                          | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
index 6b59bf53a..5dfd7b873 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
@@ -274,7 +274,7 @@ public class FavoritesScene extends BaseScene implements
 
         refreshLayout.setHeaderTranslationY(paddingTopSB);
 
-        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.colorPrimaryDrawable));
+        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.colorOppositeDrawable));
         mSearchBar.setLeftDrawable(mLeftDrawable);
         mSearchBar.setRightDrawable(DrawableManager.getDrawable(context, R.drawable.v_magnify_x24));
         mSearchBar.setHelper(this);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
index d2f3e93cd..aea006414 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
@@ -425,8 +425,8 @@ public final class GalleryListScene extends BaseScene
 
         refreshLayout.setHeaderTranslationY(paddingTopSB);
 
-        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.colorPrimaryDrawable));
-        mRightDrawable = new AddDeleteDrawable(context, AttrResources.getAttrColor(context, R.attr.colorPrimaryDrawable));
+        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.colorOppositeDrawable));
+        mRightDrawable = new AddDeleteDrawable(context, AttrResources.getAttrColor(context, R.attr.colorOppositeDrawable));
         mSearchBar.setLeftDrawable(mLeftDrawable);
         mSearchBar.setRightDrawable(mRightDrawable);
         mSearchBar.setHelper(this);
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 0a9a30298..8922d55fd 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -23,7 +23,7 @@
         <!-- For light theme, it's primary dark color -->
         <!-- For dark theme, it's primary light color -->
         <!-- For black theme, it's primary light color -->
-        <attr name="colorPrimaryDrawable" format="color"/>
+        <attr name="colorOppositeDrawable" format="color"/>
         <attr name="toolbarPopupTheme" format="reference"/>
     </declare-styleable>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c38610074..925463888 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -29,7 +29,7 @@
 
         <item name="colorDivider">@color/divider_light</item>
         <item name="colorToolbar">@color/colorPrimary</item>
-        <item name="colorPrimaryDrawable">@color/primary_drawable_light</item>
+        <item name="colorOppositeDrawable">@color/primary_drawable_light</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
@@ -51,7 +51,7 @@
 
         <item name="colorDivider">@color/divider_dark</item>
         <item name="colorToolbar">?android:attr/colorBackground</item>
-        <item name="colorPrimaryDrawable">@color/primary_drawable_dark</item>
+        <item name="colorOppositeDrawable">@color/primary_drawable_dark</item>
     </style>
 
     <style name="AppTheme.Dark.NoActionBar">
@@ -76,7 +76,7 @@
 
         <item name="colorDivider">@color/divider_dark</item>
         <item name="colorToolbar">?android:attr/colorBackground</item>
-        <item name="colorPrimaryDrawable">@color/primary_drawable_dark</item>
+        <item name="colorOppositeDrawable">@color/primary_drawable_dark</item>
     </style>
 
     <style name="AppTheme.Black.NoActionBar">