From c5709543efca4e0441156a7e2186bd4fcf57c92c Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sat, 5 Jun 2021 09:23:53 +0200
Subject: [PATCH] Fix join suggested room button style

Change-Id: I486cf6d0fed62fc245aefbfcbc49a3751072366c
---
 vector/src/main/res/layout/item_suggested_room.xml | 2 +-
 vector/src/main/res/values/attrs_sc.xml            | 5 +++++
 vector/src/main/res/values/styles_sc.xml           | 2 +-
 vector/src/main/res/values/theme_dark.xml          | 1 +
 vector/src/main/res/values/theme_light.xml         | 1 +
 vector/src/main/res/values/theme_sc.xml            | 1 +
 vector/src/main/res/values/theme_sc_light.xml      | 1 +
 7 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index dd1c5ba01e..a33e0fcb3b 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -74,7 +74,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/joinSuggestedRoomButton"
-        style="@style/VectorButtonStyleOutlined"
+        style="?vectorButtonStyleOutlined"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/values/attrs_sc.xml b/vector/src/main/res/values/attrs_sc.xml
index 40bab78f60..6e672c8b34 100644
--- a/vector/src/main/res/values/attrs_sc.xml
+++ b/vector/src/main/res/values/attrs_sc.xml
@@ -16,6 +16,11 @@
         <attr name="timestamp_overlay_fg" format="color" />
         <attr name="timestamp_overlay_bg" format="color" />
 
+        <!-- use materialButtonStyle for vectorButtonStyle
+        <attr name="vectorButtonStyle" format="reference" />
+        -->
+        <attr name="vectorButtonStyleOutlined" format="reference" />
+
     </declare-styleable>
 
 </resources>
diff --git a/vector/src/main/res/values/styles_sc.xml b/vector/src/main/res/values/styles_sc.xml
index 1cbfe83db6..76acccaab1 100644
--- a/vector/src/main/res/values/styles_sc.xml
+++ b/vector/src/main/res/values/styles_sc.xml
@@ -44,7 +44,7 @@
     </style>
 
     <style name="VectorButtonStyleOutlined.SC">
-        <item name="strokeColor">@color/accent_sc</item>
+        <item name="strokeColor">@color/button_background_tint_selector_sc</item>
     </style>
 
 </resources>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index ba2c846d64..b66f240ac2 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -172,6 +172,7 @@
         <item name="timestamp_overlay_fg">@color/timestamp_overlay_fg</item>
         <item name="timestamp_overlay_bg">@color/timestamp_overlay_bg</item>
         <item name="colorAccentPale">@color/element_accent_pale</item>
+        <item name="vectorButtonStyleOutlined">@style/VectorButtonStyleOutlined</item>
 
         <item name="android:statusBarColor">@color/riotx_header_panel_background_dark</item>
         <item name="android:navigationBarColor">@color/riotx_header_panel_background_dark</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index c179124ff6..1fd5741907 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -172,6 +172,7 @@
         <item name="timestamp_overlay_fg">@color/timestamp_overlay_fg</item>
         <item name="timestamp_overlay_bg">@color/timestamp_overlay_bg</item>
         <item name="colorAccentPale">@color/element_accent_pale</item>
+        <item name="vectorButtonStyleOutlined">@style/VectorButtonStyleOutlined</item>
 
         <!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
         <item name="android:statusBarColor">@color/riotx_header_panel_background_dark</item>
diff --git a/vector/src/main/res/values/theme_sc.xml b/vector/src/main/res/values/theme_sc.xml
index a6f60bb666..0b5db039fe 100644
--- a/vector/src/main/res/values/theme_sc.xml
+++ b/vector/src/main/res/values/theme_sc.xml
@@ -149,6 +149,7 @@
         <item name="riotx_toolbar_bg">?riotx_background</item>
         <item name="riotx_unread_unimportant_room_badge">@color/background_floating_sc</item>
         <item name="colorAccentPale">@color/accent_sc_pale</item>
+        <item name="vectorButtonStyleOutlined">@style/VectorButtonStyleOutlined.SC</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/res/values/theme_sc_light.xml b/vector/src/main/res/values/theme_sc_light.xml
index d31be5982c..f469becf82 100644
--- a/vector/src/main/res/values/theme_sc_light.xml
+++ b/vector/src/main/res/values/theme_sc_light.xml
@@ -30,6 +30,7 @@
         <item name="riotx_toolbar_bg">?riotx_background</item>
         <item name="riotx_unread_unimportant_room_badge">?riotx_header_panel_text_secondary</item>
         <item name="colorAccentPale">@color/accent_sc_pale</item>
+        <item name="vectorButtonStyleOutlined">@style/VectorButtonStyleOutlined.SC</item>
 
         <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Light</item>