From a2bac9d36851c3a8c9e47fb72674ed741dd5ed60 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 22 Jul 2019 12:04:17 -0400
Subject: [PATCH] a11y labeling

---
 .../CipherViewCell/CipherViewCell.xaml        | 19 +++++--
 src/App/Pages/Accounts/HomePage.xaml          |  4 +-
 src/App/Pages/Accounts/LockPage.xaml          |  8 ++-
 src/App/Pages/Accounts/LoginPage.xaml         |  4 +-
 src/App/Pages/Accounts/RegisterPage.xaml      |  8 ++-
 .../Pages/Generator/GeneratorHistoryPage.xaml |  4 +-
 src/App/Pages/Vault/AddEditPage.xaml          | 32 +++++++++---
 src/App/Pages/Vault/AttachmentsPage.xaml      |  4 +-
 src/App/Pages/Vault/PasswordHistoryPage.xaml  |  4 +-
 src/App/Pages/Vault/ViewPage.xaml             | 52 ++++++++++++++-----
 src/App/Resources/AppResources.Designer.cs    | 27 ++++++++++
 src/App/Resources/AppResources.resx           |  9 ++++
 12 files changed, 140 insertions(+), 35 deletions(-)

diff --git a/src/App/Controls/CipherViewCell/CipherViewCell.xaml b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
index feb596f26..44f6145a7 100644
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
@@ -3,6 +3,7 @@
           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
           x:Class="Bit.App.Controls.CipherViewCell"
           xmlns:controls="clr-namespace:Bit.App.Controls"
+          xmlns:u="clr-namespace:Bit.App.Utilities"
           xmlns:ff="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms">
 
     <Grid 
@@ -32,7 +33,8 @@
             Grid.Column="0"
             HorizontalOptions="Center"
             VerticalOptions="Center"
-            StyleClass="list-icon, list-icon-platform" />
+            StyleClass="list-icon, list-icon-platform"
+            AutomationProperties.IsInAccessibleTree="False" />
 
         <ff:CachedImage
             x:Name="_image"
@@ -44,7 +46,8 @@
             VerticalOptions="Center"
             WidthRequest="22"
             HeightRequest="22"
-            IsVisible="False"/>
+            IsVisible="False"
+            AutomationProperties.IsInAccessibleTree="False" />
 
         <Grid RowSpacing="0" ColumnSpacing="0" Grid.Row="0" Grid.Column="1" VerticalOptions="Center">
             <Grid.RowDefinitions>
@@ -79,7 +82,9 @@
                 StyleClass="list-title-icon"
                 Margin="5, 0, 0, 0"
                 Text="&#xf1e0;"
-                IsVisible="{Binding Cipher.Shared, Mode=OneWay}" />
+                IsVisible="{Binding Cipher.Shared, Mode=OneWay}"
+                AutomationProperties.IsInAccessibleTree="True"
+                AutomationProperties.Name="{u:I18n Shared}" />
             <controls:FaLabel
                 Grid.Column="2"
                 Grid.Row="0"
@@ -88,7 +93,9 @@
                 StyleClass="list-title-icon"
                 Margin="5, 0, 0, 0"
                 Text="&#xf0c6;"
-                IsVisible="{Binding Cipher.HasAttachments, Mode=OneWay}" />
+                IsVisible="{Binding Cipher.HasAttachments, Mode=OneWay}"
+                AutomationProperties.IsInAccessibleTree="True"
+                AutomationProperties.Name="{u:I18n Attachments}" />
         </Grid>
 
         <controls:MiButton
@@ -98,7 +105,9 @@
             StyleClass="list-row-button, list-row-button-platform, btn-disabled"
             Clicked="MoreButton_Clicked"
             VerticalOptions="CenterAndExpand"
-            HorizontalOptions="EndAndExpand" />
+            HorizontalOptions="EndAndExpand"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n Options}" />
 
     </Grid>
 
diff --git a/src/App/Pages/Accounts/HomePage.xaml b/src/App/Pages/Accounts/HomePage.xaml
index 3c5c388dc..ea4562cf2 100644
--- a/src/App/Pages/Accounts/HomePage.xaml
+++ b/src/App/Pages/Accounts/HomePage.xaml
@@ -16,7 +16,9 @@
         <controls:FaButton Text="&#xf013;"
                            StyleClass="btn-muted, btn-icon, btn-icon-platform"
                            HorizontalOptions="Start"
-                           Clicked="Settings_Clicked">
+                           Clicked="Settings_Clicked"
+                           AutomationProperties.IsInAccessibleTree="True"
+                           AutomationProperties.Name="{u:I18n Options}">
             <controls:FaButton.Margin>
                 <OnPlatform x:TypeArguments="Thickness">
                     <On Platform="iOS" Value="0, 10, 0, 0" />
diff --git a/src/App/Pages/Accounts/LockPage.xaml b/src/App/Pages/Accounts/LockPage.xaml
index 4945fdf41..b8bb0d585 100644
--- a/src/App/Pages/Accounts/LockPage.xaml
+++ b/src/App/Pages/Accounts/LockPage.xaml
@@ -58,7 +58,9 @@
                         Command="{Binding TogglePasswordCommand}"
                         Grid.Row="0"
                         Grid.Column="1"
-                        Grid.RowSpan="2" />
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <Grid StyleClass="box-row" IsVisible="{Binding PinLock, Converter={StaticResource inverseBool}}">
                     <Grid.RowDefinitions>
@@ -91,7 +93,9 @@
                         Command="{Binding TogglePasswordCommand}"
                         Grid.Row="0"
                         Grid.Column="1"
-                        Grid.RowSpan="2" />
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <Label
                     Text="{Binding LockedVerifyText}"
diff --git a/src/App/Pages/Accounts/LoginPage.xaml b/src/App/Pages/Accounts/LoginPage.xaml
index 8d80a610d..340fd0731 100644
--- a/src/App/Pages/Accounts/LoginPage.xaml
+++ b/src/App/Pages/Accounts/LoginPage.xaml
@@ -68,7 +68,9 @@
                         Command="{Binding TogglePasswordCommand}"
                         Grid.Row="0"
                         Grid.Column="1"
-                        Grid.RowSpan="2" />
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
             </StackLayout>
             <StackLayout Padding="10, 0">
diff --git a/src/App/Pages/Accounts/RegisterPage.xaml b/src/App/Pages/Accounts/RegisterPage.xaml
index 98f5a8e50..9cb687b04 100644
--- a/src/App/Pages/Accounts/RegisterPage.xaml
+++ b/src/App/Pages/Accounts/RegisterPage.xaml
@@ -66,7 +66,9 @@
                         Command="{Binding TogglePasswordCommand}"
                         Grid.Row="0"
                         Grid.Column="1"
-                        Grid.RowSpan="2" />
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <Label
                     Text="{u:I18n MasterPasswordDescription}"
@@ -102,7 +104,9 @@
                         Command="{Binding ToggleConfirmPasswordCommand}"
                         Grid.Row="0"
                         Grid.Column="1"
-                        Grid.RowSpan="2" />
+                        Grid.RowSpan="2"
+                        AutomationProperties.IsInAccessibleTree="True"
+                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                 </Grid>
                 <StackLayout StyleClass="box-row">
                     <Label
diff --git a/src/App/Pages/Generator/GeneratorHistoryPage.xaml b/src/App/Pages/Generator/GeneratorHistoryPage.xaml
index 8e74dea42..5080fcad4 100644
--- a/src/App/Pages/Generator/GeneratorHistoryPage.xaml
+++ b/src/App/Pages/Generator/GeneratorHistoryPage.xaml
@@ -84,7 +84,9 @@
                                 CommandParameter="{Binding .}"
                                 Grid.Row="0"
                                 Grid.Column="1"
-                                Grid.RowSpan="2" />
+                                Grid.RowSpan="2"
+                                AutomationProperties.IsInAccessibleTree="True"
+                                AutomationProperties.Name="{u:I18n CopyPassword}" />
                         </Grid>
                     </ViewCell>
                 </DataTemplate>
diff --git a/src/App/Pages/Vault/AddEditPage.xaml b/src/App/Pages/Vault/AddEditPage.xaml
index 80f0236d6..33c746d5f 100644
--- a/src/App/Pages/Vault/AddEditPage.xaml
+++ b/src/App/Pages/Vault/AddEditPage.xaml
@@ -121,21 +121,27 @@
                             Command="{Binding CheckPasswordCommand}"
                             Grid.Row="0"
                             Grid.Column="1"
-                            Grid.RowSpan="2" />
+                            Grid.RowSpan="2"
+                            AutomationProperties.IsInAccessibleTree="True"
+                            AutomationProperties.Name="{u:I18n CheckPassword}" />
                         <controls:FaButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding ShowPasswordIcon}"
                             Command="{Binding TogglePasswordCommand}"
                             Grid.Row="0"
                             Grid.Column="2"
-                            Grid.RowSpan="2" />
+                            Grid.RowSpan="2"
+                            AutomationProperties.IsInAccessibleTree="True"
+                            AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                         <controls:FaButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="&#xf021;"
                             Command="{Binding GeneratePasswordCommand}"
                             Grid.Row="0"
                             Grid.Column="3"
-                            Grid.RowSpan="2" />
+                            Grid.RowSpan="2"
+                            AutomationProperties.IsInAccessibleTree="True"
+                            AutomationProperties.Name="{u:I18n GeneratePassword}" />
                     </Grid>
 
                     <Grid StyleClass="box-row, box-row-input">
@@ -166,7 +172,9 @@
                             Clicked="ScanTotp_Clicked"
                             Grid.Row="0"
                             Grid.Column="1"
-                            Grid.RowSpan="2" />
+                            Grid.RowSpan="2"
+                            AutomationProperties.IsInAccessibleTree="True"
+                            AutomationProperties.Name="{u:I18n ScanQrTitle}" />
                     </Grid>
                 </StackLayout>
                 <StackLayout IsVisible="{Binding IsCard}" Spacing="0" Padding="0">
@@ -249,7 +257,9 @@
                             Command="{Binding ToggleCardCodeCommand}"
                             Grid.Row="0"
                             Grid.Column="1"
-                            Grid.RowSpan="2" />
+                            Grid.RowSpan="2"
+                            AutomationProperties.IsInAccessibleTree="True"
+                            AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                     </Grid>
                 </StackLayout>
                 <StackLayout IsVisible="{Binding IsIdentity}" Spacing="0" Padding="0">
@@ -454,7 +464,9 @@
                                     CommandParameter="{Binding .}"
                                     Grid.Row="0"
                                     Grid.Column="1"
-                                    Grid.RowSpan="2" />
+                                    Grid.RowSpan="2"
+                                    AutomationProperties.IsInAccessibleTree="True"
+                                    AutomationProperties.Name="{u:I18n Options}" />
                             </Grid>
                         </DataTemplate>
                     </controls:RepeaterView.ItemTemplate>
@@ -565,7 +577,9 @@
                                         IsVisible="{Binding IsHiddenType}"
                                         Grid.Row="0"
                                         Grid.Column="1"
-                                        Grid.RowSpan="2" />
+                                        Grid.RowSpan="2"
+                                        AutomationProperties.IsInAccessibleTree="True"
+                                        AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                                     <controls:FaButton 
                                         StyleClass="box-row-button, box-row-button-platform"
                                         Text="&#xf013;"
@@ -573,7 +587,9 @@
                                         CommandParameter="{Binding .}"
                                         Grid.Row="0"
                                         Grid.Column="2"
-                                        Grid.RowSpan="2" />
+                                        Grid.RowSpan="2"
+                                        AutomationProperties.IsInAccessibleTree="True"
+                                        AutomationProperties.Name="{u:I18n Options}" />
                                 </Grid>
                                 <BoxView StyleClass="box-row-separator" IsVisible="{Binding IsBooleanType}" />
                             </StackLayout>
diff --git a/src/App/Pages/Vault/AttachmentsPage.xaml b/src/App/Pages/Vault/AttachmentsPage.xaml
index 937102e62..761fe3b8e 100644
--- a/src/App/Pages/Vault/AttachmentsPage.xaml
+++ b/src/App/Pages/Vault/AttachmentsPage.xaml
@@ -54,7 +54,9 @@
                                         Text="&#xf014;"
                                         Command="{Binding BindingContext.DeleteAttachmentCommand, Source={x:Reference _page}}"
                                         CommandParameter="{Binding .}"
-                                        VerticalOptions="Center" />
+                                        VerticalOptions="Center"
+                                        AutomationProperties.IsInAccessibleTree="True"
+                                        AutomationProperties.Name="{u:I18n Delete}" />
                                 </StackLayout>
                                 <BoxView StyleClass="box-row-separator" />
                             </StackLayout>
diff --git a/src/App/Pages/Vault/PasswordHistoryPage.xaml b/src/App/Pages/Vault/PasswordHistoryPage.xaml
index 0720612f4..b2387d7fc 100644
--- a/src/App/Pages/Vault/PasswordHistoryPage.xaml
+++ b/src/App/Pages/Vault/PasswordHistoryPage.xaml
@@ -75,7 +75,9 @@
                                 CommandParameter="{Binding .}"
                                 Grid.Row="0"
                                 Grid.Column="1"
-                                Grid.RowSpan="2" />
+                                Grid.RowSpan="2"
+                                AutomationProperties.IsInAccessibleTree="True"
+                                AutomationProperties.Name="{u:I18n CopyPassword}" />
                         </Grid>
                     </ViewCell>
                 </DataTemplate>
diff --git a/src/App/Pages/Vault/ViewPage.xaml b/src/App/Pages/Vault/ViewPage.xaml
index be42e1a80..932516742 100644
--- a/src/App/Pages/Vault/ViewPage.xaml
+++ b/src/App/Pages/Vault/ViewPage.xaml
@@ -88,7 +88,9 @@
                                     CommandParameter="LoginUsername"
                                     Grid.Row="0"
                                     Grid.Column="1"
-                                    Grid.RowSpan="2" />
+                                    Grid.RowSpan="2"
+                                    AutomationProperties.IsInAccessibleTree="True"
+                                    AutomationProperties.Name="{u:I18n CopyUsername}" />
                             </Grid>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Login.Username, Converter={StaticResource stringHasValue}}" />
@@ -128,14 +130,18 @@
                                     Command="{Binding CheckPasswordCommand}"
                                     Grid.Row="0"
                                     Grid.Column="1"
-                                    Grid.RowSpan="2" />
+                                    Grid.RowSpan="2"
+                                    AutomationProperties.IsInAccessibleTree="True"
+                                    AutomationProperties.Name="{u:I18n CheckPassword}" />
                                 <controls:FaButton 
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding ShowPasswordIcon}"
                                     Command="{Binding TogglePasswordCommand}"
                                     Grid.Row="0"
                                     Grid.Column="2"
-                                    Grid.RowSpan="2" />
+                                    Grid.RowSpan="2"
+                                    AutomationProperties.IsInAccessibleTree="True"
+                                    AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                                 <controls:FaButton 
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="&#xf0ea;"
@@ -143,7 +149,9 @@
                                     CommandParameter="LoginPassword"
                                     Grid.Row="0"
                                     Grid.Column="3"
-                                    Grid.RowSpan="2" />
+                                    Grid.RowSpan="2"
+                                    AutomationProperties.IsInAccessibleTree="True"
+                                    AutomationProperties.Name="{u:I18n CopyPassword}" />
                             </Grid>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Login.Password, Converter={StaticResource stringHasValue}}" />
@@ -184,7 +192,9 @@
                                     CommandParameter="LoginTotp"
                                     Grid.Row="0"
                                     Grid.Column="2"
-                                    Grid.RowSpan="2" />
+                                    Grid.RowSpan="2"
+                                    AutomationProperties.IsInAccessibleTree="True"
+                                    AutomationProperties.Name="{u:I18n CopyTotp}" />
                             </Grid>
                             <BoxView StyleClass="box-row-separator" IsVisible="{Binding ShowTotp}" />
                         </StackLayout>
@@ -227,7 +237,9 @@
                                     CommandParameter="CardNumber"
                                     Grid.Row="0"
                                     Grid.Column="1"
-                                    Grid.RowSpan="2" />
+                                    Grid.RowSpan="2"
+                                    AutomationProperties.IsInAccessibleTree="True"
+                                    AutomationProperties.Name="{u:I18n CopyNumber}" />
                             </Grid>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Card.Number, Converter={StaticResource stringHasValue}}" />
@@ -287,7 +299,9 @@
                                     Command="{Binding ToggleCardCodeCommand}"
                                     Grid.Row="0"
                                     Grid.Column="1"
-                                    Grid.RowSpan="2" />
+                                    Grid.RowSpan="2"
+                                    AutomationProperties.IsInAccessibleTree="True"
+                                    AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                                 <controls:FaButton 
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="&#xf0ea;"
@@ -295,7 +309,9 @@
                                     CommandParameter="CardCode"
                                     Grid.Row="0"
                                     Grid.Column="2"
-                                    Grid.RowSpan="2" />
+                                    Grid.RowSpan="2"
+                                    AutomationProperties.IsInAccessibleTree="True"
+                                    AutomationProperties.Name="{u:I18n CopySecurityCode}" />
                             </Grid>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Card.Code, Converter={StaticResource stringHasValue}}" />
@@ -461,7 +477,9 @@
                                                 Grid.Row="0"
                                                 Grid.Column="1"
                                                 Grid.RowSpan="2"
-                                                IsVisible="{Binding CanLaunch, Mode=OneWay}" />
+                                                IsVisible="{Binding CanLaunch, Mode=OneWay}"
+                                                AutomationProperties.IsInAccessibleTree="True"
+                                                AutomationProperties.Name="{u:I18n Launch}" />
                                             <controls:FaButton
                                                 StyleClass="box-row-button, box-row-button-platform"
                                                 Text="&#xf0ea;"
@@ -469,7 +487,9 @@
                                                 CommandParameter="{Binding .}"
                                                 Grid.Row="0"
                                                 Grid.Column="2"
-                                                Grid.RowSpan="2" />
+                                                Grid.RowSpan="2"
+                                                AutomationProperties.IsInAccessibleTree="True"
+                                                AutomationProperties.Name="{u:I18n Copy}" />
                                         </Grid>
                                         <BoxView StyleClass="box-row-separator" />
                                     </StackLayout>
@@ -551,7 +571,9 @@
                                                 IsVisible="{Binding IsHiddenType}"
                                                 Grid.Row="0"
                                                 Grid.Column="1"
-                                                Grid.RowSpan="2" />
+                                                Grid.RowSpan="2"
+                                                AutomationProperties.IsInAccessibleTree="True"
+                                                AutomationProperties.Name="{u:I18n ToggleVisibility}" />
                                             <controls:FaButton
                                                 StyleClass="box-row-button, box-row-button-platform"
                                                 Text="&#xf0ea;"
@@ -560,7 +582,9 @@
                                                 IsVisible="{Binding ShowCopyButton}"
                                                 Grid.Row="0"
                                                 Grid.Column="2"
-                                                Grid.RowSpan="2" />
+                                                Grid.RowSpan="2"
+                                                AutomationProperties.IsInAccessibleTree="True"
+                                                AutomationProperties.Name="{u:I18n Copy}" />
                                         </Grid>
                                         <BoxView StyleClass="box-row-separator" />
                                     </StackLayout>
@@ -593,7 +617,9 @@
                                                 Text="&#xf019;"
                                                 Command="{Binding BindingContext.DownloadAttachmentCommand, Source={x:Reference _page}}"
                                                 CommandParameter="{Binding .}"
-                                                VerticalOptions="Center" />
+                                                VerticalOptions="Center"
+                                                AutomationProperties.IsInAccessibleTree="True"
+                                                AutomationProperties.Name="{u:I18n Download}" />
                                         </StackLayout>
                                         <BoxView StyleClass="box-row-separator" />
                                     </StackLayout>
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index e8bda2641..0bd673ffd 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -1248,6 +1248,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Download.
+        /// </summary>
+        public static string Download {
+            get {
+                return ResourceManager.GetString("Download", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Downloading....
         /// </summary>
@@ -3345,6 +3354,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Shared.
+        /// </summary>
+        public static string Shared {
+            get {
+                return ResourceManager.GetString("Shared", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Choose an organization that you wish to share this item with. Sharing transfers ownership of the item to the organization. You will no longer be the direct owner of this item once it has been shared..
         /// </summary>
@@ -3552,6 +3570,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Toggle Visiblity.
+        /// </summary>
+        public static string ToggleVisibility {
+            get {
+                return ResourceManager.GetString("ToggleVisibility", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Tools.
         /// </summary>
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index 35446ef17..c7ce20234 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -1566,4 +1566,13 @@
   <data name="IncludeNumber" xml:space="preserve">
     <value>Include Number</value>
   </data>
+  <data name="Download" xml:space="preserve">
+    <value>Download</value>
+  </data>
+  <data name="Shared" xml:space="preserve">
+    <value>Shared</value>
+  </data>
+  <data name="ToggleVisibility" xml:space="preserve">
+    <value>Toggle Visiblity</value>
+  </data>
 </root>
\ No newline at end of file