From 2c544607ec224f37826c2d1e1eaa8c2cf25a23e5 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Mon, 22 Oct 2018 13:05:38 +0800
Subject: [PATCH] Add tagGroupBackgroundColor and tagBackgroundColor attribute

---
 .../ehviewer/ui/scene/GalleryDetailScene.java |  4 +-
 app/src/main/res/values/attrs.xml             |  3 ++
 app/src/main/res/values/colors.xml            | 40 +++++++++++++++++--
 app/src/main/res/values/themes.xml            |  6 +++
 4 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
index 6f28baf79..9a02f9921 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -834,8 +834,8 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
             mNoTags.setVisibility(View.GONE);
         }
 
-        int colorTag = AttrResources.getAttrColor(context, R.attr.contentColorThemePrimary);
-        int colorName = AttrResources.getAttrColor(context, R.attr.contentColorThemeAccent);
+        int colorTag = AttrResources.getAttrColor(context, R.attr.tagBackgroundColor);
+        int colorName = AttrResources.getAttrColor(context, R.attr.tagGroupBackgroundColor);
         for (GalleryTagGroup tg : tagGroups) {
             LinearLayout ll = (LinearLayout) inflater.inflate(R.layout.gallery_tag_group, mTags, false);
             ll.setOrientation(LinearLayout.HORIZONTAL);
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index f41cf6441..5ca469af5 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -50,6 +50,9 @@
         <attr name="guideTitleColor" format="color"/>
         <attr name="guideTextColor" format="color"/>
 
+        <attr name="tagGroupBackgroundColor" format="color"/>
+        <attr name="tagBackgroundColor" format="color"/>
+
         <attr name="galleryDetailHeaderBackgroundColor" format="color"/>
 
         <attr name="gallerySliderBackgroundColor" format="color"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c20ae60a6..e9a2aec4a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -52,6 +52,14 @@
     <color name="widget_dark">@color/grey_700</color>
     <color name="widget_black">@color/grey_800</color>
 
+    <color name="tag_group_background_light">@color/colorAccent</color>
+    <color name="tag_group_background_dark">@color/grey_775</color>
+    <color name="tag_group_background_black">@color/grey_875</color>
+
+    <color name="tag_background_light">@color/colorPrimary</color>
+    <color name="tag_background_dark">@color/grey_775</color>
+    <color name="tag_background_black">@color/grey_875</color>
+
     <color name="red_500">#fff44336</color>
     <color name="teal_500">#ff009688</color>
     <color name="teal_700">#ff00796b</color>
@@ -63,17 +71,41 @@
     <color name="light_green_600">#ff7cb342</color>
     <color name="yellow_800">#fff9a825</color>
     <color name="deep_orange_400">#ffff7043</color>
-    <color name="grey_950">#ff101010</color>
-    <color name="grey_925">#ff181818</color>
+    <color name="grey_975">#ff080808</color>
+    <color name="grey_950">#ff111111</color>
+    <color name="grey_925">#ff191919</color>
     <color name="grey_900">#ff212121</color>
-    <color name="grey_850">#ff313131</color>
-    <color name="grey_825">#ff393939</color>
+    <color name="grey_875">#ff292929</color>
+    <color name="grey_850">#ff323232</color>
+    <color name="grey_825">#ff3a3a3a</color>
     <color name="grey_800">#ff424242</color>
+    <color name="grey_775">#ff4a4a4a</color>
+    <color name="grey_750">#ff525252</color>
+    <color name="grey_725">#ff595959</color>
     <color name="grey_700">#ff616161</color>
+    <color name="grey_675">#ff666666</color>
+    <color name="grey_650">#ff6b6b6b</color>
+    <color name="grey_625">#ff707070</color>
     <color name="grey_600">#ff757575</color>
+    <color name="grey_575">#ff7f7f7f</color>
+    <color name="grey_550">#ff8a8a8a</color>
+    <color name="grey_525">#ff949494</color>
     <color name="grey_500">#ff9e9e9e</color>
+    <color name="grey_475">#ffa6a6a6</color>
+    <color name="grey_450">#ffaeaeae</color>
+    <color name="grey_425">#ffb5b5b5</color>
+    <color name="grey_400">#ffbdbdbd</color>
+    <color name="grey_375">#ffc6c6c6</color>
+    <color name="grey_350">#ffcfcfcf</color>
+    <color name="grey_325">#ffd7d7d7</color>
     <color name="grey_300">#ffe0e0e0</color>
+    <color name="grey_275">#ffe4e4e4</color>
+    <color name="grey_250">#ffe7e7e7</color>
+    <color name="grey_225">#ffebebeb</color>
     <color name="grey_200">#ffeeeeee</color>
+    <color name="grey_175">#fff0f0f0</color>
+    <color name="grey_150">#fff2f2f2</color>
+    <color name="grey_125">#fff3f3f3</color>
     <color name="grey_100">#fff5f5f5</color>
     <color name="brown_500">#ff795548</color>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 11e2c031b..b57007184 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -42,6 +42,8 @@
         <item name="guideBackgroundColor">@color/guide_bg</item>
         <item name="guideTitleColor">?android:attr/textColorPrimaryInverse</item>
         <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="galleryDetailHeaderBackgroundColor">?attr/contentColorThemePrimary</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
@@ -81,6 +83,8 @@
         <item name="guideBackgroundColor">#e5303030</item>
         <item name="guideTitleColor">?android:attr/textColorPrimary</item>
         <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="galleryDetailHeaderBackgroundColor">?attr/contentColorThemePrimary</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
@@ -124,6 +128,8 @@
         <item name="guideBackgroundColor">#e5000000</item>
         <item name="guideTitleColor">?android:attr/textColorPrimary</item>
         <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="galleryDetailHeaderBackgroundColor">@android:color/black</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>