Merge pull request #4857 from unoplatform/dev/jela/default-theme-fix

fix(ResourceDictionary): Default theme may not be valid on first call
unoplatform · Jan 11, 2021 · e4e76b6 · e4e76b6
2 parents c560d50 + 47b6aed
commit e4e76b6
Showing 1 changed file with 21 additions and 6 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Application.cs b/src/Uno.UI/UI/Xaml/Application.cs
@@ -46,6 +46,7 @@ public partial class Application
 		private bool _themeSetExplicitly = false;
 		private ApplicationTheme? _requestedTheme;
 		private bool _systemThemeChangesObserved = false;
+		private string _requestedThemeForResources;
 
 		static Application()
 		{
@@ -81,11 +82,7 @@ public ApplicationTheme RequestedTheme
 		{
 			get
 			{
-				if (InternalRequestedTheme == null)
-				{
-					// just cache the theme, but do not notify about a change unnecessarily	
-					InternalRequestedTheme = GetDefaultSystemTheme();
-				}
+				EnsureInternalRequestedTheme();
 				return InternalRequestedTheme.Value;
 			}
 			set
@@ -98,6 +95,15 @@ public ApplicationTheme RequestedTheme
 			}
 		}
 
+		private void EnsureInternalRequestedTheme()
+		{
+			if (InternalRequestedTheme == null)
+			{
+				// just cache the theme, but do not notify about a change unnecessarily	
+				InternalRequestedTheme = GetDefaultSystemTheme();
+			}
+		}
+
 		private ApplicationTheme? InternalRequestedTheme
 		{
 			get => _requestedTheme;
@@ -120,7 +126,16 @@ internal static void UpdateRequestedThemesForResources()
 				};
 		}
 
-		internal string RequestedThemeForResources { get; private set; }
+		internal string RequestedThemeForResources
+		{
+			get
+			{
+				EnsureInternalRequestedTheme();
+				return _requestedThemeForResources;
+			}
+
+			private set => _requestedThemeForResources = value;
+		}
 
 		internal ElementTheme ActualElementTheme => (_themeSetExplicitly, RequestedTheme) switch
 		{