From 7bc77d6dd675304a6379abd26901d5a067836951 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sun, 13 Mar 2022 20:26:45 -0700
Subject: [PATCH 1/2] TextIconExtension uses Segoe Fluent Icons by default

---
 .../Extensions/Markup/Abstract/TextIconExtension.cs         | 6 +++---
 .../Extensions/Markup/FontIconExtension.cs                  | 2 +-
 .../Extensions/Markup/FontIconSourceExtension.cs            | 2 +-
 .../Extensions/Markup/SymbolIconExtension.cs                | 2 +-
 .../Extensions/Markup/SymbolIconSourceExtension.cs          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/Abstract/TextIconExtension.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/Abstract/TextIconExtension.cs
index 000b51302b5..a5bccdfc0c5 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/Abstract/TextIconExtension.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/Abstract/TextIconExtension.cs
@@ -20,14 +20,14 @@ public abstract class TextIconExtension : MarkupExtension
         public double FontSize { get; set; }
 
         [ThreadStatic]
-        private static FontFamily segoeMDL2AssetsFontFamily;
+        private static FontFamily symbolThemeFontFamily;
 
         /// <summary>
         /// Gets the reusable "Segoe MDL2 Assets" <see cref="FontFamily"/> instance.
         /// </summary>
-        protected static FontFamily SegoeMDL2AssetsFontFamily
+        protected static FontFamily SymbolThemeFontFamily
         {
-            get => segoeMDL2AssetsFontFamily ??= new FontFamily("Segoe MDL2 Assets");
+            get => symbolThemeFontFamily ??= new FontFamily("Segoe Fluent Icons,Segoe MDL2 Assets");
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconExtension.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconExtension.cs
index 6572d7c1e3d..34cd3606bc1 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconExtension.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconExtension.cs
@@ -30,7 +30,7 @@ protected override object ProvideValue()
             var fontIcon = new FontIcon
             {
                 Glyph = Glyph,
-                FontFamily = FontFamily ?? SegoeMDL2AssetsFontFamily,
+                FontFamily = FontFamily ?? SymbolThemeFontFamily,
                 FontWeight = FontWeight,
                 FontStyle = FontStyle,
                 IsTextScaleFactorEnabled = IsTextScaleFactorEnabled,
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconSourceExtension.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconSourceExtension.cs
index f152f57a0ad..c4371033a49 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconSourceExtension.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconSourceExtension.cs
@@ -30,7 +30,7 @@ protected override object ProvideValue()
             var fontIcon = new FontIconSource
             {
                 Glyph = Glyph,
-                FontFamily = FontFamily ?? SegoeMDL2AssetsFontFamily,
+                FontFamily = FontFamily ?? SymbolThemeFontFamily,
                 FontWeight = FontWeight,
                 FontStyle = FontStyle,
                 IsTextScaleFactorEnabled = IsTextScaleFactorEnabled,
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconExtension.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconExtension.cs
index 4e3528cb4f5..a7939a1e6a2 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconExtension.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconExtension.cs
@@ -24,7 +24,7 @@ protected override object ProvideValue()
             var fontIcon = new FontIcon
             {
                 Glyph = unchecked((char)Symbol).ToString(),
-                FontFamily = SegoeMDL2AssetsFontFamily,
+                FontFamily = SymbolThemeFontFamily,
                 FontWeight = FontWeight,
                 FontStyle = FontStyle,
                 IsTextScaleFactorEnabled = IsTextScaleFactorEnabled,
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconSourceExtension.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconSourceExtension.cs
index 328ac1a38cd..62354d76953 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconSourceExtension.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconSourceExtension.cs
@@ -24,7 +24,7 @@ protected override object ProvideValue()
             var fontIcon = new FontIconSource
             {
                 Glyph = unchecked((char)Symbol).ToString(),
-                FontFamily = SegoeMDL2AssetsFontFamily,
+                FontFamily = SymbolThemeFontFamily,
                 FontWeight = FontWeight,
                 FontStyle = FontStyle,
                 IsTextScaleFactorEnabled = IsTextScaleFactorEnabled,

From dc0f575788423390c2e4df58a75af257247a1a52 Mon Sep 17 00:00:00 2001
From: Tung Huynh <tung75605@gmail.com>
Date: Sun, 13 Mar 2022 21:20:26 -0700
Subject: [PATCH 2/2] update corresponding tests and comments

---
 .../Extensions/Markup/Abstract/TextIconExtension.cs           | 2 +-
 .../Extensions/Markup/FontIconExtension.cs                    | 2 +-
 .../Extensions/Markup/FontIconSourceExtension.cs              | 2 +-
 .../Extensions/Test_FontIconExtensionMarkupExtension.cs       | 4 ++--
 .../Extensions/Test_FontIconSourceExtensionMarkupExtension.cs | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/Abstract/TextIconExtension.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/Abstract/TextIconExtension.cs
index a5bccdfc0c5..d553ed25399 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/Abstract/TextIconExtension.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/Abstract/TextIconExtension.cs
@@ -23,7 +23,7 @@ public abstract class TextIconExtension : MarkupExtension
         private static FontFamily symbolThemeFontFamily;
 
         /// <summary>
-        /// Gets the reusable "Segoe MDL2 Assets" <see cref="FontFamily"/> instance.
+        /// Gets the reusable "Segoe Fluent Icons,Segoe MDL2 Assets" <see cref="FontFamily"/> instance.
         /// </summary>
         protected static FontFamily SymbolThemeFontFamily
         {
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconExtension.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconExtension.cs
index 34cd3606bc1..399960f27cf 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconExtension.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconExtension.cs
@@ -20,7 +20,7 @@ public class FontIconExtension : TextIconExtension
         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.
+        /// Gets or sets the font family to use to display the icon. If <see langword="null"/>, "Segoe Fluent Icons,Segoe MDL2 Assets" will be used.
         /// </summary>
         public FontFamily FontFamily { get; set; }
 
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconSourceExtension.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconSourceExtension.cs
index c4371033a49..3114ab09730 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconSourceExtension.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconSourceExtension.cs
@@ -20,7 +20,7 @@ public class FontIconSourceExtension : TextIconExtension
         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.
+        /// Gets or sets the font family to use to display the icon. If <see langword="null"/>, "Segoe Fluent Icons,Segoe MDL2 Assets" will be used.
         /// </summary>
         public FontFamily FontFamily { get; set; }
 
diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_FontIconExtensionMarkupExtension.cs b/UnitTests/UnitTests.UWP/Extensions/Test_FontIconExtensionMarkupExtension.cs
index f7fb4f45cc7..3b56c496749 100644
--- a/UnitTests/UnitTests.UWP/Extensions/Test_FontIconExtensionMarkupExtension.cs
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_FontIconExtensionMarkupExtension.cs
@@ -17,7 +17,7 @@ public class Test_FontIconExtensionMarkupExtension
     {
         [TestCategory("FontIconExtensionMarkupExtension")]
         [UITestMethod]
-        public void Test_FontIconExtension_MarkupExtension_ProvideSegoeMdl2Asset()
+        public void Test_FontIconExtension_MarkupExtension_ProvideSymbolThemeFont()
         {
             var treeroot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
@@ -35,7 +35,7 @@ public void Test_FontIconExtension_MarkupExtension_ProvideSegoeMdl2Asset()
             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");
+            Assert.AreEqual(icon.FontFamily.Source, "Segoe Fluent Icons,Segoe MDL2 Assets", "Expected font family to be \"Segoe Fluent Icons,Segoe MDL2 Assets\"");
         }
 
         [TestCategory("FontIconExtensionMarkupExtension")]
diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_FontIconSourceExtensionMarkupExtension.cs b/UnitTests/UnitTests.UWP/Extensions/Test_FontIconSourceExtensionMarkupExtension.cs
index fb3c81fd8ea..dd34aab47b7 100644
--- a/UnitTests/UnitTests.UWP/Extensions/Test_FontIconSourceExtensionMarkupExtension.cs
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_FontIconSourceExtensionMarkupExtension.cs
@@ -18,7 +18,7 @@ public class Test_FontIconSourceExtensionMarkupExtension
     {
         [TestCategory("FontIconSourceExtensionMarkupExtension")]
         [UITestMethod]
-        public void Test_FontIconSourceExtension_MarkupExtension_ProvideSegoeMdl2Asset()
+        public void Test_FontIconSourceExtension_MarkupExtension_ProvideSymbolThemeFont()
         {
             var treeRoot = XamlReader.Load(@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
@@ -37,7 +37,7 @@ public void Test_FontIconSourceExtension_MarkupExtension_ProvideSegoeMdl2Asset()
             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");
+            Assert.AreEqual(icon.FontFamily.Source, "Segoe Fluent Icons,Segoe MDL2 Assets", "Expected font family to be \"Segoe Fluent Icons,Segoe MDL2 Assets\"");
         }
 
         [TestCategory("FontIconSourceExtensionMarkupExtension")]