From 4c05ba21453c728075bb51efd84f383201db7d22 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 28 Jan 2021 14:16:03 +0100
Subject: [PATCH] Fixed color issues in dark mode

---
 app/src/main/res/drawable/menu.xml                          | 4 ++--
 .../main/res/drawable/round_button_background_default.xml   | 2 +-
 app/src/main/res/drawable/settings_advanced.xml             | 6 +++++-
 app/src/main/res/drawable/settings_audio.xml                | 6 +++++-
 app/src/main/res/drawable/settings_call.xml                 | 6 +++++-
 app/src/main/res/drawable/settings_chat.xml                 | 6 +++++-
 app/src/main/res/drawable/settings_contacts.xml             | 6 +++++-
 app/src/main/res/drawable/settings_network.xml              | 6 +++++-
 app/src/main/res/drawable/settings_video.xml                | 5 ++++-
 app/src/main/res/values-night/styles.xml                    | 1 +
 app/src/main/res/values/attrs.xml                           | 1 +
 app/src/main/res/values/styles.xml                          | 1 +
 12 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/drawable/menu.xml b/app/src/main/res/drawable/menu.xml
index 5cf788b6c..035606757 100644
--- a/app/src/main/res/drawable/menu.xml
+++ b/app/src/main/res/drawable/menu.xml
@@ -2,10 +2,10 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false">
         <bitmap android:src="@drawable/menu_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
+            android:tint="@color/light_grey_color"/>
     </item>
     <item>
         <bitmap android:src="@drawable/menu_default"
-            android:tint="?attr/drawableTintColor2"/>
+            android:tint="@color/white_color"/>
     </item>
 </selector>
diff --git a/app/src/main/res/drawable/round_button_background_default.xml b/app/src/main/res/drawable/round_button_background_default.xml
index 0de013568..63eba8a5c 100644
--- a/app/src/main/res/drawable/round_button_background_default.xml
+++ b/app/src/main/res/drawable/round_button_background_default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/light_grey_color"/>
+    <solid android:color="?attr/drawableTintColor3"/>
     <size android:width="30dp" android:height="30dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/settings_advanced.xml b/app/src/main/res/drawable/settings_advanced.xml
index 1fe8d2c57..4d26576b3 100644
--- a/app/src/main/res/drawable/settings_advanced.xml
+++ b/app/src/main/res/drawable/settings_advanced.xml
@@ -4,6 +4,10 @@
         <bitmap android:src="@drawable/settings_advanced_default"
             android:tint="?attr/accentColor"/>
     </item>
-    <item android:drawable="@drawable/settings_advanced_default" />
+
+    <item>
+        <bitmap android:src="@drawable/settings_advanced_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
 
diff --git a/app/src/main/res/drawable/settings_audio.xml b/app/src/main/res/drawable/settings_audio.xml
index 26323db18..bd1f54345 100644
--- a/app/src/main/res/drawable/settings_audio.xml
+++ b/app/src/main/res/drawable/settings_audio.xml
@@ -4,6 +4,10 @@
         <bitmap android:src="@drawable/settings_audio_default"
             android:tint="?attr/accentColor"/>
     </item>
-    <item android:drawable="@drawable/settings_audio_default" />
+
+    <item>
+        <bitmap android:src="@drawable/settings_audio_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
 
diff --git a/app/src/main/res/drawable/settings_call.xml b/app/src/main/res/drawable/settings_call.xml
index 04ed1f4a7..1eaeea4cd 100644
--- a/app/src/main/res/drawable/settings_call.xml
+++ b/app/src/main/res/drawable/settings_call.xml
@@ -4,6 +4,10 @@
         <bitmap android:src="@drawable/settings_call_default"
             android:tint="?attr/accentColor"/>
     </item>
-    <item android:drawable="@drawable/settings_call_default" />
+
+    <item>
+        <bitmap android:src="@drawable/settings_call_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
 
diff --git a/app/src/main/res/drawable/settings_chat.xml b/app/src/main/res/drawable/settings_chat.xml
index 3e0a9c439..91f3146d7 100644
--- a/app/src/main/res/drawable/settings_chat.xml
+++ b/app/src/main/res/drawable/settings_chat.xml
@@ -4,6 +4,10 @@
         <bitmap android:src="@drawable/settings_chat_default"
             android:tint="?attr/accentColor"/>
     </item>
-    <item android:drawable="@drawable/settings_chat_default" />
+
+    <item>
+        <bitmap android:src="@drawable/settings_chat_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
 
diff --git a/app/src/main/res/drawable/settings_contacts.xml b/app/src/main/res/drawable/settings_contacts.xml
index a7800cd8a..134672d7d 100644
--- a/app/src/main/res/drawable/settings_contacts.xml
+++ b/app/src/main/res/drawable/settings_contacts.xml
@@ -4,6 +4,10 @@
         <bitmap android:src="@drawable/settings_contacts_default"
             android:tint="?attr/accentColor"/>
     </item>
-    <item android:drawable="@drawable/settings_contacts_default" />
+
+    <item>
+        <bitmap android:src="@drawable/settings_contacts_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
 
diff --git a/app/src/main/res/drawable/settings_network.xml b/app/src/main/res/drawable/settings_network.xml
index 6a71d0f77..718e0d587 100644
--- a/app/src/main/res/drawable/settings_network.xml
+++ b/app/src/main/res/drawable/settings_network.xml
@@ -4,6 +4,10 @@
         <bitmap android:src="@drawable/settings_network_default"
             android:tint="?attr/accentColor"/>
     </item>
-    <item android:drawable="@drawable/settings_network_default" />
+
+    <item>
+        <bitmap android:src="@drawable/settings_network_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
 
diff --git a/app/src/main/res/drawable/settings_video.xml b/app/src/main/res/drawable/settings_video.xml
index 011d8cbd0..9d840fda9 100644
--- a/app/src/main/res/drawable/settings_video.xml
+++ b/app/src/main/res/drawable/settings_video.xml
@@ -4,6 +4,9 @@
         <bitmap android:src="@drawable/settings_video_default"
             android:tint="?attr/accentColor"/>
     </item>
-    <item android:drawable="@drawable/settings_video_default" />
+    <item>
+        <bitmap android:src="@drawable/settings_video_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
 
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 064ea33f0..49cce9b18 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -35,6 +35,7 @@
         <item name="drawableTintDisabledColor">@color/light_grey_color</item>
         <item name="drawableTintOverColor">@color/primary_color</item>
         <item name="drawableTintColor2">@color/dark_grey_color</item>
+        <item name="drawableTintColor3">@color/grey_color</item>
 
         <item name="lightToolbarBackgroundColor">@color/dark_grey_color</item>
         <item name="lightToolbarBackgroundDisabledColor">@color/light_grey_color</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 8345f6c27..fd3beb608 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -20,6 +20,7 @@
         <attr name="drawableTintDisabledColor" format="color"/>
         <attr name="drawableTintOverColor" format="color"/>
         <attr name="drawableTintColor2" format="color"/>
+        <attr name="drawableTintColor3" format="color"/>
 
         <attr name="lightToolbarBackgroundColor" format="color"/>
         <attr name="lightToolbarBackgroundDisabledColor" format="color"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7cf970b5e..066ea0534 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -36,6 +36,7 @@
         <item name="drawableTintDisabledColor">@color/disabled_color</item>
         <item name="drawableTintOverColor">@color/primary_color</item>
         <item name="drawableTintColor2">@color/white_color</item>
+        <item name="drawableTintColor3">@color/light_grey_color</item>
 
         <item name="lightToolbarBackgroundColor">@color/toolbar_color</item>
         <item name="lightToolbarBackgroundDisabledColor">@color/light_grey_color</item>