From 7e391ca5186ca37d24a4a1895d84d2417aa47127 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 2 Jun 2022 14:59:11 +0200
Subject: [PATCH] Fixed chat rooms menu icons while in dark mode

---
 app/src/main/res/drawable/chat_room_menu_add_contact.xml  | 7 +++++++
 .../res/drawable/chat_room_menu_mute_notifications.xml    | 7 +++++++
 .../res/drawable/chat_room_menu_unmute_notifications.xml  | 7 +++++++
 app/src/main/res/drawable/chat_room_menu_view_contact.xml | 7 +++++++
 app/src/main/res/layout/chat_room_list_cell.xml           | 2 +-
 app/src/main/res/layout/chat_room_menu.xml                | 8 ++++----
 6 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/drawable/chat_room_menu_add_contact.xml
 create mode 100644 app/src/main/res/drawable/chat_room_menu_mute_notifications.xml
 create mode 100644 app/src/main/res/drawable/chat_room_menu_unmute_notifications.xml
 create mode 100644 app/src/main/res/drawable/chat_room_menu_view_contact.xml

diff --git a/app/src/main/res/drawable/chat_room_menu_add_contact.xml b/app/src/main/res/drawable/chat_room_menu_add_contact.xml
new file mode 100644
index 000000000..474e025f6
--- /dev/null
+++ b/app/src/main/res/drawable/chat_room_menu_add_contact.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/menu_add_contact"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/chat_room_menu_mute_notifications.xml b/app/src/main/res/drawable/chat_room_menu_mute_notifications.xml
new file mode 100644
index 000000000..34f6f8794
--- /dev/null
+++ b/app/src/main/res/drawable/chat_room_menu_mute_notifications.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/menu_notifications_off"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/chat_room_menu_unmute_notifications.xml b/app/src/main/res/drawable/chat_room_menu_unmute_notifications.xml
new file mode 100644
index 000000000..e53b378eb
--- /dev/null
+++ b/app/src/main/res/drawable/chat_room_menu_unmute_notifications.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/menu_notifications_on"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/chat_room_menu_view_contact.xml b/app/src/main/res/drawable/chat_room_menu_view_contact.xml
new file mode 100644
index 000000000..248584507
--- /dev/null
+++ b/app/src/main/res/drawable/chat_room_menu_view_contact.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/menu_contact"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
+</selector>
diff --git a/app/src/main/res/layout/chat_room_list_cell.xml b/app/src/main/res/layout/chat_room_list_cell.xml
index cfa8f99a3..e6e8964fe 100644
--- a/app/src/main/res/layout/chat_room_list_cell.xml
+++ b/app/src/main/res/layout/chat_room_list_cell.xml
@@ -153,7 +153,7 @@
                     android:layout_height="wrap_content"
                     android:adjustViewBounds="true"
                     android:layout_marginRight="5dp"
-                    android:src="@drawable/menu_notifications_off"/>
+                    android:src="@drawable/chat_room_menu_mute_notifications"/>
 
                 <ImageView
                     android:visibility="@{viewModel.ephemeralEnabled ? View.VISIBLE : View.GONE, default=gone}"
diff --git a/app/src/main/res/layout/chat_room_menu.xml b/app/src/main/res/layout/chat_room_menu.xml
index 498605ff5..f8b70fbf7 100644
--- a/app/src/main/res/layout/chat_room_menu.xml
+++ b/app/src/main/res/layout/chat_room_menu.xml
@@ -65,7 +65,7 @@
             android:onClick="@{addToContactsListener}"
             style="@style/popup_item_font"
             android:text="@string/chat_message_context_menu_add_to_contacts"
-            app:drawableRightCompat="@drawable/menu_add_contact" />
+            app:drawableRightCompat="@drawable/chat_room_menu_add_contact" />
 
         <TextView
             android:layout_width="match_parent"
@@ -75,7 +75,7 @@
             android:onClick="@{goToContactListener}"
             style="@style/popup_item_font"
             android:text="@string/chat_room_context_menu_go_to_contact"
-            app:drawableRightCompat="@drawable/menu_contact" />
+            app:drawableRightCompat="@drawable/chat_room_menu_view_contact" />
 
         <TextView
             android:layout_width="match_parent"
@@ -115,7 +115,7 @@
             android:onClick="@{muteListener}"
             style="@style/popup_item_font"
             android:text="@string/chat_message_context_menu_turn_off_notifications"
-            app:drawableRightCompat="@drawable/menu_notifications_off" />
+            app:drawableRightCompat="@drawable/chat_room_menu_mute_notifications" />
 
         <TextView
             android:layout_width="match_parent"
@@ -125,7 +125,7 @@
             android:onClick="@{unmuteListener}"
             style="@style/popup_item_font"
             android:text="@string/chat_message_context_menu_turn_on_notifications"
-            app:drawableRightCompat="@drawable/menu_notifications_on" />
+            app:drawableRightCompat="@drawable/chat_room_menu_unmute_notifications" />
 
         <TextView
             android:layout_width="match_parent"