Fixed wrong font path in FontImageSourceHandler UWP (#12362) fixes #12344 fixes #12635

Author: jsuarezruiz

Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/materialdesignicons-webfont.ttf

@@ -279,6 +279,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Assets\Fonts\materialdesignicons-webfont.ttf" />
     <None Include="Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<controls:TestContentPage
+	xmlns:controls="clr-namespace:Xamarin.Forms.Controls"
+	xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Xamarin.Forms.Controls.Issues.Issue12344"
+    Title="Issue 12344">
+    <ContentPage.Resources>
+        <OnPlatform x:Key="MaterialFontFamily" x:TypeArguments="x:String">
+            <On Platform="UWP" Value="Assets/Fonts/materialdesignicons-webfont.ttf#Material Design Icons" />
+        </OnPlatform>
+    </ContentPage.Resources>
+    <StackLayout>
+        <Label
+            Padding="12"
+            BackgroundColor="Black"
+            TextColor="White"
+            Text="If you can see the icon, the test has passed." />
+        <Image
+            HeightRequest="44"
+            HorizontalOptions="CenterAndExpand"
+            VerticalOptions="CenterAndExpand"
+            WidthRequest="44">
+            <Image.Source>
+                <FontImageSource
+                    FontFamily="{DynamicResource MaterialFontFamily}"
+                    Glyph="&#xf10b;"
+                    Size="44"
+                    Color="Black" />
+            </Image.Source>
+        </Image>
+    </StackLayout>
+</controls:TestContentPage>

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue12344.xaml

@@ -0,0 +1,22 @@
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+
+namespace Xamarin.Forms.Controls.Issues
+{
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Github, 12344, "[Bug] FontImageSource does not work on UWP", PlatformAffected.UWP)]
+	public partial class Issue12344 : TestContentPage
+	{
+		public Issue12344()
+		{
+#if APP
+			InitializeComponent();
+#endif
+		}
+
+		protected override void Init()
+		{
+
+		}
+	}
+}

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue12344.xaml.cs

@@ -29,6 +29,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Issue10744.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue10909.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue11769.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Issue12344.xaml.cs">
+      <DependentUpon>Issue12344.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Issue12246.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue8613.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue9137.cs" />
@@ -2256,4 +2259,10 @@
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue12344.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems

@@ -5,7 +5,6 @@
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.Graphics.Canvas.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media;
 using WFontIconSource = Microsoft.UI.Xaml.Controls.FontIconSource;
 
 namespace Xamarin.Forms.Platform.UWP
@@ -23,19 +22,9 @@ public sealed class FontImageSourceHandler : IImageSourceHandler, IIconElementHa
 			var device = CanvasDevice.GetSharedDevice();
 			var dpi = Math.Max(_minimumDpi, Windows.Graphics.Display.DisplayInformation.GetForCurrentView().LogicalDpi);
 
-			// There's really no perfect solution to handle font families with fallbacks (comma-separated)
-			// So if the font family has fallbacks, only the first one is taken, because CanvasTextFormat
-			// only supports one font family
-
-			var fontFamily = fontsource.FontFamily.ToFontFamily();
-			var allFamilies = fontFamily.Source.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-
-			if (allFamilies.Length < 1)
-				return null;
-
 			var textFormat = new CanvasTextFormat
 			{
-				FontFamily = allFamilies[0],
+				FontFamily = GetFontSource(fontsource),
 				FontSize = (float)fontsource.Size,
 				HorizontalAlignment = CanvasHorizontalAlignment.Center,
 				VerticalAlignment = CanvasVerticalAlignment.Center,
@@ -105,5 +94,36 @@ public sealed class FontImageSourceHandler : IImageSourceHandler, IIconElementHa
 
 			return Task.FromResult(image);
 		}
+
+		string GetFontSource(FontImageSource fontImageSource)
+		{
+			if (fontImageSource == null)
+				return string.Empty;
+
+			var fontFamily = fontImageSource.FontFamily.ToFontFamily();
+
+			string fontSource = fontFamily.Source;
+
+			var allFamilies = fontFamily.Source.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+			if (allFamilies.Length > 1)
+			{       
+				// There's really no perfect solution to handle font families with fallbacks (comma-separated)	
+				// So if the font family has fallbacks, only one is taken, because CanvasTextFormat	
+				// only supports one font family
+				string source = fontImageSource.FontFamily;
+
+				foreach(var family in allFamilies)
+				{
+					if(family.Contains(source))
+					{
+						fontSource = family;
+						break;
+					}
+				}
+			}
+
+			return fontSource;
+		}
 	}
 }