From d82616f871e22aa492de03bb513181024c943baa Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Thu, 7 Apr 2022 19:46:54 +0300
Subject: [PATCH] Accessibility improvements

---
 .../android/fragments/ComposeFragment.java    |  5 +++
 .../android/fragments/HomeFragment.java       |  1 +
 .../fragments/NotificationsListFragment.java  |  1 -
 .../displayitems/FooterStatusDisplayItem.java | 39 +++++++++++++++++--
 .../displayitems/HeaderStatusDisplayItem.java |  2 +
 .../displayitems/ImageStatusDisplayItem.java  |  2 +
 .../android/ui/photoviewer/PhotoViewer.java   |  2 +
 .../joinmastodon/android/ui/views/TabBar.java |  4 --
 .../main/res/layout/display_item_header.xml   |  1 +
 .../src/main/res/layout/fragment_compose.xml  |  5 +++
 .../main/res/layout/item_settings_header.xml  |  1 +
 .../main/res/layout/item_settings_switch.xml  |  1 +
 .../res/layout/recycler_fragment_with_fab.xml |  1 +
 mastodon/src/main/res/layout/tab_bar.xml      |  4 ++
 mastodon/src/main/res/values/strings.xml      | 19 ++++++++-
 15 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 5b8fe89cb..5e154cfde 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -1094,6 +1094,11 @@ public class ComposeFragment extends ToolbarFragment implements OnBackPressedLis
 		finishAutocomplete();
 	}
 
+	@Override
+	public CharSequence getTitle(){
+		return getString(R.string.new_post);
+	}
+
 	@Override
 	public boolean wantsLightStatusBar(){
 		return !UiUtils.isDarkTheme();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
index 53f87d909..c91b97958 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
@@ -66,6 +66,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		accountID=getArguments().getString("account");
+		setTitle(R.string.app_name);
 
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
index e6c3c1fd8..34b158bc9 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
@@ -40,7 +40,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		setTitle(R.string.notifications);
 		onlyMentions=getArguments().getBoolean("onlyMentions", false);
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
index 05d7e1f05..badb6de9b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
@@ -6,6 +6,8 @@ import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -43,6 +45,15 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		private final TextView reply, boost, favorite;
 		private final ImageView share;
 
+		private final View.AccessibilityDelegate buttonAccessibilityDelegate=new View.AccessibilityDelegate(){
+			@Override
+			public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info){
+				super.onInitializeAccessibilityNodeInfo(host, info);
+				info.setClassName(Button.class.getName());
+				info.setText(item.parentFragment.getString(descriptionForId(host.getId())));
+			}
+		};
+
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_footer, parent);
 			reply=findViewById(R.id.reply);
@@ -54,10 +65,18 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 				UiUtils.fixCompoundDrawableTintOnAndroid6(boost);
 				UiUtils.fixCompoundDrawableTintOnAndroid6(favorite);
 			}
-			findViewById(R.id.reply_btn).setOnClickListener(this::onReplyClick);
-			findViewById(R.id.boost_btn).setOnClickListener(this::onBoostClick);
-			findViewById(R.id.favorite_btn).setOnClickListener(this::onFavoriteClick);
-			findViewById(R.id.share_btn).setOnClickListener(this::onShareClick);
+			View reply=findViewById(R.id.reply_btn);
+			View boost=findViewById(R.id.boost_btn);
+			View favorite=findViewById(R.id.favorite_btn);
+			View share=findViewById(R.id.share_btn);
+			reply.setOnClickListener(this::onReplyClick);
+			reply.setAccessibilityDelegate(buttonAccessibilityDelegate);
+			boost.setOnClickListener(this::onBoostClick);
+			boost.setAccessibilityDelegate(buttonAccessibilityDelegate);
+			favorite.setOnClickListener(this::onFavoriteClick);
+			favorite.setAccessibilityDelegate(buttonAccessibilityDelegate);
+			share.setOnClickListener(this::onShareClick);
+			share.setAccessibilityDelegate(buttonAccessibilityDelegate);
 		}
 
 		@Override
@@ -106,5 +125,17 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			intent.putExtra(Intent.EXTRA_TEXT, item.status.url);
 			v.getContext().startActivity(Intent.createChooser(intent, v.getContext().getString(R.string.share_toot_title)));
 		}
+
+		private int descriptionForId(int id){
+			if(id==R.id.reply_btn)
+				return R.string.button_reply;
+			if(id==R.id.boost_btn)
+				return R.string.button_reblog;
+			if(id==R.id.favorite_btn)
+				return R.string.button_favorite;
+			if(id==R.id.share_btn)
+				return R.string.button_share;
+			return 0;
+		}
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
index 09bddb373..ebda50fa8 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
@@ -126,6 +126,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			visibility.setVisibility(item.hasVisibilityToggle && !item.inset ? View.VISIBLE : View.GONE);
 			if(item.hasVisibilityToggle){
 				visibility.setImageResource(item.status.spoilerRevealed ? R.drawable.ic_visibility_off : R.drawable.ic_visibility);
+				visibility.setContentDescription(item.parentFragment.getString(item.status.spoilerRevealed ? R.string.hide_content : R.string.reveal_content));
 			}
 			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), item.needBottomPadding ? V.dp(16) : 0);
 			if(TextUtils.isEmpty(item.extraText)){
@@ -136,6 +137,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			}
 			more.setVisibility(item.inset ? View.GONE : View.VISIBLE);
 			avatar.setClickable(!item.inset);
+			avatar.setContentDescription(item.parentFragment.getString(R.string.avatar_description, item.user.acct));
 		}
 
 		@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ImageStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ImageStatusDisplayItem.java
index 8c842460f..454258544 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ImageStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ImageStatusDisplayItem.java
@@ -2,6 +2,7 @@ package org.joinmastodon.android.ui.displayitems;
 
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -70,6 +71,7 @@ public abstract class ImageStatusDisplayItem extends StatusDisplayItem{
 			crossfadeDrawable.setCrossfadeAlpha(item.status.spoilerRevealed ? 0f : 1f);
 			photo.setImageDrawable(null);
 			photo.setImageDrawable(crossfadeDrawable);
+			photo.setContentDescription(TextUtils.isEmpty(item.attachment.description) ? item.parentFragment.getString(R.string.media_no_description) : item.attachment.description);
 			didClear=false;
 		}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
index e5a3cb004..9ef99b59d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
@@ -21,6 +21,7 @@ import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
+import org.joinmastodon.android.R;
 import org.joinmastodon.android.model.Attachment;
 
 import java.io.IOException;
@@ -90,6 +91,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		wlp.flags=WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR
 				| WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
 		wlp.format=PixelFormat.TRANSLUCENT;
+		wlp.setTitle(activity.getString(R.string.media_viewer));
 		windowView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
 		wm.addView(windowView, wlp);
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/TabBar.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/TabBar.java
index 6295d9837..53fce5007 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/views/TabBar.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/TabBar.java
@@ -1,18 +1,14 @@
 package org.joinmastodon.android.ui.views;
 
 import android.content.Context;
-import android.os.Parcelable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import org.joinmastodon.android.R;
-
 import java.util.function.IntConsumer;
 import java.util.function.IntPredicate;
 
 import androidx.annotation.IdRes;
-import androidx.annotation.Nullable;
 
 public class TabBar extends LinearLayout{
 	@IdRes
diff --git a/mastodon/src/main/res/layout/display_item_header.xml b/mastodon/src/main/res/layout/display_item_header.xml
index ee3841650..5d3b27e7c 100644
--- a/mastodon/src/main/res/layout/display_item_header.xml
+++ b/mastodon/src/main/res/layout/display_item_header.xml
@@ -16,6 +16,7 @@
 		android:background="?android:selectableItemBackgroundBorderless"
 		android:scaleType="center"
 		android:tint="?android:textColorSecondary"
+		android:contentDescription="@string/more_options"
 		android:src="@drawable/ic_post_more" />
 
 	<ImageView
diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index 83aaee434..94888cdc4 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -178,6 +178,7 @@
 			android:padding="0px"
 			android:tint="@color/compose_button"
 			android:tintMode="src_in"
+			android:contentDescription="@string/add_media"
 			android:src="@drawable/ic_fluent_image_24_regular"/>
 
 		<ImageButton
@@ -189,6 +190,7 @@
 			android:padding="0px"
 			android:tint="@color/compose_button"
 			android:tintMode="src_in"
+			android:contentDescription="@string/add_poll"
 			android:src="@drawable/ic_fluent_poll_24_selector"/>
 
 		<ImageButton
@@ -200,6 +202,7 @@
 			android:padding="0px"
 			android:tint="@color/compose_button"
 			android:tintMode="src_in"
+			android:contentDescription="@string/emoji"
 			android:src="@drawable/ic_fluent_emoji_24_selector"/>
 
 		<ImageButton
@@ -211,6 +214,7 @@
 			android:padding="0px"
 			android:tint="@color/compose_button"
 			android:tintMode="src_in"
+			android:contentDescription="@string/content_warning"
 			android:src="@drawable/ic_fluent_chat_warning_24_selector"/>
 
 		<ImageButton
@@ -222,6 +226,7 @@
 			android:padding="0px"
 			android:tint="@color/compose_button"
 			android:tintMode="src_in"
+			android:contentDescription="@string/post_visibility"
 			android:src="@drawable/ic_fluent_earth_24_filled"/>
 
 		<Space
diff --git a/mastodon/src/main/res/layout/item_settings_header.xml b/mastodon/src/main/res/layout/item_settings_header.xml
index d0cca7756..03ae9ba18 100644
--- a/mastodon/src/main/res/layout/item_settings_header.xml
+++ b/mastodon/src/main/res/layout/item_settings_header.xml
@@ -7,4 +7,5 @@
 	android:fontFamily="sans-serif-medium"
 	android:textColor="?android:colorAccent"
 	android:padding="16dp"
+	android:accessibilityHeading="true"
 	tools:text="Visual appearance"/>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/item_settings_switch.xml b/mastodon/src/main/res/layout/item_settings_switch.xml
index d3fc123cd..42f13e846 100644
--- a/mastodon/src/main/res/layout/item_settings_switch.xml
+++ b/mastodon/src/main/res/layout/item_settings_switch.xml
@@ -34,6 +34,7 @@
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
 		android:layout_marginEnd="12dp"
+		android:focusable="false"
 		android:clickable="false"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/recycler_fragment_with_fab.xml b/mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
index 74c6c0d8a..4dcdac756 100644
--- a/mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
+++ b/mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
@@ -31,6 +31,7 @@
 			android:tint="@color/fab_icon"
 			android:scaleType="center"
 			android:stateListAnimator="@animator/fab_shadow"
+			android:contentDescription="@string/new_post"
 			android:src="@drawable/ic_edit_34"/>
 
 	</FrameLayout>
diff --git a/mastodon/src/main/res/layout/tab_bar.xml b/mastodon/src/main/res/layout/tab_bar.xml
index 87d346bef..a5e9f797d 100644
--- a/mastodon/src/main/res/layout/tab_bar.xml
+++ b/mastodon/src/main/res/layout/tab_bar.xml
@@ -19,6 +19,7 @@
 			android:layout_width="52dp"
 			android:layout_height="52dp"
 			android:scaleType="center"
+			android:contentDescription="@string/home_timeline"
 			android:background="?android:selectableItemBackgroundBorderless"
 			android:tint="?android:colorPrimary"
 			android:src="@drawable/ic_fluent_home_28_selector"/>
@@ -33,6 +34,7 @@
 			android:layout_width="52dp"
 			android:layout_height="52dp"
 			android:scaleType="center"
+			android:contentDescription="@string/search_hint"
 			android:background="?android:selectableItemBackgroundBorderless"
 			android:tint="?android:colorPrimary"
 			android:src="@drawable/ic_fluent_search_28_selector"/>
@@ -47,6 +49,7 @@
 			android:layout_width="52dp"
 			android:layout_height="52dp"
 			android:scaleType="center"
+			android:contentDescription="@string/notifications"
 			android:background="?android:selectableItemBackgroundBorderless"
 			android:tint="?android:colorPrimary"
 			android:src="@drawable/ic_fluent_alert_28_selector"/>
@@ -60,6 +63,7 @@
 			android:id="@+id/tab_profile"
 			android:layout_width="52dp"
 			android:layout_height="52dp"
+			android:contentDescription="@string/my_profile"
 			android:foreground="@drawable/bg_tab_profile"
 			android:background="?android:selectableItemBackgroundBorderless">
 			<ImageView
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index 0cace39ad..59749f885 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -25,7 +25,7 @@
 	<string name="time_hours">%dh</string>
 	<string name="time_days">%dd</string>
 
-	<string name="share_toot_title">Share toot</string>
+	<string name="share_toot_title">Share</string>
 	<string name="settings">Settings</string>
 	<string name="publish">Publish</string>
 	<string name="discard_draft">Discard draft?</string>
@@ -267,4 +267,21 @@
 	<string name="sensitive_content">Sensitive content</string>
 	<string name="sensitive_content_explain">The author marked this media as sensitive. Tap to reveal.</string>
 	<string name="media_hidden">Tap to reveal</string>
+	<string name="avatar_description">Go to %s\'s profile</string>
+	<string name="more_options">More options</string>
+	<string name="reveal_content">Reveal content</string>
+	<string name="hide_content">Hide content</string>
+	<string name="new_post">New post</string>
+	<string name="button_reply">Reply</string>
+	<string name="button_reblog">Reblog</string>
+	<string name="button_favorite">Favorite</string>
+	<string name="button_share">Share</string>
+	<string name="media_no_description">Media without description</string>
+	<string name="add_media">Add media</string>
+	<string name="add_poll">Add a poll</string>
+	<string name="emoji">Emoji</string>
+	<string name="post_visibility">Post visibility</string>
+	<string name="home_timeline">Home timeline</string>
+	<string name="my_profile">My profile</string>
+	<string name="media_viewer">Media viewer</string>
 </resources>
\ No newline at end of file