filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly theme verification request popup background 

Change-Id: Ia613b9cb6efe41a54cb9ec049828aac27f0968c7
This commit is contained in:
SpiritCroc 2021-08-10 10:05:11 +02:00
parent 9c2c07f194
commit 1590740981
5 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/ui-styles/src/main/res/values/attrs_sc.xml
View File

@ -27,6 +27,8 @@
<attr name="user_color_pl_1" format="color" /> <attr name="user_color_pl_1" format="color" />
<attr name="user_color_pl_0" format="color" /> <attr name="user_color_pl_0" format="color" />
<attr name="verification_request_background" format="color" />
</declare-styleable> </declare-styleable>
</resources> </resources>

1
library/ui-styles/src/main/res/values/theme_dark.xml
View File

@ -134,6 +134,7 @@
<item name="user_color_pl_95">@color/user_color_element_pl_95</item> <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="user_color_pl_100">@color/user_color_element_pl_100</item>
<item name="voice_message_playback_background_color">?vctr_content_quinary</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:statusBarColor">@color/android_status_bar_background_dark</item>
<item name="android:navigationBarColor">@color/android_navigation_bar_background_dark</item> <item name="android:navigationBarColor">@color/android_navigation_bar_background_dark</item>

1
library/ui-styles/src/main/res/values/theme_light.xml
View File

@ -134,6 +134,7 @@
<item name="user_color_pl_95">@color/user_color_element_pl_95</item> <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="user_color_pl_100">@color/user_color_element_pl_100</item>
<item name="voice_message_playback_background_color">?vctr_content_quinary</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+ --> <!-- 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> <item name="android:statusBarColor">@color/android_status_bar_background_dark</item>

1
library/ui-styles/src/main/res/values/theme_sc.xml
View File

@ -96,6 +96,7 @@
<item name="user_color_pl_95">@color/user_color_sc_pl_95</item> <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="user_color_pl_100">@color/user_color_sc_pl_100</item>
<item name="voice_message_playback_background_color">#1fffffff</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:statusBarColor">@color/background_black_sc</item>
<item name="android:navigationBarColor">@color/background_black_sc</item> <item name="android:navigationBarColor">@color/background_black_sc</item>

2
vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
View File

@ -165,7 +165,7 @@ class IncomingVerificationRequestHandler @Inject constructor(
pr.roomId ?: "" pr.roomId ?: ""
) )
} }
colorAttribute = R.attr.vctr_notice_secondary colorAttribute = R.attr.verification_request_background
// 5mn expiration // 5mn expiration
expirationTimestamp = System.currentTimeMillis() + (5 * 60 * 1000L) expirationTimestamp = System.currentTimeMillis() + (5 * 60 * 1000L)
} }