Refactore view models

Author: justcoding121

.tools/Bible.Alarm.Audio.Links.Harvestor/Utility/MediaReader.cs

@@ -9,14 +9,8 @@
 
 namespace Bible.Alarm.Audio.Links.Harvestor.Utility
 {
-    public class MediaReader
+    public class MediaReader(string indexRoot)
     {
-        private readonly string indexRoot;
-        public MediaReader(string indexRoot)
-        {
-            this.indexRoot = indexRoot;
-        }
-
         public async Task<Dictionary<string, Language>> GetBibleLanguages()
         {
             var root = indexRoot;

src/Bible.Alarm.Shared/Models/Media/Bible/BibleBook.cs

@@ -11,11 +11,11 @@ public class BibleBook : IComparable
         public int Number { get; set; }
 
         public int BibleTranslationId { get; set; }
-        public BibleTranslation? BibleTranslation { get; set; }
+        public BibleTranslation BibleTranslation { get; set; }
 
         public List<BibleChapter> Chapters { get; set; } = new List<BibleChapter>();
 
-        public int CompareTo(object? obj)
+        public int CompareTo(object obj)
         {
             if (obj is not BibleBook other) return 1;
             return Number.CompareTo(other.Number);

src/Bible.Alarm.Shared/Models/Media/Bible/BibleChapter.cs

@@ -10,12 +10,12 @@ public class BibleChapter : IComparable
 
         public string Title => $"Chapter {Number}";
 
-        public AudioSource? Source { get; set; }
+        public AudioSource Source { get; set; }
 
         public int BibleBookId { get; set; }
-        public BibleBook? Book { get; set; }
+        public BibleBook Book { get; set; }
 
-        public int CompareTo(object? obj)
+        public int CompareTo(object obj)
         {
             if (obj is not BibleChapter other) return 1;
             return Number.CompareTo(other.Number);

src/Bible.Alarm.Shared/Models/Media/Music/MusicTrack.cs

@@ -9,9 +9,9 @@ public class MusicTrack : IComparable
         public int Number { get; set; }
         public string Title { get; set; } = string.Empty;
 
-        public AudioSource? Source { get; set; }
+        public AudioSource Source { get; set; }
 
-        public int CompareTo(object? obj)
+        public int CompareTo(object obj)
         {
             if (obj is not MusicTrack other) return 1;
             return Number.CompareTo(other.Number);

src/Bible.Alarm.Shared/Models/Media/PlayItem.cs

@@ -1,16 +1,10 @@
 namespace Bible.Alarm.Shared.Models.Media
 {
-    public class PlayItem
+    public class PlayItem(NotificationDetail detail, string url)
     {
-        public NotificationDetail PlayDetail { get; set; }
+        public NotificationDetail PlayDetail { get; set; } = detail;
 
-        public string Url { get; set; }
-
-        public PlayItem(NotificationDetail detail, string url)
-        {
-            PlayDetail = detail;
-            Url = url;
-        }
+        public string Url { get; set; } = url;
 
         public override string ToString()
         {

src/Bible.Alarm/App.xaml.cs

@@ -44,7 +44,7 @@ public App(ILogger logger, IServiceProvider serviceProvider)
         WeakReferenceMessenger.Default.Register<ClearToastsMessage>(this);
     }
 
-    protected override Window CreateWindow(IActivationState? activationState)
+    protected override Window CreateWindow(IActivationState activationState)
     {
         var loadingPage = _serviceProvider.GetRequiredService<LoadingPage>();
         var navigationPage = new NavigationPage(loadingPage)

src/Bible.Alarm/Common/Interfaces/Media/IScheduleDisplayService.cs

@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Bible.Alarm.Common.Interfaces.Media;
+
+public interface IScheduleDisplayService
+{
+    Task<string> GetChapterDisplayNameAsync(long scheduleId, bool force = false);
+}
+

src/Bible.Alarm/Common/Interfaces/Media/ISchedulePlaybackService.cs

@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+
+namespace Bible.Alarm.Common.Interfaces.Media;
+
+public interface ISchedulePlaybackService
+{
+    Task PlayScheduleAsync(long scheduleId);
+    Task<bool> CanMoveChapterAsync();
+}
+

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

@@ -1,93 +1,48 @@
 namespace Bible.Alarm.Common.Messenger;
 
 // Message classes for WeakReferenceMessenger
-public class InitializedMessage
+public class InitializedMessage(bool value)
 {
-    public bool Value { get; }
-    
-    public InitializedMessage(bool value)
-    {
-        Value = value;
-    }
+    public bool Value { get; } = value;
 }
 
-public class ShowAlarmModalMessage
+public class ShowAlarmModalMessage(object value)
 {
-    public object Value { get; }
-    
-    public ShowAlarmModalMessage(object value)
-    {
-        Value = value;
-    }
+    public object Value { get; } = value;
 }
 
-public class HideAlarmModalMessage
+public class HideAlarmModalMessage(object value)
 {
-    public object Value { get; }
-    
-    public HideAlarmModalMessage(object value)
-    {
-        Value = value;
-    }
+    public object Value { get; } = value;
 }
 
-public class ShowMediaProgressModalMessage
+public class ShowMediaProgressModalMessage(object value)
 {
-    public object Value { get; }
-    
-    public ShowMediaProgressModalMessage(object value)
-    {
-        Value = value;
-    }
+    public object Value { get; } = value;
 }
 
-public class HideMediaProgressModalMessage
+public class HideMediaProgressModalMessage(object value)
 {
-    public object Value { get; }
-    
-    public HideMediaProgressModalMessage(object value)
-    {
-        Value = value;
-    }
+    public object Value { get; } = value;
 }
 
-public class MediaProgressMessage
+public class MediaProgressMessage(object value)
 {
-    public object Value { get; }
-    
-    public MediaProgressMessage(object value)
-    {
-        Value = value;
-    }
+    public object Value { get; } = value;
 }
 
-public class TrackChangedMessage
+public class TrackChangedMessage(int value)
 {
-    public int Value { get; }
-    
-    public TrackChangedMessage(int value)
-    {
-        Value = value;
-    }
+    public int Value { get; } = value;
 }
 
-public class ShowToastMessage
+public class ShowToastMessage(object value)
 {
-    public object Value { get; }
-    
-    public ShowToastMessage(object value)
-    {
-        Value = value;
-    }
+    public object Value { get; } = value;
 }
 
-public class ClearToastsMessage
+public class ClearToastsMessage(object value)
 {
-    public object Value { get; }
-    
-    public ClearToastsMessage(object value)
-    {
-        Value = value;
-    }
+    public object Value { get; } = value;
 }
 

src/Bible.Alarm/MauiProgram.cs

@@ -10,6 +10,7 @@
 using Bible.Alarm.Common.Interfaces.UI;
 using Bible.Alarm.Database;
 using Bible.Alarm.Models.Schedule;
+using Bible.Alarm.Services.Database;
 using Bible.Alarm.Services.Media;
 using Bible.Alarm.Services.Media.Interfaces;
 using Bible.Alarm.Services.Network;
@@ -88,6 +89,8 @@ public static MauiApp CreateMauiApp()
 
         // Initialize Fluxor store
         var store = app.Services.GetRequiredService<IStore>();
+        // Store initialization happens automatically, but we ensure it's ready
+        store.InitializeAsync().GetAwaiter().GetResult();
         ReduxContainer.Store = store;
 
         return app;
@@ -129,12 +132,16 @@ private static void RegisterCommonServices(IServiceCollection services)
         services.AddSingleton<IMediaCacheService, MediaCacheService>();
         services.AddSingleton<IPlaylistService, PlaylistService>();
         services.AddSingleton<IAlarmService, AlarmService>();
+        services.AddSingleton<IScheduleStateService, ScheduleStateService>();
+        services.AddSingleton<ISchedulePlaybackService, SchedulePlaybackService>();
+        services.AddSingleton<IScheduleDisplayService, ScheduleDisplayService>();
         services.AddSingleton<INetworkStatusService, NetworkStatusService>();
         services.AddSingleton<IMediaElementAudioService, MediaElementAudioService>();
         services.AddSingleton<IPlaybackService, PlaybackService>();
         services.AddSingleton<SchedulerService>();
         services.AddSingleton<ISchedulerService>(sp => sp.GetRequiredService<SchedulerService>());
         services.AddSingleton<IMediaIndexService>(sp => sp.GetRequiredService<MediaIndexService>());
+        services.AddSingleton<IDatabaseSeedService, DatabaseSeedService>();
 
         // Register platform-specific version finder
 #if ANDROID