From d3bd2ec2f45af6e32e525fb8c3c34d65e86c2283 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 24 Mar 2025 21:26:20 +0100
Subject: [PATCH] Accessibility for iconified nav menu

---
 .../java/eu/faircode/email/AdapterNavAccountFolder.java     | 6 ++++++
 app/src/main/java/eu/faircode/email/AdapterNavMenu.java     | 6 ++++++
 app/src/main/java/eu/faircode/email/AdapterNavSearch.java   | 6 ++++++
 app/src/main/java/eu/faircode/email/AdapterNavUnified.java  | 6 ++++++
 app/src/main/res/layout/item_nav.xml                        | 1 -
 5 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java b/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java
index 3254de1183..9129f0618f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java
@@ -19,6 +19,9 @@ package eu.faircode.email;
     Copyright 2018-2025 by Marcel Bokhorst (M66B)
 */
 
+import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
+import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_YES;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -172,6 +175,9 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
             tvItem.setTypeface(count == 0 ? Typeface.DEFAULT : Typeface.DEFAULT_BOLD);
             tvItem.setVisibility(expanded ? View.VISIBLE : View.GONE);
 
+            ivItem.setContentDescription(tvItem.getText());
+            ivItem.setImportantForAccessibility(expanded ? IMPORTANT_FOR_ACCESSIBILITY_NO : IMPORTANT_FOR_ACCESSIBILITY_YES);
+
             if (account.folderName == null) {
                 if (account.last_connected != null && expanded && nav_last_sync) {
                     Calendar cal = Calendar.getInstance();
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavMenu.java b/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
index 202388edef..6d144e1319 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavMenu.java
@@ -19,6 +19,9 @@ package eu.faircode.email;
     Copyright 2018-2025 by Marcel Bokhorst (M66B)
 */
 
+import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
+import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_YES;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
@@ -118,6 +121,9 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
             tvItem.setTypeface(count == null ? Typeface.DEFAULT : Typeface.DEFAULT_BOLD);
             tvItem.setVisibility(expanded ? View.VISIBLE : View.GONE);
 
+            ivItem.setContentDescription(tvItem.getText());
+            ivItem.setImportantForAccessibility(expanded ? IMPORTANT_FOR_ACCESSIBILITY_NO : IMPORTANT_FOR_ACCESSIBILITY_YES);
+
             tvItemExtra.setText(menu.getSubtitle());
             tvItemExtra.setVisibility(menu.getSubtitle() != null && expanded ? View.VISIBLE : View.GONE);
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavSearch.java b/app/src/main/java/eu/faircode/email/AdapterNavSearch.java
index 7f3513abab..2597391484 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavSearch.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavSearch.java
@@ -19,6 +19,9 @@ package eu.faircode.email;
     Copyright 2018-2025 by Marcel Bokhorst (M66B)
 */
 
+import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
+import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_YES;
+
 import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -93,6 +96,9 @@ public class AdapterNavSearch extends RecyclerView.Adapter<AdapterNavSearch.View
             tvCount.setVisibility(View.GONE);
             tvItem.setText(search.name);
 
+            ivItem.setContentDescription(tvItem.getText());
+            ivItem.setImportantForAccessibility(expanded ? IMPORTANT_FOR_ACCESSIBILITY_NO : IMPORTANT_FOR_ACCESSIBILITY_YES);
+
             tvItemExtra.setVisibility(View.GONE);
             ivExtra.setVisibility(View.GONE);
             ivWarning.setVisibility(View.GONE);
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavUnified.java b/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
index 3a5d535e0e..195dbb6706 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
@@ -19,6 +19,9 @@ package eu.faircode.email;
     Copyright 2018-2025 by Marcel Bokhorst (M66B)
 */
 
+import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
+import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_YES;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -155,6 +158,9 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
             tvItem.setTypeface(count == 0 ? Typeface.DEFAULT : Typeface.DEFAULT_BOLD);
             tvItem.setVisibility(expanded ? View.VISIBLE : View.GONE);
 
+            ivItem.setContentDescription(tvItem.getText());
+            ivItem.setImportantForAccessibility(expanded ? IMPORTANT_FOR_ACCESSIBILITY_NO : IMPORTANT_FOR_ACCESSIBILITY_YES);
+
             tvItemExtra.setText(NF.format(folder.messages));
             tvItemExtra.setVisibility(nav_count && expanded ? View.VISIBLE : View.GONE);
 
diff --git a/app/src/main/res/layout/item_nav.xml b/app/src/main/res/layout/item_nav.xml
index 46ddd27fe9..36422e2558 100644
--- a/app/src/main/res/layout/item_nav.xml
+++ b/app/src/main/res/layout/item_nav.xml
@@ -18,7 +18,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
             android:gravity="center_vertical"
-            android:importantForAccessibility="no"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"