mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-25 02:18:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

no options during selection mode

Browse source
This commit is contained in:
Kyle Spearrin 2019-06-24 15:22:46 -04:00
parent 45fbdb8411
commit 94fbf627ba
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App/Pages/Generator/GeneratorPage.xaml
View file

@ -15,6 +15,8 @@
<ContentPage.Resources> <ContentPage.Resources>
<ResourceDictionary> <ResourceDictionary>
<u:InverseBoolConverter x:Key="inverseBool" /> <u:InverseBoolConverter x:Key="inverseBool" />
<ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
x:Name="_closeItem" x:Key="closeItem" />
<ToolbarItem Text="{u:I18n Select}" <ToolbarItem Text="{u:I18n Select}"
Clicked="Select_Clicked" Clicked="Select_Clicked"
Order="Primary" Order="Primary"

15
src/App/Pages/Generator/GeneratorPage.xaml.cs
View file

@ -22,8 +22,14 @@ namespace Bit.App.Pages
_selectAction = selectAction; _selectAction = selectAction;
if(selectAction != null) if(selectAction != null)
{ {
if(Device.RuntimePlatform == Device.iOS)
{
ToolbarItems.Add(_closeItem);
}
ToolbarItems.Add(_selectItem); ToolbarItems.Add(_selectItem);
} }
else
{
if(Device.RuntimePlatform == Device.iOS) if(Device.RuntimePlatform == Device.iOS)
{ {
ToolbarItems.Add(_moreItem); ToolbarItems.Add(_moreItem);
@ -33,6 +39,7 @@ namespace Bit.App.Pages
ToolbarItems.Add(_historyItem); ToolbarItems.Add(_historyItem);
} }
} }
}
public async Task InitAsync() public async Task InitAsync()
{ {
@ -98,5 +105,13 @@ namespace Bit.App.Pages
{ {
await _vm.SliderChangedAsync(); await _vm.SliderChangedAsync();
} }
private async void Close_Clicked(object sender, EventArgs e)
{
if(DoOnce())
{
await Navigation.PopModalAsync();
}
}
} }
} }