fix: wasm splashscreen support (#1071)

* fix: wasm splashscreen support chore: pr comments * chore: fix merge * chore: pr comments * chore: fix macos partial * chore: ExtendedSplashScreen.macOS.cs * chore: ExtendedSplashScreen.macOS.cs
unoplatform · Mar 20, 2024 · 7f3037b · 7f3037b
1 parent 3608c1d
commit 7f3037b
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/...tendedSplashScreen.Windows.NetStandard.cs → ...endedSplashScreen.Windows.crossruntime.cs b/...tendedSplashScreen.Windows.NetStandard.cs → ...endedSplashScreen.Windows.crossruntime.cs
@@ -1,4 +1,4 @@
-#if WINDOWS || WINDOWS_UWP || NET472_OR_GREATER || NETSTANDARD2_0
+#if WINDOWS || WINDOWS_UWP || __SKIA_OR_WASM__
 using System;
 using System.Linq;
 using System.Threading;

diff --git a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.cs b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.cs
@@ -95,15 +95,4 @@ private async Task LoadNativeSplashScreen()
 			SplashScreenContent = splashScreenContent;
 		}
 	}
-
-
-#if !__ANDROID__ && !__IOS__ && !(WINDOWS || WINDOWS_UWP) && !NETSTANDARD2_0
-	private static Task<FrameworkElement?> GetNativeSplashScreen()
-	{
-		return Task.FromResult<FrameworkElement?>(null);
-	}
-
-	public bool SplashIsEnabled => (Platforms & SplashScreenPlatform.All) != 0;
-#endif
-
 }
diff --git a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.macOS.cs b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.macOS.cs
@@ -0,0 +1,21 @@
+#if !__ANDROID__ && !__IOS__ && !(WINDOWS || WINDOWS_UWP) && !__SKIA_OR_WASM__
+
+#if IS_WINUI
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml;
+#endif
+using System.Threading.Tasks;
+
+namespace Uno.Toolkit.UI;
+
+public partial class ExtendedSplashScreen
+{
+	private static Task<FrameworkElement?> GetNativeSplashScreen()
+	{
+		return Task.FromResult<FrameworkElement?>(null);
+	}
+
+	public bool SplashIsEnabled => (Platforms & SplashScreenPlatform.All) != 0;
+}
+#endif
diff --git a/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj b/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj
@@ -18,6 +18,11 @@
 		<UnoXamlResourcesTrimming Condition="'$(OS)'=='Windows_NT' or '$(MSBuildRuntimeType)'=='Core'">true</UnoXamlResourcesTrimming>
 	</PropertyGroup>
 
+	<!-- Undo this as part of https://github.com/unoplatform/uno.toolkit.ui/issues/1078 once we update to Uno 5.1+ -->
+	<PropertyGroup>
+		<DefineConstants Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == ''">$(DefineConstants);__SKIA_OR_WASM__</DefineConstants>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\Uno.Toolkit\Uno.Toolkit.csproj" />
 	</ItemGroup>

diff --git a/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj b/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj
@@ -18,6 +18,11 @@
 		<UnoXamlResourcesTrimming Condition="'$(OS)'=='Windows_NT' or '$(MSBuildRuntimeType)'=='Core'">true</UnoXamlResourcesTrimming>
 	</PropertyGroup>
 
+	<!-- Undo this as part of https://github.com/unoplatform/uno.toolkit.ui/issues/1078 once we update to Uno 5.1+ -->
+	<PropertyGroup>
+		<DefineConstants Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == ''">$(DefineConstants);__SKIA_OR_WASM__</DefineConstants>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\Uno.Toolkit\Uno.Toolkit.csproj" />
 	</ItemGroup>