From f0b28742aca4e24392066d949090f53f3a88136d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 10:30:54 +0200
Subject: [PATCH] textSize *sp -> style

---
 tools/check/check_code_quality.sh             | 16 +++++++-
 tools/check/forbidden_strings_in_layout.txt   | 27 +++++++++++++
 .../src/debug/res/layout/item_sas_emoji.xml   |  2 +-
 vector/src/main/res/layout/activity_call.xml  |  2 +-
 .../res/layout/bottom_sheet_bootstrap.xml     |  5 ++-
 .../res/layout/bottom_sheet_call_dial_pad.xml |  4 +-
 .../bottom_sheet_room_widget_permission.xml   |  2 +-
 .../layout/bottom_sheet_save_recovery_key.xml | 10 +++--
 .../res/layout/bottom_sheet_verification.xml  |  3 +-
 .../custom_action_item_layout_badge.xml       |  6 +--
 .../res/layout/dialog_disclaimer_content.xml  |  2 +-
 .../main/res/layout/dialog_event_content.xml  |  6 ++-
 .../layout/dialog_recovery_key_saved_info.xml |  2 +-
 .../main/res/layout/fragment_home_detail.xml  |  4 +-
 .../fragment_keys_backup_restore_success.xml  |  2 +-
 .../fragment_keys_backup_setup_step2.xml      |  2 +-
 .../fragment_keys_backup_setup_step3.xml      |  4 +-
 ...ment_space_create_choose_private_model.xml |  2 +-
 .../fragment_space_create_choose_type.xml     |  2 +-
 .../layout/fragment_ssss_access_from_key.xml  |  2 +-
 .../fragment_ssss_access_from_passphrase.xml  |  2 +-
 .../res/layout/fragment_ssss_reset_all.xml    |  4 +-
 .../src/main/res/layout/grid_item_emoji.xml   |  9 +----
 .../res/layout/item_autocomplete_emoji.xml    |  2 +-
 .../res/layout/item_bottom_sheet_action.xml   |  4 +-
 .../item_bottom_sheet_quick_reaction.xml      | 39 +++++++------------
 .../item_create_direct_room_letter_header.xml |  3 +-
 .../src/main/res/layout/item_emoji_result.xml |  3 +-
 .../src/main/res/layout/item_emoji_verif.xml  |  1 +
 .../main/res/layout/item_profile_section.xml  |  2 +-
 .../src/main/res/layout/item_public_room.xml  |  2 +-
 .../src/main/res/layout/item_pushgateway.xml  |  2 +-
 ...meline_event_merged_room_creation_stub.xml |  2 +-
 .../item_user_directory_letter_header.xml     |  3 +-
 .../main/res/layout/item_user_list_header.xml |  3 +-
 .../layout/item_verification_decimal_code.xml |  6 +--
 ...ew_sign_out_bottom_sheet_action_button.xml |  4 +-
 .../view_stub_room_member_profile_header.xml  |  2 +-
 .../layout/view_stub_room_profile_header.xml  |  2 +-
 39 files changed, 113 insertions(+), 87 deletions(-)
 create mode 100644 tools/check/forbidden_strings_in_layout.txt

diff --git a/tools/check/check_code_quality.sh b/tools/check/check_code_quality.sh
index 0b4272cbfe..7decb985bb 100755
--- a/tools/check/check_code_quality.sh
+++ b/tools/check/check_code_quality.sh
@@ -95,6 +95,14 @@ ${searchForbiddenStringsScript} ./tools/check/forbidden_strings_in_resources.txt
 
 resultForbiddenStringInResource=$?
 
+echo
+echo "Search for forbidden patterns in layouts..."
+
+${searchForbiddenStringsScript} ./tools/check/forbidden_strings_in_layout.txt \
+    ./vector/src/main/res/layout
+
+resultForbiddenStringInLayout=$?
+
 #######################################################################################################################
 # Check files with long lines
 #######################################################################################################################
@@ -156,7 +164,13 @@ fi
 
 echo
 
-if [[ ${resultNbOfDrawable} -eq 0 ]] && [[ ${resultForbiddenStringInCode} -eq 0 ]] && [[ ${resultForbiddenStringInCodeSdk} -eq 0 ]] && [[ ${resultForbiddenStringInResource} -eq 0 ]] && [[ ${resultLongFiles} -eq 0 ]] && [[ ${resultPngInDrawable} -eq 0 ]]; then
+if [[ ${resultNbOfDrawable} -eq 0 ]] \
+   && [[ ${resultForbiddenStringInCode} -eq 0 ]] \
+   && [[ ${resultForbiddenStringInCodeSdk} -eq 0 ]] \
+   && [[ ${resultForbiddenStringInResource} -eq 0 ]] \
+   && [[ ${resultForbiddenStringInLayout} -eq 0 ]] \
+   && [[ ${resultLongFiles} -eq 0 ]] \
+   && [[ ${resultPngInDrawable} -eq 0 ]]; then
    echo "MAIN OK"
 else
    echo "❌ MAIN ERROR"
diff --git a/tools/check/forbidden_strings_in_layout.txt b/tools/check/forbidden_strings_in_layout.txt
new file mode 100644
index 0000000000..dbbd7270d7
--- /dev/null
+++ b/tools/check/forbidden_strings_in_layout.txt
@@ -0,0 +1,27 @@
+#
+# Copyright 2021 New Vector Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This file list String which are not allowed in source code.
+# Use Perl regex to write forbidden strings
+# Note: line cannot start with a space. Use \s instead.
+# It is possible to specify an authorized number of occurrence with === suffix. Default is 0
+# Example:
+# AuthorizedStringThreeTimes===3
+
+# Extension:xml
+
+### Use style="@style/VectorTextView.*" instead of textSize attribute
+android:textSize===9
diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector/src/debug/res/layout/item_sas_emoji.xml
index 94e0689b1f..ee2f068f1e 100644
--- a/vector/src/debug/res/layout/item_sas_emoji.xml
+++ b/vector/src/debug/res/layout/item_sas_emoji.xml
@@ -22,11 +22,11 @@
 
     <TextView
         android:id="@+id/sas_emoji"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:textColor="@color/emoji_color"
-        android:textSize="22sp"
         tools:text="🔧" />
 
     <LinearLayout
diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index c8d1a34446..aa84e01e06 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -98,6 +98,7 @@
 
     <TextView
         android:id="@+id/participantNameText"
+        style="@style/VectorTextView.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -105,7 +106,6 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:gravity="center"
         android:textColor="@android:color/white"
-        android:textSize="20sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
index 08533c5249..512e596fc8 100644
--- a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
+++ b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
@@ -31,17 +31,18 @@
 
         <TextView
             android:id="@+id/bootstrapTitleText"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:ellipsize="end"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/bootstrapIcon"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/bootstrapIcon"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@id/bootstrapIcon"
             tools:text="@string/bottom_sheet_setup_secure_backup_title" />
 
         <androidx.fragment.app.FragmentContainerView
diff --git a/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml b/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
index 136f98c753..cfc6716c0c 100644
--- a/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
+++ b/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
@@ -16,13 +16,13 @@
 
         <TextView
             android:id="@+id/callDialPadTitle"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center_vertical"
             android:text="@string/call_dial_pad_title"
-            android:textColor="?vctr_content_primary"
-            android:textSize="20sp" />
+            android:textColor="?vctr_content_primary" />
 
         <ImageView
             android:id="@+id/callDialPadClose"
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index dd6009c655..f99dff6e51 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -11,6 +11,7 @@
 
 
     <TextView
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -18,7 +19,6 @@
         android:layout_marginBottom="8dp"
         android:text="@string/room_widget_permission_title"
         android:textColor="?vctr_content_primary"
-        android:textSize="20sp"
         android:textStyle="bold" />
 
     <TextView
diff --git a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
index 7f1e9be156..fdc3a49ae9 100644
--- a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
+++ b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
@@ -10,22 +10,22 @@
     android:paddingBottom="8dp">
 
     <TextView
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/keys_backup_setup_step3_copy_button_title"
         android:textAlignment="center"
-        android:textSize="17sp"
         android:textStyle="bold" />
 
     <TextView
         android:id="@+id/keys_backup_recovery_key_text"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_margin="@dimen/layout_horizontal_margin"
         android:fontFamily="monospace"
         android:textAlignment="center"
-        android:textSize="20sp"
         tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8" />
 
     <LinearLayout
@@ -52,11 +52,12 @@
             tools:ignore="MissingPrefix" />
 
         <TextView
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:text="@string/keys_backup_setup_step3_share_recovery_file"
-            android:textSize="17sp" />
+            android:textColor="?vctr_content_primary" />
 
     </LinearLayout>
 
@@ -84,11 +85,12 @@
             tools:ignore="MissingPrefix" />
 
         <TextView
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:text="@string/keys_backup_setup_step3_save_button_title"
-            android:textSize="17sp" />
+            android:textColor="?vctr_content_primary" />
 
     </LinearLayout>
 
diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index f0591c608d..13316b2587 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -38,6 +38,7 @@
 
         <TextView
             android:id="@+id/otherUserNameText"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -45,8 +46,8 @@
             android:ellipsize="end"
             android:maxLines="2"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@+id/otherUserAvatarImageView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/otherUserAvatarImageView"
             app:layout_constraintTop_toTopOf="@+id/otherUserAvatarImageView"
diff --git a/vector/src/main/res/layout/custom_action_item_layout_badge.xml b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
index 05ccbf4c2b..5339e7dc61 100644
--- a/vector/src/main/res/layout/custom_action_item_layout_badge.xml
+++ b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
@@ -24,12 +24,12 @@
 
     <TextView
         android:id="@+id/cart_badge"
-        android:layout_width="12dp"
-        android:layout_height="12dp"
+        style="@style/VectorTextView.Micro"
+        android:layout_width="14dp"
+        android:layout_height="14dp"
         android:background="@drawable/bg_unread_highlight"
         android:gravity="center"
         android:textColor="?colorOnError"
-        android:textSize="8sp"
         app:layout_constraintCircle="@+id/action_view_icon_image"
         app:layout_constraintCircleAngle="45"
         app:layout_constraintCircleRadius="12dp"
diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml
index e3cd296fa5..bdee2e9b44 100644
--- a/vector/src/main/res/layout/dialog_disclaimer_content.xml
+++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml
@@ -41,11 +41,11 @@
 
     <TextView
         android:id="@+id/disclaimerTextView"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/disclaimer_title"
         android:textColor="?vctr_content_primary"
-        android:textSize="20sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/dialog_event_content.xml b/vector/src/main/res/layout/dialog_event_content.xml
index 7ae0acf8f7..de4837d7ed 100644
--- a/vector/src/main/res/layout/dialog_event_content.xml
+++ b/vector/src/main/res/layout/dialog_event_content.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/event_content_text_view"
+        style="@style/VectorTextView.Caption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
         android:fontFamily="monospace"
+        android:textColor="?vctr_content_primary"
         android:textIsSelectable="true"
-        android:textSize="12sp" />
+        tools:text="Event content" />
+
 </ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
index 8bd855fc77..1243ab27bf 100644
--- a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
+++ b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
@@ -34,6 +34,7 @@
 
             <TextView
                 android:id="@+id/bootstrapTitleText"
+                style="@style/VectorTextView.HeadlineM"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -42,7 +43,6 @@
                 android:maxLines="2"
                 android:text="@string/keep_it_safe"
                 android:textColor="?vctr_content_primary"
-                android:textSize="20sp"
                 android:textStyle="bold" />
         </LinearLayout>
 
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index ccdfbe698c..ad95f98fab 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -77,19 +77,19 @@
 
                     <TextView
                         android:id="@+id/groupToolbarTitleView"
+                        style="@style/VectorTextView.HeadlineM"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:gravity="start"
                         android:maxLines="1"
                         android:textColor="?vctr_content_primary"
-                        android:textSize="20sp"
                         android:textStyle="bold"
                         tools:text="@tools:sample/lorem/random" />
 
                     <TextView
                         android:id="@+id/groupToolbarSpaceTitleView"
-                        style="@style/VectorTextView.Body"
+                        style="@style/VectorTextView.Subtitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
index 5f1ddb7b61..c8a57d477c 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
@@ -21,12 +21,12 @@
 
     <TextView
         android:id="@+id/success_text"
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:textAlignment="center"
         android:textColor="?vctr_content_primary"
-        android:textSize="20sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
index 530af43aa5..d9fabc694f 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
@@ -15,6 +15,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step2_text_title"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
@@ -24,7 +25,6 @@
             android:text="@string/keys_backup_setup_step2_text_title"
             android:textAlignment="center"
             android:textColor="?vctr_content_primary"
-            android:textSize="17sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
index 10bb4d2788..e2d932e851 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
@@ -27,6 +27,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_success_title"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -35,7 +36,6 @@
             android:text="@string/keys_backup_setup_step3_success_title"
             android:textAlignment="center"
             android:textColor="?vctr_content_primary"
-            android:textSize="17sp"
             android:textStyle="bold"
             android:visibility="gone"
             tools:visibility="visible" />
@@ -68,13 +68,13 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_recovery_key_text"
+            style="@style/VectorTextView.Title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/layout_horizontal_margin"
             android:fontFamily="monospace"
             android:textAlignment="center"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:visibility="gone"
             tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8"
             tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
index 24b15ce737..d4f63aec93 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
@@ -13,12 +13,12 @@
 
         <TextView
             android:id="@+id/headerText"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:text="@string/create_spaces_who_are_you_working_with"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
             app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_type.xml b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
index 2c28a35cf2..40a915d9e9 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_type.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
@@ -21,13 +21,13 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            style="@style/VectorTextView.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
             android:gravity="center"
             android:text="@string/create_spaces_choose_type_label"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@id/joinInfoHelpText"
             app:layout_constraintTop_toBottomOf="@id/headerText"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
index ecaaad76ba..eed347f82f 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
@@ -25,6 +25,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_key"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -32,7 +33,6 @@
             android:layout_marginEnd="16dp"
             android:text="@string/recovery_key"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ssss_shield"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index 069294d600..c05c709b76 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -27,13 +27,13 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_passphrase"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="16dp"
             android:text="@string/recovery_passphrase"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ssss_shield"
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index 7612aaf4bc..9f94507788 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -12,6 +12,7 @@
 
         <TextView
             android:id="@+id/reset_title"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -19,7 +20,6 @@
             android:drawablePadding="8dp"
             android:text="@string/secure_backup_reset_all"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
             android:tint="?vctr_content_primary"
             app:drawableStartCompat="@drawable/ic_alert_triangle"
@@ -43,6 +43,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_other_devices"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="48dp"
             android:layout_marginStart="16dp"
@@ -51,7 +52,6 @@
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:textColor="?vctr_content_secondary"
-            android:textSize="17sp"
             android:visibility="gone"
             app:drawableStartCompat="@drawable/ic_smartphone"
             app:drawableTint="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/grid_item_emoji.xml b/vector/src/main/res/layout/grid_item_emoji.xml
index 24d2aff598..e302138d55 100644
--- a/vector/src/main/res/layout/grid_item_emoji.xml
+++ b/vector/src/main/res/layout/grid_item_emoji.xml
@@ -20,12 +20,5 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_gravity="center" />
-    <!--<TextView-->
-    <!--android:layout_gravity="center"-->
-    <!--android:id="@+id/grid_item_emoji_text"-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--tools:text="😀"-->
-    <!--android:textSize="24sp"-->
-    <!--/>-->
+
 </FrameLayout>
diff --git a/vector/src/main/res/layout/item_autocomplete_emoji.xml b/vector/src/main/res/layout/item_autocomplete_emoji.xml
index 8b4c78cdd9..62c435e6e5 100644
--- a/vector/src/main/res/layout/item_autocomplete_emoji.xml
+++ b/vector/src/main/res/layout/item_autocomplete_emoji.xml
@@ -10,11 +10,11 @@
 
     <TextView
         android:id="@+id/itemAutocompleteEmoji"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:textColor="@color/emoji_color"
-        android:textSize="20dp"
         tools:ignore="SpUsage"
         tools:text="@sample/reactions.json/data/reaction" />
 
diff --git a/vector/src/main/res/layout/item_bottom_sheet_action.xml b/vector/src/main/res/layout/item_bottom_sheet_action.xml
index 348520b665..8f341f49a6 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_action.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_action.xml
@@ -53,6 +53,7 @@
 
         <TextView
             android:id="@+id/actionTitle"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
@@ -60,8 +61,7 @@
             android:ellipsize="end"
             android:maxLines="2"
             android:textColor="?vctr_content_secondary"
-            android:textSize="17sp"
-            tools:drawableEnd="@drawable/ic_material_expand_more_black"
+            tools:drawableEnd="@drawable/ic_expand_more"
             tools:drawableTint="?vctr_content_secondary"
             tools:text="kdqsksqdk" />
 
diff --git a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
index 23494c9006..339813f736 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
@@ -9,83 +9,74 @@
 
     <TextView
         android:id="@+id/quickReaction0"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="24sp"
-        tools:ignore="MissingConstraints"
+        android:textColor="@color/emoji_black"
         tools:text="👍" />
 
     <TextView
         android:id="@+id/quickReaction1"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="24sp"
-        tools:ignore="MissingConstraints"
         tools:text="👎" />
 
     <TextView
         android:id="@+id/quickReaction2"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="24sp"
-        tools:ignore="MissingConstraints"
+        android:textColor="@color/emoji_black"
         tools:text="😀" />
 
 
     <TextView
         android:id="@+id/quickReaction3"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="24sp"
-        tools:ignore="MissingConstraints"
+        android:textColor="@color/emoji_black"
         tools:text="🎉" />
 
     <TextView
         android:id="@+id/quickReaction4"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="24sp"
-        tools:ignore="MissingConstraints"
+        android:textColor="@color/emoji_black"
         tools:text="😕" />
 
     <TextView
         android:id="@+id/quickReaction5"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="24sp"
-        tools:ignore="MissingConstraints"
+        android:textColor="@color/emoji_black"
         tools:text="♥" />
 
     <TextView
         android:id="@+id/quickReaction6"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="24sp"
-        tools:ignore="MissingConstraints"
+        android:textColor="@color/emoji_black"
         tools:text="🍆" />
 
     <TextView
         android:id="@+id/quickReaction7"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="26sp"
-        tools:ignore="MissingConstraints"
+        android:textColor="@color/emoji_black"
         tools:text="👀" />
 
     <androidx.constraintlayout.helper.widget.Flow
diff --git a/vector/src/main/res/layout/item_create_direct_room_letter_header.xml b/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
index 1a7cd16176..ce4cc606ae 100644
--- a/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/createDirectRoomLetterView"
+    style="@style/VectorTextView.HeadlineM"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
     android:fontFamily="sans-serif-medium"
     android:padding="8dp"
     android:textColor="?vctr_content_primary"
-    android:textSize="20sp"
     tools:text="C" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_emoji_result.xml b/vector/src/main/res/layout/item_emoji_result.xml
index b520a8735a..6490cb9ed9 100644
--- a/vector/src/main/res/layout/item_emoji_result.xml
+++ b/vector/src/main/res/layout/item_emoji_result.xml
@@ -11,14 +11,13 @@
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingEnd="@dimen/layout_horizontal_margin">
 
-    <!-- size in dp, because we do not want the display to be impacted by font size setting -->
     <TextView
         android:id="@+id/item_emoji_tv"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         android:textColor="@color/emoji_color"
-        android:textSize="25dp"
         tools:ignore="SpUsage"
         tools:text="@sample/reactions.json/data/reaction" />
 
diff --git a/vector/src/main/res/layout/item_emoji_verif.xml b/vector/src/main/res/layout/item_emoji_verif.xml
index 23a5b3bda5..0e71831e84 100644
--- a/vector/src/main/res/layout/item_emoji_verif.xml
+++ b/vector/src/main/res/layout/item_emoji_verif.xml
@@ -10,6 +10,7 @@
     <!-- size in dp, because we do not want the display to be impacted by font size setting -->
     <TextView
         android:id="@+id/item_emoji_tv"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_profile_section.xml b/vector/src/main/res/layout/item_profile_section.xml
index b80f7c7912..c7011eef26 100644
--- a/vector/src/main/res/layout/item_profile_section.xml
+++ b/vector/src/main/res/layout/item_profile_section.xml
@@ -2,6 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemProfileSectionView"
+    style="@style/VectorTextView.Title"
     android:layout_width="match_parent"
     android:layout_height="56dp"
     android:background="?vctr_list_separator_system"
@@ -10,7 +11,6 @@
     android:paddingEnd="16dp"
     android:paddingBottom="8dp"
     android:textColor="?vctr_content_primary"
-    android:textSize="20sp"
     android:textStyle="bold"
     tools:text="Security" />
 
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index 01c44a138f..1364cf77cb 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -43,6 +43,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomTopic"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
@@ -51,7 +52,6 @@
         android:maxLines="1"
         android:singleLine="true"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomMembersCount"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index d799d75a65..ef86681e43 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -8,11 +8,11 @@
 
     <TextView
         android:id="@+id/pushGatewayKind"
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
         android:textAllCaps="true"
-        android:textSize="20sp"
         android:textStyle="bold"
         tools:text="Http Pusher" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index d7f49da9e3..0daf1672c3 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -63,12 +63,12 @@
 
         <TextView
             android:id="@+id/roomNameTileText"
+            style="@style/VectorTextView.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:layout_marginEnd="16dp"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_user_directory_letter_header.xml b/vector/src/main/res/layout/item_user_directory_letter_header.xml
index d33d5d4cfb..bd7c838015 100644
--- a/vector/src/main/res/layout/item_user_directory_letter_header.xml
+++ b/vector/src/main/res/layout/item_user_directory_letter_header.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/userDirectoryLetterView"
+    style="@style/VectorTextView.HeadlineM"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
     android:fontFamily="sans-serif-medium"
     android:padding="8dp"
     android:textColor="?vctr_content_primary"
-    android:textSize="20sp"
     tools:text="C" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_user_list_header.xml b/vector/src/main/res/layout/item_user_list_header.xml
index e3aae0e570..4b9f7ca9b9 100644
--- a/vector/src/main/res/layout/item_user_list_header.xml
+++ b/vector/src/main/res/layout/item_user_list_header.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/userListHeaderView"
+    style="@style/VectorTextView.HeadlineM"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
     android:fontFamily="sans-serif-medium"
     android:padding="8dp"
     android:textColor="?vctr_content_primary"
-    android:textSize="20sp"
     tools:text="Recents | Contacts" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_verification_decimal_code.xml b/vector/src/main/res/layout/item_verification_decimal_code.xml
index 2eeb6902dc..0ba114c64b 100644
--- a/vector/src/main/res/layout/item_verification_decimal_code.xml
+++ b/vector/src/main/res/layout/item_verification_decimal_code.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemVerificationDecimalCode"
+    style="@style/VectorTextView.Title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="16dp"
@@ -11,8 +11,4 @@
     android:textColor="?vctr_content_primary"
     android:textSize="28sp"
     android:textStyle="bold"
-    app:layout_constraintBottom_toBottomOf="@+id/sas_emoji_grid"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="@+id/sas_emoji_grid"
     tools:text="1234-4320-3905" />
diff --git a/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
index 2a9c374f2d..4543cfcb46 100644
--- a/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
@@ -32,12 +32,12 @@
 
         <TextView
             android:id="@+id/actionTitleText"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:text="@string/secure_backup_setup"
-            android:textColor="?vctr_content_secondary"
-            android:textSize="17sp" />
+            android:textColor="?vctr_content_primary" />
 
     </LinearLayout>
 
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 fe17be0e2f..aa489b1c00 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,11 @@
 
         <TextView
             android:id="@+id/memberProfileNameView"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:textAppearance="@style/Vector.Toolbar.Title"
-            android:textSize="20sp"
             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 0b31b3d510..587c3213a2 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,11 @@
 
     <TextView
         android:id="@+id/roomProfileNameView"
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:textAppearance="@style/Vector.Toolbar.Title"
-        android:textSize="20sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/roomProfileAliasView"
         app:layout_constraintEnd_toEndOf="parent"