refactor: use async commands

Author: punker76

src/IconPacks.Browser/Controls/SideBar.xaml

@@ -234,7 +234,7 @@
                         </Style>
                     </Expander.Resources>
                     <StackPanel>
-                        <Button Command="{Binding SaveAsSvgCommand}" Content="Save as svg" />
+                        <Button Command="{Binding SaveAsSvgCommand}" Content="Save as Svg" />
                         <Button Command="{Binding SaveAsWpfCommand}" Content="Save as XAML (WPF)" />
                         <Button Command="{Binding SaveAsUwpCommand}" Content="Save as XAML (UWP)" />
                         <Button Command="{Binding SaveAsPngCommand}" Content="Save as Png" />

src/IconPacks.Browser/IconPacks.Browser.csproj

@@ -19,14 +19,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
+        <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
         <PackageReference Include="WpfAnalyzers" Version="4.1.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
         <PackageReference Include="MahApps.Metro.IconPacks" Version="5.0.0" />
         <PackageReference Include="MahApps.Metro" Version="2.4.10" />
-        <PackageReference Include="AsyncAwaitBestPractices" Version="6.0.6" />
+        <PackageReference Include="AsyncAwaitBestPractices.MVVM" Version="8.0.0" />
         <PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
         <PackageReference Include="VirtualizingWrapPanel" Version="2.0.11" />
     </ItemGroup>

src/IconPacks.Browser/MainWindow.xaml

@@ -195,7 +195,7 @@
     <mah:MetroWindow.RightWindowCommands>
         <mah:WindowCommands>
             <ToggleButton x:Name="ToggleButtonOpenSettings" Content="{iconPacks:Modern Kind=Settings}" />
-            <Button Command="{x:Static viewModels:MainViewModel.OpenUrlCommand}"
+            <Button Command="{Binding OpenUrlCommand, Mode=OneWay}"
                     CommandParameter="https://github.com/MahApps/MahApps.Metro.IconPacks"
                     Content="{iconPacks:Modern SocialGithubOctocat,
                                                Width=22,
@@ -358,7 +358,7 @@
                         <Button Style="{StaticResource LinkButtonStyle}"
                                 Margin="0 0 4 0"
                                 VerticalAlignment="Center"
-                                Command="{x:Static viewModels:MainViewModel.OpenUrlCommand}"
+                                Command="{Binding OpenUrlCommand, Mode=OneWay}"
                                 CommandParameter="{Binding SelectedIcon.MetaData.ProjectUrl, Mode=OneWay}">
                             <Button.ContentTemplate>
                                 <DataTemplate>
@@ -390,7 +390,7 @@
                         <Button Style="{StaticResource LinkButtonStyle}"
                                 Margin="0 0 4 0"
                                 VerticalAlignment="Center"
-                                Command="{x:Static viewModels:MainViewModel.OpenUrlCommand}"
+                                Command="{Binding OpenUrlCommand, Mode=OneWay}"
                                 CommandParameter="{Binding SelectedIcon.MetaData.LicenseUrl, Mode=OneWay}">
                             <Button.ContentTemplate>
                                 <DataTemplate>

src/IconPacks.Browser/Styles/HyperlinkTextBox.xaml

@@ -233,7 +233,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="mah:TextBoxHelper.ButtonCommand" Value="{x:Static vm:MainViewModel.OpenUrlCommand}" />
+        <Setter Property="mah:TextBoxHelper.ButtonCommand" Value="{Binding OpenUrlCommand, Mode=OneWay}" />
         <Setter Property="mah:TextBoxHelper.ButtonCommandParameter" Value="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Text}" />
         <Setter Property="mah:TextBoxHelper.ButtonContentTemplate">
             <Setter.Value>

src/IconPacks.Browser/ViewModels/IconPackViewModel.cs

@@ -14,11 +14,11 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using AsyncAwaitBestPractices;
+using AsyncAwaitBestPractices.MVVM;
 using IconPacks.Browser.Model;
 using IconPacks.Browser.Properties;
 using JetBrains.Annotations;
 using MahApps.Metro.Controls;
-using MahApps.Metro.Controls.Dialogs;
 using MahApps.Metro.IconPacks;
 using Microsoft.Win32;
 using IO = System.IO;
@@ -32,25 +32,22 @@ public class IconPackViewModel : ViewModelBase
         private ICollectionView _iconsCollectionView;
         private string _filterText;
         private IIconViewModel _selectedIcon;
-        private readonly IDialogCoordinator dialogCoordinator;
 
-        private IconPackViewModel(MainViewModel mainViewModel, IDialogCoordinator dialogCoordinator)
+        private IconPackViewModel(MainViewModel mainViewModel)
         {
             this.MainViewModel = mainViewModel;
-            this.dialogCoordinator = dialogCoordinator;
 
             // Export commands
-            SaveAsSvgCommand = new SimpleCommand((_) => SaveAsSvg_Execute(), (_) => SelectedIcon is IconViewModel);
-            SaveAsWpfCommand = new SimpleCommand((_) => SaveAsWpf_Execute(), (_) => SelectedIcon is not null);
-            SaveAsUwpCommand = new SimpleCommand((_) => SaveAsUwp_Execute(), (_) => SelectedIcon is not null);
-
-            SaveAsPngCommand = new SimpleCommand((_) => SaveAsBitmapExecute(new PngBitmapEncoder()), (_) => SelectedIcon is not null);
-            SaveAsJpegCommand = new SimpleCommand((_) => SaveAsBitmapExecute(new JpegBitmapEncoder()), (_) => SelectedIcon is not null);
-            SaveAsBmpCommand = new SimpleCommand((_) => SaveAsBitmapExecute(new BmpBitmapEncoder()), (_) => SelectedIcon is not null);
+            SaveAsSvgCommand = new AsyncCommand(SaveAsSvgAsync, _ => SelectedIcon is IconViewModel);
+            SaveAsWpfCommand = new AsyncCommand(SaveAsWpfAsync, _ => SelectedIcon is IconViewModel);
+            SaveAsUwpCommand = new AsyncCommand(SaveAsUwpAsync, _ => SelectedIcon is IconViewModel);
+            SaveAsPngCommand = new AsyncCommand(() => SaveAsBitmapAsync(new PngBitmapEncoder()), _ => SelectedIcon is IconViewModel);
+            SaveAsJpegCommand = new AsyncCommand(() => SaveAsBitmapAsync(new JpegBitmapEncoder()), _ => SelectedIcon is IconViewModel);
+            SaveAsBmpCommand = new AsyncCommand(() => SaveAsBitmapAsync(new BmpBitmapEncoder()), _ => SelectedIcon is IconViewModel);
         }
 
-        public IconPackViewModel(MainViewModel mainViewModel, Type enumType, Type packType, IDialogCoordinator dialogCoordinator)
-            : this(mainViewModel, dialogCoordinator)
+        public IconPackViewModel(MainViewModel mainViewModel, Type enumType, Type packType)
+            : this(mainViewModel)
         {
             // Get the Name of the IconPack via Attributes
             this.MetaData = Attribute.GetCustomAttribute(packType, typeof(MetaDataAttribute)) as MetaDataAttribute;
@@ -60,8 +57,8 @@ public IconPackViewModel(MainViewModel mainViewModel, Type enumType, Type packTy
             this.LoadEnumsAsync(enumType, packType).SafeFireAndForget();
         }
 
-        public IconPackViewModel(MainViewModel mainViewModel, string caption, Type[] enumTypes, Type[] packTypes, IDialogCoordinator dialogCoordinator)
-            : this(mainViewModel, dialogCoordinator)
+        public IconPackViewModel(MainViewModel mainViewModel, string caption, Type[] enumTypes, Type[] packTypes)
+            : this(mainViewModel)
         {
             this.MainViewModel = mainViewModel;
 
@@ -183,13 +180,20 @@ public IIconViewModel SelectedIcon
                 if (Set(ref _selectedIcon, value))
                 {
                     CommandManager.InvalidateRequerySuggested();
+
+                    SaveAsSvgCommand?.RaiseCanExecuteChanged();
+                    SaveAsWpfCommand?.RaiseCanExecuteChanged();
+                    SaveAsUwpCommand?.RaiseCanExecuteChanged();
+                    SaveAsPngCommand?.RaiseCanExecuteChanged();
+                    SaveAsJpegCommand?.RaiseCanExecuteChanged();
+                    SaveAsBmpCommand?.RaiseCanExecuteChanged();
                 }
             }
         }
 
-        public ICommand SaveAsSvgCommand { get; }
+        public IAsyncCommand SaveAsSvgCommand { get; }
 
-        private async void SaveAsSvg_Execute()
+        private async Task SaveAsSvgAsync()
         {
             var progress = await dialogCoordinator.ShowProgressAsync(MainViewModel, "Export", "Saving selected icon as SVG-file");
             progress.SetIndeterminate();
@@ -253,7 +257,11 @@ private async void SaveAsSvg_Execute()
 
                     var svgFileContent = ExportHelper.FillTemplate(svgFileTemplate, parameters);
 
+#if NETFRAMEWORK
                     using IO.StreamWriter file = new IO.StreamWriter(fileSaveDialog.FileName);
+#else
+                    await using IO.StreamWriter file = new IO.StreamWriter(fileSaveDialog.FileName);
+#endif
                     await file.WriteAsync(svgFileContent);
                 }
             }
@@ -265,9 +273,9 @@ private async void SaveAsSvg_Execute()
             await progress.CloseAsync();
         }
 
-        public ICommand SaveAsWpfCommand { get; }
+        public IAsyncCommand SaveAsWpfCommand { get; }
 
-        private async void SaveAsWpf_Execute()
+        private async Task SaveAsWpfAsync()
         {
             var progress = await dialogCoordinator.ShowProgressAsync(MainViewModel, "Export", "Saving selected icon as WPF-XAML-file");
             progress.SetIndeterminate();
@@ -317,7 +325,11 @@ private async void SaveAsWpf_Execute()
 
                     var wpfFileContent = ExportHelper.FillTemplate(wpfFileTemplate, parameters);
 
+#if NETFRAMEWORK
                     using IO.StreamWriter file = new IO.StreamWriter(fileSaveDialog.FileName);
+#else
+                    await using IO.StreamWriter file = new IO.StreamWriter(fileSaveDialog.FileName);
+#endif
                     await file.WriteAsync(wpfFileContent);
                 }
             }
@@ -329,9 +341,9 @@ private async void SaveAsWpf_Execute()
             await progress.CloseAsync();
         }
 
-        public ICommand SaveAsUwpCommand { get; }
+        public IAsyncCommand SaveAsUwpCommand { get; }
 
-        private async void SaveAsUwp_Execute()
+        private async Task SaveAsUwpAsync()
         {
             var progress = await dialogCoordinator.ShowProgressAsync(MainViewModel, "Export", "Saving selected icon as WPF-XAML-file");
             progress.SetIndeterminate();
@@ -380,7 +392,11 @@ private async void SaveAsUwp_Execute()
 
                     var wpfFileContent = ExportHelper.FillTemplate(wpfFileTemplate, parameters);
 
+#if NETFRAMEWORK
                     using IO.StreamWriter file = new IO.StreamWriter(fileSaveDialog.FileName);
+#else
+                    await using IO.StreamWriter file = new IO.StreamWriter(fileSaveDialog.FileName);
+#endif
                     await file.WriteAsync(wpfFileContent);
                 }
             }
@@ -392,13 +408,13 @@ private async void SaveAsUwp_Execute()
             await progress.CloseAsync();
         }
 
-        public ICommand SaveAsPngCommand { get; }
+        public IAsyncCommand SaveAsPngCommand { get; }
 
-        public ICommand SaveAsJpegCommand { get; }
+        public IAsyncCommand SaveAsJpegCommand { get; }
 
-        public ICommand SaveAsBmpCommand { get; }
+        public IAsyncCommand SaveAsBmpCommand { get; }
 
-        private async void SaveAsBitmapExecute(BitmapEncoder encoder)
+        private async Task SaveAsBitmapAsync(BitmapEncoder encoder)
         {
             var progress = await dialogCoordinator.ShowProgressAsync(MainViewModel, "Export", "Saving selected icon as bitmap image");
             progress.SetIndeterminate();
@@ -450,7 +466,11 @@ private async void SaveAsBitmapExecute(BitmapEncoder encoder)
 
                     encoder.Frames.Add(BitmapFrame.Create(renderTargetBitmap));
 
+#if NETFRAMEWORK
                     using var fileStream = new IO.FileStream(fileSaveDialog.FileName, IO.FileMode.Create);
+#else
+                    await using var fileStream = new IO.FileStream(fileSaveDialog.FileName, IO.FileMode.Create);
+#endif
                     encoder.Save(fileStream);
                 }
             }

src/IconPacks.Browser/ViewModels/MainViewModel.cs

@@ -7,31 +7,18 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Threading;
-using MahApps.Metro.Controls.Dialogs;
 using MahApps.Metro.IconPacks;
 
 namespace IconPacks.Browser.ViewModels
 {
     public class MainViewModel : ViewModelBase
     {
-        private readonly IDialogCoordinator dialogCoordinator;
         private readonly Dispatcher _dispatcher;
         private string _filterText;
         private IconPackViewModel _selectedIconPack;
-        private static MainViewModel _Instance;
 
         public MainViewModel(Dispatcher dispatcher)
         {
-            if (_Instance is null)
-            {
-                _Instance = this;
-            }
-            else
-            {
-                return;
-            }
-
-            this.dialogCoordinator = DialogCoordinator.Instance;
             this._dispatcher = dispatcher;
             this.AppVersion = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion;
 
@@ -80,7 +67,7 @@ public MainViewModel(Dispatcher dispatcher)
 
             foreach (var (enumType, iconPackType) in availableIconPacks)
             {
-                coll.Add(new IconPackViewModel(this, enumType, iconPackType, dialogCoordinator));
+                coll.Add(new IconPackViewModel(this, enumType, iconPackType));
             }
 
             this.IconPacks = coll;
@@ -91,31 +78,13 @@ public MainViewModel(Dispatcher dispatcher)
                     this,
                     "All Icons",
                     availableIconPacks.Select(x => x.EnumType).ToArray(),
-                    availableIconPacks.Select(x => x.IconPackType).ToArray(),
-                    dialogCoordinator)
+                    availableIconPacks.Select(x => x.IconPackType).ToArray()
+                )
             });
 
             this.IconPacksVersion = FileVersionInfo.GetVersionInfo(Assembly.GetAssembly(typeof(PackIconMaterial)).Location).FileVersion;
 
-            this.Settings = new SettingsViewModel(this.dialogCoordinator);
-        }
-
-        private static async void OpenUrlLink(string link)
-        {
-            try
-            {
-                Process.Start(new ProcessStartInfo
-                {
-                    FileName = link ?? throw new ArgumentNullException(nameof(link)),
-                    // UseShellExecute is default to false on .NET Core while true on .NET Framework.
-                    // Only this value is set to true, the url link can be opened.
-                    UseShellExecute = true,
-                });
-            }
-            catch (Exception e)
-            {
-                await DialogCoordinator.Instance.ShowMessageAsync(MainViewModel._Instance, "Error", e.Message);
-            }
+            this.Settings = new SettingsViewModel();
         }
 
         public IconPackViewModel SelectedIconPack
@@ -138,13 +107,6 @@ public IconPackViewModel SelectedIconPack
 
         public string IconPacksVersion { get; }
 
-        public static ICommand OpenUrlCommand { get; } =
-            new SimpleCommand
-            {
-                CanExecuteDelegate = x => !string.IsNullOrWhiteSpace(x as string),
-                ExecuteDelegate = x => OpenUrlLink(x as string)
-            };
-
         public string FilterText
         {
             get => _filterText;