diff --git a/Project2FA.UWP/Package.appxmanifest b/Project2FA.UWP/Package.appxmanifest index d3f75a5b..08050d06 100644 --- a/Project2FA.UWP/Package.appxmanifest +++ b/Project2FA.UWP/Package.appxmanifest @@ -4,10 +4,10 @@ xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp rescap"> - - + + - 2fast – Two Factor Authenticator Supporting TOTP + 2fast (Beta) Jan Philipp Weber Assets\StoreLogo.png @@ -19,7 +19,7 @@ - + diff --git a/Project2FA.UWP/Services/DataService.cs b/Project2FA.UWP/Services/DataService.cs index 433f4c7c..cddd3924 100644 --- a/Project2FA.UWP/Services/DataService.cs +++ b/Project2FA.UWP/Services/DataService.cs @@ -10,7 +10,6 @@ using System.Collections.Specialized; using OtpNet; using Windows.UI.Xaml.Controls; -using Template10.Services.Dialog; using Prism.Commands; using Prism.Logging; using Project2FA.Core.Utils; @@ -32,6 +31,7 @@ using Project2FA.UWP.Services.WebDAV; using Windows.Storage.Streams; using WebDAVClient.Types; +using Prism.Services.Dialogs; namespace Project2FA.UWP.Services { @@ -366,7 +366,7 @@ public async Task ShowFileOrFolderNotFoundError() { selectedOption = true; dialog.Hide(); - ContentDialogResult result = await dialogService.ShowAsync(new UpdateDatafileContentDialog()); + ContentDialogResult result = await dialogService.ShowDialogAsync(new UpdateDatafileContentDialog(), new DialogParameters()); if (result == ContentDialogResult.Primary) { ErrorResolved(); @@ -417,11 +417,11 @@ async void Dialog_Closed(ContentDialog sender, ContentDialogClosedEventArgs args { if (!selectedOption) { - await dialogService.ShowAsync(dialog); + await dialogService.ShowDialogAsync(dialog, new DialogParameters()); } } } - await dialogService.ShowAsync(dialog); + await dialogService.ShowDialogAsync(dialog, new DialogParameters()); } /// diff --git a/Project2FA.UWP/Utils/WebDAVUtils.cs b/Project2FA.UWP/Utils/WebDAVUtils.cs index 66b80225..45247eea 100644 --- a/Project2FA.UWP/Utils/WebDAVUtils.cs +++ b/Project2FA.UWP/Utils/WebDAVUtils.cs @@ -4,7 +4,7 @@ using Prism.Ioc; using WebDAVClient.Exceptions; using Template10.Services.Resources; -using Template10.Services.Dialog; +using Prism.Services.Dialogs; namespace Project2FA.UWP.Utils { diff --git a/Project2FA.UWP/ViewModels/WelcomePageViewModel.cs b/Project2FA.UWP/ViewModels/WelcomePageViewModel.cs index d831a663..f2604165 100644 --- a/Project2FA.UWP/ViewModels/WelcomePageViewModel.cs +++ b/Project2FA.UWP/ViewModels/WelcomePageViewModel.cs @@ -3,12 +3,12 @@ using System; using Project2FA.UWP.Views; using System.Windows.Input; -using Template10.Services.Dialog; using Windows.Storage; using Windows.UI.Xaml.Controls; using Prism.Navigation; using Project2FA.UWP.Utils; using System.Threading.Tasks; +using Prism.Services.Dialogs; namespace Project2FA.UWP.ViewModels { @@ -59,7 +59,7 @@ public WelcomePageViewModel(IDialogService dialogService, INavigationService nav { IsTutorialOpen = false; } - await _dialogService.ShowAsync(dialog); + await _dialogService.ShowDialogAsync(dialog,new DialogParameters()); }); #pragma warning restore AsyncFixer03 // Fire-and-forget async-void methods or delegates } @@ -67,7 +67,7 @@ public WelcomePageViewModel(IDialogService dialogService, INavigationService nav private async Task NewDatafile() { var dialog = new NewDatafileContentDialog(); - var result = await _dialogService.ShowAsync(dialog); + var result = await _dialogService.ShowDialogAsync(dialog, new DialogParameters()); if (result == ContentDialogResult.Primary) { //_canNavigate = true; @@ -85,7 +85,7 @@ private async Task UseExistDatafile() StorageFile file = await StorageFile.GetFileFromPathAsync(path); UseDatafileContentDialog dialog = new UseDatafileContentDialog(); - ContentDialogResult result = await _dialogService.ShowAsync(dialog); + ContentDialogResult result = await _dialogService.ShowDialogAsync(dialog, new DialogParameters()); //result is also none, when the datafileDB is correct created if (result == ContentDialogResult.None) diff --git a/Project2FA.UWP/Views/AccountCodePage.xaml.cs b/Project2FA.UWP/Views/AccountCodePage.xaml.cs index 5a5bc326..0b89e94d 100644 --- a/Project2FA.UWP/Views/AccountCodePage.xaml.cs +++ b/Project2FA.UWP/Views/AccountCodePage.xaml.cs @@ -6,12 +6,12 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Template10.Services.Dialog; using Windows.ApplicationModel.DataTransfer; using Windows.UI; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; +using Prism.Services.Dialogs; namespace Project2FA.UWP.Views {