Parcourir la source

talkback: remove "icon" text from content description, implement proper content description for share state

AndyScherzinger il y a 6 ans
Parent
commit
4ba0c66f82

+ 3 - 0
src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -472,10 +472,13 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         
         if (file.isSharedWithSharee() || file.isSharedWithMe()) {
             sharedIconView.setImageResource(R.drawable.shared_via_users);
+            sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_share));
         } else if (file.isSharedViaLink()) {
             sharedIconView.setImageResource(R.drawable.shared_via_link);
+            sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_shared_via_link));
         } else {
             sharedIconView.setImageResource(R.drawable.ic_unshared);
+            sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_share));
         }
         sharedIconView.setOnClickListener(new View.OnClickListener() {
             @Override

+ 1 - 1
src/main/res/layout/grid_image.xml

@@ -56,7 +56,7 @@
             android:layout_marginEnd="@dimen/standard_quarter_margin"
             android:layout_marginRight="@dimen/standard_quarter_margin"
             android:layout_marginTop="@dimen/grid_image_shared_icon_layout_top_margin"
-            android:contentDescription="@string/shared_via_link_icon"
+            android:contentDescription="@string/shared_icon_shared_via_link"
             android:src="@drawable/shared_via_link" />
 
         <ImageView

+ 1 - 1
src/main/res/layout/grid_item.xml

@@ -55,7 +55,7 @@
             android:layout_marginRight="@dimen/standard_quarter_margin"
             android:layout_marginEnd="@dimen/standard_quarter_margin"
             android:src="@drawable/shared_via_link"
-            android:contentDescription="@string/shared_via_link_icon"/>
+            android:contentDescription="@string/shared_icon_shared_via_link"/>
 
         <ImageView
             android:id="@+id/localFileIndicator"

+ 1 - 1
src/main/res/layout/list_item.xml

@@ -164,7 +164,7 @@
                 android:layout_height="match_parent"
                 android:layout_centerVertical="true"
                 android:clickable="true"
-                android:contentDescription="@string/shared_icon"
+                android:contentDescription="@string/shared_icon_share"
                 android:focusable="true"
                 android:paddingEnd="@dimen/list_item_share_right_margin"
                 android:paddingLeft="@dimen/standard_half_padding"

+ 9 - 8
src/main/res/values/strings.xml

@@ -694,16 +694,17 @@
     <string name="drawer_middle_account">Middle account</string>
     <string name="drawer_end_account">Last account</string>
     <string name="contactlist_item_icon">User icon for contact list</string>
-    <string name="activity_icon">Activity icon</string>
-    <string name="file_icon">File icon</string>
-    <string name="user_icon">User icon</string>
-    <string name="favorite_icon">Favorite icon</string>
-    <string name="shared_via_link_icon">Shared via link icon</string>
-    <string name="synced_icon">Synced icon</string>
-    <string name="available_offline_icon">Available offline icon</string>
+    <string name="activity_icon">Activity</string>
+    <string name="file_icon">File</string>
+    <string name="user_icon">User</string>
+    <string name="favorite_icon">Favorite</string>
+    <string name="synced_icon">Synced</string>
+    <string name="available_offline_icon">Available offline</string>
     <string name="checkbox">Checkbox</string>
     <string name="thumbnail">Thumbnail</string>
-    <string name="shared_icon">Shared icon</string>
+    <string name="shared_icon_share">share</string>
+    <string name="shared_icon_shared_via_link">shared via link</string>
+    <string name="shared_icon_shared">shared</string>
     <string name="overflow_menu">Overflow menu</string>
     <string name="share_file_icon">Share file icon</string>
     <string name="sort_by_name_ascending">A - Z</string>