diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj index d9381d884..d40b5aafb 100644 --- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj +++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj @@ -33,8 +33,4 @@ - - - - diff --git a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.Android.cs b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.Android.cs index b9525d9f1..e7dbfed7c 100644 --- 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 GetNativeSplashScreen(SplashScreen? splashScreen) + private static Task 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 index 6ddd159e4..05398d871 100644 --- 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 GetNativeSplashScreen(SplashScreen? splashScreen) + private static async Task 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 index f710f323e..9fccea74c 100644 --- 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)); /// - /// 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. /// 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 GetNativeSplashScreen(SplashScreen? splashScreen) + private static Task GetNativeSplashScreen() { return Task.FromResult(null); } diff --git a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.iOS.cs b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.iOS.cs index 6fbb95400..72821ee9e 100644 --- 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 GetNativeSplashScreen(SplashScreen? splashScreen) + private static Task GetNativeSplashScreen() { try {