rework how module icons are defined

Author: LucHeart

Desktop/ModuleManager/ModuleManager.cs

@@ -223,6 +223,13 @@ private void LoadModule(string moduleFolderPath, string moduleDll, string module
 
         var module = (DesktopModuleBase?)ActivatorUtilities.CreateInstance(_serviceProvider, moduleAttribute.ModuleType);
         if (module is null) throw new Exception("Failed to instantiate module!");
+
+#pragma warning disable CS0618
+        if (module.IconPath is not null)
+        {
+            module.Icon = IconOneOf.FromPath(module.IconPath);
+        }
+#pragma warning restore CS0618
 
         var loadedModule = new LoadedModule
         {

Desktop/Ui/Pages/Dash/Components/ModuleManagerItem.razor

@@ -1,5 +1,6 @@
 @using System.Collections.Immutable
 @using OpenShock.Desktop.Config
+@using OpenShock.Desktop.ModuleBase
 @using OpenShock.Desktop.ModuleManager
 @using OpenShock.Desktop.ModuleManager.Repository
 @using OpenShock.Desktop.Utils
@@ -10,7 +11,15 @@
 @inject ISnackbar Snackbar
 
 <MudPaper Class="d-flex module-manager-item-root rounded-lg gap-10" Outlined="true">
-    <img src="@_moduleIcon" alt="@_moduleName" class="icon rounded-lg"/>
+    @switch (_moduleIcon?.Index)
+    {
+        case 0:
+            <img src="@_moduleIcon.AsT0" alt="Module Icon" class="icon rounded-lg"/>
+            break;
+        case 1:
+            <MudIcon Icon="@_moduleIcon.AsT1"/>
+            break;
+    }
 
     <div class="d-flex flex-column justify-space-evenly overflow-hidden">
         <MudText Typo="Typo.h4">@_moduleName</MudText>
@@ -112,7 +121,7 @@
     [Parameter] public required string ModuleId { get; init; }
 
     private string _moduleName = null!;
-    private string? _moduleIcon;
+    private IconOneOf? _moduleIcon;
 
     private SemVersion? LatestVersion => RepoModule?.Versions.Keys.Where(x => x.IsRelease).OrderByDescending(x => x, SemVersion.PrecedenceComparer).FirstOrDefault();
     private SemVersion? LatestPreReleaseVersion => RepoModule?.Versions.Keys.Where(x => !x.IsRelease).OrderByDescending(x => x, SemVersion.PrecedenceComparer).FirstOrDefault();
@@ -127,7 +136,13 @@
         }
 
         _moduleName = RepoModule?.Name ?? (LoadedModule?.Name ?? "error");
-        _moduleIcon = RepoModule?.IconUrl?.ToString() ?? LoadedModule?.Module.IconPath;
+        if (RepoModule?.IconUrl is not null)
+        {
+            _moduleIcon = IconOneOf.FromPath(RepoModule.IconUrl.ToString());
+        }
+        {
+            _moduleIcon = LoadedModule?.Module.Icon;
+        }
         _availableVersions = GetAvailableVersions();
     }
 

Desktop/Ui/Pages/Dash/Components/ModuleNavComponent.razor

@@ -2,11 +2,11 @@
 
 @if (LoadedModule.Module.RootComponent is not null)
 {
-    <MudNavLink Icon="@LoadedModule.Module.IconPath" Href="@("/dash/module/" + LoadedModule.Id)">@LoadedModule.Name</MudNavLink>
+    <ModuleNavLink Icon="LoadedModule.Module.Icon" Href="@("/dash/module/" + LoadedModule.Id)">@LoadedModule.Name</ModuleNavLink>
 }
 else
 {
-    <ModuleNavGroup IconImage="@LoadedModule.Module.IconPath" Title="@LoadedModule.Name">
+    <ModuleNavGroup Icon="@LoadedModule.Module.Icon" Title="@LoadedModule.Name">
         @foreach (var subComponent in LoadedModule.Module.NavigationComponents)
         {
             <ModuleNavLink Icon="@subComponent.Icon" Href="@("/dash/module/" + LoadedModule.Id + "/" + subComponent.Name)">@(subComponent.Name)</ModuleNavLink>

Desktop/Ui/Pages/Dash/Components/ModuleNavGroup.razor

@@ -11,16 +11,21 @@
             aria-controls="@_navigationContext.MenuId"
             aria-expanded="@_navigationContext.Expanded.ToString().ToLowerInvariant()"
             aria-label="Toggle Module Navigation">
-        @if (!string.IsNullOrEmpty(IconImage))
+        @switch (Icon?.Index)
         {
-            <img src="@IconImage" alt="Module Icon" style="width: 24px; height: 24px">
+            case 0:
+                <img src="@Icon.AsT0" alt="Module Icon" style="width: 24px; height: 24px">
+                break;
+            case 1:
+                <MudIcon Icon="@Icon.AsT1"/>
+                break;
         }
         <div Class="mud-nav-link-text">
             @Title
         </div>
         @if (!HideExpandIcon)
         {
-            <MudIcon Disabled="@Disabled" Icon="@ExpandIcon" Class="@ExpandIconClassname" />
+            <MudIcon Disabled="@Disabled" Icon="@ExpandIcon" Class="@ExpandIconClassname"/>
         }
     </button>
     <MudCollapse aria-hidden="@((_navigationContext.Expanded is false).ToString().ToLowerInvariant())"

Desktop/Ui/Pages/Dash/Components/ModuleNavGroup.razor.cs

@@ -3,6 +3,7 @@
 using MudBlazor;
 using MudBlazor.State;
 using MudBlazor.Utilities;
+using OpenShock.Desktop.ModuleBase;
 
 namespace OpenShock.Desktop.Ui.Pages.Dash.Components;
 
@@ -71,7 +72,7 @@ protected override void OnInitialized()
         /// </remarks>
         [Parameter]
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
-        public string? IconImage { get; set; }
+        public IconOneOf? Icon { get; set; }
 
         /// <summary>
         /// The CSS classes applied to this nav group title.

ModuleBase/DesktopModuleBase.cs

@@ -12,8 +12,14 @@ public abstract class DesktopModuleBase
     /// <summary>
     /// Icon path for the module, used in navigation and other UI components.
     /// </summary>
+    [Obsolete("Use Icon property instead. This property will be removed in a future version.")]
     public virtual string? IconPath { get; } = null;
 
+    /// <summary>
+    /// Main icon for the module, used in navigation and other UI components.
+    /// </summary>
+    public virtual IconOneOf? Icon { get; set; } = null;
+    
     /// <summary>
     /// Main interface for modules to interact with OpenShock Desktop.
     /// </summary>