From 3bf1e48236cda1a1d7adf8b275e4410739b545be Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 12 Feb 2021 20:08:14 +0100
Subject: [PATCH] a11y
---
.../java/im/vector/app/features/settings/push/PushRuleItem.kt | 3 +++
vector/src/main/res/layout/item_pushrule_raw.xml | 1 +
vector/src/main/res/layout/item_timeline_event_file_stub.xml | 2 +-
vector/src/main/res/values/strings.xml | 3 +++
4 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt
index 0144b162e9..332033d10e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt
@@ -59,10 +59,13 @@ abstract class PushRuleItem : EpoxyModelWithHolder<PushRuleItem.Holder>() {
if (notifAction.shouldNotify && !notifAction.soundName.isNullOrBlank()) {
holder.actionIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_action_notify_noisy))
+ holder.actionIcon.contentDescription = context.getString(R.string.a11y_rule_notify_noisy)
} else if (notifAction.shouldNotify) {
holder.actionIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_action_notify_silent))
+ holder.actionIcon.contentDescription = context.getString(R.string.a11y_rule_notify_silent)
} else {
holder.actionIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_action_dont_notify))
+ holder.actionIcon.contentDescription = context.getString(R.string.a11y_rule_notify_off)
}
val description = StringBuffer()
diff --git a/vector/src/main/res/layout/item_pushrule_raw.xml b/vector/src/main/res/layout/item_pushrule_raw.xml
index 7a29415f2e..bc1734e4fd 100644
--- a/vector/src/main/res/layout/item_pushrule_raw.xml
+++ b/vector/src/main/res/layout/item_pushrule_raw.xml
@@ -37,6 +37,7 @@
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center_vertical"
+ android:contentDescription="@string/a11y_rule_notify_off"
tools:src="@drawable/ic_action_dont_notify" />
</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_file_stub.xml b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
index 72a6cd6ec6..6df0c02cae 100644
--- a/vector/src/main/res/layout/item_timeline_event_file_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
@@ -8,7 +8,7 @@
android:paddingTop="8dp"
android:paddingBottom="8dp">
- <ImageView
+ <im.vector.app.core.ui.views.ShieldImageView
android:id="@+id/messageFilee2eIcon"
android:layout_width="14dp"
android:layout_height="14dp"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 82d2efdaf8..b62da59a3a 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2847,4 +2847,7 @@
<string name="a11y_close_emoji_picker">Close Emoji picker</string>
<string name="a11y_checked">Checked</string>
<string name="a11y_error_message_not_sent">Message not sent due to error</string>
+ <string name="a11y_rule_notify_noisy">Notify with sound</string>
+ <string name="a11y_rule_notify_silent">Notify without sound</string>
+ <string name="a11y_rule_notify_off">Do not notify</string>
</resources>