Remove Reflection

CommunityToolkit · Jun 14, 2024 · 9bcb6e7 · 9bcb6e7
1 parent 6f5103e
commit 9bcb6e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 50 deletions.
diff --git a/src/CommunityToolkit.Maui.UnitTests/Mocks/MockApplication.cs b/src/CommunityToolkit.Maui.UnitTests/Mocks/MockApplication.cs
@@ -15,28 +15,8 @@ public MockApplication(IServiceProvider serviceProvider)
 #pragma warning restore CS0612 // Type or member is obsolete
 	{
 		Services = serviceProvider;
-
-		InitializeSystemResources(new MockResourcesProvider());
-	}
-#pragma warning disable CS0612 // Type or member is obsolete
-	void InitializeSystemResources(ISystemResourcesProvider resourcesProvider)
-#pragma warning restore CS0612 // Type or member is obsolete
-	{
-		const string privateFieldName = "_systemResources";
-
-		if (typeof(Application).GetField(privateFieldName, BindingFlags.NonPublic | BindingFlags.Instance) is not FieldInfo systemResourcesFieldInfo)
-		{
-			throw new InvalidOperationException($"Unable to access {privateFieldName}");
-		}
-
-		// .NET MAUI's SystemResources initialization: https://github.com/dotnet/maui/blob/79695fbb7ba6517a334c795ecf0a1d6358ef309a/src/Controls/src/Core/Application/Application.cs#L42-L49
-		systemResourcesFieldInfo.SetValue(this, new Lazy<IResourceDictionary>(() =>
-		{
-			var systemResources = resourcesProvider.GetSystemResources();
-			systemResources.ValuesChanged += OnParentResourcesChanged;
-			return systemResources;
-		}));
-
+
+		DependencyService.Register<ISystemResourcesProvider, MockResourcesProvider>();
 	}
 }
 

diff --git a/src/CommunityToolkit.Maui.UnitTests/Mocks/MockResourcesProvider.cs b/src/CommunityToolkit.Maui.UnitTests/Mocks/MockResourcesProvider.cs
@@ -7,33 +7,7 @@ namespace CommunityToolkit.Maui.UnitTests.Mocks;
 class MockResourcesProvider : ISystemResourcesProvider
 #pragma warning restore CS0612 // Type or member is obsolete
 {
-	public IResourceDictionary GetSystemResources()
-	{
-		var dictionary = new ResourceDictionary();
+	readonly ResourceDictionary dictionary = new();
 
-		Style style = new Style(typeof(Label));
-		dictionary[Device.Styles.BodyStyleKey] = style;
-
-		style = new Style(typeof(Label));
-		style.Setters.Add(Label.FontSizeProperty, 50);
-		dictionary[Device.Styles.TitleStyleKey] = style;
-
-		style = new Style(typeof(Label));
-		style.Setters.Add(Label.FontSizeProperty, 40);
-		dictionary[Device.Styles.SubtitleStyleKey] = style;
-
-		style = new Style(typeof(Label));
-		style.Setters.Add(Label.FontSizeProperty, 30);
-		dictionary[Device.Styles.CaptionStyleKey] = style;
-
-		style = new Style(typeof(Label));
-		style.Setters.Add(Label.FontSizeProperty, 20);
-		dictionary[Device.Styles.ListItemTextStyleKey] = style;
-
-		style = new Style(typeof(Label));
-		style.Setters.Add(Label.FontSizeProperty, 10);
-		dictionary[Device.Styles.ListItemDetailTextStyleKey] = style;
-
-		return dictionary;
-	}
+	public IResourceDictionary GetSystemResources() => dictionary;
 }