From 39b7420c52e270c2c1d774e185792ec53e6fe081 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 26 Jul 2016 00:38:41 -0400 Subject: [PATCH] Updated to new version of user dialogs with new toast messages --- src/Android/Android.csproj | 4 ++-- src/Android/packages.config | 2 +- src/App/App.cs | 2 +- src/App/App.csproj | 4 ++-- src/App/Pages/RegisterPage.cs | 2 +- src/App/Pages/Settings/SettingsAddFolderPage.cs | 2 +- src/App/Pages/Settings/SettingsEditFolderPage.cs | 4 ++-- src/App/Pages/Settings/SettingsSyncPage.cs | 4 ++-- src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs | 2 +- src/App/Pages/Vault/VaultAddSitePage.cs | 4 ++-- src/App/Pages/Vault/VaultEditSitePage.cs | 6 +++--- src/App/Pages/Vault/VaultListSitesPage.cs | 4 ++-- src/App/Pages/Vault/VaultViewSitePage.cs | 2 +- src/App/packages.config | 2 +- src/iOS/iOS.csproj | 4 ++-- src/iOS/packages.config | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index 4ea623334..476892aaa 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -78,11 +78,11 @@ True - ..\..\packages\Acr.UserDialogs.5.3.0\lib\MonoAndroid10\Acr.UserDialogs.dll + ..\..\packages\Acr.UserDialogs.6.0.1\lib\MonoAndroid10\Acr.UserDialogs.dll True - ..\..\packages\Acr.UserDialogs.5.3.0\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll + ..\..\packages\Acr.UserDialogs.6.0.1\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll True diff --git a/src/Android/packages.config b/src/Android/packages.config index 8b0cb6093..540bfeb3c 100644 --- a/src/Android/packages.config +++ b/src/Android/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/App/App.cs b/src/App/App.cs index 5f8936185..7f0180b0a 100644 --- a/src/App/App.cs +++ b/src/App/App.cs @@ -185,7 +185,7 @@ namespace Bit.App Current.MainPage = new HomePage(); if(!string.IsNullOrWhiteSpace(logoutMessage)) { - _userDialogs.WarnToast("Logged out", logoutMessage); + _userDialogs.Toast(logoutMessage); } } diff --git a/src/App/App.csproj b/src/App/App.csproj index 226a8595f..f44492b9e 100644 --- a/src/App/App.csproj +++ b/src/App/App.csproj @@ -189,11 +189,11 @@ - ..\..\packages\Acr.UserDialogs.5.3.0\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.dll + ..\..\packages\Acr.UserDialogs.6.0.1\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.dll True - ..\..\packages\Acr.UserDialogs.5.3.0\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.Interface.dll + ..\..\packages\Acr.UserDialogs.6.0.1\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.Interface.dll True diff --git a/src/App/Pages/RegisterPage.cs b/src/App/Pages/RegisterPage.cs index 1cc6183e2..4744ecc3a 100644 --- a/src/App/Pages/RegisterPage.cs +++ b/src/App/Pages/RegisterPage.cs @@ -182,7 +182,7 @@ namespace Bit.App.Pages 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(); } diff --git a/src/App/Pages/Settings/SettingsAddFolderPage.cs b/src/App/Pages/Settings/SettingsAddFolderPage.cs index 0c582ca0f..596a9e15e 100644 --- a/src/App/Pages/Settings/SettingsAddFolderPage.cs +++ b/src/App/Pages/Settings/SettingsAddFolderPage.cs @@ -79,7 +79,7 @@ namespace Bit.App.Pages if(saveTask.Result.Succeeded) { await Navigation.PopModalAsync(); - _userDialogs.SuccessToast(nameCell.Entry.Text, "New folder created."); + _userDialogs.Toast("New folder created."); } else if(saveTask.Result.Errors.Count() > 0) { diff --git a/src/App/Pages/Settings/SettingsEditFolderPage.cs b/src/App/Pages/Settings/SettingsEditFolderPage.cs index 6e22f43fa..0205540a5 100644 --- a/src/App/Pages/Settings/SettingsEditFolderPage.cs +++ b/src/App/Pages/Settings/SettingsEditFolderPage.cs @@ -92,7 +92,7 @@ namespace Bit.App.Pages if(saveTask.Result.Succeeded) { await Navigation.PopModalAsync(); - _userDialogs.SuccessToast(nameCell.Entry.Text, "Folder updated."); + _userDialogs.Toast("Folder updated."); } else if(saveTask.Result.Errors.Count() > 0) { @@ -137,7 +137,7 @@ namespace Bit.App.Pages if((await deleteTask).Succeeded) { await Navigation.PopModalAsync(); - _userDialogs.SuccessToast("Folder deleted."); + _userDialogs.Toast("Folder deleted."); } } diff --git a/src/App/Pages/Settings/SettingsSyncPage.cs b/src/App/Pages/Settings/SettingsSyncPage.cs index b2efb147c..0343a620a 100644 --- a/src/App/Pages/Settings/SettingsSyncPage.cs +++ b/src/App/Pages/Settings/SettingsSyncPage.cs @@ -59,11 +59,11 @@ namespace Bit.App.Pages _userDialogs.HideLoading(); if(succeeded) { - _userDialogs.SuccessToast("Syncing complete."); + _userDialogs.Toast("Syncing complete."); } else { - _userDialogs.ErrorToast("Syncing failed."); + _userDialogs.Toast("Syncing failed."); } } diff --git a/src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs b/src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs index 6a6862e75..2061acaa7 100644 --- a/src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs +++ b/src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs @@ -150,7 +150,7 @@ namespace Bit.App.Pages private void CopyPassword() { _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 diff --git a/src/App/Pages/Vault/VaultAddSitePage.cs b/src/App/Pages/Vault/VaultAddSitePage.cs index da80e19b3..6e559dce7 100644 --- a/src/App/Pages/Vault/VaultAddSitePage.cs +++ b/src/App/Pages/Vault/VaultAddSitePage.cs @@ -137,7 +137,7 @@ namespace Bit.App.Pages if(saveTask.Result.Succeeded) { await Navigation.PopModalAsync(); - _userDialogs.SuccessToast(nameCell.Entry.Text, "New site created."); + _userDialogs.Toast("New site created."); } else if(saveTask.Result.Errors.Count() > 0) { @@ -164,7 +164,7 @@ namespace Bit.App.Pages var page = new ToolsPasswordGeneratorPage((password) => { PasswordCell.Entry.Text = password; - _userDialogs.SuccessToast("Password generated."); + _userDialogs.Toast("Password generated."); }); Navigation.PushModalAsync(new ExtendedNavigationPage(page)); } diff --git a/src/App/Pages/Vault/VaultEditSitePage.cs b/src/App/Pages/Vault/VaultEditSitePage.cs index 0636db62c..3911ea2bd 100644 --- a/src/App/Pages/Vault/VaultEditSitePage.cs +++ b/src/App/Pages/Vault/VaultEditSitePage.cs @@ -172,7 +172,7 @@ namespace Bit.App.Pages if(saveTask.Result.Succeeded) { await Navigation.PopModalAsync(); - _userDialogs.SuccessToast(nameCell.Entry.Text, "Site updated."); + _userDialogs.Toast("Site updated."); } else if(saveTask.Result.Errors.Count() > 0) { @@ -205,7 +205,7 @@ namespace Bit.App.Pages var page = new ToolsPasswordGeneratorPage((password) => { PasswordCell.Entry.Text = password; - _userDialogs.SuccessToast("Password generated."); + _userDialogs.Toast("Password generated."); }); await Navigation.PushModalAsync(new ExtendedNavigationPage(page)); } @@ -231,7 +231,7 @@ namespace Bit.App.Pages if((await deleteTask).Succeeded) { await Navigation.PopModalAsync(); - _userDialogs.SuccessToast("Site deleted."); + _userDialogs.Toast("Site deleted."); } } diff --git a/src/App/Pages/Vault/VaultListSitesPage.cs b/src/App/Pages/Vault/VaultListSitesPage.cs index 3da7869dc..3f6ece2f0 100644 --- a/src/App/Pages/Vault/VaultListSitesPage.cs +++ b/src/App/Pages/Vault/VaultListSitesPage.cs @@ -279,7 +279,7 @@ namespace Bit.App.Pages private void Copy(string copyText, string alertLabel) { _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) @@ -298,7 +298,7 @@ namespace Bit.App.Pages 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; folder.RemoveAt(siteIndex); - _userDialogs.SuccessToast(AppResources.SiteDeleted); + _userDialogs.Toast(AppResources.SiteDeleted); } else if(deleteCall.Errors.Count() > 0) { diff --git a/src/App/Pages/Vault/VaultViewSitePage.cs b/src/App/Pages/Vault/VaultViewSitePage.cs index c7d12a201..7ee3a969f 100644 --- a/src/App/Pages/Vault/VaultViewSitePage.cs +++ b/src/App/Pages/Vault/VaultViewSitePage.cs @@ -162,7 +162,7 @@ namespace Bit.App.Pages private void Copy(string copyText, string alertLabel) { _clipboardService.CopyToClipboard(copyText); - _userDialogs.SuccessToast(string.Format(AppResources.ValueHasBeenCopied, alertLabel)); + _userDialogs.Toast(string.Format(AppResources.ValueHasBeenCopied, alertLabel)); } private class EditSiteToolBarItem : ToolbarItem diff --git a/src/App/packages.config b/src/App/packages.config index 011b498d9..f59af8599 100644 --- a/src/App/packages.config +++ b/src/App/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/iOS/iOS.csproj b/src/iOS/iOS.csproj index 534ca694c..cfdf978a1 100644 --- a/src/iOS/iOS.csproj +++ b/src/iOS/iOS.csproj @@ -144,11 +144,11 @@ True - ..\..\packages\Acr.UserDialogs.5.3.0\lib\Xamarin.iOS10\Acr.UserDialogs.dll + ..\..\packages\Acr.UserDialogs.6.0.1\lib\Xamarin.iOS10\Acr.UserDialogs.dll True - ..\..\packages\Acr.UserDialogs.5.3.0\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll + ..\..\packages\Acr.UserDialogs.6.0.1\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll True diff --git a/src/iOS/packages.config b/src/iOS/packages.config index b6ddaebd7..e2c0e10d7 100644 --- a/src/iOS/packages.config +++ b/src/iOS/packages.config @@ -1,7 +1,7 @@  - +