feat(android): Proper FontWeight support

unoplatform · Jun 26, 2024 · d4e9c74 · d4e9c74
1 parent e43bbeb
commit d4e9c74
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 23 deletions.
diff --git a/src/Uno.UI/Controls/PaintPool.Android.cs b/src/Uno.UI/Controls/PaintPool.Android.cs
@@ -127,13 +127,11 @@ private static TextPaint InnerBuildPaint(FontWeight fontWeight, FontStyle fontSt
 		{
 			var paintSpecs = BuildPaintValueSpecs(fontSize, characterSpacing);
 
-			var typefaceStyle = TypefaceStyleHelper.GetTypefaceStyle(fontStyle, fontWeight);
-
 			return TextPaintPoolNative.BuildPaint(
 				paintSpecs.density,
 				paintSpecs.textSize,
 				paintSpecs.letterSpacing,
-				FontHelper.FontFamilyToTypeFace(fontFamily, fontWeight, typefaceStyle),
+				FontHelper.FontFamilyToTypeFace(fontFamily, fontWeight, fontStyle),
 				(int)((Android.Graphics.Color)foreground),
 				(textDecorations & TextDecorations.Underline) == TextDecorations.Underline,
 				(textDecorations & TextDecorations.Strikethrough) == TextDecorations.Strikethrough,

diff --git a/src/Uno.UI/TypefaceStyleHelper.Android.cs b/src/Uno.UI/TypefaceStyleHelper.Android.cs
@@ -9,7 +9,7 @@ namespace Uno.UI
 {
 	internal static class TypefaceStyleHelper
 	{
-		internal static TypefaceStyle GetTypefaceStyle(FontStyle fontStyle, FontWeight fontWeight)
+		internal static TypefaceStyle GetTypefaceStyle(bool italic, FontWeight fontWeight)
 		{
 			var style = TypefaceStyle.Normal;
 
@@ -18,7 +18,7 @@ internal static TypefaceStyle GetTypefaceStyle(FontStyle fontStyle, FontWeight f
 				style |= TypefaceStyle.Bold;
 			}
 
-			if (fontStyle == FontStyle.Italic)
+			if (italic)
 			{
 				style |= TypefaceStyle.Italic;
 			}

diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.Android.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.Android.cs
@@ -387,10 +387,8 @@ private void UpdateInputScope(InputScope inputScope)
 		{
 			if (Parent != null && _textBoxView != null)
 			{
-				var style = TypefaceStyleHelper.GetTypefaceStyle(FontStyle, FontWeight);
-				var typeface = FontHelper.FontFamilyToTypeFace(FontFamily, FontWeight);
-
-				_textBoxView.SetTypeface(typeface, style);
+				var typeface = FontHelper.FontFamilyToTypeFace(FontFamily, FontWeight, FontStyle);
+				_textBoxView.Typeface = typeface;
 				_textBoxView.SetTextSize(ComplexUnitType.Px, (float)Math.Round(ViewHelper.LogicalToPhysicalFontPixels((float)FontSize)));
 			}
 		}

diff --git a/src/Uno.UI/UI/Xaml/Extensions/FontHelper.Android.cs b/src/Uno.UI/UI/Xaml/Extensions/FontHelper.Android.cs
@@ -22,20 +22,21 @@ internal partial class FontHelper
 		private static bool _assetsListed;
 		private static readonly string DefaultFontFamilyName = "sans-serif";
 
-		internal static Typeface? FontFamilyToTypeFace(FontFamily? fontFamily, FontWeight fontWeight, TypefaceStyle style = TypefaceStyle.Normal)
+		internal static Typeface? FontFamilyToTypeFace(FontFamily? fontFamily, FontWeight fontWeight, FontStyle fontStyle)
 		{
-			var entry = new FontFamilyToTypeFaceDictionary.Entry(fontFamily?.Source, fontWeight, style);
+			var italic = fontStyle is FontStyle.Italic or FontStyle.Oblique;
+			var entry = new FontFamilyToTypeFaceDictionary.Entry(fontFamily?.Source, fontWeight, italic);
 
 			if (!_fontFamilyToTypeFaceDictionary.TryGetValue(entry, out var typeFace))
 			{
-				typeFace = InternalFontFamilyToTypeFace(fontFamily, fontWeight, style);
+				typeFace = InternalFontFamilyToTypeFace(fontFamily, fontWeight, italic);
 				_fontFamilyToTypeFaceDictionary.Add(entry, typeFace);
 			}
 
 			return typeFace;
 		}
 
-		internal static Typeface? InternalFontFamilyToTypeFace(FontFamily? fontFamily, FontWeight fontWeight, TypefaceStyle style)
+		internal static Typeface? InternalFontFamilyToTypeFace(FontFamily? fontFamily, FontWeight fontWeight, bool italic)
 		{
 			if (fontFamily?.Source == null || fontFamily.Equals(FontFamily.Default))
 			{
@@ -58,22 +59,27 @@ internal partial class FontHelper
 
 					source = source.TrimStart("ms-appx://", ignoreCase: true);
 
-					if (!TryLoadFromPath(style, source, out typeface))
+					if (!TryLoadFromPath(fontWeight.Weight, italic, source, out typeface))
 					{
 						// The lookup used to be performed without the assets folder, even if its required to specify it
 						// with UWP. Keep this behavior for backward compatibility.
 						var legacySource = source.TrimStart("/assets/", ignoreCase: true);
 
 						// The path for AndroidAssets is not encoded, unlike assets processed by the RetargetAssets tool.
-						if (!TryLoadFromPath(style, legacySource, out typeface, encodePath: false))
+						if (!TryLoadFromPath(fontWeight.Weight, italic, legacySource, out typeface, encodePath: false))
 						{
 							throw new InvalidOperationException($"Unable to find [{fontFamily.Source}] from the application's assets.");
 						}
 					}
 				}
 				else
 				{
+					var style = TypefaceStyleHelper.GetTypefaceStyle(italic, fontWeight);
 					typeface = Android.Graphics.Typeface.Create(fontFamily.Source, style);
+					if (typeface is not null && typeface.Weight != fontWeight.Weight)
+					{
+						typeface = Android.Graphics.Typeface.Create(typeface, fontWeight.Weight, italic);
+					}
 				}
 
 				return typeface;
@@ -100,7 +106,7 @@ internal partial class FontHelper
 			}
 		}
 
-		private static bool TryLoadFromPath(TypefaceStyle style, string source, out Typeface? typeface, bool encodePath = true)
+		private static bool TryLoadFromPath(int weight, bool italic, string source, out Typeface? typeface, bool encodePath = true)
 		{
 			source = FontFamilyHelper.RemoveHashFamilyName(source);
 
@@ -122,9 +128,9 @@ private static bool TryLoadFromPath(TypefaceStyle style, string source, out Type
 
 				if (typeface is not null)
 				{
-					if (style != typeface.Style)
+					if (typeface.Weight != weight || typeface.IsItalic != italic)
 					{
-						typeface = Typeface.Create(typeface, style);
+						typeface = Typeface.Create(typeface, weight, italic);
 					}
 
 					return true;

diff --git a/src/Uno.UI/UI/Xaml/Extensions/FontHelper.Lookup.Android.cs b/src/Uno.UI/UI/Xaml/Extensions/FontHelper.Lookup.Android.cs
@@ -28,25 +28,25 @@ public class Entry
 			{
 				private readonly int _hashCode;
 
-				public Entry(string? fontFamily, FontWeight fontWeight, TypefaceStyle style)
+				public Entry(string? fontFamily, FontWeight fontWeight, bool italic)
 				{
 					FontFamily = fontFamily;
 					FontWeight = fontWeight;
-					Style = style;
-					_hashCode = (FontFamily?.GetHashCode() ?? 0) ^ FontWeight.GetHashCode() ^ Style.GetHashCode();
+					Italic = italic;
+					_hashCode = (FontFamily?.GetHashCode() ?? 0) ^ FontWeight.GetHashCode() ^ Italic.GetHashCode();
 				}
 
 				public string? FontFamily { get; }
 				public FontWeight FontWeight { get; }
-				public TypefaceStyle Style { get; }
+				public bool Italic { get; }
 
 				public override bool Equals(object? other)
 				{
 					if (other is Entry otherEntry)
 					{
 						return FontFamily == otherEntry.FontFamily
 							&& FontWeight == otherEntry.FontWeight
-							&& Style == otherEntry.Style;
+							&& Italic == otherEntry.Italic;
 					}
 
 					return false;