diff --git a/vector/sampledata/users.json b/vector/sampledata/users.json
index 0a49d27450..d1b1758db3 100644
--- a/vector/sampledata/users.json
+++ b/vector/sampledata/users.json
@@ -1,15 +1,15 @@
{
"data": [
{
- "displayName": "amandine",
+ "displayName": "Amandine",
"id": "@amandine:matrix.org"
},
{
- "displayName": "benoit",
+ "displayName": "Benoit",
"id": "@benoit:matrix.org"
},
{
- "displayName": "gaelle",
+ "displayName": "Gaelle",
"id": "@gawa:matrix.org"
},
{
diff --git a/vector/src/main/res/layout/alerter_incoming_call_layout.xml b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
index d1d1812d0a..820e9de797 100644
--- a/vector/src/main/res/layout/alerter_incoming_call_layout.xml
+++ b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
@@ -28,8 +28,8 @@
android:layout_marginEnd="12dp"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/incomingCallRejectView"
app:layout_constraintStart_toEndOf="@id/incomingCallAvatar"
@@ -45,8 +45,8 @@
android:drawablePadding="4dp"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:drawableTint="?vctr_content_secondary"
app:layout_constraintEnd_toStartOf="@+id/incomingCallRejectView"
app:layout_constraintStart_toStartOf="@id/incomingCallNameView"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index c4f2bb924b..40c7bca33a 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -33,8 +33,8 @@
android:duplicateParentState="true"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@+id/spaceDescription"
@@ -63,8 +63,8 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
index 76a5ee4194..ae270b8f83 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
@@ -28,8 +28,8 @@
android:fontFamily="monospace"
android:gravity="center_horizontal"
android:padding="4dp"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_notice_secondary"
- android:textSize="15sp"
tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8" />
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index fbd99be528..c0b3a209a0 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -50,8 +50,8 @@
android:layout_marginEnd="8dp"
android:maxLines="1"
android:singleLine="true"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeaderAvatarView"
@@ -64,8 +64,8 @@
android:layout_marginEnd="8dp"
android:maxLines="1"
android:singleLine="true"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintBottom_toTopOf="@+id/homeDrawerInviteFriendButton"
app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
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 42d8b1f97f..9606096e0f 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
@@ -40,8 +40,8 @@
android:layout_marginBottom="16dp"
android:text="@string/keys_backup_setup_step2_text_description"
android:textAlignment="center"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/keys_backup_setup_step2_text_title" />
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 97c178c932..f7c1fb8a0e 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
@@ -50,8 +50,8 @@
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:text="@string/keys_backup_setup_step3_text_line1"
android:textAlignment="center"
- android:textColor="?vctr_content_primary"
- android:textSize="15sp" />
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
+ android:textColor="?vctr_content_primary" />
diff --git a/vector/src/main/res/layout/fragment_login_account_created.xml b/vector/src/main/res/layout/fragment_login_account_created.xml
index 15e1f36a9e..90075330f6 100644
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ b/vector/src/main/res/layout/fragment_login_account_created.xml
@@ -74,8 +74,8 @@
android:layout_marginEnd="4dp"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/loginAccountCreatedTime"
app:layout_constraintStart_toEndOf="@+id/loginAccountCreatedAvatar"
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index d02ad68bdb..6d80ae8489 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -48,8 +48,8 @@
android:maxLines="1"
android:singleLine="true"
android:textAlignment="textStart"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
tools:text="@sample/rooms.json/data/name" />
@@ -62,8 +62,8 @@
android:maxLines="1"
android:singleLine="true"
android:textAlignment="textStart"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
app:layout_goneMarginTop="0dp"
@@ -147,8 +147,8 @@
android:autoLink="web"
android:maxLines="4"
android:textAlignment="textStart"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintTop_toBottomOf="@id/matrixToMemberPills"
tools:text="@sample/rooms.json/data/topic" />
@@ -214,8 +214,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="@id/knownMember1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/knownMember5"
diff --git a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
index 995759dc4b..3d5b5a600e 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
@@ -29,8 +29,8 @@
android:maxLines="1"
android:singleLine="true"
android:textAlignment="center"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
tools:text="@sample/users.json/data/displayName" />
@@ -44,8 +44,8 @@
android:maxLines="1"
android:singleLine="true"
android:textAlignment="center"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
tools:text="@sample/users.json/data/id" />
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 4242d72ce6..0484ed3a30 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -94,9 +94,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="56dp"
android:gravity="center"
- android:textAppearance="@style/VectorTextAppearanceTitle"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
tools:text="@sample/rooms.json/data/name" />
@@ -127,8 +126,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="center"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?colorError"
- android:textSize="15sp"
android:visibility="gone"
tools:text="Error"
tools:visibility="visible" />
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 ce402215a5..c45d91199a 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -66,8 +66,8 @@
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/secure_backup_reset_if_you_reset_all"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?colorError"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ssss_reset_other_devices" />
@@ -81,8 +81,8 @@
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:text="@string/secure_backup_reset_no_history"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
app:layout_constraintTop_toBottomOf="@id/ssss_reset_text3" />
@@ -124,8 +124,8 @@
android:maxLines="1"
android:singleLine="true"
android:textAlignment="center"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintTop_toBottomOf="@id/showUserCodeCardNameText"
tools:text="@sample/users.json/data/id" />
@@ -163,8 +163,8 @@
android:layout_marginEnd="16dp"
android:text="@string/user_code_info_text"
android:textAlignment="center"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintEnd_toEndOf="@id/showUserCodeCard"
app:layout_constraintStart_toStartOf="@id/showUserCodeCard"
app:layout_constraintTop_toBottomOf="@id/showUserCodeCard" />
diff --git a/vector/src/main/res/layout/item_bottom_sheet_radio.xml b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
index 0da96725bb..0cbf6a1eb9 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_radio.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
@@ -31,8 +31,8 @@
android:layout_marginStart="8dp"
android:ellipsize="end"
android:maxLines="2"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
@@ -46,8 +46,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/actionTitle"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_title.xml b/vector/src/main/res/layout/item_bottom_sheet_title.xml
index 0c9da51647..e5f77096d0 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_title.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_title.xml
@@ -28,8 +28,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_contact_action.xml b/vector/src/main/res/layout/item_contact_action.xml
index 27c680555f..ac286fe580 100644
--- a/vector/src/main/res/layout/item_contact_action.xml
+++ b/vector/src/main/res/layout/item_contact_action.xml
@@ -28,8 +28,8 @@
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
tools:text="@string/invite_friends" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_contact_detail.xml b/vector/src/main/res/layout/item_contact_detail.xml
index 59f43472b6..7268f9d278 100644
--- a/vector/src/main/res/layout/item_contact_detail.xml
+++ b/vector/src/main/res/layout/item_contact_detail.xml
@@ -17,8 +17,8 @@
android:layout_marginStart="60dp"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
app:layout_constraintBottom_toTopOf="@id/contactDetailMatrixId"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -33,8 +33,8 @@
android:layout_gravity="center_vertical"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_contact_main.xml b/vector/src/main/res/layout/item_contact_main.xml
index d4300191f7..e867e2da55 100644
--- a/vector/src/main/res/layout/item_contact_main.xml
+++ b/vector/src/main/res/layout/item_contact_main.xml
@@ -29,7 +29,7 @@
android:ellipsize="end"
android:maxLines="1"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_create_direct_room_user.xml b/vector/src/main/res/layout/item_create_direct_room_user.xml
index 690b292de8..d5e0964571 100644
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@@ -47,8 +47,8 @@
android:layout_marginStart="12dp"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/createDirectRoomUserID"
app:layout_constraintEnd_toEndOf="parent"
@@ -63,8 +63,8 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index 79dd430209..5adf720a63 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -15,8 +15,8 @@
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:duplicateParentState="true"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
app:layout_constraintBottom_toTopOf="@+id/formSwitchSummary"
app:layout_constraintEnd_toStartOf="@+id/formSwitchSwitch"
app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_generic_empty_state.xml b/vector/src/main/res/layout/item_generic_empty_state.xml
index c72edc72a8..138bc59cd5 100644
--- a/vector/src/main/res/layout/item_generic_empty_state.xml
+++ b/vector/src/main/res/layout/item_generic_empty_state.xml
@@ -28,8 +28,8 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="30dp"
android:gravity="center"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/emptyItemMessageView"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_generic_header.xml b/vector/src/main/res/layout/item_generic_header.xml
index 6dbf68cd11..f01bf4a3e0 100644
--- a/vector/src/main/res/layout/item_generic_header.xml
+++ b/vector/src/main/res/layout/item_generic_header.xml
@@ -8,7 +8,7 @@
android:paddingTop="4dp"
android:paddingEnd="16dp"
android:paddingBottom="4dp"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_notice_text_color"
- android:textSize="15sp"
android:textStyle="bold"
tools:text="Today" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_generic_with_value.xml b/vector/src/main/res/layout/item_generic_with_value.xml
index ddeb03c21b..a3b8c46e1f 100644
--- a/vector/src/main/res/layout/item_generic_with_value.xml
+++ b/vector/src/main/res/layout/item_generic_with_value.xml
@@ -35,8 +35,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="0dp"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
tools:text="Value"
tools:textColor="?colorPrimary" />
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index f28d399d35..c257ee5052 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -31,8 +31,8 @@
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
app:layout_constraintEnd_toStartOf="@+id/groupAvatarChevron"
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index 1941aa9cda..7f44e78ca7 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@@ -46,8 +46,8 @@
android:layout_marginStart="12dp"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/knownUserID"
app:layout_constraintEnd_toEndOf="parent"
@@ -62,8 +62,8 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index d5bd16e5b5..049907b09d 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -31,8 +31,8 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="2"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomTopic"
app:layout_constraintEnd_toStartOf="@+id/itemPublicRoomButtonState"
@@ -69,8 +69,8 @@
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:minWidth="56dp"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:drawableStartCompat="@drawable/ic_user"
app:drawableTint="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
@@ -88,8 +88,8 @@
android:maxLines="1"
android:minWidth="40dp"
android:singleLine="true"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintBaseline_toBaselineOf="@+id/itemPublicRoomMembersCount"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/itemPublicRoomMembersCount"
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index c8021126bd..ba5b3f5671 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -105,8 +105,8 @@
android:duplicateParentState="true"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toStartOf="@+id/roomDraftBadge"
@@ -159,8 +159,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
+ android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/roomNameView"
@@ -174,8 +174,8 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="2"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/roomNameView"
app:layout_constraintTop_toBottomOf="@+id/roomNameView"
@@ -189,8 +189,8 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="2"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?colorPrimary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/roomNameView"
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index 72ed6fdf07..11f2fd6ad5 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -34,8 +34,8 @@
android:ellipsize="end"
android:lines="1"
android:maxLines="2"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/itemRoomDirectoryDescription"
app:layout_constraintEnd_toStartOf="@+id/itemRoomDirectoryChecked"
diff --git a/vector/src/main/res/layout/item_room_directory_server.xml b/vector/src/main/res/layout/item_room_directory_server.xml
index a6a52e0397..2d2e9207e1 100644
--- a/vector/src/main/res/layout/item_room_directory_server.xml
+++ b/vector/src/main/res/layout/item_room_directory_server.xml
@@ -36,8 +36,8 @@
android:ellipsize="end"
android:lines="1"
android:maxLines="2"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/itemRoomDirectoryServerRemove"
diff --git a/vector/src/main/res/layout/item_room_filter_footer.xml b/vector/src/main/res/layout/item_room_filter_footer.xml
index e1a44f91c8..21dc303682 100644
--- a/vector/src/main/res/layout/item_room_filter_footer.xml
+++ b/vector/src/main/res/layout/item_room_filter_footer.xml
@@ -11,8 +11,8 @@
android:layout_gravity="center"
android:layout_marginTop="56dp"
android:text="@string/room_filtering_footer_title"
- android:textColor="?vctr_content_secondary"
- android:textSize="15sp" />
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
+ android:textColor="?vctr_content_secondary" />
@@ -32,8 +32,8 @@
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:orientation="vertical"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
tools:text="Description / Value" />
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index 248552bc01..35cd0086eb 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -63,8 +63,8 @@
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/groupDescView"
app:layout_constraintEnd_toStartOf="@+id/groupChildrenCollapse"
@@ -75,22 +75,22 @@
+ tools:text="@tools:sample/lorem/random"
+ tools:visibility="visible" />
@@ -23,8 +23,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/spaces_beta_welcome_to_spaces_desc"
- android:textColor="?vctr_content_secondary"
- android:textSize="15sp" />
+ android:textAppearance="@style/VectorTextAppearanceBody"
+ android:textColor="?vctr_content_secondary" />
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index d87337439e..f4e79eb364 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -49,8 +49,8 @@
android:layout_marginEnd="4dp"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/childRoomTopic"
app:layout_constraintEnd_toStartOf="@id/spaceChildMemberCountIcon"
@@ -64,8 +64,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="@id/spaceChildBarrier"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
diff --git a/vector/src/main/res/layout/item_space_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
index 0c231adf03..a9e89db344 100644
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -55,8 +55,8 @@
android:layout_marginBottom="16dp"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_space_top_summary.xml b/vector/src/main/res/layout/item_space_top_summary.xml
index 15a63e6d68..4194b35693 100644
--- a/vector/src/main/res/layout/item_space_top_summary.xml
+++ b/vector/src/main/res/layout/item_space_top_summary.xml
@@ -39,8 +39,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:autoLink="all"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/spaceSummaryMemberCountIcon"
diff --git a/vector/src/main/res/layout/item_sub_space.xml b/vector/src/main/res/layout/item_sub_space.xml
index 62f202c8f0..2e31f7b854 100644
--- a/vector/src/main/res/layout/item_sub_space.xml
+++ b/vector/src/main/res/layout/item_sub_space.xml
@@ -63,8 +63,8 @@
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/groupChildrenCollapse"
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index 9a18de06a1..c9615465e8 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -46,8 +46,8 @@
android:duplicateParentState="true"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toStartOf="@+id/joinSuggestedRoomButton"
@@ -65,8 +65,8 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintEnd_toStartOf="@id/joinSuggestedRoomButton"
app:layout_constraintStart_toStartOf="@+id/roomNameView"
app:layout_constraintTop_toBottomOf="@+id/roomNameView"
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 6be8bc0ede..12a63594a8 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -36,8 +36,8 @@
android:layout_toEndOf="@+id/messageStartGuideline"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
tools:text="@sample/users.json/data/displayName" />
diff --git a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
index db2884741f..810620fec4 100644
--- a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
@@ -22,8 +22,8 @@
android:layout_marginTop="4dp"
android:drawablePadding="6dp"
android:gravity="center"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
tools:text="@sample/users.json/data/displayName" />
diff --git a/vector/src/main/res/layout/item_timeline_event_day_separator.xml b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
index 38b03c4159..c05c0c2a72 100644
--- a/vector/src/main/res/layout/item_timeline_event_day_separator.xml
+++ b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
@@ -21,8 +21,8 @@
android:background="?android:colorBackground"
android:paddingStart="24dp"
android:paddingEnd="24dp"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_tertiary"
- android:textSize="15sp"
tools:text="@tools:sample/date/day_of_week" />
\ No newline at end of file
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 437cb2f4bd..61bb2c68d9 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
@@ -81,8 +81,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/roomNameTileText"
@@ -93,9 +93,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
android:textColorLink="?colorPrimary"
- android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/roomNameDescriptionText"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
index 06bcd02351..a4fb8195a2 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
@@ -28,8 +28,8 @@
android:drawablePadding="2dp"
android:gravity="start"
android:text="@string/notice_crypto_unable_to_decrypt_merged"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
app:drawableStartCompat="@drawable/ic_clock"
app:drawableTint="?vctr_content_secondary" />
diff --git a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
index 9b2927adb1..a1ded81e2f 100644
--- a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
@@ -13,8 +13,8 @@
android:layout_gravity="center_horizontal"
android:drawablePadding="6dp"
android:gravity="center"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
tools:drawableStart="@drawable/ic_shield_trusted"
tools:text="@string/sas_verified" />
diff --git a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
index c95bb5ff84..ae2869a765 100644
--- a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
@@ -14,8 +14,8 @@
android:layout_gravity="center_horizontal"
android:drawablePadding="6dp"
android:gravity="center"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:drawableStartCompat="@drawable/ic_shield_black"
tools:text="@string/verification_request" />
diff --git a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
index 6732e6d121..5754bf2fc3 100644
--- a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
@@ -13,8 +13,8 @@
android:layout_height="wrap_content"
android:drawablePadding="6dp"
android:gravity="center"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:drawableTint="?vctr_content_primary"
tools:drawableStart="@drawable/ic_video"
diff --git a/vector/src/main/res/layout/item_timeline_read_marker.xml b/vector/src/main/res/layout/item_timeline_read_marker.xml
index 5ce388c90b..3ef212edc0 100644
--- a/vector/src/main/res/layout/item_timeline_read_marker.xml
+++ b/vector/src/main/res/layout/item_timeline_read_marker.xml
@@ -21,7 +21,7 @@
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:text="@string/timeline_unread_messages"
- android:textColor="@color/notification_accent_color"
- android:textSize="15sp" />
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
+ android:textColor="@color/notification_accent_color" />
diff --git a/vector/src/main/res/layout/item_unknown_room.xml b/vector/src/main/res/layout/item_unknown_room.xml
index dc71d0694a..408cd4852f 100644
--- a/vector/src/main/res/layout/item_unknown_room.xml
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@@ -31,8 +31,8 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="2"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_user.xml b/vector/src/main/res/layout/item_user.xml
index 407ea7f3cb..d65e77b223 100644
--- a/vector/src/main/res/layout/item_user.xml
+++ b/vector/src/main/res/layout/item_user.xml
@@ -29,8 +29,8 @@
android:layout_marginStart="12dp"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/itemUserName"
app:layout_constraintEnd_toEndOf="parent"
@@ -46,8 +46,8 @@
android:layout_marginStart="12dp"
android:ellipsize="end"
android:maxLines="1"
+ android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
- android:textSize="15sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/view_active_conference_view.xml b/vector/src/main/res/layout/view_active_conference_view.xml
index 043736c190..97f0dd5cd4 100644
--- a/vector/src/main/res/layout/view_active_conference_view.xml
+++ b/vector/src/main/res/layout/view_active_conference_view.xml
@@ -37,7 +37,6 @@
android:paddingStart="8dp"
android:paddingEnd="16dp"
android:text="@string/action_close"
- android:textSize="15sp"
android:textStyle="bold" />
diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml
index 38a297a4ad..d413f49f88 100644
--- a/vector/src/main/res/layout/view_state.xml
+++ b/vector/src/main/res/layout/view_state.xml
@@ -79,8 +79,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
+ android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
- android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/emptyMessageView"
app:layout_constraintEnd_toEndOf="parent"