From 80d2c20d5e33ff83d505cae721644c34e130351c Mon Sep 17 00:00:00 2001
From: ShirosakiMio <852468399@qq.com>
Date: Fri, 30 Aug 2024 09:57:18 +0800
Subject: [PATCH] fix themed icon

---
 FCL/src/main/AndroidManifest.xml                         | 2 +-
 FCL/src/main/res/mipmap-anydpi-v26/ic_launcher.xml       | 3 ++-
 FCL/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml | 5 -----
 FCL/src/main/res/values-v31/colors.xml                   | 4 ++++
 FCL/src/main/res/values/colors.xml                       | 1 +
 5 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 FCL/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
 create mode 100644 FCL/src/main/res/values-v31/colors.xml

diff --git a/FCL/src/main/AndroidManifest.xml b/FCL/src/main/AndroidManifest.xml
index 2cd0deba..8f5a5105 100644
--- a/FCL/src/main/AndroidManifest.xml
+++ b/FCL/src/main/AndroidManifest.xml
@@ -53,7 +53,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:largeHeap="true"
         android:usesCleartextTraffic="true"
diff --git a/FCL/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/FCL/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index c4a603d4..e86b4167 100644
--- a/FCL/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/FCL/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
+    <background android:drawable="@color/icon_background_color"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/FCL/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/FCL/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index c4a603d4..00000000
--- a/FCL/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/FCL/src/main/res/values-v31/colors.xml b/FCL/src/main/res/values-v31/colors.xml
new file mode 100644
index 00000000..6f3023a0
--- /dev/null
+++ b/FCL/src/main/res/values-v31/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="icon_background_color">@android:color/system_accent1_0</color>
+</resources>
\ No newline at end of file
diff --git a/FCL/src/main/res/values/colors.xml b/FCL/src/main/res/values/colors.xml
index 39515ad4..297b5489 100644
--- a/FCL/src/main/res/values/colors.xml
+++ b/FCL/src/main/res/values/colors.xml
@@ -4,4 +4,5 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="ui_bg_color">#4DBCBCBC</color>
+    <color name="icon_background_color">#FFFFFF</color>
 </resources>
\ No newline at end of file