From c79d1d24b37a5f92fc359b63d8668cfdc2977fa5 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 14 Jun 2019 17:31:06 -0400
Subject: [PATCH] add and more toolbar buttons for ios

---
 src/App/Pages/Settings/FoldersPage.xaml            | 14 +++++++++-----
 src/App/Pages/Settings/FoldersPage.xaml.cs         |  3 ++-
 src/App/Pages/Vault/AddEditPage.xaml.cs            |  5 ++++-
 .../Pages/Vault/GroupingsPage/GroupingsPage.xaml   | 12 ++++++++++--
 .../Vault/GroupingsPage/GroupingsPage.xaml.cs      |  1 +
 src/App/Pages/Vault/ViewPage.xaml                  |  4 +++-
 6 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/App/Pages/Settings/FoldersPage.xaml b/src/App/Pages/Settings/FoldersPage.xaml
index 398ee56b3..d75f67849 100644
--- a/src/App/Pages/Settings/FoldersPage.xaml
+++ b/src/App/Pages/Settings/FoldersPage.xaml
@@ -16,13 +16,15 @@
         <pages:FoldersPageViewModel />
     </ContentPage.BindingContext>
 
-    <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
-    </ContentPage.ToolbarItems>
-
     <ContentPage.Resources>
         <ResourceDictionary>
             <u:InverseBoolConverter x:Key="inverseBool" />
+            <ToolbarItem x:Name="_closeItem" x:Key="closeItem" Text="{u:I18n Close}"
+                         Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+            <ToolbarItem x:Name="_addItem" x:Key="addItem" Icon="plus.png"
+                         Clicked="AddButton_Clicked" Order="Primary"
+                         AutomationProperties.IsInAccessibleTree="True"
+                         AutomationProperties.Name="{u:I18n AddItem}" />
             <StackLayout x:Name="_mainLayout" x:Key="mainLayout">
                 <Label IsVisible="{Binding ShowNoData}"
                        Text="{u:I18n NoFoldersToList}"
@@ -68,7 +70,9 @@
             x:Name="_fab"
             ImageName="plus.png"
             AbsoluteLayout.LayoutFlags="PositionProportional"
-            AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize">
+            AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n AddFolder}">
         </fab:FloatingActionButtonView>
     </AbsoluteLayout>
 
diff --git a/src/App/Pages/Settings/FoldersPage.xaml.cs b/src/App/Pages/Settings/FoldersPage.xaml.cs
index ceae14c21..2ce820e97 100644
--- a/src/App/Pages/Settings/FoldersPage.xaml.cs
+++ b/src/App/Pages/Settings/FoldersPage.xaml.cs
@@ -18,10 +18,11 @@ namespace Bit.App.Pages
             if(Device.RuntimePlatform == Device.iOS)
             {
                 _absLayout.Children.Remove(_fab);
+                ToolbarItems.Add(_closeItem);
+                ToolbarItems.Add(_addItem);
             }
             else
             {
-                ToolbarItems.RemoveAt(0);
                 _fab.Clicked = AddButton_Clicked;
             }
         }
diff --git a/src/App/Pages/Vault/AddEditPage.xaml.cs b/src/App/Pages/Vault/AddEditPage.xaml.cs
index e7f27ec99..974bd58be 100644
--- a/src/App/Pages/Vault/AddEditPage.xaml.cs
+++ b/src/App/Pages/Vault/AddEditPage.xaml.cs
@@ -54,7 +54,10 @@ namespace Bit.App.Pages
             if(Device.RuntimePlatform == Device.iOS)
             {
                 ToolbarItems.Add(_closeItem);
-                ToolbarItems.Add(_moreItem);
+                if(_vm.EditMode)
+                {
+                    ToolbarItems.Add(_moreItem);
+                }
             }
 
             _typePicker.ItemDisplayBinding = new Binding("Key");
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
index 484bc7998..f06cd0f69 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
@@ -16,7 +16,9 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Icon="search.png" Clicked="Search_Clicked" />
+        <ToolbarItem Icon="search.png" Clicked="Search_Clicked"
+                     AutomationProperties.IsInAccessibleTree="True"
+                     AutomationProperties.Name="{u:I18n Search}" />
     </ContentPage.ToolbarItems>
 
     <ContentPage.Resources>
@@ -29,6 +31,10 @@
                          Clicked="Lock_Clicked" Order="Secondary" />
             <ToolbarItem x:Name="_exitItem" x:Key="exitItem" Text="{u:I18n Exit}"
                          Clicked="Exit_Clicked" Order="Secondary" />
+            <ToolbarItem x:Name="_addItem" x:Key="addItem" Icon="plus.png"
+                         Clicked="AddButton_Clicked" Order="Primary"
+                         AutomationProperties.IsInAccessibleTree="True"
+                         AutomationProperties.Name="{u:I18n AddItem}" />
 
             <DataTemplate x:Key="cipherTemplate"
                           x:DataType="pages:GroupingsPageListItem">
@@ -137,7 +143,9 @@
             x:Name="_fab"
             ImageName="plus.png"
             AbsoluteLayout.LayoutFlags="PositionProportional"
-            AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize">
+            AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n AddItem}">
         </fab:FloatingActionButtonView>
     </AbsoluteLayout>
 
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
index 7508f4a89..294a0470c 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
@@ -49,6 +49,7 @@ namespace Bit.App.Pages
             if(Device.RuntimePlatform == Device.iOS)
             {
                 _absLayout.Children.Remove(_fab);
+                ToolbarItems.Add(_addItem);
             }
             else
             {
diff --git a/src/App/Pages/Vault/ViewPage.xaml b/src/App/Pages/Vault/ViewPage.xaml
index 7a345492d..91773a7cd 100644
--- a/src/App/Pages/Vault/ViewPage.xaml
+++ b/src/App/Pages/Vault/ViewPage.xaml
@@ -637,7 +637,9 @@
             x:Name="_fab"
             ImageName="pencil.png"
             AbsoluteLayout.LayoutFlags="PositionProportional"
-            AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize">
+            AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n EditItem}">
         </fab:FloatingActionButtonView>
     </AbsoluteLayout>