mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-27 16:33:47 +00:00
Code Issues Releases Wiki Activity

Simplified accessibility message count

Browse source
This commit is contained in:
M66B 2019-12-27 19:13:20 +01:00
parent b38b458666
commit ff7308e1fd
2 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/AdapterMessage.java
View file

@ -3696,17 +3696,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (selectionTracker != null && selectionTracker.isSelected(message.id)) if (selectionTracker != null && selectionTracker.isSelected(message.id))
result.add(context.getString(R.string.title_accessibility_selected)); result.add(context.getString(R.string.title_accessibility_selected));
if (message.count == 1) result.add(context.getString(message.unseen > 0 ? R.string.title_accessibility_unseen : R.string.title_accessibility_seen));
result.add(context.getString(message.unseen > 0 ? R.string.title_accessibility_unseen : R.string.title_accessibility_seen)); result.add(context.getResources().getQuantityString(
else if (message.unseen == message.count) R.plurals.title_accessibility_messages, message.visible, message.visible));
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_unseen, message.unseen, message.unseen, message.count));
if (ibExpander.getVisibility() == View.VISIBLE) { if (ibExpander.getVisibility() == View.VISIBLE) {
result.add(context.getString(expanded ? R.string.title_accessibility_expanded : R.string.title_accessibility_collapsed)); result.add(context.getString(expanded ? R.string.title_accessibility_expanded : R.string.title_accessibility_collapsed));

16
app/src/main/res/values/strings.xml
View file

@ -1040,19 +1040,9 @@
<string name="title_accessibility_seen">Read</string> <string name="title_accessibility_seen">Read</string>
<string name="title_accessibility_unseen">Unread</string> <string name="title_accessibility_unseen">Unread</string>
<plurals name="title_accessibility_count_of_unseen"> <plurals name="title_accessibility_messages">
<item quantity="one">%1$d of %2$d unread</item> <item quantity="one">%1$d message</item>
<item quantity="other">%1$d of %2$d unread</item> <item quantity="other">%1$d messages</item>
</plurals>
<plurals name="title_accessibility_all_of_seen">
<item quantity="one"></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> </plurals>
<string name="title_accessibility_flagged">Starred</string> <string name="title_accessibility_flagged">Starred</string>