Some proposals and ideas

src/IconPacks.Avalonia.BootstrapIcons/Converter/PackIconBootstrapIconsKindToImageConverter.cs

@@ -1,21 +1,8 @@
-using Avalonia.Media;
-using IconPacks.Avalonia.Core;
-using IconPacks.Avalonia.Core.Converter;
+using IconPacks.Avalonia.Core.Converter;
 
 namespace IconPacks.Avalonia.BootstrapIcons.Converter
 {
     public class PackIconBootstrapIconsKindToImageConverter : PackIconKindToImageConverterBase
     {
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconBootstrapIconsKind kind)
-            {
-                PackIconDataFactory<PackIconBootstrapIconsKind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.BootstrapIcons/PackIconBootstrapIcons.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Media;
 using IconPacks.Avalonia.Core;
 using IconPacks.Avalonia.Core.Attributes;
 
@@ -12,11 +11,6 @@ namespace IconPacks.Avalonia.BootstrapIcons
     [MetaData("Bootstrap Icons", "https://icons.getbootstrap.com/", "https://github.com/twbs/icons?tab=MIT-1-ov-file#readme")]
     public class PackIconBootstrapIcons : PackIconControlBase
     {
-        public PackIconBootstrapIcons()
-        {
-            UpdateIconPseudoClasses(true, false, false);
-        }
-
         public static readonly StyledProperty<PackIconBootstrapIconsKind> KindProperty
             = AvaloniaProperty.Register<PackIconBootstrapIcons, PackIconBootstrapIconsKind>(nameof(Kind));
 
@@ -50,9 +44,7 @@ protected override void UpdateData()
         {
             if (Kind != default)
             {
-                string data = null;
-                PackIconDataFactory<PackIconBootstrapIconsKind>.DataIndex.Value?.TryGetValue(Kind, out data);
-                this.Data = data != null ? StreamGeometry.Parse(data) : null;
+                this.Data = PackIconGeometryCache.GetOrAdd(Kind);
             }
             else
             {

src/IconPacks.Avalonia.BootstrapIcons/PackIconBootstrapIconsImageExtension.cs

@@ -22,17 +22,5 @@ public override object ProvideValue(IServiceProvider serviceProvider)
         {
             return CreateImageSource(this.Kind, this.Brush ?? Brushes.Black);
         }
-
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconBootstrapIconsKind kind)
-            {
-                PackIconDataFactory<PackIconBootstrapIconsKind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.BoxIcons/Converter/PackIconBoxIconsKindToImageConverter.cs

@@ -1,21 +1,8 @@
-using Avalonia.Media;
-using IconPacks.Avalonia.Core;
-using IconPacks.Avalonia.Core.Converter;
+using IconPacks.Avalonia.Core.Converter;
 
 namespace IconPacks.Avalonia.BoxIcons.Converter
 {
     public class PackIconBoxIconsKindToImageConverter : PackIconKindToImageConverterBase
     {
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconBoxIconsKind kind)
-            {
-                PackIconDataFactory<PackIconBoxIconsKind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Media;
 using IconPacks.Avalonia.Core;
 using IconPacks.Avalonia.Core.Attributes;
 
@@ -12,11 +11,6 @@ namespace IconPacks.Avalonia.BoxIcons
     [MetaData("Boxicons v3", "https://boxicons.com/", "https://docs.boxicons.com/license/free")]
     public class PackIconBoxIcons : PackIconControlBase
     {
-        public PackIconBoxIcons()
-        {
-            UpdateIconPseudoClasses(true, false, false);
-        }
-
         public static readonly StyledProperty<PackIconBoxIconsKind> KindProperty
             = AvaloniaProperty.Register<PackIconBoxIcons, PackIconBoxIconsKind>(nameof(Kind));
 
@@ -50,9 +44,7 @@ protected override void UpdateData()
         {
             if (Kind != default)
             {
-                string data = null;
-                PackIconDataFactory<PackIconBoxIconsKind>.DataIndex.Value?.TryGetValue(Kind, out data);
-                this.Data = data != null ? StreamGeometry.Parse(data) : null;
+                Data = PackIconGeometryCache.GetOrAdd(Kind);
             }
             else
             {

src/IconPacks.Avalonia.BoxIcons/PackIconBoxIconsImageExtension.cs

@@ -22,17 +22,5 @@ public override object ProvideValue(IServiceProvider serviceProvider)
         {
             return CreateImageSource(this.Kind, this.Brush ?? Brushes.Black);
         }
-
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconBoxIconsKind kind)
-            {
-                PackIconDataFactory<PackIconBoxIconsKind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.BoxIcons2/Converter/PackIconBoxIcons2KindToImageConverter.cs

@@ -1,21 +1,8 @@
-using Avalonia.Media;
-using IconPacks.Avalonia.Core;
-using IconPacks.Avalonia.Core.Converter;
+using IconPacks.Avalonia.Core.Converter;
 
 namespace IconPacks.Avalonia.BoxIcons2.Converter
 {
     public class PackIconBoxIcons2KindToImageConverter : PackIconKindToImageConverterBase
     {
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconBoxIcons2Kind kind)
-            {
-                PackIconDataFactory<PackIconBoxIcons2Kind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.BoxIcons2/PackIconBoxIcons2.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Media;
 using IconPacks.Avalonia.Core;
 using IconPacks.Avalonia.Core.Attributes;
 
@@ -12,11 +11,6 @@ namespace IconPacks.Avalonia.BoxIcons2
     [MetaData("Boxicons v2", "https://v2.boxicons.com/", "https://v2.boxicons.com/usage#license")]
     public class PackIconBoxIcons2 : PackIconControlBase
     {
-        public PackIconBoxIcons2()
-        {
-            UpdateIconPseudoClasses(true, false, false);
-        }
-
         public static readonly StyledProperty<PackIconBoxIcons2Kind> KindProperty
             = AvaloniaProperty.Register<PackIconBoxIcons2, PackIconBoxIcons2Kind>(nameof(Kind));
 
@@ -50,9 +44,7 @@ protected override void UpdateData()
         {
             if (Kind != default)
             {
-                string data = null;
-                PackIconDataFactory<PackIconBoxIcons2Kind>.DataIndex.Value?.TryGetValue(Kind, out data);
-                this.Data = data != null ? StreamGeometry.Parse(data) : null;
+                this.Data = PackIconGeometryCache.GetOrAdd(Kind);
             }
             else
             {

src/IconPacks.Avalonia.BoxIcons2/PackIconBoxIcons2ImageExtension.cs

@@ -22,17 +22,5 @@ public override object ProvideValue(IServiceProvider serviceProvider)
         {
             return CreateImageSource(this.Kind, this.Brush ?? Brushes.Black);
         }
-
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconBoxIcons2Kind kind)
-            {
-                PackIconDataFactory<PackIconBoxIcons2Kind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.CircumIcons/Converter/PackIconCircumIconsKindToImageConverter.cs

@@ -1,21 +1,8 @@
-using Avalonia.Media;
-using IconPacks.Avalonia.Core;
-using IconPacks.Avalonia.Core.Converter;
+using IconPacks.Avalonia.Core.Converter;
 
 namespace IconPacks.Avalonia.CircumIcons.Converter
 {
     public class PackIconCircumIconsKindToImageConverter : PackIconKindToImageConverterBase
     {
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconCircumIconsKind kind)
-            {
-                PackIconDataFactory<PackIconCircumIconsKind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.CircumIcons/PackIconCircumIcons.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Media;
 using IconPacks.Avalonia.Core;
 using IconPacks.Avalonia.Core.Attributes;
 
@@ -12,11 +11,6 @@ namespace IconPacks.Avalonia.CircumIcons
     [MetaData("Circum Icons Free", "https://github.com/Klarr-Agency/Circum-Icons", "https://github.com/Klarr-Agency/Circum-Icons?tab=MPL-2.0-1-ov-file")]
     public class PackIconCircumIcons : PackIconControlBase
     {
-        public PackIconCircumIcons()
-        {
-            UpdateIconPseudoClasses(true, false, false);
-        }
-
         public static readonly StyledProperty<PackIconCircumIconsKind> KindProperty
             = AvaloniaProperty.Register<PackIconCircumIcons, PackIconCircumIconsKind>(nameof(Kind));
 
@@ -50,9 +44,7 @@ protected override void UpdateData()
         {
             if (Kind != default)
             {
-                string data = null;
-                PackIconDataFactory<PackIconCircumIconsKind>.DataIndex.Value?.TryGetValue(Kind, out data);
-                this.Data = data != null ? StreamGeometry.Parse(data) : null;
+                this.Data = PackIconGeometryCache.GetOrAdd(Kind);
             }
             else
             {

src/IconPacks.Avalonia.CircumIcons/PackIconCircumIconsImageExtension.cs

@@ -22,17 +22,5 @@ public override object ProvideValue(IServiceProvider serviceProvider)
         {
             return CreateImageSource(this.Kind, this.Brush ?? Brushes.Black);
         }
-
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconCircumIconsKind kind)
-            {
-                PackIconDataFactory<PackIconCircumIconsKind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.Codicons/Converter/PackIconCodiconsKindToImageConverter.cs

@@ -1,21 +1,8 @@
-using Avalonia.Media;
-using IconPacks.Avalonia.Core;
-using IconPacks.Avalonia.Core.Converter;
+using IconPacks.Avalonia.Core.Converter;
 
 namespace IconPacks.Avalonia.Codicons.Converter
 {
     public class PackIconCodiconsKindToImageConverter : PackIconKindToImageConverterBase
     {
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconCodiconsKind kind)
-            {
-                PackIconDataFactory<PackIconCodiconsKind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.Codicons/PackIconCodicons.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Media;
 using IconPacks.Avalonia.Core;
 using IconPacks.Avalonia.Core.Attributes;
 
@@ -12,11 +11,6 @@ namespace IconPacks.Avalonia.Codicons
     [MetaData("Codicons", "https://github.com/microsoft/vscode-codicons", "https://github.com/microsoft/vscode-codicons/blob/main/LICENSE")]
     public class PackIconCodicons : PackIconControlBase
     {
-        public PackIconCodicons()
-        {
-            UpdateIconPseudoClasses(true, false, false);
-        }
-
         public static readonly StyledProperty<PackIconCodiconsKind> KindProperty
             = AvaloniaProperty.Register<PackIconCodicons, PackIconCodiconsKind>(nameof(Kind));
 
@@ -50,9 +44,7 @@ protected override void UpdateData()
         {
             if (Kind != default)
             {
-                string data = null;
-                PackIconDataFactory<PackIconCodiconsKind>.DataIndex.Value?.TryGetValue(Kind, out data);
-                this.Data = data != null ? StreamGeometry.Parse(data) : null;
+                this.Data = PackIconGeometryCache.GetOrAdd(Kind);
             }
             else
             {

src/IconPacks.Avalonia.Codicons/PackIconCodiconsImageExtension.cs

@@ -22,17 +22,5 @@ public override object ProvideValue(IServiceProvider serviceProvider)
         {
             return CreateImageSource(this.Kind, this.Brush ?? Brushes.Black);
         }
-
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconCodiconsKind kind)
-            {
-                PackIconDataFactory<PackIconCodiconsKind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.Coolicons/Converter/PackIconCooliconsKindToImageConverter.cs

@@ -1,21 +1,8 @@
-using Avalonia.Media;
-using IconPacks.Avalonia.Core;
-using IconPacks.Avalonia.Core.Converter;
+using IconPacks.Avalonia.Core.Converter;
 
 namespace IconPacks.Avalonia.Coolicons.Converter
 {
     public class PackIconCooliconsKindToImageConverter : PackIconKindToImageConverterBase
     {
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconCooliconsKind kind)
-            {
-                PackIconDataFactory<PackIconCooliconsKind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }