From acfb64b39e0ca38b62e4e65787c91d3cb849f93f Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Tue, 10 Oct 2023 18:26:46 +0000
Subject: [PATCH] chore: Remove CheckBox workarounds from Skia/Wasm (#1202)

---
 src/library/Uno.Cupertino/Styles/Controls/CheckBox.xaml   | 8 ++++----
 src/library/Uno.Cupertino/Uno.Cupertino.csproj            | 4 ++--
 src/library/Uno.Material/Styles/Controls/v1/CheckBox.xaml | 8 ++++----
 src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml | 8 ++++----
 src/library/Uno.Material/Uno.Material.csproj              | 4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/library/Uno.Cupertino/Styles/Controls/CheckBox.xaml b/src/library/Uno.Cupertino/Styles/Controls/CheckBox.xaml
index eaf78f875..6f0e760f7 100644
--- a/src/library/Uno.Cupertino/Styles/Controls/CheckBox.xaml
+++ b/src/library/Uno.Cupertino/Styles/Controls/CheckBox.xaml
@@ -4,10 +4,10 @@
 					xmlns:android="http://uno.ui/android"
 					xmlns:ios="http://uno.ui/ios"
 					xmlns:not_ios="http://uno.ui/not_ios"
-					xmlns:wasm="http://uno.ui/wasm"
 					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:xamarin="http://uno.ui/xamarin"
-					mc:Ignorable="android ios not_ios wasm xamarin">
+					xmlns:mobile="http://uno.ui/mobile"
+					mc:Ignorable="android ios not_ios xamarin mobile">
 
 	<x:String x:Key="HyphenGlyphPathStyle">M0,0L32,0 32,5.3 0,5.3z</x:String>
 	<x:String x:Key="CheckGlyphPathStyle">M28.718018,0L32,3.2819897 10.666016,24.616999 0,13.951997 3.2810059,10.670007 10.666016,18.055033z</x:String>
@@ -286,7 +286,7 @@
 								  Height="4"
 								  Opacity="0"
 								  AutomationProperties.AccessibilityView="Raw"
-								  xamarin:Margin="0,2,0,0" />
+								  mobile:Margin="0,2,0,0" />
 
 							<Path x:Name="CheckGlyph"
 								  Data="{StaticResource CheckGlyphPathStyle}"
@@ -298,7 +298,7 @@
 								  Height="12"
 								  Opacity="0"
 								  AutomationProperties.AccessibilityView="Raw"
-								  xamarin:Margin="0,2,0,0" />
+								  mobile:Margin="0,2,0,0" />
 						</Grid>
 
 						<ContentPresenter x:Name="ContentPresenter"
diff --git a/src/library/Uno.Cupertino/Uno.Cupertino.csproj b/src/library/Uno.Cupertino/Uno.Cupertino.csproj
index f38866575..80899138d 100644
--- a/src/library/Uno.Cupertino/Uno.Cupertino.csproj
+++ b/src/library/Uno.Cupertino/Uno.Cupertino.csproj
@@ -51,9 +51,9 @@
 			</PropertyGroup>
 
 			<ItemGroup>
-				<PackageReference Include="Uno.WinUI" Version="5.0.0-dev.1148" />
+				<PackageReference Include="Uno.WinUI" Version="5.0.0-dev.2572" />
 
-				<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.0-dev.1148" Condition="!$(_IsWinUI)" />
+				<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.0-dev.2572" Condition="!$(_IsWinUI)" />
 
 				<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.0" Condition="$(_IsWinUI)" />
 				<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" Condition="$(_IsWinUI)" />
diff --git a/src/library/Uno.Material/Styles/Controls/v1/CheckBox.xaml b/src/library/Uno.Material/Styles/Controls/v1/CheckBox.xaml
index 3ca4090df..ee0d4c96d 100644
--- a/src/library/Uno.Material/Styles/Controls/v1/CheckBox.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v1/CheckBox.xaml
@@ -4,10 +4,10 @@
 					xmlns:android="http://uno.ui/android"
 					xmlns:ios="http://uno.ui/ios"
 					xmlns:not_ios="http://uno.ui/not_ios"
-					xmlns:wasm="http://uno.ui/wasm"
 					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:xamarin="http://uno.ui/xamarin"
-					mc:Ignorable="android ios not_ios wasm xamarin">
+					xmlns:mobile="http://uno.ui/mobile"
+					mc:Ignorable="android ios not_ios xamarin mobile">
 
 	<x:String x:Key="CheckBoxHyphenGlyphPathStyle">M0,0L32,0 32,5.3 0,5.3z</x:String>
 	<x:String x:Key="CheckBoxCheckGlyphPathStyle">M28.718018,0L32,3.2819897 10.666016,24.616999 0,13.951997 3.2810059,10.670007 10.666016,18.055033z</x:String>
@@ -497,7 +497,7 @@
 								  Height="4"
 								  Opacity="0"
 								  AutomationProperties.AccessibilityView="Raw"
-								  xamarin:Margin="0,2,0,0" />
+								  mobile:Margin="0,2,0,0" />
 
 							<Path x:Name="CheckGlyph"
 								  Data="{StaticResource CheckBoxCheckGlyphPathStyle}"
@@ -509,7 +509,7 @@
 								  Height="12"
 								  Opacity="0"
 								  AutomationProperties.AccessibilityView="Raw"
-								  xamarin:Margin="0,2,0,0" />
+								  mobile:Margin="0,2,0,0" />
 						</Grid>
 
 						<ContentPresenter x:Name="ContentPresenter"
diff --git a/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml b/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml
index 59788f55b..994d1c794 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml
@@ -5,10 +5,10 @@
 					xmlns:android="http://uno.ui/android"
 					xmlns:ios="http://uno.ui/ios"
 					xmlns:not_ios="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-					xmlns:wasm="http://uno.ui/wasm"
 					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:xamarin="http://uno.ui/xamarin"
-					mc:Ignorable="android ios wasm xamarin">
+					xmlns:mobile="http://uno.ui/mobile"
+					mc:Ignorable="android ios xamarin mobile">
 
 	<ResourceDictionary.ThemeDictionaries>
 		<ResourceDictionary x:Key="Default">
@@ -582,7 +582,7 @@
 								  Height="4"
 								  Opacity="0"
 								  AutomationProperties.AccessibilityView="Raw"
-								  xamarin:Margin="0,2,0,0" />
+								  mobile:Margin="0,2,0,0" />
 
 							<Path x:Name="CheckGlyph"
 								  Data="{ThemeResource CheckBoxCheckGlyphPathData}"
@@ -594,7 +594,7 @@
 								  Height="12"
 								  Opacity="0"
 								  AutomationProperties.AccessibilityView="Raw"
-								  xamarin:Margin="0,2,0,0" />
+								  mobile:Margin="0,2,0,0" />
 						</Grid>
 
 						<ContentPresenter x:Name="ContentPresenter"
diff --git a/src/library/Uno.Material/Uno.Material.csproj b/src/library/Uno.Material/Uno.Material.csproj
index b6e437962..e93d14f4d 100644
--- a/src/library/Uno.Material/Uno.Material.csproj
+++ b/src/library/Uno.Material/Uno.Material.csproj
@@ -56,9 +56,9 @@
 			</PropertyGroup>
 
 			<ItemGroup>
-				<PackageReference Include="Uno.WinUI" Version="5.0.0-dev.1148" />
+				<PackageReference Include="Uno.WinUI" Version="5.0.0-dev.2572" />
 
-				<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.0-dev.1148" Condition="!$(_IsWinUI)" />
+				<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.0-dev.2572" Condition="!$(_IsWinUI)" />
 
 				<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.0" Condition="$(_IsWinUI)" />
 				<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" Condition="$(_IsWinUI)" />