From e918a6a93b7be82c27e6667fa50f9eba6f15c377 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 10:42:29 +0200
Subject: [PATCH] Style for Toolbar

---
 .../view_stub_room_member_profile_header.xml      |  3 +--
 .../res/layout/view_stub_room_profile_header.xml  |  3 +--
 vector/src/main/res/values/styles_toolbar.xml     | 15 ++-------------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index aa489b1c00..6aac00a12d 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -41,11 +41,10 @@
 
         <TextView
             android:id="@+id/memberProfileNameView"
-            style="@style/VectorTextView.HeadlineM"
+            style="@style/VectorTextView.Title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:textAppearance="@style/Vector.Toolbar.Title"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/memberProfileIdView"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/view_stub_room_profile_header.xml b/vector/src/main/res/layout/view_stub_room_profile_header.xml
index 587c3213a2..43b6084666 100644
--- a/vector/src/main/res/layout/view_stub_room_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_profile_header.xml
@@ -31,11 +31,10 @@
 
     <TextView
         android:id="@+id/roomProfileNameView"
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/VectorTextView.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:textAppearance="@style/Vector.Toolbar.Title"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/roomProfileAliasView"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/values/styles_toolbar.xml b/vector/src/main/res/values/styles_toolbar.xml
index faca4feb25..83edaa8f87 100644
--- a/vector/src/main/res/values/styles_toolbar.xml
+++ b/vector/src/main/res/values/styles_toolbar.xml
@@ -40,22 +40,11 @@
         <item name="android:textSize">12sp</item>
     </style>
 
-    <!-- Action mode text style -->
-    <style name="Vector.Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
-        <item name="android:textSize">20sp</item>
-        <item name="android:fontFamily">"sans-serif-medium"</item>
-    </style>
-
-    <style name="Vector.Toolbar.SubTitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
-        <item name="android:textSize">16sp</item>
-        <item name="android:fontFamily">"sans-serif"</item>
-    </style>
-
     <!-- Action mode style -->
     <style name="VectorActionMode" parent="Widget.AppCompat.ActionMode">
         <item name="background">?android:colorBackground</item>
-        <item name="titleTextStyle">@style/Vector.Toolbar.Title</item>
-        <item name="subtitleTextStyle">@style/Vector.Toolbar.SubTitle</item>
+        <item name="titleTextStyle">@style/VectorTextView.Title</item>
+        <item name="subtitleTextStyle">@style/VectorTextView.Subtitle</item>
         <item name="actionMenuTextColor">?colorOnPrimary</item>
     </style>