Call dispose correctly

justcoding121 · justcoding121 · commit 7b58c3477e68 · 2025-11-14T19:01:08.000-06:00
diff --git a/src/Bible.Alarm/MauiProgram.cs b/src/Bible.Alarm/MauiProgram.cs
@@ -242,7 +242,7 @@ private static void RegisterViewModels(IServiceCollection services)
         services.AddTransient<BookSelectionViewModel>();
         services.AddTransient<ChapterSelectionViewModel>();
         services.AddTransient<AlarmViewModal>();
-        services.AddSingleton<MediaProgressViewModal>();
+        services.AddTransient<MediaProgressViewModal>();
 
         // Register ScheduleListItem as transient for list items
         services.AddTransient<ScheduleListItem>();
diff --git a/src/Bible.Alarm/Services/UI/NavigationService.cs b/src/Bible.Alarm/Services/UI/NavigationService.cs
@@ -152,11 +152,9 @@ public async Task CloseModalAsync()
         var navigation = GetNavigation();
         if (navigation.ModalStack.Count > 0)
         {
-            var modal = await navigation.PopModalAsync();
-            if (modal.BindingContext is IDisposable disposable)
-            {
-                disposable.Dispose();
-            }
+            await navigation.PopModalAsync();
+            // Disposal is handled automatically by BaseContentPage.OnNavigatedFrom
+            // for all modals that inherit from BaseContentPage
         }
     }
 }
diff --git a/src/Bible.Alarm/Views/General/AlarmModal.xaml b/src/Bible.Alarm/Views/General/AlarmModal.xaml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ContentPage
+<views:BaseContentPage
     x:Class="Bible.Alarm.Views.General.AlarmModal"
+    xmlns:views="clr-namespace:Bible.Alarm.Views"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:forms="http://schemas.microsoft.com/dotnet/2021/maui/design"
@@ -10,10 +11,10 @@
     xmlns:converters="clr-namespace:Bible.Alarm.Common.ViewHelpers.Converters"
     xmlns:fn="clr-namespace:Bible.Alarm.Views"
     x:DataType="shared:AlarmViewModal">
-    <ContentPage.Resources>
+    <views:BaseContentPage.Resources>
         <converters:IsEnabledColorConverter x:Key="isEnabledConverter" />
-    </ContentPage.Resources>
-    <ContentPage.Content>
+    </views:BaseContentPage.Resources>
+    <views:BaseContentPage.Content>
         <Grid HorizontalOptions="Center" VerticalOptions="Fill">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
@@ -223,5 +224,5 @@
             </Grid>
         </Grid>
 
-    </ContentPage.Content>
-</ContentPage>
+    </views:BaseContentPage.Content>
+</views:BaseContentPage>
diff --git a/src/Bible.Alarm/Views/General/AlarmModal.xaml.cs b/src/Bible.Alarm/Views/General/AlarmModal.xaml.cs
@@ -2,7 +2,7 @@
 
 namespace Bible.Alarm.Views.General;
 
-public partial class AlarmModal : ContentPage
+public partial class AlarmModal : BaseContentPage
 {
     public AlarmViewModal ViewModel => BindingContext as AlarmViewModal;
 
diff --git a/src/Bible.Alarm/Views/General/BatteryOptimizationExclusionModal.xaml b/src/Bible.Alarm/Views/General/BatteryOptimizationExclusionModal.xaml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ContentPage
+<views:BaseContentPage
     x:Class="Bible.Alarm.Views.General.BatteryOptimizationExclusionModal"
+    xmlns:views="clr-namespace:Bible.Alarm.Views"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:d="http://schemas.microsoft.com/dotnet/2021/maui/design"
@@ -10,10 +11,10 @@
     xmlns:converters="clr-namespace:Bible.Alarm.Common.ViewHelpers.Converters"
     x:DataType="vm:ScheduleViewModel"
     mc:Ignorable="d">
-    <ContentPage.Resources>
+    <views:BaseContentPage.Resources>
         <converters:NegateBooleanConverter x:Key="negateBooleanConverter" />
-    </ContentPage.Resources>
-    <ContentPage.Content>
+    </views:BaseContentPage.Resources>
+    <views:BaseContentPage.Content>
         <StackLayout
             Margin="0,0,0,125"
             AutomationId="BatteryOptimizationModal"
@@ -98,5 +99,5 @@
                 TextColor="SlateBlue"
                 WidthRequest="200" />
         </StackLayout>
-    </ContentPage.Content>
-</ContentPage>
+    </views:BaseContentPage.Content>
+</views:BaseContentPage>
diff --git a/src/Bible.Alarm/Views/General/BatteryOptimizationExclusionModal.xaml.cs b/src/Bible.Alarm/Views/General/BatteryOptimizationExclusionModal.xaml.cs
@@ -1,6 +1,6 @@
 ﻿namespace Bible.Alarm.Views.General;
 
-public partial class BatteryOptimizationExclusionModal : ContentPage
+public partial class BatteryOptimizationExclusionModal : BaseContentPage
 {
     public BatteryOptimizationExclusionModal()
     {
diff --git a/src/Bible.Alarm/Views/General/MediaProgressModal.xaml b/src/Bible.Alarm/Views/General/MediaProgressModal.xaml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ContentPage
+<views:BaseContentPage
     x:Class="Bible.Alarm.Views.General.MediaProgressModal"
+    xmlns:views="clr-namespace:Bible.Alarm.Views"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:d="http://schemas.microsoft.com/dotnet/2021/maui/design"
@@ -10,7 +11,7 @@
     x:DataType="vm:MediaProgressViewModal"
     BackgroundColor="White"
     mc:Ignorable="d">
-    <ContentPage.Content>
+    <views:BaseContentPage.Content>
         <StackLayout
             HorizontalOptions="Center"
             Orientation="Vertical"
@@ -21,5 +22,5 @@
                 Progress="{Binding Progress}"
                 ProgressColor="SlateBlue" />
         </StackLayout>
-    </ContentPage.Content>
-</ContentPage>
+    </views:BaseContentPage.Content>
+</views:BaseContentPage>
diff --git a/src/Bible.Alarm/Views/General/MediaProgressModal.xaml.cs b/src/Bible.Alarm/Views/General/MediaProgressModal.xaml.cs
@@ -1,7 +1,7 @@
 ﻿namespace Bible.Alarm.Views.General;
 
 [XamlCompilation(XamlCompilationOptions.Compile)]
-public partial class MediaProgressModal : ContentPage
+public partial class MediaProgressModal : BaseContentPage
 {
     public MediaProgressModal()
     {

Original file line number	Diff line number	Diff line change
`@@ -152,11 +152,9 @@ public async Task CloseModalAsync()`
`152`	`152`	`var navigation = GetNavigation();`
`153`	`153`	`if (navigation.ModalStack.Count > 0)`
`154`	`154`	`{`
`155`		`- var modal = await navigation.PopModalAsync();`
`156`		`- if (modal.BindingContext is IDisposable disposable)`
`157`		`- {`
`158`		`- disposable.Dispose();`
`159`		`- }`
	`155`	`+ await navigation.PopModalAsync();`
	`156`	`+ // Disposal is handled automatically by BaseContentPage.OnNavigatedFrom`
	`157`	`+ // for all modals that inherit from BaseContentPage`
`160`	`158`	`}`
`161`	`159`	`}`
`162`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Bible.Alarm.Views.General;`
`4`	`4`
`5`		`-public partial class AlarmModal : ContentPage`
	`5`	`+public partial class AlarmModal : BaseContentPage`
`6`	`6`	`{`
`7`	`7`	`public AlarmViewModal ViewModel => BindingContext as AlarmViewModal;`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace Bible.Alarm.Views.General;`
`2`	`2`
`3`		`-public partial class BatteryOptimizationExclusionModal : ContentPage`
	`3`	`+public partial class BatteryOptimizationExclusionModal : BaseContentPage`
`4`	`4`	`{`
`5`	`5`	`public BatteryOptimizationExclusionModal()`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`namespace Bible.Alarm.Views.General;`
`2`	`2`
`3`	`3`	`[XamlCompilation(XamlCompilationOptions.Compile)]`
`4`		`-public partial class MediaProgressModal : ContentPage`
	`4`	`+public partial class MediaProgressModal : BaseContentPage`
`5`	`5`	`{`
`6`	`6`	`public MediaProgressModal()`
`7`	`7`	`{`