fix: fix progressring lottie source from uwp/winui split (#1367)

* fix: fix progressring lottie source from uwp/winui split * chore: rename namespace aliases
unoplatform · Mar 25, 2024 · d2eb75c · d2eb75c
1 parent 2fa3e59
commit d2eb75c
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 12 deletions.
diff --git a/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml b/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml
@@ -5,14 +5,18 @@
 					xmlns:not_win="http://uno.ui/not_win"
 					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+					xmlns:uwp="http://uno.ui/uwp"
+					xmlns:winui="http://uno.ui/winui"
 					xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie"
-					mc:Ignorable="d not_win lottie_not_win">
+					mc:Ignorable="d not_win lottie_not_win uwp winui">
 	<ResourceDictionary.MergedDictionaries>
 		<not_win:ResourceDictionary>
 			<lottie_not_win:LottieVisualSource x:Key="CupertinoDeterminateAnimation_Uno"
-											   UriSource="embedded://Uno.Cupertino/Uno.Cupertino.Assets.CupertinoProgressRing.json" />
+											   uwp:UriSource="embedded://Uno.Cupertino/Uno.Cupertino.Assets.CupertinoProgressRing.json"
+											   winui:UriSource="embedded://Uno.Cupertino.WinUI/Uno.Cupertino.WinUI.Assets.CupertinoProgressRing.json" />
 			<lottie_not_win:LottieVisualSource x:Key="CupertinoIndeterminateAnimation_Uno"
-											   UriSource="embedded://Uno.Cupertino/Uno.Cupertino.Assets.CupertinoProgressRing.json" />
+											   uwp:UriSource="embedded://Uno.Cupertino/Uno.Cupertino.Assets.CupertinoProgressRing.json"
+											   winui:UriSource="embedded://Uno.Cupertino.WinUI/Uno.Cupertino.WinUI.Assets.CupertinoProgressRing.json" />
 
 		</not_win:ResourceDictionary>
 	</ResourceDictionary.MergedDictionaries>

diff --git a/src/library/Uno.Cupertino/cupertino-common.props b/src/library/Uno.Cupertino/cupertino-common.props
@@ -1,4 +1,4 @@
-<Project>
+<Project>
 	<PropertyGroup>
 		<AllowedOutputExtensionsInPackageBuildOutputFolder>.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
 		<DebugSymbols>true</DebugSymbols>
@@ -26,6 +26,29 @@
 		</Otherwise>
 	</Choose>
 
+	<!-- NOTE: These two conditionals ONLY work under Uno targets and not Windows Desktop so they need to be used within the context of not_win or finer constraints -->
+	<!-- Make sure to add these aliases to the mc:Ignorable when using -->
+	<Choose>
+		<When Condition="'$(FrameworkLineage)'=='UWP'">
+			<ItemGroup>
+				<IncludeXamlNamespaces Include="uwp" />
+				<ExcludeXamlNamespaces Include="winui" />
+			</ItemGroup>
+		</When>
+		<When Condition="'$(FrameworkLineage)'=='WinUI'">
+			<ItemGroup>
+				<IncludeXamlNamespaces Include="winui" />
+				<ExcludeXamlNamespaces Include="uwp" />
+			</ItemGroup>
+		</When>
+		<Otherwise>
+			<ItemGroup>
+				<ExcludeXamlNamespaces Include="winui" />
+				<ExcludeXamlNamespaces Include="uwp" />
+			</ItemGroup>
+		</Otherwise>
+	</Choose>
+
 	<ItemGroup>
 		<LottieJson Include="Assets\CupertinoProgressRing.json" />
 	</ItemGroup>
@@ -69,4 +92,4 @@
 	</ItemGroup>
 
 	<Import Project="..\xamlmerge.targets" />
-</Project>
+</Project>
diff --git a/src/library/Uno.Material/Styles/Controls/v1/ProgressRing.xaml b/src/library/Uno.Material/Styles/Controls/v1/ProgressRing.xaml
@@ -6,14 +6,18 @@
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 					xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
 					xmlns:not_win="http://uno.ui/not_win"
+					xmlns:uwp="http://uno.ui/uwp"
+					xmlns:winui="http://uno.ui/winui"
 					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-					mc:Ignorable="d not_win lottie_not_win">
+					mc:Ignorable="d not_win lottie_not_win uwp winui">
 	<ResourceDictionary.MergedDictionaries>
 		<not_win:ResourceDictionary>
 			<lottie_not_win:LottieVisualSource x:Key="MaterialDeterminateAnimation_Uno"
-											   UriSource="embedded://Uno.Material/Uno.Material.Assets.MaterialDeterminate.json" />
+											   uwp:UriSource="embedded://Uno.Material/Uno.Material.Assets.MaterialDeterminate.json"
+											   winui:UriSource="embedded://Uno.Material.WinUI/Uno.Material.WinUI.Assets.MaterialDeterminate.json" />
 			<lottie_not_win:LottieVisualSource x:Key="MaterialIndeterminateAnimation_Uno"
-											   UriSource="embedded://Uno.Material/Uno.Material.Assets.MaterialIndeterminate.json" />
+											   uwp:UriSource="embedded://Uno.Material/Uno.Material.Assets.MaterialIndeterminate.json"
+											   winui:UriSource="embedded://Uno.Material.WinUI/Uno.Material.WinUI.Assets.MaterialIndeterminate.json" />
 		</not_win:ResourceDictionary>
 	</ResourceDictionary.MergedDictionaries>
 

diff --git a/src/library/Uno.Material/Styles/Controls/v2/ProgressRing.xaml b/src/library/Uno.Material/Styles/Controls/v2/ProgressRing.xaml
@@ -5,16 +5,21 @@
 					xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie"
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 					xmlns:not_win="http://uno.ui/not_win"
+					xmlns:uwp="http://uno.ui/uwp"
+					xmlns:winui="http://uno.ui/winui"
+					xmlns:um="using:Uno.Material"
 					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-					mc:Ignorable="d not_win lottie_not_win">
+					mc:Ignorable="d not_win lottie_not_win uwp winui">
 
 	<ResourceDictionary.MergedDictionaries>
 		<not_win:ResourceDictionary>
 			<lottie_not_win:LottieVisualSource x:Key="MaterialDeterminateAnimation_Uno"
-											   UriSource="embedded://Uno.Material/Uno.Material.Assets.MaterialDeterminate.json" />
+											   uwp:UriSource="embedded://Uno.Material/Uno.Material.Assets.MaterialDeterminate.json"
+											   winui:UriSource="embedded://Uno.Material.WinUI/Uno.Material.WinUI.Assets.MaterialDeterminate.json" />
 			<lottie_not_win:LottieVisualSource x:Key="MaterialIndeterminateAnimation_Uno"
-											   UriSource="embedded://Uno.Material/Uno.Material.Assets.MaterialIndeterminate.json" />
+											   uwp:UriSource="embedded://Uno.Material/Uno.Material.Assets.MaterialIndeterminate.json"
+											   winui:UriSource="embedded://Uno.Material.WinUI/Uno.Material.WinUI.Assets.MaterialIndeterminate.json" />
 		</not_win:ResourceDictionary>
 	</ResourceDictionary.MergedDictionaries>
 

diff --git a/src/library/Uno.Material/material-common.props b/src/library/Uno.Material/material-common.props
@@ -28,6 +28,29 @@
 		</Otherwise>
 	</Choose>
 
+	<!-- NOTE: These two conditionals ONLY work under Uno targets and not Windows Desktop so they need to be used within the context of not_win or finer constraints -->
+	<!-- Make sure to add these aliases to the mc:Ignorable when using -->
+	<Choose>
+		<When Condition="'$(FrameworkLineage)'=='UWP'">
+			<ItemGroup>
+				<IncludeXamlNamespaces Include="uwp" />
+				<ExcludeXamlNamespaces Include="winui" />
+			</ItemGroup>
+		</When>
+		<When Condition="'$(FrameworkLineage)'=='WinUI'">
+			<ItemGroup>
+				<IncludeXamlNamespaces Include="winui" />
+				<ExcludeXamlNamespaces Include="uwp" />
+			</ItemGroup>
+		</When>
+		<Otherwise>
+			<ItemGroup>
+				<ExcludeXamlNamespaces Include="winui" />
+				<ExcludeXamlNamespaces Include="uwp" />
+			</ItemGroup>
+		</Otherwise>
+	</Choose>
+
 	<ItemGroup>
 		<LottieJson Include="Assets\MaterialDeterminate.json" />
 		<LottieJson Include="Assets\MaterialIndeterminate.json" />
@@ -111,4 +134,4 @@
 	</ItemGroup>
 
 	<Import Project="..\xamlmerge.targets" />
-</Project>
+</Project>