fix: add converters to merged dicts of resources (#1348)

unoplatform · Feb 6, 2024 · 186037c · 186037c
1 parent 413e238
commit 186037c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/library/Uno.Material/MaterialResourcesV2.cs b/src/library/Uno.Material/MaterialResourcesV2.cs
@@ -21,7 +21,7 @@ public MaterialResourcesV2()
 		{
 
 			Source = new Uri("ms-appx:///Uno.Material/Generated/mergedpages.v2.xaml");
-			MergedDictionaries.Add(new ResourceDictionary { Source = new Uri("ms-appx:///Uno.Themes/Styles/Application/Common/Converters.xaml") });
+			MergedDictionaries.Add(new ResourceDictionary { Source = new Uri(Themes.Constants.ConverterResourcePath) });
 			MergedDictionaries.Add(new MaterialFonts());
 			MergedDictionaries.Add(new MaterialColorsV2());
 		}

diff --git a/src/library/Uno.Themes/BaseTheme.cs b/src/library/Uno.Themes/BaseTheme.cs
@@ -184,6 +184,7 @@ protected void UpdateSource()
 		this.Clear();
 
 		var colors = new ResourceDictionary { Source = new Uri(Constants.SharedColorsResourcePath) };
+		var converters = new ResourceDictionary { Source = new Uri(Constants.ConverterResourcePath) };
 
 		colors.MergedDictionaries.Add(new ResourceDictionary { Source = new Uri(Constants.SharedColorPaletteResourcePath) });
 
@@ -195,6 +196,7 @@ protected void UpdateSource()
 		var mergedPages = GenerateSpecificResources();
 
 		mergedPages.MergedDictionaries.Add(colors);
+		mergedPages.MergedDictionaries.Add(converters);
 
 		MergedDictionaries.Add(mergedPages);
 	}