Add readonly modifier

Author: justcoding121

src/Bible.Alarm.Shared/Constants/AppConstants.cs

@@ -267,7 +267,7 @@ public static class Platform
         /// <summary>
         /// iOS platform identifier
         /// </summary>
-        public const string iOS = "iOS";
+        public const string IOs = "iOS";
 
         /// <summary>
         /// Windows platform identifier

src/Bible.Alarm.Shared/Utilities/DirectoryHelper.cs

@@ -7,7 +7,7 @@ public static class DirectoryHelper
 {
     public static string IndexDirectory => indexDirectory.Value;
 
-    private static Lazy<string> indexDirectory = new(() =>
+    private static readonly Lazy<string> indexDirectory = new(() =>
     {
         var currentDir = new DirectoryInfo(Directory.GetCurrentDirectory());
 

src/Bible.Alarm/App.xaml.cs

@@ -3,8 +3,6 @@
 using Bible.Alarm.Services.Contracts;
 using Bible.Alarm.UI;
 using Bible.Alarm.ViewModels;
-using Serilog;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Bible.Alarm;
 
@@ -32,17 +30,9 @@ protected override Window CreateWindow(IActivationState? activationState)
         // Initialize platform-specific bootstrap helper after ServiceProviderManager is available
         InitializePlatformBootstrap();
 
-        // Create a simple window with a basic page for now
-        var window = new Window(new ContentPage
-        {
-            Title = "Bible Alarm",
-            Content = new Label 
-            { 
-                Text = "Bible Alarm is starting...", 
-                HorizontalOptions = LayoutOptions.Center,
-                VerticalOptions = LayoutOptions.Center
-            }
-        });
+        // Create a NavigationPage as the root page (proper MAUI pattern)
+        var navigationPage = new NavigationPage();
+        var window = new Window(navigationPage);
 
         // Initialize services in background
         Task.Run(async () =>
@@ -51,13 +41,10 @@ protected override Window CreateWindow(IActivationState? activationState)
             {
                 System.Diagnostics.Debug.WriteLine("Starting service initialization...");
 
-                // Create and store the navigation service for later use
+                // Get navigation service from DI container
                 using var scope = _scopeFactory.CreateScope();
-                _navigationService = new NavigationService(
-                    scope.ServiceProvider.GetRequiredService<ILogger>(), 
-                    null, // Will be set when we have proper navigation
-                    _scopeFactory);
-                System.Diagnostics.Debug.WriteLine("NavigationService created!");
+                _navigationService = scope.ServiceProvider.GetRequiredService<INavigationService>();
+                System.Diagnostics.Debug.WriteLine("NavigationService retrieved from DI!");
 
                 // Initialize the home page
                 await InitializeHomePage(window);
@@ -84,11 +71,22 @@ private async Task InitializeHomePage(Window window)
             System.Diagnostics.Debug.WriteLine("InitializeHomePage called!");
             using var scope = _scopeFactory.CreateScope();
             var homePage = new Home { BindingContext = scope.ServiceProvider.GetRequiredService<HomeViewModel>() };
-            
-            // Set the main page to the home page
-            window.Page = homePage;
-            System.Diagnostics.Debug.WriteLine("Home page set!");
-            
+
+            // Get the NavigationPage from the window
+            if (window.Page is NavigationPage navigationPage)
+            {
+                // Push the home page to the navigation stack
+                await navigationPage.PushAsync(homePage);
+                System.Diagnostics.Debug.WriteLine("Home page pushed to navigation stack!");
+
+                // Set the navigation instance for the NavigationService
+                if (_navigationService != null)
+                {
+                    _navigationService.SetNavigation(navigationPage.Navigation);
+                    System.Diagnostics.Debug.WriteLine("Navigation instance set!");
+                }
+            }
+
             // Add a small delay to ensure proper initialization
             await Task.Delay(100);
         }

src/Bible.Alarm/Bible.Alarm.csproj

@@ -22,6 +22,9 @@
 		<!-- Windows-specific -->
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
 		<UseWinUI>true</UseWinUI>
+		
+		<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
+		<WindowsPackageType>None</WindowsPackageType>
 
 		<!-- Suppress duplicate assembly attribute warnings -->
 		<NoWarn>$(NoWarn);CS0579</NoWarn>

src/Bible.Alarm/Common/Helpers/CommonBootstrapHelper.cs

@@ -5,11 +5,11 @@ namespace Bible.Alarm.Common.Helpers;
 
 public static class CommonBootstrapHelper
 {
-    private static SemaphoreSlim @lock = new(1);
+    private static readonly SemaphoreSlim Lock = new(1);
 
     public static async Task VerifyServices()
     {
-        await @lock.WaitAsync();
+        await Lock.WaitAsync();
 
         try
         {
@@ -20,7 +20,7 @@ public static async Task VerifyServices()
         }
         finally
         {
-            @lock.Release();
+            Lock.Release();
         }
     }
 

src/Bible.Alarm/Common/Mvvm/Commands/RelayCommand.cs

@@ -13,7 +13,7 @@ public class RelayCommand(Action execute, Func<bool> canExecute = null) : IRelay
 
     #region Fields
 
-    private Func<bool> _canExecute = canExecute ?? (() => true);
+    private readonly Func<bool> _canExecute = canExecute ?? (() => true);
 
     #endregion
 

src/Bible.Alarm/Common/Mvvm/Commands/RelayCommand{T}.cs

@@ -13,7 +13,7 @@ public class RelayCommand<T>(Action<T> execute, Func<T, bool> canExecute = null)
 
     #region Fields
 
-    private Func<T, bool> _canExecute = canExecute ?? ((o) => true);
+    private readonly Func<T, bool> _canExecute = canExecute ?? ((o) => true);
 
     #endregion
 

src/Bible.Alarm/Common/Mvvm/Messenger/Messenger.cs

@@ -24,19 +24,19 @@ private class MessageWrapper(T parameter)
         public T Parameter { get; private set; } = parameter;
     }
 
-    private static ConcurrentDictionary<MvvmMessages, BehaviorSubject<MessageWrapper>> cache = new();
+    private static readonly ConcurrentDictionary<MvvmMessages, BehaviorSubject<MessageWrapper>> Cache = new();
 
     public static void Publish(MvvmMessages stream, T parameter = default)
     {
-        var subject = cache.GetOrAdd(stream, new BehaviorSubject<MessageWrapper>(null));
+        var subject = Cache.GetOrAdd(stream, new BehaviorSubject<MessageWrapper>(null));
         subject.OnNext(new MessageWrapper(parameter));
     }
 
     public static IDisposable Subscribe(MvvmMessages stream,
         Func<T, Task> action,
         bool getMostRecentEvent = false)
     {
-        var subject = cache.GetOrAdd(stream, new BehaviorSubject<MessageWrapper>(null));
+        var subject = Cache.GetOrAdd(stream, new BehaviorSubject<MessageWrapper>(null));
 
         if (getMostRecentEvent)
             return subject.Where(x => x != null)

src/Bible.Alarm/Common/Mvvm/Observers/NotifyPropertyObserver.cs

@@ -27,9 +27,9 @@ public NotifyPropertyObserver(TObservable observable, TObserver observer)
 
     private bool _hasBeenActive;
 
-    private TObservable _observable;
+    private readonly TObservable _observable;
 
-    private WeakReference<TObserver> _observer;
+    private readonly WeakReference<TObserver> _observer;
 
     private Dictionary<string, Action> _propertyObservers = [];
 

src/Bible.Alarm/Common/ServiceProviderManager.cs

@@ -6,8 +6,8 @@ namespace Bible.Alarm;
 /// </summary>
 public static class ServiceProviderManager
 {
-    private static IServiceProvider _serviceProvider;
-    private static readonly object _lock = new();
+    private static IServiceProvider serviceProvider;
+    private static readonly object Lock = new();
 
     /// <summary>
     /// Gets the global service provider. Throws if not initialized.
@@ -16,10 +16,10 @@ public static IServiceProvider ServiceProvider
     {
         get
         {
-            if (_serviceProvider == null)
+            if (serviceProvider == null)
                 throw new InvalidOperationException(
                     "Service provider has not been initialized. Call Initialize() first.");
-            return _serviceProvider;
+            return serviceProvider;
         }
     }
 
@@ -31,11 +31,11 @@ public static void Initialize(IServiceProvider serviceProvider)
     {
         if (serviceProvider == null) throw new ArgumentNullException(nameof(serviceProvider));
 
-        lock (_lock)
+        lock (Lock)
         {
-            if (_serviceProvider != null)
+            if (ServiceProviderManager.serviceProvider != null)
                 throw new InvalidOperationException("Service provider has already been initialized.");
-            _serviceProvider = serviceProvider;
+            ServiceProviderManager.serviceProvider = serviceProvider;
         }
     }
 
@@ -62,5 +62,5 @@ public static object GetService(Type serviceType)
     /// <summary>
     /// Checks if the service provider has been initialized.
     /// </summary>
-    public static bool IsInitialized => _serviceProvider != null;
+    public static bool IsInitialized => serviceProvider != null;
 }