From 52aa57ac7c575dbab3ac62b5b58347346f0aaf45 Mon Sep 17 00:00:00 2001
From: onurays <onurays@matrix.org>
Date: Fri, 24 Apr 2020 17:18:59 +0300
Subject: [PATCH] Fix the color of misleading url according to design document.
---
.../riotx/features/home/room/detail/RoomDetailFragment.kt | 4 ++--
vector/src/main/res/values/colors_riotx.xml | 5 +++++
vector/src/main/res/values/theme_black.xml | 1 +
vector/src/main/res/values/theme_dark.xml | 1 +
vector/src/main/res/values/theme_light.xml | 1 +
5 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
index 150c0d1979..f348e0612a 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
@@ -957,8 +957,8 @@ class RoomDetailFragment @Inject constructor(
.setMessage(
getString(R.string.external_link_confirmation_message, title, url)
.toSpannable()
- .colorizeMatchingText(url, colorProvider.getColorFromAttribute(android.R.attr.textColorLink))
- .colorizeMatchingText(title, colorProvider.getColorFromAttribute(android.R.attr.textColorLink))
+ .colorizeMatchingText(url, colorProvider.getColorFromAttribute(R.attr.riotx_text_primary_body_contrast))
+ .colorizeMatchingText(title, colorProvider.getColorFromAttribute(R.attr.riotx_text_primary_body_contrast))
)
.setPositiveButton(R.string._continue) { _, _ ->
openUrlInExternalBrowser(requireContext(), url)
diff --git a/vector/src/main/res/values/colors_riotx.xml b/vector/src/main/res/values/colors_riotx.xml
index 7c0e57be93..238fcbd6a2 100644
--- a/vector/src/main/res/values/colors_riotx.xml
+++ b/vector/src/main/res/values/colors_riotx.xml
@@ -99,6 +99,11 @@
<color name="riotx_text_secondary_dark">#FFA1B2D1</color>
<color name="riotx_text_secondary_black">#FFA1B2D1</color>
+ <attr name="riotx_text_primary_body_contrast" format="color" />
+ <color name="riotx_text_primary_body_contrast_light">#FF61708B</color>
+ <color name="riotx_text_primary_body_contrast_dark">#FFA1B2D1</color>
+ <color name="riotx_text_primary_body_contrast_black">#FFA1B2D1</color>
+
<attr name="riotx_android_secondary" format="color" />
<color name="riotx_android_secondary_light">#FF7E899C</color>
<color name="riotx_android_secondary_dark">#FF7E899C</color>
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index b2ddfd5b81..f3f84a36d8 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -18,6 +18,7 @@
<item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_black</item>
<item name="riotx_text_primary">@color/riotx_text_primary_black</item>
<item name="riotx_text_secondary">@color/riotx_text_secondary_black</item>
+ <item name="riotx_text_primary_body_contrast">@color/riotx_text_primary_body_contrast_black</item>
<item name="riotx_android_secondary">@color/riotx_android_secondary_black</item>
<item name="riotx_search_placeholder">@color/riotx_search_placeholder_black</item>
<item name="riotx_room_highlight">@color/riotx_room_highlight_black</item>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 09775d4d41..a2be367e55 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -16,6 +16,7 @@
<item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_dark</item>
<item name="riotx_text_primary">@color/riotx_text_primary_dark</item>
<item name="riotx_text_secondary">@color/riotx_text_secondary_dark</item>
+ <item name="riotx_text_primary_body_contrast">@color/riotx_text_primary_body_contrast_dark</item>
<item name="riotx_android_secondary">@color/riotx_android_secondary_dark</item>
<item name="riotx_search_placeholder">@color/riotx_search_placeholder_dark</item>
<item name="riotx_room_highlight">@color/riotx_room_highlight_dark</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index c63dfa9057..9709172f9d 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -16,6 +16,7 @@
<item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_light</item>
<item name="riotx_text_primary">@color/riotx_text_primary_light</item>
<item name="riotx_text_secondary">@color/riotx_text_secondary_light</item>
+ <item name="riotx_text_primary_body_contrast">@color/riotx_text_primary_body_contrast_light</item>
<item name="riotx_android_secondary">@color/riotx_android_secondary_light</item>
<item name="riotx_search_placeholder">@color/riotx_search_placeholder_light</item>
<item name="riotx_room_highlight">@color/riotx_room_highlight_light</item>