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

move settings pages to modals instead of navigation pages

Browse source
This commit is contained in:
Kyle Spearrin 2017-02-08 19:18:34 -05:00
parent a429dcf978
commit 230722945e
6 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/App/Pages/Settings/SettingsAboutPage.cs
View file

@ -74,6 +74,11 @@ namespace Bit.App.Pages
Spacing = 0 Spacing = 0
}; };
if(Device.OS == TargetPlatform.iOS)
{
ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel));
}
Title = AppResources.About; Title = AppResources.About;
Content = new ScrollView { Content = stackLayout }; Content = new ScrollView { Content = stackLayout };
} }

5
src/App/Pages/Settings/SettingsHelpPage.cs
View file

@ -104,6 +104,11 @@ namespace Bit.App.Pages
bugLabel.WidthRequest = stackLayout.Bounds.Width - bugLabel.Bounds.Left * 2; bugLabel.WidthRequest = stackLayout.Bounds.Width - bugLabel.Bounds.Left * 2;
}; };
if(Device.OS == TargetPlatform.iOS)
{
ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel));
}
Title = AppResources.HelpAndFeedback; Title = AppResources.HelpAndFeedback;
Content = new ScrollView { Content = stackLayout }; Content = new ScrollView { Content = stackLayout };
} }

5
src/App/Pages/Settings/SettingsListFoldersPage.cs
View file

@ -38,6 +38,11 @@ namespace Bit.App.Pages
listView.ItemSelected += FolderSelected; listView.ItemSelected += FolderSelected;
listView.ItemTemplate = new DataTemplate(() => new SettingsFolderListViewCell(this)); listView.ItemTemplate = new DataTemplate(() => new SettingsFolderListViewCell(this));
if(Device.OS == TargetPlatform.iOS)
{
ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel));
}
Title = AppResources.Folders; Title = AppResources.Folders;
Content = listView; Content = listView;
} }

13
src/App/Pages/Settings/SettingsPage.cs
View file

@ -244,12 +244,12 @@ namespace Bit.App.Pages
private void SyncCell_Tapped(object sender, EventArgs e) private void SyncCell_Tapped(object sender, EventArgs e)
{ {
Navigation.PushAsync(new SettingsSyncPage()); Navigation.PushModalAsync(new ExtendedNavigationPage(new SettingsSyncPage()));
} }
private void AboutCell_Tapped(object sender, EventArgs e) private void AboutCell_Tapped(object sender, EventArgs e)
{ {
Navigation.PushAsync(new SettingsAboutPage()); Navigation.PushModalAsync(new ExtendedNavigationPage(new SettingsAboutPage()));
} }
private void RateCell_Tapped(object sender, EventArgs e) private void RateCell_Tapped(object sender, EventArgs e)
@ -268,7 +268,7 @@ namespace Bit.App.Pages
private void HelpCell_Tapped(object sender, EventArgs e) private void HelpCell_Tapped(object sender, EventArgs e)
{ {
Navigation.PushAsync(new SettingsHelpPage()); Navigation.PushModalAsync(new ExtendedNavigationPage(new SettingsHelpPage()));
} }
private void LockCell_Tapped(object sender, EventArgs e) private void LockCell_Tapped(object sender, EventArgs e)
@ -342,7 +342,7 @@ namespace Bit.App.Pages
cell.On = false; cell.On = false;
var pinPage = new SettingsPinPage(); var pinPage = new SettingsPinPage();
pinPage.OnPinEntered += PinEntered; pinPage.OnPinEntered += PinEntered;
Navigation.PushAsync(pinPage); Navigation.PushModalAsync(new ExtendedNavigationPage(pinPage));
} }
else if(!cell.On) else if(!cell.On)
{ {
@ -353,7 +353,8 @@ namespace Bit.App.Pages
private void PinEntered(object sender, EventArgs args) private void PinEntered(object sender, EventArgs args)
{ {
var page = sender as SettingsPinPage; var page = sender as SettingsPinPage;
page.Navigation.PopAsync(); page.PinControl.Entry.Unfocus();
page.Navigation.PopModalAsync();
_authService.PIN = page.Model.PIN; _authService.PIN = page.Model.PIN;
@ -369,7 +370,7 @@ namespace Bit.App.Pages
private void FoldersCell_Tapped(object sender, EventArgs e) private void FoldersCell_Tapped(object sender, EventArgs e)
{ {
Navigation.PushAsync(new SettingsListFoldersPage()); Navigation.PushModalAsync(new ExtendedNavigationPage(new SettingsListFoldersPage()));
} }
private string GetLockOptionsDetailsText() private string GetLockOptionsDetailsText()

5
src/App/Pages/Settings/SettingsPinPage.cs
View file

@ -56,6 +56,11 @@ namespace Bit.App.Pages
PinControl.Label.GestureRecognizers.Add(tgr); PinControl.Label.GestureRecognizers.Add(tgr);
instructionLabel.GestureRecognizers.Add(tgr); instructionLabel.GestureRecognizers.Add(tgr);
if(Device.OS == TargetPlatform.iOS)
{
ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel));
}
Title = AppResources.SetPIN; Title = AppResources.SetPIN;
Content = stackLayout; Content = stackLayout;
Content.GestureRecognizers.Add(tgr); Content.GestureRecognizers.Add(tgr);

5
src/App/Pages/Settings/SettingsSyncPage.cs
View file

@ -57,6 +57,11 @@ namespace Bit.App.Pages
Padding = new Thickness(15, 0) Padding = new Thickness(15, 0)
}; };
if(Device.OS == TargetPlatform.iOS)
{
ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel));
}
Title = AppResources.Sync; Title = AppResources.Sync;
Content = stackLayout; Content = stackLayout;
} }