mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-01-11 18:57:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

cleanup search page for ios

Browse source
This commit is contained in:
Kyle Spearrin 2019-06-14 17:40:21 -04:00
parent c79d1d24b3
commit 77314d4b8d
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/App/Pages/Vault/CiphersPage.xaml
View file

@ -15,13 +15,11 @@
<pages:CiphersPageViewModel /> <pages:CiphersPageViewModel />
</ContentPage.BindingContext> </ContentPage.BindingContext>
<ContentPage.ToolbarItems>
<ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
</ContentPage.ToolbarItems>
<ContentPage.Resources> <ContentPage.Resources>
<ResourceDictionary> <ResourceDictionary>
<u:DateTimeConverter x:Key="dateTime" /> <u:DateTimeConverter x:Key="dateTime" />
<ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
x:Name="_closeItem" x:Key="closeItem" />
</ResourceDictionary> </ResourceDictionary>
</ContentPage.Resources> </ContentPage.Resources>
@ -31,12 +29,14 @@
VerticalOptions="FillAndExpand" VerticalOptions="FillAndExpand"
HorizontalOptions="FillAndExpand" HorizontalOptions="FillAndExpand"
Spacing="0" Spacing="0"
Padding="0"> Padding="0"
x:Name="_titleLayout">
<controls:MiButton <controls:MiButton
StyleClass="btn-title, btn-title-platform" StyleClass="btn-title, btn-title-platform"
Text="&#xe5c4;" Text="&#xe5c4;"
VerticalOptions="CenterAndExpand" VerticalOptions="CenterAndExpand"
Clicked="BackButton_Clicked" /> Clicked="BackButton_Clicked"
x:Name="_backButton" />
<SearchBar <SearchBar
x:Name="_searchBar" x:Name="_searchBar"
HorizontalOptions="FillAndExpand" HorizontalOptions="FillAndExpand"

12
src/App/Pages/Vault/CiphersPage.xaml.cs
View file

@ -40,9 +40,10 @@ namespace Bit.App.Pages
_vm.PageTitle = AppResources.SearchVault; _vm.PageTitle = AppResources.SearchVault;
} }
if(Device.RuntimePlatform == Device.Android) if(Device.RuntimePlatform == Device.iOS)
{ {
ToolbarItems.RemoveAt(0); ToolbarItems.Add(_closeItem);
_titleLayout.Children.Remove(_backButton);
} }
_deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService"); _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
} }
@ -121,12 +122,9 @@ namespace Bit.App.Pages
} }
} }
private async void Close_Clicked(object sender, System.EventArgs e) private void Close_Clicked(object sender, EventArgs e)
{ {
if(DoOnce()) GoBack();
{
await Navigation.PopModalAsync();
}
} }
} }
} }