diff --git a/src/App/Pages/Settings/FolderAddEditPage.xaml b/src/App/Pages/Settings/FolderAddEditPage.xaml index 493799831..3def4df89 100644 --- a/src/App/Pages/Settings/FolderAddEditPage.xaml +++ b/src/App/Pages/Settings/FolderAddEditPage.xaml @@ -21,6 +21,15 @@ IsDestructive="True" x:Name="_deleteItem" /> + + + + + + diff --git a/src/App/Pages/Settings/FolderAddEditPage.xaml.cs b/src/App/Pages/Settings/FolderAddEditPage.xaml.cs index 81cd54b16..f835e64c7 100644 --- a/src/App/Pages/Settings/FolderAddEditPage.xaml.cs +++ b/src/App/Pages/Settings/FolderAddEditPage.xaml.cs @@ -1,4 +1,6 @@ -using Xamarin.Forms; +using Bit.App.Resources; +using System.Collections.Generic; +using Xamarin.Forms; namespace Bit.App.Pages { @@ -19,6 +21,10 @@ namespace Bit.App.Pages { ToolbarItems.Remove(_deleteItem); } + if(_vm.EditMode && Device.RuntimePlatform == Device.iOS) + { + ToolbarItems.Add(_moreItem); + } if(Device.RuntimePlatform == Device.Android) { ToolbarItems.RemoveAt(0); @@ -61,5 +67,20 @@ namespace Bit.App.Pages await Navigation.PopModalAsync(); } } + + private async void More_Clicked(object sender, System.EventArgs e) + { + if(!DoOnce()) + { + return; + } + var options = new List { }; + var selection = await DisplayActionSheet(AppResources.Options, AppResources.Cancel, + _vm.EditMode ? AppResources.Delete : null, options.ToArray()); + if(selection == AppResources.Delete) + { + await _vm.DeleteAsync(); + } + } } } diff --git a/src/App/Pages/Settings/FoldersPageViewModel.cs b/src/App/Pages/Settings/FoldersPageViewModel.cs index 48097988d..7f6a75182 100644 --- a/src/App/Pages/Settings/FoldersPageViewModel.cs +++ b/src/App/Pages/Settings/FoldersPageViewModel.cs @@ -10,14 +10,12 @@ namespace Bit.App.Pages { public class FoldersPageViewModel : BaseViewModel { - private readonly IPlatformUtilsService _platformUtilsService; private readonly IFolderService _folderService; private bool _showNoData; public FoldersPageViewModel() { - _platformUtilsService = ServiceContainer.Resolve("platformUtilsService"); _folderService = ServiceContainer.Resolve("folderService"); PageTitle = AppResources.Folders;