Resolved theme issue for the trimming changes

naveenkumar-sanjeevirayan · naveenkumar-sanjeevirayan · commit 0052aa9df9f8 · 2025-03-11T18:18:01.000+05:30
diff --git a/maui/src/Core/BaseView/PlatformView/LayoutViewExt.ios.cs b/maui/src/Core/BaseView/PlatformView/LayoutViewExt.ios.cs
@@ -176,7 +176,10 @@ internal void InitializeNativeGraphicsView()
 					}
 				}
 
-				Add(_nativeGraphicsView);
+				if(_nativeGraphicsView is not null)
+				{
+					Add(_nativeGraphicsView);
+				}
 			}
 			else if (_nativeGraphicsView != null)
 			{
diff --git a/maui/src/Core/Theme/Resources/DarkThemeColors.xaml.cs b/maui/src/Core/Theme/Resources/DarkThemeColors.xaml.cs
@@ -3,7 +3,7 @@
 	/// <summary>
 	/// Dark theme resource dictionary.
 	/// </summary>
-	[XamlCompilation(XamlCompilationOptions.Skip)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class DarkThemeColors : SyncfusionThemeDictionary
 	{
 		/// <summary>
diff --git a/maui/src/Core/Theme/Resources/DefaultTheme.xaml.cs b/maui/src/Core/Theme/Resources/DefaultTheme.xaml.cs
@@ -3,7 +3,7 @@
 	/// <summary>
 	/// Dark theme resource dictionary.
 	/// </summary>
-	[XamlCompilation(XamlCompilationOptions.Skip)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class DefaultTheme : SyncfusionThemeDictionary
 	{
 		/// <summary>
diff --git a/maui/src/Core/Theme/Resources/LightThemeColors.xaml.cs b/maui/src/Core/Theme/Resources/LightThemeColors.xaml.cs
@@ -3,7 +3,7 @@
 	/// <summary>
 	/// Dark theme resource dictionary.
 	/// </summary>
-	[XamlCompilation(XamlCompilationOptions.Skip)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class LightThemeColors : SyncfusionThemeDictionary
 	{
 		/// <summary>
diff --git a/maui/src/Core/Theme/Resources/SyncfusionThemeDictionary.xaml.cs b/maui/src/Core/Theme/Resources/SyncfusionThemeDictionary.xaml.cs
@@ -3,7 +3,7 @@
 	/// <summary>
 	/// ThemeDictionary class for Syncfusion in which controls themes are to be included.
 	/// </summary>
-	[XamlCompilation(XamlCompilationOptions.Skip)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class SyncfusionThemeDictionary : ResourceDictionary
 	{
 		/// <summary>
diff --git a/maui/src/Core/Theme/StaticThemeResourceExtension.cs b/maui/src/Core/Theme/StaticThemeResourceExtension.cs
@@ -13,10 +13,11 @@ namespace Syncfusion.Maui.Toolkit.Themes
 	/// ***
 	/// </example>
 
-	[Microsoft.Maui.Controls.Internals.Preserve(AllMembers = true)]
-
 	[ContentProperty(nameof(ResourceKey))]
 
+#if NET9_0
+	[RequireService([typeof(IProvideValueTarget)])]
+#endif
 	public class StaticThemeResourceExtension : IMarkupExtension
 	{
 		/// <summary>
@@ -36,9 +37,9 @@ public class StaticThemeResourceExtension : IMarkupExtension
 				return null;
 			}
 
-			if (serviceProvider.GetService(typeof(IRootObjectProvider)) is IRootObjectProvider rootObjectProvider)
+			if (serviceProvider.GetService(typeof(IProvideValueTarget)) is IProvideValueTarget provideValueTarget)
 			{
-				if (rootObjectProvider.RootObject is ResourceDictionary themeResourceDictionary)
+				if (provideValueTarget.TargetObject is ResourceDictionary themeResourceDictionary)
 				{
 					var mergedDictionaries = themeResourceDictionary.MergedDictionaries ?? Enumerable.Empty<ResourceDictionary>();
 
diff --git a/maui/src/Core/Theme/ThemeElement.cs b/maui/src/Core/Theme/ThemeElement.cs
@@ -50,7 +50,6 @@ internal static class ThemeElement
 		/// <summary>
 		/// The implicit style property.
 		/// </summary>
-		[UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "<Pending>")]
 		private static readonly BindableProperty ImplicitStyleProperty = BindableProperty.Create(
 			"ImplicitStyle",
 			typeof(Style),
@@ -151,7 +150,7 @@ private static void MergePendingDictionaries()
 		/// <param name="bindable">Bindable.</param>
 		/// <param name="oldValue">Old value.</param>
 		/// <param name="newValue">New value.</param>
-		[RequiresUnreferencedCode("The IsOverriddenMethod method is not trim compatible")]
+		[UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "<Pending>")]
 		private static void OnImplicitStyleChanged(BindableObject bindable, object oldValue, object newValue)
 		{
 			if (bindable is Element element && newValue is Style style && !ApplyStyle(element, style))
@@ -176,7 +175,7 @@ private static void OnImplicitStyleChanged(BindableObject bindable, object oldVa
 		/// <param name="element"></param>
 		/// <param name="style"></param>
 		/// <returns></returns>
-		[RequiresUnreferencedCode("The IsOverriddenMethod method is not trim compatible")]
+		[RequiresUnreferencedCode("The ApplyStyle method is not trim compatible")]
 		private static bool ApplyStyle(Element element, Style style)
 		{
 			var applyMethodInfo = typeof(Style).GetInterface("IStyle")?.GetMethod("Apply");
diff --git a/maui/src/Themes/SfBottomSheetStyle.xaml.cs b/maui/src/Themes/SfBottomSheetStyle.xaml.cs
@@ -5,6 +5,7 @@ namespace Syncfusion.Maui.Toolkit.BottomSheet;
 /// <summary>
 /// SfBottomSheetStyle provides a set of predefined styles for SfBottomSheet control.
 /// </summary>
+[XamlCompilation(XamlCompilationOptions.Compile)]
 public partial class SfBottomSheetStyle : ResourceDictionary
 {
     /// <summary>
diff --git a/maui/src/Themes/SfButtonStyles.xaml.cs b/maui/src/Themes/SfButtonStyles.xaml.cs
@@ -3,6 +3,7 @@ namespace Syncfusion.Maui.Toolkit.Buttons;
 /// <summary>
 /// SfButtonStyles class provides a set of predefined styles for SfButton control.
 /// </summary>
+[XamlCompilation(XamlCompilationOptions.Compile)]
 public partial class SfButtonStyles : ResourceDictionary
 {
 	/// <summary>
diff --git a/maui/src/Themes/SfCalendarStyles.xaml.cs b/maui/src/Themes/SfCalendarStyles.xaml.cs
@@ -5,6 +5,7 @@ namespace Syncfusion.Maui.Toolkit.Calendar;
 /// <summary>
 /// Represents <see cref="SfCalendarStyles"/> class.
 /// </summary>
+[XamlCompilation(XamlCompilationOptions.Compile)]
 public partial class SfCalendarStyles : ResourceDictionary
 {
     #region Constructor
diff --git a/maui/src/Themes/SfChipGroupStyles.xaml.cs b/maui/src/Themes/SfChipGroupStyles.xaml.cs
@@ -4,6 +4,7 @@ namespace Syncfusion.Maui.Toolkit.Chips
 	/// Represents a collection of styles for the <see cref="SfChipGroup"/> control.
 	/// </summary>
 	/// <exclude/>
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class SfChipGroupStyles : ResourceDictionary
 	{
 		/// <summary>
diff --git a/maui/src/Themes/SfChipStyles.xaml.cs b/maui/src/Themes/SfChipStyles.xaml.cs
@@ -4,6 +4,7 @@ namespace Syncfusion.Maui.Toolkit.Chips
 	/// Represents a collection of styles for the <see cref="SfChip"/> control.
 	/// </summary>
 	/// <exclude/>
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class SfChipStyles : ResourceDictionary
 	{
 		/// <summary>
diff --git a/maui/src/Themes/SfEffectsViewStyles.xaml.cs b/maui/src/Themes/SfEffectsViewStyles.xaml.cs
@@ -3,6 +3,7 @@ namespace Syncfusion.Maui.Toolkit.EffectsView
 	/// <summary>
 	/// Initializing SfEffectsViewStyles class
 	/// </summary>
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class SfEffectsViewStyles : ResourceDictionary
 	{
 		/// <summary>
diff --git a/maui/src/Themes/SfNavigationDrawerStyle.xaml.cs b/maui/src/Themes/SfNavigationDrawerStyle.xaml.cs
@@ -3,6 +3,7 @@ namespace Syncfusion.Maui.Toolkit.NavigationDrawer
 	/// <summary>
 	/// SfNavigationDrawerStyle provides a set of predefined styles for SfNavigationDrawer control.
 	/// </summary>
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class SfNavigationDrawerStyle : ResourceDictionary
 	{
 		/// <summary>
diff --git a/maui/src/Themes/SfNumericEntryStyles.xaml.cs b/maui/src/Themes/SfNumericEntryStyles.xaml.cs
@@ -5,6 +5,7 @@ namespace Syncfusion.Maui.Toolkit.NumericEntry;
 /// <summary>
 /// Initializing SfNumericEntryStyles class
 /// </summary>
+[XamlCompilation(XamlCompilationOptions.Compile)]
 public partial class SfNumericEntryStyles : ResourceDictionary
 {
 	/// <summary>
diff --git a/maui/src/Themes/SfNumericUpDownStyles.xaml.cs b/maui/src/Themes/SfNumericUpDownStyles.xaml.cs
@@ -5,6 +5,7 @@ namespace Syncfusion.Maui.Toolkit.NumericUpDown;
 /// <summary>
 /// Initializes the SfNumericUpDownStyles class.
 /// </summary>
+[XamlCompilation(XamlCompilationOptions.Compile)]
 public partial class SfNumericUpDownStyles : ResourceDictionary
 {
 	/// <summary>
diff --git a/maui/src/Themes/SfPullToRefreshStyles.xaml.cs b/maui/src/Themes/SfPullToRefreshStyles.xaml.cs
@@ -4,6 +4,7 @@ namespace Syncfusion.Maui.Toolkit.PullToRefresh
 	/// Dictionary for theming the pulltorefresh control.
 	/// </summary>
 	/// <exclude/>
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class SfPullToRefreshStyles : ResourceDictionary
 	{
 		/// <summary>
diff --git a/maui/src/Themes/SfSegmentedControlStyles.xaml.cs b/maui/src/Themes/SfSegmentedControlStyles.xaml.cs
@@ -3,6 +3,7 @@ namespace Syncfusion.Maui.Toolkit.SegmentedControl
 	/// <summary>
 	/// Represents a class which is used to styles.
 	/// </summary>
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class SfSegmentedControlStyles : ResourceDictionary
 	{
 		/// <summary>
diff --git a/maui/src/Themes/SfShimmerStyles.xaml.cs b/maui/src/Themes/SfShimmerStyles.xaml.cs
@@ -5,6 +5,7 @@ namespace Syncfusion.Maui.Toolkit.Shimmer
 	/// Shimmer theme resource dictionary.
 	/// </summary>
 	/// <exclude/>
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class SfShimmerStyles : ResourceDictionary
 	{
 		/// <summary>
diff --git a/maui/src/Themes/SfTabViewStyles.xaml.cs b/maui/src/Themes/SfTabViewStyles.xaml.cs
@@ -4,6 +4,7 @@ namespace Syncfusion.Maui.Toolkit.TabView
 	/// <summary>
 	/// Represents a collection of styles and resources used in the <see cref="SfTabView"/> control for consistent theming and styling.
 	/// </summary>
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class SfTabViewStyles : ResourceDictionary
 	{
 		/// <summary>
diff --git a/maui/src/Themes/SfTextInputLayoutStyles.xaml.cs b/maui/src/Themes/SfTextInputLayoutStyles.xaml.cs
@@ -4,6 +4,7 @@ namespace Syncfusion.Maui.Toolkit.TextInputLayout
 	/// Initiates <see cref="SfTextInputLayout"/> class.
 	/// </summary>
 	/// <exclude/>
+	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class SfTextInputLayoutStyles : ResourceDictionary
 	{
 		/// <summary>

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,10 @@ internal void InitializeNativeGraphicsView()`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`
`179`		`- Add(_nativeGraphicsView);`
	`179`	`+ if(_nativeGraphicsView is not null)`
	`180`	`+ {`
	`181`	`+ Add(_nativeGraphicsView);`
	`182`	`+ }`
`180`	`183`	`}`
`181`	`184`	`else if (_nativeGraphicsView != null)`
`182`	`185`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Dark theme resource dictionary.`
`5`	`5`	`/// </summary>`
`6`		`- [XamlCompilation(XamlCompilationOptions.Skip)]`
	`6`	`+ [XamlCompilation(XamlCompilationOptions.Compile)]`
`7`	`7`	`public partial class DarkThemeColors : SyncfusionThemeDictionary`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// ThemeDictionary class for Syncfusion in which controls themes are to be included.`
`5`	`5`	`/// </summary>`
`6`		`- [XamlCompilation(XamlCompilationOptions.Skip)]`
	`6`	`+ [XamlCompilation(XamlCompilationOptions.Compile)]`
`7`	`7`	`public partial class SyncfusionThemeDictionary : ResourceDictionary`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,11 @@ namespace Syncfusion.Maui.Toolkit.Themes`
`13`	`13`	`/// ***`
`14`	`14`	`/// </example>`
`15`	`15`
`16`		`- [Microsoft.Maui.Controls.Internals.Preserve(AllMembers = true)]`
`17`		`-`
`18`	`16`	`[ContentProperty(nameof(ResourceKey))]`
`19`	`17`
	`18`	`+#if NET9_0`
	`19`	`+ [RequireService([typeof(IProvideValueTarget)])]`
	`20`	`+#endif`
`20`	`21`	`public class StaticThemeResourceExtension : IMarkupExtension`
`21`	`22`	`{`
`22`	`23`	`/// <summary>`
`@@ -36,9 +37,9 @@ public class StaticThemeResourceExtension : IMarkupExtension`
`36`	`37`	`return null;`
`37`	`38`	`}`
`38`	`39`
`39`		`- if (serviceProvider.GetService(typeof(IRootObjectProvider)) is IRootObjectProvider rootObjectProvider)`
	`40`	`+ if (serviceProvider.GetService(typeof(IProvideValueTarget)) is IProvideValueTarget provideValueTarget)`
`40`	`41`	`{`
`41`		`- if (rootObjectProvider.RootObject is ResourceDictionary themeResourceDictionary)`
	`42`	`+ if (provideValueTarget.TargetObject is ResourceDictionary themeResourceDictionary)`
`42`	`43`	`{`
`43`	`44`	`var mergedDictionaries = themeResourceDictionary.MergedDictionaries ?? Enumerable.Empty<ResourceDictionary>();`
`44`	`45`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ namespace Syncfusion.Maui.Toolkit.BottomSheet;`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// SfBottomSheetStyle provides a set of predefined styles for SfBottomSheet control.`
`7`	`7`	`/// </summary>`
	`8`	`+[XamlCompilation(XamlCompilationOptions.Compile)]`
`8`	`9`	`public partial class SfBottomSheetStyle : ResourceDictionary`
`9`	`10`	`{`
`10`	`11`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ namespace Syncfusion.Maui.Toolkit.Buttons;`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// SfButtonStyles class provides a set of predefined styles for SfButton control.`
`5`	`5`	`/// </summary>`
	`6`	`+[XamlCompilation(XamlCompilationOptions.Compile)]`
`6`	`7`	`public partial class SfButtonStyles : ResourceDictionary`
`7`	`8`	`{`
`8`	`9`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ namespace Syncfusion.Maui.Toolkit.Calendar;`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// Represents <see cref="SfCalendarStyles"/> class.`
`7`	`7`	`/// </summary>`
	`8`	`+[XamlCompilation(XamlCompilationOptions.Compile)]`
`8`	`9`	`public partial class SfCalendarStyles : ResourceDictionary`
`9`	`10`	`{`
`10`	`11`	`#region Constructor`