From 79dafaf13d8e9f9d1965085e4fe3fbc5facd5e89 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 12 Feb 2021 17:44:12 +0100 Subject: [PATCH] Fix some accessibility on images --- .../layout/activity_test_material_theme.xml | 1 + .../src/main/res/layout/composer_layout.xml | 1 + ...composer_layout_constraint_set_compact.xml | 2 ++ ...omposer_layout_constraint_set_expanded.xml | 3 +++ .../res/layout/dialog_disclaimer_content.xml | 3 +++ .../fragment_keys_backup_restore_success.xml | 1 + .../fragment_keys_backup_setup_step1.xml | 1 + .../fragment_keys_backup_setup_step3.xml | 1 + vector/src/main/res/layout/fragment_login.xml | 1 + .../main/res/layout/fragment_login_splash.xml | 2 ++ .../main/res/layout/fragment_login_terms.xml | 1 + .../res/layout/fragment_matrix_profile.xml | 3 ++- .../main/res/layout/fragment_room_detail.xml | 1 + .../fragment_room_preview_no_preview.xml | 2 ++ .../layout/fragment_room_setting_generic.xml | 3 ++- .../main/res/layout/fragment_room_uploads.xml | 7 +++--- .../main/res/layout/fragment_room_widget.xml | 1 + .../layout/fragment_ssss_access_from_key.xml | 1 + .../fragment_ssss_access_from_passphrase.xml | 1 + .../res/layout/fragment_user_code_show.xml | 2 ++ .../res/layout/fragment_user_directory.xml | 1 + .../main/res/layout/fragment_user_list.xml | 1 + .../layout/item_attachment_big_preview.xml | 1 + .../layout/item_autocomplete_matrix_item.xml | 1 + .../res/layout/item_bottom_sheet_action.xml | 1 + .../layout/item_bottom_sheet_room_preview.xml | 2 +- .../main/res/layout/item_contact_action.xml | 1 + .../src/main/res/layout/item_contact_main.xml | 1 + .../layout/item_create_direct_room_user.xml | 1 + .../res/layout/item_display_read_receipt.xml | 1 + .../main/res/layout/item_editable_avatar.xml | 4 ++++ .../src/main/res/layout/item_emoji_verif.xml | 11 +++++---- .../res/layout/item_expandable_textview.xml | 1 + .../src/main/res/layout/item_generic_list.xml | 2 ++ .../res/layout/item_generic_with_value.xml | 24 +++++++++---------- vector/src/main/res/layout/item_group.xml | 2 ++ .../src/main/res/layout/item_help_footer.xml | 1 + .../src/main/res/layout/item_known_user.xml | 1 + .../layout/item_notification_troubleshoot.xml | 1 + .../main/res/layout/item_profile_action.xml | 9 ++++--- .../res/layout/item_profile_matrix_item.xml | 2 ++ .../item_profile_matrix_item_progress.xml | 6 +++-- .../src/main/res/layout/item_public_room.xml | 7 +++--- vector/src/main/res/layout/item_room.xml | 7 ++++-- .../main/res/layout/item_room_directory.xml | 1 + .../main/res/layout/item_room_invitation.xml | 5 ++-- .../src/main/res/layout/item_room_widget.xml | 1 + .../main/res/layout/item_search_result.xml | 1 + .../res/layout/item_settings_three_pid.xml | 2 ++ .../res/layout/item_timeline_event_base.xml | 1 + .../item_timeline_event_call_tile_stub.xml | 21 ++++++++-------- .../item_timeline_event_default_stub.xml | 1 + ...item_timeline_event_media_message_stub.xml | 2 ++ ...meline_event_merged_room_creation_stub.xml | 2 ++ .../item_timeline_event_notice_stub.xml | 1 + .../layout/item_timeline_event_poll_stub.xml | 1 + vector/src/main/res/layout/item_tos.xml | 1 + .../src/main/res/layout/item_unknown_room.xml | 1 + .../src/main/res/layout/item_uploads_file.xml | 3 +++ .../main/res/layout/item_uploads_image.xml | 1 + .../main/res/layout/item_uploads_video.xml | 2 ++ vector/src/main/res/layout/item_user.xml | 1 + .../res/layout/item_verification_action.xml | 2 ++ .../res/layout/item_verification_wait.xml | 2 ++ .../main/res/layout/vector_invite_view.xml | 1 + .../view_bottom_sheet_action_button.xml | 2 ++ .../main/res/layout/view_call_controls.xml | 18 +++++++------- .../res/layout/view_keys_backup_banner.xml | 1 + .../res/layout/view_notification_area.xml | 1 + ...ew_sign_out_bottom_sheet_action_button.xml | 1 + vector/src/main/res/layout/view_state.xml | 1 + .../view_stub_room_member_profile_header.xml | 1 + .../layout/view_stub_room_profile_header.xml | 1 + .../src/main/res/layout/view_url_preview.xml | 1 + vector/src/main/res/values/strings.xml | 6 +++++ 75 files changed, 159 insertions(+), 54 deletions(-) diff --git a/vector/src/debug/res/layout/activity_test_material_theme.xml b/vector/src/debug/res/layout/activity_test_material_theme.xml index f6f12942fe..21a2d3fbf5 100644 --- a/vector/src/debug/res/layout/activity_test_material_theme.xml +++ b/vector/src/debug/res/layout/activity_test_material_theme.xml @@ -159,6 +159,7 @@ diff --git a/vector/src/main/res/layout/composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml index 5dd24676c1..03e347a72f 100644 --- a/vector/src/main/res/layout/composer_layout.xml +++ b/vector/src/main/res/layout/composer_layout.xml @@ -36,6 +36,7 @@ android:id="@+id/composerRelatedMessageAvatar" android:layout_width="0dp" android:layout_height="0dp" + android:contentDescription="@string/avatar" tools:ignore="MissingConstraints" tools:src="@tools:sample/avatars" /> diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml index bd00c7743c..9765bb31ba 100644 --- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml +++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml @@ -42,6 +42,7 @@ android:id="@+id/composerRelatedMessageAvatar" android:layout_width="40dp" android:layout_height="40dp" + android:contentDescription="@string/avatar" android:visibility="invisible" app:layout_constraintBottom_toTopOf="parent" app:layout_constraintEnd_toStartOf="parent" @@ -162,6 +163,7 @@ android:layout_height="56dp" android:layout_marginEnd="2dp" android:background="@drawable/bg_send" + android:contentDescription="@string/send" android:scaleType="center" android:src="@drawable/ic_send" app:layout_constraintBottom_toBottomOf="parent" diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml index 49f45ab654..24397e4abf 100644 --- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml +++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml @@ -42,6 +42,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" + android:contentDescription="@string/avatar" app:layout_constraintBottom_toTopOf="@id/composerRelatedMessageActionIcon" app:layout_constraintEnd_toStartOf="@+id/composerRelatedMessageTitle" app:layout_constraintStart_toStartOf="parent" @@ -93,6 +94,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:background="?android:attr/selectableItemBackground" + android:contentDescription="@string/action_close" android:src="@drawable/ic_close_round" app:layout_constraintBottom_toBottomOf="@id/composerRelatedMessageContent" app:layout_constraintEnd_toEndOf="parent" @@ -165,6 +167,7 @@ android:layout_height="56dp" android:layout_marginEnd="2dp" android:background="@drawable/bg_send" + android:contentDescription="@string/send" android:scaleType="center" android:src="@drawable/ic_send" app:layout_constraintBottom_toBottomOf="parent" diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml index 89fa1395b9..e1442f39f4 100644 --- a/vector/src/main/res/layout/dialog_disclaimer_content.xml +++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml @@ -19,12 +19,14 @@ @@ -32,6 +34,7 @@ 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 b897d2fcdd..2fea5b0520 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 @@ -11,6 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="36dp" + android:importantForAccessibility="no" android:src="@drawable/key_big" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml index 76efdb4e21..ee1e53b1d4 100644 --- a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml +++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml @@ -12,6 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/layout_vertical_margin" + android:importantForAccessibility="no" android:src="@drawable/backup_keys" app:layout_constraintBottom_toTopOf="@+id/keys_backup_setup_step1_title" app:layout_constraintEnd_toEndOf="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 bffc7a5f76..341f83b589 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 @@ -20,6 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="60dp" + android:importantForAccessibility="no" android:src="@drawable/backup_keys" app:tint="?riotx_text_primary" tools:ignore="MissingPrefix" /> diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml index 425b1266f8..fb0937d6d2 100644 --- a/vector/src/main/res/layout/fragment_login.xml +++ b/vector/src/main/res/layout/fragment_login.xml @@ -19,6 +19,7 @@ android:id="@+id/loginServerIcon" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:importantForAccessibility="no" app:tint="?riotx_text_primary" tools:ignore="MissingPrefix" tools:src="@drawable/ic_logo_matrix_org" /> diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml index fe845cd20e..7edaa99016 100644 --- a/vector/src/main/res/layout/fragment_login_splash.xml +++ b/vector/src/main/res/layout/fragment_login_splash.xml @@ -36,6 +36,7 @@ android:id="@+id/loginSplashLogo" android:layout_width="64dp" android:layout_height="64dp" + android:importantForAccessibility="no" android:src="@drawable/element_logo_green" android:transitionName="loginLogoTransition" /> @@ -44,6 +45,7 @@ android:layout_width="wrap_content" android:layout_height="44dp" android:layout_marginTop="8dp" + android:contentDescription="@string/app_name" android:src="@drawable/element_logotype" app:tint="?colorAccent" tools:ignore="MissingPrefix" /> diff --git a/vector/src/main/res/layout/fragment_login_terms.xml b/vector/src/main/res/layout/fragment_login_terms.xml index d093709d6d..0bedf56e93 100644 --- a/vector/src/main/res/layout/fragment_login_terms.xml +++ b/vector/src/main/res/layout/fragment_login_terms.xml @@ -13,6 +13,7 @@ diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml index c380ea293c..081d31b800 100644 --- a/vector/src/main/res/layout/fragment_matrix_profile.xml +++ b/vector/src/main/res/layout/fragment_matrix_profile.xml @@ -15,9 +15,9 @@ + android:elevation="4dp" + android:transitionName="toolbar"> \ No newline at end of file diff --git a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml index 81eb084eb6..4fc7d45f07 100644 --- a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml +++ b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml @@ -13,6 +13,7 @@ android:layout_width="28dp" android:layout_height="28dp" android:layout_gravity="center_vertical" + android:importantForAccessibility="no" tools:src="@tools:sample/avatars" /> diff --git a/vector/src/main/res/layout/item_contact_action.xml b/vector/src/main/res/layout/item_contact_action.xml index 7a9a751257..837d66c633 100644 --- a/vector/src/main/res/layout/item_contact_action.xml +++ b/vector/src/main/res/layout/item_contact_action.xml @@ -15,6 +15,7 @@ android:layout_height="44dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" + android:importantForAccessibility="no" android:padding="10dp" app:tint="?riotx_text_secondary" tools:src="@drawable/ic_invite_people" /> diff --git a/vector/src/main/res/layout/item_contact_main.xml b/vector/src/main/res/layout/item_contact_main.xml index e9a07274b3..8db2080b47 100644 --- a/vector/src/main/res/layout/item_contact_main.xml +++ b/vector/src/main/res/layout/item_contact_main.xml @@ -14,6 +14,7 @@ android:id="@+id/contactAvatar" android:layout_width="48dp" android:layout_height="48dp" + android:contentDescription="@string/avatar" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="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 108c02cd02..59ae13602a 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 @@ -24,6 +24,7 @@ android:id="@+id/createDirectRoomUserAvatar" android:layout_width="40dp" android:layout_height="40dp" + android:contentDescription="@string/avatar" tools:src="@tools:sample/avatars" /> @@ -40,6 +43,7 @@ android:layout_width="32dp" android:layout_height="32dp" android:background="@drawable/header_panel_round_background" + android:contentDescription="@string/a11y_delete_avatar" android:scaleType="center" android:src="@drawable/ic_delete" android:visibility="gone" diff --git a/vector/src/main/res/layout/item_emoji_verif.xml b/vector/src/main/res/layout/item_emoji_verif.xml index ff883e6de1..004ee36fe9 100644 --- a/vector/src/main/res/layout/item_emoji_verif.xml +++ b/vector/src/main/res/layout/item_emoji_verif.xml @@ -15,21 +15,22 @@ android:layout_gravity="center" android:textColor="@color/black" android:textSize="40dp" - tools:visibility="gone" tools:ignore="SpUsage" - tools:text="🌵" /> + tools:text="🌵" + tools:visibility="gone" /> + tools:text="🌵" + tools:visibility="visible" /> + android:paddingEnd="@dimen/layout_horizontal_margin"> + android:importantForAccessibility="no" + android:src="@drawable/ic_shield_trusted" /> @@ -33,12 +33,12 @@ android:id="@+id/itemGenericWithValueValueText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="15sp" - android:textColor="?riotx_text_primary" android:layout_marginStart="8dp" android:layout_marginEnd="0dp" - tools:textColor="@color/riotx_positive_accent" - tools:text="Value" /> + android:textColor="?riotx_text_primary" + android:textSize="15sp" + tools:text="Value" + tools:textColor="@color/riotx_positive_accent" /> \ No newline at end of file diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml index d99c990cc7..6c2721ff33 100644 --- a/vector/src/main/res/layout/item_group.xml +++ b/vector/src/main/res/layout/item_group.xml @@ -16,6 +16,7 @@ android:layout_height="42dp" android:layout_gravity="center" android:layout_marginStart="@dimen/layout_horizontal_margin" + android:contentDescription="@string/avatar" android:duplicateParentState="true" app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator" app:layout_constraintStart_toStartOf="parent" @@ -44,6 +45,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="21dp" + android:importantForAccessibility="no" android:src="@drawable/ic_arrow_right" app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator" app:layout_constraintEnd_toEndOf="parent" diff --git a/vector/src/main/res/layout/item_help_footer.xml b/vector/src/main/res/layout/item_help_footer.xml index 9ea25d99c8..6dc253fb2c 100644 --- a/vector/src/main/res/layout/item_help_footer.xml +++ b/vector/src/main/res/layout/item_help_footer.xml @@ -11,6 +11,7 @@ android:id="@+id/itemHelpPicto" android:layout_width="32dp" android:layout_height="32dp" + android:importantForAccessibility="no" android:src="@drawable/ic_idea" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/itemHelpText" diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml index c539aaba2e..d5a61e2a40 100644 --- a/vector/src/main/res/layout/item_known_user.xml +++ b/vector/src/main/res/layout/item_known_user.xml @@ -24,6 +24,7 @@ android:id="@+id/knownUserAvatar" android:layout_width="40dp" android:layout_height="40dp" + android:contentDescription="@string/avatar" tools:src="@tools:sample/avatars" /> @@ -83,13 +85,14 @@ android:id="@+id/actionEditable" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:importantForAccessibility="no" android:src="@drawable/ic_arrow_right" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:visibility="visible" app:tint="?riotx_text_secondary" - tools:ignore="MissingPrefix" /> + tools:ignore="MissingPrefix" + tools:visibility="visible" /> diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml index f35141576c..86c0d4a035 100644 --- a/vector/src/main/res/layout/item_profile_matrix_item.xml +++ b/vector/src/main/res/layout/item_profile_matrix_item.xml @@ -19,6 +19,7 @@ android:layout_width="32dp" android:layout_height="32dp" android:layout_centerVertical="true" + android:contentDescription="@string/avatar" android:scaleType="centerInside" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -79,6 +80,7 @@ android:id="@+id/matrixItemEditable" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:importantForAccessibility="no" android:src="@drawable/ic_arrow_right" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml index 69e4b40bb4..23e3edda87 100644 --- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml +++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml @@ -19,6 +19,7 @@ android:layout_width="32dp" android:layout_height="32dp" android:layout_centerVertical="true" + android:contentDescription="@string/avatar" android:scaleType="centerInside" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -91,13 +92,14 @@ android:id="@+id/matrixItemEditable" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:importantForAccessibility="no" android:src="@drawable/ic_arrow_right" android:visibility="visible" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:visibility="visible" app:tint="?riotx_text_secondary" - tools:ignore="MissingPrefix" /> + tools:ignore="MissingPrefix" + tools:visibility="visible" /> diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml index bb9d379f31..a65115e1da 100644 --- a/vector/src/main/res/layout/item_public_room.xml +++ b/vector/src/main/res/layout/item_public_room.xml @@ -17,6 +17,7 @@ android:layout_width="56dp" android:layout_height="56dp" android:layout_marginStart="8dp" + android:contentDescription="@string/avatar" app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -70,12 +71,12 @@ android:minWidth="56dp" android:textColor="?riotx_text_secondary" android:textSize="15sp" + app:drawableStartCompat="@drawable/ic_user" + app:drawableTint="?riotx_text_secondary" app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator" app:layout_constraintStart_toStartOf="@+id/itemPublicRoomName" app:layout_constraintTop_toBottomOf="@+id/itemPublicRoomTopic" - tools:text="148" - app:drawableTint="?riotx_text_secondary" - app:drawableStartCompat="@drawable/ic_user" /> + tools:text="148" /> + tools:ignore="MissingPrefix" + tools:visibility="visible" /> @@ -42,14 +43,14 @@ android:maxLines="1" android:textColor="?riotx_text_primary" android:textSize="15sp" + app:drawableEndCompat="@drawable/ic_arrow_right" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toEndOf="@id/roomInvitationAvatarImageView" app:layout_constraintTop_toTopOf="parent" - tools:text="@sample/matrix.json/data/displayName" - app:drawableEndCompat="@drawable/ic_arrow_right" /> + tools:text="@sample/matrix.json/data/displayName" /> diff --git a/vector/src/main/res/layout/item_settings_three_pid.xml b/vector/src/main/res/layout/item_settings_three_pid.xml index 0040840ce9..03d0c9d988 100644 --- a/vector/src/main/res/layout/item_settings_three_pid.xml +++ b/vector/src/main/res/layout/item_settings_three_pid.xml @@ -14,6 +14,7 @@ android:layout_width="16dp" android:layout_height="16dp" android:layout_marginEnd="8dp" + android:importantForAccessibility="no" android:scaleType="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/item_settings_three_pid_title" @@ -40,6 +41,7 @@ android:id="@+id/item_settings_three_pid_delete" android:layout_width="@dimen/layout_touch_size" android:layout_height="@dimen/layout_touch_size" + android:contentDescription="@string/delete" android:scaleType="center" android:src="@drawable/ic_trash_24" app:layout_constraintBottom_toBottomOf="parent" 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 cfde244217..68f59b103b 100644 --- a/vector/src/main/res/layout/item_timeline_event_base.xml +++ b/vector/src/main/res/layout/item_timeline_event_base.xml @@ -21,6 +21,7 @@ android:layout_height="44dp" android:layout_marginStart="8dp" android:layout_marginTop="4dp" + android:contentDescription="@string/avatar" tools:src="@tools:sample/avatars" /> + android:layout_gravity="center_horizontal" + android:contentDescription="@string/avatar" + tools:src="@tools:sample/avatars" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> diff --git a/vector/src/main/res/layout/item_timeline_event_default_stub.xml b/vector/src/main/res/layout/item_timeline_event_default_stub.xml index 68c8936b32..01b6e63aaa 100644 --- a/vector/src/main/res/layout/item_timeline_event_default_stub.xml +++ b/vector/src/main/res/layout/item_timeline_event_default_stub.xml @@ -10,6 +10,7 @@ android:id="@+id/itemDefaultAvatarView" android:layout_width="24dp" android:layout_height="24dp" + android:contentDescription="@string/avatar" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:srcCompat="@tools:sample/avatars" /> diff --git a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml index ba4b4f64d7..42bae56238 100644 --- a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml +++ b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml @@ -10,6 +10,7 @@ android:layout_width="375dp" android:layout_height="0dp" android:layout_marginEnd="32dp" + android:contentDescription="@string/a11y_image" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" @@ -41,6 +42,7 @@ android:id="@+id/messageMediaPlayView" android:layout_width="40dp" android:layout_height="40dp" + android:contentDescription="@string/play_video" android:src="@drawable/ic_material_play_circle" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/messageThumbnailView" 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 728b90b696..b9c5f039e9 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 @@ -32,6 +32,7 @@ android:layout_width="60dp" android:layout_height="60dp" android:layout_marginTop="20dp" + android:importantForAccessibility="no" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/creationEncryptionTile" tools:srcCompat="@tools:sample/avatars" /> @@ -151,6 +152,7 @@ android:layout_height="24dp" android:layout_alignParentStart="true" android:layout_centerVertical="true" + android:contentDescription="@string/avatar" tools:srcCompat="@tools:sample/avatars" /> diff --git a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml index 598b7d2dc1..347e5f1590 100644 --- a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml +++ b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml @@ -16,6 +16,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_margin="4dp" + android:importantForAccessibility="no" android:src="@drawable/ic_poll" app:tint="@color/riotx_accent" tools:ignore="MissingPrefix" /> diff --git a/vector/src/main/res/layout/item_tos.xml b/vector/src/main/res/layout/item_tos.xml index b3387991b2..f32e63a190 100644 --- a/vector/src/main/res/layout/item_tos.xml +++ b/vector/src/main/res/layout/item_tos.xml @@ -44,6 +44,7 @@ android:id="@+id/term_policy_arrow" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:importantForAccessibility="no" android:rotationY="@integer/rtl_mirror_flip" android:src="@drawable/ic_material_chevron_right_black" app:layout_constraintBottom_toBottomOf="parent" diff --git a/vector/src/main/res/layout/item_unknown_room.xml b/vector/src/main/res/layout/item_unknown_room.xml index a097767e63..4387577d51 100644 --- a/vector/src/main/res/layout/item_unknown_room.xml +++ b/vector/src/main/res/layout/item_unknown_room.xml @@ -17,6 +17,7 @@ android:layout_width="56dp" android:layout_height="56dp" android:layout_marginStart="8dp" + android:contentDescription="@string/avatar" app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/vector/src/main/res/layout/item_uploads_file.xml b/vector/src/main/res/layout/item_uploads_file.xml index 5c40327d95..12b883e249 100644 --- a/vector/src/main/res/layout/item_uploads_file.xml +++ b/vector/src/main/res/layout/item_uploads_file.xml @@ -12,6 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/layout_horizontal_margin" + android:importantForAccessibility="no" android:src="@drawable/ic_file" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -54,6 +55,7 @@ android:id="@+id/uploadsFileActionDownload" android:layout_width="@dimen/layout_touch_size" android:layout_height="@dimen/layout_touch_size" + android:contentDescription="@string/download" android:scaleType="center" android:src="@drawable/ic_download" app:layout_constraintBottom_toBottomOf="parent" @@ -67,6 +69,7 @@ android:layout_width="@dimen/layout_touch_size" android:layout_height="@dimen/layout_touch_size" android:layout_marginEnd="@dimen/layout_horizontal_margin" + android:contentDescription="@string/share" android:scaleType="center" android:src="@drawable/ic_material_share" app:layout_constraintBottom_toBottomOf="parent" diff --git a/vector/src/main/res/layout/item_uploads_image.xml b/vector/src/main/res/layout/item_uploads_image.xml index 464816d74a..a4dbb5fd48 100644 --- a/vector/src/main/res/layout/item_uploads_image.xml +++ b/vector/src/main/res/layout/item_uploads_image.xml @@ -11,6 +11,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_margin="2dp" + android:contentDescription="@string/a11y_image" android:scaleType="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="H,1:1" diff --git a/vector/src/main/res/layout/item_uploads_video.xml b/vector/src/main/res/layout/item_uploads_video.xml index 97d7529c13..e33a1acee0 100644 --- a/vector/src/main/res/layout/item_uploads_video.xml +++ b/vector/src/main/res/layout/item_uploads_video.xml @@ -11,6 +11,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_margin="2dp" + android:contentDescription="@string/a11y_video" android:scaleType="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="H,1:1" @@ -22,6 +23,7 @@ diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml index 68ee392cff..ad2e0df51e 100644 --- a/vector/src/main/res/layout/item_verification_action.xml +++ b/vector/src/main/res/layout/item_verification_action.xml @@ -19,6 +19,7 @@ android:id="@+id/itemVerificationLeftIcon" android:layout_width="48dp" android:layout_height="48dp" + android:importantForAccessibility="no" android:scaleType="center" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -66,6 +67,7 @@ android:id="@+id/itemVerificationActionIcon" android:layout_width="48dp" android:layout_height="48dp" + android:importantForAccessibility="no" android:scaleType="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/vector/src/main/res/layout/item_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml index 675af87cbf..b3cc8fdf72 100644 --- a/vector/src/main/res/layout/item_verification_wait.xml +++ b/vector/src/main/res/layout/item_verification_wait.xml @@ -27,6 +27,7 @@ android:layout_width="40dp" android:layout_height="40dp" android:layout_marginTop="16dp" + android:importantForAccessibility="no" android:scaleType="fitCenter" android:src="@drawable/ic_monitor" app:layout_constraintEnd_toStartOf="@id/smartphoneIcon" @@ -40,6 +41,7 @@ android:layout_width="40dp" android:layout_height="40dp" android:layout_marginTop="16dp" + android:importantForAccessibility="no" android:scaleType="fitCenter" android:src="@drawable/ic_smartphone" app:layout_constraintEnd_toEndOf="parent" diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml index 159e394426..3028fb7953 100644 --- a/vector/src/main/res/layout/vector_invite_view.xml +++ b/vector/src/main/res/layout/vector_invite_view.xml @@ -13,6 +13,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="86dp" android:layout_marginEnd="8dp" + android:contentDescription="@string/avatar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml index ec2e7d2bfe..c563ad63db 100644 --- a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml +++ b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml @@ -24,6 +24,7 @@ android:id="@+id/bottomSheetActionLeftIcon" android:layout_width="48dp" android:layout_height="48dp" + android:importantForAccessibility="no" android:scaleType="center" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -71,6 +72,7 @@ android:id="@+id/bottomSheetActionIcon" android:layout_width="48dp" android:layout_height="48dp" + android:importantForAccessibility="no" android:scaleType="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/vector/src/main/res/layout/view_call_controls.xml b/vector/src/main/res/layout/view_call_controls.xml index 81684cafea..e1d3d67776 100644 --- a/vector/src/main/res/layout/view_call_controls.xml +++ b/vector/src/main/res/layout/view_call_controls.xml @@ -45,9 +45,9 @@ @@ -69,11 +69,11 @@ android:id="@+id/openChatIcon" android:layout_width="@dimen/layout_touch_size" android:layout_height="@dimen/layout_touch_size" - android:scaleType="center" - android:clickable="true" android:background="@drawable/bg_rounded_button" + android:clickable="true" android:contentDescription="@string/a11y_open_chat" android:focusable="true" + android:scaleType="center" android:src="@drawable/ic_call_pip" app:tint="@android:color/white" tools:ignore="MissingConstraints,MissingPrefix" /> @@ -84,12 +84,12 @@ android:layout_height="56dp" android:background="@drawable/bg_rounded_button" android:clickable="true" + android:contentDescription="@string/a11y_mute_microphone" android:focusable="true" android:padding="16dp" android:src="@drawable/ic_microphone_off" app:backgroundTint="?attr/riotx_background" app:tint="?attr/riotx_text_primary" - tools:contentDescription="@string/a11y_mute_microphone" tools:ignore="MissingConstraints,MissingPrefix" /> @@ -136,9 +136,9 @@ diff --git a/vector/src/main/res/layout/view_keys_backup_banner.xml b/vector/src/main/res/layout/view_keys_backup_banner.xml index 7cd3f3d954..861a5b0222 100644 --- a/vector/src/main/res/layout/view_keys_backup_banner.xml +++ b/vector/src/main/res/layout/view_keys_backup_banner.xml @@ -13,6 +13,7 @@ android:layout_width="32dp" android:layout_height="32dp" android:layout_marginStart="19dp" + android:importantForAccessibility="no" android:src="@drawable/ic_secure_backup" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/vector/src/main/res/layout/view_notification_area.xml b/vector/src/main/res/layout/view_notification_area.xml index b411a90ca7..1255323139 100644 --- a/vector/src/main/res/layout/view_notification_area.xml +++ b/vector/src/main/res/layout/view_notification_area.xml @@ -18,6 +18,7 @@ android:layout_height="32dp" android:layout_centerVertical="true" android:layout_marginStart="24dp" + android:importantForAccessibility="no" android:padding="5dp" tools:src="@drawable/vector_typing" /> 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 6809cfd119..e31a517749 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 @@ -24,6 +24,7 @@ android:layout_height="24dp" android:layout_gravity="center_vertical" android:layout_marginEnd="16dp" + android:importantForAccessibility="no" android:scaleType="fitCenter" android:src="@drawable/ic_secure_backup" app:tint="?riotx_text_primary" diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml index 11f176e405..731f3bd5c8 100644 --- a/vector/src/main/res/layout/view_state.xml +++ b/vector/src/main/res/layout/view_state.xml @@ -62,6 +62,7 @@ android:layout_marginStart="20dp" android:layout_marginEnd="20dp" android:layout_marginBottom="30dp" + android:importantForAccessibility="no" android:maxHeight="350dp" app:layout_constraintBottom_toTopOf="@id/emptyTitleView" app:layout_constraintEnd_toEndOf="parent" 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 0ba595042a..ee7f63e56c 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 @@ -22,6 +22,7 @@ android:layout_width="128dp" android:layout_height="128dp" android:layout_marginBottom="16dp" + android:contentDescription="@string/avatar" app:layout_constraintBottom_toTopOf="@+id/memberProfileNameView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="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 ecb7174f0e..6b7d2675f4 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 @@ -12,6 +12,7 @@ android:layout_width="128dp" android:layout_height="128dp" android:layout_marginBottom="16dp" + android:contentDescription="@string/avatar" android:transitionName="roomProfileAvatarView" app:layout_constraintBottom_toTopOf="@+id/roomProfileNameView" app:layout_constraintEnd_toEndOf="parent" diff --git a/vector/src/main/res/layout/view_url_preview.xml b/vector/src/main/res/layout/view_url_preview.xml index a8c287b471..93c73cea02 100644 --- a/vector/src/main/res/layout/view_url_preview.xml +++ b/vector/src/main/res/layout/view_url_preview.xml @@ -78,6 +78,7 @@ android:id="@+id/url_preview_close" android:layout_width="@dimen/layout_touch_size" android:layout_height="@dimen/layout_touch_size" + android:contentDescription="@string/action_close" android:scaleType="center" android:src="@drawable/ic_close_24dp" app:layout_constraintEnd_toEndOf="parent" diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml index 38f2001f6d..b3731ae6a3 100644 --- a/vector/src/main/res/values/strings.xml +++ b/vector/src/main/res/values/strings.xml @@ -2833,4 +2833,10 @@ Screenshot Open widgets Import key from file + Image + Change avatar + Delete avatar + Some messages have not been sent + This room has unsent draft + Video