bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-10 21:33:36 +00:00
Code Issues Releases Wiki Activity

Updated to new version of user dialogs with new toast messages

Browse Source
This commit is contained in:
Kyle Spearrin
2016-07-26 00:38:41 -04:00
parent d344354a33
commit 39b7420c52
16 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Android/Android.csproj
View File

@@ -78,11 +78,11 @@
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Acr.UserDialogs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Acr.UserDialogs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Acr.UserDialogs.5.3.0\lib\MonoAndroid10\Acr.UserDialogs.dll</HintPath> <HintPath>..\..\packages\Acr.UserDialogs.6.0.1\lib\MonoAndroid10\Acr.UserDialogs.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Acr.UserDialogs.Interface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Acr.UserDialogs.Interface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Acr.UserDialogs.5.3.0\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll</HintPath> <HintPath>..\..\packages\Acr.UserDialogs.6.0.1\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="AndHUD, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="AndHUD, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">

2
src/Android/packages.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Acr.Support" version="2.1.0" targetFramework="monoandroid60" /> <package id="Acr.Support" version="2.1.0" targetFramework="monoandroid60" />
<package id="Acr.UserDialogs" version="5.3.0" targetFramework="monoandroid60" /> <package id="Acr.UserDialogs" version="6.0.1" targetFramework="monoandroid60" />
<package id="AndHUD" version="1.2.0" targetFramework="monoandroid60" /> <package id="AndHUD" version="1.2.0" targetFramework="monoandroid60" />
<package id="CommonServiceLocator" version="1.3" targetFramework="monoandroid60" /> <package id="CommonServiceLocator" version="1.3" targetFramework="monoandroid60" />
<package id="HockeySDK.Xamarin" version="4.1.0-beta3" targetFramework="monoandroid60" /> <package id="HockeySDK.Xamarin" version="4.1.0-beta3" targetFramework="monoandroid60" />

2
src/App/App.cs
View File

@@ -185,7 +185,7 @@ namespace Bit.App
Current.MainPage = new HomePage(); Current.MainPage = new HomePage();
if(!string.IsNullOrWhiteSpace(logoutMessage)) if(!string.IsNullOrWhiteSpace(logoutMessage))
{ {
_userDialogs.WarnToast("Logged out", logoutMessage); _userDialogs.Toast(logoutMessage);
} }
} }

4
src/App/App.csproj
View File

@@ -189,11 +189,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Acr.UserDialogs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Acr.UserDialogs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Acr.UserDialogs.5.3.0\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.dll</HintPath> <HintPath>..\..\packages\Acr.UserDialogs.6.0.1\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Acr.UserDialogs.Interface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Acr.UserDialogs.Interface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Acr.UserDialogs.5.3.0\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.Interface.dll</HintPath> <HintPath>..\..\packages\Acr.UserDialogs.6.0.1\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.Interface.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="crypto, Version=1.8.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL"> <Reference Include="crypto, Version=1.8.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">

2
src/App/Pages/RegisterPage.cs
View File

@@ -182,7 +182,7 @@ namespace Bit.App.Pages
return; return;
} }
_userDialogs.SuccessToast("Account Created", "Your new account has been created! You may now log in."); _userDialogs.Toast("Your new account has been created! You may now log in.");
await Navigation.PopModalAsync(); await Navigation.PopModalAsync();
} }

2
src/App/Pages/Settings/SettingsAddFolderPage.cs
View File

@@ -79,7 +79,7 @@ namespace Bit.App.Pages
if(saveTask.Result.Succeeded) if(saveTask.Result.Succeeded)
{ {
await Navigation.PopModalAsync(); await Navigation.PopModalAsync();
_userDialogs.SuccessToast(nameCell.Entry.Text, "New folder created."); _userDialogs.Toast("New folder created.");
} }
else if(saveTask.Result.Errors.Count() > 0) else if(saveTask.Result.Errors.Count() > 0)
{ {

4
src/App/Pages/Settings/SettingsEditFolderPage.cs
View File

@@ -92,7 +92,7 @@ namespace Bit.App.Pages
if(saveTask.Result.Succeeded) if(saveTask.Result.Succeeded)
{ {
await Navigation.PopModalAsync(); await Navigation.PopModalAsync();
_userDialogs.SuccessToast(nameCell.Entry.Text, "Folder updated."); _userDialogs.Toast("Folder updated.");
} }
else if(saveTask.Result.Errors.Count() > 0) else if(saveTask.Result.Errors.Count() > 0)
{ {
@@ -137,7 +137,7 @@ namespace Bit.App.Pages
if((await deleteTask).Succeeded) if((await deleteTask).Succeeded)
{ {
await Navigation.PopModalAsync(); await Navigation.PopModalAsync();
_userDialogs.SuccessToast("Folder deleted."); _userDialogs.Toast("Folder deleted.");
} }
} }

4
src/App/Pages/Settings/SettingsSyncPage.cs
View File

@@ -59,11 +59,11 @@ namespace Bit.App.Pages
_userDialogs.HideLoading(); _userDialogs.HideLoading();
if(succeeded) if(succeeded)
{ {
_userDialogs.SuccessToast("Syncing complete."); _userDialogs.Toast("Syncing complete.");
} }
else else
{ {
_userDialogs.ErrorToast("Syncing failed."); _userDialogs.Toast("Syncing failed.");
} }
} }

2
src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs
View File

@@ -150,7 +150,7 @@ namespace Bit.App.Pages
private void CopyPassword() private void CopyPassword()
{ {
_clipboardService.CopyToClipboard(Password.Text); _clipboardService.CopyToClipboard(Password.Text);
_userDialogs.SuccessToast(string.Format(AppResources.ValueHasBeenCopied, AppResources.Password)); _userDialogs.Toast(string.Format(AppResources.ValueHasBeenCopied, AppResources.Password));
} }
// TODO: move to standalone reusable control // TODO: move to standalone reusable control

4
src/App/Pages/Vault/VaultAddSitePage.cs
View File

@@ -137,7 +137,7 @@ namespace Bit.App.Pages
if(saveTask.Result.Succeeded) if(saveTask.Result.Succeeded)
{ {
await Navigation.PopModalAsync(); await Navigation.PopModalAsync();
_userDialogs.SuccessToast(nameCell.Entry.Text, "New site created."); _userDialogs.Toast("New site created.");
} }
else if(saveTask.Result.Errors.Count() > 0) else if(saveTask.Result.Errors.Count() > 0)
{ {
@@ -164,7 +164,7 @@ namespace Bit.App.Pages
var page = new ToolsPasswordGeneratorPage((password) => var page = new ToolsPasswordGeneratorPage((password) =>
{ {
PasswordCell.Entry.Text = password; PasswordCell.Entry.Text = password;
_userDialogs.SuccessToast("Password generated."); _userDialogs.Toast("Password generated.");
}); });
Navigation.PushModalAsync(new ExtendedNavigationPage(page)); Navigation.PushModalAsync(new ExtendedNavigationPage(page));
} }

6
src/App/Pages/Vault/VaultEditSitePage.cs
View File

@@ -172,7 +172,7 @@ namespace Bit.App.Pages
if(saveTask.Result.Succeeded) if(saveTask.Result.Succeeded)
{ {
await Navigation.PopModalAsync(); await Navigation.PopModalAsync();
_userDialogs.SuccessToast(nameCell.Entry.Text, "Site updated."); _userDialogs.Toast("Site updated.");
} }
else if(saveTask.Result.Errors.Count() > 0) else if(saveTask.Result.Errors.Count() > 0)
{ {
@@ -205,7 +205,7 @@ namespace Bit.App.Pages
var page = new ToolsPasswordGeneratorPage((password) => var page = new ToolsPasswordGeneratorPage((password) =>
{ {
PasswordCell.Entry.Text = password; PasswordCell.Entry.Text = password;
_userDialogs.SuccessToast("Password generated."); _userDialogs.Toast("Password generated.");
}); });
await Navigation.PushModalAsync(new ExtendedNavigationPage(page)); await Navigation.PushModalAsync(new ExtendedNavigationPage(page));
} }
@@ -231,7 +231,7 @@ namespace Bit.App.Pages
if((await deleteTask).Succeeded) if((await deleteTask).Succeeded)
{ {
await Navigation.PopModalAsync(); await Navigation.PopModalAsync();
_userDialogs.SuccessToast("Site deleted."); _userDialogs.Toast("Site deleted.");
} }
} }

4
src/App/Pages/Vault/VaultListSitesPage.cs
View File

@@ -279,7 +279,7 @@ namespace Bit.App.Pages
private void Copy(string copyText, string alertLabel) private void Copy(string copyText, string alertLabel)
{ {
_clipboardService.CopyToClipboard(copyText); _clipboardService.CopyToClipboard(copyText);
_userDialogs.SuccessToast(string.Format(AppResources.ValueHasBeenCopied, alertLabel)); _userDialogs.Toast(string.Format(AppResources.ValueHasBeenCopied, alertLabel));
} }
private async void DeleteClickedAsync(object sender, EventArgs e) private async void DeleteClickedAsync(object sender, EventArgs e)
@@ -298,7 +298,7 @@ namespace Bit.App.Pages
var folder = PresentationFolders.Single(f => f.Id == site.FolderId); var folder = PresentationFolders.Single(f => f.Id == site.FolderId);
var siteIndex = folder.Select((s, i) => new { s, i }).First(s => s.s.Id == site.Id).i; var siteIndex = folder.Select((s, i) => new { s, i }).First(s => s.s.Id == site.Id).i;
folder.RemoveAt(siteIndex); folder.RemoveAt(siteIndex);
_userDialogs.SuccessToast(AppResources.SiteDeleted); _userDialogs.Toast(AppResources.SiteDeleted);
} }
else if(deleteCall.Errors.Count() > 0) else if(deleteCall.Errors.Count() > 0)
{ {

2
src/App/Pages/Vault/VaultViewSitePage.cs
View File

@@ -162,7 +162,7 @@ namespace Bit.App.Pages
private void Copy(string copyText, string alertLabel) private void Copy(string copyText, string alertLabel)
{ {
_clipboardService.CopyToClipboard(copyText); _clipboardService.CopyToClipboard(copyText);
_userDialogs.SuccessToast(string.Format(AppResources.ValueHasBeenCopied, alertLabel)); _userDialogs.Toast(string.Format(AppResources.ValueHasBeenCopied, alertLabel));
} }
private class EditSiteToolBarItem : ToolbarItem private class EditSiteToolBarItem : ToolbarItem

2
src/App/packages.config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Acr.UserDialogs" version="5.3.0" targetFramework="portable45-net45+win8+wpa81" /> <package id="Acr.UserDialogs" version="6.0.1" targetFramework="portable45-net45+win8+wpa81" />
<package id="CommonServiceLocator" version="1.3" targetFramework="portable45-net45+win8+wpa81" /> <package id="CommonServiceLocator" version="1.3" targetFramework="portable45-net45+win8+wpa81" />
<package id="HockeySDK.Xamarin" version="4.1.0-beta3" targetFramework="portable45-net45+win8+wpa81" /> <package id="HockeySDK.Xamarin" version="4.1.0-beta3" targetFramework="portable45-net45+win8+wpa81" />
<package id="modernhttpclient" version="2.4.2" targetFramework="portable45-net45+win8+wpa81" /> <package id="modernhttpclient" version="2.4.2" targetFramework="portable45-net45+win8+wpa81" />

4
src/iOS/iOS.csproj
View File

@@ -144,11 +144,11 @@
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Acr.UserDialogs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Acr.UserDialogs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Acr.UserDialogs.5.3.0\lib\Xamarin.iOS10\Acr.UserDialogs.dll</HintPath> <HintPath>..\..\packages\Acr.UserDialogs.6.0.1\lib\Xamarin.iOS10\Acr.UserDialogs.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Acr.UserDialogs.Interface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Acr.UserDialogs.Interface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Acr.UserDialogs.5.3.0\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll</HintPath> <HintPath>..\..\packages\Acr.UserDialogs.6.0.1\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="BTProgressHUD, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="BTProgressHUD, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

2
src/iOS/packages.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Acr.Support" version="2.1.0" targetFramework="xamarinios10" /> <package id="Acr.Support" version="2.1.0" targetFramework="xamarinios10" />
<package id="Acr.UserDialogs" version="5.3.0" targetFramework="xamarinios10" /> <package id="Acr.UserDialogs" version="6.0.1" targetFramework="xamarinios10" />
<package id="BTProgressHUD" version="1.2.0.3" targetFramework="xamarinios10" /> <package id="BTProgressHUD" version="1.2.0.3" targetFramework="xamarinios10" />
<package id="CommonServiceLocator" version="1.3" targetFramework="xamarinios10" /> <package id="CommonServiceLocator" version="1.3" targetFramework="xamarinios10" />
<package id="HockeySDK.Xamarin" version="4.1.0-beta3" targetFramework="xamarinios10" /> <package id="HockeySDK.Xamarin" version="4.1.0-beta3" targetFramework="xamarinios10" />