From c708f31ac46d01c057a044724880db9915d9a028 Mon Sep 17 00:00:00 2001
From: Pr0pHesyer <74277431+Pr0pHesyer@users.noreply.github.com>
Date: Fri, 21 Jul 2023 14:18:25 +0800
Subject: [PATCH] fix #1947 Auto icon color change (#1949)

---
 ...dd_folder_white_24dp.xml => ic_add_folder_24dp.xml} |  2 +-
 .../{ic_check_white_24dp.xml => ic_check_24dp.xml}     |  2 +-
 .../{ic_delete_white_24dp.xml => ic_delete_24dp.xml}   |  2 +-
 app/src/main/res/drawable/ic_share_white_24dp.xml      | 10 ----------
 app/src/main/res/menu/device_settings.xml              |  6 +++---
 app/src/main/res/menu/folder_picker.xml                |  2 +-
 app/src/main/res/menu/folder_settings.xml              |  4 ++--
 7 files changed, 9 insertions(+), 19 deletions(-)
 rename app/src/main/res/drawable/{ic_add_folder_white_24dp.xml => ic_add_folder_24dp.xml} (89%)
 rename app/src/main/res/drawable/{ic_check_white_24dp.xml => ic_check_24dp.xml} (86%)
 rename app/src/main/res/drawable/{ic_delete_white_24dp.xml => ic_delete_24dp.xml} (87%)
 delete mode 100644 app/src/main/res/drawable/ic_share_white_24dp.xml

diff --git a/app/src/main/res/drawable/ic_add_folder_white_24dp.xml b/app/src/main/res/drawable/ic_add_folder_24dp.xml
similarity index 89%
rename from app/src/main/res/drawable/ic_add_folder_white_24dp.xml
rename to app/src/main/res/drawable/ic_add_folder_24dp.xml
index d2f2e42b..5b4e629a 100644
--- a/app/src/main/res/drawable/ic_add_folder_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_add_folder_24dp.xml
@@ -5,6 +5,6 @@
         android:viewportWidth="24.0"
         android:width="24dp">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M20,6h-8l-2,-2L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM19,14h-3v3h-2v-3h-3v-2h3L14,9h2v3h3v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_check_white_24dp.xml b/app/src/main/res/drawable/ic_check_24dp.xml
similarity index 86%
rename from app/src/main/res/drawable/ic_check_white_24dp.xml
rename to app/src/main/res/drawable/ic_check_24dp.xml
index e69d6e1a..cfd9660a 100644
--- a/app/src/main/res/drawable/ic_check_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_check_24dp.xml
@@ -5,6 +5,6 @@
         android:viewportWidth="24.0"
         android:width="24dp">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_24dp.xml
similarity index 87%
rename from app/src/main/res/drawable/ic_delete_white_24dp.xml
rename to app/src/main/res/drawable/ic_delete_24dp.xml
index 95f2ef56..2f44ebb4 100644
--- a/app/src/main/res/drawable/ic_delete_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_delete_24dp.xml
@@ -5,6 +5,6 @@
         android:viewportWidth="24.0"
         android:width="24dp">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share_white_24dp.xml
deleted file mode 100644
index 51ea4a28..00000000
--- a/app/src/main/res/drawable/ic_share_white_24dp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:autoMirrored="true"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0"
-        android:width="24dp">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-</vector>
diff --git a/app/src/main/res/menu/device_settings.xml b/app/src/main/res/menu/device_settings.xml
index 277c1a5a..6c87a3de 100644
--- a/app/src/main/res/menu/device_settings.xml
+++ b/app/src/main/res/menu/device_settings.xml
@@ -6,18 +6,18 @@
     <item
         android:id="@+id/create"
         android:title="@string/add"
-        android:icon="@drawable/ic_check_white_24dp"
+        android:icon="@drawable/ic_check_24dp"
         app:showAsAction="always|withText" />
 
     <item
         android:id="@+id/share_device_id"
-        android:icon="@drawable/ic_share_white_24dp"
+        android:icon="@drawable/ic_share_24dp"
         android:title="@string/share_device_id"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/remove"
-        android:icon="@drawable/ic_delete_white_24dp"
+        android:icon="@drawable/ic_delete_24dp"
         android:title="@string/delete_device"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/folder_picker.xml b/app/src/main/res/menu/folder_picker.xml
index b0a7bf54..d88595b9 100644
--- a/app/src/main/res/menu/folder_picker.xml
+++ b/app/src/main/res/menu/folder_picker.xml
@@ -11,7 +11,7 @@
     <item
         android:id="@+id/create_folder"
         android:title="@string/create_fs_folder"
-        android:icon="@drawable/ic_add_folder_white_24dp"
+        android:icon="@drawable/ic_add_folder_24dp"
         app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/folder_settings.xml b/app/src/main/res/menu/folder_settings.xml
index 4baaa177..78b7e500 100644
--- a/app/src/main/res/menu/folder_settings.xml
+++ b/app/src/main/res/menu/folder_settings.xml
@@ -5,13 +5,13 @@
 
     <item
         android:id="@+id/create"
-        android:icon="@drawable/ic_check_white_24dp"
+        android:icon="@drawable/ic_check_24dp"
         android:title="@string/create"
         app:showAsAction="always|withText" />
 
     <item
         android:id="@+id/remove"
-        android:icon="@drawable/ic_delete_white_24dp"
+        android:icon="@drawable/ic_delete_24dp"
         android:title="@string/delete_folder"
         app:showAsAction="ifRoom" />