Merge pull request #21661 from ramezgerges/unicode_text

Unicode text

Author: MartinZikmund

src/Directory.Build.targets

@@ -65,6 +65,7 @@
 		<MicrosoftTestingPlatformVersion>1.9.0</MicrosoftTestingPlatformVersion>
 		<SkiaSharpVersion>3.119.0</SkiaSharpVersion>
 		<HarfbuzzSharpVersion>8.3.1.1</HarfbuzzSharpVersion>
+		<UnoICUVersion>77.1.0-dev.45</UnoICUVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -162,6 +163,12 @@
 		<PackageReference Update="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.28" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Update="Uno.icu-macos" Version="$(UnoICUVersion)" />
+		<PackageReference Update="Uno.icu-wasm" Version="$(UnoICUVersion)" />
+		<PackageReference Update="Uno.icu-ios" Version="$(UnoICUVersion)" />
+	</ItemGroup>
+
 	<Target Name="ValidateSolutionPath" BeforeTargets="Build">
 		<Error Condition="$(MSBuildThisFileDirectory.Contains(' '))"
 			 Text="The Uno.UI Solution cannot build with a space in the path. Consider changing to a path without spaces."/>

src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.cs

@@ -590,13 +590,13 @@ private string GetTestResultIcon(TestResult testResult)
 				default:
 				case TestResult.Error:
 				case TestResult.Failed:
-					return "❌ (F)";
+					return "\uE711 (F)";
 
 				case TestResult.Skipped:
-					return "🚫 (I)";
+					return "\uEE35 (I)";
 
 				case TestResult.Passed:
-					return "✔️ (S)";
+					return "\uE73E️ (S)";
 			}
 		}
 

src/Uno.UI.Runtime.Skia.AppleUIKit/Uno.UI.Runtime.Skia.AppleUIKit.csproj

@@ -47,6 +47,7 @@
 		<PackageReference Include="SkiaSharp" />
 		<PackageReference Include="HarfBuzzSharp" />
 		<PackageReference Include="SkiaSharp.Views" />
+		<PackageReference Include="Uno.icu-ios" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Uno.UI.Runtime.Skia.MacOS/Uno.UI.Runtime.Skia.MacOS.csproj

@@ -29,6 +29,7 @@
 		<PackageReference Include="HarfBuzzSharp.NativeAssets.macOS" />
 		<PackageReference Include="HarfBuzzSharp" />
 		<PackageReference Include="SkiaSharp" />
+		<PackageReference Include="Uno.icu-macos" />
 	</ItemGroup>
 
 	<PropertyGroup>

src/Uno.UI.Runtime.Skia.WebAssembly.Browser/Uno.UI.Runtime.Skia.WebAssembly.Browser.csproj

@@ -37,6 +37,7 @@
 		<PackageReference Include="SkiaSharp" />
 		<PackageReference Include="HarfBuzzSharp" />
 		<PackageReference Include="Microsoft.TypeScript.MSBuild" PrivateAssets="all" />
+		<PackageReference Include="Uno.icu-wasm" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Uno.UI.Runtime.Skia.Win32/Uno.UI.Runtime.Skia.Win32.csproj

@@ -29,6 +29,7 @@
 
 		<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
 		<PackageReference Include="HarfBuzzSharp" />
+		<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Uno.UI.Runtime.Skia.Wpf/Uno.UI.Runtime.Skia.Wpf.csproj

@@ -29,6 +29,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Web.WebView2" Aliases="WpfWebView" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
 
 		<!-- 
 			Required to ensure that this reference is latest and not

src/Uno.UI.RuntimeTests/Tests/HotReload/Frame/HRApp/Uno.UI.RuntimeTests.HRApp.Skia.csproj

@@ -45,6 +45,7 @@
 		<PackageReference Include="Uno.UI.RuntimeTests.Engine" Version="0.36.0-dev.124" />
 		<PackageReference Include="Uno.Fonts.Fluent" />
 		<PackageReference Include="Uno.Fonts.OpenSans" Version="2.7.1" />
+		<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
 
 		<!--
 		<PackageReference Include="Uno.Resizetizer" Version="1.0.4" />

src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBlock.cs

@@ -155,10 +155,9 @@ public async Task Check_FontFallback()
 			await ImageAssert.AreSimilarAsync(screenshot1, screenshot2, imperceptibilityThreshold: 0.15);
 		}
 
-		// Reason for failure on X11 is not very known, but it's likely the AdvanceX of space character
-		// is different between the fallback font and OpenSans
 		[TestMethod]
-		[PlatformCondition(ConditionMode.Exclude, RuntimeTestPlatforms.SkiaX11 | RuntimeTestPlatforms.SkiaWasm)]
+		// Different platforms will resolve SKFontManager.Default.MatchCharacter to different fonts
+		[PlatformCondition(ConditionMode.Include, RuntimeTestPlatforms.SkiaWin32)]
 		public async Task Check_FontFallback_Shaping()
 		{
 			var SUT = new TextBlock
@@ -169,7 +168,6 @@ public async Task Check_FontFallback_Shaping()
 			};
 
 			var skFont = FontDetailsCache.GetFont(SUT.FontFamily?.Source, (float)SUT.FontSize, SUT.FontWeight, SUT.FontStretch, SUT.FontStyle).details.SKFont;
-			var familyName = skFont.Typeface.FamilyName;
 			Assert.IsFalse(skFont.ContainsGlyph(SUT.Text[0]));
 
 			var fallbackFont = SKFontManager.Default.MatchCharacter(SUT.Text[0]);
@@ -656,40 +654,12 @@ public async Task When_Changing_Text_Through_Inlines()
 #endif
 
 		[TestMethod]
-		public async Task When_FontFamily_In_Separate_Assembly()
+		[PlatformCondition(ConditionMode.Include, RuntimeTestPlatforms.Skia)]
+		[DataRow("ms-appx:///Assets/Fonts/CascadiaCode-Regular.ttf")]
+		[DataRow("ms-appx:///Uno.UI.RuntimeTests/Assets/Fonts/Roboto-Regular.ttf")]
+		public async Task When_FontFamily_Changed(string font)
 		{
-			var SUT = new TextBlock { Text = "\xE102\xE102\xE102\xE102\xE102" };
-			WindowHelper.WindowContent = SUT;
-			await WindowHelper.WaitForIdle();
-
-			var size = new Size(1000, 1000);
-			SUT.Measure(size);
-
-			var originalSize = SUT.DesiredSize;
-
-			Assert.AreNotEqual(0, SUT.DesiredSize.Width);
-			Assert.AreNotEqual(0, SUT.DesiredSize.Height);
-
-			SUT.FontFamily = new Microsoft.UI.Xaml.Media.FontFamily("ms-appx:///Uno.UI.RuntimeTests/Assets/Fonts/uno-fluentui-assets-runtimetest01.ttf");
-
-			int counter = 3;
-
-			do
-			{
-				await WindowHelper.WaitForIdle();
-				await Task.Delay(100);
-
-				SUT.InvalidateMeasure();
-			}
-			while (SUT.DesiredSize == originalSize && counter-- > 0);
-
-			Assert.AreNotEqual(originalSize, SUT.DesiredSize);
-		}
-
-		[TestMethod]
-		public async Task When_FontFamily_Default()
-		{
-			var SUT = new TextBlock { Text = "\xE102\xE102\xE102\xE102\xE102" };
+			var SUT = new TextBlock { Text = "abcd" };
 			WindowHelper.WindowContent = SUT;
 			await WindowHelper.WaitForIdle();
 
@@ -701,7 +671,7 @@ public async Task When_FontFamily_Default()
 			Assert.AreNotEqual(0, SUT.DesiredSize.Width);
 			Assert.AreNotEqual(0, SUT.DesiredSize.Height);
 
-			SUT.FontFamily = Application.Current.Resources["SymbolThemeFontFamily"] as FontFamily;
+			SUT.FontFamily = new FontFamily(font);
 
 			int counter = 3;
 

src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBox.skia.cs

@@ -22,6 +22,7 @@
 using Windows.System;
 using Windows.UI;
 using Windows.UI.Input.Preview.Injection;
+using Uno.UI.Xaml.Media;
 using static Private.Infrastructure.TestServices;
 using Color = Windows.UI.Color;
 using Point = Windows.Foundation.Point;
@@ -2058,6 +2059,7 @@ public async Task When_Paste_History_Remains_Intact()
 			var text = "copied content";
 			dp.SetText(text);
 			Clipboard.SetContent(dp);
+			await Task.Delay(500);
 
 			// This actually matches WinUI. text comes before "initial" and text2 comes after text
 
@@ -2069,6 +2071,7 @@ public async Task When_Paste_History_Remains_Intact()
 			var text2 = "copied content 2";
 			dp2.SetText(text2);
 			Clipboard.SetContent(dp2);
+			await Task.Delay(500);
 
 			SUT.PasteFromClipboard();
 			await WindowHelper.WaitForIdle();
@@ -2738,7 +2741,7 @@ public async Task When_Multiline_Pointer_Tap()
 			using var mouse = injector.GetMouse();
 
 			var bounds = SUT.GetAbsoluteBounds();
-			mouse.MoveTo(bounds.GetCenter());
+			mouse.MoveTo(bounds.Location.Offset(145, 50));
 			await WindowHelper.WaitForIdle();
 
 			mouse.Press();
@@ -2956,8 +2959,8 @@ public async Task When_Multiline_Pointer_TripleTap()
 			mouse.Release();
 			await WindowHelper.WaitForIdle();
 
-			Assert.AreEqual(13, SUT.SelectionStart);
-			Assert.AreEqual(26, SUT.SelectionLength);
+			Assert.AreEqual(25, SUT.SelectionStart);
+			Assert.AreEqual(14, SUT.SelectionLength);
 		}
 
 		[TestMethod]
@@ -4214,10 +4217,10 @@ public async Task When_Caret_Color_DarkMode()
 			{
 				await Task.Delay(random.Next(75, 126));
 				var screenshot = await UITestHelper.ScreenShot(SUT);
-				// For some reason, the caret sometimes appears black, and sometimes as very dark grey (#FF030303), so we check for both
-				Color[] blacks = [Colors.Black, Colors.FromARGB(0xFF, 0x03, 0x03, 0x03)];
-				if (blacks.Any(b => HasColorInRectangle(screenshot, new Rectangle(0, 0, screenshot.Width / 2, screenshot.Height), b)) &&
-					blacks.All(b => !HasColorInRectangle(screenshot, new Rectangle(screenshot.Width / 2, 0, screenshot.Width / 2, screenshot.Height), Colors.Black)))
+				// this color is the result of alpha blending 0xE4000000 (the default caret color) on top of 0xFFFFFFFF
+				var black = Colors.White.AlphaBlend(((SolidColorBrush)DefaultBrushes.TextForegroundBrush).Color);
+				if (HasColorInRectangle(screenshot, new Rectangle(0, 0, screenshot.Width / 2, screenshot.Height), black) &&
+					!HasColorInRectangle(screenshot, new Rectangle(screenshot.Width / 2, 0, screenshot.Width / 2, screenshot.Height), black))
 				{
 					break;
 				}