From a92fa304f1cd02c1dc536e96e2bbb4605a54a6b1 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 26 May 2022 23:00:45 +0800
Subject: [PATCH] Tag color fix

---
 .../java/com/hippo/ehviewer/ui/CommonOperations.java | 12 ++++++++++++
 .../hippo/ehviewer/ui/scene/GalleryDetailScene.java  |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java
index fa42be226..e81624282 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java
@@ -18,7 +18,11 @@ package com.hippo.ehviewer.ui;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
 import androidx.core.content.ContextCompat;
 
 import com.hippo.app.ListCheckBoxDialogBuilder;
@@ -267,4 +271,12 @@ public final class CommonOperations {
             delegate.onCancel();
         }
     }
+
+    public static @ColorInt
+    int resolveColor(Resources.Theme theme, @AttrRes int attrId) {
+        TypedArray a = theme.obtainStyledAttributes(new int[]{attrId});
+        int res = a.getColor(0, 0);
+        a.recycle();
+        return res;
+    }
 }
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 5c0847931..aa0274a9c 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -951,8 +951,8 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
         }
 
         EhTagDatabase ehTags = Settings.getShowTagTranslations() ? EhTagDatabase.getInstance(context) : null;
-        int colorTag = 0;
-        int colorName = 0;
+        int colorTag = CommonOperations.resolveColor(getTheme(), R.attr.tagBackgroundColor);
+        int colorName = CommonOperations.resolveColor(getTheme(), R.attr.tagGroupBackgroundColor);
         for (GalleryTagGroup tg : tagGroups) {
             LinearLayout ll = (LinearLayout) inflater.inflate(R.layout.gallery_tag_group, mTags, false);
             ll.setOrientation(LinearLayout.HORIZONTAL);