From acbb7966498e2d6d53b962558ea2904415b53d95 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Feb 2021 18:18:31 +0100
Subject: [PATCH] Fix potential issue with link colors

---
 vector/src/main/res/values/colors.xml      | 1 -
 vector/src/main/res/values/styles_riot.xml | 4 ++--
 vector/src/main/res/values/theme_black.xml | 2 --
 vector/src/main/res/values/theme_dark.xml  | 2 +-
 vector/src/main/res/values/theme_light.xml | 4 ++--
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/vector/src/main/res/values/colors.xml b/vector/src/main/res/values/colors.xml
index e4cfa18461..4b0d4d008d 100644
--- a/vector/src/main/res/values/colors.xml
+++ b/vector/src/main/res/values/colors.xml
@@ -131,7 +131,6 @@
     <color name="riotx_notice">#FFFF4B55</color>
     <color name="riotx_notice_secondary">#FF61708B</color>
     <color name="riotx_notice_secondary_alpha12">#1E61708B</color>
-    <color name="riotx_links">#FF368BD6</color>
 
     <color name="riotx_avatar_fill_1">#FF03B381</color>
     <color name="riotx_avatar_fill_2">#FF368bd6</color>
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index d81b4cb6e9..8017376cc3 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -271,7 +271,7 @@
         <item name="android:textColorSecondary">@color/riot_secondary_text_color_dark</item>
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/riot_tertiary_text_color_dark</item>
-        <item name="android:textColorLink">@color/riotx_links</item>
+        <item name="android:textColorLink">@color/link_color_dark</item>
     </style>
 
     <style name="Vector.BottomSheet.Light" parent="Theme.Design.Light.BottomSheetDialog">
@@ -279,7 +279,7 @@
         <item name="android:textColorSecondary">@color/riot_secondary_text_color_light</item>
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/riot_tertiary_text_color_light</item>
-        <item name="android:textColorLink">@color/riotx_links</item>
+        <item name="android:textColorLink">@color/link_color_light</item>
     </style>
 
 
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index e5c6851f40..5403c521b4 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -66,8 +66,6 @@
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
         <item name="toolbarStyle">@style/VectorToolbarStyle</item>
 
-        <item name="android:textColorLink">@color/riotx_links</item>
-
         <!-- Menu text color -->
         <item name="android:actionMenuTextColor">?colorAccent</item>
 
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 953691a6b7..eeba89ec44 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -66,7 +66,7 @@
         <item name="toolbarStyle">@style/VectorToolbarStyle</item>
         <item name="alertDialogTheme">@style/VectorAlertDialogStyleDark</item>
 
-        <item name="android:textColorLink">@color/riotx_links</item>
+        <item name="android:textColorLink">@color/link_color_dark</item>
 
         <!-- Menu text color -->
         <item name="android:actionMenuTextColor">?colorAccent</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index cae2ef7794..2a8be2e557 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -65,7 +65,7 @@
         <item name="toolbarStyle">@style/VectorToolbarStyle</item>
         <item name="alertDialogTheme">@style/VectorAlertDialogStyleLight</item>
 
-        <item name="android:textColorLink">@color/riotx_links</item>
+        <item name="android:textColorLink">@color/link_color_light</item>
 
         <!-- Menu text color -->
         <item name="android:actionMenuTextColor">?colorAccent</item>
@@ -82,7 +82,7 @@
         <item name="vctr_toolbar_primary_text_color">@color/riotx_text_primary_light</item>
         <!-- Base Text Secondary-->
         <item name="vctr_toolbar_secondary_text_color">@color/riotx_text_primary_light</item>
-        <item name="vctr_toolbar_link_text_color">@color/riotx_links</item>
+        <item name="vctr_toolbar_link_text_color">@color/link_color_light</item>
 
         <!-- default text colors -->
         <item name="vctr_default_text_hint_color">@color/default_text_hint_color_light</item>