From 1eb86355cb08d3c118c16464e20e86719db3d823 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Mon, 13 Jun 2022 14:32:21 +0800
Subject: [PATCH] Drop hardcoded dynamic color

* Fix crash on api<S as well
---
 .../com/hippo/ehviewer/ui/scene/DownloadsScene.java   |  2 +-
 .../com/hippo/ehviewer/ui/scene/HistoryScene.java     |  4 +++-
 .../com/hippo/ehviewer/widget/GalleryGuideView.java   |  5 +++--
 app/src/main/java/com/hippo/widget/ContentLayout.java |  4 +++-
 app/src/main/res/layout/scene_gallery_comments.xml    |  2 +-
 app/src/main/res/values/attrs.xml                     |  3 ---
 app/src/main/res/values/styles.xml                    |  4 +---
 app/src/main/res/values/themes.xml                    | 11 ++++-------
 8 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
index ffd422733..23249e74b 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
@@ -379,7 +379,7 @@ public class DownloadsScene extends ToolbarScene
 
         mFastScroller.attachToRecyclerView(mRecyclerView);
         HandlerDrawable handlerDrawable = new HandlerDrawable();
-        handlerDrawable.setColor(com.google.android.material.R.color.material_dynamic_neutral100);
+        handlerDrawable.setColor(ResourcesKt.resolveColor(getTheme(), com.google.android.material.R.attr.colorPrimary));
         mFastScroller.setHandlerDrawable(handlerDrawable);
         mFastScroller.setOnDragHandlerListener(this);
 
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java
index 2012f15ad..3ff6670f5 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java
@@ -85,6 +85,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import rikka.core.res.ResourcesKt;
+
 public class HistoryScene extends ToolbarScene {
 
     /*---------------
@@ -232,7 +234,7 @@ public class HistoryScene extends ToolbarScene {
 
         mFastScroller.attachToRecyclerView(mRecyclerView);
         HandlerDrawable handlerDrawable = new HandlerDrawable();
-        handlerDrawable.setColor(com.google.android.material.R.color.material_dynamic_neutral100);
+        handlerDrawable.setColor(ResourcesKt.resolveColor(getTheme(), com.google.android.material.R.attr.colorPrimary));
         mFastScroller.setHandlerDrawable(handlerDrawable);
 
         updateLazyList();
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/GalleryGuideView.java b/app/src/main/java/com/hippo/ehviewer/widget/GalleryGuideView.java
index 5cc25a0ef..7ee47f1d8 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/GalleryGuideView.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/GalleryGuideView.java
@@ -18,6 +18,7 @@ package com.hippo.ehviewer.widget;
 
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Paint;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -60,9 +61,9 @@ public class GalleryGuideView extends ViewGroup implements View.OnClickListener
     }
 
     private void init(Context context) {
-        mBgColor = ResourcesKt.resolveColor(context.getTheme(), R.attr.guideBackgroundColor);
+        mBgColor = Color.GRAY;
         mPaint = new Paint();
-        mPaint.setColor(ResourcesKt.resolveColor(context.getTheme(), R.attr.guideTitleColor));
+        mPaint.setColor(Color.WHITE);
         mPaint.setStyle(Paint.Style.STROKE);
         mPaint.setStrokeWidth(context.getResources().getDimension(R.dimen.gallery_guide_divider_width));
         setOnClickListener(this);
diff --git a/app/src/main/java/com/hippo/widget/ContentLayout.java b/app/src/main/java/com/hippo/widget/ContentLayout.java
index 58842e658..1e256a193 100644
--- a/app/src/main/java/com/hippo/widget/ContentLayout.java
+++ b/app/src/main/java/com/hippo/widget/ContentLayout.java
@@ -55,6 +55,8 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
+import rikka.core.res.ResourcesKt;
+
 public class ContentLayout extends FrameLayout {
 
     private CircularProgressIndicator mProgressView;
@@ -102,7 +104,7 @@ public class ContentLayout extends FrameLayout {
 
         mFastScroller.attachToRecyclerView(mRecyclerView);
         HandlerDrawable drawable = new HandlerDrawable();
-        drawable.setColor(com.google.android.material.R.color.material_dynamic_neutral100);
+        drawable.setColor(ResourcesKt.resolveColor(context.getTheme(), androidx.appcompat.R.attr.colorPrimary));
         mFastScroller.setHandlerDrawable(drawable);
 
         mRefreshLayout.setColorSchemeResources(
diff --git a/app/src/main/res/layout/scene_gallery_comments.xml b/app/src/main/res/layout/scene_gallery_comments.xml
index 2568a2a20..6da0a716e 100644
--- a/app/src/main/res/layout/scene_gallery_comments.xml
+++ b/app/src/main/res/layout/scene_gallery_comments.xml
@@ -50,7 +50,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:background="@color/material_dynamic_primary50"
+        android:background="?attr/colorPrimaryContainer"
         android:elevation="4dp"
         android:orientation="horizontal"
         android:visibility="invisible"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 9865ac015..72857966b 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -23,9 +23,6 @@
         <attr name="drawableColorThemePrimary" format="color" />
         <attr name="contentColorThemePrimary" format="color" />
         <attr name="contentColorThemeAccent" format="color" />
-        <attr name="guideBackgroundColor" format="color" />
-        <attr name="guideTitleColor" format="color" />
-        <attr name="guideTextColor" format="color" />
         <attr name="tagGroupBackgroundColor" format="color" />
         <attr name="tagBackgroundColor" format="color" />
     </declare-styleable>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 53864331f..4c3b66fe4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -62,7 +62,5 @@
         <item name="indicatorColor">?attr/dividerColor</item>
     </style>
 
-    <style name="Guide.Title" parent="TextAppearance.Material3.TitleMedium">
-        <item name="android:textColor">?attr/guideTitleColor</item>
-    </style>
+    <style name="Guide.Title" parent="TextAppearance.Material3.TitleMedium"/>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7b72f4d1c..c30f6b1f0 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -23,13 +23,10 @@
     <style name="Base.AppTheme" parent="Theme.Material3.DynamicColors.DayNight">
         <item name="colorEdgeEffect">@color/grey_500</item>
         <item name="dividerColor">@color/divider</item>
-        <item name="drawableColorSecondary">@color/material_dynamic_secondary50</item>
-        <item name="drawableColorThemePrimary">@color/material_dynamic_primary50</item>
-        <item name="guideBackgroundColor">@color/material_dynamic_neutral80</item>
-        <item name="guideTitleColor">@color/material_dynamic_primary70</item>
-        <item name="guideTextColor">@color/material_dynamic_primary50</item>
-        <item name="tagGroupBackgroundColor">@color/material_dynamic_primary50</item>
-        <item name="tagBackgroundColor">@color/material_dynamic_neutral50</item>
+        <item name="drawableColorSecondary">?attr/colorOnSurface</item>
+        <item name="drawableColorThemePrimary">?attr/colorPrimary</item>
+        <item name="tagGroupBackgroundColor">?attr/colorPrimary</item>
+        <item name="tagBackgroundColor">?attr/colorTertiary</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="windowActionBar">false</item>