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

Rename pages

Browse source
This commit is contained in:
Kyle Spearrin 2017-11-27 14:24:47 -05:00
parent 7cff22fb9e
commit 793241523d
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/App/App.csproj
View file

@ -67,7 +67,7 @@
<Compile Include="Abstractions\Services\ISecureStorageService.cs" /> <Compile Include="Abstractions\Services\ISecureStorageService.cs" />
<Compile Include="Abstractions\Services\ISqlService.cs" /> <Compile Include="Abstractions\Services\ISqlService.cs" />
<Compile Include="Constants.cs" /> <Compile Include="Constants.cs" />
<Compile Include="Controls\AddCipherToolbarItem.cs" /> <Compile Include="Controls\AddCipherToolbarItem2.cs" />
<Compile Include="Controls\HybridWebView.cs" /> <Compile Include="Controls\HybridWebView.cs" />
<Compile Include="Controls\ExtendedToolbarItem.cs" /> <Compile Include="Controls\ExtendedToolbarItem.cs" />
<Compile Include="Controls\DismissModalToolBarItem.cs" /> <Compile Include="Controls\DismissModalToolBarItem.cs" />
@ -193,7 +193,7 @@
<Compile Include="Pages\Vault\VaultCustomFieldsPage.cs" /> <Compile Include="Pages\Vault\VaultCustomFieldsPage.cs" />
<Compile Include="Pages\Vault\VaultAutofillListCiphersPage.cs" /> <Compile Include="Pages\Vault\VaultAutofillListCiphersPage.cs" />
<Compile Include="Pages\Vault\VaultAttachmentsPage.cs" /> <Compile Include="Pages\Vault\VaultAttachmentsPage.cs" />
<Compile Include="Pages\Vault\VaultSearchCiphersPage.cs" /> <Compile Include="Pages\Vault\VaultListCiphersPage.cs" />
<Compile Include="Pages\Vault\VaultListGroupingsPage.cs" /> <Compile Include="Pages\Vault\VaultListGroupingsPage.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Abstractions\Repositories\ICipherRepository.cs" /> <Compile Include="Abstractions\Repositories\ICipherRepository.cs" />

4
src/App/Controls/AddCipherToolbarItem.cs → src/App/Controls/AddCipherToolbarItem2.cs
View file

@ -4,9 +4,9 @@ using Xamarin.Forms;
namespace Bit.App.Controls namespace Bit.App.Controls
{ {
public class AddCipherToolbarItem : ExtendedToolbarItem public class AddCipherToolBarItem : ExtendedToolbarItem
{ {
public AddCipherToolbarItem(Page page, string folderId) public AddCipherToolBarItem(Page page, string folderId)
: base(() => Helpers.AddCipher(page, folderId)) : base(() => Helpers.AddCipher(page, folderId))
{ {
Text = AppResources.Add; Text = AppResources.Add;

2
src/App/Pages/MainPage.cs
View file

@ -11,7 +11,7 @@ namespace Bit.App.Pages
TintColor = Color.FromHex("3c8dbc"); TintColor = Color.FromHex("3c8dbc");
var settingsNavigation = new ExtendedNavigationPage(new SettingsPage()); var settingsNavigation = new ExtendedNavigationPage(new SettingsPage());
var favoritesNavigation = new ExtendedNavigationPage(new VaultSearchCiphersPage(favorites: true)); var favoritesNavigation = new ExtendedNavigationPage(new VaultListCiphersPage(favorites: true));
var vaultNavigation = new ExtendedNavigationPage(new VaultListGroupingsPage()); var vaultNavigation = new ExtendedNavigationPage(new VaultListGroupingsPage());
var toolsNavigation = new ExtendedNavigationPage(new ToolsPage()); var toolsNavigation = new ExtendedNavigationPage(new ToolsPage());

2
src/App/Pages/Vault/VaultAutofillListCiphersPage.cs
View file

@ -293,7 +293,7 @@ namespace Bit.App.Pages
{ {
_page.GoogleAnalyticsService.TrackExtensionEvent("CloseToSearch", _page.GoogleAnalyticsService.TrackExtensionEvent("CloseToSearch",
_page.Uri.StartsWith("http") ? "Website" : "App"); _page.Uri.StartsWith("http") ? "Website" : "App");
Application.Current.MainPage = new ExtendedNavigationPage(new VaultSearchCiphersPage(uri: _page.Uri)); Application.Current.MainPage = new ExtendedNavigationPage(new VaultListCiphersPage(uri: _page.Uri));
_page.UserDialogs.Toast(string.Format(AppResources.BitwardenAutofillServiceSearch, _page._name), _page.UserDialogs.Toast(string.Format(AppResources.BitwardenAutofillServiceSearch, _page._name),
TimeSpan.FromSeconds(10)); TimeSpan.FromSeconds(10));
} }

8
src/App/Pages/Vault/VaultSearchCiphersPage.cs → src/App/Pages/Vault/VaultListCiphersPage.cs
View file

@ -15,7 +15,7 @@ using System.Collections.Generic;
namespace Bit.App.Pages namespace Bit.App.Pages
{ {
public class VaultSearchCiphersPage : ExtendedContentPage public class VaultListCiphersPage : ExtendedContentPage
{ {
private readonly ICipherService _cipherService; private readonly ICipherService _cipherService;
private readonly IConnectivity _connectivity; private readonly IConnectivity _connectivity;
@ -33,7 +33,7 @@ namespace Bit.App.Pages
private readonly string _groupingName = null; private readonly string _groupingName = null;
private readonly string _uri = null; private readonly string _uri = null;
public VaultSearchCiphersPage(bool folder = false, string folderId = null, public VaultListCiphersPage(bool folder = false, string folderId = null,
string collectionId = null, string groupingName = null, bool favorites = false, string uri = null) string collectionId = null, string groupingName = null, bool favorites = false, string uri = null)
: base(true) : base(true)
{ {
@ -62,13 +62,13 @@ namespace Bit.App.Pages
public ListView ListView { get; set; } public ListView ListView { get; set; }
public SearchBar Search { get; set; } public SearchBar Search { get; set; }
public StackLayout ResultsStackLayout { get; set; } public StackLayout ResultsStackLayout { get; set; }
private AddCipherToolbarItem AddCipherItem { get; set; } private AddCipherToolBarItem AddCipherItem { get; set; }
private void Init() private void Init()
{ {
if(!string.IsNullOrWhiteSpace(_uri) || _folder || !string.IsNullOrWhiteSpace(_folderId)) if(!string.IsNullOrWhiteSpace(_uri) || _folder || !string.IsNullOrWhiteSpace(_folderId))
{ {
AddCipherItem = new AddCipherToolbarItem(this, _folderId); AddCipherItem = new AddCipherToolBarItem(this, _folderId);
ToolbarItems.Add(AddCipherItem); ToolbarItems.Add(AddCipherItem);
} }

10
src/App/Pages/Vault/VaultListGroupingsPage.cs
View file

@ -56,13 +56,13 @@ namespace Bit.App.Pages
public ListView ListView { get; set; } public ListView ListView { get; set; }
public StackLayout NoDataStackLayout { get; set; } public StackLayout NoDataStackLayout { get; set; }
public ActivityIndicator LoadingIndicator { get; set; } public ActivityIndicator LoadingIndicator { get; set; }
private AddCipherToolbarItem AddCipherItem { get; set; } private AddCipherToolBarItem AddCipherItem { get; set; }
private SearchToolBarItem SearchItem { get; set; } private SearchToolBarItem SearchItem { get; set; }
private void Init() private void Init()
{ {
SearchItem = new SearchToolBarItem(this); SearchItem = new SearchToolBarItem(this);
AddCipherItem = new AddCipherToolbarItem(this, null); AddCipherItem = new AddCipherToolBarItem(this, null);
ToolbarItems.Add(SearchItem); ToolbarItems.Add(SearchItem);
ToolbarItems.Add(AddCipherItem); ToolbarItems.Add(AddCipherItem);
@ -255,11 +255,11 @@ namespace Bit.App.Pages
Page page; Page page;
if(grouping.Folder) if(grouping.Folder)
{ {
page = new VaultSearchCiphersPage(folder: true, folderId: grouping.Id, groupingName: grouping.Name); page = new VaultListCiphersPage(folder: true, folderId: grouping.Id, groupingName: grouping.Name);
} }
else else
{ {
page = new VaultSearchCiphersPage(collectionId: grouping.Id, groupingName: grouping.Name); page = new VaultListCiphersPage(collectionId: grouping.Id, groupingName: grouping.Name);
} }
await Navigation.PushAsync(page); await Navigation.PushAsync(page);
@ -268,7 +268,7 @@ namespace Bit.App.Pages
private async void Search() private async void Search()
{ {
var page = new ExtendedNavigationPage(new VaultSearchCiphersPage()); var page = new ExtendedNavigationPage(new VaultListCiphersPage());
await Navigation.PushModalAsync(page); await Navigation.PushModalAsync(page);
} }