diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActions.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActions.kt index 30d4abff36..c0c77e0319 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActions.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActions.kt @@ -21,12 +21,12 @@ import androidx.annotation.StringRes import im.vector.riotx.R sealed class RoomListQuickActions(@StringRes val titleRes: Int, @DrawableRes val iconResId: Int) { - data class NotificationsAllNoisy(val roomId: String) : RoomListQuickActions(R.string.room_settings_all_messages_noisy, R.drawable.ic_room_actions_notifications_all_noisy) - data class NotificationsAll(val roomId: String) : RoomListQuickActions(R.string.room_settings_all_messages, R.drawable.ic_room_actions_notifications_all) - data class NotificationsMentionsOnly(val roomId: String) : RoomListQuickActions(R.string.room_settings_mention_only, R.drawable.ic_room_actions_notifications_mentions) - data class NotificationsMute(val roomId: String) : RoomListQuickActions(R.string.room_settings_mute, R.drawable.ic_room_actions_notifications_mutes) - data class Settings(val roomId: String) : RoomListQuickActions(R.string.room_sliding_menu_settings, R.drawable.ic_room_actions_settings) - data class Leave(val roomId: String) : RoomListQuickActions(R.string.leave, R.drawable.ic_room_actions_leave) + data class NotificationsAllNoisy(val roomId: String) : RoomListQuickActions(R.string.room_list_quick_actions_notifications_all_noisy, R.drawable.ic_room_actions_notifications_all_noisy) + data class NotificationsAll(val roomId: String) : RoomListQuickActions(R.string.room_list_quick_actions_notifications_all, R.drawable.ic_room_actions_notifications_all) + data class NotificationsMentionsOnly(val roomId: String) : RoomListQuickActions(R.string.room_list_quick_actions_notifications_mentions, R.drawable.ic_room_actions_notifications_mentions) + data class NotificationsMute(val roomId: String) : RoomListQuickActions(R.string.room_list_quick_actions_notifications_mute, R.drawable.ic_room_actions_notifications_mutes) + data class Settings(val roomId: String) : RoomListQuickActions(R.string.room_list_quick_actions_settings, R.drawable.ic_room_actions_settings) + data class Leave(val roomId: String) : RoomListQuickActions(R.string.room_list_quick_actions_leave, R.drawable.ic_room_actions_leave) companion object { fun all(roomId: String): List { diff --git a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml index 410e6ea1ab..1a38feface 100644 --- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml +++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml @@ -16,6 +16,7 @@ android:layout_marginBottom="8dp" android:adjustViewBounds="true" android:background="@drawable/circle" + android:importantForAccessibility="no" android:contentDescription="@string/avatar" android:scaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" @@ -50,6 +51,7 @@ android:background="?attr/selectableItemBackground" android:scaleType="centerInside" android:src="@drawable/ic_room_actions_settings" + android:contentDescription="@string/room_list_quick_actions_settings" app:layout_constraintBottom_toBottomOf="@+id/bottomSheetRoomPreviewAvatar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/bottomSheetRoomPreviewAvatar" /> diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml index 9b12db5e7f..c627d40eb0 100644 --- a/vector/src/main/res/values/strings_riotX.xml +++ b/vector/src/main/res/values/strings_riotX.xml @@ -6,7 +6,7 @@ "All messages" "Mentions only" "Mute" - "Settings" - "Leave" + "Settings" + "Leave the room"