From 92ee97a5dae46d27f13192c89faf8dd4b87e6094 Mon Sep 17 00:00:00 2001 From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> Date: Mon, 12 May 2025 23:18:07 +0300 Subject: [PATCH] Clean up --- .../Components/DashboardViewModel.cs | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs b/DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs index ad459332..79acfa0a 100644 --- a/DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs +++ b/DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs @@ -33,28 +33,6 @@ public partial class DashboardViewModel : ViewModelBase private DiscordClient? _discord; - [ObservableProperty] - [NotifyPropertyChangedFor(nameof(IsProgressIndeterminate))] - [NotifyCanExecuteChangedFor(nameof(PullGuildsCommand))] - [NotifyCanExecuteChangedFor(nameof(PullChannelsCommand))] - [NotifyCanExecuteChangedFor(nameof(ExportCommand))] - public partial bool IsBusy { get; set; } - - [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(PullGuildsCommand))] - public partial string? Token { get; set; } - - [ObservableProperty] - public partial IReadOnlyList? AvailableGuilds { get; set; } - - [ObservableProperty] - [NotifyCanExecuteChangedFor(nameof(PullChannelsCommand))] - [NotifyCanExecuteChangedFor(nameof(ExportCommand))] - public partial Guild? SelectedGuild { get; set; } - - [ObservableProperty] - public partial IReadOnlyList? AvailableChannels { get; set; } - public DashboardViewModel( ViewModelManager viewModelManager, DialogManager dialogManager, @@ -84,10 +62,32 @@ public partial class DashboardViewModel : ViewModelBase ); } + [ObservableProperty] + [NotifyPropertyChangedFor(nameof(IsProgressIndeterminate))] + [NotifyCanExecuteChangedFor(nameof(PullGuildsCommand))] + [NotifyCanExecuteChangedFor(nameof(PullChannelsCommand))] + [NotifyCanExecuteChangedFor(nameof(ExportCommand))] + public partial bool IsBusy { get; set; } + public ProgressContainer Progress { get; } = new(); public bool IsProgressIndeterminate => IsBusy && Progress.Current.Fraction is <= 0 or >= 1; + [ObservableProperty] + [NotifyCanExecuteChangedFor(nameof(PullGuildsCommand))] + public partial string? Token { get; set; } + + [ObservableProperty] + public partial IReadOnlyList? AvailableGuilds { get; set; } + + [ObservableProperty] + [NotifyCanExecuteChangedFor(nameof(PullChannelsCommand))] + [NotifyCanExecuteChangedFor(nameof(ExportCommand))] + public partial Guild? SelectedGuild { get; set; } + + [ObservableProperty] + public partial IReadOnlyList? AvailableChannels { get; set; } + public ObservableCollection SelectedChannels { get; } = []; [RelayCommand]