From 37f572166824e10510b9b9febb7b82747fb97224 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 27 Sep 2022 09:14:41 +0200
Subject: [PATCH] Fixed cancelled meeting background color when in dark mode

---
 app/src/main/res/drawable/shape_round_red_background.xml       | 2 +-
 .../drawable/shape_round_red_background_with_orange_border.xml | 2 +-
 app/src/main/res/values-night/styles.xml                       | 1 +
 app/src/main/res/values/attrs.xml                              | 1 +
 app/src/main/res/values/colors.xml                             | 3 ++-
 app/src/main/res/values/styles.xml                             | 1 +
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/drawable/shape_round_red_background.xml b/app/src/main/res/drawable/shape_round_red_background.xml
index 1672ca8f0..9cc11d1e7 100644
--- a/app/src/main/res/drawable/shape_round_red_background.xml
+++ b/app/src/main/res/drawable/shape_round_red_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="7dp" />
-    <solid android:color="@color/voip_conference_cancelled_bg_color"/>
+    <solid android:color="?attr/voipCancelledMeetingBackgroundColor"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_red_background_with_orange_border.xml b/app/src/main/res/drawable/shape_round_red_background_with_orange_border.xml
index abb8a805f..033bc92ea 100644
--- a/app/src/main/res/drawable/shape_round_red_background_with_orange_border.xml
+++ b/app/src/main/res/drawable/shape_round_red_background_with_orange_border.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="7dp" />
-    <solid android:color="@color/voip_conference_cancelled_bg_color"/>
+    <solid android:color="?attr/voipCancelledMeetingBackgroundColor"/>
     <stroke android:width="2dp" android:color="?attr/colorPrimary"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 8f9263261..fce97c303 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -61,6 +61,7 @@
         <item name="voipFormBackgroundColor">@color/voip_dark_color</item>
         <item name="voipFormFieldBackgroundColor">@color/voip_dark_color5</item>
         <item name="voipFormDisabledFieldBackgroundColor">@color/voip_dark_color4</item>
+        <item name="voipCancelledMeetingBackgroundColor">@color/voip_conference_cancelled_bg_color_dark</item>
     </style>
 
     <style name="AppTheme" parent="BaseAppTheme" />
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index ff80297ea..23a0702cb 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -46,6 +46,7 @@
         <attr name="voipFormBackgroundColor" format="color" />
         <attr name="voipFormFieldBackgroundColor" format="color" />
         <attr name="voipFormDisabledFieldBackgroundColor" format="color" />
+        <attr name="voipCancelledMeetingBackgroundColor" format="color" />
     </declare-styleable>
 
     <declare-styleable name="Settings">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index eda6f6da2..eb3caf6a8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -38,7 +38,8 @@
     <color name="voip_conf_address_text_color">#A2A2A2</color>
     <color name="voip_conference_updated_color">#EFAE00</color>
     <color name="voip_conference_cancelled_title_color">#FF0000</color>
-    <color name="voip_conference_cancelled_bg_color">#FFE6E6</color>
+    <color name="voip_conference_cancelled_bg_color_light">#FFE6E6</color>
+    <color name="voip_conference_cancelled_bg_color_dark">#3D3434</color>
 
     <color name="form_field_gray_background">#F7F7F7</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2471608dd..8d2def36a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -68,6 +68,7 @@
         <item name="voipFormBackgroundColor">@color/form_field_gray_background</item>
         <item name="voipFormFieldBackgroundColor">@color/light_grey_color</item>
         <item name="voipFormDisabledFieldBackgroundColor">@color/header_background_color</item>
+        <item name="voipCancelledMeetingBackgroundColor">@color/voip_conference_cancelled_bg_color_light</item>
     </style>
 
     <style name="AppTheme" parent="BaseAppTheme" />