Merge pull request #2 from Rckov/develop

Author: Rckov

src/Remote Desktop.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.13.35919.96 d17.13
+VisualStudioVersion = 17.13.35919.96
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RemoteDesktop", "RemoteDesktop\RemoteDesktop.csproj", "{D70472F4-C5FB-4FA5-8E14-738DDD4F9695}"
 EndProject

src/RemoteDesktop/App.xaml

@@ -2,6 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:hc="https://handyorg.github.io/handycontrol">
+
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

src/RemoteDesktop/App.xaml.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
+using DryIoc;
 
 using RemoteDesktop.Services.Interfaces;
 using RemoteDesktop.ViewModels;
@@ -8,28 +8,39 @@
 
 namespace RemoteDesktop;
 
-public partial class App : Application
+public partial class App
 {
-    private readonly IServiceProvider _provider;
+    private readonly IContainer _container;
 
     public App()
     {
-        _provider = ConfigureServices(new ServiceCollection());
+        _container = ConfigureContainer();
     }
 
+    /// <summary>
+    /// Base directory of the application.
+    /// </summary>
     public static string BaseDirectory => AppContext.BaseDirectory;
 
-    private ServiceProvider ConfigureServices(IServiceCollection services)
+    /// <summary>
+    /// Configures the DryIoc container by registering views and services.
+    /// </summary>
+    private IContainer ConfigureContainer()
     {
-        services.AddViews();
-        services.AddServices();
+        var container = new Container();
 
-        return services.BuildServiceProvider();
+        container.RegisterViews();
+        container.RegisterServices();
+
+        return container;
     }
 
+    /// <summary>
+    /// Handles application startup event.
+    /// </summary>
     protected override void OnStartup(StartupEventArgs e)
     {
-        var service = _provider.GetRequiredService<IWindowService>();
+        var service = _container.Resolve<IWindowService>();
         service.Show<MainViewModel>();
     }
 }

src/RemoteDesktop/Common/Base/BaseViewModel.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+
+namespace RemoteDesktop.Common.Base;
+
+/// <summary>
+/// Base class for all ViewModels providing property change notification.
+/// </summary>
+internal abstract class BaseViewModel : INotifyPropertyChanged
+{
+    protected BaseViewModel()
+    {
+        InitializeCommands();
+    }
+
+    /// <summary>
+    /// Event raised when a property value changes.
+    /// </summary>
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    /// <summary>
+    /// Override this method to initialize commands in the derived ViewModel.
+    /// </summary>
+    public virtual void InitializeCommands()
+    { }
+
+    /// <summary>
+    /// Logs an informational message along with the calling method name.
+    /// </summary>
+    public void LogInfo(string message, [CallerMemberName] string method = null)
+    {
+        Debug.WriteLine(
+            $"Method: {method}\r\n" +
+            $"Message: {message}"
+        );
+    }
+
+    /// <summary>
+    /// Logs an error message with optional exception details and calling method name.
+    /// </summary>
+    public void LogError(string message, Exception exception = null, [CallerMemberName] string method = null)
+    {
+        Debug.WriteLine(
+            $"Method: {method}\r\n" +
+            $"Message: {message}\r\n" +
+            $"Exception: {exception?.Message ?? "No exception"}"
+        );
+    }
+
+    /// <summary>
+    /// Raises the PropertyChanged event for UI updates.
+    /// </summary>
+    protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+
+    /// <summary>
+    /// Sets the backing field value and raises PropertyChanged if the value has changed.
+    /// </summary>
+    protected bool Set<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;
+    }
+}

src/RemoteDesktop/Common/Base/ValidatableViewModel.cs

@@ -0,0 +1,103 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+using ValidationResult = System.ComponentModel.DataAnnotations.ValidationResult;
+
+namespace RemoteDesktop.Common.Base;
+
+/// <summary>
+/// Extends BaseViewModel with support for data validation using DataAnnotations.
+/// </summary>
+internal abstract class ValidatableViewModel : BaseViewModel, INotifyDataErrorInfo
+{
+    private readonly IDictionary<string, IList<string>> _errors = new Dictionary<string, IList<string>>();
+
+    /// <summary>
+    /// Event raised when the validation errors for a property have changed.
+    /// </summary>
+    public event EventHandler<DataErrorsChangedEventArgs> ErrorsChanged;
+
+    /// <summary>
+    /// Indicates whether the object has any validation errors.
+    /// </summary>
+    public bool HasErrors => _errors.Any();
+
+    /// <summary>
+    /// Gets the validation errors for a specific property.
+    /// </summary>
+    public IEnumerable GetErrors(string propertyName)
+    {
+        if (string.IsNullOrEmpty(propertyName))
+        {
+            return _errors.SelectMany(e => e.Value);
+        }
+
+        return _errors.TryGetValue(propertyName, out var errors) ? errors : Enumerable.Empty<string>();
+    }
+
+    /// <summary>
+    /// Raises PropertyChanged and validates the changed property.
+    /// </summary>
+    protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+    {
+        base.OnPropertyChanged(propertyName);
+        ValidateProperty(propertyName);
+    }
+
+    /// <summary>
+    /// Validates a single property using DataAnnotation attributes.
+    /// Updates the internal error collection and raises ErrorsChanged if necessary.
+    /// </summary>
+    protected virtual void ValidateProperty(string propertyName)
+    {
+        if (string.IsNullOrEmpty(propertyName))
+        {
+            return;
+        }
+
+        var propertyInfo = GetType().GetProperty(propertyName);
+        if (propertyInfo == null)
+        {
+            return;
+        }
+
+        var value = propertyInfo.GetValue(this);
+        var context = new ValidationContext(this)
+        {
+            MemberName = propertyName
+        };
+
+        var results = new List<ValidationResult>();
+        Validator.TryValidateProperty(value, context, results);
+
+        if (_errors.ContainsKey(propertyName))
+        {
+            _errors.Remove(propertyName);
+        }
+
+        if (results.Any())
+        {
+            _errors[propertyName] = [.. results.Select(r => r.ErrorMessage)];
+        }
+
+        ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
+    }
+
+    /// <summary>
+    /// Validates all public properties of the object.
+    /// Useful when submitting a form or performing global checks.
+    /// </summary>
+    public void ValidateAllProperties()
+    {
+        foreach (var property in GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))
+        {
+            ValidateProperty(property.Name);
+        }
+    }
+}

src/RemoteDesktop/ViewModels/Parameters/DialogParameters.cs renamed to src/RemoteDesktop/Common/Parameters/InputData.cs

@@ -1,7 +1,10 @@
 using System.Collections.Generic;
 
-namespace RemoteDesktop.ViewModels.Parameters;
+namespace RemoteDesktop.Common.Parameters;
 
+/// <summary>
+/// Container for passing parameters between ViewModels.
+/// </summary>
 internal class InputData<T>(T value = default, IEnumerable<string> names = default)
 {
     public T Value { get; } = value;

src/RemoteDesktop/Common/RelayCommand.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Windows.Input;
+
+namespace RemoteDesktop.Common;
+
+/// <summary>
+/// A command that executes a delegate when Execute is called and determines
+/// whether it can execute in the current state using the CanExecute delegate.
+/// </summary>
+public class RelayCommand(Action<object> execute, Predicate<object> canExecute) : ICommand
+{
+    private readonly Action<object> _execute = execute ?? throw new ArgumentNullException(nameof(execute));
+
+    /// <summary>
+    /// Creates a new instance of RelayCommand.
+    /// </summary>
+    /// <param name="execute">The delegate to execute when the command is invoked.</param>
+    public RelayCommand(Action execute)
+        : this(_ => execute(), null)
+    {
+    }
+
+    /// <summary>
+    /// Creates a new instance of RelayCommand.
+    /// </summary>
+    /// <param name="execute">The delegate to execute when the command is invoked.</param>
+    /// <param name="canExecute">The delegate that determines whether the command can execute.</param>
+    public RelayCommand(Action execute, Func<bool> canExecute)
+        : this(_ => execute(), _ => canExecute())
+    {
+    }
+
+    /// <summary>
+    /// Creates a new instance of RelayCommand.
+    /// </summary>
+    /// <param name="execute">The delegate to execute when the command is invoked.</param>
+    public RelayCommand(Action<object> execute)
+        : this(execute, null)
+    {
+    }
+
+    /// <summary>
+    /// Occurs when changes occur that affect whether the command can execute.
+    /// </summary>
+    public event EventHandler CanExecuteChanged
+    {
+        add => CommandManager.RequerySuggested += value;
+        remove => CommandManager.RequerySuggested -= value;
+    }
+
+    /// <summary>
+    /// Determines whether the command can execute in its current state.
+    /// </summary>
+    /// <param name="parameter">The parameter for the command.</param>
+    /// <returns>true if the command can be executed; otherwise false.</returns>
+    public bool CanExecute(object parameter) => canExecute?.Invoke(parameter) ?? true;
+
+    /// <summary>
+    /// Executes the command with the given parameter.
+    /// </summary>
+    /// <param name="parameter">The parameter for the command.</param>
+    public void Execute(object parameter) => _execute(parameter);
+
+    /// <summary>
+    /// Notifies that the ability of the command to execute has changed.
+    /// </summary>
+    public void RaiseCanExecuteChanged() => CommandManager.InvalidateRequerySuggested();
+}