Fix navigation initialization error

Author: justcoding121

src/Bible.Alarm/Services/UI/NavigationService.cs

@@ -14,131 +14,149 @@
 namespace Bible.Alarm.Services.UI;
 
 public class NavigationService(
-    INavigation navigation,
     IServiceProvider serviceProvider)
     : INavigationService
 {
-    private readonly INavigation _navigation = navigation;
     private readonly IServiceProvider _serviceProvider = serviceProvider;
 
+    private INavigation GetNavigation()
+    {
+        return _serviceProvider.GetRequiredService<INavigation>();
+    }
+
     public async Task NavigateToHomeAsync()
     {
+        var navigation = GetNavigation();
         var homePage = _serviceProvider.GetRequiredService<Home>();
         NavigationPage.SetHasNavigationBar(homePage, false);
-        await _navigation.PushAsync(homePage);
+        await navigation.PushAsync(homePage);
 
         // Remove any other pages from the stack
-        var pagesToRemove = _navigation.NavigationStack.Where(p => p != homePage).ToList();
+        var pagesToRemove = navigation.NavigationStack.Where(p => p != homePage).ToList();
         foreach (var page in pagesToRemove)
         {
-            _navigation.RemovePage(page);
+            navigation.RemovePage(page);
         }
     }
 
     public async Task NavigateToScheduleAsync()
     {
+        var navigation = GetNavigation();
         var page = _serviceProvider.GetRequiredService<Schedule>();
-        await _navigation.PushAsync(page);
+        await navigation.PushAsync(page);
     }
 
     public async Task NavigateToMusicSelectionAsync()
     {
+        var navigation = GetNavigation();
         var page = _serviceProvider.GetRequiredService<MusicSelection>();
-        await _navigation.PushAsync(page);
+        await navigation.PushAsync(page);
     }
 
     public async Task NavigateToSongBookSelectionAsync()
     {
+        var navigation = GetNavigation();
         var page = _serviceProvider.GetRequiredService<SongBookSelection>();
-        await _navigation.PushAsync(page);
+        await navigation.PushAsync(page);
     }
 
     public async Task NavigateToTrackSelectionAsync()
     {
+        var navigation = GetNavigation();
         var page = _serviceProvider.GetRequiredService<TrackSelection>();
-        await _navigation.PushAsync(page);
+        await navigation.PushAsync(page);
     }
 
     public async Task NavigateToBibleSelectionAsync()
     {
+        var navigation = GetNavigation();
         var page = _serviceProvider.GetRequiredService<BibleSelection>();
-        await _navigation.PushAsync(page);
+        await navigation.PushAsync(page);
     }
 
     public async Task NavigateToBookSelectionAsync()
     {
+        var navigation = GetNavigation();
         var page = _serviceProvider.GetRequiredService<BookSelection>();
-        await _navigation.PushAsync(page);
+        await navigation.PushAsync(page);
     }
 
     public async Task NavigateToChapterSelectionAsync()
     {
+        var navigation = GetNavigation();
         var page = _serviceProvider.GetRequiredService<ChapterSelection>();
-        await _navigation.PushAsync(page);
+        await navigation.PushAsync(page);
     }
 
     public async Task PopAsync()
     {
-        if (_navigation.NavigationStack.Count > 1)
+        var navigation = GetNavigation();
+        if (navigation.NavigationStack.Count > 1)
         {
-            await _navigation.PopAsync();
+            await navigation.PopAsync();
         }
     }
 
     public async Task OpenNumberOfChaptersModalAsync(object bindingContext)
     {
+        var navigation = GetNavigation();
         var modal = _serviceProvider.GetRequiredService<NumberOfChaptersModal>();
         modal.BindingContext = bindingContext;
-        await _navigation.PushModalAsync(modal);
+        await navigation.PushModalAsync(modal);
     }
 
     public async Task OpenLanguageModalAsync(object bindingContext)
     {
+        var navigation = GetNavigation();
         var modal = _serviceProvider.GetRequiredService<LanguageModal>();
         modal.BindingContext = bindingContext;
-        await _navigation.PushModalAsync(modal);
+        await navigation.PushModalAsync(modal);
     }
 
     public async Task OpenAlarmModalAsync()
     {
+        var navigation = GetNavigation();
         // Check if alarm modal is already open
-        if (_navigation.ModalStack.LastOrDefault()?.GetType() == typeof(AlarmModal))
+        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 async Task OpenMediaProgressModalAsync()
     {
+        var navigation = GetNavigation();
         // Check if media progress modal is already open
-        if (_navigation.ModalStack.LastOrDefault()?.GetType() == typeof(MediaProgressModal))
+        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 async Task OpenBatteryOptimizationModalAsync(object bindingContext)
     {
+        var navigation = GetNavigation();
         var modal = _serviceProvider.GetRequiredService<BatteryOptimizationExclusionModal>();
         modal.BindingContext = bindingContext;
-        await _navigation.PushModalAsync(modal);
+        await navigation.PushModalAsync(modal);
     }
 
     public async Task CloseModalAsync()
     {
-        if (_navigation.ModalStack.Count > 0)
+        var navigation = GetNavigation();
+        if (navigation.ModalStack.Count > 0)
         {
-            var modal = await _navigation.PopModalAsync();
+            var modal = await navigation.PopModalAsync();
             if (modal.BindingContext is IDisposable disposable)
             {
                 disposable.Dispose();