From 5b91b8ee8d2f0b6bcee39e33a367775e0f05df34 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 26 Dec 2019 18:04:37 +0100
Subject: [PATCH] Accessibility improvement

Closes #170
---
 .../java/eu/faircode/email/AdapterMessage.java    |  5 ++++-
 app/src/main/res/values/strings.xml               | 15 +++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index d9fd7d56ab..21d6679490 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -453,12 +453,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                     if (message.count == 1)
                         result.add(context.getString(message.unseen > 0 ? R.string.title_accessibility_unseen : R.string.title_accessibility_seen));
+                    else if (message.unseen == message.count)
+                        result.add(context.getResources().getQuantityString(
+                                R.plurals.title_accessibility_all_of_unseen, message.count, message.count));
                     else if (message.unseen == 0)
                         result.add(context.getResources().getQuantityString(
                                 R.plurals.title_accessibility_all_of_seen, message.count, message.count));
                     else
                         result.add(context.getResources().getQuantityString(
-                                R.plurals.title_accessibility_count_of_seen, message.unseen, message.unseen, message.count));
+                                R.plurals.title_accessibility_count_of_unseen, message.unseen, message.unseen, message.count));
 
                     if (ibExpander.getVisibility() == View.VISIBLE) {
                         result.add(context.getString(expanded ? R.string.title_accessibility_expanded : R.string.title_accessibility_collapsed));
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5105b953d7..1d9d5f6a61 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1034,13 +1034,20 @@
     <string name="title_accessibility_expanded">Expanded</string>
     <string name="title_accessibility_seen">Read</string>
     <string name="title_accessibility_unseen">Unread</string>
-    <plurals name="title_accessibility_count_of_seen">
-        <item quantity="one"></item>
-        <item quantity="other">%1$d of %2$d read</item>
+
+    <plurals name="title_accessibility_count_of_unseen">
+        <item quantity="one">%1$d of %2$d unread</item>
+        <item quantity="other">%1$d of %2$d unread</item>
     </plurals>
+
     <plurals name="title_accessibility_all_of_seen">
         <item quantity="one"></item>
-        <item quantity="other">All of %1$d read</item>
+        <item quantity="other">All %1$d read</item>
+    </plurals>
+
+    <plurals name="title_accessibility_all_of_unseen">
+        <item quantity="one"></item>
+        <item quantity="other">All %1$d unread</item>
     </plurals>
 
     <string name="title_accessibility_flagged">Starred</string>