chore: Remove property for UAP splash entity (#1061)

* chore: Refactor GetNativeSplashScreen method * chore: Remove erroneous ItemGroup
unoplatform · Mar 11, 2024 · dfe2584 · dfe2584
1 parent ec1b941
commit dfe2584
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 15 deletions.
diff --git a/...no.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj b/...no.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj
@@ -33,8 +33,4 @@
 
 	<Import Project="..\..\Uno.Toolkit.Samples\Uno.Toolkit.Samples.Shared\Uno.Toolkit.Samples.Shared.projitems" Label="Shared" />
 
-	<ItemGroup>
-	  <Page Remove="C:\Work\uno.toolkit.ui\samples\Uno.Toolkit.Samples\Uno.Toolkit.Samples.Shared\Content\TestPages\ShadowContainerRectangleTestPage.WinUI.xaml" />
-	</ItemGroup>
-
 </Project>
diff --git a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.Android.cs b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.Android.cs
@@ -6,7 +6,6 @@
 using Uno.Extensions;
 using Uno.Logging;
 using Uno.UI;
-using Windows.ApplicationModel.Activation;
 using Windows.Foundation;
 using System.Runtime.InteropServices;
 using Android.OS;
@@ -38,7 +37,7 @@ public bool SplashIsEnabled
 		}
 	}
 
-	private static Task<FrameworkElement?> GetNativeSplashScreen(SplashScreen? splashScreen)
+	private static Task<FrameworkElement?> GetNativeSplashScreen()
 	{
 		try
 		{

diff --git a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.Windows.NetStandard.cs b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.Windows.NetStandard.cs
@@ -6,7 +6,6 @@
 using System.Xml.Linq;
 using Microsoft.Extensions.Logging;
 using Uno.Extensions;
-using Windows.ApplicationModel.Activation;
 using Windows.Graphics.Display;
 using System.Reflection;
 using System.IO;
@@ -51,7 +50,7 @@ public partial class ExtendedSplashScreen
 					RuntimeInformation.IsOSPlatform(OSPlatform.Create("WEBASSEMBLY")) // Legacy Value (Bootstrapper 1.2.0-dev.29 or earlier).
 					|| RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER"));
 
-		private static async Task<FrameworkElement?> GetNativeSplashScreen(SplashScreen? splashScreen)
+		private static async Task<FrameworkElement?> GetNativeSplashScreen()
 		{
 			// Position of image aligns with WASM Bootstrapper style for splash image
 			// see https://github.com/unoplatform/Uno.Wasm.Bootstrap/blob/7d82af66c7dc587f6d1f6b6382860051fc2d92a0/src/Uno.Wasm.Bootstrap/WasmCSS/uno-bootstrap.css#L21

diff --git a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.cs b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.cs
@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using Uno.Disposables;
 using Uno.Extensions;
-using Windows.ApplicationModel.Activation;
 #if IS_WINUI
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -30,7 +29,7 @@ public partial class ExtendedSplashScreen : LoadingView
 		new PropertyMetadata(SplashScreenPlatform.All));
 
 	/// <summary>
-	/// Gets or sets the list of platforms where extended splash screen should be used.
+	/// Gets or sets the platform(s) where extended splash screen should be used.
 	/// </summary>
 	public SplashScreenPlatform Platforms
 	{
@@ -39,8 +38,6 @@ public SplashScreenPlatform Platforms
 	}
 	#endregion
 
-	public SplashScreen? SplashScreen { get; set; }
-
 	#region DependencyProperty: SplashScreenContent
 	internal static DependencyProperty SplashScreenContentProperty { get; } = DependencyProperty.Register(
 		nameof(SplashScreenContent),
@@ -80,7 +77,7 @@ protected override void OnApplyTemplate()
 
 	private async Task LoadNativeSplashScreen()
 	{
-		var splashScreenContent = await GetNativeSplashScreen(SplashScreen);
+		var splashScreenContent = await GetNativeSplashScreen();
 
 		if (splashScreenContent is not null)
 		{
@@ -92,7 +89,7 @@ private async Task LoadNativeSplashScreen()
 
 
 #if !__ANDROID__ && !__IOS__ && !(WINDOWS || WINDOWS_UWP) && !NETSTANDARD2_0
-	private static Task<FrameworkElement?> GetNativeSplashScreen(SplashScreen? splashScreen)
+	private static Task<FrameworkElement?> GetNativeSplashScreen()
 	{
 		return Task.FromResult<FrameworkElement?>(null);
 	}

diff --git a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.iOS.cs b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.iOS.cs
@@ -30,7 +30,7 @@ public partial class ExtendedSplashScreen
 	{
 		public bool SplashIsEnabled => (Platforms & SplashScreenPlatform.iOS) != 0;
 
-		private static Task<FrameworkElement?> GetNativeSplashScreen(SplashScreen? splashScreen)
+		private static Task<FrameworkElement?> GetNativeSplashScreen()
 		{
 			try
 			{
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ public partial class ExtendedSplashScreen @@
     	{
     		public bool SplashIsEnabled => (Platforms & SplashScreenPlatform.iOS) != 0;
-    		private static Task<FrameworkElement?> GetNativeSplashScreen(SplashScreen? splashScreen)
+    		private static Task<FrameworkElement?> GetNativeSplashScreen()
     		{
     			try
     			{
@@ Expand Down @@