From 8bdbd5c4c23fb45c5b5014fd34c28802d6ea68f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvagner@pvagner.tk>
Date: Thu, 26 Dec 2019 11:10:07 +0100
Subject: [PATCH] Fixed unseen info for a11y
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 3 +++
 app/src/main/res/values/strings.xml                     | 8 ++++++--
 2 files changed, 9 insertions(+), 2 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..cc9f303773 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -453,6 +453,9 @@ 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));
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0e49929649..3da7ff0042 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1025,12 +1025,16 @@
     <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="one">%1$d of %2$d read</item>
         <item quantity="other">%1$d of %2$d read</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>