close buttons for ios

src/App/Pages/Accounts/EnvironmentPage.xaml

@@ -13,6 +13,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Save}" Clicked="Submit_Clicked" />
     </ContentPage.ToolbarItems>
 

src/App/Pages/Accounts/EnvironmentPage.xaml.cs

@@ -12,6 +12,10 @@ namespace Bit.App.Pages
             InitializeComponent();
             _vm = BindingContext as EnvironmentPageViewModel;
             _vm.Page = this;
+            if(Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
 
             _webVaultEntry.ReturnType = ReturnType.Next;
             _webVaultEntry.ReturnCommand = new Command(() => _apiEntry.Focus());
@@ -28,5 +32,13 @@ namespace Bit.App.Pages
                 await _vm.SubmitAsync();
             }
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Accounts/HintPage.xaml

@@ -13,6 +13,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Submit}" Clicked="Submit_Clicked" />
     </ContentPage.ToolbarItems>
 

src/App/Pages/Accounts/HintPage.xaml.cs

@@ -1,4 +1,5 @@
 using System;
+using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
@@ -11,6 +12,10 @@ namespace Bit.App.Pages
             InitializeComponent();
             _vm = BindingContext as HintPageViewModel;
             _vm.Page = this;
+            if(Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
         }
 
         protected override void OnAppearing()
@@ -26,5 +31,13 @@ namespace Bit.App.Pages
                 await _vm.SubmitAsync();
             }
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Accounts/LoginPage.xaml

@@ -20,6 +20,7 @@
     </ContentPage.Resources>
 
     <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n LogIn}" Clicked="LogIn_Clicked" />
     </ContentPage.ToolbarItems>
 

src/App/Pages/Accounts/LoginPage.xaml.cs

@@ -14,6 +14,10 @@ namespace Bit.App.Pages
             _vm.Page = this;
             _vm.Email = email;
             MasterPasswordEntry = _masterPassword;
+            if(Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
 
             _email.ReturnType = ReturnType.Next;
             _email.ReturnCommand = new Command(() => _masterPassword.Focus());
@@ -50,5 +54,13 @@ namespace Bit.App.Pages
                 Navigation.PushModalAsync(new NavigationPage(new HintPage()));
             }
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Accounts/RegisterPage.xaml

@@ -20,6 +20,7 @@
     </ContentPage.Resources>
 
     <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Submit}" Clicked="Submit_Clicked" />
     </ContentPage.ToolbarItems>
 

src/App/Pages/Accounts/RegisterPage.xaml.cs

@@ -21,6 +21,10 @@ namespace Bit.App.Pages
             };
             MasterPasswordEntry = _masterPassword;
             ConfirmMasterPasswordEntry = _confirmMasterPassword;
+            if(Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
 
             _email.ReturnType = ReturnType.Next;
             _email.ReturnCommand = new Command(() => _masterPassword.Focus());
@@ -46,5 +50,13 @@ namespace Bit.App.Pages
                 await _vm.SubmitAsync();
             }
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Accounts/TwoFactorPage.xaml

@@ -22,6 +22,10 @@
         </ResourceDictionary>
     </ContentPage.Resources>
 
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+    </ContentPage.ToolbarItems>
+
     <ScrollView x:Name="_scrollView">
         <StackLayout Spacing="10" Padding="0, 0, 0, 10" VerticalOptions="FillAndExpand">
             <StackLayout Spacing="20" Padding="0" IsVisible="{Binding TotpMethod, Mode=OneWay}">

src/App/Pages/Accounts/TwoFactorPage.xaml.cs

@@ -24,6 +24,10 @@ namespace Bit.App.Pages
             _vm = BindingContext as TwoFactorPageViewModel;
             _vm.Page = this;
             DuoWebView = _duoWebView;
+            if(Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
         }
 
         public HybridWebView DuoWebView { get; set; }
@@ -126,5 +130,13 @@ namespace Bit.App.Pages
                 await _vm.SendEmailAsync(true, true);
             }
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Generator/GeneratorHistoryPage.xaml

@@ -23,6 +23,7 @@
     </ContentPage.Resources>
 
     <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Clear}"
                      Clicked="Clear_Clicked"
                      Order="Secondary"

src/App/Pages/Generator/GeneratorHistoryPage.xaml.cs

@@ -26,5 +26,13 @@ namespace Bit.App.Pages
         {
             await _vm.ClearAsync();
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Settings/FolderAddEditPage.xaml

@@ -13,6 +13,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" Order="Primary" />
         <ToolbarItem Text="{u:I18n Delete}"
                      Clicked="Delete_Clicked"

src/App/Pages/Settings/FolderAddEditPage.xaml.cs

@@ -1,4 +1,6 @@
-namespace Bit.App.Pages
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
 {
     public partial class FolderAddEditPage : BaseContentPage
     {
@@ -13,10 +15,14 @@
             _vm.FolderId = folderId;
             _vm.Init();
             SetActivityIndicator();
-            if(!_vm.EditMode)
+            if(!_vm.EditMode || Device.RuntimePlatform == Device.iOS)
             {
                 ToolbarItems.Remove(_deleteItem);
             }
+            if(Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
         }
 
         protected override async void OnAppearing()
@@ -47,5 +53,13 @@
                 await _vm.DeleteAsync();
             }
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Settings/FoldersPage.xaml

@@ -16,6 +16,10 @@
         <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" />

src/App/Pages/Settings/FoldersPage.xaml.cs

@@ -21,6 +21,7 @@ namespace Bit.App.Pages
             }
             else
             {
+                ToolbarItems.RemoveAt(0);
                 _fab.Clicked = AddButton_Clicked;
             }
         }
@@ -57,5 +58,13 @@ namespace Bit.App.Pages
                 await Navigation.PushModalAsync(new NavigationPage(page));
             }
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Settings/OptionsPage.xaml

@@ -12,6 +12,10 @@
         <pages:OptionsPageViewModel />
     </ContentPage.BindingContext>
 
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+    </ContentPage.ToolbarItems>
+
     <ScrollView Padding="0, 0, 0, 20">
         <StackLayout Padding="0" Spacing="20">
             <StackLayout StyleClass="box">

src/App/Pages/Settings/OptionsPage.xaml.cs

@@ -21,6 +21,7 @@ namespace Bit.App.Pages
             _clearClipboardPicker.ItemDisplayBinding = new Binding("Value");
             if(Device.RuntimePlatform == Device.Android)
             {
+                ToolbarItems.RemoveAt(0);
                 _vm.ShowAndroidAccessibilitySettings = true;
                 _vm.ShowAndroidAutofillSettings = _deviceActionService.SupportsAutofillService();
                 _themeDescriptionLabel.Text = string.Concat(_themeDescriptionLabel.Text, " ",
@@ -44,5 +45,13 @@ namespace Bit.App.Pages
         {
             await _vm.UpdateAutofillBlacklistedUris();
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Settings/SyncPage.xaml

@@ -7,10 +7,15 @@
     xmlns:u="clr-namespace:Bit.App.Utilities"
     x:DataType="pages:SyncPageViewModel"
     Title="{Binding PageTitle}">
+
     <ContentPage.BindingContext>
         <pages:SyncPageViewModel />
     </ContentPage.BindingContext>
 
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+    </ContentPage.ToolbarItems>
+
     <ScrollView>
         <StackLayout Spacing="10"
                      Padding="10, 5"

src/App/Pages/Settings/SyncPage.xaml.cs

@@ -1,4 +1,5 @@
 using System;
+using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
@@ -11,6 +12,10 @@ namespace Bit.App.Pages
             InitializeComponent();
             _vm = BindingContext as SyncPageViewModel;
             _vm.Page = this;
+            if(Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
         }
 
         protected async override void OnAppearing()
@@ -26,5 +31,13 @@ namespace Bit.App.Pages
                 await _vm.SyncAsync();
             }
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Vault/AddEditPage.xaml

@@ -15,6 +15,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" Order="Primary" />
         <ToolbarItem Text="{u:I18n Attachments}"
                      Clicked="Attachments_Clicked"

src/App/Pages/Vault/AddEditPage.xaml.cs

@@ -46,11 +46,15 @@ namespace Bit.App.Pages
             _vm.DefaultUri = uri ?? appOptions?.Uri;
             _vm.Init();
             SetActivityIndicator();
-            if(!_vm.EditMode)
+            if(!_vm.EditMode || Device.RuntimePlatform == Device.iOS)
             {
                 ToolbarItems.Remove(_attachmentsItem);
                 ToolbarItems.Remove(_deleteItem);
             }
+            if(Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
 
             _typePicker.ItemDisplayBinding = new Binding("Key");
             _cardBrandPicker.ItemDisplayBinding = new Binding("Key");
@@ -233,6 +237,14 @@ namespace Bit.App.Pages
             }
         }
 
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
+
         private async Task ShowAlertsAsync()
         {
             if(!_vm.EditMode)

src/App/Pages/Vault/AttachmentsPage.xaml

@@ -15,6 +15,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" />
     </ContentPage.ToolbarItems>
 

src/App/Pages/Vault/AttachmentsPage.xaml.cs

@@ -18,6 +18,10 @@ namespace Bit.App.Pages
             _vm.Page = this;
             _vm.CipherId = cipherId;
             SetActivityIndicator();
+            if(Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
         }
 
         protected override async void OnAppearing()
@@ -59,5 +63,13 @@ namespace Bit.App.Pages
                 await _vm.ChooseFileAsync();
             }
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Vault/CiphersPage.xaml

@@ -15,6 +15,10 @@
         <pages:CiphersPageViewModel />
     </ContentPage.BindingContext>
 
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+    </ContentPage.ToolbarItems>
+
     <ContentPage.Resources>
         <ResourceDictionary>
             <u:DateTimeConverter x:Key="dateTime" />

src/App/Pages/Vault/CiphersPage.xaml.cs

@@ -40,6 +40,10 @@ namespace Bit.App.Pages
                 _vm.PageTitle = AppResources.SearchVault;
             }
 
+            if(Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
         }
 
@@ -116,5 +120,13 @@ namespace Bit.App.Pages
                 await _vm.SelectCipherAsync(cipher);
             }
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Vault/CollectionsPage.xaml

@@ -14,6 +14,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" />
     </ContentPage.ToolbarItems>
 

src/App/Pages/Vault/CollectionsPage.xaml.cs

@@ -13,6 +13,10 @@ namespace Bit.App.Pages
             _vm.Page = this;
             _vm.CipherId = cipherId;
             SetActivityIndicator();
+            if(Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
         }
 
         protected override async void OnAppearing()
@@ -33,5 +37,13 @@ namespace Bit.App.Pages
                 await _vm.SubmitAsync();
             }
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Vault/PasswordHistoryPage.xaml

@@ -15,6 +15,10 @@
         <pages:PasswordHistoryPageViewModel />
     </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" />

src/App/Pages/Vault/PasswordHistoryPage.xaml.cs

@@ -1,4 +1,5 @@
 using System;
+using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
@@ -13,6 +14,10 @@ namespace Bit.App.Pages
             _vm = BindingContext as PasswordHistoryPageViewModel;
             _vm.Page = this;
             _vm.CipherId = cipherId;
+            if(Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
         }
 
         protected override async void OnAppearing()
@@ -22,5 +27,13 @@ namespace Bit.App.Pages
                 await _vm.InitAsync();
             });
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Vault/ScanPage.xaml

@@ -9,6 +9,10 @@
     x:Name="_page"
     Title="{u:I18n ScanQrTitle}">
 
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
+    </ContentPage.ToolbarItems>
+
     <Grid
         VerticalOptions="FillAndExpand"
         HorizontalOptions="FillAndExpand">

src/App/Pages/Vault/ScanPage.xaml.cs

@@ -21,6 +21,10 @@ namespace Bit.App.Pages
                 PossibleFormats = new List<ZXing.BarcodeFormat> { ZXing.BarcodeFormat.QR_CODE },
                 AutoRotate = false,
             };
+            if(Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
         }
 
         protected override void OnAppearing()
@@ -75,5 +79,13 @@ namespace Bit.App.Pages
             }
             _callback(null);
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Vault/SharePage.xaml

@@ -14,6 +14,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" />
     </ContentPage.ToolbarItems>
 

src/App/Pages/Vault/SharePage.xaml.cs

@@ -13,6 +13,10 @@ namespace Bit.App.Pages
             _vm.Page = this;
             _vm.CipherId = cipherId;
             SetActivityIndicator();
+            if(Device.RuntimePlatform == Device.Android)
+            {
+                ToolbarItems.RemoveAt(0);
+            }
             _organizationPicker.ItemDisplayBinding = new Binding("Key");
         }
 
@@ -34,5 +38,13 @@ namespace Bit.App.Pages
                 await _vm.SubmitAsync();
             }
         }
+
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
     }
 }

src/App/Pages/Vault/ViewPage.xaml

@@ -16,6 +16,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
+        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
         <ToolbarItem Text="{u:I18n Edit}" Clicked="EditToolbarItem_Clicked" Order="Primary" />
         <ToolbarItem Text="{u:I18n Attachments}" Clicked="Attachments_Clicked" Order="Secondary" />
         <ToolbarItem Text="{u:I18n Delete}" Clicked="Delete_Clicked" Order="Secondary" IsDestructive="True" />

src/App/Pages/Vault/ViewPage.xaml.cs

@@ -25,9 +25,12 @@ namespace Bit.App.Pages
             if(Device.RuntimePlatform == Device.iOS)
             {
                 _absLayout.Children.Remove(_fab);
+                ToolbarItems.RemoveAt(2);
+                ToolbarItems.RemoveAt(2);
             }
             else
             {
+                ToolbarItems.RemoveAt(0);
                 ToolbarItems.RemoveAt(0);
                 _fab.Clicked = EditButton_Clicked;
                 _mainLayout.Padding = new Thickness(0, 0, 0, 75);
@@ -142,11 +145,17 @@ namespace Bit.App.Pages
             }
         }
 
+        private async void Close_Clicked(object sender, System.EventArgs e)
+        {
+            if(DoOnce())
+            {
+                await Navigation.PopModalAsync();
+            }
+        }
+
         private void AdjustToolbar()
         {
-            if(Device.RuntimePlatform == Device.Android)
+            if(Device.RuntimePlatform != Device.Android || _vm.Cipher == null)
-            {
-                if(_vm.Cipher == null)
             {
                 return;
             }
@@ -175,4 +184,3 @@ namespace Bit.App.Pages
         }
     }
 }
-}