Fix logic for concatenating hints in Android (#1837)

dotnet · Jul 28, 2021 · 05e97c8 · 05e97c8
1 parent 729b266
commit 05e97c8
Showing 1 changed file with 26 additions and 6 deletions.
diff --git a/src/Core/src/Handlers/View/ViewHandler.Android.cs b/src/Core/src/Handlers/View/ViewHandler.Android.cs
@@ -131,8 +131,13 @@ public void OnInitializeAccessibilityNodeInfo(NativeView? host, AccessibilityNod
 			if (!string.IsNullOrEmpty(desc))
 			{
 				// Edit Text fields won't read anything for the content description
-				if (host is EditText)
-					newText = $"{desc}, {((EditText)host).Text}";
+				if (host is EditText et)
+				{
+					if (!string.IsNullOrEmpty(et.Text))
+						newText = $"{desc}, {et.Text}";
+					else
+						newText = $"{desc}";
+				}
 				else
 					newContentDescription = desc;
 			}
@@ -150,11 +155,26 @@ public void OnInitializeAccessibilityNodeInfo(NativeView? host, AccessibilityNod
 				}
 				else
 				{
-					if (host is TextView tv)
+					if (host is EditText et)
 					{
-						newText = newText ?? tv.Text;
+						newText = newText ?? et.Text;
 						newText = $"{newText}, {hint}";
 					}
+					else if (host is TextView tv)
+					{
+						if (newContentDescription != null)
+						{
+							newText = $"{newContentDescription}, {hint}";
+						}
+						else if (!string.IsNullOrEmpty(tv.Text))
+						{
+							newText = $"{tv.Text}, {hint}";
+						}
+						else
+						{
+							newText = $"{hint}";
+						}
+					}
 					else
 					{
 						if (newContentDescription != null)
@@ -171,10 +191,10 @@ public void OnInitializeAccessibilityNodeInfo(NativeView? host, AccessibilityNod
 				}
 			}
 
-			if (!String.IsNullOrWhiteSpace(newContentDescription))
+			if (!string.IsNullOrWhiteSpace(newContentDescription))
 				info.ContentDescription = newContentDescription;
 
-			if (!String.IsNullOrWhiteSpace(newText))
+			if (!string.IsNullOrWhiteSpace(newText))
 				info.Text = newText;
 		}