Switched to CreateWindow(IActivationState? activationState)

Fixed #588
AndreasReitberger · Nov 21, 2024 · abb90d5 · abb90d5
1 parent 8865b9d
commit abb90d5
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/SharedMauiXamlStylesLibrary.SampleApp/App.xaml.cs b/src/SharedMauiXamlStylesLibrary.SampleApp/App.xaml.cs
@@ -5,17 +5,22 @@ namespace SharedMauiXamlStylesLibrary.SampleApp
 {
     public partial class App : Application
     {
+        public static IServiceProvider? ServiceProvider;
+
         public App(IServiceProvider serviceProvider)
         {
+            ServiceProvider = serviceProvider;
             SecretAppSetting secrets = SecretAppSettingReader.ReadSection<SecretAppSetting>("ExampleApp");
             if (secrets is not null)
             {
                 SyncfusionLicenseProvider.RegisterLicense(secrets.SyncfusionApiKey);
             }
             InitializeComponent();
-
-            // Workaroung: https://github.com/dotnet/maui/issues/11485#issuecomment-1416689085
-            MainPage = serviceProvider.GetRequiredService<AppShell>();
+        }
+        protected override Window CreateWindow(IActivationState? activationState)
+        {
+            AppShell? page = ServiceProvider?.GetRequiredService<AppShell>();
+            return new Window(page ?? new AppShell());
         }
     }
 }