Fix color changes on theme change

Author: justcoding121

src/Bible.Alarm/App.xaml.cs

@@ -152,6 +152,10 @@ private void OnRequestedThemeChanged(object? sender, AppThemeChangedEventArgs e)
         UpdateThemeAwareColorResources();
         WindowSetupService.UpdateNavigationBarColors();
         // Notify ViewModels to update theme-aware bindings (e.g., day button colors)
-        WeakReferenceMessenger.Default.Send(new ThemeChangedMessage());
+        // Use BeginInvokeOnMainThread to ensure resources are fully propagated before ViewModels update
+        MainThread.BeginInvokeOnMainThread(() =>
+        {
+            WeakReferenceMessenger.Default.Send(new ThemeChangedMessage());
+        });
     }
 }

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

@@ -1,28 +1,11 @@
-using System.ComponentModel;
 using System.Globalization;
 using Bible.Alarm.Shared.Models.Enums;
 using Bible.Alarm.ViewModels;
 
 namespace Bible.Alarm.Common.ViewHelpers.Converters;
 
-public sealed class DayBackgroundColorConverter : IValueConverter, IMultiValueConverter, INotifyPropertyChanged
+public sealed class DayBackgroundColorConverter : IValueConverter, IMultiValueConverter
 {
-    public event PropertyChangedEventHandler? PropertyChanged;
-
-    public DayBackgroundColorConverter()
-    {
-        // Subscribe to theme changes when converter is instantiated
-        if (Application.Current != null)
-        {
-            Application.Current.RequestedThemeChanged += OnRequestedThemeChanged;
-        }
-    }
-
-    private void OnRequestedThemeChanged(object? sender, AppThemeChangedEventArgs e)
-    {
-        // Notify that the converter output has changed, causing all bindings to re-evaluate
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(string.Empty));
-    }
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
         var theme = ThemeColors.GetCurrentTheme();

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

@@ -1,28 +1,11 @@
-using System.ComponentModel;
 using System.Globalization;
 using Bible.Alarm.Shared.Models.Enums;
 using Bible.Alarm.ViewModels;
 
 namespace Bible.Alarm.Common.ViewHelpers.Converters;
 
-public sealed class DayColorConverter : IValueConverter, IMultiValueConverter, INotifyPropertyChanged
+public sealed class DayColorConverter : IValueConverter, IMultiValueConverter
 {
-    public event PropertyChangedEventHandler? PropertyChanged;
-
-    public DayColorConverter()
-    {
-        // Subscribe to theme changes when converter is instantiated
-        if (Application.Current != null)
-        {
-            Application.Current.RequestedThemeChanged += OnRequestedThemeChanged;
-        }
-    }
-
-    private void OnRequestedThemeChanged(object? sender, AppThemeChangedEventArgs e)
-    {
-        // Notify that the converter output has changed, causing all bindings to re-evaluate
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(string.Empty));
-    }
     private static DaysOfWeek ParseDayParameter(object parameter)
     {
         return parameter switch

src/Bible.Alarm/ViewModels/BiblePublications/BibleSelectionViewModelHelpers/BiblePublicationSelectionActionDispatcher.cs

@@ -1,7 +1,6 @@
 #nullable enable
 using Bible.Alarm.Stores.Actions.BiblePublications;
 using Bible.Alarm.Stores.Models;
-using Bible.Alarm.ViewModels.Shared;
 using IDispatcher = Fluxor.IDispatcher;
 
 namespace Bible.Alarm.ViewModels.BiblePublications.BibleSelectionViewModelHelpers;
@@ -27,7 +26,7 @@ public void DispatchBiblePublicationSelectionActions(BiblePublicationStateItem b
         dispatcher.Dispatch(new TrackSelectedAction(biblePublicationItem));
     }
 
-    public void DispatchLanguageSelectionActions(BiblePublicationStateItem biblePublicationItem, LanguageListViewItemModel language)
+    public void DispatchLanguageSelectionActions(BiblePublicationStateItem biblePublicationItem)
     {
         // Only dispatch TrackSelectedAction - its reducer updates both CurrentSchedule and
         // CurrentBiblePublicationSchedule, and its effect syncs all properties.

src/Bible.Alarm/ViewModels/BiblePublications/BibleSelectionViewModelHelpers/BiblePublicationSelectionCommandHandler.cs

@@ -197,7 +197,7 @@ public ICommand CreateSelectLanguageCommand(
             var biblePublicationItem = CreateBiblePublicationItemForLanguageSelection(
                 x, publicationCode, sectionNumber, trackNumber, sectionName, publicationName, trackTitle, currentSchedule);
             var actionDispatcher = new BiblePublicationSelectionActionDispatcher(dispatcher);
-            actionDispatcher.DispatchLanguageSelectionActions(biblePublicationItem, x);
+            actionDispatcher.DispatchLanguageSelectionActions(biblePublicationItem);
         });
     }
 

src/Bible.Alarm/ViewModels/Schedule/ScheduleDetailsContainerViewModel.cs

@@ -2,12 +2,14 @@
 
 using System.Windows.Input;
 using AutoMapper;
+using Bible.Alarm.Common.Messenger;
 using Bible.Alarm.Shared.Models.Enums;
 using Bible.Alarm.Stores;
 using Bible.Alarm.Stores.Actions.Schedule;
 using Bible.Alarm.Stores.Models;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
 using Fluxor;
 using Serilog;
 using IDispatcher = Fluxor.IDispatcher;
@@ -42,6 +44,8 @@ public ScheduleDetailsContainerViewModel(
         this.mapper = mapper;
 
         state.StateChanged += OnStateChanged;
+        // Subscribe to theme changes to update day button colors
+        WeakReferenceMessenger.Default.Register<ThemeChangedMessage>(this, (r, m) => OnThemeChanged());
         InitializeCommands();
         InitializeFromState();
     }
@@ -114,67 +118,81 @@ private void SignalContainerReady()
 
     private void OnStateChanged(object? sender, EventArgs e)
     {
-        var stateValue = state.Value;
-        var currentSchedule = stateValue.CurrentSchedule;
-
-        // If ContainerReadiness was reset to NotReady but we've already signaled ready, reset our flag
-        // This handles the case where ViewScheduleAction resets ContainerReadiness after containers signaled ready
-        if (hasSignaledReady && !stateValue.ContainerReadiness.ScheduleDetails && currentSchedule != null)
+        // Prevent re-entrant calls to avoid cycles
+        if (isProcessingStateChange)
         {
-            hasSignaledReady = false;
-            isReadyActionQueued = false; // Reset queued flag as well
-            // Re-initialize and signal ready again
-            InitializeFromState();
             return;
         }
 
-        // If we don't have a scheduleId yet (initial state), initialize when CurrentSchedule is set
-        // But only if we haven't already signaled ready (prevents infinite loop for new schedules with Id=0)
-        if (scheduleId == 0 && currentSchedule != null && !hasSignaledReady)
+        isProcessingStateChange = true;
+        try
         {
-            InitializeFromState();
-            return;
-        }
+            var stateValue = state.Value;
+            var currentSchedule = stateValue.CurrentSchedule;
 
-        // Reset hasSignaledReady when schedule ID changes to a different positive ID (existing schedule opened)
-        if (currentSchedule != null && currentSchedule.Id != scheduleId && currentSchedule.Id > 0)
-        {
-            hasSignaledReady = false;
-            isReadyActionQueued = false; // Reset queued flag as well
-            InitializeFromState();
-            return;
-        }
+            // If ContainerReadiness was reset to NotReady but we've already signaled ready, reset our flag
+            // This handles the case where ViewScheduleAction resets ContainerReadiness after containers signaled ready
+            if (hasSignaledReady && !stateValue.ContainerReadiness.ScheduleDetails && currentSchedule != null)
+            {
+                hasSignaledReady = false;
+                isReadyActionQueued = false; // Reset queued flag as well
+                // Re-initialize and signal ready again
+                InitializeFromState();
+                return;
+            }
 
-        // Only update properties if they changed (don't re-initialize)
-        if (currentSchedule != null && !hasSignaledReady)
-        {
-            // Handle case where InitializeFromState hasn't been called yet
-            InitializeFromState();
-        }
-        else if (currentSchedule != null && hasSignaledReady)
-        {
-            // Update individual properties when they change (after initialization)
-            if (isEnabled != currentSchedule.IsEnabled)
+            // If we don't have a scheduleId yet (initial state), initialize when CurrentSchedule is set
+            // But only if we haven't already signaled ready (prevents infinite loop for new schedules with Id=0)
+            if (scheduleId == 0 && currentSchedule != null && !hasSignaledReady)
             {
-                isEnabled = currentSchedule.IsEnabled;
-                OnPropertyChanged(nameof(IsEnabled));
+                InitializeFromState();
+                return;
             }
-            if (time != new TimeSpan(currentSchedule.Hour, currentSchedule.Minute, currentSchedule.Second))
+
+            // Reset hasSignaledReady when schedule ID changes to a different positive ID (existing schedule opened)
+            if (currentSchedule != null && currentSchedule.Id != scheduleId && currentSchedule.Id > 0)
             {
-                time = new TimeSpan(currentSchedule.Hour, currentSchedule.Minute, currentSchedule.Second);
-                OnPropertyChanged(nameof(Time));
+                hasSignaledReady = false;
+                isReadyActionQueued = false; // Reset queued flag as well
+                InitializeFromState();
+                return;
             }
-            if (daysOfWeek != currentSchedule.DaysOfWeek)
+
+            // Only update properties if they changed (don't re-initialize)
+            if (currentSchedule != null && !hasSignaledReady)
             {
-                daysOfWeek = currentSchedule.DaysOfWeek;
-                OnPropertyChanged(nameof(DaysOfWeek));
+                // Handle case where InitializeFromState hasn't been called yet
+                InitializeFromState();
             }
-            if (name != currentSchedule.Name)
+            else if (currentSchedule != null && hasSignaledReady)
             {
-                name = currentSchedule.Name;
-                OnPropertyChanged(nameof(Name));
+                // Update individual properties when they change (after initialization)
+                if (isEnabled != currentSchedule.IsEnabled)
+                {
+                    isEnabled = currentSchedule.IsEnabled;
+                    OnPropertyChanged(nameof(IsEnabled));
+                }
+                if (time != new TimeSpan(currentSchedule.Hour, currentSchedule.Minute, currentSchedule.Second))
+                {
+                    time = new TimeSpan(currentSchedule.Hour, currentSchedule.Minute, currentSchedule.Second);
+                    OnPropertyChanged(nameof(Time));
+                }
+                if (daysOfWeek != currentSchedule.DaysOfWeek)
+                {
+                    daysOfWeek = currentSchedule.DaysOfWeek;
+                    OnPropertyChanged(nameof(DaysOfWeek));
+                }
+                if (name != currentSchedule.Name)
+                {
+                    name = currentSchedule.Name;
+                    OnPropertyChanged(nameof(Name));
+                }
             }
         }
+        finally
+        {
+            isProcessingStateChange = false;
+        }
     }
 
     public ICommand ToggleDayCommand { get; private set; } = null!;
@@ -326,9 +344,20 @@ private void NotifyScheduleDetailsPropertiesChanged()
         OnPropertyChanged(nameof(IsEnabled));
     }
 
+    private void OnThemeChanged()
+    {
+        // Notify DaysOfWeek and IsEnabled properties to trigger converters that bind to them
+        // This causes day button colors to update when theme changes
+        // Note: We're already on the main thread (message is sent from main thread),
+        // but we batch the notifications to ensure MultiBinding converters see both values updated together
+        OnPropertyChanged(nameof(DaysOfWeek));
+        OnPropertyChanged(nameof(IsEnabled));
+    }
+
     public void Dispose()
     {
         state.StateChanged -= OnStateChanged;
+        WeakReferenceMessenger.Default.Unregister<ThemeChangedMessage>(this);
     }
 }
 

src/Bible.Alarm/ViewModels/ScheduleListItemViewModel.cs

@@ -551,9 +551,18 @@ private void OnPlaybackStateChanged(object? sender, EventArgs e)
         // The overlay is hidden by AlarmModalService -> ScheduleItemStateService after modal is shown.
     }
 
+    private void OnThemeChanged()
+    {
+        // Notify 'This' property to trigger converters that bind to the entire ViewModel
+        // This causes day button colors to update when theme changes
+        // Note: We're already on the main thread (message is sent from main thread)
+        OnPropertyChanged(nameof(This));
+    }
+
     public void Dispose()
     {
         applicationState.StateChanged -= OnApplicationStateChanged;
         playbackState.StateChanged -= OnPlaybackStateChanged;
+        WeakReferenceMessenger.Default.Unregister<ThemeChangedMessage>(this);
     }
 }