chore: adding [RelayCommand]

Converting all the boilerplate code over to use the attribute tags

Author: ProgrammingByPermutation

src/Nullinside.TwitchStreamingTools/Controls/Keybind.axaml

@@ -10,7 +10,7 @@
     <StackPanel>
         <Button IsVisible="{Binding !Listening}"
                 Content="{Binding Keybind, TargetNullValue='[None]'}"
-                Command="{Binding ListenForKeystroke}"
+                Command="{Binding StartListenKeystrokeCommand}"
                 ToolTip.Tip="ESC to unset" />
         <StackPanel IsVisible="{Binding Listening}"
                     Orientation="Horizontal">

src/Nullinside.TwitchStreamingTools/Controls/ViewModels/KeybindViewModel.cs

@@ -1,6 +1,7 @@
 using System.Reactive;
 
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 
 using Nullinside.TwitchStreamingTools.Models;
 using Nullinside.TwitchStreamingTools.Services;
@@ -34,17 +35,12 @@ public partial class KeybindViewModel : ObservableObject {
   /// <param name="service">The listener for keystrokes on the keyboard.</param>
   public KeybindViewModel(IGlobalKeyPressService service) {
     _service = service;
-    ListenForKeystroke = ReactiveCommand.Create(StartListenKeystroke);
   }
 
-  /// <summary>
-  ///   Listens for keystrokes.
-  /// </summary>
-  public ReactiveCommand<Unit, Unit> ListenForKeystroke { get; }
-
   /// <summary>
   ///   Starts listening for keystrokes.
   /// </summary>
+  [RelayCommand]
   private void StartListenKeystroke() {
     Listening = true;
     _service.OnKeystroke -= OnKeystroke;

src/Nullinside.TwitchStreamingTools/ViewModels/NewVersionWindowViewModel.cs

@@ -1,17 +1,15 @@
 using System.Diagnostics;
 using System.Threading.Tasks;
-using System.Windows.Input;
 
 using Avalonia.Controls;
 using Avalonia.Threading;
 
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 
 using Nullinside.Api.Common.Desktop;
 using Nullinside.TwitchStreamingTools.Views;
 
-using ReactiveUI;
-
 namespace Nullinside.TwitchStreamingTools.ViewModels;
 
 /// <summary>
@@ -42,9 +40,6 @@ public partial class NewVersionWindowViewModel : ViewModelBase {
   ///   Initializes a new instance of the <see cref="NewVersionWindowViewModel" /> class.
   /// </summary>
   public NewVersionWindowViewModel() {
-    UpdateSoftware = ReactiveCommand.Create(StartUpdateSoftware);
-    CloseWindow = ReactiveCommand.Create<Window>(CloseWindowCommand);
-
     // asynchronously determine the current version number.
     Task.Factory.StartNew(async () => {
       GithubLatestReleaseJson? version =
@@ -67,27 +62,19 @@ public string? LocalVersion {
     set => _localVersion = 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/Nullinside.TwitchStreamingTools/ViewModels/Pages/AccountViewModel.cs

@@ -3,13 +3,13 @@
 using System.IO;
 using System.Net.Http;
 using System.Net.WebSockets;
-using System.Reactive;
 using System.Threading;
 using System.Threading.Tasks;
 
 using Avalonia.Media.Imaging;
 
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 
 using log4net;
 
@@ -21,16 +21,14 @@
 using Nullinside.TwitchStreamingTools.Services;
 using Nullinside.TwitchStreamingTools.Utilities;
 
-using ReactiveUI;
-
 using TwitchLib.Api.Helix.Models.Users.GetUsers;
 
 namespace Nullinside.TwitchStreamingTools.ViewModels.Pages;
 
 /// <summary>
 ///   Handles binding your account to the application.
 /// </summary>
-public partial class AccountViewModel : PageViewModelBase, IDisposable {
+public partial class AccountViewModel : PageViewModelBase {
   /// <summary>
   ///   The path to the folder containing cached profile images.
   /// </summary>
@@ -92,8 +90,6 @@ public AccountViewModel(ITwitchAccountService twitchAccountService, IConfigurati
     _twitchAccountService.OnCredentialsStatusChanged += OnCredentialsStatusChanged;
     _twitchAccountService.OnCredentialsChanged += OnCredentialsChanged;
     _configuration = configuration;
-    OnPerformLogin = ReactiveCommand.Create(PerformLogin);
-    OnLogout = ReactiveCommand.Create(ClearCredentials);
 
     // Set the initial state of the ui
     HasValidOAuthToken = _twitchAccountService.CredentialsAreValid;
@@ -103,27 +99,11 @@ public AccountViewModel(ITwitchAccountService twitchAccountService, IConfigurati
   /// <inheritdoc />
   public override string IconResourceKey { get; } = "InprivateAccountRegular";
 
-  /// <summary>
-  ///   Called when the user clicks the login button.
-  /// </summary>
-  public ReactiveCommand<Unit, Unit> OnPerformLogin { get; }
-
-  /// <summary>
-  ///   Called when logging out the current user.
-  /// </summary>
-  public ReactiveCommand<Unit, Unit> OnLogout { get; }
-
   /// <summary>
   ///   The application version number.
   /// </summary>
   public string? Version => Constants.APP_VERSION;
 
-  /// <inheritdoc />
-  public void Dispose() {
-    OnPerformLogin.Dispose();
-    OnLogout.Dispose();
-  }
-
   /// <summary>
   ///   Loads the profile image when the UI loads.
   /// </summary>
@@ -202,7 +182,8 @@ private void OnCredentialsStatusChanged(bool valid) {
   /// <summary>
   ///   Launches the computer's default browser to generate an OAuth token.
   /// </summary>
-  private async void PerformLogin() {
+  [RelayCommand]
+  private async Task PerformLogin() {
     LoggingIn = true;
     try {
       CancellationToken token = CancellationToken.None;
@@ -251,6 +232,7 @@ private async void PerformLogin() {
   /// <summary>
   ///   Clears the credentials out (logging out).
   /// </summary>
+  [RelayCommand]
   private void ClearCredentials() {
     _twitchAccountService.DeleteCredentials();
   }

src/Nullinside.TwitchStreamingTools/ViewModels/Pages/ChatViewModel.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Reactive;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -11,13 +10,12 @@
 using Avalonia.Media;
 
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 
 using Nullinside.Api.Common.Twitch;
 using Nullinside.TwitchStreamingTools.Models;
 using Nullinside.TwitchStreamingTools.Utilities;
 
-using ReactiveUI;
-
 using TwitchLib.Client.Events;
 
 namespace Nullinside.TwitchStreamingTools.ViewModels.Pages;
@@ -72,9 +70,6 @@ public ChatViewModel(ITwitchClientProxy twitchClient, IConfiguration configurati
     _twitchClient = twitchClient;
     _configuration = configuration;
 
-    OnAddChat = ReactiveCommand.Create(OnAddChatCommand);
-    OnRemoveChat = ReactiveCommand.Create<string>(OnRemoveChatCommand);
-
     Application.Current!.TryFindResource("DeleteRegular", out object? icon);
     DeleteIcon = (StreamGeometry)icon!;
   }
@@ -87,16 +82,6 @@ public ChatViewModel(ITwitchClientProxy twitchClient, IConfiguration configurati
   /// </summary>
   public StreamGeometry DeleteIcon { get; set; }
 
-  /// <summary>
-  ///   Called when adding a chat.
-  /// </summary>
-  public ReactiveCommand<Unit, Unit> OnAddChat { get; }
-
-  /// <summary>
-  ///   Called when removing a chat.
-  /// </summary>
-  public ReactiveCommand<string, Unit> OnRemoveChat { get; }
-
   /// <inheritdoc />
   public void Dispose() {
     foreach (TwitchChatConfiguration channel in _configuration.TwitchChats ?? []) {
@@ -106,15 +91,13 @@ public void Dispose() {
 
       _twitchClient.RemoveMessageCallback(channel.TwitchChannel, OnChatMessage);
     }
-
-    OnAddChat.Dispose();
-    OnRemoveChat.Dispose();
   }
 
   /// <summary>
   ///   Handles adding a new chat to monitor.
   /// </summary>
-  private void OnAddChatCommand() {
+  [RelayCommand]
+  private void AddChat() {
     // Ensure we have a username
     string? username = TwitchChatName?.Trim();
     if (string.IsNullOrWhiteSpace(username) || SelectedTwitchChatNames.Contains(username)) {
@@ -147,7 +130,8 @@ from user in SelectedTwitchChatNames
   ///   Handles removing a chat we were monitoring.
   /// </summary>
   /// <param name="channel">The chat to remove.</param>
-  private void OnRemoveChatCommand(string channel) {
+  [RelayCommand]
+  private void RemoveChat(string channel) {
     SelectedTwitchChatNames.Remove(channel);
 
     // Remove the callback

src/Nullinside.TwitchStreamingTools/ViewModels/Pages/PageViewModelBase.cs

@@ -1,46 +1,38 @@
 using System.Reactive;
 
+using CommunityToolkit.Mvvm.Input;
+
 using ReactiveUI;
 
 namespace Nullinside.TwitchStreamingTools.ViewModels.Pages;
 
 /// <summary>
 ///   A base class for all pages of the application that are navigable through the left nav of the application.
 /// </summary>
-public abstract class PageViewModelBase : ViewModelBase {
+public abstract partial class PageViewModelBase : ViewModelBase {
   /// <summary>
   ///   Initializes a new instance of the <see cref="PageViewModelBase" /> class.
   /// </summary>
   protected PageViewModelBase() {
-    OnLoadedCommand = ReactiveCommand.Create(OnLoaded);
-    OnUnloadedCommand = ReactiveCommand.Create(OnUnloaded);
   }
 
   /// <summary>
   ///   The style resource key name of the icon.
   /// </summary>
   public abstract string IconResourceKey { get; }
 
-  /// <summary>
-  ///   Called when the UI is loaded.
-  /// </summary>
-  public ReactiveCommand<Unit, Unit> OnLoadedCommand { protected set; get; }
-
-  /// <summary>
-  ///   Called when the UI is unloaded.
-  /// </summary>
-  public ReactiveCommand<Unit, Unit> OnUnloadedCommand { protected set; get; }
-
   /// <summary>
   ///   Called then Ui is loaded.
   /// </summary>
+  [RelayCommand]
   public virtual void OnLoaded() {
     // Just exist to be overridden.
   }
 
   /// <summary>
   ///   Called when the Ui is unloaded.
   /// </summary>
+  [RelayCommand]
   public virtual void OnUnloaded() {
   }
 }

src/Nullinside.TwitchStreamingTools/Views/NewVersionWindow.axaml

@@ -33,8 +33,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/Nullinside.TwitchStreamingTools/Views/Pages/AccountView.axaml

@@ -28,7 +28,7 @@
             <controls1:Loading IsVisible="{Binding LoggingIn}" Width="75" Height="75" />
             <Button IsVisible="{Binding !HasValidOAuthToken}"
                     IsEnabled="{Binding !LoggingIn}"
-                    Command="{Binding OnPerformLogin}"
+                    Command="{Binding PerformLoginCommand}"
                     HorizontalAlignment="Center"
                     VerticalContentAlignment="Top">
                 Login
@@ -47,7 +47,7 @@
                     <TextBlock Grid.Column="0" VerticalAlignment="Center" Margin="0 0 10 0">User:</TextBlock>
                     <TextBox Grid.Column="1" Text="{Binding TwitchUsername}" IsReadOnly="True" />
                 </Grid>
-                <Button Command="{Binding OnLogout}"
+                <Button Command="{Binding ClearCredentialsCommand}"
                         HorizontalAlignment="Center"
                         VerticalContentAlignment="Top">
                     Logout

src/Nullinside.TwitchStreamingTools/Views/Pages/ChatView.axaml

@@ -29,7 +29,7 @@
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Column="0" VerticalAlignment="Center" Margin="0 0 5 0">Twitch Channel:</TextBlock>
             <TextBox Grid.Column="1" Text="{Binding TwitchChatName}" Margin="0 0 5 0" />
-            <Button Grid.Column="2" IsDefault="True" Command="{Binding OnAddChat}" Content="Add" />
+            <Button Grid.Column="2" IsDefault="True" Command="{Binding AddChatCommand}" Content="Add" />
         </Grid>
 
         <Label Grid.Row="1" Grid.Column="0" HorizontalAlignment="Center">Twitch Channels</Label>
@@ -45,7 +45,7 @@
                         <TextBlock HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding }" Padding="0" />
                         <Button Grid.Column="1"
                                 FontWeight="Bold"
-                                Command="{Binding $parent[UserControl].((chatView:ChatViewModel)DataContext).OnRemoveChat, FallbackValue=null}"
+                                Command="{Binding $parent[UserControl].((chatView:ChatViewModel)DataContext).RemoveChatCommand, FallbackValue=null}"
                                 CommandParameter="{Binding }">
                             <Button.Styles>
                                 <Style Selector="Button">