Merge pull request #12 from MilKAOS/master

AvantiPoint · Aug 4, 2023 · 695f5aa · 695f5aa
2 parents e87b375 + 78fd1d0
commit 695f5aa
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/MauiMicroMvvm/MauiMicroBuilderExtensions.cs b/src/MauiMicroMvvm/MauiMicroBuilderExtensions.cs
@@ -21,10 +21,7 @@ public static MauiAppBuilder UseMauiMicroMvvm<TApp, TShell>(this MauiAppBuilder
             .AddSingleton<TApp>()
             .AddSingleton<IApplication>(sp =>
             {
-                var app = sp.GetRequiredService<TApp>();
-                var shell = sp.GetRequiredService<Shell>();
-                app.Resources = resources;
-                app.MainPage = shell;
+                var app = sp.GetRequiredService<TApp>();                
 
                 if (mergedDictionaries.Any())
                 {
@@ -44,9 +41,17 @@ public static MauiAppBuilder UseMauiMicroMvvm<TApp, TShell>(this MauiAppBuilder
 {string.Join('\n', qualifiedResources)}
   </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>";
-                    app.Resources.LoadFromXaml(xaml);
+                    
+                    app.Resources.LoadFromXaml(xaml);                    
                 }
 
+                if (resources != null && resources.Keys.Any())
+                {
+                    app.Resources.Add(resources);
+                }
+
+                var shell = sp.GetRequiredService<Shell>();
+                app.MainPage = shell;
                 return app;
             });