From 4388c53929ff4a7ffc5423815b9d6e9e1c15fdff Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Wed, 25 May 2022 14:08:57 +0800
Subject: [PATCH] Clean primary color

* No hardcode primary color anymore
---
 .../java/com/hippo/ehviewer/download/DownloadService.java     | 4 ----
 .../main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java | 1 -
 .../main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java | 1 -
 .../java/com/hippo/ehviewer/ui/scene/GalleryListScene.java    | 1 -
 .../java/com/hippo/widget/lockpattern/LockPatternView.java    | 2 +-
 app/src/main/res/drawable-v25/ic_shortcut_start.xml           | 4 ++--
 app/src/main/res/drawable-v25/ic_shortcut_stop.xml            | 4 ++--
 app/src/main/res/drawable/ic_pause_108dp.xml                  | 2 +-
 app/src/main/res/drawable/ic_play_arrow_108dp.xml             | 2 +-
 app/src/main/res/layout/activity_preference.xml               | 3 +--
 app/src/main/res/values/colors.xml                            | 2 --
 app/src/main/res/values/drawables.xml                         | 1 -
 app/src/main/res/values/themes.xml                            | 1 -
 13 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java
index 4568247a6..f34d0881e 100644
--- a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java
+++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java
@@ -224,8 +224,6 @@ public class DownloadService extends Service implements DownloadManager.Download
                 .setOngoing(true)
                 .setAutoCancel(false)
                 .setCategory(NotificationCompat.CATEGORY_PROGRESS)
-                .setColor(ContextCompat.getColor(this, R.color.colorPrimary))
-                .setColorized(true)
                 .addAction(R.drawable.v_pause_x24, getString(R.string.stat_download_action_stop_all), piStopAll)
                 .setShowWhen(false)
                 .setChannelId(CHANNEL_ID);
@@ -254,7 +252,6 @@ public class DownloadService extends Service implements DownloadManager.Download
         mDownloadedBuilder = new NotificationCompat.Builder(getApplicationContext(), CHANNEL_ID)
                 .setSmallIcon(android.R.drawable.stat_sys_download_done)
                 .setContentTitle(getString(R.string.stat_download_done_title))
-                .setColor(ContextCompat.getColor(this, R.color.colorPrimary))
                 .setDeleteIntent(piClear)
                 .setOngoing(false)
                 .setAutoCancel(true)
@@ -273,7 +270,6 @@ public class DownloadService extends Service implements DownloadManager.Download
                 .setContentText(getString(R.string.stat_509_alert_title))
                 .setContentText(getString(R.string.stat_509_alert_text))
                 .setStyle(new NotificationCompat.BigTextStyle().bigText(getString(R.string.stat_509_alert_text)))
-                .setColor(ContextCompat.getColor(this, R.color.colorPrimary))
                 .setAutoCancel(true)
                 .setOngoing(false)
                 .setCategory(NotificationCompat.CATEGORY_ERROR);
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 4c6108c57..614eea23a 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
@@ -468,7 +468,6 @@ public class DownloadsScene extends ToolbarScene
                 TapTarget.forBounds(bounds,
                                 getString(R.string.guide_download_labels_title),
                                 getString(R.string.guide_download_labels_text))
-                        .outerCircleColor(R.color.colorPrimary)
                         .transparentTarget(true),
                 new TapTargetView.Listener() {
                     @Override
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 a5aad8cbc..0d94d7cee 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
@@ -341,7 +341,6 @@ public class FavoritesScene extends BaseScene implements
                 TapTarget.forBounds(bounds,
                                 getString(R.string.guide_collections_title),
                                 getString(R.string.guide_collections_text))
-                        .outerCircleColor(R.color.colorPrimary)
                         .transparentTarget(true),
                 new TapTargetView.Listener() {
                     @Override
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 e62c1bbc4..c9e8a0ae7 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
@@ -664,7 +664,6 @@ public final class GalleryListScene extends BaseScene
                 TapTarget.forBounds(bounds,
                                 getString(R.string.guide_quick_search_title),
                                 getString(R.string.guide_quick_search_text))
-                        .outerCircleColor(R.color.colorPrimary)
                         .transparentTarget(true),
                 new TapTargetView.Listener() {
                     @Override
diff --git a/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java b/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java
index 6aca9ebd4..2b0e66333 100644
--- a/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java
+++ b/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java
@@ -141,7 +141,7 @@ public class LockPatternView extends View {
 
         mRegularColor = getResources().getColor(R.color.lock_pattern_view_regular_color);
         mErrorColor = getResources().getColor(R.color.lock_pattern_view_error_color);
-        mSuccessColor = getResources().getColor(R.color.lock_pattern_view_success_color);
+        mSuccessColor = mErrorColor;
 
         mPathPaint.setColor(mRegularColor);
 
diff --git a/app/src/main/res/drawable-v25/ic_shortcut_start.xml b/app/src/main/res/drawable-v25/ic_shortcut_start.xml
index b84b61e9a..7f8cd0895 100644
--- a/app/src/main/res/drawable-v25/ic_shortcut_start.xml
+++ b/app/src/main/res/drawable-v25/ic_shortcut_start.xml
@@ -6,10 +6,10 @@
     android:viewportHeight="48">
     <path
         android:fillAlpha="1"
-        android:fillColor="@color/shortcut_bg"
+        android:fillColor="@android:color/white"
         android:pathData="M46,24A22,22 0,0 1,24 46,22 22,0 0,1 2,24 22,22 0,0 1,24 2,22 22,0 0,1 46,24Z" />
     <path
         android:fillAlpha="1"
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="@android:color/black"
         android:pathData="M20,17V31L31,24Z" />
 </vector>
diff --git a/app/src/main/res/drawable-v25/ic_shortcut_stop.xml b/app/src/main/res/drawable-v25/ic_shortcut_stop.xml
index 07106f4a6..7f492130b 100644
--- a/app/src/main/res/drawable-v25/ic_shortcut_stop.xml
+++ b/app/src/main/res/drawable-v25/ic_shortcut_stop.xml
@@ -6,10 +6,10 @@
     android:viewportHeight="48">
     <path
         android:fillAlpha="1"
-        android:fillColor="@color/shortcut_bg"
+        android:fillColor="@android:color/white"
         android:pathData="M46,24A22,22 0,0 1,24 46,22 22,0 0,1 2,24 22,22 0,0 1,24 2,22 22,0 0,1 46,24Z" />
     <path
         android:fillAlpha="1"
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="@android:color/black"
         android:pathData="m18,31h4L22,17h-4zM26,17v14h4L30,17Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_pause_108dp.xml b/app/src/main/res/drawable/ic_pause_108dp.xml
index aa5d42ac9..2d230c637 100644
--- a/app/src/main/res/drawable/ic_pause_108dp.xml
+++ b/app/src/main/res/drawable/ic_pause_108dp.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="108">
     <path
         android:fillAlpha="1"
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="@android:color/white"
         android:pathData="m42,68h8V40H42ZM58,40v28h8V40Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow_108dp.xml b/app/src/main/res/drawable/ic_play_arrow_108dp.xml
index 48a841c46..0d5b95f27 100644
--- a/app/src/main/res/drawable/ic_play_arrow_108dp.xml
+++ b/app/src/main/res/drawable/ic_play_arrow_108dp.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="108">
     <path
         android:fillAlpha="1"
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="@android:color/white"
         android:pathData="M46,40V68L68,54Z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_preference.xml b/app/src/main/res/layout/activity_preference.xml
index 54aa94d0a..094837151 100644
--- a/app/src/main/res/layout/activity_preference.xml
+++ b/app/src/main/res/layout/activity_preference.xml
@@ -11,13 +11,12 @@
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:elevation="4dp"
         android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize" />
+            android:layout_height="wrap_content" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 65e5153bf..d4285939c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -26,7 +26,6 @@
     <color name="deep_orange_400">#ffff7043</color>
     <color name="grey_500">#ff9e9e9e</color>
     <color name="brown_500">#ff795548</color>
-    <color name="colorPrimary">@color/teal_500</color>
     <color name="loading_indicator_red">#ffe53935</color>
     <color name="loading_indicator_purple">@color/purple_a700</color>
     <color name="loading_indicator_blue">#ff1d87e4</color>
@@ -67,7 +66,6 @@
 
     <!-- Lock pattern view -->
     <color name="lock_pattern_view_regular_color">#8a000000</color>
-    <color name="lock_pattern_view_success_color">@color/colorPrimary</color>
     <color name="lock_pattern_view_error_color">@color/red_500</color>
 
     <!--Shortcut background-->
diff --git a/app/src/main/res/values/drawables.xml b/app/src/main/res/values/drawables.xml
index 0c49197d4..40e3a7415 100644
--- a/app/src/main/res/values/drawables.xml
+++ b/app/src/main/res/values/drawables.xml
@@ -17,6 +17,5 @@
 
     <drawable name="transparent">@android:color/transparent</drawable>
     <drawable name="tile_background_activated">#7f9c27b0</drawable>
-    <drawable name="sadpanda_low_poly">@color/colorPrimary</drawable>
 
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 9a8c93275..0cc71b491 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -21,7 +21,6 @@
     <!-- ========== -->
 
     <style name="Base.AppTheme" parent="Theme.Material3.DynamicColors.DayNight">
-        <item name="colorControlActivated">@color/colorPrimary</item>
         <item name="colorEdgeEffect">@color/grey_500</item>
         <item name="dividerColor">@color/divider</item>
         <item name="drawableColorSecondary">@color/material_dynamic_secondary50</item>