Fix media playback

Author: justcoding121

src/Bible.Alarm/App.xaml.cs

@@ -5,6 +5,7 @@
 using Bible.Alarm.ViewModels;
 using Bible.Alarm.Views;
 using Bible.Alarm.Views.General;
+using CommunityToolkit.Maui.Views;
 using CommunityToolkit.Mvvm.Messaging;
 using Serilog;
 
@@ -13,8 +14,6 @@ namespace Bible.Alarm;
 public partial class App : Application,
     IRecipient<ShowAlarmModalMessage>,
     IRecipient<HideAlarmModalMessage>,
-    IRecipient<ShowMediaProgressModalMessage>,
-    IRecipient<HideMediaProgressModalMessage>,
     IRecipient<ShowToastMessage>,
     IRecipient<ClearToastsMessage>,
     IRecipient<InitializedMessage>
@@ -37,22 +36,20 @@ public App(ILogger logger, IServiceProvider serviceProvider, INavigationService
 
         WeakReferenceMessenger.Default.Register<ShowAlarmModalMessage>(this);
         WeakReferenceMessenger.Default.Register<HideAlarmModalMessage>(this);
-        WeakReferenceMessenger.Default.Register<ShowMediaProgressModalMessage>(this);
-        WeakReferenceMessenger.Default.Register<HideMediaProgressModalMessage>(this);
         WeakReferenceMessenger.Default.Register<ShowToastMessage>(this);
         WeakReferenceMessenger.Default.Register<ClearToastsMessage>(this);
     }
 
     protected override Window CreateWindow(IActivationState activationState)
     {
-        var loadingPage = _serviceProvider.GetRequiredService<LoadingPage>();
-        var navigationPage = new NavigationPage(loadingPage)
+        var bootstrapPage = _serviceProvider.GetRequiredService<BootstrapPage>();
+        var navigationPage = new NavigationPage(bootstrapPage)
         {
             BarBackgroundColor = Colors.Transparent,
             BarTextColor = Colors.White
         };
 
-        NavigationPage.SetHasNavigationBar(loadingPage, false);
+        NavigationPage.SetHasNavigationBar(bootstrapPage, false);
 
         var window = new Window(navigationPage);
 
@@ -133,11 +130,16 @@ public void Receive(ShowAlarmModalMessage message)
     {
         _ = MainThread.InvokeOnMainThreadAsync(async () =>
         {
-            var playbackService = _serviceProvider.GetRequiredService<IPlaybackService>();
-            if (!playbackService.IsPlaying)
-                return;
-
-            await _navigationService.OpenAlarmModalAsync();
+            try
+            {
+                _logger.Information("ShowAlarmModalMessage received");
+                await _navigationService.OpenAlarmModalAsync();
+                _logger.Information("AlarmModal opened");
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex, "Error showing AlarmModal");
+            }
         });
     }
 
@@ -149,21 +151,6 @@ public void Receive(HideAlarmModalMessage message)
         });
     }
 
-    public void Receive(ShowMediaProgressModalMessage message)
-    {
-        _ = MainThread.InvokeOnMainThreadAsync(async () =>
-        {
-            await _navigationService.OpenMediaProgressModalAsync();
-        });
-    }
-
-    public void Receive(HideMediaProgressModalMessage message)
-    {
-        _ = MainThread.InvokeOnMainThreadAsync(async () =>
-        {
-            await _navigationService.PopModalAsync();
-        });
-    }
 
     public void Receive(ShowToastMessage message)
     {

src/Bible.Alarm/Common/Interfaces/UI/INavigationService.cs

@@ -1,3 +1,5 @@
+using CommunityToolkit.Maui.Views;
+
 namespace Bible.Alarm.Common.Interfaces.UI;
 
 public interface INavigationService
@@ -13,9 +15,9 @@ public interface INavigationService
     Task OpenNumberOfChaptersModalAsync(object bindingContext);
     Task OpenLanguageModalAsync(object bindingContext);
     Task OpenAlarmModalAsync();
-    Task OpenMediaProgressModalAsync();
     Task OpenBatteryOptimizationModalAsync(object bindingContext);
     Task PopModalAsync();
     Task PopAsync();
+    MediaElement GetMediaElement();
 }
 

src/Bible.Alarm/MauiProgram.cs

@@ -220,17 +220,18 @@ private static void RegisterCommonServices(IServiceCollection services)
             if (app?.Windows.Count > 0)
             {
                 var window = app.Windows[0];
-                if (window.Page is NavigationPage windowNavPage)
+                // Window.Page is directly NavigationPage
+                if (window?.Page is NavigationPage windowNavPage)
                 {
                     return windowNavPage.Navigation;
                 }
             }
 
             // Fallback — try MainPage for compatibility (obsolete but may be needed)
 #pragma warning disable CS0618 // Type or member is obsolete
-            if (app?.MainPage is NavigationPage navPage)
+            if (app?.MainPage is NavigationPage mainNavPage)
             {
-                return navPage.Navigation;
+                return mainNavPage.Navigation;
             }
 #pragma warning restore CS0618
 
@@ -251,7 +252,6 @@ private static void RegisterViewModels(IServiceCollection services)
         services.AddTransient<BookSelectionViewModel>();
         services.AddTransient<ChapterSelectionViewModel>();
         services.AddTransient<AlarmViewModal>();
-        services.AddTransient<MediaProgressViewModal>();
 
         // Register ScheduleListItem as transient for list items
         services.AddTransient<ScheduleListItem>();
@@ -281,8 +281,7 @@ private static void RegisterUiComponents(IServiceCollection services)
         services.AddTransient<AlarmModal>();
         services.AddTransient<BatteryOptimizationExclusionModal>();
         services.AddTransient<NumberOfChaptersModal>();
-        services.AddTransient<MediaProgressModal>();
-        services.AddTransient<LoadingPage>();
+        services.AddTransient<BootstrapPage>();
     }
 
     /// <summary>