fix(android): correct content description component (#12538)

tidev · Aug 19, 2021 · db1a83a · db1a83a
1 parent 386c5cf
commit db1a83a
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 4 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiImageView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiImageView.java
@@ -589,4 +589,9 @@ public int getTintColor()
 	{
 		return tintColor;
 	}
+
+	public ImageView getImageView()
+	{
+		return this.imageView;
+	}
 }
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIImageView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIImageView.java
@@ -67,6 +67,7 @@ public class TiUIImageView extends TiUIView implements OnLifecycleEvent, Handler
 	private boolean firedLoad;
 	private ImageViewProxy imageViewProxy;
 	private int currentDuration;
+	private TiImageView view;
 
 	private ArrayList<TiDrawableReference> imageSources;
 	private TiDrawableReference defaultImageSource;
@@ -90,7 +91,7 @@ public TiUIImageView(final TiViewProxy proxy)
 
 		Log.d(TAG, "Creating an ImageView", Log.DEBUG_MODE);
 
-		TiImageView view = new TiImageView(proxy.getActivity(), proxy);
+		view = new TiImageView(proxy.getActivity(), proxy);
 
 		downloadListener = new TiDownloadListener() {
 			@Override
@@ -165,6 +166,30 @@ public void loadImageFailed()
 		// TODO proxy.getActivity().addOnLifecycleEventListener(this);
 	}
 
+	@Override
+	protected void applyContentDescription()
+	{
+		if (proxy == null || nativeView == null) {
+			return;
+		}
+		String contentDescription = composeContentDescription();
+		if (contentDescription != null) {
+			this.view.getImageView().setContentDescription(contentDescription);
+		}
+	}
+
+	@Override
+	protected void applyContentDescription(KrollDict properties)
+	{
+		if (proxy == null || nativeView == null) {
+			return;
+		}
+		String contentDescription = composeContentDescription(properties);
+		if (contentDescription != null) {
+			this.view.getImageView().setContentDescription(contentDescription);
+		}
+	}
+
 	@Override
 	public void setProxy(TiViewProxy proxy)
 	{
@@ -174,7 +199,7 @@ public void setProxy(TiViewProxy proxy)
 
 	private TiImageView getView()
 	{
-		return (TiImageView) nativeView;
+		return this.view;
 	}
 
 	protected View getParentView()

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java
@@ -271,6 +271,30 @@ public void processProperties(KrollDict d)
 		disableChangeEvent = false;
 	}
 
+	@Override
+	protected void applyContentDescription()
+	{
+		if (proxy == null || nativeView == null) {
+			return;
+		}
+		String contentDescription = composeContentDescription();
+		if (contentDescription != null) {
+			this.tv.setContentDescription(contentDescription);
+		}
+	}
+
+	@Override
+	protected void applyContentDescription(KrollDict properties)
+	{
+		if (proxy == null || nativeView == null) {
+			return;
+		}
+		String contentDescription = composeContentDescription(properties);
+		if (contentDescription != null) {
+			this.tv.setContentDescription(contentDescription);
+		}
+	}
+
 	private void updateTextField()
 	{
 		if (!field) {

diff --git a/android/titanium/src/java/org/appcelerator/titanium/view/TiUIView.java b/android/titanium/src/java/org/appcelerator/titanium/view/TiUIView.java
@@ -2214,7 +2214,7 @@ private void resetPostAnimationValues()
 		animatedAlpha = Float.MIN_VALUE;                                         // we use min val to signal no val.
 	}
 
-	private void applyContentDescription()
+	protected void applyContentDescription()
 	{
 		if (proxy == null || nativeView == null) {
 			return;
@@ -2225,7 +2225,7 @@ private void applyContentDescription()
 		}
 	}
 
-	private void applyContentDescription(KrollDict properties)
+	protected void applyContentDescription(KrollDict properties)
 	{
 		if (proxy == null || nativeView == null) {
 			return;