From c1f2e9f1719fa2c4bba6ebf7ac2c0c32f689d3d4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 23 Sep 2019 17:48:13 +0200
Subject: [PATCH] Fix a few accessibility issues - home menu (best compromise)

---
 .../features/home/room/list/widget/FabMenuView.kt    | 12 ++++++++++++
 vector/src/main/res/layout/fragment_room_list.xml    |  1 -
 vector/src/main/res/layout/motion_fab_menu_merge.xml | 12 ++++++++++--
 vector/src/main/res/values/strings_riotX.xml         |  3 ++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt
index e95a0237ad..9f1f6526c9 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt
@@ -63,6 +63,18 @@ class FabMenuView @JvmOverloads constructor(context: Context, attrs: AttributeSe
         }
     }
 
+    override fun transitionToEnd() {
+        super.transitionToEnd()
+
+        createRoomButton.contentDescription = context.getString(R.string.a11y_create_menu_close)
+    }
+
+    override fun transitionToStart() {
+        super.transitionToStart()
+
+        createRoomButton.contentDescription = context.getString(R.string.a11y_create_menu_open)
+    }
+
     fun show() {
         isVisible = true
         createRoomButton.show()
diff --git a/vector/src/main/res/layout/fragment_room_list.xml b/vector/src/main/res/layout/fragment_room_list.xml
index 5789bc7029..30ab86d004 100644
--- a/vector/src/main/res/layout/fragment_room_list.xml
+++ b/vector/src/main/res/layout/fragment_room_list.xml
@@ -17,7 +17,6 @@
         android:id="@+id/createChatFabMenu"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:accessibilityTraversalBefore="@+id/roomListEpoxyRecyclerView"
         android:visibility="gone"
         app:layoutDescription="@xml/motion_scene_fab_menu"
         tools:showPaths="true"
diff --git a/vector/src/main/res/layout/motion_fab_menu_merge.xml b/vector/src/main/res/layout/motion_fab_menu_merge.xml
index 967e1120f3..02ba4341c6 100644
--- a/vector/src/main/res/layout/motion_fab_menu_merge.xml
+++ b/vector/src/main/res/layout/motion_fab_menu_merge.xml
@@ -13,7 +13,10 @@
         android:id="@+id/createRoomTouchGuard"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?riotx_touch_guard_bg" />
+        android:background="?riotx_touch_guard_bg"
+        android:clickable="true"
+        android:contentDescription="@string/a11y_create_menu_close"
+        android:focusable="true" />
 
     <!-- Sub menu item 2 -->
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -21,6 +24,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
+        android:accessibilityTraversalBefore="@+id/roomListEpoxyRecyclerView"
         android:contentDescription="@string/a11y_create_room"
         android:src="@drawable/ic_fab_add_room"
         app:backgroundTint="#FFFFFF"
@@ -36,6 +40,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:ellipsize="end"
+        android:importantForAccessibility="no"
         android:text="@string/fab_menu_create_room" />
 
     <!-- Sub menu item 1 -->
@@ -44,6 +49,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
+        android:accessibilityTraversalBefore="@+id/createRoomItemGroup"
         android:contentDescription="@string/a11y_create_direct_message"
         android:src="@drawable/ic_fab_add_chat"
         app:backgroundTint="#FFFFFF"
@@ -59,6 +65,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:ellipsize="end"
+        android:importantForAccessibility="no"
         android:text="@string/fab_menu_create_chat" />
 
     <!-- Menu -->
@@ -66,7 +73,8 @@
         android:id="@+id/createRoomButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:contentDescription="@string/a11y_create_menu"
+        android:accessibilityTraversalBefore="@+id/createRoomItemChat"
+        android:contentDescription="@string/a11y_create_menu_open"
         android:src="@drawable/ic_fab_add"
         app:maxImageSize="14dp" />
 
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index 693b6c6e52..6b46d359be 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -16,7 +16,8 @@
     <string name="send_attachment">Send attachment</string>
 
     <string name="a11y_open_drawer">Open the navigation drawer</string>
-    <string name="a11y_create_menu">Create…</string>
+    <string name="a11y_create_menu_open">Open the create room menu</string>
+    <string name="a11y_create_menu_close">Close the create room menu…</string>
     <string name="a11y_create_direct_message">Create a new direct conversation</string>
     <string name="a11y_create_room">Create a new room</string>
     <string name="a11y_close_keys_backup_banner">Close keys backup banner</string>