refactor(TaskCreation): move Window closing

Author: Xiphereal

Desktop/Common/ICloseable.cs

@@ -0,0 +1,6 @@
+namespace Desktop.Common;
+
+public interface ICloseable
+{
+    void Close();
+}

Desktop/Common/ViewModelBase.cs

@@ -0,0 +1,28 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace Desktop.Common;
+
+public abstract class ViewModelBase : INotifyPropertyChanged
+{
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+
+    protected bool SetField<T>(
+        ref T field,
+        T value,
+        [CallerMemberName] string? propertyName = null)
+    {
+        if (EqualityComparer<T>.Default.Equals(field, value))
+            return false;
+
+        field = value;
+        OnPropertyChanged(propertyName);
+
+        return true;
+    }
+}

Desktop/Desktop.csproj

@@ -28,8 +28,9 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0"/>
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.5" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.5"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5"/>
+        <PackageReference Include="MVVMToolkitExtensions.WPF" Version="1.0.5"/>
     </ItemGroup>
 
     <ItemGroup>

Desktop/Tasks/TaskCreation.xaml

@@ -3,9 +3,14 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Desktop.Tasks"
         mc:Ignorable="d"
+        x:Name="TaskCreationWindow"
         Title="Task creation" Height="225" Width="400"
         WindowStartupLocation="CenterScreen">
+    <Window.DataContext>
+        <local:TaskCreationViewModel />
+    </Window.DataContext>
     <Grid FocusManager.FocusedElement="{Binding ElementName=Name}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -21,6 +26,8 @@
                  VerticalAlignment="Stretch" />
         <Button AutomationProperties.AutomationId="SaveTask" Grid.Row="4" Content="Add" HorizontalAlignment="Right"
                 IsDefault="True"
-                Click="SaveTask" />
+                Click="SaveTask"
+                Command="{Binding SaveTask }"
+                CommandParameter="{Binding ElementName=TaskCreationWindow}" />
     </Grid>
 </Window>

Desktop/Tasks/TaskCreation.xaml.cs

@@ -1,11 +1,12 @@
 using System.Windows;
+using Desktop.Common;
 using Task = Desktop.Domain.Task;
 
 namespace Desktop.Tasks;
 
 using Task = Task;
 
-public partial class TaskCreation : Window
+public partial class TaskCreation : Window, ICloseable
 {
     public TaskCreation()
     {
@@ -17,6 +18,5 @@ public TaskCreation()
     private void SaveTask(object sender, RoutedEventArgs e)
     {
         CreatedTask = new Task(name: Name.Text, description: Description.Text);
-        Close();
     }
 }

Desktop/Tasks/TaskCreationViewModel.cs

@@ -0,0 +1,11 @@
+using System.Windows.Input;
+using CommunityToolkit.Mvvm.Input;
+using Desktop.Common;
+
+namespace Desktop.Tasks;
+
+public class TaskCreationViewModel : ViewModelBase
+{
+    public ICommand SaveTask { get; } =
+        new RelayCommand<ICloseable>(closeable => { closeable.Close(); });
+}