feat: CommunityToolkit.Mvvm

Author: ProgrammingByPermutation

src/[ApplicationNameUpperCamelCase]/ViewModels/MainWindowViewModel.cs

@@ -12,28 +12,24 @@
 using ReactiveUI;
 
 using ApplicationNameUpperCamelCase.Models;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace ApplicationNameUpperCamelCase.ViewModels;
 
 /// <summary>
 ///   The view model for the main UI.
 /// </summary>
-public class MainWindowViewModel : ViewModelBase {
+public partial class MainWindowViewModel : ViewModelBase {
   /// <summary>
   ///   True if the application is updating, false otherwise.
   /// </summary>
+  [ObservableProperty]
   private bool _isUpdating;
+  
   /// <summary>
   ///   Initializes a new instance of the <see cref="MainWindowViewModel" /> class.
   /// </summary>
   public MainWindowViewModel() {
     _isUpdating = Environment.GetCommandLineArgs().ToList().Contains("--update");
   }
-  /// <summary>
-  ///   True if the application is updating, false otherwise.
-  /// </summary>
-  public bool IsUpdating {
-    get => _isUpdating;
-    set => this.RaiseAndSetIfChanged(ref _isUpdating, value);
-  }
 }

src/[ApplicationNameUpperCamelCase]/ViewModels/NewVersionWindowViewModel.cs

@@ -4,7 +4,8 @@
 using ApplicationNameUpperCamelCase.Views;
 using Avalonia.Controls;
 using Avalonia.Threading;
-
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using Nullinside.Api.Common.Desktop;
 
 using ReactiveUI;
@@ -14,10 +15,11 @@ namespace ApplicationNameUpperCamelCase.ViewModels;
 /// <summary>
 ///   The view model for the <seealso cref="NewVersionWindow" /> class.
 /// </summary>
-public class NewVersionWindowViewModel : ViewModelBase {
+public partial class NewVersionWindowViewModel : ViewModelBase {
   /// <summary>
   ///   True if updating the application currently, false otherwise.
   /// </summary>
+  [ObservableProperty]
   private bool _isUpdating;
 
   /// <summary>
@@ -33,15 +35,13 @@ public class NewVersionWindowViewModel : ViewModelBase {
   /// <summary>
   ///   The version of the application on the GitHub server.
   /// </summary>
+  [ObservableProperty]
   private string? _serverVersion;
 
   /// <summary>
   ///   Initializes a new instance of the <see cref="NewVersionWindowViewModel" /> class.
   /// </summary>
   public NewVersionWindowViewModel() {
-    UpdateSoftware = ReactiveCommand.Create(StartUpdateSoftware);
-    CloseWindow = ReactiveCommand.Create<Window>(CloseWindowCommand);
-
     Task.Factory.StartNew(async () => {
       GithubLatestReleaseJson? version =
         await GitHubUpdateManager.GetLatestVersion("nullinside-development-group", "ApplicationNameUpperCamelCase").ConfigureAwait(false);
@@ -63,43 +63,19 @@ public string? LocalVersion {
     set => _localVersion = value;
   }
 
-  /// <summary>
-  ///   The version of the software on the GitHub server.
-  /// </summary>
-  public string? ServerVersion {
-    get => _serverVersion;
-    set => this.RaiseAndSetIfChanged(ref _serverVersion, value);
-  }
-
-  /// <summary>
-  ///   True if updating the application currently, false otherwise.
-  /// </summary>
-  public bool IsUpdating {
-    get => _isUpdating;
-    set => this.RaiseAndSetIfChanged(ref _isUpdating, value);
-  }
-
-  /// <summary>
-  ///   A command to update the software.
-  /// </summary>
-  public ICommand UpdateSoftware { get; }
-
-  /// <summary>
-  ///   A command to close the current window.
-  /// </summary>
-  public ICommand CloseWindow { get; }
-
   /// <summary>
   ///   A command to close the current window.
   /// </summary>
   /// <param name="self">The reference to our own window.</param>
-  private void CloseWindowCommand(Window self) {
+  [RelayCommand]
+  private void CloseWindow(Window self) {
     self.Close();
   }
 
   /// <summary>
   ///   Launches the web browser at the new release page.
   /// </summary>
+  [RelayCommand]
   private void StartUpdateSoftware() {
     IsUpdating = true;
     GitHubUpdateManager.PrepareUpdate()

src/[ApplicationNameUpperCamelCase]/ViewModels/ViewModelBase.cs

@@ -1,8 +1,9 @@
-using ReactiveUI;
+using CommunityToolkit.Mvvm.ComponentModel;
+using ReactiveUI;
 
 namespace ApplicationNameUpperCamelCase.ViewModels;
 
 /// <summary>
 ///   A base class for all view models.
 /// </summary>
-public class ViewModelBase : ReactiveObject { }
+public class ViewModelBase : ObservableObject { }

src/[ApplicationNameUpperCamelCase]/Views/MainWindow.axaml.cs

@@ -44,7 +44,7 @@ protected override void OnInitialized() {
 
     var args = Environment.GetCommandLineArgs().ToList();
     if (args.Contains("--update")) {
-      _ = GitHubUpdateManager.PerformUpdateAndRestart("nullinside-development-group", "ApplicationNameUpperCamelCase", args[2], "windows-x64.zip");
+      _ = GitHubUpdateManager.PerformUpdateAndRestart("nullinside-development-group", "ApplicationNameUpperCamelCase", args[2].Trim('"').Trim(), "windows-x64.zip");
       return;
     }
 

src/[ApplicationNameUpperCamelCase]/Views/NewVersionWindow.axaml

@@ -35,8 +35,8 @@
                     <TextBlock Text="{Binding ServerVersion}" HorizontalAlignment="Center" VerticalAlignment="Center" />
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
-                    <Button Command="{Binding UpdateSoftware}" Margin="0 10 0 0">Install New Version</Button>
-                    <Button Command="{Binding CloseWindow}" CommandParameter="{Binding ElementName=Window}"
+                    <Button Command="{Binding StartUpdateSoftwareCommand}" Margin="0 10 0 0">Install New Version</Button>
+                    <Button Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=Window}"
                             Margin="10 10 0 0">
                         Close
                     </Button>

src/[ApplicationNameUpperCamelCase]/[ApplicationNameUpperCamelCase].csproj

@@ -34,6 +34,7 @@
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.10"/>
         <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.6" />
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     </ItemGroup>
 
     <ItemGroup>