Merge pull request #92 from AathifMahir/Fix

New and Improved ImageSource Extension

samples/MauiIcons.Sample/MarkupPage.cs

@@ -92,6 +92,7 @@ private void AddMarkup()
                         new MauiIcon().Icon(FontAwesomeBrandIcons.Pinterest).IconColor(Colors.Red),
                         new Button().Icon(FontAwesomeBrandIcons.Github).IconSize(30),
                         new Entry().Icon(FontAwesomeIcons.Building).IconSize(20.0),
+                        new Image{ Source = MaterialIcons.Favorite.ToImageSource(iconColor: Colors.Blue, iconSize: 50) },
                     }
                 }
 

src/Directory.Build.props

@@ -29,9 +29,9 @@
 	<PropertyGroup Condition="'$(MSBuildProjectName)' != 'MauiIcons.Sample' and $(MSBuildProjectName) != 'MauiIcons.Modules.UnitTest'">
 		<Title>MauiIcons</Title>
 		<PackageIcon>icon.png</PackageIcon>
-		<AssemblyVersion>2.1.2.0</AssemblyVersion>
-		<AssemblyFileVersion>2.1.2.0</AssemblyFileVersion>
-		<Version>2.1.2</Version>
+		<AssemblyVersion>2.1.5.0</AssemblyVersion>
+		<AssemblyFileVersion>2.1.5.0</AssemblyFileVersion>
+		<Version>2.1.5</Version>
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
 		<PackageVersion>$(Version)$(VersionSuffix)</PackageVersion>
 		<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>

src/MauiIcons.Core/Extensions/CommonExtension.cs

@@ -0,0 +1,30 @@
+using MauiIcons.Core.Helpers;
+
+namespace MauiIcons.Core;
+public static class CommonExtension
+{
+    /// <summary>
+    /// this is used for seamlessly transforming the MauiIcons Enum Constructs to an ImageSource
+    /// </summary>
+    /// <param name="iconColor">sets the color of the icon. Defaults to black or white based on App Theme</param>
+    /// <param name="iconSize">sets the size of the icon. Defaults to 30.0</param>
+    /// <param name="iconAutoScaling">sets a value indicating whether the icon should automatically scale. Defaults to false</param>
+    /// <returns>Icon as ImageSource</returns>
+    /// <exception cref="MauiIconsExpection">
+    /// Thrown when the Enum is not a MauiIcons Construct
+    /// </exception>
+    public static ImageSource ToImageSource(this Enum icon, Color? iconColor = null, double iconSize = 30.0, bool iconAutoScaling = false)
+    {
+        if (icon.GetDescription() is null)
+            throw new MauiIconsExpection("MauiIcons ToImageSourceExtension Only Works on MauiIcons Constructs Not on All the Enum Types");
+
+        return new FontImageSource()
+        {
+            Glyph = icon.GetDescription(),
+            Color = iconColor.SetDefaultOrAssignedColor(),
+            FontFamily = icon.GetFontFamily(),
+            Size = iconSize,
+            FontAutoScalingEnabled = iconAutoScaling
+        };
+    }
+}

src/MauiIcons.Core/Helpers/ThemeHelper.cs

@@ -1,7 +1,7 @@
 namespace MauiIcons.Core.Helpers;
 internal static class ThemeHelper
 {
-    internal static Color SetDefaultOrAssignedColor(this Color value, Color originalColor)
+    internal static Color SetDefaultOrAssignedColor(this Color? value, Color originalColor)
     {
         if (value is null)
         {
@@ -10,7 +10,7 @@ internal static Color SetDefaultOrAssignedColor(this Color value, Color original
         return value;
     }
 
-    internal static Color SetDefaultOrAssignedColor(this Color value)
+    internal static Color SetDefaultOrAssignedColor(this Color? value)
     {
         if (value is null)
         {

src/MauiIcons.Core/ReleaseNotes.txt

@@ -1,4 +1,7 @@
-v2.1.2
+v2.1.5
+• New and Improved Extension for MauiIcon C#
+
+v2.1.2
 • Minor Fixes and Improvements for Base Extension
 
 v2.1.1

src/MauiIcons.Cupertino/ReleaseNotes.txt

@@ -1,4 +1,7 @@
-v2.1.2
+v2.1.5
+• New and Improved Extension for MauiIcon C#
+
+v2.1.2
 • Minor Fixes and Improvements for Base Extension
 
 v2.1.1

src/MauiIcons.Fluent.Filled/ReleaseNotes.txt

@@ -1,4 +1,7 @@
-v2.1.2
+v2.1.5
+• New and Improved Extension for MauiIcon C#
+
+v2.1.2
 • Minor Fixes and Improvements for Base Extension
 
 v2.1.1

src/MauiIcons.Fluent/ReleaseNotes.txt

@@ -1,4 +1,7 @@
-v2.1.2
+v2.1.5
+• New and Improved Extension for MauiIcon C#
+
+v2.1.2
 • Minor Fixes and Improvements for Base Extension
 
 v2.1.1

src/MauiIcons.FontAwesome.Brand/ReleaseNotes.txt

@@ -1,4 +1,7 @@
-v2.1.2
+v2.1.5
+• New and Improved Extension for MauiIcon C#
+
+v2.1.2
 • Minor Fixes and Improvements for Base Extension
 
 v2.1.1

src/MauiIcons.FontAwesome.Solid/ReleaseNotes.txt

@@ -1,4 +1,7 @@
-v2.1.2
+v2.1.5
+• New and Improved Extension for MauiIcon C#
+
+v2.1.2
 • Minor Fixes and Improvements for Base Extension
 
 v2.1.1

src/MauiIcons.FontAwesome/ReleaseNotes.txt

@@ -1,4 +1,7 @@
-v2.1.2
+v2.1.5
+• New and Improved Extension for MauiIcon C#
+
+v2.1.2
 • Minor Fixes and Improvements for Base Extension
 
 v2.1.1

src/MauiIcons.Material.Outlined/ReleaseNotes.txt

@@ -1,4 +1,7 @@
-v2.1.2
+v2.1.5
+• New and Improved Extension for MauiIcon C#
+
+v2.1.2
 • Minor Fixes and Improvements for Base Extension
 
 v2.1.1

src/MauiIcons.Material.Rounded/ReleaseNotes.txt

@@ -1,4 +1,7 @@
-v2.1.2
+v2.1.5
+• New and Improved Extension for MauiIcon C#
+
+v2.1.2
 • Minor Fixes and Improvements for Base Extension
 
 v2.1.1

src/MauiIcons.Material.Sharp/ReleaseNotes.txt

@@ -1,4 +1,7 @@
-v2.1.2
+v2.1.5
+• New and Improved Extension for MauiIcon C#
+
+v2.1.2
 • Minor Fixes and Improvements for Base Extension
 
 v2.1.1

src/MauiIcons.Material/ReleaseNotes.txt

@@ -1,4 +1,7 @@
-v2.1.2
+v2.1.5
+• New and Improved Extension for MauiIcon C#
+
+v2.1.2
 • Minor Fixes and Improvements for Base Extension
 
 v2.1.1

src/MauiIcons.Modules.UnitTest/Extensions/CommonExtensionTests.cs

@@ -0,0 +1,154 @@
+using MauiIcons.Fluent.Filled;
+using MauiIcons.Cupertino;
+using MauiIcons.Core;
+
+namespace MauiIcons.Modules.UnitTest.Extensions;
+public class CommonExtensionTests : BaseHandlerTest
+{
+    [Fact]
+    public void Icon()
+    {
+        // Arrange
+        Image image;
+        var icon = FluentFilledIcons.Accessibility16Filled.ToImageSource();
+        var iconCode = "\uF102";
+        FontImageSource source;
+
+        // Act
+        image = new Image { Source = icon };
+        source = (FontImageSource)image.Source;
+
+        // Assert
+        image.Source.Should().NotBeNull();
+        source.Glyph.Should().Be(iconCode);
+        source.FontFamily.Should().Be("FluentFilledIcons");
+    }
+
+    [Fact]
+    public void IconChanged()
+    {
+        // Arrange
+        Image image;
+        bool changedSignaled = false;
+        var assignedIcon = CupertinoIcons.Airplane.ToImageSource();
+        var assignedIconCode = "\ue900";
+        FontImageSource source;
+
+        // Act
+        image = new Image();
+        image.PropertyChanged += (sender, e) =>
+        {
+            if (e.PropertyName == "Source")
+            {
+                changedSignaled = true;
+            }
+        };
+        image.Source = assignedIcon;
+        source = (FontImageSource)image.Source;
+
+
+        // Assert
+        image.Source.Should().NotBeNull();
+        source.Glyph.Should().Be(assignedIconCode);
+        source.FontFamily.Should().Be("CupertinoIcons");
+        changedSignaled.Should().BeTrue();
+    }
+
+    [Fact]
+    public void IconColorChanged()
+    {
+        // Arrange
+        Image image;
+        bool changedSignaled = false;
+        var assignedColor = Colors.Blue;
+        var assignedIcon = CupertinoIcons.Airplane.ToImageSource(iconColor: assignedColor);
+        FontImageSource source;
+
+        // Act
+        image = new Image();
+        image.PropertyChanged += (sender, e) =>
+        {
+            if (e.PropertyName == "Source")
+            {
+                changedSignaled = true;
+            }
+        };
+        image.Source = assignedIcon;
+        source = (FontImageSource)image.Source;
+
+        // Assert
+        image.Source.Should().NotBeNull();
+        source.Color.Should().Be(assignedColor);
+        changedSignaled.Should().BeTrue();
+    }
+
+    [Fact]
+    public void IconColorChangedToDefault()
+    {
+        // Arrange
+        Image image;
+        var assignedIcon = CupertinoIcons.Airplane.ToImageSource();
+        var assignedColoredIcon = CupertinoIcons.Airplane.ToImageSource(iconColor: Colors.Green);
+        FontImageSource source;
+
+        // Act
+        image = new Image { Source = assignedColoredIcon };
+        image.Source = assignedIcon;
+        source = (FontImageSource)image.Source;
+
+
+        // Assert
+        image.Source.Should().NotBeNull();
+        source.Color.Should().Be(Colors.Black);
+    }
+
+
+    [Fact]
+    public void IconSizeChanged()
+    {
+        // Arrange
+        Image image;
+        bool changedSignaled = false;
+        var assignedSize = 25.0;
+        var assignedIcon = CupertinoIcons.Airplane.ToImageSource(iconSize: assignedSize);
+        FontImageSource source;
+
+        // Act
+        image = new Image();
+        image.PropertyChanged += (sender, e) =>
+        {
+            if (e.PropertyName == "Source")
+            {
+                changedSignaled = true;
+            }
+        };
+        image.Source = assignedIcon;
+        source = (FontImageSource)image.Source;
+
+
+        // Assert
+        image.Source.Should().NotBeNull();
+        source.Size.Should().Be(assignedSize);
+        changedSignaled.Should().BeTrue();
+    }
+
+    [Fact]
+    public void IconSizeChangedToDefault()
+    {
+        // Arrange
+        Image image;
+        var defaultSize = 30.0;
+        var defaultIcon = CupertinoIcons.Airplane.ToImageSource();
+        var assignedIcon = CupertinoIcons.Airplane.ToImageSource(iconSize: 40);
+        FontImageSource source;
+
+        // Act
+        image = new Image { Source = assignedIcon };
+        image.Source = defaultIcon;
+        source = (FontImageSource)image.Source;
+
+        // Assert
+        image.Source.Should().NotBeNull();
+        source.Size.Should().Be(defaultSize);
+    }
+}

src/MauiIcons.SegoeFluent/ReleaseNotes.txt

@@ -1,4 +1,7 @@
-v2.1.2
+v2.1.5
+• New and Improved Extension for MauiIcon C#
+
+v2.1.2
 • Minor Fixes and Improvements for Base Extension
 
 v2.1.1