From 14bd7d74f3eb2494d338ff486fbe5bffa033edda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Dec 2025 17:46:40 +0000 Subject: [PATCH 1/4] Bump CommunityToolkit.Mvvm from 8.2.2 to 8.4.0 --- updated-dependencies: - dependency-name: CommunityToolkit.Mvvm dependency-version: 8.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- BusLane.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BusLane.csproj b/BusLane.csproj index e3075f3..1433e11 100644 --- a/BusLane.csproj +++ b/BusLane.csproj @@ -31,7 +31,7 @@ - + From ae9ddfe4dcbd6dc9f6641e58cf103ed502f41214 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 20 Dec 2025 18:10:55 +0000 Subject: [PATCH 2/4] Initial plan From 061b9d83ae46896c1b60a96d090981daf40e81ea Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 20 Dec 2025 18:14:27 +0000 Subject: [PATCH 3/4] Fix MVVMTK0034 warning by using Theme property instead of _theme field Co-authored-by: soliktomasz <6443354+soliktomasz@users.noreply.github.com> --- ViewModels/SettingsViewModel.cs | 35 ++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/ViewModels/SettingsViewModel.cs b/ViewModels/SettingsViewModel.cs index 674282a..64d7795 100644 --- a/ViewModels/SettingsViewModel.cs +++ b/ViewModels/SettingsViewModel.cs @@ -8,6 +8,7 @@ public partial class SettingsViewModel : ViewModelBase { private readonly Action _onClose; private string _originalTheme = "Light"; + private bool _isLoading; [ObservableProperty] private bool _confirmBeforeDelete = true; [ObservableProperty] private bool _confirmBeforePurge = true; @@ -31,23 +32,35 @@ public SettingsViewModel(Action onClose) partial void OnThemeChanged(string value) { + // Skip theme preview during initial load + if (_isLoading) + return; + // Apply theme immediately as preview when user changes it App.Instance?.ApplyTheme(value); } private void LoadSettings() { - // Load settings from preferences/storage - ConfirmBeforeDelete = Preferences.ConfirmBeforeDelete; - ConfirmBeforePurge = Preferences.ConfirmBeforePurge; - AutoRefreshMessages = Preferences.AutoRefreshMessages; - AutoRefreshIntervalSeconds = Preferences.AutoRefreshIntervalSeconds; - DefaultMessageCount = Preferences.DefaultMessageCount; - ShowDeadLetterBadges = Preferences.ShowDeadLetterBadges; - EnableMessagePreview = Preferences.EnableMessagePreview; - - // Set theme field directly to avoid triggering OnThemeChanged during load - _theme = Preferences.Theme; + _isLoading = true; + try + { + // Load settings from preferences/storage + ConfirmBeforeDelete = Preferences.ConfirmBeforeDelete; + ConfirmBeforePurge = Preferences.ConfirmBeforePurge; + AutoRefreshMessages = Preferences.AutoRefreshMessages; + AutoRefreshIntervalSeconds = Preferences.AutoRefreshIntervalSeconds; + DefaultMessageCount = Preferences.DefaultMessageCount; + ShowDeadLetterBadges = Preferences.ShowDeadLetterBadges; + EnableMessagePreview = Preferences.EnableMessagePreview; + + // Use the generated property instead of the field + Theme = Preferences.Theme; + } + finally + { + _isLoading = false; + } } [RelayCommand] From 64f5103dea725d151de8721abf3d2097c1135c66 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 20 Dec 2025 18:15:37 +0000 Subject: [PATCH 4/4] Move _isLoading flag setting inside try block for better exception handling Co-authored-by: soliktomasz <6443354+soliktomasz@users.noreply.github.com> --- ViewModels/SettingsViewModel.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ViewModels/SettingsViewModel.cs b/ViewModels/SettingsViewModel.cs index 64d7795..9a0d892 100644 --- a/ViewModels/SettingsViewModel.cs +++ b/ViewModels/SettingsViewModel.cs @@ -42,9 +42,10 @@ partial void OnThemeChanged(string value) private void LoadSettings() { - _isLoading = true; try { + _isLoading = true; + // Load settings from preferences/storage ConfirmBeforeDelete = Preferences.ConfirmBeforeDelete; ConfirmBeforePurge = Preferences.ConfirmBeforePurge;