From 93cd7048e8370c629e72ad751e7b1fef15a78bf2 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Mon, 10 Dec 2018 09:37:04 +0100
Subject: [PATCH] some more content descriptions - #623

---
 .../drawers/AccountsInAListAdapter.java       |  2 ++
 app/src/main/res/layout/dialog_profile.xml    | 11 ++++------
 app/src/main/res/layout/drawer_account.xml    |  5 +++--
 .../layout/drawer_account_follow_request.xml  |  4 +---
 .../main/res/layout/drawer_account_list.xml   |  4 ++--
 .../res/layout/drawer_account_main_search.xml |  3 +--
 .../main/res/layout/drawer_account_reply.xml  |  3 +--
 .../main/res/layout/drawer_account_search.xml |  3 +--
 .../res/layout/drawer_account_search_dev.xml  |  3 ++-
 .../res/layout/drawer_account_search_html.xml |  3 ++-
 app/src/main/res/layout/drawer_domain.xml     |  2 +-
 app/src/main/res/layout/drawer_draft.xml      |  6 ++----
 .../main/res/layout/drawer_emoji_search.xml   |  2 +-
 .../main/res/layout/drawer_notification.xml   | 21 +++++++++----------
 app/src/main/res/values/strings.xml           |  4 ++++
 15 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsInAListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsInAListAdapter.java
index 67976910e..53b81c0c2 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsInAListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsInAListAdapter.java
@@ -92,8 +92,10 @@ public class AccountsInAListAdapter extends RecyclerView.Adapter implements OnLi
 
         if( actionType == type.CURRENT){
             holder.account_action.setImageResource(R.drawable.ic_close);
+            holder.account_action.setContentDescription(context.getString(R.string.remove_account));
         }else if(actionType == type.SEARCH){
             holder.account_action.setImageResource(R.drawable.ic_add);
+            holder.account_action.setContentDescription(context.getString(R.string.add_account));
         }
         holder.account_action.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/res/layout/dialog_profile.xml b/app/src/main/res/layout/dialog_profile.xml
index 3d9d4c2d0..0e9554362 100644
--- a/app/src/main/res/layout/dialog_profile.xml
+++ b/app/src/main/res/layout/dialog_profile.xml
@@ -15,13 +15,10 @@
     You should have received a copy of the GNU General Public License along with Mastalab; if not,
     see <http://www.gnu.org/licenses>.
 -->
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/background_image"
-    >
+    android:background="@color/background_image">
     <ImageView
         android:id="@+id/back_ground_image"
         android:alpha="0.2"
@@ -29,7 +26,7 @@
         android:scaleType="centerCrop"
         android:adjustViewBounds="true"
         android:layout_height="wrap_content"
-        tools:ignore="ContentDescription" />
+        android:contentDescription="@string/profile_banner" />
     <RelativeLayout
         android:padding="@dimen/fab_margin"
         android:layout_width="match_parent"
@@ -43,7 +40,7 @@
             android:adjustViewBounds="true"
             android:layout_centerHorizontal="true"
             android:layout_height="80dp"
-            tools:ignore="ContentDescription" />
+            android:contentDescription="@string/profile_picture" />
         <!-- Screen name -->
         <TextView
             android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/drawer_account.xml b/app/src/main/res/layout/drawer_account.xml
index 96f055f51..bd6e9ef99 100644
--- a/app/src/main/res/layout/drawer_account.xml
+++ b/app/src/main/res/layout/drawer_account.xml
@@ -16,7 +16,6 @@
     see <http://www.gnu.org/licenses>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -29,7 +28,7 @@
         android:id="@+id/account_pp"
         android:layout_width="60dp"
         android:layout_height="60dp"
-        tools:ignore="ContentDescription" />
+        android:contentDescription="@string/profile_picture"/>
     <LinearLayout
         android:layout_marginLeft="20dp"
         android:layout_marginStart="20dp"
@@ -158,6 +157,7 @@
             android:scaleType="fitXY"
             android:layout_gravity="center"
             android:gravity="center"
+            android:contentDescription="@string/action_follow"
             />
         <android.support.design.widget.FloatingActionButton
             android:id="@+id/account_mute_notification"
@@ -169,6 +169,7 @@
             android:scaleType="fitXY"
             android:layout_gravity="center"
             android:gravity="center"
+            android:contentDescription="@string/action_mute"
             />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/drawer_account_follow_request.xml b/app/src/main/res/layout/drawer_account_follow_request.xml
index 52af2cafa..8790f1b3a 100644
--- a/app/src/main/res/layout/drawer_account_follow_request.xml
+++ b/app/src/main/res/layout/drawer_account_follow_request.xml
@@ -16,7 +16,6 @@
     see <http://www.gnu.org/licenses>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:id="@+id/account_container"
@@ -28,8 +27,7 @@
         android:id="@+id/account_pp"
         android:layout_width="60dp"
         android:layout_height="60dp"
-
-        tools:ignore="ContentDescription" />
+        android:contentDescription="@string/profile_picture"/>
     <TextView
         android:id="@+id/account_un"
         android:padding="5dp"
diff --git a/app/src/main/res/layout/drawer_account_list.xml b/app/src/main/res/layout/drawer_account_list.xml
index 0a754a436..d8feaca5a 100644
--- a/app/src/main/res/layout/drawer_account_list.xml
+++ b/app/src/main/res/layout/drawer_account_list.xml
@@ -16,7 +16,6 @@
     see <http://www.gnu.org/licenses>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -31,7 +30,7 @@
         android:id="@+id/account_pp"
         android:layout_width="30dp"
         android:layout_height="30dp"
-        tools:ignore="ContentDescription" />
+        android:contentDescription="@string/profile_picture" />
     <LinearLayout
         android:layout_width="0dp"
         android:layout_weight="1"
@@ -57,6 +56,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
     </LinearLayout>
+    <!-- Content description set programmatically -->
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/account_action"
         app:fabSize="mini"
diff --git a/app/src/main/res/layout/drawer_account_main_search.xml b/app/src/main/res/layout/drawer_account_main_search.xml
index 4fd912f7e..8c5554238 100644
--- a/app/src/main/res/layout/drawer_account_main_search.xml
+++ b/app/src/main/res/layout/drawer_account_main_search.xml
@@ -16,7 +16,6 @@
     see <http://www.gnu.org/licenses>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:id="@+id/main_container"
@@ -52,7 +51,7 @@
                 android:id="@+id/account_pp"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
-                tools:ignore="ContentDescription" />
+                android:contentDescription="@string/profile_picture" />
         </LinearLayout>
         <LinearLayout
             android:layout_marginLeft="20dp"
diff --git a/app/src/main/res/layout/drawer_account_reply.xml b/app/src/main/res/layout/drawer_account_reply.xml
index 402f70bd6..1fed72432 100644
--- a/app/src/main/res/layout/drawer_account_reply.xml
+++ b/app/src/main/res/layout/drawer_account_reply.xml
@@ -17,7 +17,6 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="2dp"
@@ -37,7 +36,7 @@
         android:id="@+id/account_pp"
         android:layout_width="30dp"
         android:layout_height="30dp"
-        tools:ignore="ContentDescription" />
+        android:contentDescription="@string/profile_picture" />
     <TextView
         android:layout_marginStart="10dp"
         android:layout_marginLeft="10dp"
diff --git a/app/src/main/res/layout/drawer_account_search.xml b/app/src/main/res/layout/drawer_account_search.xml
index bda8d4468..a7bb4839a 100644
--- a/app/src/main/res/layout/drawer_account_search.xml
+++ b/app/src/main/res/layout/drawer_account_search.xml
@@ -17,7 +17,6 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="2dp"
@@ -29,7 +28,7 @@
         android:id="@+id/account_pp"
         android:layout_width="30dp"
         android:layout_height="30dp"
-        tools:ignore="ContentDescription" />
+        android:contentDescription="@string/profile_picture" />
     <TextView
         android:layout_marginStart="10dp"
         android:layout_marginLeft="10dp"
diff --git a/app/src/main/res/layout/drawer_account_search_dev.xml b/app/src/main/res/layout/drawer_account_search_dev.xml
index 9348082fe..a5b8bfc89 100644
--- a/app/src/main/res/layout/drawer_account_search_dev.xml
+++ b/app/src/main/res/layout/drawer_account_search_dev.xml
@@ -30,7 +30,7 @@
         android:layout_width="60dp"
         android:layout_height="60dp"
         android:layout_margin="10dp"
-        tools:ignore="ContentDescription"/>
+        android:contentDescription="@string/profile_picture"/>
     <LinearLayout
         android:layout_marginTop="10dp"
         android:layout_marginStart="10dp"
@@ -56,6 +56,7 @@
     <android.support.design.widget.FloatingActionButton
         android:layout_gravity="center"
         app:fabSize="mini"
+        android:contentDescription="@string/follow_account"
         android:id="@+id/account_follow"
         android:textAllCaps="false"
         android:src="@drawable/ic_user_plus"
diff --git a/app/src/main/res/layout/drawer_account_search_html.xml b/app/src/main/res/layout/drawer_account_search_html.xml
index d7b996b82..c6a23a232 100644
--- a/app/src/main/res/layout/drawer_account_search_html.xml
+++ b/app/src/main/res/layout/drawer_account_search_html.xml
@@ -33,7 +33,7 @@
             android:layout_margin="10dp"
             android:layout_width="60dp"
             android:layout_height="60dp"
-            tools:ignore="ContentDescription" />
+            android:contentDescription="@string/profile_picture"  />
         <LinearLayout
             android:layout_marginTop="10dp"
             android:layout_marginStart="10dp"
@@ -60,6 +60,7 @@
             android:layout_gravity="center"
             app:fabSize="mini"
             android:id="@+id/account_follow"
+            android:contentDescription="@string/follow_account"
             android:textAllCaps="false"
             android:src="@drawable/ic_user_plus"
             android:gravity="center"
diff --git a/app/src/main/res/layout/drawer_domain.xml b/app/src/main/res/layout/drawer_domain.xml
index 89cc8bc56..50528a196 100644
--- a/app/src/main/res/layout/drawer_domain.xml
+++ b/app/src/main/res/layout/drawer_domain.xml
@@ -41,5 +41,5 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="10dp"
-        tools:ignore="ContentDescription" />
+        android:contentDescription="@string/delete_domain" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_draft.xml b/app/src/main/res/layout/drawer_draft.xml
index c00591a46..3a28f13c5 100644
--- a/app/src/main/res/layout/drawer_draft.xml
+++ b/app/src/main/res/layout/drawer_draft.xml
@@ -16,13 +16,11 @@
     see <http://www.gnu.org/licenses>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:id="@+id/drafts_container"
     android:layout_marginTop="10dp"
-    android:orientation="horizontal"
-    >
+    android:orientation="horizontal">
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="0dp"
         android:layout_weight="1"
@@ -54,5 +52,5 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:padding="10dp"
-        tools:ignore="ContentDescription" />
+        android:contentDescription="@string/remove_draft" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_emoji_search.xml b/app/src/main/res/layout/drawer_emoji_search.xml
index e9ee582dc..a5a720539 100644
--- a/app/src/main/res/layout/drawer_emoji_search.xml
+++ b/app/src/main/res/layout/drawer_emoji_search.xml
@@ -30,7 +30,7 @@
         android:id="@+id/emoji_icon"
         android:layout_width="30dp"
         android:layout_height="30dp"
-        tools:ignore="ContentDescription" />
+        android:contentDescription="@string/custom_emoji_picker"  />
     <TextView
         android:layout_marginStart="10dp"
         android:layout_marginLeft="10dp"
diff --git a/app/src/main/res/layout/drawer_notification.xml b/app/src/main/res/layout/drawer_notification.xml
index ae2933f7d..433d5a4bc 100644
--- a/app/src/main/res/layout/drawer_notification.xml
+++ b/app/src/main/res/layout/drawer_notification.xml
@@ -48,7 +48,7 @@
                     android:layout_width="50dp"
                     android:layout_gravity="center_horizontal"
                     android:gravity="center_horizontal|top"
-                    tools:ignore="ContentDescription" />
+                    android:contentDescription="@string/profile_picture"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="0dp"
@@ -91,7 +91,7 @@
                     android:src="@drawable/ic_delete"
                     android:layout_width="25dp"
                     android:layout_height="25dp"
-                    tools:ignore="ContentDescription" />
+                    android:contentDescription="@string/delete_notification" />
             </RelativeLayout>
             <LinearLayout
                 android:layout_width="match_parent"
@@ -156,8 +156,7 @@
                                 android:id="@+id/status_prev1"
                                 android:layout_width="match_parent"
                                 android:scaleType="centerCrop"
-                                android:layout_height="match_parent"
-                                tools:ignore="ContentDescription" />
+                                android:layout_height="match_parent" />
                             <ImageView
                                 android:id="@+id/status_prev1_play"
                                 android:visibility="gone"
@@ -165,7 +164,7 @@
                                 android:layout_width="20dp"
                                 android:src="@drawable/ic_play_arrow"
                                 android:layout_height="20dp"
-                                tools:ignore="ContentDescription" />
+                                android:contentDescription="@string/play_video" />
                         </RelativeLayout>
                         <LinearLayout
                             android:orientation="vertical"
@@ -185,7 +184,7 @@
                                     android:layout_width="match_parent"
                                     android:scaleType="centerCrop"
                                     android:layout_height="match_parent"
-                                    tools:ignore="ContentDescription" />
+                                   />
                                 <ImageView
                                     android:visibility="gone"
                                     android:id="@+id/status_prev2_play"
@@ -193,7 +192,7 @@
                                     android:layout_width="20dp"
                                     android:src="@drawable/ic_play_arrow"
                                     android:layout_height="20dp"
-                                    tools:ignore="ContentDescription" />
+                                    android:contentDescription="@string/play_video"  />
                             </RelativeLayout>
 
                             <LinearLayout
@@ -213,7 +212,7 @@
                                         android:layout_width="match_parent"
                                         android:scaleType="centerCrop"
                                         android:layout_height="match_parent"
-                                        tools:ignore="ContentDescription" />
+                                        />
                                     <ImageView
                                         android:id="@+id/status_prev3_play"
                                         android:layout_centerInParent="true"
@@ -221,7 +220,7 @@
                                         android:src="@drawable/ic_play_arrow"
                                         android:visibility="gone"
                                         android:layout_height="20dp"
-                                        tools:ignore="ContentDescription" />
+                                        android:contentDescription="@string/play_video" />
                                 </RelativeLayout>
                                 <RelativeLayout
                                     android:layout_marginLeft="2dp"
@@ -235,7 +234,7 @@
                                         android:layout_width="match_parent"
                                         android:scaleType="centerCrop"
                                         android:layout_height="match_parent"
-                                        tools:ignore="ContentDescription" />
+                                        />
                                     <ImageView
                                         android:id="@+id/status_prev4_play"
                                         android:layout_centerInParent="true"
@@ -243,7 +242,7 @@
                                         android:layout_width="20dp"
                                         android:src="@drawable/ic_play_arrow"
                                         android:layout_height="20dp"
-                                        tools:ignore="ContentDescription" />
+                                        android:contentDescription="@string/play_video" />
                                 </RelativeLayout>
                             </LinearLayout>
                         </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d81ddc67e..3b90534f1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -701,6 +701,10 @@
     <string name="emoji_picker">Emoji picker</string>
     <string name="refresh">Refresh</string>
     <string name="expand_conversation">Expand the conversation</string>
+    <string name="remove_account">Remove an account</string>
+    <string name="delete_domain">Delete the blocked domain</string>
+    <string name="custom_emoji_picker">Custom emoji picker</string>
+    <string name="play_video">Play video</string>
 
     <string-array name="filter_expire">
         <item>Never</item>