bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2026-01-10 12:33:28 +00:00
Code Issues Releases Wiki Activity

close buttons for ios

Browse Source
This commit is contained in:
Kyle Spearrin
2019-06-11 21:31:51 -04:00
parent b6e7db6ecf
commit e05708979d
36 changed files with 271 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/App/Pages/Settings/FolderAddEditPage.xaml
View File

@@ -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"

18
src/App/Pages/Settings/FolderAddEditPage.xaml.cs
View File

@@ -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();
}
}
}
}

4
src/App/Pages/Settings/FoldersPage.xaml
View File

@@ -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" />

9
src/App/Pages/Settings/FoldersPage.xaml.cs
View File

@@ -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();
}
}
}
}

4
src/App/Pages/Settings/OptionsPage.xaml
View File

@@ -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">

9
src/App/Pages/Settings/OptionsPage.xaml.cs
View File

@@ -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();
}
}
}
}

5
src/App/Pages/Settings/SyncPage.xaml
View File

@@ -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"

13
src/App/Pages/Settings/SyncPage.xaml.cs
View File

@@ -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();
}
}
}
}