From 1795addbf33745a720177b6375a328265da01a6b Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Tue, 22 Mar 2022 23:43:46 +0800
Subject: [PATCH] Merge code

---
 .idea/misc.xml                                     |  2 ++
 .../notify/utils/tool/IconRuleManagerTool.kt       |  5 +++--
 app/src/main/res/drawable/ic_nf_icon_refresh.xml   | 12 ++++++++++++
 app/src/main/res/drawable/ic_nf_icon_update.xml    | 14 ++++++++++----
 4 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_nf_icon_refresh.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 34bb8a4..515e7e8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,6 +6,8 @@
         <entry key="app/src/main/res/drawable-night/bg_orange_round.xml" value="0.232" />
         <entry key="app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.254" />
         <entry key="app/src/main/res/drawable/bg_orange_round.xml" value="0.232" />
+        <entry key="app/src/main/res/drawable/ic_nf_icon_refresh.xml" value="0.232" />
+        <entry key="app/src/main/res/drawable/ic_nf_icon_update.xml" value="0.232" />
         <entry key="app/src/main/res/layout/activity_config.xml" value="0.4375" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.335" />
         <entry key="app/src/main/res/layout/adapter_config.xml" value="0.4375" />
diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt b/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt
index 7133a24..1d1e147 100644
--- a/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt
@@ -367,7 +367,8 @@ object IconRuleManagerTool {
     private fun pushWithRefresh(context: Context) {
         if (context !is AppCompatActivity) return
         SystemUITool.showNeedUpdateApplySnake(context)
-        pushNotify(appContext, title = "更新完成", msg = "部分通知图标需要重启系统界面生效", isAction = false)
+        /** 发送通知提醒宿主更新图标缓存 */
+        pushNotify(appContext, title = "请稍后", msg = "正在动态刷新通知图标改变", isAction = false)
         /** 刷新成功后取消通知 */
         Handler().postDelayed({ context.getSystemService<NotificationManager>()?.cancel(1) }, 1500)
     }
@@ -404,7 +405,7 @@ object IconRuleManagerTool {
                     setContentText(msg)
                     color = OS_COLOR.toInt()
                     setAutoCancel(true)
-                    setSmallIcon(R.drawable.ic_nf_icon_update)
+                    setSmallIcon(if (isAction) R.drawable.ic_nf_icon_update else R.drawable.ic_nf_icon_refresh)
                     setSound(null)
                     setDefaults(NotificationCompat.DEFAULT_ALL)
                     if (isAction) setContentIntent(
diff --git a/app/src/main/res/drawable/ic_nf_icon_refresh.xml b/app/src/main/res/drawable/ic_nf_icon_refresh.xml
new file mode 100644
index 0000000..a75eeda
--- /dev/null
+++ b/app/src/main/res/drawable/ic_nf_icon_refresh.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="@color/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M9.01,14H2v2h7.01v3L13,15l-3.99,-4V14zM14.99,13v-3H22V8h-7.01V5L11,9L14.99,13z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_nf_icon_update.xml b/app/src/main/res/drawable/ic_nf_icon_update.xml
index 684336c..3691ec4 100644
--- a/app/src/main/res/drawable/ic_nf_icon_update.xml
+++ b/app/src/main/res/drawable/ic_nf_icon_update.xml
@@ -1,5 +1,11 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM14,13v4h-4v-4H7l5,-5 5,5h-3z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM14,13v4h-4v-4H7l5,-5 5,5h-3z" />
 </vector>