From 159074098107bca81badd2f853417ee850cc0629 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Tue, 10 Aug 2021 10:05:11 +0200
Subject: [PATCH] Properly theme verification request popup background

Change-Id: Ia613b9cb6efe41a54cb9ec049828aac27f0968c7
---
 library/ui-styles/src/main/res/values/attrs_sc.xml              | 2 ++
 library/ui-styles/src/main/res/values/theme_dark.xml            | 1 +
 library/ui-styles/src/main/res/values/theme_light.xml           | 1 +
 library/ui-styles/src/main/res/values/theme_sc.xml              | 1 +
 .../crypto/verification/IncomingVerificationRequestHandler.kt   | 2 +-
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/library/ui-styles/src/main/res/values/attrs_sc.xml b/library/ui-styles/src/main/res/values/attrs_sc.xml
index 2b3cb892f1..996eddae65 100644
--- a/library/ui-styles/src/main/res/values/attrs_sc.xml
+++ b/library/ui-styles/src/main/res/values/attrs_sc.xml
@@ -27,6 +27,8 @@
         <attr name="user_color_pl_1" format="color" />
         <attr name="user_color_pl_0" format="color" />
 
+        <attr name="verification_request_background" format="color" />
+
     </declare-styleable>
 
 </resources>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index d634263c9a..1fe2ba36ac 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -134,6 +134,7 @@
         <item name="user_color_pl_95">@color/user_color_element_pl_95</item>
         <item name="user_color_pl_100">@color/user_color_element_pl_100</item>
         <item name="voice_message_playback_background_color">?vctr_content_quinary</item>
+        <item name="verification_request_background">?vctr_notice_secondary</item>
 
         <item name="android:statusBarColor">@color/android_status_bar_background_dark</item>
         <item name="android:navigationBarColor">@color/android_navigation_bar_background_dark</item>
diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
index 8c0a9d9ff6..3d4902241b 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -134,6 +134,7 @@
         <item name="user_color_pl_95">@color/user_color_element_pl_95</item>
         <item name="user_color_pl_100">@color/user_color_element_pl_100</item>
         <item name="voice_message_playback_background_color">?vctr_content_quinary</item>
+        <item name="verification_request_background">?vctr_notice_secondary</item>
 
         <!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
         <item name="android:statusBarColor">@color/android_status_bar_background_dark</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc.xml b/library/ui-styles/src/main/res/values/theme_sc.xml
index 7fcba51231..1bd135972a 100644
--- a/library/ui-styles/src/main/res/values/theme_sc.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc.xml
@@ -96,6 +96,7 @@
         <item name="user_color_pl_95">@color/user_color_sc_pl_95</item>
         <item name="user_color_pl_100">@color/user_color_sc_pl_100</item>
         <item name="voice_message_playback_background_color">#1fffffff</item>
+        <item name="verification_request_background">?colorBackgroundFloating</item>
 
         <item name="android:statusBarColor">@color/background_black_sc</item>
         <item name="android:navigationBarColor">@color/background_black_sc</item>
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
index 0b93120b52..74346b0695 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
@@ -165,7 +165,7 @@ class IncomingVerificationRequestHandler @Inject constructor(
                                     pr.roomId ?: ""
                             )
                         }
-                        colorAttribute = R.attr.vctr_notice_secondary
+                        colorAttribute = R.attr.verification_request_background
                         // 5mn expiration
                         expirationTimestamp = System.currentTimeMillis() + (5 * 60 * 1000L)
                     }