From 553bae4a333e19fb1f505b8546359be9e1d94086 Mon Sep 17 00:00:00 2001
From: Mash Kyrielight <fiepi@live.com>
Date: Sun, 10 Nov 2024 04:44:02 +0800
Subject: [PATCH] Fix icon color on dark theme

---
 res/drawable/ic_album_art_placeholder.xml                     | 2 +-
 res/drawable/{ic_volume_black.xml => ic_volume.xml}           | 2 +-
 res/drawable/{ic_volume_mute_black.xml => ic_volume_mute.xml} | 4 +---
 res/layout/list_item_systemvolume.xml                         | 2 +-
 res/layout/mpris_control.xml                                  | 2 +-
 .../kdeconnect/Plugins/SystemVolumePlugin/SinkItemHolder.java | 2 +-
 .../kde/kdeconnect/UserInterface/About/EasterEggActivity.kt   | 4 ++--
 7 files changed, 8 insertions(+), 10 deletions(-)
 rename res/drawable/{ic_volume_black.xml => ic_volume.xml} (89%)
 rename res/drawable/{ic_volume_mute_black.xml => ic_volume_mute.xml} (76%)

diff --git a/res/drawable/ic_album_art_placeholder.xml b/res/drawable/ic_album_art_placeholder.xml
index 8e8544f6..74602609 100644
--- a/res/drawable/ic_album_art_placeholder.xml
+++ b/res/drawable/ic_album_art_placeholder.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#000000"
+        android:fillColor="?colorControlNormal"
         android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/>
 </vector>
diff --git a/res/drawable/ic_volume_black.xml b/res/drawable/ic_volume.xml
similarity index 89%
rename from res/drawable/ic_volume_black.xml
rename to res/drawable/ic_volume.xml
index bb0c74ba..1ec6f529 100644
--- a/res/drawable/ic_volume_black.xml
+++ b/res/drawable/ic_volume.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z"/>
 </vector>
diff --git a/res/drawable/ic_volume_mute_black.xml b/res/drawable/ic_volume_mute.xml
similarity index 76%
rename from res/drawable/ic_volume_mute_black.xml
rename to res/drawable/ic_volume_mute.xml
index 049a8c5e..434a1bcd 100644
--- a/res/drawable/ic_volume_mute_black.xml
+++ b/res/drawable/ic_volume_mute.xml
@@ -6,8 +6,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="#000000"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M7 9v6h4l5 5V4l-5 5H7z" />
-    <path
-        android:pathData="M0 0h24v24H0z" />
 </vector>
diff --git a/res/layout/list_item_systemvolume.xml b/res/layout/list_item_systemvolume.xml
index 013d5495..fde7086a 100644
--- a/res/layout/list_item_systemvolume.xml
+++ b/res/layout/list_item_systemvolume.xml
@@ -49,7 +49,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
                 android:background="@android:color/transparent"
                 android:contentDescription="@string/mute"
                 android:scaleType="fitXY"
-                android:src="@drawable/ic_volume_black"/>
+                android:src="@drawable/ic_volume"/>
 
             <SeekBar
                 android:id="@+id/systemvolume_seek"
diff --git a/res/layout/mpris_control.xml b/res/layout/mpris_control.xml
index c7711ec3..6190cb42 100644
--- a/res/layout/mpris_control.xml
+++ b/res/layout/mpris_control.xml
@@ -198,7 +198,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
             android:layout_weight="0"
             android:contentDescription="@string/mpris_volume"
             android:maxWidth="30dip"
-            android:src="@drawable/ic_volume_black"/>
+            android:src="@drawable/ic_volume"/>
 
 
         <SeekBar
diff --git a/src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/SinkItemHolder.java b/src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/SinkItemHolder.java
index 07f4b262..5eb66728 100644
--- a/src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/SinkItemHolder.java
+++ b/src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/SinkItemHolder.java
@@ -98,7 +98,7 @@ class SinkItemHolder extends RecyclerView.ViewHolder
         seekBar.setMax(sink.getMaxVolume());
         seekBar.setProgress(sink.getVolume());
 
-        int iconRes = sink.isMute() ? R.drawable.ic_volume_mute_black : R.drawable.ic_volume_black;
+        int iconRes = sink.isMute() ? R.drawable.ic_volume_mute : R.drawable.ic_volume;
 
         ImageButton button = viewBinding.systemvolumeMute;
         button.setImageResource(iconRes);
diff --git a/src/org/kde/kdeconnect/UserInterface/About/EasterEggActivity.kt b/src/org/kde/kdeconnect/UserInterface/About/EasterEggActivity.kt
index 2d7f136f..e22b052c 100644
--- a/src/org/kde/kdeconnect/UserInterface/About/EasterEggActivity.kt
+++ b/src/org/kde/kdeconnect/UserInterface/About/EasterEggActivity.kt
@@ -64,7 +64,7 @@ class EasterEggActivity : AppCompatActivity(), SensorEventListener {
                     R.drawable.ic_device_laptop_32dp, R.drawable.ic_device_phone_32dp,
                     R.drawable.ic_device_tablet_32dp, R.drawable.ic_device_tv_32dp,
                     R.drawable.ic_delete, R.drawable.ic_warning,
-                    R.drawable.ic_volume_black, R.drawable.ic_wifi,
+                    R.drawable.ic_volume, R.drawable.ic_wifi,
                     R.drawable.ic_add, R.drawable.touchpad_plugin_action_24dp,
                     R.drawable.konqi, R.drawable.run_command_plugin_icon_24dp,
                     R.drawable.ic_phonelink_36dp, R.drawable.ic_phonelink_off_36dp,
@@ -72,7 +72,7 @@ class EasterEggActivity : AppCompatActivity(), SensorEventListener {
                     R.drawable.ic_settings_white_32dp, R.drawable.ic_stop,
                     R.drawable.ic_rewind_black, R.drawable.ic_play_black,
                     R.drawable.ic_mic_black, R.drawable.ic_pause_black,
-                    R.drawable.ic_volume_mute_black, R.drawable.ic_arrow_upward_black_24dp,
+                    R.drawable.ic_volume_mute, R.drawable.ic_arrow_upward_black_24dp,
                     R.drawable.ic_next_black, R.drawable.ic_previous_black,
                     R.drawable.ic_presenter_24dp, R.drawable.ic_key,
                     R.drawable.ic_keyboard_return_black_24dp, R.drawable.ic_keyboard_hide_36dp,