Fix INavigation issues on Windows

justcoding121 · justcoding121 · commit a92f9fbc26e0 · 2025-11-10T12:13:49.000-06:00
diff --git a/src/Bible.Alarm/App.xaml.cs b/src/Bible.Alarm/App.xaml.cs
@@ -7,8 +7,6 @@
 using Bible.Alarm.Views.General;
 using Bible.Alarm.ViewModels;
 using Bible.Alarm.ViewModels.Shared;
-using Bible.Alarm.Views.Shared;
-
 #nullable enable
 
 namespace Bible.Alarm;
@@ -19,13 +17,14 @@ public partial class App : Application,
     IRecipient<ShowMediaProgressModalMessage>,
     IRecipient<HideMediaProgressModalMessage>,
     IRecipient<ShowToastMessage>,
-    IRecipient<ClearToastsMessage>
+    IRecipient<ClearToastsMessage>,
+    IRecipient<InitializedMessage>
 {
     private readonly Serilog.ILogger _logger;
     private readonly IServiceProvider _serviceProvider;
 
     public static bool IsInForeground { get; set; } = false;
-    private INavigation? _navigation;
+    private INavigation? Navigation => _serviceProvider.GetService<INavigation>();
 
     public App(Serilog.ILogger logger, IServiceProvider serviceProvider)
     {
@@ -34,6 +33,10 @@ public App(Serilog.ILogger logger, IServiceProvider serviceProvider)
         _serviceProvider = serviceProvider;
         InitializeComponent();
 
+        // Register for InitializedMessage before bootstrap is called
+        // This will handle showing HomePage after bootstrap completes
+        WeakReferenceMessenger.Default.Register<InitializedMessage>(this);
+
         // Register for modal messages
         WeakReferenceMessenger.Default.Register<ShowAlarmModalMessage>(this);
         WeakReferenceMessenger.Default.Register<HideAlarmModalMessage>(this);
@@ -46,75 +49,31 @@ public App(Serilog.ILogger logger, IServiceProvider serviceProvider)
     protected override Window CreateWindow(IActivationState? activationState)
     {
         System.Diagnostics.Debug.WriteLine("CreateWindow called!");
-        
-        var homePage = _serviceProvider.GetRequiredService<Home>();
-        var navigationPage = new NavigationPage(homePage)
+
+        var loadingPage = _serviceProvider.GetRequiredService<LoadingPage>();
+        var navigationPage = new NavigationPage(loadingPage)
         {
             BarBackgroundColor = Colors.Transparent,
             BarTextColor = Colors.White
         };
 
-        // Hide the nav bar on HomePage only
-        NavigationPage.SetHasNavigationBar(homePage, false);
+        NavigationPage.SetHasNavigationBar(loadingPage, false);
 
-        // Run bootstrapper after navigation page setup for foreground launch
-        // This ensures UI is ready before bootstrap initializes
-        MauiProgram.InitializePlatformBootstrap(_serviceProvider, isForeground: true);
-
-#if IOS
-        // Note: Large titles in MAUI are typically configured via platform-specific code
-        // or using Shell if needed. For now, we'll skip this configuration.
-#endif
-
-        _navigation = navigationPage.Navigation;
-        
-        var window = new Window(navigationPage);
-        
-        // Initialize services in background
-        _ = Task.Run(async () =>
-        {
-            try
-            {
-                System.Diagnostics.Debug.WriteLine("Starting service initialization...");
-                
-                var playbackService = _serviceProvider.GetRequiredService<IPlaybackService>();
-                if (playbackService.IsPrepared) WeakReferenceMessenger.Default.Send(new ShowAlarmModalMessage(null));
-                
-                await Task.Delay(100); // Small delay to ensure initialization
-                
-                System.Diagnostics.Debug.WriteLine("Service initialization completed!");
-            }
-            catch (Exception ex)
-            {
-                System.Diagnostics.Debug.WriteLine($"Error in initialization: {ex.Message}");
-                System.Diagnostics.Debug.WriteLine($"Stack trace: {ex.StackTrace}");
-            }
-        });
-        
-        return window;
+        return new Window(navigationPage);
     }
 
     protected override void OnStart()
     {
         IsInForeground = true;
 
         base.OnStart();
+
+        MauiProgram.InitializePlatformBootstrap(_serviceProvider, isForeground: true);
+
         Task.Run(async () =>
         {
             try
             {
-                // Navigate to home
-                if (_navigation != null)
-                {
-                    await MainThread.InvokeOnMainThreadAsync(async () =>
-                    {
-                        while (_navigation.ModalStack.Count > 0)
-                            await _navigation.PopModalAsync();
-
-                        while (_navigation.NavigationStack.Count > 1)
-                            await _navigation.PopAsync();
-                    });
-                }
 
                 var playbackService = _serviceProvider.GetRequiredService<IPlaybackService>();
 
@@ -149,8 +108,9 @@ protected override void OnResume()
             try
             {
                 var playbackService = _serviceProvider.GetRequiredService<IPlaybackService>();
-                // Handle when your app resumes
-                if (playbackService.IsPrepared) WeakReferenceMessenger.Default.Send(new ShowAlarmModalMessage(null));
+
+                if (playbackService.IsPrepared) 
+                    WeakReferenceMessenger.Default.Send(new ShowAlarmModalMessage(null));
 
                 await Task.Delay(1000);
 
@@ -169,29 +129,29 @@ public void Receive(ShowAlarmModalMessage message)
     {
         _ = MainThread.InvokeOnMainThreadAsync(async () =>
         {
-            if (_navigation == null) return;
+            if (Navigation == null) return;
 
-            // Prevent showing alarm modal when playback is not active
             var playbackService = _serviceProvider.GetRequiredService<IPlaybackService>();
-            if (!playbackService.IsPlaying) return;
+            if (!playbackService.IsPlaying)
+                return;
 
-            if (_navigation.ModalStack.LastOrDefault()?.GetType() == typeof(AlarmModal)) return;
+            if (Navigation.ModalStack.LastOrDefault()?.GetType() == typeof(AlarmModal)) return;
 
             var vm = _serviceProvider.GetRequiredService<AlarmViewModal>();
             var modal = _serviceProvider.GetRequiredService<AlarmModal>();
             modal.BindingContext = vm;
-            await _navigation.PushModalAsync(modal);
+            await Navigation.PushModalAsync(modal);
         });
     }
 
     public void Receive(HideAlarmModalMessage message)
     {
         _ = MainThread.InvokeOnMainThreadAsync(async () =>
         {
-            if (_navigation == null) return;
-            if (_navigation.ModalStack.Count > 0)
+            if (Navigation == null) return;
+            if (Navigation.ModalStack.Count > 0)
             {
-                var modal = await _navigation.PopModalAsync();
+                var modal = await Navigation.PopModalAsync();
                 if (modal.BindingContext is IDisposable disposable) disposable.Dispose();
             }
         });
@@ -201,25 +161,25 @@ public void Receive(ShowMediaProgressModalMessage message)
     {
         _ = MainThread.InvokeOnMainThreadAsync(async () =>
         {
-            if (_navigation == null) return;
+            if (Navigation == null) return;
 
-            if (_navigation.ModalStack.LastOrDefault()?.GetType() == typeof(MediaProgressModal)) return;
+            if (Navigation.ModalStack.LastOrDefault()?.GetType() == typeof(MediaProgressModal)) return;
 
             var vm = _serviceProvider.GetRequiredService<MediaProgressViewModal>();
             var modal = _serviceProvider.GetRequiredService<MediaProgressModal>();
             modal.BindingContext = vm;
-            await _navigation.PushModalAsync(modal);
+            await Navigation.PushModalAsync(modal);
         });
     }
 
     public void Receive(HideMediaProgressModalMessage message)
     {
         _ = MainThread.InvokeOnMainThreadAsync(async () =>
         {
-            if (_navigation == null) return;
-            if (_navigation.ModalStack.Count > 0)
+            if (Navigation == null) return;
+            if (Navigation.ModalStack.Count > 0)
             {
-                var modal = await _navigation.PopModalAsync();
+                var modal = await Navigation.PopModalAsync();
                 if (modal.BindingContext is IDisposable disposable) disposable.Dispose();
             }
         });
@@ -242,4 +202,58 @@ public void Receive(ClearToastsMessage message)
             await toastService.Clear();
         });
     }
+
+    public void Receive(InitializedMessage message)
+    {
+        _ = MainThread.InvokeOnMainThreadAsync(async () =>
+        {
+            if (Navigation == null) return;
+
+            try
+            {
+                var homePage = _serviceProvider.GetRequiredService<Home>();
+
+                NavigationPage.SetHasNavigationBar(homePage, false);
+
+                await Navigation.PushAsync(homePage); 
+                
+                // PopAsync removes the TOP page (HomePage), so we need to manipulate the stack differently
+                var pagesToRemove = Navigation.NavigationStack.Where(p => p != homePage).ToList();
+                foreach (var page in pagesToRemove)
+                {
+                    Navigation.RemovePage(page);
+                }
+
+                if (homePage.BindingContext is HomeViewModel homeViewModel)
+                {
+                    await homeViewModel.InitializeAsync();
+                }
+
+      
+                _ = Task.Run(async () =>
+                {
+                    try
+                    {
+                        System.Diagnostics.Debug.WriteLine("Starting service initialization...");
+                        
+                        var playbackService = _serviceProvider.GetRequiredService<IPlaybackService>();
+                        if (playbackService.IsPrepared) WeakReferenceMessenger.Default.Send(new ShowAlarmModalMessage(null));
+                        
+                        await Task.Delay(100); 
+                        
+                        System.Diagnostics.Debug.WriteLine("Service initialization completed!");
+                    }
+                    catch (Exception ex)
+                    {
+                        System.Diagnostics.Debug.WriteLine($"Error in initialization: {ex.Message}");
+                        System.Diagnostics.Debug.WriteLine($"Stack trace: {ex.StackTrace}");
+                    }
+                });
+            }
+            catch (Exception e)
+            {
+                _logger.Error(e, "An error happened while showing HomePage after initialization.");
+            }
+        });
+    }
 }
diff --git a/src/Bible.Alarm/MauiProgram.cs b/src/Bible.Alarm/MauiProgram.cs
@@ -183,6 +183,33 @@ private static void RegisterCommonServices(IServiceCollection services)
 
         // Register TaskScheduler for compatibility - use default scheduler instead of UI context
         services.AddSingleton<TaskScheduler>(sp => TaskScheduler.Default);
+
+#if WINDOWS
+        // CRITICAL FIX FOR WINDOWS — INavigation is NOT auto-registered on Windows
+        // This is a known MAUI bug that affects Windows but not Android/iOS
+        // Android/iOS auto-register INavigation, but Windows does not
+        services.AddSingleton<Microsoft.Maui.Controls.INavigation>(sp =>
+        {
+            var app = Application.Current;
+            if (app?.MainPage is NavigationPage navPage)
+            {
+                return navPage.Navigation;
+            }
+            
+            // Fallback — try to get from Window's Page (set in CreateWindow)
+            if (app?.Windows.Count > 0)
+            {
+                var window = app.Windows[0];
+                if (window.Page is NavigationPage windowNavPage)
+                {
+                    return windowNavPage.Navigation;
+                }
+            }
+            
+            // During startup, this might not be ready yet
+            throw new InvalidOperationException("INavigation is not available. NavigationPage must be set before resolving INavigation.");
+        });
+#endif
     }
 
     private static void RegisterViewModels(IServiceCollection services)
@@ -226,6 +253,7 @@ private static void RegisterUiComponents(IServiceCollection services)
         services.AddTransient<BatteryOptimizationExclusionModal>();
         services.AddTransient<NumberOfChaptersModal>();
         services.AddTransient<MediaProgressModal>();
+        services.AddTransient<LoadingPage>();
     }
 
     /// <summary>
diff --git a/src/Bible.Alarm/ViewModels/HomeViewModel.cs b/src/Bible.Alarm/ViewModels/HomeViewModel.cs
@@ -24,7 +24,7 @@
 
 namespace Bible.Alarm.ViewModels;
 
-public class HomeViewModel : ObservableObject, IDisposable, IRecipient<InitializedMessage>
+public class HomeViewModel : ObservableObject, IDisposable
 {
     private readonly ILogger _logger;
     private readonly IServiceScopeFactory _scopeFactory;
@@ -114,13 +114,15 @@ public HomeViewModel(
             IsBusy = false;
         }
 
-        // Subscribe to Initialized message using WeakReferenceMessenger
-        WeakReferenceMessenger.Default.Register<InitializedMessage>(this);
     }
 
-    public void Receive(InitializedMessage message)
+    /// <summary>
+    /// Initializes the HomeViewModel after bootstrap is complete.
+    /// This should be called from App.xaml.cs after InitializedMessage is received.
+    /// </summary>
+    public async Task InitializeAsync()
     {
-        _ = HandleInitialized();
+        await HandleInitialized();
     }
 
     private async Task HandleInitialized()
@@ -415,9 +417,6 @@ private void SetupMediaCache(long scheduleId)
 
     public void Dispose()
     {
-        // Unsubscribe from WeakReferenceMessenger
-        WeakReferenceMessenger.Default.Unregister<InitializedMessage>(this);
-
         // Unsubscribe from all schedule IsEnabled changes
         if (Schedules != null)
         {
diff --git a/src/Bible.Alarm/Views/General/LoadingPage.xaml b/src/Bible.Alarm/Views/General/LoadingPage.xaml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ContentPage
+    x:Class="Bible.Alarm.Views.General.LoadingPage"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    BackgroundColor="White"
+    Title="Bible Alarm">
+    <ContentPage.Content>
+        <Grid>
+            <StackLayout
+                HorizontalOptions="Center"
+                Orientation="Vertical"
+                VerticalOptions="Center">
+                <ActivityIndicator
+                    IsRunning="True"
+                    Color="SlateBlue"
+                    WidthRequest="100"
+                    HeightRequest="100">
+                    <ActivityIndicator.Scale>
+                        <OnPlatform x:TypeArguments="x:Double">
+                            <OnPlatform.Platforms>
+                                <On Platform="iOS" Value="2.0" />
+                                <On Platform="Android" Value="1.5" />
+                                <On Platform="Win" Value="1.5" />
+                            </OnPlatform.Platforms>
+                        </OnPlatform>
+                    </ActivityIndicator.Scale>
+                </ActivityIndicator>
+                <Label
+                    Text="Loading..."
+                    FontSize="Large"
+                    HorizontalOptions="Center"
+                    Margin="0,20,0,0"
+                    TextColor="SlateBlue" />
+            </StackLayout>
+        </Grid>
+    </ContentPage.Content>
+</ContentPage>
+
diff --git a/src/Bible.Alarm/Views/General/LoadingPage.xaml.cs b/src/Bible.Alarm/Views/General/LoadingPage.xaml.cs
@@ -0,0 +1,11 @@
+namespace Bible.Alarm.Views.General;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+public partial class LoadingPage : ContentPage
+{
+    public LoadingPage()
+    {
+        InitializeComponent();
+    }
+}
+

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`namespace Bible.Alarm.ViewModels;`
`26`	`26`
`27`		`-public class HomeViewModel : ObservableObject, IDisposable, IRecipient<InitializedMessage>`
	`27`	`+public class HomeViewModel : ObservableObject, IDisposable`
`28`	`28`	`{`
`29`	`29`	`private readonly ILogger _logger;`
`30`	`30`	`private readonly IServiceScopeFactory _scopeFactory;`
`@@ -114,13 +114,15 @@ public HomeViewModel(`
`114`	`114`	`IsBusy = false;`
`115`	`115`	`}`
`116`	`116`
`117`		`- // Subscribe to Initialized message using WeakReferenceMessenger`
`118`		`- WeakReferenceMessenger.Default.Register<InitializedMessage>(this);`
`119`	`117`	`}`
`120`	`118`
`121`		`- public void Receive(InitializedMessage message)`
	`119`	`+ /// <summary>`
	`120`	`+ /// Initializes the HomeViewModel after bootstrap is complete.`
	`121`	`+ /// This should be called from App.xaml.cs after InitializedMessage is received.`
	`122`	`+ /// </summary>`
	`123`	`+ public async Task InitializeAsync()`
`122`	`124`	`{`
`123`		`- _ = HandleInitialized();`
	`125`	`+ await HandleInitialized();`
`124`	`126`	`}`
`125`	`127`
`126`	`128`	`private async Task HandleInitialized()`
`@@ -415,9 +417,6 @@ private void SetupMediaCache(long scheduleId)`
`415`	`417`
`416`	`418`	`public void Dispose()`
`417`	`419`	`{`
`418`		`- // Unsubscribe from WeakReferenceMessenger`
`419`		`- WeakReferenceMessenger.Default.Unregister<InitializedMessage>(this);`
`420`		`-`
`421`	`420`	`// Unsubscribe from all schedule IsEnabled changes`
`422`	`421`	`if (Schedules != null)`
`423`	`422`	`{`