From 36383b6f4705a253426eac33ae4a549df4441350 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 1 Dec 2022 09:53:18 +0800
Subject: [PATCH] Use Primary color for icons

---
 app/src/main/res/drawable/v_adb_primary_x24.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_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/values/attrs.xml                     | 1 -
 app/src/main/res/values/themes.xml                    | 2 --
 8 files changed, 6 insertions(+), 9 deletions(-)

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 9a365b442..4bfd988f2 100644
--- a/app/src/main/res/drawable/v_adb_primary_x24.xml
+++ b/app/src/main/res/drawable/v_adb_primary_x24.xml
@@ -17,7 +17,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?drawableColorThemePrimary"
+    android:tint="?colorPrimary"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
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 96b13f30a..f6376fe37 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
@@ -17,7 +17,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?drawableColorThemePrimary"
+    android:tint="?colorPrimary"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
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 088ca995c..ae52d0cef 100644
--- a/app/src/main/res/drawable/v_download_primary_x24.xml
+++ b/app/src/main/res/drawable/v_download_primary_x24.xml
@@ -17,7 +17,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?drawableColorThemePrimary"
+    android:tint="?colorPrimary"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
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 162483869..12809d584 100644
--- a/app/src/main/res/drawable/v_info_primary_x24.xml
+++ b/app/src/main/res/drawable/v_info_primary_x24.xml
@@ -17,7 +17,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?drawableColorThemePrimary"
+    android:tint="?colorPrimary"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
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 450bc5ab4..80b56fc59 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
@@ -17,7 +17,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?drawableColorThemePrimary"
+    android:tint="?colorPrimary"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
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 825ddc4aa..d1a67695c 100644
--- a/app/src/main/res/drawable/v_sec_primary_x24.xml
+++ b/app/src/main/res/drawable/v_sec_primary_x24.xml
@@ -19,7 +19,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?drawableColorThemePrimary"
+    android:tint="?colorPrimary"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 3ee898fc6..702ca5bb7 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -18,7 +18,6 @@
 
     <declare-styleable name="Theme">
         <attr name="dividerColor" format="color" />
-        <attr name="drawableColorThemePrimary" format="color" />
         <attr name="tagGroupBackgroundColor" format="color" />
         <attr name="tagBackgroundColor" format="color" />
     </declare-styleable>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 93e1748f6..9ad9a902a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -18,7 +18,6 @@
 
     <style name="Base.AppTheme" parent="Theme.Material3.DynamicColors.DayNight">
         <item name="dividerColor">@color/divider</item>
-        <item name="drawableColorThemePrimary">?attr/colorPrimary</item>
         <item name="tagGroupBackgroundColor">?attr/colorPrimaryContainer</item>
         <item name="tagBackgroundColor">?attr/colorTertiaryContainer</item>
 
@@ -49,7 +48,6 @@
         <item name="colorPrimaryDark">@android:color/black</item>
         <item name="android:colorBackground">@android:color/black</item>
         <item name="dividerColor">@color/divider_black</item>
-        <item name="drawableColorThemePrimary">@color/primary_drawable_black</item>
     </style>
 
     <style name="RatingBarTheme" parent="ThemeOverlay.Material3">