From e66912f492822622b8350f6522b1ab1b634d22ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20ANDRE?= Date: Mon, 29 Apr 2024 11:49:04 +0200 Subject: [PATCH] chore: change namespaces --- src/MyNet.UI/Dialogs/DialogManager.cs | 12 ------------ src/MyNet.UI/Dialogs/IDialogService.cs | 1 - src/MyNet.UI/Extensions/BusyExtensions.cs | 6 ------ src/MyNet.UI/Extensions/IViewResolverExtensions.cs | 6 +++--- .../Providers/RecentFilesControllerProvider.cs | 2 -- src/MyNet.UI/Toasting/ToasterManager.cs | 1 - src/MyNet.UI/ViewModels/IListViewModel.cs | 8 ++++---- .../List/Filtering/AdvancedFiltersViewModel.cs | 1 - .../List/Filtering/CompositeFilterViewModel.cs | 1 - .../List/Filtering/ExtendedFiltersViewModel.cs | 1 - .../List/Filtering/FilterProviderViewModel.cs | 1 - .../List/Filtering/Filters/FilterViewModel.cs | 1 - .../Filtering}/FiltersChangedEventArgs.cs | 2 +- .../ViewModels/List/Filtering/FiltersCollection.cs | 1 - .../ViewModels/List/Filtering/FiltersViewModel.cs | 1 - .../Filtering/ICompositeFilterViewModel.cs} | 2 +- .../{Filters => List/Filtering}/IFilterViewModel.cs | 2 +- .../{Filters => List/Filtering}/IFiltersViewModel.cs | 2 +- .../Filtering/SelectableCompositeFilterViewModel.cs | 1 - .../List/Filtering/SpeedFiltersViewModel.cs | 1 - .../List/Grouping/ExtendedGroupingViewModel.cs | 1 - .../{ => List}/Grouping/GroupingChangedEventArgs.cs | 2 +- .../List/Grouping/GroupingPropertiesCollection.cs | 1 - .../List/Grouping/GroupingPropertyViewModel.cs | 1 - .../ViewModels/List/Grouping/GroupingViewModel.cs | 1 - .../Grouping/IGroupingPropertyViewModel.cs | 2 +- .../{ => List}/Grouping/IGroupingViewModel.cs | 2 +- .../ViewModels/List/IListParametersProvider.cs | 7 +++---- .../ViewModels/{Paging => List}/IPagingViewModel.cs | 2 +- .../ViewModels/List/ListParametersProvider.cs | 4 ---- src/MyNet.UI/ViewModels/List/ListViewModelBase.cs | 5 +---- .../ViewModels/List/Paging/PagingViewModel.cs | 1 - .../{Paging => List}/PagingChangedEventArgs.cs | 2 +- .../ViewModels/{Paging => List}/PagingResponse.cs | 2 +- .../List/Sorting/ExtendedSortingViewModel.cs | 1 - .../{ => List}/Sorting/ISortingPropertyViewModel.cs | 2 +- .../{ => List}/Sorting/ISortingViewModel.cs | 2 +- .../{ => List}/Sorting/SortingChangedEventArgs.cs | 2 +- .../List/Sorting/SortingPropertiesCollection.cs | 1 - .../List/Sorting/SortingPropertyViewModel.cs | 1 - .../ViewModels/List/Sorting/SortingViewModel.cs | 1 - 41 files changed, 24 insertions(+), 72 deletions(-) rename src/MyNet.UI/ViewModels/{Filters => List/Filtering}/FiltersChangedEventArgs.cs (89%) rename src/MyNet.UI/ViewModels/{Filters/CompositeFilterViewModel.cs => List/Filtering/ICompositeFilterViewModel.cs} (91%) rename src/MyNet.UI/ViewModels/{Filters => List/Filtering}/IFilterViewModel.cs (90%) rename src/MyNet.UI/ViewModels/{Filters => List/Filtering}/IFiltersViewModel.cs (88%) rename src/MyNet.UI/ViewModels/{ => List}/Grouping/GroupingChangedEventArgs.cs (90%) rename src/MyNet.UI/ViewModels/{ => List}/Grouping/IGroupingPropertyViewModel.cs (90%) rename src/MyNet.UI/ViewModels/{ => List}/Grouping/IGroupingViewModel.cs (88%) rename src/MyNet.UI/ViewModels/{Paging => List}/IPagingViewModel.cs (96%) rename src/MyNet.UI/ViewModels/{Paging => List}/PagingChangedEventArgs.cs (89%) rename src/MyNet.UI/ViewModels/{Paging => List}/PagingResponse.cs (93%) rename src/MyNet.UI/ViewModels/{ => List}/Sorting/ISortingPropertyViewModel.cs (90%) rename src/MyNet.UI/ViewModels/{ => List}/Sorting/ISortingViewModel.cs (89%) rename src/MyNet.UI/ViewModels/{ => List}/Sorting/SortingChangedEventArgs.cs (90%) diff --git a/src/MyNet.UI/Dialogs/DialogManager.cs b/src/MyNet.UI/Dialogs/DialogManager.cs index 62f2387..666470e 100644 --- a/src/MyNet.UI/Dialogs/DialogManager.cs +++ b/src/MyNet.UI/Dialogs/DialogManager.cs @@ -64,7 +64,6 @@ public static async Task ShowAsync(Action? closeAction = null) where T : c /// /// Displays a modal dialog. /// - /// The view to include in workspace dialog. public static async Task ShowAsync(Type typeViewModel, Action? closeAction = null) { var vm = GetViewModel(typeViewModel); @@ -78,7 +77,6 @@ public static async Task ShowAsync(Type typeViewModel, Action? /// /// Displays a message dialog. /// - /// The view to include in workspace dialog. public static async Task ShowAsync(T viewModel, Action? closeAction = null) where T : IDialogViewModel { if (_dialogService is null) return; @@ -136,37 +134,29 @@ public static async Task ShowSuccessAsync(string message, stri /// /// Displays a message dialog. /// - /// Message. - /// Buttons of window. public static async Task ShowInformationAsync(string message, string? title = null, MessageBoxResultOption buttons = MessageBoxResultOption.Ok) => await ShowMessageAsync(message, title ?? UiResources.Information, buttons, MessageSeverity.Information, MessageBoxResult.OK).ConfigureAwait(false); /// /// Displays a message dialog. /// - /// Message. - /// Buttons of window. public static async Task ShowErrorAsync(string message, string? title = null, MessageBoxResultOption buttons = MessageBoxResultOption.Ok) => await ShowMessageAsync(message, title ?? UiResources.Error, buttons, MessageSeverity.Error, MessageBoxResult.OK).ConfigureAwait(false); /// /// Displays a message dialog. /// - /// Message. - /// Buttons of window. public static async Task ShowWarningAsync(string message, string? title = null, MessageBoxResultOption buttons = MessageBoxResultOption.Ok) => await ShowMessageAsync(message, title ?? UiResources.Warning, buttons, MessageSeverity.Warning, MessageBoxResult.OK).ConfigureAwait(false); /// /// Displays a message dialog. /// - /// Message. public static async Task ShowQuestionAsync(string message, string? title = null) => await ShowMessageAsync(message, title ?? UiResources.Question, MessageBoxResultOption.YesNo, MessageSeverity.Question, MessageBoxResult.Yes).ConfigureAwait(false); /// /// Displays a message dialog. /// - /// Message. public static async Task ShowQuestionWithCancelAsync(string message, string? title = null) => await ShowMessageAsync(message, title ?? UiResources.Question, MessageBoxResultOption.YesNoCancel, MessageSeverity.Question, MessageBoxResult.Yes).ConfigureAwait(false); /// @@ -211,7 +201,6 @@ public static async Task ShowMessageAsync( /// Displays a message box that has a message, title bar caption, button, and icon; and /// that accepts a default message box result and returns a result. /// - /// The settings for the message box dialog. /// /// A value that specifies which message box button is /// clicked by the user. @@ -232,7 +221,6 @@ public static async Task ShowMessageBoxAsync(IMessageBox viewM /// /// Displays the . /// - /// The settings for the open file dialog. /// /// If the user clicks the OK button of the dialog that is displayed, true is returned; /// otherwise false. diff --git a/src/MyNet.UI/Dialogs/IDialogService.cs b/src/MyNet.UI/Dialogs/IDialogService.cs index adf144a..a73fe25 100644 --- a/src/MyNet.UI/Dialogs/IDialogService.cs +++ b/src/MyNet.UI/Dialogs/IDialogService.cs @@ -35,7 +35,6 @@ public interface IDialogService /// Displays a message box that has a message, title bar caption, button, and icon; and /// that accepts a default message box result and returns a result. /// - /// The settings for the message box dialog. /// /// A value that specifies which message box button is /// clicked by the user. diff --git a/src/MyNet.UI/Extensions/BusyExtensions.cs b/src/MyNet.UI/Extensions/BusyExtensions.cs index 23a2365..d577c85 100644 --- a/src/MyNet.UI/Extensions/BusyExtensions.cs +++ b/src/MyNet.UI/Extensions/BusyExtensions.cs @@ -13,22 +13,16 @@ public static class BusyExtensions /// /// Show busy control during action. /// - /// - /// public static async Task WaitIndeterminateAsync(this IBusyService busyService, Action action) => await busyService.WaitAsync(action); /// /// Show busy control during action. /// - /// - /// public static async Task WaitIndeterminateAsync(this IBusyService busyService, Action action) => await busyService.WaitAsync(_ => action()); /// /// Show busy control during action. /// - /// - /// public static async Task WaitDeterminateAsync(this IBusyService busyService, Action action) => await busyService.WaitAsync(action); } } diff --git a/src/MyNet.UI/Extensions/IViewResolverExtensions.cs b/src/MyNet.UI/Extensions/IViewResolverExtensions.cs index 7405054..9c47b37 100644 --- a/src/MyNet.UI/Extensions/IViewResolverExtensions.cs +++ b/src/MyNet.UI/Extensions/IViewResolverExtensions.cs @@ -24,10 +24,10 @@ public static class IViewResolverExtensions /// /// Resolves a view by the view model and the registered . /// - /// The type of the view model. - /// The view locator. + /// The type of the view model. + /// The view locator. /// The resolved view or null if the view could not be resolved. - /// The is null. + /// The is null. /// Keep in mind that all results are cached. The cache itself is not automatically cleared when the /// are changed. If the are changed, /// the cache must be cleared manually. diff --git a/src/MyNet.UI/Services/Providers/RecentFilesControllerProvider.cs b/src/MyNet.UI/Services/Providers/RecentFilesControllerProvider.cs index 3dfdd00..dd54277 100644 --- a/src/MyNet.UI/Services/Providers/RecentFilesControllerProvider.cs +++ b/src/MyNet.UI/Services/Providers/RecentFilesControllerProvider.cs @@ -6,12 +6,10 @@ using MyNet.Observable; using MyNet.UI.Commands; using MyNet.UI.ViewModels.FileHistory; -using MyNet.UI.ViewModels.Filters; using MyNet.UI.ViewModels.List; using MyNet.UI.ViewModels.List.Filtering; using MyNet.UI.ViewModels.List.Filtering.Filters; using MyNet.UI.ViewModels.List.Sorting; -using MyNet.UI.ViewModels.Sorting; using MyNet.Utilities.Comparaison; namespace MyNet.UI.Services.Providers diff --git a/src/MyNet.UI/Toasting/ToasterManager.cs b/src/MyNet.UI/Toasting/ToasterManager.cs index 4cf6f9a..98e7749 100644 --- a/src/MyNet.UI/Toasting/ToasterManager.cs +++ b/src/MyNet.UI/Toasting/ToasterManager.cs @@ -79,7 +79,6 @@ public static void Show(INotification notification, /// /// Hide a toast. /// - /// /// public static void Hide(INotification toast) => _toasterService?.Hide(toast); diff --git a/src/MyNet.UI/ViewModels/IListViewModel.cs b/src/MyNet.UI/ViewModels/IListViewModel.cs index b9d0e8b..0da9225 100644 --- a/src/MyNet.UI/ViewModels/IListViewModel.cs +++ b/src/MyNet.UI/ViewModels/IListViewModel.cs @@ -3,10 +3,10 @@ using System; using System.Collections; -using MyNet.UI.ViewModels.Filters; -using MyNet.UI.ViewModels.Grouping; -using MyNet.UI.ViewModels.Paging; -using MyNet.UI.ViewModels.Sorting; +using MyNet.UI.ViewModels.List; +using MyNet.UI.ViewModels.List.Filtering; +using MyNet.UI.ViewModels.List.Grouping; +using MyNet.UI.ViewModels.List.Sorting; namespace MyNet.UI.ViewModels { diff --git a/src/MyNet.UI/ViewModels/List/Filtering/AdvancedFiltersViewModel.cs b/src/MyNet.UI/ViewModels/List/Filtering/AdvancedFiltersViewModel.cs index ae7a1f6..5257db3 100644 --- a/src/MyNet.UI/ViewModels/List/Filtering/AdvancedFiltersViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Filtering/AdvancedFiltersViewModel.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using MyNet.UI.Commands; -using MyNet.UI.ViewModels.Filters; using MyNet.Utilities; namespace MyNet.UI.ViewModels.List.Filtering diff --git a/src/MyNet.UI/ViewModels/List/Filtering/CompositeFilterViewModel.cs b/src/MyNet.UI/ViewModels/List/Filtering/CompositeFilterViewModel.cs index effa9ef..993fbbb 100644 --- a/src/MyNet.UI/ViewModels/List/Filtering/CompositeFilterViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Filtering/CompositeFilterViewModel.cs @@ -3,7 +3,6 @@ using MyNet.Observable; using MyNet.Observable.Translatables; -using MyNet.UI.ViewModels.Filters; using MyNet.Utilities.Comparaison; namespace MyNet.UI.ViewModels.List.Filtering diff --git a/src/MyNet.UI/ViewModels/List/Filtering/ExtendedFiltersViewModel.cs b/src/MyNet.UI/ViewModels/List/Filtering/ExtendedFiltersViewModel.cs index a3220f3..b603264 100644 --- a/src/MyNet.UI/ViewModels/List/Filtering/ExtendedFiltersViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Filtering/ExtendedFiltersViewModel.cs @@ -8,7 +8,6 @@ using System.Reactive.Linq; using DynamicData; using MyNet.Observable.Translatables; -using MyNet.UI.ViewModels.Filters; using MyNet.Utilities; using PropertyChanged; diff --git a/src/MyNet.UI/ViewModels/List/Filtering/FilterProviderViewModel.cs b/src/MyNet.UI/ViewModels/List/Filtering/FilterProviderViewModel.cs index 86118ed..dc222ae 100644 --- a/src/MyNet.UI/ViewModels/List/Filtering/FilterProviderViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Filtering/FilterProviderViewModel.cs @@ -3,7 +3,6 @@ using System; using MyNet.Observable.Translatables; -using MyNet.UI.ViewModels.Filters; namespace MyNet.UI.ViewModels.List.Filtering { diff --git a/src/MyNet.UI/ViewModels/List/Filtering/Filters/FilterViewModel.cs b/src/MyNet.UI/ViewModels/List/Filtering/Filters/FilterViewModel.cs index e8b34ca..ee86d9a 100644 --- a/src/MyNet.UI/ViewModels/List/Filtering/Filters/FilterViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Filtering/Filters/FilterViewModel.cs @@ -7,7 +7,6 @@ using System.Linq; using DynamicData.Binding; using MyNet.Observable; -using MyNet.UI.ViewModels.Filters; using PropertyChanged; namespace MyNet.UI.ViewModels.List.Filtering.Filters diff --git a/src/MyNet.UI/ViewModels/Filters/FiltersChangedEventArgs.cs b/src/MyNet.UI/ViewModels/List/Filtering/FiltersChangedEventArgs.cs similarity index 89% rename from src/MyNet.UI/ViewModels/Filters/FiltersChangedEventArgs.cs rename to src/MyNet.UI/ViewModels/List/Filtering/FiltersChangedEventArgs.cs index cdeae19..f3ab31e 100644 --- a/src/MyNet.UI/ViewModels/Filters/FiltersChangedEventArgs.cs +++ b/src/MyNet.UI/ViewModels/List/Filtering/FiltersChangedEventArgs.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace MyNet.UI.ViewModels.Filters +namespace MyNet.UI.ViewModels.List.Filtering { public class FiltersChangedEventArgs(IEnumerable filters) : EventArgs { diff --git a/src/MyNet.UI/ViewModels/List/Filtering/FiltersCollection.cs b/src/MyNet.UI/ViewModels/List/Filtering/FiltersCollection.cs index c33339c..4db0c06 100644 --- a/src/MyNet.UI/ViewModels/List/Filtering/FiltersCollection.cs +++ b/src/MyNet.UI/ViewModels/List/Filtering/FiltersCollection.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using MyNet.Observable.Collections; -using MyNet.UI.ViewModels.Filters; namespace MyNet.UI.ViewModels.List.Filtering { diff --git a/src/MyNet.UI/ViewModels/List/Filtering/FiltersViewModel.cs b/src/MyNet.UI/ViewModels/List/Filtering/FiltersViewModel.cs index 06ff5c2..c09afde 100644 --- a/src/MyNet.UI/ViewModels/List/Filtering/FiltersViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Filtering/FiltersViewModel.cs @@ -12,7 +12,6 @@ using MyNet.Observable; using MyNet.Observable.Attributes; using MyNet.UI.Commands; -using MyNet.UI.ViewModels.Filters; using MyNet.Utilities; using MyNet.Utilities.Comparaison; using MyNet.Utilities.Deferring; diff --git a/src/MyNet.UI/ViewModels/Filters/CompositeFilterViewModel.cs b/src/MyNet.UI/ViewModels/List/Filtering/ICompositeFilterViewModel.cs similarity index 91% rename from src/MyNet.UI/ViewModels/Filters/CompositeFilterViewModel.cs rename to src/MyNet.UI/ViewModels/List/Filtering/ICompositeFilterViewModel.cs index 16060d7..9105b82 100644 --- a/src/MyNet.UI/ViewModels/Filters/CompositeFilterViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Filtering/ICompositeFilterViewModel.cs @@ -6,7 +6,7 @@ using MyNet.Utilities; using MyNet.Utilities.Comparaison; -namespace MyNet.UI.ViewModels.Filters +namespace MyNet.UI.ViewModels.List.Filtering { public interface ICompositeFilterViewModel : IWrapper, INotifyPropertyChanged, ICloneable { diff --git a/src/MyNet.UI/ViewModels/Filters/IFilterViewModel.cs b/src/MyNet.UI/ViewModels/List/Filtering/IFilterViewModel.cs similarity index 90% rename from src/MyNet.UI/ViewModels/Filters/IFilterViewModel.cs rename to src/MyNet.UI/ViewModels/List/Filtering/IFilterViewModel.cs index 1c8b36f..f76a788 100644 --- a/src/MyNet.UI/ViewModels/Filters/IFilterViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Filtering/IFilterViewModel.cs @@ -6,7 +6,7 @@ using MyNet.Observable.Collections.Filters; using MyNet.Utilities; -namespace MyNet.UI.ViewModels.Filters +namespace MyNet.UI.ViewModels.List.Filtering { public interface IFilterViewModel : IFilter, INotifyPropertyChanged, ICloneable, ISettable, ISimilar { diff --git a/src/MyNet.UI/ViewModels/Filters/IFiltersViewModel.cs b/src/MyNet.UI/ViewModels/List/Filtering/IFiltersViewModel.cs similarity index 88% rename from src/MyNet.UI/ViewModels/Filters/IFiltersViewModel.cs rename to src/MyNet.UI/ViewModels/List/Filtering/IFiltersViewModel.cs index b54eb28..a20fc6a 100644 --- a/src/MyNet.UI/ViewModels/Filters/IFiltersViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Filtering/IFiltersViewModel.cs @@ -3,7 +3,7 @@ using System; -namespace MyNet.UI.ViewModels.Filters +namespace MyNet.UI.ViewModels.List.Filtering { public interface IFiltersViewModel { diff --git a/src/MyNet.UI/ViewModels/List/Filtering/SelectableCompositeFilterViewModel.cs b/src/MyNet.UI/ViewModels/List/Filtering/SelectableCompositeFilterViewModel.cs index be5fd7c..1eaef92 100644 --- a/src/MyNet.UI/ViewModels/List/Filtering/SelectableCompositeFilterViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Filtering/SelectableCompositeFilterViewModel.cs @@ -4,7 +4,6 @@ using System.Collections.ObjectModel; using System.Linq; using MyNet.Observable; -using MyNet.UI.ViewModels.Filters; using MyNet.Utilities.Comparaison; using PropertyChanged; diff --git a/src/MyNet.UI/ViewModels/List/Filtering/SpeedFiltersViewModel.cs b/src/MyNet.UI/ViewModels/List/Filtering/SpeedFiltersViewModel.cs index abe0706..048eb33 100644 --- a/src/MyNet.UI/ViewModels/List/Filtering/SpeedFiltersViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Filtering/SpeedFiltersViewModel.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; -using MyNet.UI.ViewModels.Filters; namespace MyNet.UI.ViewModels.List.Filtering { diff --git a/src/MyNet.UI/ViewModels/List/Grouping/ExtendedGroupingViewModel.cs b/src/MyNet.UI/ViewModels/List/Grouping/ExtendedGroupingViewModel.cs index 2ca759a..aca07b7 100644 --- a/src/MyNet.UI/ViewModels/List/Grouping/ExtendedGroupingViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Grouping/ExtendedGroupingViewModel.cs @@ -6,7 +6,6 @@ using System.Linq; using DynamicData; using MyNet.Observable.Attributes; -using MyNet.UI.ViewModels.Grouping; namespace MyNet.UI.ViewModels.List.Grouping { diff --git a/src/MyNet.UI/ViewModels/Grouping/GroupingChangedEventArgs.cs b/src/MyNet.UI/ViewModels/List/Grouping/GroupingChangedEventArgs.cs similarity index 90% rename from src/MyNet.UI/ViewModels/Grouping/GroupingChangedEventArgs.cs rename to src/MyNet.UI/ViewModels/List/Grouping/GroupingChangedEventArgs.cs index f8b8722..aeab4be 100644 --- a/src/MyNet.UI/ViewModels/Grouping/GroupingChangedEventArgs.cs +++ b/src/MyNet.UI/ViewModels/List/Grouping/GroupingChangedEventArgs.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace MyNet.UI.ViewModels.Grouping +namespace MyNet.UI.ViewModels.List.Grouping { public class GroupingChangedEventArgs(IEnumerable groupProperties) : EventArgs { diff --git a/src/MyNet.UI/ViewModels/List/Grouping/GroupingPropertiesCollection.cs b/src/MyNet.UI/ViewModels/List/Grouping/GroupingPropertiesCollection.cs index 43f49c3..e70c936 100644 --- a/src/MyNet.UI/ViewModels/List/Grouping/GroupingPropertiesCollection.cs +++ b/src/MyNet.UI/ViewModels/List/Grouping/GroupingPropertiesCollection.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using MyNet.Observable.Collections; -using MyNet.UI.ViewModels.Grouping; namespace MyNet.UI.ViewModels.List.Grouping { diff --git a/src/MyNet.UI/ViewModels/List/Grouping/GroupingPropertyViewModel.cs b/src/MyNet.UI/ViewModels/List/Grouping/GroupingPropertyViewModel.cs index 99c69b8..ad13ce8 100644 --- a/src/MyNet.UI/ViewModels/List/Grouping/GroupingPropertyViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Grouping/GroupingPropertyViewModel.cs @@ -3,7 +3,6 @@ using MyNet.Observable; using MyNet.Observable.Translatables; -using MyNet.UI.ViewModels.Grouping; namespace MyNet.UI.ViewModels.List.Grouping { diff --git a/src/MyNet.UI/ViewModels/List/Grouping/GroupingViewModel.cs b/src/MyNet.UI/ViewModels/List/Grouping/GroupingViewModel.cs index 9f44a77..6c2e4b9 100644 --- a/src/MyNet.UI/ViewModels/List/Grouping/GroupingViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Grouping/GroupingViewModel.cs @@ -13,7 +13,6 @@ using MyNet.Observable; using MyNet.Observable.Attributes; using MyNet.UI.Commands; -using MyNet.UI.ViewModels.Grouping; using MyNet.Utilities; using MyNet.Utilities.Deferring; using PropertyChanged; diff --git a/src/MyNet.UI/ViewModels/Grouping/IGroupingPropertyViewModel.cs b/src/MyNet.UI/ViewModels/List/Grouping/IGroupingPropertyViewModel.cs similarity index 90% rename from src/MyNet.UI/ViewModels/Grouping/IGroupingPropertyViewModel.cs rename to src/MyNet.UI/ViewModels/List/Grouping/IGroupingPropertyViewModel.cs index 304d8f0..7a92169 100644 --- a/src/MyNet.UI/ViewModels/Grouping/IGroupingPropertyViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Grouping/IGroupingPropertyViewModel.cs @@ -4,7 +4,7 @@ using System; using System.ComponentModel; -namespace MyNet.UI.ViewModels.Grouping +namespace MyNet.UI.ViewModels.List.Grouping { public interface IGroupingPropertyViewModel : INotifyPropertyChanged, ICloneable { diff --git a/src/MyNet.UI/ViewModels/Grouping/IGroupingViewModel.cs b/src/MyNet.UI/ViewModels/List/Grouping/IGroupingViewModel.cs similarity index 88% rename from src/MyNet.UI/ViewModels/Grouping/IGroupingViewModel.cs rename to src/MyNet.UI/ViewModels/List/Grouping/IGroupingViewModel.cs index 3146fd1..34a0ddf 100644 --- a/src/MyNet.UI/ViewModels/Grouping/IGroupingViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Grouping/IGroupingViewModel.cs @@ -4,7 +4,7 @@ using System; using System.ComponentModel; -namespace MyNet.UI.ViewModels.Grouping +namespace MyNet.UI.ViewModels.List.Grouping { public interface IGroupingViewModel : INotifyPropertyChanged { diff --git a/src/MyNet.UI/ViewModels/List/IListParametersProvider.cs b/src/MyNet.UI/ViewModels/List/IListParametersProvider.cs index 66448a6..9d8c30e 100644 --- a/src/MyNet.UI/ViewModels/List/IListParametersProvider.cs +++ b/src/MyNet.UI/ViewModels/List/IListParametersProvider.cs @@ -2,10 +2,9 @@ // See the LICENSE file in the project root for more information. using MyNet.UI.ViewModels; -using MyNet.UI.ViewModels.Filters; -using MyNet.UI.ViewModels.Grouping; -using MyNet.UI.ViewModels.Paging; -using MyNet.UI.ViewModels.Sorting; +using MyNet.UI.ViewModels.List.Filtering; +using MyNet.UI.ViewModels.List.Grouping; +using MyNet.UI.ViewModels.List.Sorting; namespace MyNet.UI.ViewModels.List { diff --git a/src/MyNet.UI/ViewModels/Paging/IPagingViewModel.cs b/src/MyNet.UI/ViewModels/List/IPagingViewModel.cs similarity index 96% rename from src/MyNet.UI/ViewModels/Paging/IPagingViewModel.cs rename to src/MyNet.UI/ViewModels/List/IPagingViewModel.cs index 3b4832e..6b54205 100644 --- a/src/MyNet.UI/ViewModels/Paging/IPagingViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/IPagingViewModel.cs @@ -5,7 +5,7 @@ using System.ComponentModel; using MyNet.UI.Commands; -namespace MyNet.UI.ViewModels.Paging +namespace MyNet.UI.ViewModels.List { public interface IPagingViewModel : INotifyPropertyChanged { diff --git a/src/MyNet.UI/ViewModels/List/ListParametersProvider.cs b/src/MyNet.UI/ViewModels/List/ListParametersProvider.cs index 0ca22f8..7ec825c 100644 --- a/src/MyNet.UI/ViewModels/List/ListParametersProvider.cs +++ b/src/MyNet.UI/ViewModels/List/ListParametersProvider.cs @@ -5,10 +5,6 @@ using System.ComponentModel; using System.Linq; using MyNet.UI.ViewModels; -using MyNet.UI.ViewModels.Filters; -using MyNet.UI.ViewModels.Grouping; -using MyNet.UI.ViewModels.Paging; -using MyNet.UI.ViewModels.Sorting; using MyNet.UI.ViewModels.Display; using MyNet.UI.ViewModels.List.Filtering; using MyNet.UI.ViewModels.List.Grouping; diff --git a/src/MyNet.UI/ViewModels/List/ListViewModelBase.cs b/src/MyNet.UI/ViewModels/List/ListViewModelBase.cs index 44b85f8..85bcb01 100644 --- a/src/MyNet.UI/ViewModels/List/ListViewModelBase.cs +++ b/src/MyNet.UI/ViewModels/List/ListViewModelBase.cs @@ -22,12 +22,9 @@ using MyNet.UI.Dialogs; using MyNet.UI.Dialogs.Models; using MyNet.UI.Resources; -using MyNet.UI.ViewModels.Filters; -using MyNet.UI.ViewModels.Grouping; using MyNet.UI.ViewModels.List.Filtering; +using MyNet.UI.ViewModels.List.Grouping; using MyNet.UI.ViewModels.List.Sorting; -using MyNet.UI.ViewModels.Paging; -using MyNet.UI.ViewModels.Sorting; using MyNet.UI.ViewModels.Workspace; using MyNet.Utilities; using PropertyChanged; diff --git a/src/MyNet.UI/ViewModels/List/Paging/PagingViewModel.cs b/src/MyNet.UI/ViewModels/List/Paging/PagingViewModel.cs index f31c17a..2fe26a6 100644 --- a/src/MyNet.UI/ViewModels/List/Paging/PagingViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Paging/PagingViewModel.cs @@ -7,7 +7,6 @@ using MyNet.Observable; using MyNet.Observable.Collections; using MyNet.UI.Commands; -using MyNet.UI.ViewModels.Paging; using MyNet.Utilities; namespace MyNet.UI.ViewModels.List.Paging diff --git a/src/MyNet.UI/ViewModels/Paging/PagingChangedEventArgs.cs b/src/MyNet.UI/ViewModels/List/PagingChangedEventArgs.cs similarity index 89% rename from src/MyNet.UI/ViewModels/Paging/PagingChangedEventArgs.cs rename to src/MyNet.UI/ViewModels/List/PagingChangedEventArgs.cs index 4fe6bb9..09ce688 100644 --- a/src/MyNet.UI/ViewModels/Paging/PagingChangedEventArgs.cs +++ b/src/MyNet.UI/ViewModels/List/PagingChangedEventArgs.cs @@ -3,7 +3,7 @@ using System; -namespace MyNet.UI.ViewModels.Paging +namespace MyNet.UI.ViewModels.List { public class PagingChangedEventArgs(int page, int pageSize) : EventArgs { diff --git a/src/MyNet.UI/ViewModels/Paging/PagingResponse.cs b/src/MyNet.UI/ViewModels/List/PagingResponse.cs similarity index 93% rename from src/MyNet.UI/ViewModels/Paging/PagingResponse.cs rename to src/MyNet.UI/ViewModels/List/PagingResponse.cs index 42e4e24..a5c8469 100644 --- a/src/MyNet.UI/ViewModels/Paging/PagingResponse.cs +++ b/src/MyNet.UI/ViewModels/List/PagingResponse.cs @@ -1,7 +1,7 @@ // Copyright (c) Stéphane ANDRE. All Right Reserved. // See the LICENSE file in the project root for more information. -namespace MyNet.UI.ViewModels.Paging +namespace MyNet.UI.ViewModels.List { public readonly struct PagingResponse { diff --git a/src/MyNet.UI/ViewModels/List/Sorting/ExtendedSortingViewModel.cs b/src/MyNet.UI/ViewModels/List/Sorting/ExtendedSortingViewModel.cs index 525b66b..925985b 100644 --- a/src/MyNet.UI/ViewModels/List/Sorting/ExtendedSortingViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Sorting/ExtendedSortingViewModel.cs @@ -7,7 +7,6 @@ using System.Linq; using DynamicData; using MyNet.Observable.Attributes; -using MyNet.UI.ViewModels.Sorting; namespace MyNet.UI.ViewModels.List.Sorting { diff --git a/src/MyNet.UI/ViewModels/Sorting/ISortingPropertyViewModel.cs b/src/MyNet.UI/ViewModels/List/Sorting/ISortingPropertyViewModel.cs similarity index 90% rename from src/MyNet.UI/ViewModels/Sorting/ISortingPropertyViewModel.cs rename to src/MyNet.UI/ViewModels/List/Sorting/ISortingPropertyViewModel.cs index 91f52fd..bdb2fed 100644 --- a/src/MyNet.UI/ViewModels/Sorting/ISortingPropertyViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Sorting/ISortingPropertyViewModel.cs @@ -4,7 +4,7 @@ using System; using System.ComponentModel; -namespace MyNet.UI.ViewModels.Sorting +namespace MyNet.UI.ViewModels.List.Sorting { public interface ISortingPropertyViewModel : INotifyPropertyChanged, ICloneable { diff --git a/src/MyNet.UI/ViewModels/Sorting/ISortingViewModel.cs b/src/MyNet.UI/ViewModels/List/Sorting/ISortingViewModel.cs similarity index 89% rename from src/MyNet.UI/ViewModels/Sorting/ISortingViewModel.cs rename to src/MyNet.UI/ViewModels/List/Sorting/ISortingViewModel.cs index d0d3ce7..5cd3b61 100644 --- a/src/MyNet.UI/ViewModels/Sorting/ISortingViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Sorting/ISortingViewModel.cs @@ -4,7 +4,7 @@ using System; using MyNet.UI.Commands; -namespace MyNet.UI.ViewModels.Sorting +namespace MyNet.UI.ViewModels.List.Sorting { public interface ISortingViewModel { diff --git a/src/MyNet.UI/ViewModels/Sorting/SortingChangedEventArgs.cs b/src/MyNet.UI/ViewModels/List/Sorting/SortingChangedEventArgs.cs similarity index 90% rename from src/MyNet.UI/ViewModels/Sorting/SortingChangedEventArgs.cs rename to src/MyNet.UI/ViewModels/List/Sorting/SortingChangedEventArgs.cs index 79a0b3b..9b0bf45 100644 --- a/src/MyNet.UI/ViewModels/Sorting/SortingChangedEventArgs.cs +++ b/src/MyNet.UI/ViewModels/List/Sorting/SortingChangedEventArgs.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace MyNet.UI.ViewModels.Sorting +namespace MyNet.UI.ViewModels.List.Sorting { public class SortingChangedEventArgs(IEnumerable properties) : EventArgs { diff --git a/src/MyNet.UI/ViewModels/List/Sorting/SortingPropertiesCollection.cs b/src/MyNet.UI/ViewModels/List/Sorting/SortingPropertiesCollection.cs index 996ef35..6862566 100644 --- a/src/MyNet.UI/ViewModels/List/Sorting/SortingPropertiesCollection.cs +++ b/src/MyNet.UI/ViewModels/List/Sorting/SortingPropertiesCollection.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using MyNet.Observable.Collections; -using MyNet.UI.ViewModels.Sorting; namespace MyNet.UI.ViewModels.List.Sorting { diff --git a/src/MyNet.UI/ViewModels/List/Sorting/SortingPropertyViewModel.cs b/src/MyNet.UI/ViewModels/List/Sorting/SortingPropertyViewModel.cs index 4cbb16b..f0ea264 100644 --- a/src/MyNet.UI/ViewModels/List/Sorting/SortingPropertyViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Sorting/SortingPropertyViewModel.cs @@ -4,7 +4,6 @@ using System.ComponentModel; using MyNet.Observable; using MyNet.Observable.Translatables; -using MyNet.UI.ViewModels.Sorting; namespace MyNet.UI.ViewModels.List.Sorting { diff --git a/src/MyNet.UI/ViewModels/List/Sorting/SortingViewModel.cs b/src/MyNet.UI/ViewModels/List/Sorting/SortingViewModel.cs index 0f7d8fa..5437d81 100644 --- a/src/MyNet.UI/ViewModels/List/Sorting/SortingViewModel.cs +++ b/src/MyNet.UI/ViewModels/List/Sorting/SortingViewModel.cs @@ -13,7 +13,6 @@ using MyNet.Observable; using MyNet.Observable.Attributes; using MyNet.UI.Commands; -using MyNet.UI.ViewModels.Sorting; using MyNet.Utilities; using MyNet.Utilities.Deferring; using PropertyChanged;