From 98130e89de006a92289c753028cf094b6af87f7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Filipe=20da=20Silva=20Bispo?=
 <abispo@bitwarden.com>
Date: Wed, 1 Jun 2022 20:50:19 +0100
Subject: [PATCH] PS-689 Android: Accessibility - back buttons in search and
 vault > bin lack appropriate accessible name (#1929)

* PS-689 Added back buttons accessibility text

* PS-689 Changed resource key from "GoBack" to "TapToGoBack"

* PS-689: class rename
---
 src/Android/Android.csproj                  |  1 +
 src/Android/Renderers/CustomPageRenderer.cs | 31 +++++++++++++++++++++
 src/App/Pages/Vault/CiphersPage.xaml        |  4 ++-
 src/App/Resources/AppResources.Designer.cs  |  6 ++++
 src/App/Resources/AppResources.resx         |  3 ++
 5 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 src/Android/Renderers/CustomPageRenderer.cs

diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
index f03f2776e..94691d6a3 100644
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -150,6 +150,7 @@
     <Compile Include="Renderers\SelectableLabelRenderer.cs" />
     <Compile Include="Services\ClipboardService.cs" />
     <Compile Include="Utilities\IntentExtensions.cs" />
+    <Compile Include="Renderers\CustomPageRenderer.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\bwi-font.ttf" />
diff --git a/src/Android/Renderers/CustomPageRenderer.cs b/src/Android/Renderers/CustomPageRenderer.cs
new file mode 100644
index 000000000..5dec9821a
--- /dev/null
+++ b/src/Android/Renderers/CustomPageRenderer.cs
@@ -0,0 +1,31 @@
+using System;
+using Android.App;
+using Android.Content;
+using AndroidX.AppCompat.Widget;
+using Bit.App.Resources;
+using Bit.Droid.Renderers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(ContentPage), typeof(CustomPageRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class CustomPageRenderer : PageRenderer
+    {
+        public CustomPageRenderer(Context context) : base(context)
+        {
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<Page> e)
+        {
+            base.OnElementChanged(e);
+
+            Activity context = (Activity)this.Context;
+            var toolbar = context.FindViewById<Toolbar>(Resource.Id.toolbar);
+            if(toolbar != null)
+            {
+                toolbar.NavigationContentDescription = AppResources.TapToGoBack;
+            }
+        }
+    }
+}
diff --git a/src/App/Pages/Vault/CiphersPage.xaml b/src/App/Pages/Vault/CiphersPage.xaml
index d9a31fa53..8b463e1a3 100644
--- a/src/App/Pages/Vault/CiphersPage.xaml
+++ b/src/App/Pages/Vault/CiphersPage.xaml
@@ -33,7 +33,9 @@
                     Text="&#xe5c4;"
                     VerticalOptions="CenterAndExpand"
                     Clicked="BackButton_Clicked"
-                    x:Name="_backButton" />
+                    x:Name="_backButton"
+                    AutomationProperties.IsInAccessibleTree="True"
+                    AutomationProperties.Name="{u:I18n TapToGoBack}"/>
                 <controls:ExtendedSearchBar
                     x:Name="_searchBar"
                     HorizontalOptions="FillAndExpand"
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index 32c3f538d..fcc4c72de 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -3971,6 +3971,12 @@ namespace Bit.App.Resources {
             }
         }
         
+        public static string TapToGoBack {
+            get {
+                return ResourceManager.GetString("TapToGoBack", resourceCulture);
+            }
+        }
+        
         public static string PasswordIsVisibleTapToHide {
             get {
                 return ResourceManager.GetString("PasswordIsVisibleTapToHide", resourceCulture);
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index fbfbda78f..8fb2e6aec 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -2220,6 +2220,9 @@
   <data name="SpecialCharacters" xml:space="preserve">
     <value>Special Characters (!@#$%^&amp;*)</value>
   </data>
+  <data name="TapToGoBack" xml:space="preserve">
+    <value>Tap to go back</value>
+  </data>
   <data name="PasswordIsVisibleTapToHide" xml:space="preserve">
     <value>Password is visible, tap to hide.</value>
   </data>