From f384ec0601233d147f189925d7880ca52591ec17 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 14 Jun 2021 21:53:51 +0200 Subject: [PATCH] textSize 14sp -> android:textAppearance="@style/VectorTextAppearanceHeadlineM" --- .../main/res/layout/bottom_sheet_logout_and_backup.xml | 2 +- .../res/layout/bottom_sheet_room_widget_permission.xml | 8 +++++--- vector/src/main/res/layout/fragment_contacts_book.xml | 2 +- .../fragment_create_direct_room_directory_users.xml | 2 +- vector/src/main/res/layout/fragment_create_room.xml | 2 +- .../main/res/layout/fragment_keys_backup_setup_step1.xml | 2 +- vector/src/main/res/layout/fragment_matrix_profile.xml | 2 +- .../main/res/layout/fragment_recyclerview_with_search.xml | 2 +- vector/src/main/res/layout/fragment_room_detail.xml | 2 +- .../main/res/layout/fragment_room_preview_no_preview.xml | 2 +- .../src/main/res/layout/fragment_room_setting_generic.xml | 2 +- vector/src/main/res/layout/fragment_room_uploads.xml | 2 +- vector/src/main/res/layout/fragment_space_add_rooms.xml | 2 +- vector/src/main/res/layout/fragment_space_preview.xml | 2 +- .../res/layout/fragment_ssss_access_from_passphrase.xml | 5 +++-- vector/src/main/res/layout/fragment_user_code_show.xml | 2 +- vector/src/main/res/layout/fragment_user_directory.xml | 2 +- vector/src/main/res/layout/fragment_user_list.xml | 2 +- vector/src/main/res/layout/item_bottom_sheet_title.xml | 2 +- vector/src/main/res/layout/item_help_footer.xml | 2 +- vector/src/main/res/layout/item_room_alias_text_input.xml | 4 ++-- .../src/main/res/layout/item_settings_section_title.xml | 2 +- vector/src/main/res/layout/item_simple_reaction_info.xml | 2 +- vector/src/main/res/layout/view_keys_backup_banner.xml | 2 +- 24 files changed, 31 insertions(+), 28 deletions(-) diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml index 847fc65837..c45dd60b91 100644 --- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml +++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml @@ -17,8 +17,8 @@ android:layout_marginEnd="@dimen/layout_horizontal_margin" android:layout_marginBottom="8dp" android:text="@string/action_sign_out" + android:textAppearance="@style/VectorTextAppearanceHeadlineM" android:textColor="?vctr_content_primary" - android:textSize="18sp" android:textStyle="bold" /> + tools:text="@sample/users.json/data/displayName" /> + tools:text="@sample/users.json/data/id" /> + + diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml index 1013120134..dcef10e1a4 100644 --- a/vector/src/main/res/layout/fragment_room_detail.xml +++ b/vector/src/main/res/layout/fragment_room_detail.xml @@ -52,8 +52,8 @@ android:layout_marginEnd="8dp" android:ellipsize="end" android:maxLines="1" + android:textAppearance="@style/VectorTextAppearanceHeadlineM" android:textColor="?vctr_content_primary" - android:textSize="18sp" app:layout_constraintBottom_toTopOf="@+id/roomToolbarSubtitleView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" 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 11fea7c752..4242d72ce6 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 @@ -45,8 +45,8 @@ android:layout_marginEnd="8dp" android:ellipsize="end" android:maxLines="1" + android:textAppearance="@style/VectorTextAppearanceHeadlineM" android:textColor="?vctr_content_primary" - android:textSize="18sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml index cf41d67a35..be03c351f3 100644 --- a/vector/src/main/res/layout/fragment_room_setting_generic.xml +++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml @@ -54,8 +54,8 @@ android:layout_marginEnd="8dp" android:ellipsize="end" android:maxLines="1" + android:textAppearance="@style/VectorTextAppearanceHeadlineM" android:textColor="?vctr_content_primary" - android:textSize="18sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/roomSettingsToolbarAvatarImageView" diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml index 3ebed9ab44..dcef1b9c4e 100644 --- a/vector/src/main/res/layout/fragment_room_uploads.xml +++ b/vector/src/main/res/layout/fragment_room_uploads.xml @@ -52,8 +52,8 @@ android:layout_marginEnd="8dp" android:ellipsize="end" android:maxLines="1" + android:textAppearance="@style/VectorTextAppearanceHeadlineM" android:textColor="?vctr_content_primary" - android:textSize="18sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/roomUploadsToolbarAvatarImageView" diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml index 786bda0c95..30313f7f82 100644 --- a/vector/src/main/res/layout/fragment_space_add_rooms.xml +++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml @@ -42,8 +42,8 @@ android:gravity="start|center" android:maxLines="1" android:text="@string/space_add_existing_rooms" + android:textAppearance="@style/VectorTextAppearanceHeadlineM" android:textColor="?vctr_content_primary" - android:textSize="18sp" android:textStyle="bold" /> @@ -119,7 +119,8 @@ app:layout_constraintBottom_toTopOf="@+id/ssss_passphrase_reset" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_or" /> + app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_or" + tools:ignore="MissingPrefix" /> @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/layout_horizontal_margin" android:maxWidth="200dp" - android:textSize="18sp" + android:textAppearance="@style/VectorTextAppearanceHeadlineM" app:layout_constraintBaseline_toBaselineOf="@+id/itemRoomAliasTextInputLayout" app:layout_constraintEnd_toEndOf="parent" tools:text=":matrix.org" /> diff --git a/vector/src/main/res/layout/item_settings_section_title.xml b/vector/src/main/res/layout/item_settings_section_title.xml index 2f11a4657a..6416935a25 100644 --- a/vector/src/main/res/layout/item_settings_section_title.xml +++ b/vector/src/main/res/layout/item_settings_section_title.xml @@ -9,7 +9,7 @@ android:paddingTop="@dimen/layout_vertical_margin" android:paddingEnd="@dimen/layout_horizontal_margin" android:paddingBottom="@dimen/layout_vertical_margin" + android:textAppearance="@style/VectorTextAppearanceHeadlineM" android:textColor="?vctr_content_primary" - android:textSize="18sp" android:textStyle="bold" tools:text="Title" /> diff --git a/vector/src/main/res/layout/item_simple_reaction_info.xml b/vector/src/main/res/layout/item_simple_reaction_info.xml index 74474a0713..c07c1072ac 100644 --- a/vector/src/main/res/layout/item_simple_reaction_info.xml +++ b/vector/src/main/res/layout/item_simple_reaction_info.xml @@ -17,8 +17,8 @@ android:layout_marginEnd="8dp" android:gravity="center" android:lines="1" + android:textAppearance="@style/VectorTextAppearanceHeadlineM" android:textColor="@color/emoji_color" - android:textSize="18sp" tools:text="@sample/reactions.json/data/reaction" />