From cd6624a8a6e499cd38768c4d9bbf12135d904fc8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit.marty@gmail.com>
Date: Fri, 19 Jul 2019 15:15:29 +0200
Subject: [PATCH] Fix issue on setting screen: bad alignment of title

---
 vector/src/main/res/layout/activity_vector_settings.xml | 4 +++-
 vector/src/main/res/values/styles_riot.xml              | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/activity_vector_settings.xml b/vector/src/main/res/layout/activity_vector_settings.xml
index 55716157..eaba9b33 100755
--- a/vector/src/main/res/layout/activity_vector_settings.xml
+++ b/vector/src/main/res/layout/activity_vector_settings.xml
@@ -9,8 +9,10 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
+        <!-- Use VectorToolbarStyleWithPadding on this screen for better alignment with setting items -->
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/settingsToolbar"
+            style="@style/VectorToolbarStyleWithPadding"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:elevation="4dp" />
@@ -19,7 +21,7 @@
             android:id="@+id/vector_settings_page"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?android:attr/colorBackground" />
+            android:background="?riotx_background" />
 
     </LinearLayout>
 
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index 91753271..eaf0530b 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -4,11 +4,14 @@
     <!-- ************************ Common items ************************ -->
 
     <!-- toolbar styles-->
-    <style name="VectorToolbarStyle" parent="Widget.MaterialComponents.Toolbar">
+    <style name="VectorToolbarStyleWithPadding" parent="Widget.MaterialComponents.Toolbar">
         <!-- main text -->
         <item name="titleTextAppearance">@style/Vector.Toolbar.Title</item>
         <item name="subtitleTextAppearance">@style/Vector.Toolbar.SubTitle</item>
         <item name="android:background">?riotx_background</item>
+    </style>
+
+    <style name="VectorToolbarStyle" parent="VectorToolbarStyleWithPadding">
         <item name="contentInsetStartWithNavigation">0dp</item>
     </style>