From afa839ed0b84bc0fde38e29ba76de614a60b61b7 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Thu, 18 Oct 2018 23:01:57 +0800
Subject: [PATCH] Rename color drawable attribute

colorDrawableOpposite -> colorDrawablePrimary
colorDrawablePrimary -> colorDrawableThemePrimary
---
 .../java/com/hippo/ehviewer/ui/scene/FavoritesScene.java  | 2 +-
 .../com/hippo/ehviewer/ui/scene/GalleryListScene.java     | 4 ++--
 app/src/main/res/drawable/v_adb_primary_x24.xml           | 2 +-
 app/src/main/res/drawable/v_archive_primary_x48.xml       | 2 +-
 app/src/main/res/drawable/v_book_open_primary_x24.xml     | 2 +-
 app/src/main/res/drawable/v_download_primary_x24.xml      | 2 +-
 app/src/main/res/drawable/v_file_find_primary_x48.xml     | 2 +-
 app/src/main/res/drawable/v_heart_outline_primary_x48.xml | 2 +-
 app/src/main/res/drawable/v_heart_primary_x48.xml         | 2 +-
 app/src/main/res/drawable/v_info_primary_x24.xml          | 2 +-
 app/src/main/res/drawable/v_sad_panda_primary_x24.xml     | 2 +-
 app/src/main/res/drawable/v_sec_primary_x24.xml           | 2 +-
 app/src/main/res/drawable/v_share_primary_x48.xml         | 2 +-
 app/src/main/res/drawable/v_similar_primary_x48.xml       | 2 +-
 app/src/main/res/drawable/v_thumb_up_primary_x48.xml      | 2 +-
 app/src/main/res/drawable/v_utorrent_primary_x48.xml      | 2 +-
 app/src/main/res/values/attrs.xml                         | 4 ++--
 app/src/main/res/values/themes.xml                        | 8 ++++----
 18 files changed, 23 insertions(+), 23 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 56c9a9672..dc0ac5460 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.colorDrawableOpposite));
+        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.colorDrawablePrimary));
         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 050db6bf3..2f79baeb3 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.colorDrawableOpposite));
-        mRightDrawable = new AddDeleteDrawable(context, AttrResources.getAttrColor(context, R.attr.colorDrawableOpposite));
+        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.colorDrawablePrimary));
+        mRightDrawable = new AddDeleteDrawable(context, AttrResources.getAttrColor(context, R.attr.colorDrawablePrimary));
         mSearchBar.setLeftDrawable(mLeftDrawable);
         mSearchBar.setRightDrawable(mRightDrawable);
         mSearchBar.setHelper(this);
diff --git a/app/src/main/res/drawable/v_adb_primary_x24.xml b/app/src/main/res/drawable/v_adb_primary_x24.xml
index 3e7e935a7..ffeba8553 100644
--- a/app/src/main/res/drawable/v_adb_primary_x24.xml
+++ b/app/src/main/res/drawable/v_adb_primary_x24.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawablePrimary"
+        android:fillColor="?attr/colorDrawableThemePrimary"
         android:pathData="@string/pd_adb"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_archive_primary_x48.xml b/app/src/main/res/drawable/v_archive_primary_x48.xml
index b203afa0d..dc411f08e 100644
--- a/app/src/main/res/drawable/v_archive_primary_x48.xml
+++ b/app/src/main/res/drawable/v_archive_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24.0">
 
     <path
-        android:fillColor="?attr/colorDrawablePrimary"
+        android:fillColor="?attr/colorDrawableThemePrimary"
         android:pathData="@string/pd_archive"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_book_open_primary_x24.xml b/app/src/main/res/drawable/v_book_open_primary_x24.xml
index 31b4e5a57..2f3527730 100644
--- a/app/src/main/res/drawable/v_book_open_primary_x24.xml
+++ b/app/src/main/res/drawable/v_book_open_primary_x24.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawablePrimary"
+        android:fillColor="?attr/colorDrawableThemePrimary"
         android:pathData="@string/pd_book_open"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_download_primary_x24.xml b/app/src/main/res/drawable/v_download_primary_x24.xml
index ccd7f538d..a71341619 100644
--- a/app/src/main/res/drawable/v_download_primary_x24.xml
+++ b/app/src/main/res/drawable/v_download_primary_x24.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawablePrimary"
+        android:fillColor="?attr/colorDrawableThemePrimary"
         android:pathData="@string/pd_download"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_file_find_primary_x48.xml b/app/src/main/res/drawable/v_file_find_primary_x48.xml
index 71c8e4dc4..60b2ee72f 100644
--- a/app/src/main/res/drawable/v_file_find_primary_x48.xml
+++ b/app/src/main/res/drawable/v_file_find_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawablePrimary"
+        android:fillColor="?attr/colorDrawableThemePrimary"
         android:pathData="@string/pd_file_find"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_outline_primary_x48.xml b/app/src/main/res/drawable/v_heart_outline_primary_x48.xml
index bb60d8f0c..07aa4070c 100644
--- a/app/src/main/res/drawable/v_heart_outline_primary_x48.xml
+++ b/app/src/main/res/drawable/v_heart_outline_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawablePrimary"
+        android:fillColor="?attr/colorDrawableThemePrimary"
         android:pathData="@string/pd_heart_outline"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_primary_x48.xml b/app/src/main/res/drawable/v_heart_primary_x48.xml
index d91045da7..52d59a968 100644
--- a/app/src/main/res/drawable/v_heart_primary_x48.xml
+++ b/app/src/main/res/drawable/v_heart_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawablePrimary"
+        android:fillColor="?attr/colorDrawableThemePrimary"
         android:pathData="@string/pd_heart"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_info_primary_x24.xml b/app/src/main/res/drawable/v_info_primary_x24.xml
index 56311c15f..20b8f83d3 100644
--- a/app/src/main/res/drawable/v_info_primary_x24.xml
+++ b/app/src/main/res/drawable/v_info_primary_x24.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawablePrimary"
+        android:fillColor="?attr/colorDrawableThemePrimary"
         android:pathData="@string/pd_info"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_sad_panda_primary_x24.xml b/app/src/main/res/drawable/v_sad_panda_primary_x24.xml
index ed9247754..7401b70e0 100644
--- a/app/src/main/res/drawable/v_sad_panda_primary_x24.xml
+++ b/app/src/main/res/drawable/v_sad_panda_primary_x24.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawablePrimary"
+        android:fillColor="?attr/colorDrawableThemePrimary"
         android:pathData="@string/pd_sad_panda"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_sec_primary_x24.xml b/app/src/main/res/drawable/v_sec_primary_x24.xml
index 5c2d2ff42..76a054fd7 100644
--- a/app/src/main/res/drawable/v_sec_primary_x24.xml
+++ b/app/src/main/res/drawable/v_sec_primary_x24.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/colorDrawablePrimary"
+        android:fillColor="?attr/colorDrawableThemePrimary"
         android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/v_share_primary_x48.xml b/app/src/main/res/drawable/v_share_primary_x48.xml
index b40e79f77..845fd5c19 100644
--- a/app/src/main/res/drawable/v_share_primary_x48.xml
+++ b/app/src/main/res/drawable/v_share_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawablePrimary"
+        android:fillColor="?attr/colorDrawableThemePrimary"
         android:pathData="@string/pd_share"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_similar_primary_x48.xml b/app/src/main/res/drawable/v_similar_primary_x48.xml
index 2b7685082..de6c8ae5c 100644
--- a/app/src/main/res/drawable/v_similar_primary_x48.xml
+++ b/app/src/main/res/drawable/v_similar_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawablePrimary"
+        android:fillColor="?attr/colorDrawableThemePrimary"
         android:pathData="@string/pd_similar"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_thumb_up_primary_x48.xml b/app/src/main/res/drawable/v_thumb_up_primary_x48.xml
index ea95dd2cf..c567aab25 100644
--- a/app/src/main/res/drawable/v_thumb_up_primary_x48.xml
+++ b/app/src/main/res/drawable/v_thumb_up_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawablePrimary"
+        android:fillColor="?attr/colorDrawableThemePrimary"
         android:pathData="@string/pd_thumb_up"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_utorrent_primary_x48.xml b/app/src/main/res/drawable/v_utorrent_primary_x48.xml
index afc44d299..8ff8455f7 100644
--- a/app/src/main/res/drawable/v_utorrent_primary_x48.xml
+++ b/app/src/main/res/drawable/v_utorrent_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawablePrimary"
+        android:fillColor="?attr/colorDrawableThemePrimary"
         android:pathData="@string/pd_utorrent"/>
 
 </vector>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index bc7a5b11c..f769d079c 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -23,11 +23,11 @@
         <!-- 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="colorDrawableOpposite" format="color"/>
+        <attr name="colorDrawablePrimary" format="color"/>
         <!-- For light theme, it's primary color -->
         <!-- For dark theme, it's primary light color -->
         <!-- For black theme, it's primary light color -->
-        <attr name="colorDrawablePrimary" format="color"/>
+        <attr name="colorDrawableThemePrimary" 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 c1f5d7e4f..7c8119ca1 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -29,8 +29,8 @@
 
         <item name="colorDivider">@color/divider_light</item>
         <item name="colorToolbar">@color/colorPrimary</item>
-        <item name="colorDrawableOpposite">@color/primary_drawable_light</item>
-        <item name="colorDrawablePrimary">@color/colorPrimary</item>
+        <item name="colorDrawablePrimary">@color/primary_drawable_light</item>
+        <item name="colorDrawableThemePrimary">@color/colorPrimary</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
@@ -52,8 +52,8 @@
 
         <item name="colorDivider">@color/divider_dark</item>
         <item name="colorToolbar">?android:attr/colorBackground</item>
-        <item name="colorDrawableOpposite">@color/primary_drawable_dark</item>
         <item name="colorDrawablePrimary">@color/primary_drawable_dark</item>
+        <item name="colorDrawableThemePrimary">@color/primary_drawable_dark</item>
     </style>
 
     <style name="AppTheme.Dark.NoActionBar">
@@ -78,8 +78,8 @@
 
         <item name="colorDivider">@color/divider_dark</item>
         <item name="colorToolbar">?android:attr/colorBackground</item>
-        <item name="colorDrawableOpposite">@color/primary_drawable_dark</item>
         <item name="colorDrawablePrimary">@color/primary_drawable_dark</item>
+        <item name="colorDrawableThemePrimary">@color/primary_drawable_dark</item>
     </style>
 
     <style name="AppTheme.Black.NoActionBar">