Add stable NotificationType type (dalamud api10)

Co-authored-by: Stanley Dimant <root.darkarchon@outlook.com>

MareSynchronos/Interop/Ipc/IpcCallerGlamourer.cs

@@ -1,8 +1,8 @@
 using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Plugin;
 using Glamourer.Api.Helpers;
 using Glamourer.Api.IpcSubscribers;
+using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.PlayerData.Handlers;
 using MareSynchronos.Services;
 using MareSynchronos.Services.Mediator;

MareSynchronos/Interop/Ipc/IpcCallerPenumbra.cs

@@ -1,4 +1,3 @@
-using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Plugin;
 using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.PlayerData.Handlers;

MareSynchronos/MareConfiguration/Models/NotificationLocation.cs

@@ -7,3 +7,10 @@ public enum NotificationLocation
     Toast,
     Both
 }
+
+public enum NotificationType
+{
+    Info,
+    Warning,
+    Error
+}

MareSynchronos/PlayerData/Pairs/PairManager.cs

@@ -1,5 +1,4 @@
 using Dalamud.Game.Gui.ContextMenu;
-using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Plugin.Services;
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Comparer;
@@ -7,6 +6,7 @@ using MareSynchronos.API.Data.Extensions;
 using MareSynchronos.API.Dto.Group;
 using MareSynchronos.API.Dto.User;
 using MareSynchronos.MareConfiguration;
+using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.PlayerData.Factories;
 using MareSynchronos.Services.Events;
 using MareSynchronos.Services.Mediator;

MareSynchronos/Services/CommandManagerService.cs

@@ -1,9 +1,8 @@
 using Dalamud.Game.Command;
-using Dalamud.Game.Text.SeStringHandling.Payloads;
-using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Plugin.Services;
 using MareSynchronos.FileCache;
 using MareSynchronos.MareConfiguration;
+using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.Services.ServerConfiguration;
 using MareSynchronos.UI;

MareSynchronos/Services/Mediator/Messages.cs

@@ -1,8 +1,8 @@
 using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Interface.ImGuiNotification;
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Dto;
 using MareSynchronos.API.Dto.Group;
+using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.PlayerData.Handlers;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.Services.Events;

MareSynchronos/Services/NotificationService.cs

@@ -1,11 +1,11 @@
 using Dalamud.Game.Text.SeStringHandling;
-using Dalamud.Interface;
 using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Plugin.Services;
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.Services.Mediator;
 using Microsoft.Extensions.Logging;
+using NotificationType = MareSynchronos.MareConfiguration.Models.NotificationType;
 
 namespace MareSynchronos.Services;
 
@@ -47,8 +47,6 @@ public class NotificationService : DisposableMediatorSubscriberBase
         switch (msg.Type)
         {
             case NotificationType.Info:
-            case NotificationType.Success:
-            case NotificationType.None:
                 PrintInfoChat(msg.Message);
                 break;
 
@@ -69,8 +67,6 @@ public class NotificationService : DisposableMediatorSubscriberBase
         switch (msg.Type)
         {
             case NotificationType.Info:
-            case NotificationType.Success:
-            case NotificationType.None:
                 ShowNotificationLocationBased(msg, _configurationService.Current.InfoNotification);
                 break;
 
@@ -108,11 +104,19 @@ public class NotificationService : DisposableMediatorSubscriberBase
 
     private void ShowToast(NotificationMessage msg)
     {
-        _notificationManager.AddNotification(new Dalamud.Interface.ImGuiNotification.Notification()
+        Dalamud.Interface.ImGuiNotification.NotificationType dalamudType = msg.Type switch
+        {
+            NotificationType.Error => Dalamud.Interface.ImGuiNotification.NotificationType.Error,
+            NotificationType.Warning => Dalamud.Interface.ImGuiNotification.NotificationType.Warning,
+            NotificationType.Info => Dalamud.Interface.ImGuiNotification.NotificationType.Info,
+            _ => Dalamud.Interface.ImGuiNotification.NotificationType.Info
+        };
+
+        _notificationManager.AddNotification(new Notification()
         {
             Content = msg.Message ?? string.Empty,
             Title = msg.Title,
-            Type = msg.Type,
+            Type = dalamudType,
             Minimized = false,
             InitialDuration = msg.TimeShownOnScreen ?? TimeSpan.FromSeconds(3)
         });

MareSynchronos/Services/PluginWarningNotificationService.cs

@@ -1,8 +1,8 @@
-using Dalamud.Interface.ImGuiNotification;
+using MareSynchronos.API.Data;
-using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Comparer;
 using MareSynchronos.Interop.Ipc;
 using MareSynchronos.MareConfiguration;
+using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.Services.Mediator;
 using System.Collections.Concurrent;
 

MareSynchronos/WebAPI/SignalR/ApiController.Functions.Callbacks.cs

@@ -1,9 +1,9 @@
-using Dalamud.Interface.ImGuiNotification;
+using MareSynchronos.API.Data.Enum;
-using MareSynchronos.API.Data.Enum;
 using MareSynchronos.API.Dto;
 using MareSynchronos.API.Dto.Chat;
 using MareSynchronos.API.Dto.Group;
 using MareSynchronos.API.Dto.User;
+using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.Services.Mediator;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.Logging;

MareSynchronos/WebAPI/SignalR/ApiController.cs

@@ -1,10 +1,10 @@
-using Dalamud.Interface.ImGuiNotification;
+using Dalamud.Utility;
-using Dalamud.Utility;
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Extensions;
 using MareSynchronos.API.Dto;
 using MareSynchronos.API.Dto.User;
 using MareSynchronos.API.SignalR;
+using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.Services;
 using MareSynchronos.Services.Mediator;

MareSynchronos/WebAPI/SignalR/TokenProvider.cs

@@ -1,5 +1,5 @@
-using Dalamud.Interface.ImGuiNotification;
+using MareSynchronos.API.Routes;
-using MareSynchronos.API.Routes;
+using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.Services;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.Services.ServerConfiguration;

MareSynchronos/WebAPI/SignalR/Utils/ForeverRetryPolicy.cs

@@ -1,4 +1,4 @@
-using Dalamud.Interface.ImGuiNotification;
+using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.Services.Mediator;
 using Microsoft.AspNetCore.SignalR.Client;