Added InfoBar-related code to VM

Author: szv

src/Codebreaker.ViewModels/Components/InfoMessageViewModel.cs

@@ -1,6 +1,4 @@
-using System.Windows.Input;
-
-namespace Codebreaker.ViewModels;
+namespace Codebreaker.ViewModels.Components;
 
 public enum InfoMessageSeverity
 {
@@ -10,82 +8,38 @@ public enum InfoMessageSeverity
     Error
 }
 
-public partial class InfoMessageViewModel : ObservableObject
+public partial class InfoMessageViewModel(Action closeAction) : ObservableObject
 {
-    public static InfoMessageViewModel Error(string content)
-    {
-        InfoMessageViewModel message = new()
-        {
-            Title = "Error",
-            Message = content,
-            Severity = InfoMessageSeverity.Error,
-            ActionTitle = "OK"
-        };
-        message.ActionCommand = new RelayCommand(() => message.Close());
-        return message;
-    }
-
-    public static InfoMessageViewModel Warning(string content)
-    {
-        InfoMessageViewModel message = new()
-        {
-            Title = "Warning",
-            Message = content,
-            Severity = InfoMessageSeverity.Warning,
-            ActionTitle = "OK"
-        };
-        message.ActionCommand = new RelayCommand(() => message.Close());
-        return message;
-    }
-
-    public static InfoMessageViewModel Information(string content)
-    {
-        InfoMessageViewModel message = new()
-        {
-            Title = "Information",
-            Message = content,
-            Severity = InfoMessageSeverity.Info,
-            ActionTitle = "OK"
-        };
-        message.ActionCommand = new RelayCommand(() => message.Close());
-        return message;
-    }
-
-    public static InfoMessageViewModel Success(string content)
-    {
-        InfoMessageViewModel message = new()
-        {
-            Title = "Success",
-            Message = content,
-            Severity = InfoMessageSeverity.Success,
-            ActionTitle = "OK"
-        };
-        message.ActionCommand = new RelayCommand(() => message.Close());
-        return message;
-    }
-
-    internal ICollection<InfoMessageViewModel>? ContainingCollection { get; set; }
-
     [ObservableProperty]
-    private InfoMessageSeverity _severity = InfoMessageSeverity.Info;
+    private InfoMessageSeverity _severity;
 
     [ObservableProperty]
     private string _message = string.Empty;
 
     [ObservableProperty]
-    private string _title = string.Empty;
+    private string? _title;
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(HasAction))]
-    private ICommand? _actionCommand;
+    [NotifyCanExecuteChangedFor(nameof(ExecuteActionCommand))]
+    private Action? _action;
+
+    [RelayCommand]
+    public void ExecuteAction() => Action?.Invoke();
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(HasAction))]
-    private string? _actionTitle = "OK";
+    private string? _actionText = "OK";
 
-    public bool HasAction =>
-        ActionCommand is not null && ActionTitle is not null;
+    public bool HasAction => ExecuteActionCommand is not null && ActionText is not null;
 
-    public void Close() =>
-        ContainingCollection?.Remove(this);
-}
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(CloseCommand))]
+    private Action _closeAction = closeAction;
+
+    [ObservableProperty]
+    private bool _isClosable;
+
+    [RelayCommand]
+    public void Close() => CloseAction();
+}

src/Codebreaker.ViewModels/Contracts/Services/IInfoBarService.cs

@@ -0,0 +1,12 @@
+using Codebreaker.ViewModels.Components;
+
+namespace Codebreaker.ViewModels.Contracts.Services;
+
+public interface IInfoBarService
+{
+    ObservableCollection<InfoMessageViewModel> Messages { get; }
+
+    InfoMessageBuilder New { get; }
+
+    void Clear();
+}

src/Codebreaker.ViewModels/Services/InfoBarMessageService.cs

@@ -0,0 +1,89 @@
+using Codebreaker.ViewModels.Components;
+using Codebreaker.ViewModels.Contracts.Services;
+
+namespace Codebreaker.ViewModels.Services;
+
+public class InfoBarService : IInfoBarService
+{
+    public ObservableCollection<InfoMessageViewModel> Messages { get; } = [];
+
+    public InfoMessageBuilder New => new(this);
+
+    public void Clear() =>
+        Messages.Clear();
+}
+
+public class InfoMessageBuilder
+{
+    private readonly IInfoBarService _infoBarService;
+
+    private readonly InfoMessageViewModel _message;
+
+    public InfoMessageBuilder(IInfoBarService infoBarService)
+    {
+        _infoBarService = infoBarService;
+        _message = new(() => infoBarService.Messages.Remove(_message!))
+        {
+            IsClosable = true
+        };
+    }
+
+    public InfoMessageBuilder WithSeverity(InfoMessageSeverity severity)
+    {
+        _message.Severity = severity;
+        return this;
+    }
+
+    public InfoMessageBuilder IsInformationMessage() => WithSeverity(InfoMessageSeverity.Info);
+
+    public InfoMessageBuilder IsWarningMessage() => WithSeverity(InfoMessageSeverity.Warning);
+
+    public InfoMessageBuilder IsErrorMessage() => WithSeverity(InfoMessageSeverity.Error);
+
+    public InfoMessageBuilder IsSuccessMessage() => WithSeverity(InfoMessageSeverity.Success);
+
+    public InfoMessageBuilder WithTitle(string title)
+    {
+        _message.Title = title;
+        return this;
+    }
+
+    public InfoMessageBuilder WithMessage(string message)
+    {
+        _message.Message = message;
+        return this;
+    }
+
+    public InfoMessageBuilder WithAction(Action<InfoMessageViewModel> action, string? text = null)
+    {
+        _message.Action = () => action(_message);
+
+        if (text is not null)
+            _message.ActionText = text;
+
+        return this;
+    }
+
+    public InfoMessageBuilder WithAction(Action action, string? text = null)
+    {
+
+        _message.Action = action;
+
+        if (text is not null)
+            _message.ActionText = text;
+
+        return this;
+    }
+
+    public InfoMessageBuilder IsClosable(bool closeable = true)
+    {
+        _message.IsClosable = closeable;
+        return this;
+    }
+
+    public InfoMessageViewModel Show()
+    {
+        _infoBarService.Messages.Add(_message);
+        return _message;
+    }
+}