Skip to content

Bump CommunityToolkit.Mvvm from 8.2.2 to 8.4.0 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
soliktomasz merged 5 commits into from
Dec 20, 2025
Merged

Bump CommunityToolkit.Mvvm from 8.2.2 to 8.4.0 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14bd7d7
Bump CommunityToolkit.Mvvm from 8.2.2 to 8.4.0
dependabot[bot] Dec 20, 2025
ae9ddfe
Initial plan
Copilot Dec 20, 2025
061b9d8
Fix MVVMTK0034 warning by using Theme property instead of _theme field
Copilot Dec 20, 2025
64f5103
Move _isLoading flag setting inside try block for better exception ha…
Copilot Dec 20, 2025
f59d2de
Merge pull request #8 from soliktomasz/copilot/sub-pr-6
soliktomasz Dec 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BusLane.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<PackageReference Include="Azure.ResourceManager" Version="1.13.2" />
<PackageReference Include="Azure.ResourceManager.ServiceBus" Version="1.1.0" />
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.20.1" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
</ItemGroup>

Expand Down
36 changes: 25 additions & 11 deletions ViewModels/SettingsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -31,23 +32,36 @@ 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;
try
{
_isLoading = true;

// 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]
Expand Down