Merge pull request #1681 from Nexus-Mods/icon-colouring

Added: Support for coloured vector icons.
Nexus-Mods · Jun 25, 2024 · ad01530 · ad01530
2 parents ef1296e + a94e016
commit ad01530
Show file tree

Hide file tree

Showing 17 changed files with 294 additions and 71 deletions.
diff --git a/src/NexusMods.App.UI/Assets/Icons/add_circle_24px.svg b/src/NexusMods.App.UI/Assets/Icons/add_circle_24px.svg
diff --git a/src/NexusMods.App.UI/Assets/Icons/bookmarks_24px.svg b/src/NexusMods.App.UI/Assets/Icons/bookmarks_24px.svg
diff --git a/src/NexusMods.App.UI/Assets/Icons/collections.svg b/src/NexusMods.App.UI/Assets/Icons/collections.svg
diff --git a/src/NexusMods.App.UI/Assets/Icons/discord.svg b/src/NexusMods.App.UI/Assets/Icons/discord.svg
diff --git a/src/NexusMods.App.UI/Assets/Icons/disk_20px.svg b/src/NexusMods.App.UI/Assets/Icons/disk_20px.svg
diff --git a/src/NexusMods.App.UI/Assets/Icons/forum.svg b/src/NexusMods.App.UI/Assets/Icons/forum.svg
diff --git a/src/NexusMods.App.UI/Assets/Icons/list_filled_24px.svg b/src/NexusMods.App.UI/Assets/Icons/list_filled_24px.svg
diff --git a/src/NexusMods.App.UI/Assets/Icons/mod_library.svg b/src/NexusMods.App.UI/Assets/Icons/mod_library.svg
diff --git a/src/NexusMods.App.UI/Assets/Icons/mods.svg b/src/NexusMods.App.UI/Assets/Icons/mods.svg
diff --git a/src/NexusMods.App.UI/Assets/Icons/newspaper-variant-outline-1.svg b/src/NexusMods.App.UI/Assets/Icons/newspaper-variant-outline-1.svg
diff --git a/src/NexusMods.App.UI/Assets/Icons/stethoscope_24px.svg b/src/NexusMods.App.UI/Assets/Icons/stethoscope_24px.svg
diff --git a/src/NexusMods.App.UI/Assets/Icons/videogame_asset_24px.svg b/src/NexusMods.App.UI/Assets/Icons/videogame_asset_24px.svg
diff --git a/src/NexusMods.Icons/IconValue.cs b/src/NexusMods.Icons/IconValue.cs
@@ -1,11 +1,13 @@
 using Avalonia.Media;
 using JetBrains.Annotations;
+using NexusMods.Icons.SimpleVector;
 using Union = OneOf.OneOf<
     NexusMods.Icons.Empty,
     NexusMods.Icons.ProjektankerIcon,
     NexusMods.Icons.AvaloniaImage,
     NexusMods.Icons.AvaloniaSvg,
-    NexusMods.Icons.AvaloniaPathIcon>;
+    NexusMods.Icons.AvaloniaPathIcon,
+    NexusMods.Icons.SimpleVectorIcon>;
 
 namespace NexusMods.Icons;
 
@@ -42,6 +44,11 @@ public Geometry? GeometrySetter
     {
         set => Value = new AvaloniaPathIcon(value);
     }
+
+    public SimpleVectorIconImage? SimpleVectorSetter
+    {
+        set => Value = new SimpleVectorIcon(value);
+    }
 
     public IconValue()
     {
@@ -57,6 +64,7 @@ public IconValue(Union input)
     public static implicit operator IconValue(AvaloniaImage value) => new(value);
     public static implicit operator IconValue(AvaloniaSvg value) => new(value);
     public static implicit operator IconValue(AvaloniaPathIcon value) => new(value);
+    public static implicit operator IconValue(SimpleVectorIcon value) => new(value);
 }
 
 [PublicAPI]
@@ -74,3 +82,5 @@ public record struct AvaloniaSvg(string? Path);
 [PublicAPI]
 public record struct AvaloniaPathIcon(Geometry? Geometry);
 
+[PublicAPI]
+public record struct SimpleVectorIcon(SimpleVectorIconImage Image);