Chore: Refactor dialogs

Author: BornToBeRoot

Source/NETworkManager/ViewModels/SettingsProfilesViewModel.cs

@@ -133,15 +133,16 @@ private async Task AddProfileFileAction()
 
         await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
 
+        // Re-select the profile file
         if (string.IsNullOrEmpty(profileName))
             return;
 
         SelectedProfileFile = ProfileFiles.Cast<ProfileFileInfo>()
             .FirstOrDefault(p => p.Name.Equals(profileName, StringComparison.OrdinalIgnoreCase));
 
-        // Ask to enable encryption for the new profile file
-        var result = await DialogHelper.ShowOKCancelMessageAsync(Application.Current.MainWindow, 
-            Strings.EnableEncryptionQuestion, 
+        // Ask the user if they want to enable encryption for the new profile file
+        var result = await DialogHelper.ShowOKCancelMessageAsync(Application.Current.MainWindow,
+            Strings.EnableEncryptionQuestion,
             Strings.EnableEncryptionForProfileFileMessage);
 
         if (result)
@@ -178,6 +179,7 @@ private async Task EditProfileFileAction()
 
         await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
 
+        // Re-select the profile file
         if (string.IsNullOrEmpty(profileName))
             return;
 
@@ -193,7 +195,7 @@ private bool DeleteProfileFile_CanExecute(object obj)
         return ProfileFiles.Cast<ProfileFileInfo>().Count() > 1;
     }
 
-    private Task DeleteProfileFileAction()
+    private async Task DeleteProfileFileAction()
     {
         var childWindow = new OKCancelMessageChildWindow();
 
@@ -216,14 +218,20 @@ private Task DeleteProfileFileAction()
 
         ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+
+        // Select the first profile file
+        SelectedProfileFile = ProfileFiles.Cast<ProfileFileInfo>().FirstOrDefault();
     }
 
     public ICommand EnableEncryptionCommand => new RelayCommand(_ => EnableEncryptionAction());
 
     private async void EnableEncryptionAction()
     {
-        if (!await ShowEncryptionDisclaimerAsync())
+        // Show encryption disclaimer
+        if (!await DialogHelper.ShowOKCancelMessageAsync(Application.Current.MainWindow,
+             Strings.Disclaimer,
+             Strings.ProfileEncryptionDisclaimer))
             return;
 
         var customDialog = new CustomDialog
@@ -257,87 +265,66 @@ await _dialogCoordinator.ShowMessageAsync(this, Strings.EncryptionError,
 
         await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
     }
+   
+    public ICommand ChangeMasterPasswordCommand => new RelayCommand(async _ => await ChangeMasterPasswordAction().ConfigureAwait(false));
 
-    private async Task<bool> ShowEncryptionDisclaimerAsync()
+    private async Task ChangeMasterPasswordAction()
     {
-        var result = false;
-
-        var childWindow = new OKCancelMessageChildWindow();
+        var profileName = SelectedProfileFile.Name;
 
-        var childWindowViewModel = new OKCancelMessageViewModel(_ =>
-        {
-            childWindow.IsOpen = false;
-            ConfigurationManager.Current.IsChildWindowOpen = false;
+        var childWindow = new CredentialsChangePasswordChildWindow();
 
-            result = true;
-        }, _ =>
+        var childWindowViewModel = new CredentialsChangePasswordViewModel(async instance =>
         {
             childWindow.IsOpen = false;
             ConfigurationManager.Current.IsChildWindowOpen = false;
-        },
-            Strings.ProfileEncryptionDisclaimer
-        );
-
-        childWindow.Title = Strings.Disclaimer;
-
-        childWindow.DataContext = childWindowViewModel;
-
-        ConfigurationManager.Current.IsChildWindowOpen = true;
-
-        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
-
-        return result;
-    }
-
-    public ICommand ChangeMasterPasswordCommand => new RelayCommand(_ => ChangeMasterPasswordAction());
-
-    private async void ChangeMasterPasswordAction()
-    {
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.ChangeMasterPassword
-        };
-
-        var credentialsPasswordViewModel = new CredentialsChangePasswordViewModel(async instance =>
-        {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
 
             try
             {
                 ProfileManager.ChangeMasterPassword(SelectedProfileFile, instance.Password, instance.NewPassword);
             }
             catch (CryptographicException)
             {
-                var settings = AppearanceManager.MetroDialog;
-                settings.AffirmativeButtonText = Strings.OK;
-
-                await _dialogCoordinator.ShowMessageAsync(this, Strings.WrongPassword,
-                    Strings.WrongPasswordDecryptionFailedMessage, MessageDialogStyle.Affirmative,
-                    settings);
+                await DialogHelper.ShowOKMessageAsync(Application.Current.MainWindow,
+                    Strings.WrongPassword,
+                    Strings.WrongPasswordDecryptionFailedMessage,
+                    ChildWindowIcon.Error).ConfigureAwait(false);
             }
             catch (Exception ex)
             {
-                var settings = AppearanceManager.MetroDialog;
-                settings.AffirmativeButtonText = Strings.OK;
-
-                await _dialogCoordinator.ShowMessageAsync(this, Strings.DecryptionError,
+                await DialogHelper.ShowOKMessageAsync(Application.Current.MainWindow,
+                    Strings.DecryptionError,
                     $"{Strings.DecryptionErrorMessage}\n\n{ex.Message}",
-                    MessageDialogStyle.Affirmative, settings);
+                    ChildWindowIcon.Error).ConfigureAwait(false);
             }
-        }, async _ => { await _dialogCoordinator.HideMetroDialogAsync(this, customDialog); });
-
-        customDialog.Content = new CredentialsChangePasswordDialog
+        }, _ =>
         {
-            DataContext = credentialsPasswordViewModel
-        };
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+        });
 
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        childWindow.Title = Strings.ChangeMasterPassword;
+
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
+
+        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+
+        // Re-select the profile file
+        if (string.IsNullOrEmpty(profileName))
+            return;
+
+        SelectedProfileFile = ProfileFiles.Cast<ProfileFileInfo>()
+            .FirstOrDefault(p => p.Name.Equals(profileName, StringComparison.OrdinalIgnoreCase));
     }
 
     public ICommand DisableEncryptionCommand => new RelayCommand(async _ => await DisableEncryptionAction().ConfigureAwait(false));
 
-    private Task DisableEncryptionAction()
+    private async Task DisableEncryptionAction()
     {
+        var profileName = SelectedProfileFile.Name;
+
         var childWindow = new CredentialsPasswordChildWindow();
 
         var childWindowViewModel = new CredentialsPasswordViewModel(async instance =>
@@ -376,8 +363,15 @@ await DialogHelper.ShowOKMessageAsync(Application.Current.MainWindow,
 
         ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+
+        // Re-select the profile file
+        if (string.IsNullOrEmpty(profileName))
+            return;
+                
+        SelectedProfileFile = ProfileFiles.Cast<ProfileFileInfo>()
+            .FirstOrDefault(p => p.Name.Equals(profileName, StringComparison.OrdinalIgnoreCase));
     }
 
     #endregion
-}
+}

…ews/CredentialsChangePasswordDialog.xaml …redentialsChangePasswordChildWindow.xamlSource/NETworkManager/Views/CredentialsChangePasswordDialog.xaml renamed to Source/NETworkManager/Views/CredentialsChangePasswordChildWindow.xaml Source/NETworkManager/Views/CredentialsChangePasswordDialog.xaml renamed to Source/NETworkManager/Views/CredentialsChangePasswordChildWindow.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="NETworkManager.Views.CredentialsChangePasswordDialog"
+<simpleChildWindow:ChildWindow x:Class="NETworkManager.Views.CredentialsChangePasswordChildWindow"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -7,9 +7,12 @@
              xmlns:interactivity="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
-             mc:Ignorable="d" Loaded="ChildWindow_OnLoaded"
-             d:DataContext="{d:DesignInstance viewModels:CredentialsChangePasswordViewModel}">
-    <Grid Margin="0,20">
+             xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"             
+             CloseButtonCommand="{Binding Path=CancelCommand}"
+             Style="{StaticResource DefaultChildWindow}"
+             Loaded="ChildWindow_OnLoaded"                            
+             mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:CredentialsChangePasswordViewModel}">    
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
@@ -35,31 +38,31 @@
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.CurrentPassword}" />
             <PasswordBox x:Name="PasswordBoxPassword" Grid.Column="2" Grid.Row="0"
-                         Style="{StaticResource DefaultPasswordBox}">
+                     Style="{StaticResource DefaultPasswordBox}">
                 <interactivity:Interaction.Behaviors>
                     <wpfHelpers:PasswordBoxBindingBehavior
-                        Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 </interactivity:Interaction.Behaviors>
             </PasswordBox>
             <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.NewPassword}" />
             <PasswordBox x:Name="PasswordBoxNewPassword" Grid.Column="2" Grid.Row="2"
-                         Style="{StaticResource DefaultPasswordBox}">
+                     Style="{StaticResource DefaultPasswordBox}">
                 <interactivity:Interaction.Behaviors>
                     <wpfHelpers:PasswordBoxBindingBehavior
-                        Password="{Binding NewPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    Password="{Binding NewPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 </interactivity:Interaction.Behaviors>
             </PasswordBox>
             <TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.Repeat}" />
             <PasswordBox x:Name="PasswordBoxNewPasswordRepeat" Grid.Column="2" Grid.Row="4"
-                         Style="{StaticResource DefaultPasswordBox}">
+                     Style="{StaticResource DefaultPasswordBox}">
                 <interactivity:Interaction.Behaviors>
                     <wpfHelpers:PasswordBoxBindingBehavior
-                        Password="{Binding NewPasswordRepeat, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    Password="{Binding NewPasswordRepeat, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 </interactivity:Interaction.Behaviors>
             </PasswordBox>
         </Grid>
         <TextBlock Grid.Row="1" Foreground="{DynamicResource MahApps.Brushes.Accent}"
-                   Text="{x:Static localization:Strings.PasswordsDoNotMatch}" Margin="0,10,0,0">
+               Text="{x:Static localization:Strings.PasswordsDoNotMatch}" Margin="0,10,0,0">
             <TextBlock.Style>
                 <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlock}">
                     <Setter Property="Visibility" Value="Collapsed" />
@@ -79,7 +82,7 @@
         </TextBlock>
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Content="{x:Static localization:Strings.OK}" Command="{Binding OKCommand}" IsDefault="True"
-                    Margin="0,0,10,0">
+                Margin="0,0,10,0">
                 <Button.Style>
                     <Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
                         <Setter Property="IsEnabled" Value="False" />
@@ -98,7 +101,7 @@
                 </Button.Style>
             </Button>
             <Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True"
-                    Style="{StaticResource DefaultButton}" />
+                Style="{StaticResource DefaultButton}" />
         </StackPanel>
     </Grid>
-</UserControl>
+</simpleChildWindow:ChildWindow>

…/CredentialsChangePasswordDialog.xaml.cs …entialsChangePasswordChildWindow.xaml.csSource/NETworkManager/Views/CredentialsChangePasswordDialog.xaml.cs renamed to Source/NETworkManager/Views/CredentialsChangePasswordChildWindow.xaml.cs Source/NETworkManager/Views/CredentialsChangePasswordDialog.xaml.cs renamed to Source/NETworkManager/Views/CredentialsChangePasswordChildWindow.xaml.cs

@@ -4,9 +4,9 @@
 
 namespace NETworkManager.Views;
 
-public partial class CredentialsChangePasswordDialog
+public partial class CredentialsChangePasswordChildWindow
 {
-    public CredentialsChangePasswordDialog()
+    public CredentialsChangePasswordChildWindow()
     {
         InitializeComponent();
     }