chore: Adjust check

(cherry picked from commit 1cf85d7)
unoplatform · Feb 11, 2025 · e78b7cb · e78b7cb
1 parent fe873d1
commit e78b7cb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Application.Android.cs b/src/Uno.UI/UI/Xaml/Application.Android.cs
@@ -32,5 +32,13 @@ static partial void StartPartial(ApplicationInitializationCallback callback)
 	/// </remarks>
 	private DateTimeOffset GetSuspendingOffset() => DateTimeOffset.Now.AddSeconds(5);
 
-	partial void ApplySystemOverlaysTheming() => NativeWindowWrapper.Instance?.ApplySystemOverlaysTheming();
+	partial void ApplySystemOverlaysTheming()
+	{
+		// This is needed only due to the fact that currently Instance accessor creates the wrapper
+		// eagerly - which could then happen too early. Will no longer be needed when un-singletoned.
+		if (InitializationComplete)
+		{
+			NativeWindowWrapper.Instance.ApplySystemOverlaysTheming();
+		}
+	}
 }
diff --git a/src/Uno.UI/UI/Xaml/Application.cs b/src/Uno.UI/UI/Xaml/Application.cs
@@ -444,10 +444,7 @@ private void SetRequestedTheme(ApplicationTheme requestedTheme)
 
 		internal void OnRequestedThemeChanged()
 		{
-			if (InitializationComplete)
-			{
-				ApplySystemOverlaysTheming();
-			}
+			ApplySystemOverlaysTheming();
 			OnResourcesChanged(ResourceUpdateReason.ThemeResource);
 		}