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" />