FontIcon markup extension

Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconExtension.cs

@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Markup;
+using Windows.UI.Xaml.Media;
+
+namespace Microsoft.Toolkit.Uwp.UI.Extensions
+{
+    /// <summary>
+    /// Custom <see cref="MarkupExtension"/> which can provide <see cref="FontIcon"/> values.
+    /// </summary>
+    [Bindable]
+    [MarkupExtensionReturnType(ReturnType = typeof(FontIcon))]
+    public class FontIconExtension : MarkupExtension
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="string"/> representing the icon to display.
+        /// </summary>
+        public string Glyph { get; set; }
+
+        /// <summary>
+        /// Gets or sets the font family to use to display the icon. If <see langword="null"/>, "Segoe MDL2 Assets" will be used.
+        /// </summary>
+        public FontFamily FontFamily { get; set; }
+
+        /// <inheritdoc/>
+        protected override object ProvideValue()
+        {
+            return new FontIcon
+            {
+                Glyph = Glyph,
+                FontFamily = FontFamily ?? new FontFamily("Segoe MDL2 Assets")
+            };
+        }
+    }
+}

Microsoft.Toolkit.Uwp.UI/Extensions/Markup/NullableBool.cs

@@ -2,11 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Markup;
 

Microsoft.Toolkit.Uwp.UI/Extensions/Markup/OnDevice.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using Windows.ApplicationModel;
 using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Markup;

UnitTests/Extensions/Test_FontIconExtensionMarkupExtension.cs

@@ -0,0 +1,63 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Toolkit.Uwp.UI.Extensions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Markup;
+
+namespace UnitTests.Extensions
+{
+    [TestClass]
+    public class Test_FontIconExtensionMarkupExtension
+    {
+        [TestCategory("FontIconExtensionMarkupExtension")]
+        [UITestMethod]
+        public void Test_FontIconExtension_MarkupExtension_ProvideSegoeMdl2Asset()
+        {
+            var treeroot = XamlReader.Load(@"<Page
+    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
+    xmlns:ex=""using:Microsoft.Toolkit.Uwp.UI.Extensions"">
+        <AppBarButton x:Name=""Check"" Icon=""{ex:FontIcon Glyph=&#xE14D;}""/>
+</Page>") as FrameworkElement;
+
+            var button = treeroot.FindChildByName("Check") as AppBarButton;
+
+            Assert.IsNotNull(button, $"Could not find the {nameof(AppBarButton)} control in tree.");
+
+            var icon = button.Icon as FontIcon;
+
+            Assert.IsNotNull(icon, $"Could not find the {nameof(FontIcon)} element in button.");
+
+            Assert.AreEqual(icon.Glyph, "\uE105", "Expected icon glyph to be E105.");
+            Assert.AreEqual(icon.FontFamily.Source, "Segoe MDL2 Assets", "Expected font family to be Segoe MDL2 Assets");
+        }
+
+        [TestCategory("FontIconExtensionMarkupExtension")]
+        [UITestMethod]
+        public void Test_FontIconExtension_MarkupExtension_ProvideSegoeUI()
+        {
+            var treeroot = XamlReader.Load(@"<Page
+    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
+    xmlns:ex=""using:Microsoft.Toolkit.Uwp.UI.Extensions"">
+        <AppBarButton x:Name=""Check"" Icon=""{ex:FontIcon Glyph=&#xE14D;, FontFamily='Segoe UI'}""/>
+</Page>") as FrameworkElement;
+
+            var button = treeroot.FindChildByName("Check") as AppBarButton;
+
+            Assert.IsNotNull(button, $"Could not find the {nameof(AppBarButton)} control in tree.");
+
+            var icon = button.Icon as FontIcon;
+
+            Assert.IsNotNull(icon, $"Could not find the {nameof(FontIcon)} element in button.");
+
+            Assert.AreEqual(icon.Glyph, "\uE105", "Expected icon glyph to be E105.");
+            Assert.AreEqual(icon.FontFamily.Source, "Segoe MDL2 Assets", "Expected font family to be Segoe UI");
+        }
+    }
+}

UnitTests/UnitTests.csproj

@@ -134,6 +134,7 @@
     <Compile Include="Converters\Test_StringFormatConverter.cs" />
     <Compile Include="Extensions\Helpers\ObjectWithNullableBoolProperty.cs" />
     <Compile Include="Extensions\Test_ArrayExtensions.cs" />
+    <Compile Include="Extensions\Test_FontIconExtensionMarkupExtension.cs" />
     <Compile Include="Extensions\Test_NullableBoolMarkupExtension.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Helpers\Test_AdvancedCollectionView.cs" />