From ab95cbee92c75756b61657a405b14f0696203623 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 13 Jun 2019 14:19:31 +0200
Subject: [PATCH] Improve keys backup banner rendering

---
 vector/src/main/res/layout/fragment_home_detail.xml    | 2 +-
 vector/src/main/res/layout/view_keys_backup_banner.xml | 4 +++-
 vector/src/main/res/values/colors_riotx.xml            | 5 +++++
 vector/src/main/res/values/theme_dark.xml              | 1 +
 vector/src/main/res/values/theme_light.xml             | 1 +
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index 7bf62538..13c8133c 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -48,7 +48,7 @@
         android:id="@+id/homeKeysBackupBanner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?vctr_list_header_background_color"
+        android:background="?riotx_keys_backup_banner_accent_color"
         android:minHeight="67dp"
         app:layout_constraintBottom_toTopOf="@+id/roomListContainer"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/view_keys_backup_banner.xml b/vector/src/main/res/layout/view_keys_backup_banner.xml
index dab259ee..3f829c58 100644
--- a/vector/src/main/res/layout/view_keys_backup_banner.xml
+++ b/vector/src/main/res/layout/view_keys_backup_banner.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?vctr_list_header_background_color"
+    android:background="?riotx_keys_backup_banner_accent_color"
     android:minHeight="67dp"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
@@ -26,6 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
         android:layout_marginLeft="27dp"
+        android:layout_marginTop="8dp"
         android:text="@string/keys_backup_banner_setup_line1"
         android:textColor="?riotx_text_primary"
         android:textSize="15sp"
@@ -41,6 +42,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
         android:layout_marginLeft="27dp"
+        android:layout_marginBottom="8dp"
         android:text="@string/keys_backup_banner_setup_line2"
         android:textColor="?colorAccent"
         android:textSize="15sp"
diff --git a/vector/src/main/res/values/colors_riotx.xml b/vector/src/main/res/values/colors_riotx.xml
index 3ea2d51c..0e51d46c 100644
--- a/vector/src/main/res/values/colors_riotx.xml
+++ b/vector/src/main/res/values/colors_riotx.xml
@@ -147,5 +147,10 @@
     <color name="riotx_touch_guard_bg_dark">#BF000000</color>
     <color name="riotx_touch_guard_bg_black">#BF000000</color>
 
+    <!-- (color from RiotWeb) -->
+    <attr name="riotx_keys_backup_banner_accent_color" format="color" />
+    <color name="riotx_keys_backup_banner_accent_color_light">#FFF8E3</color>
+    <color name="riotx_keys_backup_banner_accent_color_dark">#22262E</color>
+
 
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index f6050599..831cf337 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -28,6 +28,7 @@
         <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_dark</item>
         <item name="riotx_fab_label_color">@color/riotx_fab_label_color_dark</item>
         <item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_dark</item>
+        <item name="riotx_keys_backup_banner_accent_color">@color/riotx_keys_backup_banner_accent_color_dark</item>
 
         <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
         <item name="colorPrimary">@color/riotx_accent</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 03d1c4ef..926ad850 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -28,6 +28,7 @@
         <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_light</item>
         <item name="riotx_fab_label_color">@color/riotx_fab_label_color_light</item>
         <item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_light</item>
+        <item name="riotx_keys_backup_banner_accent_color">@color/riotx_keys_backup_banner_accent_color_light</item>
 
         <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
         <item name="colorPrimary">@color/riotx_accent</item>