Fix various UI bugs

Author: justcoding121

src/Bible.Alarm/App.xaml.cs

@@ -138,8 +138,6 @@ private void UpdateThemeAwareColorResources()
             Resources["PrimaryTextColor"] = ThemeColors.PrimaryText.Get(theme);
             Resources["SelectedItemBackgroundColor"] = ThemeColors.SelectedItemBackground.Get(theme);
             Resources["DisabledTextColor"] = ThemeColors.DisabledText.Get(theme);
-            Resources["PrimaryColor"] = ThemeColors.Primary.Get(theme);
-            Resources["PrimaryLightColor"] = ThemeColors.PrimaryLight.Get(theme);
         }
         catch (Exception ex)
         {

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

@@ -112,3 +112,19 @@ public class SeekBackwardButtonPressedMessage
 public class DestroyMediaElementMessage
 {
 }
+
+/// <summary>
+/// Message sent to show the progress bar on the home page.
+/// Used when next/prev buttons are clicked to indicate background activity.
+/// </summary>
+public class ShowProgressBarMessage
+{
+}
+
+/// <summary>
+/// Message sent to hide the progress bar on the home page.
+/// Used when subtitle is updated after track change.
+/// </summary>
+public class HideProgressBarMessage
+{
+}

src/Bible.Alarm/Common/ThemeColors.cs

@@ -103,21 +103,6 @@ public static class Primary
         public static Color SlateBlue => Color.FromArgb("#6A5ACD");
         public static Color LightPurple => Color.FromArgb("#9370DB");
         public static Color LightPurpleForDark => Color.FromArgb("#E8E0FF");
-        
-        // Theme-aware primary color - lighter in dark mode for better contrast
-        public static Color Dark => Color.FromArgb("#B8A0F0"); // Lighter purple for dark mode
-        public static Color Light => Color.FromArgb("#6A5ACD"); // Original slate blue for light mode
-        
-        public static Color Get(AppTheme theme) => theme == AppTheme.Dark ? Dark : Light;
-    }
-
-    public static class PrimaryLight
-    {
-        // Theme-aware primary light color - used for highlights and lighter accents
-        public static Color Dark => Color.FromArgb("#D0C0F8"); // Even lighter purple for dark mode highlights
-        public static Color Light => Color.FromArgb("#9370DB"); // Original light purple for light mode
-        
-        public static Color Get(AppTheme theme) => theme == AppTheme.Dark ? Dark : Light;
     }
 
     // Day/Calendar Colors (used in converters)

src/Bible.Alarm/Services/UI/NavigationServiceHelpers/HomeNavigationHandler.cs

@@ -98,18 +98,12 @@ private async Task PopToExistingHomeAsync(INavigation navigation, Home existingH
             }
         }
 
-        // Check if playback is active and hide home page if so
-        // This prevents visual flash when app starts cold from Android Auto while playing
-        if (ShouldHideHomePageOnStart())
-        {
-            existingHome.Opacity = 0.0;
-            Logger.Information("Existing home page opacity set to 0.0 after pop (playback active)");
-        }
-        else
-        {
-            // Ensure home page is visible if playback is not active
-            existingHome.Opacity = 1.0;
-        }
+        // NOTE: Do NOT change opacity when navigating back to an existing Home page.
+        // The Home page's opacity is managed by AlarmModalService based on playback state.
+        // Changing it here causes bugs:
+        // - If playback is active: opacity = 0 makes Home blank when user returns from Schedule page
+        // - The AlarmModalService will show/hide Home appropriately when playback starts/stops
+        Logger.Information("Navigated back to existing home page (opacity unchanged)");
     }
 
     private async Task PopToRootAndPushNewHomeAsync(INavigation navigation)

src/Bible.Alarm/ViewModels/HomeViewModel.cs

@@ -12,15 +12,17 @@
 using Bible.Alarm.Stores.Actions.Schedule;
 using Bible.Alarm.ViewModels.General;
 using Bible.Alarm.ViewModels.HomeViewModelHelpers;
+using Bible.Alarm.Common.Messenger;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
 using Fluxor;
 using Serilog;
 using IDispatcher = Fluxor.IDispatcher;
 
 namespace Bible.Alarm.ViewModels;
 
-public sealed class HomeViewModel : ObservableObject, IDisposable
+public sealed class HomeViewModel : ObservableObject, IDisposable, IRecipient<ShowProgressBarMessage>, IRecipient<HideProgressBarMessage>
 {
     private readonly ILogger logger;
     private readonly IServiceScopeFactory scopeFactory;
@@ -195,6 +197,10 @@ public HomeViewModel(
 
         // Start tracking bootstrap ready state
         bootstrapReadyManager.StartTracking();
+
+        // Register for progress bar messages
+        WeakReferenceMessenger.Default.Register<ShowProgressBarMessage>(this);
+        WeakReferenceMessenger.Default.Register<HideProgressBarMessage>(this);
     }
 
 
@@ -373,9 +379,29 @@ private void OnStateChanged(object? sender, EventArgs e)
         });
     }
 
+    public void Receive(ShowProgressBarMessage message)
+    {
+        MainThread.BeginInvokeOnMainThread(() =>
+        {
+            // Show progress bar temporarily (doesn't affect normal visibility logic)
+            progressBarManager.ShowTemporarily();
+        });
+    }
+
+    public void Receive(HideProgressBarMessage message)
+    {
+        MainThread.BeginInvokeOnMainThread(async () =>
+        {
+            // Hide progress bar temporarily (doesn't affect normal visibility logic)
+            await progressBarManager.HideTemporarilyAsync();
+        });
+    }
+
     public void Dispose()
     {
         state.StateChanged -= OnStateChanged;
+        WeakReferenceMessenger.Default.Unregister<ShowProgressBarMessage>(this);
+        WeakReferenceMessenger.Default.Unregister<HideProgressBarMessage>(this);
         bootstrapReadyManager.Dispose();
         progressBarManager.Dispose();
         scheduleViewModelManager.DisposeAll();

src/Bible.Alarm/ViewModels/HomeViewModelHelpers/CommandHandler.cs

@@ -55,8 +55,8 @@ public ICommand CreateAddScheduleCommand()
 
     public ICommand CreateViewScheduleCommand()
     {
-        // Use AsyncRelayCommandOptions.AllowConcurrentExecutions to ensure taps aren't ignored
-        // while a previous command is still completing
+        // Do NOT use AllowConcurrentExecutions - this prevents double-tap from creating
+        // multiple navigations that race with each other and corrupt ScheduleNavigationContext
         return new AsyncRelayCommand<ScheduleListItemViewModel>(async x =>
         {
             if (x == null || x.Schedule == null)
@@ -70,7 +70,7 @@ public ICommand CreateViewScheduleCommand()
             }
 
             await showOverlayAndNavigateAsync(x);
-        }, AsyncRelayCommandOptions.AllowConcurrentExecutions);
+        });
     }
 }
 

src/Bible.Alarm/ViewModels/HomeViewModelHelpers/ProgressBarManager.cs

@@ -49,6 +49,15 @@ public void UpdateVisibility(bool isBusy, int? schedulesCount)
         ProgressBarOpacity = shouldShow ? 1.0 : 0.0;
     }
 
+    /// <summary>
+    /// Temporarily shows the progress bar without affecting the shouldShowProgressBar flag.
+    /// Used for showing progress during next/prev track operations.
+    /// </summary>
+    public void ShowTemporarily()
+    {
+        ProgressBarOpacity = 1.0;
+    }
+
     public async Task FadeOutAsync()
     {
         // Prevent showing progress bar again
@@ -75,6 +84,33 @@ public async Task FadeOutAsync()
         ProgressBarOpacity = 0.0;
     }
 
+    /// <summary>
+    /// Hides the progress bar with fade animation without affecting the shouldShowProgressBar flag.
+    /// Used for hiding progress after next/prev track operations complete.
+    /// </summary>
+    public async Task HideTemporarilyAsync()
+    {
+        // If already hidden, don't re-animate (would cause a flash)
+        if (progressBarOpacity == 0)
+        {
+            return;
+        }
+
+        const int fadeSteps = 10;
+        const int fadeDurationMs = 200;
+        const double stepDelay = fadeDurationMs / (double)fadeSteps;
+
+        // Fade from current opacity to 0 (not from 1.0)
+        var startOpacity = progressBarOpacity;
+        for (int i = fadeSteps; i >= 0; i--)
+        {
+            ProgressBarOpacity = startOpacity * i / fadeSteps;
+            await Task.Delay((int)stepDelay);
+        }
+
+        ProgressBarOpacity = 0.0;
+    }
+
     public void Reset()
     {
         shouldShowProgressBar = true;

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

@@ -231,6 +231,8 @@ private void OnStateChanged(object? sender, EventArgs e)
                         // Update label text properties
                         OnPropertyChanged(nameof(HasSectionStructure));
                         OnPropertyChanged(nameof(TrackLabelText));
+                        OnPropertyChanged(nameof(TracksLabelText));
+                        OnPropertyChanged(nameof(SelectedTracksText));
                         OnPropertyChanged(nameof(ModalHeaderText));
                         OnPropertyChanged(nameof(RestartLabelText));
 
@@ -275,7 +277,7 @@ public NumberOfTracksListViewItemModel? CurrentNumberOfTracks
             {
                 // Notify that the Text property (computed from CurrentNumberOfTracks) has changed
                 OnPropertyChanged(nameof(CurrentNumberOfTracksText));
-                OnPropertyChanged(nameof(TracksLabelText));
+                OnPropertyChanged(nameof(SelectedTracksText));
             }
         }
     }
@@ -307,17 +309,30 @@ public bool HasSectionStructure
     public string TrackLabelText => HasSectionStructure ? "Chapters to play each time" : "Episodes to play each time";
 
     /// <summary>
-    /// Gets the combined label text showing the number with "chapters or episodes" format.
-    /// Returns format like "3 chapters or episodes" (not bold).
+    /// Gets the static label text for the tracks selection row.
+    /// Returns "Number of chapters to play" for sectioned publications (Bible),
+    /// or "Number of episodes to play" for non-sectioned publications (dramas).
     /// </summary>
-    public string TracksLabelText
+    public string TracksLabelText => HasSectionStructure ? "Number of chapters to play" : "Number of episodes to play";
+
+    /// <summary>
+    /// Gets the dynamic selected value text showing the number with proper singular/plural.
+    /// Returns format like "3 Chapters", "1 Chapter", "3 Episodes", or "1 Episode".
+    /// </summary>
+    public string SelectedTracksText
     {
         get
         {
             var number = CurrentNumberOfTracks?.Value ?? 0;
             if (number == 0)
-                return "chapters or episodes";
-            return $"{number} chapters or episodes";
+            {
+                return HasSectionStructure ? "Chapters" : "Episodes";
+            }
+            
+            var unitSingular = HasSectionStructure ? "Chapter" : "Episode";
+            var unitPlural = HasSectionStructure ? "Chapters" : "Episodes";
+            var selectedUnit = number == 1 ? unitSingular : unitPlural;
+            return $"{number} {selectedUnit}";
         }
     }
 

src/Bible.Alarm/ViewModels/ScheduleListItemViewModel.cs

@@ -222,6 +222,8 @@ public bool IsEnabled
                 OnPropertyChanged();
                 if (!propertyManager.IsInitializing && Schedule != null)
                 {
+                    // Show progress bar to indicate background activity
+                    WeakReferenceMessenger.Default.Send(new ShowProgressBarMessage());
                     _ = HandleIsEnabledChanged(value);
                 }
             }
@@ -251,6 +253,9 @@ await MainThread.InvokeOnMainThreadAsync(() =>
             propertyManager.IsEnabled = !attemptedValue;
             OnPropertyChanged(nameof(IsEnabled));
             OnPropertyChanged(nameof(This));
+            
+            // Hide progress bar when operation fails and is reverted
+            WeakReferenceMessenger.Default.Send(new HideProgressBarMessage());
         });
     }
 
@@ -497,6 +502,9 @@ private void NotifyPropertyChanges(ScheduleListItemStateHandler.ScheduleChangeIn
             if (changeInfo.IsEnabledChanged)
             {
                 OnPropertyChanged(nameof(IsEnabled));
+                
+                // Hide progress bar when IsEnabled is updated (indicates toggle operation is complete)
+                WeakReferenceMessenger.Default.Send(new HideProgressBarMessage());
             }
             if (changeInfo.NameChanged)
             {
@@ -521,6 +529,9 @@ private void NotifyPropertyChanges(ScheduleListItemStateHandler.ScheduleChangeIn
                     ScheduleId);
                 OnPropertyChanged(nameof(SubTitle));
                 OnPropertyChanged(nameof(Language));
+                
+                // Hide progress bar when subtitle is updated (indicates track change is complete)
+                WeakReferenceMessenger.Default.Send(new HideProgressBarMessage());
             }
         });
     }

src/Bible.Alarm/ViewModels/ScheduleListItemViewModelHelpers/ScheduleListItemCommandHandler.cs

@@ -70,6 +70,10 @@ public ICommand CreatePreviousCommand(AlarmSchedule? schedule)
             }
 
             logger.Information("PreviousCommand: Moving to previous track for schedule {ScheduleId}", schedule.Id);
+            
+            // Show progress bar to indicate background activity
+            WeakReferenceMessenger.Default.Send(new ShowProgressBarMessage());
+            
             try
             {
                 // Run database operations off UI thread
@@ -124,6 +128,10 @@ public ICommand CreateNextCommand(AlarmSchedule? schedule)
             }
 
             logger.Information("NextCommand: Moving to next track for schedule {ScheduleId}", schedule.Id);
+            
+            // Show progress bar to indicate background activity
+            WeakReferenceMessenger.Default.Send(new ShowProgressBarMessage());
+            
             try
             {
                 // Run database operations off UI thread