feat: Font manifest #17118

Youssef1313 · 2024-06-13T06:14:47Z

GitHub Issue (If applicable): closes #

PR Type

What kind of change does this PR introduce?

What is the current behavior?

What is the new behavior?

PR Checklist

Please check if your PR fulfills the following requirements:

Docs have been added/updated which fit documentation template (for bug fixes / features)
Unit Tests and/or UI Tests for the changes have been added (for bug fixes / features) (if applicable)
Validated PR Screenshots Compare Test Run results.
Contains NO breaking changes
Associated with an issue (GitHub or internal) and uses the automatic close keywords.
Commits must be following the Conventional Commits specification.

Other information

Internal Issue (If applicable):

unodevops · 2024-06-13T07:06:39Z

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-17118/index.html

unodevops · 2024-06-13T08:54:55Z

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-17118/index.html

unodevops · 2024-06-13T11:03:22Z

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-17118/index.html

carldebilly · 2024-06-13T14:27:53Z

Is that manifest a standard thing or something we're creating?

NVLudwig · 2024-06-13T15:04:28Z

@Youssef1313 This is a very unexpected addition.
Thank you very much.
Support for Line Height across platforms would be a game changer :)

jeromelaban · 2024-06-14T15:24:06Z

src/Uno.UI/UI/Xaml/Controls/ContentPresenter/ContentPresenter.cs

+	public FontStretch FontStretch
+	{
+		get => (FontStretch)this.GetValue(FontStretchProperty);
+		set => this.SetValue(FontStretchProperty, value);
+	}
+
+	public static DependencyProperty FontStretchProperty { get; } =
+		DependencyProperty.Register(
+			nameof(FontStretch),
+			typeof(FontStretch),
+			typeof(ContentPresenter),
+			new FrameworkPropertyMetadata(
+				FontStretch.Normal,
+				FrameworkPropertyMetadataOptions.Inherits,
+				(s, e) => ((ContentPresenter)s)?.OnFontStretchChanged((FontStretch)e.OldValue, (FontStretch)e.NewValue)
+			)
+		);


Let's use generated properties

@jeromelaban For readability or perf?

My concern with generated DPs is that they cache the value when it changes. So, it's faster, but increases the object size. So my personal view to it is "speed vs memory"

jeromelaban · 2024-06-14T15:24:20Z

src/Uno.UI/UI/Xaml/Controls/Control/Control.cs

+		public static DependencyProperty FontStretchProperty { get; } =
+			DependencyProperty.Register(
+				nameof(FontStretch),
+				typeof(FontStretch),
+				typeof(Control),
+				new FrameworkPropertyMetadata(
+					FontStretch.Normal,
+					FrameworkPropertyMetadataOptions.Inherits,
+					(s, e) => ((Control)s)?.OnFontStretchChanged((FontStretch)e.OldValue, (FontStretch)e.NewValue)
+				)
+			);


Generated properties

jeromelaban · 2024-06-14T15:24:42Z

src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.cs

+		public static DependencyProperty FontStretchProperty { get; } =
+			DependencyProperty.Register(
+				nameof(FontStretch),
+				typeof(FontStretch),
+				typeof(TextBlock),
+				new FrameworkPropertyMetadata(
+					defaultValue: FontStretch.Normal,
+					options: FrameworkPropertyMetadataOptions.Inherits,
+					propertyChangedCallback: (s, e) => ((TextBlock)s).OnFontStretchChanged()
+				)
+			);


Generated properties

src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.skia.cs

jeromelaban · 2024-06-14T15:26:08Z

src/Uno.UI/UI/Xaml/Documents/Inline.skia.cs

+				{
+					// While font family itself didn't change, OnFontFamilyChanged will invalidate whatever
+					// needed for the rendering to happen correct on the next frame.
+					_fontInfo.FontUpdated += OnFontFamilyChanged;


src/Uno.UI/UI/Xaml/Documents/Run.skia.cs

jeromelaban · 2024-06-14T15:27:06Z

src/Uno.UI/UI/Xaml/Documents/TextElement.cs

+		public static DependencyProperty FontStretchProperty { get; } =
+			DependencyProperty.Register(
+				nameof(FontStretch),
+				typeof(FontStretch),
+				typeof(TextElement),
+				new FrameworkPropertyMetadata(
+					defaultValue: FontStretch.Normal,
+					options: FrameworkPropertyMetadataOptions.Inherits,
+					propertyChangedCallback: (s, e) => ((TextElement)s).OnFontStretchChanged()
+				)
+			);


Generated properties

src/Uno.UI/UI/Xaml/Documents/TextFormatting/FontDetailsCache.skia.cs

jeromelaban · 2024-06-14T15:30:26Z

src/Uno.UI/UI/Xaml/Documents/TextFormatting/FontDetailsCache.skia.cs

+		}
+		catch
+		{
+			// manifest file is not found or cannot be read. Ignore it.


We have an existing internal API to determine the presence of a file

@jeromelaban What is it? I couldn't find it

https://platform.uno/docs/articles/features/file-management.html#support-for-library-provided-assets: StorageFileHelper.ExistsInPackage

@jeromelaban That's in Uno.UI.Toolkit 😕

src/Uno.UI/UI/Xaml/Documents/TextFormatting/FontDetailsCache.skia.cs

unodevops · 2024-06-17T14:02:08Z

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-17118/index.html

Youssef1313 · 2024-06-17T14:04:30Z

Is that manifest a standard thing or something we're creating?

@carldebilly It's something we're creating/designing ourselves.

unodevops · 2024-06-17T14:43:45Z

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-17118/index.html

unodevops · 2024-06-17T19:21:20Z

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-17118/index.html

unodevops · 2024-06-17T19:41:30Z

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-17118/index.html

unodevops · 2024-06-18T06:31:35Z

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-17118/index.html

unodevops · 2024-06-18T06:39:35Z

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-17118/index.html

unodevops · 2024-06-18T09:28:54Z

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-17118/index.html

unodevops · 2024-06-18T09:56:30Z

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-17118/index.html

unodevops · 2024-06-18T11:01:13Z

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-17118/index.html

unodevops · 2024-06-18T11:18:46Z

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-17118/index.html

unodevops · 2024-06-18T12:43:58Z

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-17118/index.html

jeromelaban · 2024-06-18T13:06:39Z

src/Uno.UI/UI/Xaml/Documents/TextFormatting/FontDetailsCache.skia.cs

+				uri = new Uri(FontManifestHelpers.GetFamilyNameFromManifest(manifestStream, weight, style, stretch));
+			}
+		}
+		catch


Let's not hide the original error

jeromelaban · 2024-06-18T13:07:44Z

src/Uno.UI/UI/Xaml/Documents/TextFormatting/FontDetailsCache.skia.cs

+			}
+		}
+
+		var file = await StorageFile.GetFileFromApplicationUriAsync(uri);


Let's log in debug that we're fetching a font

jeromelaban · 2024-06-18T13:09:06Z

src/Uno.UI/UI/Xaml/Documents/TextFormatting/FontDetailsCache.skia.cs


-			// SKTypeface.FromFile may return null if the file is not found (SkiaSharp is not yet nullable attributed)
-			skTypeFace = SKTypeface.FromFile(filePath);
+		if (Uri.TryCreate(name, UriKind.Absolute, out var uri) && uri.Scheme == "ms-appx")


We have IsLocalResource

unodevops · 2024-06-18T14:10:10Z

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-17118/index.html

unodevops · 2024-06-18T19:20:57Z

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-17118/index.html

unodevops · 2024-06-19T05:09:29Z

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-17118/index.html

unodevops · 2024-06-20T13:43:49Z

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-17118/index.html

github-actions bot added the area/skia ✏️ Categorizes an issue or PR as relevant to Skia label Jun 13, 2024

Youssef1313 force-pushed the font-manifest branch from 6c9bdd0 to 06a53a3 Compare June 13, 2024 08:18

feat: Font manifest

80e37e3

Youssef1313 force-pushed the font-manifest branch from 06a53a3 to 80e37e3 Compare June 13, 2024 10:31

github-actions bot added platform/wasm 🌐 Categorizes an issue or PR as relevant to the WebAssembly platform platform/android 🤖 Categorizes an issue or PR as relevant to the Android platform area/automation Categorizes an issue or PR as relevant to project automation labels Jun 13, 2024

jeromelaban reviewed Jun 14, 2024

View reviewed changes

chore: Address review comment

40b3407

Youssef1313 added 2 commits June 17, 2024 20:41

chore: Feedback

5366342

chore: Feedback

2fc34cf

chore: Address review comment

d28d2be

github-actions bot added platform/macos 🍏 Categorizes an issue or PR as relevant to the macOS platform platform/ios 🍎 Categorizes an issue or PR as relevant to the iOS platform labels Jun 18, 2024

chore: Font manifest for Android

8c71e1a

chore: Fix skia

44390ad

jeromelaban reviewed Jun 18, 2024

View reviewed changes

Youssef1313 force-pushed the font-manifest branch from 1201ae9 to 44390ad Compare June 20, 2024 04:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Font manifest #17118

feat: Font manifest #17118

Youssef1313 commented Jun 13, 2024

unodevops commented Jun 13, 2024

unodevops commented Jun 13, 2024

unodevops commented Jun 13, 2024

carldebilly commented Jun 13, 2024

NVLudwig commented Jun 13, 2024

jeromelaban Jun 14, 2024

Youssef1313 Jun 17, 2024

jeromelaban Jun 14, 2024

jeromelaban Jun 14, 2024

jeromelaban Jun 14, 2024

jeromelaban Jun 14, 2024

jeromelaban Jun 14, 2024

Youssef1313 Jun 17, 2024

jeromelaban Jun 17, 2024

Youssef1313 Jun 17, 2024

unodevops commented Jun 17, 2024

Youssef1313 commented Jun 17, 2024

unodevops commented Jun 17, 2024

unodevops commented Jun 17, 2024

unodevops commented Jun 17, 2024

unodevops commented Jun 18, 2024

unodevops commented Jun 18, 2024

unodevops commented Jun 18, 2024

unodevops commented Jun 18, 2024

unodevops commented Jun 18, 2024

unodevops commented Jun 18, 2024

unodevops commented Jun 18, 2024

jeromelaban Jun 18, 2024

jeromelaban Jun 18, 2024

jeromelaban Jun 18, 2024

unodevops commented Jun 18, 2024

unodevops commented Jun 18, 2024

unodevops commented Jun 19, 2024

unodevops commented Jun 20, 2024

feat: Font manifest #17118

Are you sure you want to change the base?

feat: Font manifest #17118

Conversation

Youssef1313 commented Jun 13, 2024

PR Type

What is the current behavior?

What is the new behavior?

PR Checklist

Other information

unodevops commented Jun 13, 2024

unodevops commented Jun 13, 2024

unodevops commented Jun 13, 2024

carldebilly commented Jun 13, 2024

NVLudwig commented Jun 13, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

unodevops commented Jun 17, 2024

Youssef1313 commented Jun 17, 2024

unodevops commented Jun 17, 2024

unodevops commented Jun 17, 2024

unodevops commented Jun 17, 2024

unodevops commented Jun 18, 2024

unodevops commented Jun 18, 2024

unodevops commented Jun 18, 2024

unodevops commented Jun 18, 2024

unodevops commented Jun 18, 2024

unodevops commented Jun 18, 2024

unodevops commented Jun 18, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

unodevops commented Jun 18, 2024

unodevops commented Jun 18, 2024

unodevops commented Jun 19, 2024

unodevops commented Jun 20, 2024