Fix build

Author: justcoding121

src/Bible.Alarm/Common/ViewHelpers/Converters/PlayStatusIconConverter.cs

@@ -1,4 +1,5 @@
 using System.Globalization;
+using Bible.Alarm.Views;
 
 namespace Bible.Alarm.Common.ViewHelpers.Converters;
 

src/Bible.Alarm/Common/ViewHelpers/ListViewHelper.cs

@@ -1,4 +1,5 @@
 #if WINDOWS
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 #endif
 using System.Runtime.InteropServices;

src/Bible.Alarm/MauiProgram.cs

@@ -47,6 +47,7 @@
 using Bible.Alarm.Platforms.Android.Services.Handlers;
 using Bible.Alarm.Platforms.Android.Services.Helpers;
 using Bible.Alarm.Platforms.Android.Services.Battery;
+using Bible.Alarm.Common.Interfaces.Battery;
 using Bible.Alarm.Platforms.Android.Services.Platform;
 using Bible.Alarm.Platforms.Android.Services.Storage;
 #endif
@@ -57,6 +58,7 @@
 using Bible.Alarm.Platforms.Windows.Services.Storage;
 using Bible.Alarm.Platforms.Windows.Services.Platform;
 using Bible.Alarm.Platforms.Windows.Helpers;
+using Windows.Media.Playback;
 #endif
 
 namespace Bible.Alarm;
@@ -95,7 +97,7 @@ private static void RegisterServices(IServiceCollection services)
     {
         // Register platform-specific HttpMessageHandler
 #if ANDROID
-        services.AddSingleton<HttpMessageHandler, AndroidMessageHandler>();
+        services.AddSingleton<HttpMessageHandler, HttpClientHandler>();
 #elif IOS
         services.AddSingleton<HttpMessageHandler, HttpClientHandler>();
 #elif WINDOWS
@@ -284,9 +286,12 @@ private static void RunBootstrap(IServiceProvider services)
 
 #if ANDROID
             // Android bootstrap initialization
-            var context = Platform.CurrentActivity?.ApplicationContext ?? Application.Context;
+            var context = Platform.CurrentActivity?.ApplicationContext;
             var application = Platform.CurrentActivity?.Application;
-            BootstrapHelper.Initialize(logger, context, application);
+            if (context != null && application != null)
+            {
+                BootstrapHelper.Initialize(logger, context, application);
+            }
 #elif IOS
             // iOS bootstrap initialization
             BootstrapHelper.Initialize(logger, isForeground: true);

src/Bible.Alarm/ViewModels/Bible/BookSelectionViewModel.cs

@@ -20,6 +20,8 @@ public class BookSelectionViewModel : ObservableObject, IDisposable
 
     private readonly MediaService _mediaService;
     private readonly IState<ApplicationState> _state;
+    private EventHandler? _onBibleReadingChanged;
+    private EventHandler? _onBibleReadingInitialized;
 
     public ICommand BackCommand { get; set; }
     public ICommand ChapterSelectionCommand { get; set; }
@@ -58,8 +60,7 @@ public BookSelectionViewModel(MediaService mediaService, INavigation navigation,
 
         //set schedules from initial state.
         //this should fire only once 
-        EventHandler onBibleReadingInitialized = null;
-        onBibleReadingInitialized = (sender, e) =>
+        _onBibleReadingInitialized = (sender, e) =>
         {
             var stateValue = _state.Value;
             if (stateValue.CurrentBibleReadingSchedule == null ||
@@ -72,9 +73,13 @@ public BookSelectionViewModel(MediaService mediaService, INavigation navigation,
                 await Initialize(_tentative.LanguageCode, _tentative.PublicationCode);
                 await MainThread.InvokeOnMainThreadAsync(() => IsBusy = false);
             });
-            _state.StateChanged -= onBibleReadingInitialized;
+            if (_onBibleReadingInitialized != null)
+            {
+                _state.StateChanged -= _onBibleReadingInitialized;
+                _onBibleReadingInitialized = null;
+            }
         };
-        _state.StateChanged += onBibleReadingInitialized;
+        _state.StateChanged += _onBibleReadingInitialized;
 
         // Subscribe to current schedule changes (but skip first one)
         BibleReadingSchedule lastCurrent = null;
@@ -88,8 +93,23 @@ void OnBibleReadingChanged(object sender, EventArgs e)
             lastCurrent = _current;
         }
 
-        _state.StateChanged += OnBibleReadingChanged;
+        _onBibleReadingChanged = OnBibleReadingChanged;
+        _state.StateChanged += _onBibleReadingChanged;
+
+    }
 
+    public void Dispose()
+    {
+        if (_onBibleReadingChanged != null)
+        {
+            _state.StateChanged -= _onBibleReadingChanged;
+            _onBibleReadingChanged = null;
+        }
+        if (_onBibleReadingInitialized != null)
+        {
+            _state.StateChanged -= _onBibleReadingInitialized;
+            _onBibleReadingInitialized = null;
+        }
     }
 
     private void SetSelectedBook()

src/Bible.Alarm/ViewModels/Bible/ChapterSelectionViewModel.cs

@@ -304,7 +304,6 @@ public void Dispose()
             UnsubscribeFromChapterEvents(chapter);
         }
 
-        _subscriptions.ForEach(x => x.Dispose());
         _propertyChangedHandlers.Clear();
 
         _lock.Dispose();

src/Bible.Alarm/ViewModels/ScheduleViewModel.cs

@@ -38,8 +38,8 @@ public class ScheduleViewModel : ObservableObject
     private readonly IToastService _popUpService;
     private readonly INavigation _navigation;
 
-    public Command BatteryOptimizationExcludeCommand { get; private set; }
-    public Command BatteryOptimizationDismissCommand { get; private set; }
+    public ICommand BatteryOptimizationExcludeCommand { get; private set; }
+    public ICommand BatteryOptimizationDismissCommand { get; private set; }
 
     public ICommand PreviousBookCommand { get; set; }
     public ICommand NextBookCommand { get; set; }

src/Bible.Alarm/Views/FontFileResources.xaml.cs

@@ -52,18 +52,8 @@ public static string FontAwesomeSolid
             }
 
             // Fallback: try to get from ResourceDictionary
-
-            <<<<<<<
-
-            Unmerged change from project 'Bible.Alarm (net9.0-android)',
-            return Instance.GetStringResourceForPlatform("FontAwesomeSolidId") ?? "FontAwesomeSolid";
-        }
-=======
             return GetStringResourceForPlatform("FontAwesomeSolidId") ?? "FontAwesomeSolid";
         }
->>>>>>> After
-            return FontFileResources.GetStringResourceForPlatform("FontAwesomeSolidId") ?? "FontAwesomeSolid";
-        }
     }
 
     private static string? GetStringResourceForPlatform(string resourceKey)