From 55dca6cebb5bc732e72104ec76b1d6f1db0e97c6 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 16 Dec 2025 22:01:43 +0100 Subject: [PATCH 1/4] Upgrade packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update namespaces Clean up unused imports Replace Avalonia.ReactiveUI with ReactiveUI.Avalonia 🙄 --- src/Artemis.Core/Artemis.Core.csproj | 2 +- .../ColorScience/Quantization/ColorSwatch.cs | 3 +- .../Models/ProfileConfiguration/Hotkey.cs | 3 +- .../Plugins/DeviceProviders/DeviceProvider.cs | 1 - src/Artemis.Core/Services/DeviceService.cs | 1 - .../Services/Input/InputKeyLedIdMap.cs | 4 +- .../Services/Interfaces/IDeviceService.cs | 1 - .../Services/Interfaces/IRenderService.cs | 2 - .../Services/PluginManagementService.cs | 1 - .../Services/Storage/ProfileService.cs | 2 - .../WebServer/EndPoints/JsonPluginEndPoint.cs | 2 +- .../WebServer/EndPoints/PluginEndPoint.cs | 2 - .../EndPoints/StringPluginEndPoint.cs | 2 +- .../WebServer/Interfaces/IWebServerService.cs | 1 - .../Services/WebServer/PluginsHandler.cs | 4 +- .../Services/WebServer/WebServerService.cs | 1 - src/Artemis.Core/Utilities/EnumUtilities.cs | 4 +- src/Artemis.Core/Utilities/Utilities.cs | 1 - .../Artemis.Storage.Legacy.csproj | 2 +- src/Artemis.Storage/Artemis.Storage.csproj | 2 +- src/Artemis.Storage/ArtemisDbContext.cs | 1 - .../Entities/Plugins/PluginEntity.cs | 1 - .../Entities/Profile/ProfileEntity.cs | 1 - .../Repositories/ProfileRepository.cs | 1 - src/Artemis.UI.Linux/App.axaml.cs | 2 +- src/Artemis.UI.Linux/Artemis.UI.Linux.csproj | 2 +- src/Artemis.UI.Linux/Program.cs | 2 +- .../Providers/Input/LinuxInputDeviceReader.cs | 1 - src/Artemis.UI.MacOS/App.axaml.cs | 2 +- src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj | 2 +- src/Artemis.UI.MacOS/Program.cs | 2 +- .../Artemis.UI.Shared.csproj | 4 +- .../Controls/ArtemisIcon.axaml.cs | 2 - .../DataModelPicker/DataModelPicker.cs | 1 - .../Controls/DraggableNumberBox.axaml.cs | 1 - .../Controls/EnumComboBox.axaml.cs | 1 - .../Flyouts/MaterialIconPickerFlyout.cs | 1 - .../Controls/HotkeyBox.axaml.cs | 1 - .../Controls/NoInputTextBox.cs | 2 - .../TagsInput/TagsInput.properties.cs | 1 - .../Converters/BytesToStringConverter.cs | 1 - .../DefaultDataModelDisplayView.axaml.cs | 1 - .../SKColorDataModelDisplayView.axaml.cs | 1 - src/Artemis.UI.Shared/ReactiveAppWindow.cs | 5 +- .../Routing/Router/Navigation.cs | 3 - .../Routing/Router/NavigationArguments.cs | 1 - .../Builders/FileDialogFilterBuilder.cs | 1 - .../Services/MainWindow/MainWindowService.cs | 1 - .../Services/ProfileEditor/IToolViewModel.cs | 1 - .../PropertyInput/PropertyInputViewModel.cs | 1 + .../Window/ExceptionDialogView.axaml.cs | 3 +- .../Window/ExceptionDialogViewModel.cs | 1 - .../VisualScripting/CustomNodeViewModel.cs | 1 + src/Artemis.UI.Windows/App.axaml.cs | 2 +- .../Artemis.UI.Windows.csproj | 2 +- src/Artemis.UI.Windows/Program.cs | 3 +- .../Utilities/InputUtilities.cs | 1 - src/Artemis.UI/Artemis.UI.csproj | 2 +- .../Converters/DateTimeConverter.cs | 1 - .../Converters/PropertyTreeMarginConverter.cs | 1 - .../Converters/SubstringConverter.cs | 2 - .../BoolPropertyInputView.axaml.cs | 3 +- .../BrushPropertyInputView.axaml.cs | 3 +- .../BrushPropertyInputViewModel.cs | 3 +- .../ColorGradientPropertyInputView.axaml.cs | 3 +- .../EnumPropertyInputView.axaml.cs | 3 +- .../FloatPropertyInputView.axaml.cs | 3 +- .../FloatRangePropertyInputView.axaml.cs | 3 +- .../IntPropertyInputView.axaml.cs | 3 +- .../IntRangePropertyInputView.axaml.cs | 3 +- .../SKColorPropertyInputView.axaml.cs | 3 +- .../SKPointPropertyInputView.axaml.cs | 3 +- .../SKSizePropertyInputView.axaml.cs | 3 +- .../StringPropertyInputView.axaml.cs | 2 +- .../CompositeDisposableExtensions.cs | 1 + src/Artemis.UI/MainWindow.axaml.cs | 2 +- .../Screens/Debugger/DebugView.axaml.cs | 3 +- .../Screens/Debugger/DebugViewModel.cs | 1 + .../DataModel/DataModelDebugView.axaml.cs | 3 +- .../Tabs/DataModel/DataModelDebugViewModel.cs | 1 + .../Debugger/Tabs/Logs/LogsDebugView.axaml.cs | 6 +- .../Debugger/Tabs/Logs/LogsDebugViewModel.cs | 4 +- .../PerformanceDebugPluginView.axaml.cs | 1 - .../PerformanceDebugProfilerView.axaml.cs | 1 - .../Performance/PerformanceDebugView.axaml.cs | 3 +- .../Performance/PerformanceDebugViewModel.cs | 1 + .../Tabs/Render/RenderDebugView.axaml.cs | 3 +- .../Tabs/Render/RenderDebugViewModel.cs | 1 + .../Tabs/Routing/RoutingDebugView.axaml.cs | 2 +- .../Tabs/Routing/RoutingDebugViewModel.cs | 1 + .../Tabs/Settings/DebugSettingsView.axaml.cs | 3 +- .../Tabs/Workshop/WorkshopDebugView.axaml.cs | 5 +- .../Device/DeviceDetectInputView.axaml.cs | 3 +- .../Device/DeviceDetectInputViewModel.cs | 1 + .../Device/DevicePropertiesView.axaml.cs | 1 - .../Device/DevicePropertiesViewModel.cs | 1 + .../Device/DeviceSettingsView.axaml.cs | 3 +- .../General/DeviceGeneralTabView.axaml.cs | 2 +- .../Tabs/General/DeviceGeneralTabViewModel.cs | 1 + .../InputMappingsTabView.axaml.cs | 2 +- .../InputMappingsTabViewModel.cs | 1 + .../Tabs/Layout/DeviceLayoutTabView.axaml.cs | 2 +- .../DeviceLogicalLayoutDialogView.axaml.cs | 2 +- .../DevicePhysicalLayoutDialogView.axaml.cs | 2 +- .../WorkshopLayoutView.axaml.cs | 3 +- .../Tabs/Leds/DeviceLedsTabView.axaml.cs | 2 +- .../Tabs/Leds/DeviceLedsTabViewModel.cs | 2 +- src/Artemis.UI/Screens/Home/HomeView.axaml.cs | 3 +- ...ginPrerequisitesInstallDialogView.axaml.cs | 3 +- ...uginPrerequisitesInstallDialogViewModel.cs | 5 +- ...nPrerequisitesUninstallDialogView.axaml.cs | 3 +- ...inPrerequisitesUninstallDialogViewModel.cs | 1 + .../Features/PluginFeatureView.axaml.cs | 2 +- .../Features/PluginFeatureViewModel.cs | 1 + .../Plugins/PluginPlatformView.axaml.cs | 1 - .../Plugins/PluginSettingsView.axaml.cs | 3 +- .../Plugins/PluginSettingsWindowView.axaml.cs | 3 +- .../Screens/Plugins/PluginView.axaml.cs | 3 +- .../Screens/Plugins/PluginViewModel.cs | 2 +- .../PluginPrerequisiteView.axaml.cs | 2 +- .../PluginPrerequisiteViewModel.cs | 1 + .../AlwaysOnConditionView.axaml.cs | 1 - .../EventConditionView.axaml.cs | 3 +- .../ConditionTypes/EventConditionViewModel.cs | 2 +- .../PlayOnceConditionView.axaml.cs | 1 - .../StaticConditionView.axaml.cs | 3 +- .../StaticConditionViewModel.cs | 2 +- .../DisplayConditionScriptView.axaml.cs | 3 +- .../DisplayConditionScriptViewModel.cs | 2 +- .../Panels/MenuBar/MenuBarView.axaml.cs | 3 +- .../Panels/MenuBar/MenuBarViewModel.cs | 2 +- .../Panels/Playback/PlaybackView.axaml.cs | 3 +- .../Panels/Playback/PlaybackViewModel.cs | 1 + .../ProfileElementRenameView.axaml.cs | 5 +- .../CategoryAdaptionHintView.axaml.cs | 1 - .../DeviceAdaptionHintView.axaml.cs | 1 - .../KeyboardSectionAdaptionHintView.axaml.cs | 1 - .../SingleLedAdaptionHintView.axaml.cs | 1 - .../Dialogs/LayerHintsDialogView.axaml.cs | 1 - .../Dialogs/LayerHintsDialogViewModel.cs | 2 +- .../ProfileTree/FolderTreeItemView.axaml.cs | 2 +- .../ProfileTree/FolderTreeItemViewModel.cs | 4 +- .../ProfileTree/LayerTreeItemView.axaml.cs | 2 +- .../ProfileTree/ProfileTreeView.axaml.cs | 2 +- .../ProfileTree/ProfileTreeViewModel.cs | 2 +- .../Panels/ProfileTree/TreeItemViewModel.cs | 5 +- .../DataBinding/DataBindingView.axaml.cs | 3 +- .../DataBinding/DataBindingViewModel.cs | 2 +- .../Properties/Dialogs/AddEffectView.axaml.cs | 3 +- .../Dialogs/TimelineSegmentEditView.axaml.cs | 3 +- .../Panels/Properties/PropertiesView.axaml.cs | 3 +- .../Panels/Properties/PropertiesViewModel.cs | 1 + .../Properties/PropertyGroupViewModel.cs | 1 - .../Keyframes/TimelineEasingView.axaml.cs | 1 - .../Keyframes/TimelineKeyframeView.axaml.cs | 3 +- .../Keyframes/TimelineKeyframeViewModel.cs | 3 +- .../Timeline/Segments/EndSegmentView.axaml.cs | 3 +- .../Timeline/Segments/EndSegmentViewModel.cs | 2 +- .../Segments/MainSegmentView.axaml.cs | 3 +- .../Timeline/Segments/MainSegmentViewModel.cs | 2 +- .../Segments/StartSegmentView.axaml.cs | 3 +- .../Segments/StartSegmentViewModel.cs | 2 +- .../Segments/TimelineSegmentViewModel.cs | 2 +- .../Timeline/TimelineGroupView.axaml.cs | 3 +- .../Timeline/TimelineGroupViewModel.cs | 2 +- .../Timeline/TimelinePropertyView.axaml.cs | 3 +- .../Timeline/TimelinePropertyViewModel.cs | 2 +- .../Properties/Timeline/TimelineView.axaml.cs | 3 +- .../Properties/Timeline/TimelineViewModel.cs | 3 +- .../LayerEffectRenameView.axaml.cs | 3 +- .../Dialogs/LayerBrushPresetView.axaml.cs | 3 +- .../Properties/Tree/TreeGroupView.axaml.cs | 3 +- .../Properties/Tree/TreeGroupViewModel.cs | 1 + .../Properties/Tree/TreePropertyView.axaml.cs | 5 +- .../Properties/Tree/TreePropertyViewModel.cs | 2 +- .../Panels/StatusBar/StatusBarView.axaml.cs | 3 +- .../Panels/StatusBar/StatusBarViewModel.cs | 2 +- .../Tools/SelectionAddToolView.axaml.cs | 3 +- .../Tools/SelectionAddToolViewModel.cs | 3 +- .../Tools/SelectionRemoveToolView.axaml.cs | 3 +- .../Tools/SelectionRemoveToolViewModel.cs | 3 +- .../Tools/TransformToolView.axaml.cs | 5 +- .../Tools/TransformToolViewModel.cs | 3 +- .../VisualEditor/VisualEditorView.axaml.cs | 3 +- .../VisualEditor/VisualEditorViewModel.cs | 2 +- .../LayerShapeVisualizerView.axaml.cs | 5 +- .../LayerShapeVisualizerViewModel.cs | 2 +- .../Visualizers/LayerVisualizerView.axaml.cs | 3 +- .../Visualizers/LayerVisualizerViewModel.cs | 2 +- .../ProfileEditorTitleBarView.axaml.cs | 1 - .../ProfileEditorTitleBarViewModel.cs | 1 - .../ProfileEditor/ProfileEditorView.axaml.cs | 2 +- .../ProfileEditor/ProfileEditorViewModel.cs | 1 + .../ProfileEditor/ProfileView.axaml.cs | 7 +-- .../WorkshopProfileView.axaml.cs | 2 +- .../Screens/Root/BlankView.axaml.cs | 5 +- .../Screens/Root/DefaultTitleBarView.axaml.cs | 1 - src/Artemis.UI/Screens/Root/RootView.axaml.cs | 5 +- src/Artemis.UI/Screens/Root/RootViewModel.cs | 1 - .../Screens/Root/SplashView.axaml.cs | 5 +- .../Account/ChangeEmailAddressView.axaml.cs | 3 +- .../Account/ChangePasswordView.axaml.cs | 5 +- .../CreatePersonalAccessTokenView.axaml.cs | 5 +- .../Account/PersonalAccessTokenView.axaml.cs | 5 +- .../Account/RemoveAccountView.axaml.cs | 3 +- .../Screens/Settings/SettingsView.axaml.cs | 5 +- .../Screens/Settings/SettingsViewModel.cs | 3 +- .../Settings/Tabs/AboutTabView.axaml.cs | 3 +- .../Settings/Tabs/AccountTabView.axaml.cs | 5 +- .../Settings/Tabs/AccountTabViewModel.cs | 3 +- .../Settings/Tabs/DevicesTabView.axaml.cs | 3 +- .../Settings/Tabs/DevicesTabViewModel.cs | 2 +- .../Settings/Tabs/GeneralTabView.axaml.cs | 3 +- .../Settings/Tabs/GeneralTabViewModel.cs | 1 + .../Settings/Tabs/PluginsTabView.axaml.cs | 4 +- .../Settings/Tabs/PluginsTabViewModel.cs | 3 +- .../Settings/Tabs/ReleasesTabView.axaml.cs | 5 +- .../Settings/Tabs/ReleasesTabViewModel.cs | 4 +- .../Updating/ReleaseDetailsView.axaml.cs | 3 +- .../Updating/ReleaseDetailsViewModel.cs | 2 +- .../SidebarCategoryEditView.axaml.cs | 2 +- .../ModuleActivationRequirementView.axaml.cs | 3 +- .../ModuleActivationRequirementViewModel.cs | 2 +- .../ModuleActivationRequirementsView.axaml.cs | 1 - .../ProfileConfigurationEditView.axaml.cs | 3 +- .../Sidebar/SidebarCategoryView.axaml.cs | 3 +- .../Sidebar/SidebarCategoryViewModel.cs | 2 +- .../SidebarProfileConfigurationView.axaml.cs | 3 +- .../SidebarProfileConfigurationViewModel.cs | 2 +- .../Sidebar/SidebarScreenView.axaml.cs | 2 +- .../Screens/Sidebar/SidebarView.axaml.cs | 6 +- .../Screens/Sidebar/SidebarViewModel.cs | 4 +- .../StartupWizard/StartupWizardView.axaml.cs | 5 +- .../Steps/DefaultEntriesStepView.axaml.cs | 5 +- .../Steps/DefaultEntriesStepViewModel.cs | 2 - .../Steps/DefaultEntryItemView.axaml.cs | 2 +- .../Steps/DefaultEntryItemViewModel.cs | 3 - .../Steps/FinishStepView.axaml.cs | 4 +- .../Steps/FinishStepViewModel.cs | 3 +- .../Steps/LayoutsStepView.axaml.cs | 5 +- .../Steps/SettingsStepView.axaml.cs | 4 +- .../Steps/SettingsStepViewModel.cs | 10 +-- .../Steps/SurfaceStepView.axaml.cs | 4 +- .../Steps/SurfaceStepViewModel.cs | 6 -- .../Steps/WelcomeStepView.axaml.cs | 4 +- .../WorkshopUnreachableStepView.axaml.cs | 4 +- .../WizardPluginFeatureView.axaml.cs | 5 +- .../WizardPluginFeatureViewModel.cs | 1 + .../SurfaceEditor/ListDeviceView.axaml.cs | 1 - .../SurfaceEditor/SurfaceDeviceView.axaml.cs | 3 +- .../SurfaceEditor/SurfaceDeviceViewModel.cs | 1 + .../SurfaceEditor/SurfaceEditorView.axaml.cs | 2 +- .../SurfaceEditor/SurfaceEditorViewModel.cs | 1 + .../VisualScripting/CableView.axaml.cs | 6 +- .../Screens/VisualScripting/CableViewModel.cs | 1 + .../VisualScripting/DragCableView.axaml.cs | 6 +- .../VisualScripting/DragCableViewModel.cs | 2 +- .../VisualScripting/NodePickerView.axaml.cs | 5 +- .../VisualScripting/NodePickerViewModel.cs | 1 + .../VisualScripting/NodeScriptView.axaml.cs | 4 +- .../VisualScripting/NodeScriptViewModel.cs | 3 +- .../NodeScriptWindowView.axaml.cs | 1 - .../NodeScriptWindowViewModel.cs | 2 +- .../Screens/VisualScripting/NodeView.axaml.cs | 3 +- .../Screens/VisualScripting/NodeViewModel.cs | 2 +- .../Pins/InputPinCollectionView.axaml.cs | 3 +- .../Pins/InputPinView.axaml.cs | 2 - .../Pins/OutputPinCollectionView.axaml.cs | 3 +- .../Pins/OutputPinView.axaml.cs | 2 - .../Pins/PinCollectionViewModel.cs | 2 +- .../Screens/VisualScripting/Pins/PinView.cs | 2 +- .../VisualScripting/Pins/PinViewModel.cs | 2 +- .../Categories/CategoriesView.axaml.cs | 2 +- .../Categories/CategoriesViewModel.cs | 2 +- .../CurrentUser/CurrentUserView.axaml.cs | 5 +- .../CurrentUser/CurrentUserViewModel.cs | 3 +- .../CurrentUser/WorkshopLoginView.axaml.cs | 2 +- .../CurrentUser/WorkshopLoginViewModel.cs | 1 + .../Entries/Details/EntryImageView.axaml.cs | 4 +- .../Details/EntryImagesDialogView.axaml.cs | 5 +- .../Details/EntryImagesDialogViewModel.cs | 1 + .../Entries/Details/EntryImagesView.axaml.cs | 2 +- .../Entries/Details/EntryInfoView.axaml.cs | 5 +- .../Entries/Details/EntryInfoViewModel.cs | 2 +- .../Details/EntrySpecificationsView.axaml.cs | 2 +- .../Details/EntrySpecificationsViewModel.cs | 2 - .../Workshop/Entries/EntriesView.axaml.cs | 5 +- .../Workshop/Entries/EntriesViewModel.cs | 2 +- .../List/EntryListItemVerticalView.axaml.cs | 5 +- .../Entries/List/EntryListItemView.axaml.cs | 2 +- .../Entries/List/EntryListView.axaml.cs | 2 +- .../Entries/List/EntryListViewModel.cs | 2 +- .../Dialogs/DependenciesDialogView.axaml.cs | 5 +- .../Dialogs/DependenciesDialogViewModel.cs | 2 +- .../EntryReleaseInfoView.axaml.cs | 2 +- .../EntryReleaseInfoViewModel.cs | 1 + .../EntryReleaseItemView.axaml.cs | 2 +- .../EntryReleaseItemViewModel.cs | 1 + .../EntryReleases/EntryReleaseView.axaml.cs | 5 +- .../EntryReleases/EntryReleasesView.axaml.cs | 3 +- .../EntryReleases/EntryReleasesViewModel.cs | 3 +- .../Workshop/Home/WorkshopHomeView.axaml.cs | 2 +- .../Home/WorkshopOfflineView.axaml.cs | 5 +- .../Workshop/Home/WorkshopOfflineViewModel.cs | 1 - .../Image/ImagePropertiesDialogView.axaml.cs | 5 +- .../Image/ImagePropertiesDialogViewModel.cs | 1 - .../Image/ImageSubmissionView.axaml.cs | 2 +- .../Image/ImageSubmissionViewModel.cs | 2 +- .../DeviceProviderPickerDialogView.axaml.cs | 4 +- .../Layout/LayoutDescriptionView.axaml.cs | 5 +- .../Layout/LayoutDetailsView.axaml.cs | 4 +- .../Workshop/Layout/LayoutDetailsViewModel.cs | 2 - .../Workshop/Layout/LayoutInfoView.axaml.cs | 2 +- .../Layout/LayoutListDefaultView.axaml.cs | 5 +- .../Workshop/Layout/LayoutListView.axaml.cs | 6 +- .../Workshop/Layout/LayoutListViewModel.cs | 1 - .../Workshop/Layout/LayoutManageView.axaml.cs | 5 +- .../LayoutFinderDeviceView.axaml.cs | 2 - .../LayoutFinder/LayoutFinderView.axaml.cs | 5 +- .../LayoutFinder/LayoutFinderViewModel.cs | 2 - .../Library/SubmissionDetailsView.axaml.cs | 5 +- .../Library/SubmissionDetailsViewModel.cs | 1 - .../Library/SubmissionManagementView.axaml.cs | 4 +- .../Library/SubmissionManagementViewModel.cs | 2 +- .../Library/SubmissionReleaseView.axaml.cs | 2 +- .../Library/SubmissionReleaseViewModel.cs | 2 - .../Tabs/InstalledTabItemView.axaml.cs | 2 +- .../Library/Tabs/InstalledTabItemViewModel.cs | 2 - .../Library/Tabs/InstalledTabView.axaml.cs | 5 +- .../Library/Tabs/InstalledTabViewModel.cs | 2 +- .../Tabs/SubmissionsTabItemView.axaml.cs | 2 - .../Library/Tabs/SubmissionsTabView.axaml.cs | 5 +- .../Library/WorkshopLibraryVIew.axaml.cs | 5 +- .../Library/WorkshopLibraryViewModel.cs | 2 +- .../Plugins/PluginDescriptionView.axaml.cs | 5 +- .../Plugins/PluginDescriptionViewModel.cs | 1 - .../Plugins/PluginDetailsView.axaml.cs | 4 +- .../Workshop/Plugins/PluginListView.axaml.cs | 4 +- .../Plugins/PluginManageView.axaml.cs | 5 +- .../Profile/ProfileDescriptionView.axaml.cs | 5 +- .../Profile/ProfileDescriptionViewModel.cs | 1 - .../Profile/ProfileDetailsView.axaml.cs | 4 +- .../Profile/ProfileDetailsViewModel.cs | 3 - .../Workshop/Profile/ProfileListView.axaml.cs | 4 +- .../Profile/ProfilePreviewView.axaml.cs | 2 +- .../Profile/ProfilePreviewViewModel.cs | 1 + .../Workshop/Search/SearchResultView.axaml.cs | 5 +- .../Workshop/Search/SearchViewModel.cs | 1 - .../Models/SubmissionWizardState.cs | 1 - .../ReleaseWizardView.axaml.cs | 3 +- .../Steps/ChangelogStepView.axaml.cs | 5 +- .../Steps/ChangelogStepViewModel.cs | 1 - .../Steps/EntryTypeStepView.axaml.cs | 2 +- .../Steps/ImagesStepView.axaml.cs | 5 +- .../Steps/Layout/LayoutInfoStepView.axaml.cs | 5 +- .../Steps/Layout/LayoutInfoStepViewModel.cs | 2 +- .../Layout/LayoutSelectionStepView.axaml.cs | 5 +- .../Layout/LayoutSelectionStepViewModel.cs | 1 - .../Steps/LoginStepView.axaml.cs | 2 +- .../Steps/LoginStepViewModel.cs | 3 - .../Plugin/PluginSelectionStepView.axaml.cs | 2 +- .../Plugin/PluginSelectionStepViewModel.cs | 1 - .../ProfileAdaptionHintsStepView.axaml.cs | 2 +- .../Profile/ProfileSelectionStepView.axaml.cs | 2 +- .../Profile/ProfileSelectionStepViewModel.cs | 1 - .../Steps/SpecificationsStepView.axaml.cs | 2 +- .../Steps/SpecificationsStepViewModel.cs | 1 - .../Steps/SubmitStepView.axaml.cs | 2 +- .../Steps/SubmitStepViewModel.cs | 2 +- .../Steps/UploadStepView.axaml.cs | 2 +- .../Steps/UploadStepViewModel.cs | 5 +- .../Steps/ValidateEmailStepView.axaml.cs | 2 +- .../Steps/ValidateEmailStepViewModel.cs | 2 +- .../Steps/WelcomeStepView.axaml.cs | 2 +- .../Steps/WelcomeStepViewModel.cs | 2 - .../SubmissionWizardView.axaml.cs | 3 +- .../SubmissionWizardViewModel.cs | 2 +- .../Screens/Workshop/WorkshopView.axaml.cs | 5 +- .../Services/DeviceLayoutService.cs | 1 - .../Services/Updating/UpdateService.cs | 2 - src/Artemis.UI/ViewLocator.cs | 3 +- .../Artemis.WebClient.Updating.csproj | 2 +- .../Artemis.WebClient.Workshop.csproj | 2 +- .../EntryInstallResult.cs | 1 - .../Services/WorkshopService.cs | 2 - .../WorkshopConstants.cs | 7 +++ src/Directory.Packages.props | 62 +++++++++---------- 387 files changed, 367 insertions(+), 696 deletions(-) diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj index ffea2cad6..3ebf067a5 100644 --- a/src/Artemis.Core/Artemis.Core.csproj +++ b/src/Artemis.Core/Artemis.Core.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 false false Artemis.Core diff --git a/src/Artemis.Core/ColorScience/Quantization/ColorSwatch.cs b/src/Artemis.Core/ColorScience/Quantization/ColorSwatch.cs index 602f3d480..0adb2cbe6 100644 --- a/src/Artemis.Core/ColorScience/Quantization/ColorSwatch.cs +++ b/src/Artemis.Core/ColorScience/Quantization/ColorSwatch.cs @@ -1,5 +1,4 @@ -using System.Text; -using SkiaSharp; +using SkiaSharp; namespace Artemis.Core.ColorScience; diff --git a/src/Artemis.Core/Models/ProfileConfiguration/Hotkey.cs b/src/Artemis.Core/Models/ProfileConfiguration/Hotkey.cs index b7dc91525..cd3fbd754 100644 --- a/src/Artemis.Core/Models/ProfileConfiguration/Hotkey.cs +++ b/src/Artemis.Core/Models/ProfileConfiguration/Hotkey.cs @@ -1,5 +1,4 @@ -using System; -using Artemis.Core.Services; +using Artemis.Core.Services; using Artemis.Storage.Entities.Profile; namespace Artemis.Core; diff --git a/src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs b/src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs index 263748f0d..755cc48ee 100644 --- a/src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs +++ b/src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs @@ -1,7 +1,6 @@ using System; using System.IO; using System.Linq; -using System.Threading.Tasks; using RGB.NET.Core; namespace Artemis.Core.DeviceProviders; diff --git a/src/Artemis.Core/Services/DeviceService.cs b/src/Artemis.Core/Services/DeviceService.cs index aaa27c59b..33b9792db 100644 --- a/src/Artemis.Core/Services/DeviceService.cs +++ b/src/Artemis.Core/Services/DeviceService.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Threading; using System.Threading.Tasks; using Artemis.Core.DeviceProviders; using Artemis.Core.Providers; diff --git a/src/Artemis.Core/Services/Input/InputKeyLedIdMap.cs b/src/Artemis.Core/Services/Input/InputKeyLedIdMap.cs index 45608664e..257ecf4d0 100644 --- a/src/Artemis.Core/Services/Input/InputKeyLedIdMap.cs +++ b/src/Artemis.Core/Services/Input/InputKeyLedIdMap.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using RGB.NET.Core; +using RGB.NET.Core; namespace Artemis.Core.Services; diff --git a/src/Artemis.Core/Services/Interfaces/IDeviceService.cs b/src/Artemis.Core/Services/Interfaces/IDeviceService.cs index eb611d613..0187425c6 100644 --- a/src/Artemis.Core/Services/Interfaces/IDeviceService.cs +++ b/src/Artemis.Core/Services/Interfaces/IDeviceService.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Threading.Tasks; using Artemis.Core.DeviceProviders; namespace Artemis.Core.Services; diff --git a/src/Artemis.Core/Services/Interfaces/IRenderService.cs b/src/Artemis.Core/Services/Interfaces/IRenderService.cs index e33d4fea0..1845bdce6 100644 --- a/src/Artemis.Core/Services/Interfaces/IRenderService.cs +++ b/src/Artemis.Core/Services/Interfaces/IRenderService.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using Artemis.Core.Services.Core; using Artemis.Core.SkiaSharp; using RGB.NET.Core; diff --git a/src/Artemis.Core/Services/PluginManagementService.cs b/src/Artemis.Core/Services/PluginManagementService.cs index f65a9d858..d0827b7cd 100644 --- a/src/Artemis.Core/Services/PluginManagementService.cs +++ b/src/Artemis.Core/Services/PluginManagementService.cs @@ -9,7 +9,6 @@ using System.Threading; using System.Threading.Tasks; using Artemis.Core.DeviceProviders; using Artemis.Core.DryIoc; -using Artemis.Storage.Entities.General; using Artemis.Storage.Entities.Plugins; using Artemis.Storage.Entities.Surface; using Artemis.Storage.Repositories.Interfaces; diff --git a/src/Artemis.Core/Services/Storage/ProfileService.cs b/src/Artemis.Core/Services/Storage/ProfileService.cs index 981f247a5..2c87b52ff 100644 --- a/src/Artemis.Core/Services/Storage/ProfileService.cs +++ b/src/Artemis.Core/Services/Storage/ProfileService.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Diagnostics; using System.IO; using System.IO.Compression; using System.Linq; @@ -11,7 +10,6 @@ using System.Text.Json.Nodes; using System.Threading.Tasks; using Artemis.Core.Modules; using Artemis.Storage.Entities.Profile; -using Artemis.Storage.Migrations; using Artemis.Storage.Repositories.Interfaces; using Serilog; using SkiaSharp; diff --git a/src/Artemis.Core/Services/WebServer/EndPoints/JsonPluginEndPoint.cs b/src/Artemis.Core/Services/WebServer/EndPoints/JsonPluginEndPoint.cs index eee990829..b3313ea97 100644 --- a/src/Artemis.Core/Services/WebServer/EndPoints/JsonPluginEndPoint.cs +++ b/src/Artemis.Core/Services/WebServer/EndPoints/JsonPluginEndPoint.cs @@ -2,8 +2,8 @@ using System.Text.Json; using System.Threading.Tasks; using GenHTTP.Api.Protocol; -using GenHTTP.Modules.Basics; using GenHTTP.Modules.Conversion.Serializers.Json; +using GenHTTP.Modules.IO; namespace Artemis.Core.Services; diff --git a/src/Artemis.Core/Services/WebServer/EndPoints/PluginEndPoint.cs b/src/Artemis.Core/Services/WebServer/EndPoints/PluginEndPoint.cs index f621ade10..9da53c1c8 100644 --- a/src/Artemis.Core/Services/WebServer/EndPoints/PluginEndPoint.cs +++ b/src/Artemis.Core/Services/WebServer/EndPoints/PluginEndPoint.cs @@ -1,9 +1,7 @@ using System; -using System.Net.Http; using System.Text.Json.Serialization; using System.Threading.Tasks; using GenHTTP.Api.Protocol; -using GenHTTP.Modules.Basics; using GenHTTP.Modules.IO; using StringContent = GenHTTP.Modules.IO.Strings.StringContent; diff --git a/src/Artemis.Core/Services/WebServer/EndPoints/StringPluginEndPoint.cs b/src/Artemis.Core/Services/WebServer/EndPoints/StringPluginEndPoint.cs index 83230e8c1..34410dffc 100644 --- a/src/Artemis.Core/Services/WebServer/EndPoints/StringPluginEndPoint.cs +++ b/src/Artemis.Core/Services/WebServer/EndPoints/StringPluginEndPoint.cs @@ -2,7 +2,7 @@ using System.IO; using System.Threading.Tasks; using GenHTTP.Api.Protocol; -using GenHTTP.Modules.Basics; +using GenHTTP.Modules.IO; using GenHTTP.Modules.IO.Strings; namespace Artemis.Core.Services; diff --git a/src/Artemis.Core/Services/WebServer/Interfaces/IWebServerService.cs b/src/Artemis.Core/Services/WebServer/Interfaces/IWebServerService.cs index 01a41d1dd..d6170e75f 100644 --- a/src/Artemis.Core/Services/WebServer/Interfaces/IWebServerService.cs +++ b/src/Artemis.Core/Services/WebServer/Interfaces/IWebServerService.cs @@ -1,6 +1,5 @@ using System; using System.Threading.Tasks; -using Artemis.Core.Modules; using GenHTTP.Api.Infrastructure; using GenHTTP.Api.Protocol; diff --git a/src/Artemis.Core/Services/WebServer/PluginsHandler.cs b/src/Artemis.Core/Services/WebServer/PluginsHandler.cs index f7db246b5..410b85972 100644 --- a/src/Artemis.Core/Services/WebServer/PluginsHandler.cs +++ b/src/Artemis.Core/Services/WebServer/PluginsHandler.cs @@ -1,12 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text.Json; using System.Threading.Tasks; using GenHTTP.Api.Content; using GenHTTP.Api.Protocol; -using GenHTTP.Modules.Basics; -using GenHTTP.Modules.Conversion.Serializers.Json; +using GenHTTP.Modules.IO; using GenHTTP.Modules.IO.Strings; namespace Artemis.Core.Services; diff --git a/src/Artemis.Core/Services/WebServer/WebServerService.cs b/src/Artemis.Core/Services/WebServer/WebServerService.cs index 8a132c8e6..24f851e83 100644 --- a/src/Artemis.Core/Services/WebServer/WebServerService.cs +++ b/src/Artemis.Core/Services/WebServer/WebServerService.cs @@ -12,7 +12,6 @@ using GenHTTP.Api.Protocol; using GenHTTP.Engine.Internal; using GenHTTP.Modules.Conversion; using GenHTTP.Modules.Conversion.Serializers; -using GenHTTP.Modules.ErrorHandling; using GenHTTP.Modules.Layouting; using GenHTTP.Modules.Layouting.Provider; using GenHTTP.Modules.Practices; diff --git a/src/Artemis.Core/Utilities/EnumUtilities.cs b/src/Artemis.Core/Utilities/EnumUtilities.cs index 0abf74e92..6291d0867 100644 --- a/src/Artemis.Core/Utilities/EnumUtilities.cs +++ b/src/Artemis.Core/Utilities/EnumUtilities.cs @@ -30,7 +30,7 @@ public static class EnumUtilities if (!t.IsEnum) throw new ArgumentException($"{t} must be an enum type"); - return Enum.GetValues(t).Cast().Select(e => (e, e.Humanize())).ToList(); + return Enum.GetValues(t).Cast().Select(e => (e, HumanizeValue(e))).ToList(); } /// @@ -40,6 +40,6 @@ public static class EnumUtilities /// A humanized string describing the given value public static string HumanizeValue(Enum value) { - return value.Humanize(); + return value.ToString().Humanize(); } } \ No newline at end of file diff --git a/src/Artemis.Core/Utilities/Utilities.cs b/src/Artemis.Core/Utilities/Utilities.cs index 8c9422400..625af0630 100644 --- a/src/Artemis.Core/Utilities/Utilities.cs +++ b/src/Artemis.Core/Utilities/Utilities.cs @@ -4,7 +4,6 @@ using System.IO; using System.Linq; using System.Security.AccessControl; using System.Security.Principal; -using SkiaSharp; namespace Artemis.Core; diff --git a/src/Artemis.Storage.Legacy/Artemis.Storage.Legacy.csproj b/src/Artemis.Storage.Legacy/Artemis.Storage.Legacy.csproj index ede098742..159352cb7 100644 --- a/src/Artemis.Storage.Legacy/Artemis.Storage.Legacy.csproj +++ b/src/Artemis.Storage.Legacy/Artemis.Storage.Legacy.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable diff --git a/src/Artemis.Storage/Artemis.Storage.csproj b/src/Artemis.Storage/Artemis.Storage.csproj index 62503b361..c37f5b716 100644 --- a/src/Artemis.Storage/Artemis.Storage.csproj +++ b/src/Artemis.Storage/Artemis.Storage.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 false x64 enable diff --git a/src/Artemis.Storage/ArtemisDbContext.cs b/src/Artemis.Storage/ArtemisDbContext.cs index 0893def84..5f719521c 100644 --- a/src/Artemis.Storage/ArtemisDbContext.cs +++ b/src/Artemis.Storage/ArtemisDbContext.cs @@ -8,7 +8,6 @@ using Artemis.Storage.Entities.Profile; using Artemis.Storage.Entities.Surface; using Artemis.Storage.Entities.Workshop; using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Diagnostics; namespace Artemis.Storage; diff --git a/src/Artemis.Storage/Entities/Plugins/PluginEntity.cs b/src/Artemis.Storage/Entities/Plugins/PluginEntity.cs index faf43f951..fe9dbe442 100644 --- a/src/Artemis.Storage/Entities/Plugins/PluginEntity.cs +++ b/src/Artemis.Storage/Entities/Plugins/PluginEntity.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Runtime.InteropServices; using Microsoft.EntityFrameworkCore; namespace Artemis.Storage.Entities.Plugins; diff --git a/src/Artemis.Storage/Entities/Profile/ProfileEntity.cs b/src/Artemis.Storage/Entities/Profile/ProfileEntity.cs index c27fdb5ed..459bbdf06 100644 --- a/src/Artemis.Storage/Entities/Profile/ProfileEntity.cs +++ b/src/Artemis.Storage/Entities/Profile/ProfileEntity.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Artemis.Storage.Entities.General; namespace Artemis.Storage.Entities.Profile; diff --git a/src/Artemis.Storage/Repositories/ProfileRepository.cs b/src/Artemis.Storage/Repositories/ProfileRepository.cs index dd129e23e..28d273aca 100644 --- a/src/Artemis.Storage/Repositories/ProfileRepository.cs +++ b/src/Artemis.Storage/Repositories/ProfileRepository.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Text.Json.Nodes; using Artemis.Storage.Entities; using Artemis.Storage.Entities.Profile; -using Artemis.Storage.Exceptions; using Artemis.Storage.Migrations; using Artemis.Storage.Repositories.Interfaces; using Microsoft.EntityFrameworkCore; diff --git a/src/Artemis.UI.Linux/App.axaml.cs b/src/Artemis.UI.Linux/App.axaml.cs index dbba1fb2f..ef163019f 100644 --- a/src/Artemis.UI.Linux/App.axaml.cs +++ b/src/Artemis.UI.Linux/App.axaml.cs @@ -7,7 +7,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using DryIoc; using ReactiveUI; diff --git a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj index 64844bc6c..3c98265c9 100644 --- a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj +++ b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj @@ -1,7 +1,7 @@ WinExe - net9.0 + net10.0 enable x64 x64 diff --git a/src/Artemis.UI.Linux/Program.cs b/src/Artemis.UI.Linux/Program.cs index e39ba8973..8a9a92109 100644 --- a/src/Artemis.UI.Linux/Program.cs +++ b/src/Artemis.UI.Linux/Program.cs @@ -2,7 +2,7 @@ using System; using Artemis.Core; using Artemis.Storage; using Avalonia; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using DryIoc; using Serilog; diff --git a/src/Artemis.UI.Linux/Providers/Input/LinuxInputDeviceReader.cs b/src/Artemis.UI.Linux/Providers/Input/LinuxInputDeviceReader.cs index 9f78fd227..d1abe1807 100644 --- a/src/Artemis.UI.Linux/Providers/Input/LinuxInputDeviceReader.cs +++ b/src/Artemis.UI.Linux/Providers/Input/LinuxInputDeviceReader.cs @@ -1,5 +1,4 @@ using System; -using System.Diagnostics; using System.IO; using System.Runtime.InteropServices; using System.Threading; diff --git a/src/Artemis.UI.MacOS/App.axaml.cs b/src/Artemis.UI.MacOS/App.axaml.cs index 800bb523f..95863dbae 100644 --- a/src/Artemis.UI.MacOS/App.axaml.cs +++ b/src/Artemis.UI.MacOS/App.axaml.cs @@ -2,7 +2,7 @@ using Artemis.Storage.Legacy; using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using DryIoc; using ReactiveUI; diff --git a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj index 816f3cd77..75ec28c90 100644 --- a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj +++ b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj @@ -1,7 +1,7 @@  WinExe - net9.0 + net10.0 enable x64 x64 diff --git a/src/Artemis.UI.MacOS/Program.cs b/src/Artemis.UI.MacOS/Program.cs index 3343ecafb..aecf565f5 100644 --- a/src/Artemis.UI.MacOS/Program.cs +++ b/src/Artemis.UI.MacOS/Program.cs @@ -2,7 +2,7 @@ using System; using Artemis.Core; using Artemis.Storage; using Avalonia; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using DryIoc; using Serilog; diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj index ef6ed4e95..e56e208fa 100644 --- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj +++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj @@ -1,7 +1,7 @@ Library - net9.0 + net10.0 enable bin\ x64 @@ -14,12 +14,12 @@ - + diff --git a/src/Artemis.UI.Shared/Controls/ArtemisIcon.axaml.cs b/src/Artemis.UI.Shared/Controls/ArtemisIcon.axaml.cs index 7aadc91bf..c56a747a3 100644 --- a/src/Artemis.UI.Shared/Controls/ArtemisIcon.axaml.cs +++ b/src/Artemis.UI.Shared/Controls/ArtemisIcon.axaml.cs @@ -2,10 +2,8 @@ using System; using System.Text.RegularExpressions; using Avalonia; using Avalonia.Controls; -using Avalonia.Controls.Documents; using Avalonia.Layout; using Avalonia.LogicalTree; -using Avalonia.Markup.Xaml; using Avalonia.Media; using Avalonia.Media.Imaging; using Material.Icons; diff --git a/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPicker.cs b/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPicker.cs index 996dc842c..21f9514e6 100644 --- a/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPicker.cs +++ b/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPicker.cs @@ -1,5 +1,4 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; diff --git a/src/Artemis.UI.Shared/Controls/DraggableNumberBox.axaml.cs b/src/Artemis.UI.Shared/Controls/DraggableNumberBox.axaml.cs index cb85a0bc6..44cd60381 100644 --- a/src/Artemis.UI.Shared/Controls/DraggableNumberBox.axaml.cs +++ b/src/Artemis.UI.Shared/Controls/DraggableNumberBox.axaml.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using Avalonia; using Avalonia.Controls; using Avalonia.Data; diff --git a/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml.cs b/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml.cs index 8fcd1eba4..b5e538b62 100644 --- a/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml.cs +++ b/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml.cs @@ -6,7 +6,6 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Data; using Avalonia.LogicalTree; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Shared; diff --git a/src/Artemis.UI.Shared/Controls/Flyouts/MaterialIconPickerFlyout.cs b/src/Artemis.UI.Shared/Controls/Flyouts/MaterialIconPickerFlyout.cs index 99321b5e0..4597081db 100644 --- a/src/Artemis.UI.Shared/Controls/Flyouts/MaterialIconPickerFlyout.cs +++ b/src/Artemis.UI.Shared/Controls/Flyouts/MaterialIconPickerFlyout.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using FluentAvalonia.UI.Controls; namespace Artemis.UI.Shared.Flyouts; diff --git a/src/Artemis.UI.Shared/Controls/HotkeyBox.axaml.cs b/src/Artemis.UI.Shared/Controls/HotkeyBox.axaml.cs index 1697977a8..3c0bfd8d2 100644 --- a/src/Artemis.UI.Shared/Controls/HotkeyBox.axaml.cs +++ b/src/Artemis.UI.Shared/Controls/HotkeyBox.axaml.cs @@ -7,7 +7,6 @@ using Avalonia.Controls; using Avalonia.Data; using Avalonia.Input; using Avalonia.Interactivity; -using Avalonia.Markup.Xaml; using Avalonia.Threading; using Avalonia.VisualTree; using DryIoc; diff --git a/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs b/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs index 67ed37900..8361d3abe 100644 --- a/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs +++ b/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs @@ -1,8 +1,6 @@ using System; -using Avalonia; using Avalonia.Controls; using Avalonia.Input; -using Avalonia.Styling; namespace Artemis.UI.Shared; diff --git a/src/Artemis.UI.Shared/Controls/TagsInput/TagsInput.properties.cs b/src/Artemis.UI.Shared/Controls/TagsInput/TagsInput.properties.cs index 2660e7bb8..6359c0260 100644 --- a/src/Artemis.UI.Shared/Controls/TagsInput/TagsInput.properties.cs +++ b/src/Artemis.UI.Shared/Controls/TagsInput/TagsInput.properties.cs @@ -1,7 +1,6 @@ using System.Collections.ObjectModel; using Avalonia; using Avalonia.Controls.Primitives; -using Avalonia.Data; namespace Artemis.UI.Shared.TagsInput; diff --git a/src/Artemis.UI.Shared/Converters/BytesToStringConverter.cs b/src/Artemis.UI.Shared/Converters/BytesToStringConverter.cs index f6f7da7e6..82946c897 100644 --- a/src/Artemis.UI.Shared/Converters/BytesToStringConverter.cs +++ b/src/Artemis.UI.Shared/Converters/BytesToStringConverter.cs @@ -2,7 +2,6 @@ using System; using System.Globalization; using Avalonia.Data.Converters; using Humanizer; -using Humanizer.Bytes; namespace Artemis.UI.Shared.Converters; diff --git a/src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/DefaultDataModelDisplayView.axaml.cs b/src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/DefaultDataModelDisplayView.axaml.cs index 2980cf877..663fb2f7e 100644 --- a/src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/DefaultDataModelDisplayView.axaml.cs +++ b/src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/DefaultDataModelDisplayView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Shared.DefaultTypes.DataModel.Display; diff --git a/src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/SKColorDataModelDisplayView.axaml.cs b/src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/SKColorDataModelDisplayView.axaml.cs index 57a8c867a..933bb4b90 100644 --- a/src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/SKColorDataModelDisplayView.axaml.cs +++ b/src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/SKColorDataModelDisplayView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; using SkiaSharp; namespace Artemis.UI.Shared.DefaultTypes.DataModel.Display; diff --git a/src/Artemis.UI.Shared/ReactiveAppWindow.cs b/src/Artemis.UI.Shared/ReactiveAppWindow.cs index c943cbbfe..038e0fe05 100644 --- a/src/Artemis.UI.Shared/ReactiveAppWindow.cs +++ b/src/Artemis.UI.Shared/ReactiveAppWindow.cs @@ -1,12 +1,9 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Runtime.InteropServices; using Avalonia; using Avalonia.Controls; using Avalonia.Media; -using Avalonia.Media.Immutable; -using Avalonia.Styling; -using FluentAvalonia.UI.Media; using FluentAvalonia.UI.Windowing; using ReactiveUI; diff --git a/src/Artemis.UI.Shared/Routing/Router/Navigation.cs b/src/Artemis.UI.Shared/Routing/Router/Navigation.cs index 1df871d34..23c0e906b 100644 --- a/src/Artemis.UI.Shared/Routing/Router/Navigation.cs +++ b/src/Artemis.UI.Shared/Routing/Router/Navigation.cs @@ -1,10 +1,7 @@ using System; -using System.Reactive.Threading.Tasks; using System.Threading; using System.Threading.Tasks; -using Avalonia.Threading; using DryIoc; -using ReactiveUI; using Serilog; namespace Artemis.UI.Shared.Routing; diff --git a/src/Artemis.UI.Shared/Routing/Router/NavigationArguments.cs b/src/Artemis.UI.Shared/Routing/Router/NavigationArguments.cs index 3b732d987..799ecd8b2 100644 --- a/src/Artemis.UI.Shared/Routing/Router/NavigationArguments.cs +++ b/src/Artemis.UI.Shared/Routing/Router/NavigationArguments.cs @@ -1,5 +1,4 @@ using System; -using System.Threading.Tasks; namespace Artemis.UI.Shared.Routing; diff --git a/src/Artemis.UI.Shared/Services/Builders/FileDialogFilterBuilder.cs b/src/Artemis.UI.Shared/Services/Builders/FileDialogFilterBuilder.cs index e0b6532fc..c3c420a64 100644 --- a/src/Artemis.UI.Shared/Services/Builders/FileDialogFilterBuilder.cs +++ b/src/Artemis.UI.Shared/Services/Builders/FileDialogFilterBuilder.cs @@ -2,7 +2,6 @@ using System.Linq; using Avalonia.Controls; using Avalonia.Platform.Storage; -using SkiaSharp; namespace Artemis.UI.Shared.Services.Builders; diff --git a/src/Artemis.UI.Shared/Services/MainWindow/MainWindowService.cs b/src/Artemis.UI.Shared/Services/MainWindow/MainWindowService.cs index 0a95a0087..a72cbd167 100644 --- a/src/Artemis.UI.Shared/Services/MainWindow/MainWindowService.cs +++ b/src/Artemis.UI.Shared/Services/MainWindow/MainWindowService.cs @@ -1,5 +1,4 @@ using System; -using ReactiveUI; namespace Artemis.UI.Shared.Services.MainWindow; diff --git a/src/Artemis.UI.Shared/Services/ProfileEditor/IToolViewModel.cs b/src/Artemis.UI.Shared/Services/ProfileEditor/IToolViewModel.cs index 7b1bf30d8..b6f910846 100644 --- a/src/Artemis.UI.Shared/Services/ProfileEditor/IToolViewModel.cs +++ b/src/Artemis.UI.Shared/Services/ProfileEditor/IToolViewModel.cs @@ -1,6 +1,5 @@ using System; using Artemis.Core; -using Avalonia.Input; using Material.Icons; namespace Artemis.UI.Shared.Services.ProfileEditor; diff --git a/src/Artemis.UI.Shared/Services/PropertyInput/PropertyInputViewModel.cs b/src/Artemis.UI.Shared/Services/PropertyInput/PropertyInputViewModel.cs index ede68d21f..70a22613b 100644 --- a/src/Artemis.UI.Shared/Services/PropertyInput/PropertyInputViewModel.cs +++ b/src/Artemis.UI.Shared/Services/PropertyInput/PropertyInputViewModel.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.Shared.Controls; diff --git a/src/Artemis.UI.Shared/Services/Window/ExceptionDialogView.axaml.cs b/src/Artemis.UI.Shared/Services/Window/ExceptionDialogView.axaml.cs index 9aca2bcf9..3c51492ac 100644 --- a/src/Artemis.UI.Shared/Services/Window/ExceptionDialogView.axaml.cs +++ b/src/Artemis.UI.Shared/Services/Window/ExceptionDialogView.axaml.cs @@ -1,6 +1,5 @@ using Avalonia; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Shared.Services; diff --git a/src/Artemis.UI.Shared/Services/Window/ExceptionDialogViewModel.cs b/src/Artemis.UI.Shared/Services/Window/ExceptionDialogViewModel.cs index 06a3ea86c..3bb88df15 100644 --- a/src/Artemis.UI.Shared/Services/Window/ExceptionDialogViewModel.cs +++ b/src/Artemis.UI.Shared/Services/Window/ExceptionDialogViewModel.cs @@ -1,7 +1,6 @@ using System; using System.Threading.Tasks; using Artemis.UI.Shared.Services.Builders; -using Avalonia; using Avalonia.Layout; namespace Artemis.UI.Shared.Services; diff --git a/src/Artemis.UI.Shared/VisualScripting/CustomNodeViewModel.cs b/src/Artemis.UI.Shared/VisualScripting/CustomNodeViewModel.cs index b8484d7a0..554f769d9 100644 --- a/src/Artemis.UI.Shared/VisualScripting/CustomNodeViewModel.cs +++ b/src/Artemis.UI.Shared/VisualScripting/CustomNodeViewModel.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.Core; using ReactiveUI; using ReactiveUI.Validation.Helpers; diff --git a/src/Artemis.UI.Windows/App.axaml.cs b/src/Artemis.UI.Windows/App.axaml.cs index feb425d47..78713954b 100644 --- a/src/Artemis.UI.Windows/App.axaml.cs +++ b/src/Artemis.UI.Windows/App.axaml.cs @@ -14,7 +14,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using DryIoc; using HotAvalonia; using ReactiveUI; diff --git a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj index 9f301ae22..ebf6b8b40 100644 --- a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj +++ b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj @@ -1,7 +1,7 @@ WinExe - net9.0-windows10.0.17763.0 + net10.0-windows10.0.17763.0 enable x64 bin diff --git a/src/Artemis.UI.Windows/Program.cs b/src/Artemis.UI.Windows/Program.cs index b7ccdd7a9..6b2714cce 100644 --- a/src/Artemis.UI.Windows/Program.cs +++ b/src/Artemis.UI.Windows/Program.cs @@ -2,8 +2,7 @@ using System; using Artemis.Core; using Artemis.Storage; using Avalonia; -using Avalonia.Logging; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using DryIoc; using Serilog; diff --git a/src/Artemis.UI.Windows/Utilities/InputUtilities.cs b/src/Artemis.UI.Windows/Utilities/InputUtilities.cs index 44eacdb66..f2677cd5f 100644 --- a/src/Artemis.UI.Windows/Utilities/InputUtilities.cs +++ b/src/Artemis.UI.Windows/Utilities/InputUtilities.cs @@ -1,6 +1,5 @@ using System; using System.Runtime.InteropServices; -using System.Text; using Artemis.Core.Services; using Microsoft.Win32; diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index 36b83abef..6bd4a0858 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -1,7 +1,7 @@ Library - net9.0 + net10.0 enable bin/ x64 diff --git a/src/Artemis.UI/Converters/DateTimeConverter.cs b/src/Artemis.UI/Converters/DateTimeConverter.cs index 7baf68ebb..f284779e5 100644 --- a/src/Artemis.UI/Converters/DateTimeConverter.cs +++ b/src/Artemis.UI/Converters/DateTimeConverter.cs @@ -1,6 +1,5 @@ using System; using System.Globalization; -using Artemis.WebClient.Workshop; using Avalonia.Data.Converters; using Humanizer; diff --git a/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs b/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs index 8c69358ff..aa7cfc232 100644 --- a/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs +++ b/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs @@ -1,7 +1,6 @@ using System; using System.Globalization; using Artemis.UI.Screens.ProfileEditor.Properties.Tree; -using Artemis.UI.Screens.ProfileEditor.Properties.Tree; using Avalonia; using Avalonia.Data.Converters; diff --git a/src/Artemis.UI/Converters/SubstringConverter.cs b/src/Artemis.UI/Converters/SubstringConverter.cs index 8ed7dc8fb..7665e59a6 100644 --- a/src/Artemis.UI/Converters/SubstringConverter.cs +++ b/src/Artemis.UI/Converters/SubstringConverter.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Globalization; -using System.Linq; using Avalonia.Data.Converters; namespace Artemis.UI.Converters; diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/BoolPropertyInputView.axaml.cs b/src/Artemis.UI/DefaultTypes/PropertyInput/BoolPropertyInputView.axaml.cs index 66e0f8f66..4af365217 100644 --- a/src/Artemis.UI/DefaultTypes/PropertyInput/BoolPropertyInputView.axaml.cs +++ b/src/Artemis.UI/DefaultTypes/PropertyInput/BoolPropertyInputView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.DefaultTypes.PropertyInput; diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputView.axaml.cs b/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputView.axaml.cs index c7a542a47..993f05214 100644 --- a/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputView.axaml.cs +++ b/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.DefaultTypes.PropertyInput; diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs b/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs index d382da86d..2698709d1 100644 --- a/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs +++ b/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.ObjectModel; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.LayerBrushes; @@ -14,7 +14,6 @@ using Artemis.UI.Shared.Services.ProfileEditor.Commands; using Artemis.UI.Shared.Services.PropertyInput; using Avalonia.Threading; using ReactiveUI; -using LayerBrushPresetViewModel = Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetViewModel; namespace Artemis.UI.DefaultTypes.PropertyInput; diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/ColorGradientPropertyInputView.axaml.cs b/src/Artemis.UI/DefaultTypes/PropertyInput/ColorGradientPropertyInputView.axaml.cs index e41460b0a..75955a35f 100644 --- a/src/Artemis.UI/DefaultTypes/PropertyInput/ColorGradientPropertyInputView.axaml.cs +++ b/src/Artemis.UI/DefaultTypes/PropertyInput/ColorGradientPropertyInputView.axaml.cs @@ -1,7 +1,6 @@ using System; using Artemis.UI.Shared.Controls.GradientPicker; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.DefaultTypes.PropertyInput; diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/EnumPropertyInputView.axaml.cs b/src/Artemis.UI/DefaultTypes/PropertyInput/EnumPropertyInputView.axaml.cs index d5bd57b96..e584f34d5 100644 --- a/src/Artemis.UI/DefaultTypes/PropertyInput/EnumPropertyInputView.axaml.cs +++ b/src/Artemis.UI/DefaultTypes/PropertyInput/EnumPropertyInputView.axaml.cs @@ -1,6 +1,5 @@ using Artemis.UI.Shared.Services.PropertyInput; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.DefaultTypes.PropertyInput; diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/FloatPropertyInputView.axaml.cs b/src/Artemis.UI/DefaultTypes/PropertyInput/FloatPropertyInputView.axaml.cs index f9ef0b669..94ce23837 100644 --- a/src/Artemis.UI/DefaultTypes/PropertyInput/FloatPropertyInputView.axaml.cs +++ b/src/Artemis.UI/DefaultTypes/PropertyInput/FloatPropertyInputView.axaml.cs @@ -1,7 +1,6 @@ using System; using Artemis.UI.Shared.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.DefaultTypes.PropertyInput; diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/FloatRangePropertyInputView.axaml.cs b/src/Artemis.UI/DefaultTypes/PropertyInput/FloatRangePropertyInputView.axaml.cs index 5567c1cee..5e54392f6 100644 --- a/src/Artemis.UI/DefaultTypes/PropertyInput/FloatRangePropertyInputView.axaml.cs +++ b/src/Artemis.UI/DefaultTypes/PropertyInput/FloatRangePropertyInputView.axaml.cs @@ -1,7 +1,6 @@ using System; using Artemis.UI.Shared.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.DefaultTypes.PropertyInput; diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/IntPropertyInputView.axaml.cs b/src/Artemis.UI/DefaultTypes/PropertyInput/IntPropertyInputView.axaml.cs index 5e06c0aea..271ba8c40 100644 --- a/src/Artemis.UI/DefaultTypes/PropertyInput/IntPropertyInputView.axaml.cs +++ b/src/Artemis.UI/DefaultTypes/PropertyInput/IntPropertyInputView.axaml.cs @@ -1,7 +1,6 @@ using System; using Artemis.UI.Shared.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.DefaultTypes.PropertyInput; diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/IntRangePropertyInputView.axaml.cs b/src/Artemis.UI/DefaultTypes/PropertyInput/IntRangePropertyInputView.axaml.cs index a703040f4..46725b890 100644 --- a/src/Artemis.UI/DefaultTypes/PropertyInput/IntRangePropertyInputView.axaml.cs +++ b/src/Artemis.UI/DefaultTypes/PropertyInput/IntRangePropertyInputView.axaml.cs @@ -1,7 +1,6 @@ using System; using Artemis.UI.Shared.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.DefaultTypes.PropertyInput; diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/SKColorPropertyInputView.axaml.cs b/src/Artemis.UI/DefaultTypes/PropertyInput/SKColorPropertyInputView.axaml.cs index 83d3c91fe..1f4e05dec 100644 --- a/src/Artemis.UI/DefaultTypes/PropertyInput/SKColorPropertyInputView.axaml.cs +++ b/src/Artemis.UI/DefaultTypes/PropertyInput/SKColorPropertyInputView.axaml.cs @@ -1,6 +1,5 @@ using System; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using FluentAvalonia.UI.Controls; namespace Artemis.UI.DefaultTypes.PropertyInput; diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/SKPointPropertyInputView.axaml.cs b/src/Artemis.UI/DefaultTypes/PropertyInput/SKPointPropertyInputView.axaml.cs index 5b707d3bd..e3df945dd 100644 --- a/src/Artemis.UI/DefaultTypes/PropertyInput/SKPointPropertyInputView.axaml.cs +++ b/src/Artemis.UI/DefaultTypes/PropertyInput/SKPointPropertyInputView.axaml.cs @@ -1,7 +1,6 @@ using System; using Artemis.UI.Shared.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.DefaultTypes.PropertyInput; diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/SKSizePropertyInputView.axaml.cs b/src/Artemis.UI/DefaultTypes/PropertyInput/SKSizePropertyInputView.axaml.cs index d4eb6fb41..6d55713ed 100644 --- a/src/Artemis.UI/DefaultTypes/PropertyInput/SKSizePropertyInputView.axaml.cs +++ b/src/Artemis.UI/DefaultTypes/PropertyInput/SKSizePropertyInputView.axaml.cs @@ -1,7 +1,6 @@ using System; using Artemis.UI.Shared.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.DefaultTypes.PropertyInput; diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/StringPropertyInputView.axaml.cs b/src/Artemis.UI/DefaultTypes/PropertyInput/StringPropertyInputView.axaml.cs index 9063787d5..b9e7a4bc0 100644 --- a/src/Artemis.UI/DefaultTypes/PropertyInput/StringPropertyInputView.axaml.cs +++ b/src/Artemis.UI/DefaultTypes/PropertyInput/StringPropertyInputView.axaml.cs @@ -1,5 +1,5 @@ using Avalonia.Input; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.DefaultTypes.PropertyInput; diff --git a/src/Artemis.UI/Extensions/CompositeDisposableExtensions.cs b/src/Artemis.UI/Extensions/CompositeDisposableExtensions.cs index 743035d3e..35ed76fad 100644 --- a/src/Artemis.UI/Extensions/CompositeDisposableExtensions.cs +++ b/src/Artemis.UI/Extensions/CompositeDisposableExtensions.cs @@ -1,4 +1,5 @@ using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading; namespace Artemis.UI.Extensions; diff --git a/src/Artemis.UI/MainWindow.axaml.cs b/src/Artemis.UI/MainWindow.axaml.cs index d8114cced..612eca968 100644 --- a/src/Artemis.UI/MainWindow.axaml.cs +++ b/src/Artemis.UI/MainWindow.axaml.cs @@ -7,7 +7,7 @@ using Artemis.UI.Shared; using Avalonia; using Avalonia.Controls; using Avalonia.Input; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI; diff --git a/src/Artemis.UI/Screens/Debugger/DebugView.axaml.cs b/src/Artemis.UI/Screens/Debugger/DebugView.axaml.cs index 01ed1a181..15dc055a0 100644 --- a/src/Artemis.UI/Screens/Debugger/DebugView.axaml.cs +++ b/src/Artemis.UI/Screens/Debugger/DebugView.axaml.cs @@ -1,11 +1,10 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.UI.Shared; using Artemis.UI.Shared.Events; using Avalonia; using Avalonia.Controls; -using Avalonia.Markup.Xaml; using ReactiveUI; namespace Artemis.UI.Screens.Debugger; diff --git a/src/Artemis.UI/Screens/Debugger/DebugViewModel.cs b/src/Artemis.UI/Screens/Debugger/DebugViewModel.cs index 8cc677053..ac4fb4594 100644 --- a/src/Artemis.UI/Screens/Debugger/DebugViewModel.cs +++ b/src/Artemis.UI/Screens/Debugger/DebugViewModel.cs @@ -1,6 +1,7 @@ using System; using System.Collections.ObjectModel; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.UI.Screens.Debugger.DataModel; using Artemis.UI.Screens.Debugger.Logs; using Artemis.UI.Screens.Debugger.Performance; diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/DataModel/DataModelDebugView.axaml.cs b/src/Artemis.UI/Screens/Debugger/Tabs/DataModel/DataModelDebugView.axaml.cs index dd39a5f8d..e5e83453c 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/DataModel/DataModelDebugView.axaml.cs +++ b/src/Artemis.UI/Screens/Debugger/Tabs/DataModel/DataModelDebugView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Debugger.DataModel; diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/DataModel/DataModelDebugViewModel.cs b/src/Artemis.UI/Screens/Debugger/Tabs/DataModel/DataModelDebugViewModel.cs index 88c40497b..9286ed9b1 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/DataModel/DataModelDebugViewModel.cs +++ b/src/Artemis.UI/Screens/Debugger/Tabs/DataModel/DataModelDebugViewModel.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Modules; diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugView.axaml.cs b/src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugView.axaml.cs index 26d8ab003..7ea32c8d7 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugView.axaml.cs +++ b/src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugView.axaml.cs @@ -1,10 +1,6 @@ -using System; using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Threading; -using ReactiveUI; -using Serilog; namespace Artemis.UI.Screens.Debugger.Logs; diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugViewModel.cs b/src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugViewModel.cs index 95a87a167..eddc5abcc 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugViewModel.cs +++ b/src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugViewModel.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.ObjectModel; using Artemis.Core; using Artemis.UI.Shared; using Avalonia.Threading; @@ -7,9 +6,8 @@ using ReactiveUI; using Serilog.Events; using Serilog.Formatting.Display; using System.IO; -using System.Linq; using System.Reactive.Disposables; -using System.Text; +using System.Reactive.Disposables.Fluent; using Avalonia.Controls.Documents; using Avalonia.Media; diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugPluginView.axaml.cs b/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugPluginView.axaml.cs index 27f98c36e..d943b4094 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugPluginView.axaml.cs +++ b/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugPluginView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.Debugger.Performance; diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugProfilerView.axaml.cs b/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugProfilerView.axaml.cs index 56c8ec8de..7ced40ece 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugProfilerView.axaml.cs +++ b/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugProfilerView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.Debugger.Performance; diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugView.axaml.cs b/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugView.axaml.cs index 0c91c2bbb..e0d15dd1e 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugView.axaml.cs +++ b/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Debugger.Performance; diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugViewModel.cs b/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugViewModel.cs index 0b2bd65a9..42296d296 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugViewModel.cs +++ b/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugViewModel.cs @@ -2,6 +2,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Services; diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugView.axaml.cs b/src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugView.axaml.cs index 4826cf124..d258b2ab6 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugView.axaml.cs +++ b/src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Debugger.Render; diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugViewModel.cs b/src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugViewModel.cs index dbf76e823..057c85dc3 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugViewModel.cs +++ b/src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugViewModel.cs @@ -1,5 +1,6 @@ using System.IO; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.Core; using Artemis.Core.Services; using Artemis.UI.Shared; diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Routing/RoutingDebugView.axaml.cs b/src/Artemis.UI/Screens/Debugger/Tabs/Routing/RoutingDebugView.axaml.cs index 05c2474ea..763cc5b87 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/Routing/RoutingDebugView.axaml.cs +++ b/src/Artemis.UI/Screens/Debugger/Tabs/Routing/RoutingDebugView.axaml.cs @@ -1,5 +1,5 @@ using Avalonia.Controls; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Threading; namespace Artemis.UI.Screens.Debugger.Routing; diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Routing/RoutingDebugViewModel.cs b/src/Artemis.UI/Screens/Debugger/Tabs/Routing/RoutingDebugViewModel.cs index 18907523b..e102604e6 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/Routing/RoutingDebugViewModel.cs +++ b/src/Artemis.UI/Screens/Debugger/Tabs/Routing/RoutingDebugViewModel.cs @@ -2,6 +2,7 @@ using System.IO; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Settings/DebugSettingsView.axaml.cs b/src/Artemis.UI/Screens/Debugger/Tabs/Settings/DebugSettingsView.axaml.cs index f0ba0577a..fb17ac268 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/Settings/DebugSettingsView.axaml.cs +++ b/src/Artemis.UI/Screens/Debugger/Tabs/Settings/DebugSettingsView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Debugger.Settings; diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Workshop/WorkshopDebugView.axaml.cs b/src/Artemis.UI/Screens/Debugger/Tabs/Workshop/WorkshopDebugView.axaml.cs index 832b85df8..d2f1fc053 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/Workshop/WorkshopDebugView.axaml.cs +++ b/src/Artemis.UI/Screens/Debugger/Tabs/Workshop/WorkshopDebugView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Debugger.Workshop; diff --git a/src/Artemis.UI/Screens/Device/DeviceDetectInputView.axaml.cs b/src/Artemis.UI/Screens/Device/DeviceDetectInputView.axaml.cs index 5dfd448c8..2932b0590 100644 --- a/src/Artemis.UI/Screens/Device/DeviceDetectInputView.axaml.cs +++ b/src/Artemis.UI/Screens/Device/DeviceDetectInputView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Device; diff --git a/src/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs b/src/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs index 9e70ce509..73f1af7e7 100644 --- a/src/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs +++ b/src/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Services; diff --git a/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml.cs b/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml.cs index 14e491652..80c70a8a5 100644 --- a/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml.cs +++ b/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml.cs @@ -3,7 +3,6 @@ using Artemis.UI.Shared; using Artemis.UI.Shared.Events; using Avalonia; using Avalonia.Input; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.Device; diff --git a/src/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs b/src/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs index 204ff48ac..de720c30e 100644 --- a/src/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs +++ b/src/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.Core; using Artemis.Core.Services; using Artemis.UI.DryIoc.Factories; diff --git a/src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml.cs b/src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml.cs index bc9c25196..d66fb36f8 100644 --- a/src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml.cs +++ b/src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Device; diff --git a/src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabView.axaml.cs b/src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabView.axaml.cs index 6a0d32d75..ae0f28c6a 100644 --- a/src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabView.axaml.cs +++ b/src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Device.General; public partial class DeviceGeneralTabView : ReactiveUserControl diff --git a/src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabViewModel.cs b/src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabViewModel.cs index 19bd02b61..4c018beee 100644 --- a/src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabViewModel.cs +++ b/src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabViewModel.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.Services; diff --git a/src/Artemis.UI/Screens/Device/Tabs/InputMappings/InputMappingsTabView.axaml.cs b/src/Artemis.UI/Screens/Device/Tabs/InputMappings/InputMappingsTabView.axaml.cs index 36dea6bb0..542f17a97 100644 --- a/src/Artemis.UI/Screens/Device/Tabs/InputMappings/InputMappingsTabView.axaml.cs +++ b/src/Artemis.UI/Screens/Device/Tabs/InputMappings/InputMappingsTabView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Device.InputMappings; diff --git a/src/Artemis.UI/Screens/Device/Tabs/InputMappings/InputMappingsTabViewModel.cs b/src/Artemis.UI/Screens/Device/Tabs/InputMappings/InputMappingsTabViewModel.cs index 9a116cd92..506ac3463 100644 --- a/src/Artemis.UI/Screens/Device/Tabs/InputMappings/InputMappingsTabViewModel.cs +++ b/src/Artemis.UI/Screens/Device/Tabs/InputMappings/InputMappingsTabViewModel.cs @@ -2,6 +2,7 @@ using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.Core; using Artemis.Core.Services; using Artemis.UI.Exceptions; diff --git a/src/Artemis.UI/Screens/Device/Tabs/Layout/DeviceLayoutTabView.axaml.cs b/src/Artemis.UI/Screens/Device/Tabs/Layout/DeviceLayoutTabView.axaml.cs index 3663d773b..ee8af09e5 100644 --- a/src/Artemis.UI/Screens/Device/Tabs/Layout/DeviceLayoutTabView.axaml.cs +++ b/src/Artemis.UI/Screens/Device/Tabs/Layout/DeviceLayoutTabView.axaml.cs @@ -1,6 +1,6 @@ using Avalonia.Controls; using Avalonia.Interactivity; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Device.Layout; diff --git a/src/Artemis.UI/Screens/Device/Tabs/Layout/DeviceLogicalLayoutDialogView.axaml.cs b/src/Artemis.UI/Screens/Device/Tabs/Layout/DeviceLogicalLayoutDialogView.axaml.cs index 977a59c9e..0cd315cf9 100644 --- a/src/Artemis.UI/Screens/Device/Tabs/Layout/DeviceLogicalLayoutDialogView.axaml.cs +++ b/src/Artemis.UI/Screens/Device/Tabs/Layout/DeviceLogicalLayoutDialogView.axaml.cs @@ -1,7 +1,7 @@ using System; using System.Globalization; using System.Threading.Tasks; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Threading; namespace Artemis.UI.Screens.Device.Layout; diff --git a/src/Artemis.UI/Screens/Device/Tabs/Layout/DevicePhysicalLayoutDialogView.axaml.cs b/src/Artemis.UI/Screens/Device/Tabs/Layout/DevicePhysicalLayoutDialogView.axaml.cs index 3fd6ae71c..89c69905c 100644 --- a/src/Artemis.UI/Screens/Device/Tabs/Layout/DevicePhysicalLayoutDialogView.axaml.cs +++ b/src/Artemis.UI/Screens/Device/Tabs/Layout/DevicePhysicalLayoutDialogView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Device.Layout; diff --git a/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml.cs b/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml.cs index 4ec2fb9e3..3cda5fe6e 100644 --- a/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml.cs +++ b/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml.cs @@ -1,7 +1,6 @@ -using System.Threading.Tasks; using Avalonia.Controls; using Avalonia.Interactivity; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Device.Layout.LayoutProviders; diff --git a/src/Artemis.UI/Screens/Device/Tabs/Leds/DeviceLedsTabView.axaml.cs b/src/Artemis.UI/Screens/Device/Tabs/Leds/DeviceLedsTabView.axaml.cs index c144c7558..2b2a464be 100644 --- a/src/Artemis.UI/Screens/Device/Tabs/Leds/DeviceLedsTabView.axaml.cs +++ b/src/Artemis.UI/Screens/Device/Tabs/Leds/DeviceLedsTabView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Device.Leds; diff --git a/src/Artemis.UI/Screens/Device/Tabs/Leds/DeviceLedsTabViewModel.cs b/src/Artemis.UI/Screens/Device/Tabs/Leds/DeviceLedsTabViewModel.cs index e05a22b08..353ce8219 100644 --- a/src/Artemis.UI/Screens/Device/Tabs/Leds/DeviceLedsTabViewModel.cs +++ b/src/Artemis.UI/Screens/Device/Tabs/Leds/DeviceLedsTabViewModel.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.Core; using Artemis.UI.Shared; using DynamicData.Binding; diff --git a/src/Artemis.UI/Screens/Home/HomeView.axaml.cs b/src/Artemis.UI/Screens/Home/HomeView.axaml.cs index 881d46848..49f8897fe 100644 --- a/src/Artemis.UI/Screens/Home/HomeView.axaml.cs +++ b/src/Artemis.UI/Screens/Home/HomeView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Home; diff --git a/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesInstallDialogView.axaml.cs b/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesInstallDialogView.axaml.cs index 5186027b4..9d4b68645 100644 --- a/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesInstallDialogView.axaml.cs +++ b/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesInstallDialogView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Plugins; diff --git a/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesInstallDialogViewModel.cs b/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesInstallDialogViewModel.cs index 30db350ca..6bc7f3849 100644 --- a/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesInstallDialogViewModel.cs +++ b/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesInstallDialogViewModel.cs @@ -1,9 +1,9 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading; using System.Threading.Tasks; using Artemis.Core; @@ -12,7 +12,6 @@ using Artemis.UI.Screens.Plugins.Prerequisites; using Artemis.UI.Shared; using Artemis.UI.Shared.Services; using Avalonia.Threading; -using FluentAvalonia.Core; using FluentAvalonia.UI.Controls; using PropertyChanged.SourceGenerator; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesUninstallDialogView.axaml.cs b/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesUninstallDialogView.axaml.cs index 6ea72f1da..98d2e6841 100644 --- a/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesUninstallDialogView.axaml.cs +++ b/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesUninstallDialogView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Plugins; diff --git a/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesUninstallDialogViewModel.cs b/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesUninstallDialogViewModel.cs index fc6a88aff..e84d58537 100644 --- a/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesUninstallDialogViewModel.cs +++ b/src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesUninstallDialogViewModel.cs @@ -4,6 +4,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/Plugins/Features/PluginFeatureView.axaml.cs b/src/Artemis.UI/Screens/Plugins/Features/PluginFeatureView.axaml.cs index 1beddfbbf..8c54ea405 100644 --- a/src/Artemis.UI/Screens/Plugins/Features/PluginFeatureView.axaml.cs +++ b/src/Artemis.UI/Screens/Plugins/Features/PluginFeatureView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Plugins.Features; diff --git a/src/Artemis.UI/Screens/Plugins/Features/PluginFeatureViewModel.cs b/src/Artemis.UI/Screens/Plugins/Features/PluginFeatureViewModel.cs index 86bcd40db..7b6572811 100644 --- a/src/Artemis.UI/Screens/Plugins/Features/PluginFeatureViewModel.cs +++ b/src/Artemis.UI/Screens/Plugins/Features/PluginFeatureViewModel.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.DeviceProviders; diff --git a/src/Artemis.UI/Screens/Plugins/PluginPlatformView.axaml.cs b/src/Artemis.UI/Screens/Plugins/PluginPlatformView.axaml.cs index 2d858d732..1ef3609fd 100644 --- a/src/Artemis.UI/Screens/Plugins/PluginPlatformView.axaml.cs +++ b/src/Artemis.UI/Screens/Plugins/PluginPlatformView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.Plugins; diff --git a/src/Artemis.UI/Screens/Plugins/PluginSettingsView.axaml.cs b/src/Artemis.UI/Screens/Plugins/PluginSettingsView.axaml.cs index 52179210f..1fa4adda3 100644 --- a/src/Artemis.UI/Screens/Plugins/PluginSettingsView.axaml.cs +++ b/src/Artemis.UI/Screens/Plugins/PluginSettingsView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Plugins; diff --git a/src/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml.cs b/src/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml.cs index 9c027031b..eea9eeecd 100644 --- a/src/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml.cs +++ b/src/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml.cs @@ -1,9 +1,8 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.UI.Shared; using Avalonia; -using Avalonia.Markup.Xaml; using ReactiveUI; namespace Artemis.UI.Screens.Plugins; diff --git a/src/Artemis.UI/Screens/Plugins/PluginView.axaml.cs b/src/Artemis.UI/Screens/Plugins/PluginView.axaml.cs index 5647db9df..410e79da3 100644 --- a/src/Artemis.UI/Screens/Plugins/PluginView.axaml.cs +++ b/src/Artemis.UI/Screens/Plugins/PluginView.axaml.cs @@ -1,7 +1,6 @@ using System; using Avalonia.Interactivity; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Threading; namespace Artemis.UI.Screens.Plugins; diff --git a/src/Artemis.UI/Screens/Plugins/PluginViewModel.cs b/src/Artemis.UI/Screens/Plugins/PluginViewModel.cs index 82d1f4b86..ccb378a06 100644 --- a/src/Artemis.UI/Screens/Plugins/PluginViewModel.cs +++ b/src/Artemis.UI/Screens/Plugins/PluginViewModel.cs @@ -4,10 +4,10 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading.Tasks; using Artemis.Core; using Artemis.UI.Exceptions; -using Artemis.UI.Services; using Artemis.UI.Services.Interfaces; using Artemis.UI.Shared; using Artemis.UI.Shared.Services; diff --git a/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteView.axaml.cs b/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteView.axaml.cs index 043fbce7b..27ae64ac0 100644 --- a/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteView.axaml.cs +++ b/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Plugins.Prerequisites; diff --git a/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteViewModel.cs b/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteViewModel.cs index 10b3e4d8e..a7d1ae67d 100644 --- a/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteViewModel.cs +++ b/src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteViewModel.cs @@ -2,6 +2,7 @@ using System.ComponentModel; using System.Linq; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs index 20c9a7452..c28f4b02d 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs index 2240a63ea..f57f4f101 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs index fbd8eea25..2c874324e 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs @@ -1,5 +1,5 @@ using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml.cs index 068dfeca2..313b59c90 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs index cbe8b1ab1..44e5e1825 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs index 086c67091..cc92523b8 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs @@ -1,5 +1,5 @@ using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml.cs index 95484f28d..1d3d6cc80 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.DisplayCondition; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptViewModel.cs index edc771a93..689df9336 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptViewModel.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.DryIoc.Factories; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/MenuBar/MenuBarView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/MenuBar/MenuBarView.axaml.cs index 2049889ad..2186e25ed 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/MenuBar/MenuBarView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/MenuBar/MenuBarView.axaml.cs @@ -1,7 +1,6 @@ using Avalonia.Controls; using Avalonia.Interactivity; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.VisualTree; namespace Artemis.UI.Screens.ProfileEditor.MenuBar; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/MenuBar/MenuBarViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/MenuBar/MenuBarViewModel.cs index fedca92d3..8a9edca11 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/MenuBar/MenuBarViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/MenuBar/MenuBarViewModel.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Playback/PlaybackView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Playback/PlaybackView.axaml.cs index 06a684191..6f027965a 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Playback/PlaybackView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Playback/PlaybackView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.Playback; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Playback/PlaybackViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Playback/PlaybackViewModel.cs index 71d7891a8..f5c48d1db 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Playback/PlaybackViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Playback/PlaybackViewModel.cs @@ -1,6 +1,7 @@ using System; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Timers; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml.cs index bdcc4c91f..193572882 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml.cs @@ -1,9 +1,6 @@ using System.Threading.Tasks; using Artemis.UI.Shared.Extensions; -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Threading; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml.cs index 68e0563e8..d90d0e444 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml.cs index bc64fa3e6..f7de159a3 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml.cs index df0eb98f7..1bbba200a 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml.cs index 1a82d8d6e..6e15c102c 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml.cs index c7703fe65..7e05c99da 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml.cs @@ -1,6 +1,5 @@ using Artemis.UI.Shared; using Avalonia; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogViewModel.cs index edd5b07ec..0fa09e049 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogViewModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.ObjectModel; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Services; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs index 58e21af71..9b504d30a 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.ProfileTree; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/FolderTreeItemViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/FolderTreeItemViewModel.cs index c5cf0fd31..39cdcb433 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/FolderTreeItemViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/FolderTreeItemViewModel.cs @@ -1,9 +1,7 @@ -using System; -using System.Linq; +using System.Linq; using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.Services; -using Artemis.Storage.Entities.Profile; using Artemis.UI.DryIoc.Factories; using Artemis.UI.Extensions; using Artemis.UI.Models; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs index 43b4d5f28..201c0933d 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.ProfileTree; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs index bda9e9fd9..458aa7a33 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs @@ -7,7 +7,7 @@ using Avalonia.Layout; using Avalonia.LogicalTree; using Avalonia.Media; using Avalonia.Media.Imaging; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.VisualTree; namespace Artemis.UI.Screens.ProfileEditor.ProfileTree; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeViewModel.cs index 16bf19759..65b6d4b27 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeViewModel.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs index c5adf0948..0120f0ea7 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs @@ -4,8 +4,8 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; -using System.Threading; using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.Services; @@ -18,8 +18,7 @@ using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services.Builders; using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor.Commands; -using Avalonia; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using PropertyChanged.SourceGenerator; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml.cs index f0d5a3e71..8a943f108 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.Properties.DataBinding; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/DataBinding/DataBindingViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/DataBinding/DataBindingViewModel.cs index 5ae472de2..76d3210c3 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/DataBinding/DataBindingViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/DataBinding/DataBindingViewModel.cs @@ -1,5 +1,5 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading.Tasks; using System.Timers; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml.cs index 89a8aab4c..d4a2d25f6 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml.cs @@ -1,8 +1,7 @@ using Artemis.Core.LayerEffects; using Avalonia; using Avalonia.Input; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.Properties.Dialogs; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml.cs index aa499ec9d..6fb57d060 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.Properties.Dialogs; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertiesView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertiesView.axaml.cs index beedfbbea..add7b99c6 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertiesView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertiesView.axaml.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using System.Linq; using Avalonia; using Avalonia.Input; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.VisualTree; namespace Artemis.UI.Screens.ProfileEditor.Properties; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertiesViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertiesViewModel.cs index de049688f..de471677b 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertiesViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertiesViewModel.cs @@ -4,6 +4,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertyGroupViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertyGroupViewModel.cs index 3503ba360..7cce8013d 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertyGroupViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertyGroupViewModel.cs @@ -10,7 +10,6 @@ using Artemis.UI.DryIoc.Factories; using Artemis.UI.Screens.ProfileEditor.Properties.Timeline; using Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes; using Artemis.UI.Screens.ProfileEditor.Properties.Tree; -using Artemis.UI.Shared; using Artemis.UI.Shared.Services.PropertyInput; using DynamicData; using DynamicData.Binding; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml.cs index 5aa75d59c..55791f0e9 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs index cebade11d..75353b20a 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs @@ -1,8 +1,7 @@ using System; using Avalonia.Input; using Avalonia.LogicalTree; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs index 3c618d0b8..cc1667470 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; @@ -13,7 +13,6 @@ using Artemis.UI.Shared; using Artemis.UI.Shared.Extensions; using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor.Commands; -using Avalonia; using Avalonia.Input; using DynamicData; using DynamicData.Binding; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs index b93038748..65e9e81b8 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs @@ -1,6 +1,5 @@ using Avalonia.Input; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs index 1d556bb59..041f17929 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs @@ -1,5 +1,5 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.Shared.Services; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs index 4923e2def..e46190856 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs @@ -1,6 +1,5 @@ using Avalonia.Input; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs index a122bbb56..e9e73462d 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs @@ -1,5 +1,5 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.Shared.Services; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs index 231a80b51..680c21d52 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs @@ -1,6 +1,5 @@ using Avalonia.Input; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs index 38acf3c31..e4f3f0e6c 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs @@ -1,5 +1,5 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.Shared.Services; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs index 04397ef25..5856f56b8 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs index 327a9ef5b..cddb95b63 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs index b3876c952..02ad75169 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.ObjectModel; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.UI.Shared; using Artemis.UI.Shared.Services.ProfileEditor; using DynamicData; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs index 8bb5494d0..45593163c 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs index 4ae156667..5557caf64 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs index dce407954..294d81dab 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs @@ -5,8 +5,7 @@ using Artemis.UI.Shared.Events; using Artemis.UI.Shared.Extensions; using Avalonia; using Avalonia.Input; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.VisualTree; namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs index a4c4952ba..c9be82c7e 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; @@ -14,7 +14,6 @@ using Artemis.UI.Services.ProfileEditor.Commands; using Artemis.UI.Shared; using Artemis.UI.Shared.Extensions; using Artemis.UI.Shared.Services.ProfileEditor; -using Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs index 9f99d70b9..360d60c00 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs @@ -1,7 +1,6 @@ using System.Threading.Tasks; using Artemis.UI.Shared.Extensions; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Threading; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs index 9f25e9c19..603f342bf 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs @@ -1,8 +1,7 @@ using Artemis.Core.LayerBrushes; using Avalonia; using Avalonia.Input; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs index eb5e233a1..ae159c277 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs @@ -1,6 +1,5 @@ using Avalonia.Input; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs index 9a5409908..98b6d13e5 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs @@ -2,6 +2,7 @@ using System.Collections.ObjectModel; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reflection; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs index 04a3a4d99..cf04cb096 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs @@ -1,11 +1,10 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Avalonia.Controls; using Avalonia.Interactivity; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs index 8c7e214a5..476a5bbb4 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs @@ -1,6 +1,6 @@ using System; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.Extensions; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/StatusBar/StatusBarView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/StatusBar/StatusBarView.axaml.cs index 088f7b1bc..b94175fe3 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/StatusBar/StatusBarView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/StatusBar/StatusBarView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.StatusBar; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/StatusBar/StatusBarViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/StatusBar/StatusBarViewModel.cs index 389935810..10b9413c8 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/StatusBar/StatusBarViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/StatusBar/StatusBarViewModel.cs @@ -1,5 +1,5 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.Shared; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml.cs index c7399853d..d200e5bff 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml.cs @@ -1,7 +1,6 @@ using Artemis.UI.Shared.Events; using Avalonia.Input; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Skia; namespace Artemis.UI.Screens.ProfileEditor.VisualEditor.Tools; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolViewModel.cs index 484bca7f4..1831f2010 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolViewModel.cs @@ -1,13 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Services; using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor.Commands; -using Avalonia.Input; using Material.Icons; using ReactiveUI; using SkiaSharp; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml.cs index a0c64e88a..46cbcb0c1 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml.cs @@ -1,6 +1,5 @@ using Artemis.UI.Shared.Events; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Skia; namespace Artemis.UI.Screens.ProfileEditor.VisualEditor.Tools; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolViewModel.cs index 806b9279a..36293f5db 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolViewModel.cs @@ -1,13 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Services; using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor.Commands; -using Avalonia.Input; using Material.Icons; using ReactiveUI; using SkiaSharp; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs index c4af9f2bf..78a247a09 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.Core; using Artemis.UI.Shared.Extensions; using Avalonia; @@ -10,10 +10,9 @@ using Avalonia.Controls.PanAndZoom; using Avalonia.Controls.Shapes; using Avalonia.Input; using Avalonia.LogicalTree; -using Avalonia.Markup.Xaml; using Avalonia.Media; using Avalonia.Media.Transformation; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Skia; using Avalonia.VisualTree; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/TransformToolViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/TransformToolViewModel.cs index 98ed7fe40..c2bf29244 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/TransformToolViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/TransformToolViewModel.cs @@ -1,6 +1,6 @@ using System; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Services; @@ -9,7 +9,6 @@ using Artemis.UI.Shared.Extensions; using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor.Commands; using Avalonia; -using Avalonia.Input; using Material.Icons; using PropertyChanged.SourceGenerator; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs index 5c613747c..016859e94 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs @@ -1,12 +1,13 @@ using System; using System.Linq; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Avalonia; using Avalonia.Controls.PanAndZoom; using Avalonia.Input; using Avalonia.Media; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Threading; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs index a5246024b..a557fab30 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Services; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs index 6ed5671fa..43cb30d58 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs @@ -1,12 +1,11 @@ using System; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Avalonia; using Avalonia.Controls.PanAndZoom; using Avalonia.LogicalTree; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerViewModel.cs index 6a4a4dca0..07264e28a 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerViewModel.cs @@ -1,5 +1,5 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.Shared; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs index 71567cf66..9c23a0f1b 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs @@ -3,8 +3,7 @@ using System.Linq; using Avalonia; using Avalonia.Controls.PanAndZoom; using Avalonia.LogicalTree; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerViewModel.cs index c570fbdff..0523abf01 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerViewModel.cs @@ -1,5 +1,5 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.Shared; diff --git a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorTitleBarView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorTitleBarView.axaml.cs index 1cf5dae03..e0630a23e 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorTitleBarView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorTitleBarView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.ProfileEditor; diff --git a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorTitleBarViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorTitleBarViewModel.cs index 21fb272b1..2bd55511f 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorTitleBarViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorTitleBarViewModel.cs @@ -1,6 +1,5 @@ using Artemis.UI.Screens.ProfileEditor.MenuBar; using Artemis.UI.Screens.Root; -using Artemis.UI.Services.Interfaces; using Artemis.UI.Shared; namespace Artemis.UI.Screens.ProfileEditor; diff --git a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml.cs index 361306f00..eef82a619 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor; diff --git a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs index 6abf8acd3..ddf5fc3e0 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs @@ -4,6 +4,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/ProfileEditor/ProfileView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileView.axaml.cs index 032140095..63c76ee24 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/ProfileView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileView.axaml.cs @@ -1,9 +1,8 @@ using System; -using System.Reactive.Disposables; -using Artemis.UI.Shared.Routing; -using Avalonia.ReactiveUI; -using Avalonia.Threading; +using System.Reactive.Disposables.Fluent; +using ReactiveUI.Avalonia; using ReactiveUI; + namespace Artemis.UI.Screens.ProfileEditor; public partial class ProfileView : ReactiveUserControl diff --git a/src/Artemis.UI/Screens/ProfileEditor/WorkshopProfileView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/WorkshopProfileView.axaml.cs index 926bf205e..7cd4c27ee 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/WorkshopProfileView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/WorkshopProfileView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.ProfileEditor; diff --git a/src/Artemis.UI/Screens/Root/BlankView.axaml.cs b/src/Artemis.UI/Screens/Root/BlankView.axaml.cs index e145f1b7f..30b7e0635 100644 --- a/src/Artemis.UI/Screens/Root/BlankView.axaml.cs +++ b/src/Artemis.UI/Screens/Root/BlankView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Root; diff --git a/src/Artemis.UI/Screens/Root/DefaultTitleBarView.axaml.cs b/src/Artemis.UI/Screens/Root/DefaultTitleBarView.axaml.cs index f4bfd4e04..c29a12ce7 100644 --- a/src/Artemis.UI/Screens/Root/DefaultTitleBarView.axaml.cs +++ b/src/Artemis.UI/Screens/Root/DefaultTitleBarView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.Root; diff --git a/src/Artemis.UI/Screens/Root/RootView.axaml.cs b/src/Artemis.UI/Screens/Root/RootView.axaml.cs index 90cd6afb8..396c86378 100644 --- a/src/Artemis.UI/Screens/Root/RootView.axaml.cs +++ b/src/Artemis.UI/Screens/Root/RootView.axaml.cs @@ -1,8 +1,7 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.UI.Shared.Routing; -using Avalonia.ReactiveUI; -using Avalonia.Threading; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Root; diff --git a/src/Artemis.UI/Screens/Root/RootViewModel.cs b/src/Artemis.UI/Screens/Root/RootViewModel.cs index b3433b5da..55c2051a2 100644 --- a/src/Artemis.UI/Screens/Root/RootViewModel.cs +++ b/src/Artemis.UI/Screens/Root/RootViewModel.cs @@ -1,6 +1,5 @@ using System; using System.Reactive; -using System.Reactive.Disposables; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/Root/SplashView.axaml.cs b/src/Artemis.UI/Screens/Root/SplashView.axaml.cs index 082586d98..3cc18a653 100644 --- a/src/Artemis.UI/Screens/Root/SplashView.axaml.cs +++ b/src/Artemis.UI/Screens/Root/SplashView.axaml.cs @@ -1,9 +1,8 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Avalonia; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Threading; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressView.axaml.cs b/src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressView.axaml.cs index ed3f4a7d0..19687f9b4 100644 --- a/src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressView.axaml.cs +++ b/src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressView.axaml.cs @@ -1,6 +1,5 @@ using Artemis.UI.Shared.Extensions; -using Avalonia.ReactiveUI; -using Avalonia.Threading; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Settings.Account; diff --git a/src/Artemis.UI/Screens/Settings/Account/ChangePasswordView.axaml.cs b/src/Artemis.UI/Screens/Settings/Account/ChangePasswordView.axaml.cs index 2b13f8a7a..a4709578f 100644 --- a/src/Artemis.UI/Screens/Settings/Account/ChangePasswordView.axaml.cs +++ b/src/Artemis.UI/Screens/Settings/Account/ChangePasswordView.axaml.cs @@ -1,8 +1,5 @@ using Artemis.UI.Shared.Extensions; -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Settings.Account; diff --git a/src/Artemis.UI/Screens/Settings/Account/CreatePersonalAccessTokenView.axaml.cs b/src/Artemis.UI/Screens/Settings/Account/CreatePersonalAccessTokenView.axaml.cs index 368c39351..e3d138896 100644 --- a/src/Artemis.UI/Screens/Settings/Account/CreatePersonalAccessTokenView.axaml.cs +++ b/src/Artemis.UI/Screens/Settings/Account/CreatePersonalAccessTokenView.axaml.cs @@ -1,8 +1,5 @@ using Artemis.UI.Shared.Extensions; -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Settings.Account; diff --git a/src/Artemis.UI/Screens/Settings/Account/PersonalAccessTokenView.axaml.cs b/src/Artemis.UI/Screens/Settings/Account/PersonalAccessTokenView.axaml.cs index d9110ec53..d0efe94f4 100644 --- a/src/Artemis.UI/Screens/Settings/Account/PersonalAccessTokenView.axaml.cs +++ b/src/Artemis.UI/Screens/Settings/Account/PersonalAccessTokenView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Settings.Account; diff --git a/src/Artemis.UI/Screens/Settings/Account/RemoveAccountView.axaml.cs b/src/Artemis.UI/Screens/Settings/Account/RemoveAccountView.axaml.cs index 5c4491cab..e16754951 100644 --- a/src/Artemis.UI/Screens/Settings/Account/RemoveAccountView.axaml.cs +++ b/src/Artemis.UI/Screens/Settings/Account/RemoveAccountView.axaml.cs @@ -1,6 +1,5 @@ using Artemis.UI.Shared.Extensions; -using Avalonia.ReactiveUI; -using Avalonia.Threading; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Settings.Account; diff --git a/src/Artemis.UI/Screens/Settings/SettingsView.axaml.cs b/src/Artemis.UI/Screens/Settings/SettingsView.axaml.cs index cb03c7a44..5399a1840 100644 --- a/src/Artemis.UI/Screens/Settings/SettingsView.axaml.cs +++ b/src/Artemis.UI/Screens/Settings/SettingsView.axaml.cs @@ -1,8 +1,7 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.UI.Shared; -using Avalonia.ReactiveUI; -using Avalonia.Threading; +using ReactiveUI.Avalonia; using FluentAvalonia.UI.Controls; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs b/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs index 4e288c11c..3d64f199e 100644 --- a/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs @@ -1,8 +1,7 @@ using System; using System.Collections.ObjectModel; using System.Linq; -using System.Reactive.Disposables; -using System.Reactive.Linq; +using System.Reactive.Disposables.Fluent; using System.Threading; using System.Threading.Tasks; using Artemis.UI.Routing; diff --git a/src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml.cs b/src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml.cs index 0450a4417..8c0a1f848 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Settings; diff --git a/src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml.cs b/src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml.cs index 040547f9f..f431cbf4a 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Settings; diff --git a/src/Artemis.UI/Screens/Settings/Tabs/AccountTabViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/AccountTabViewModel.cs index afab57079..037956c95 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/AccountTabViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/AccountTabViewModel.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.ComponentModel; using System.IO; using System.Linq; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/src/Artemis.UI/Screens/Settings/Tabs/DevicesTabView.axaml.cs b/src/Artemis.UI/Screens/Settings/Tabs/DevicesTabView.axaml.cs index cc8949831..977d62174 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/DevicesTabView.axaml.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/DevicesTabView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Settings; diff --git a/src/Artemis.UI/Screens/Settings/Tabs/DevicesTabViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/DevicesTabViewModel.cs index 5e9125aac..4960097ed 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/DevicesTabViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/DevicesTabViewModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.ObjectModel; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml.cs b/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml.cs index d94e90eae..4b51975cc 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Settings; diff --git a/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs index 2605df33d..cb4b0936d 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs @@ -4,6 +4,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml.cs b/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml.cs index 7a5c54a6a..f299e71ec 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia.Interactivity; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Settings; diff --git a/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabViewModel.cs index ca289eed7..13d3b4af7 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabViewModel.cs @@ -3,6 +3,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; @@ -12,7 +13,7 @@ using Artemis.UI.Screens.Plugins; using Artemis.UI.Shared.Routing; using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services.Builders; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using DynamicData; using DynamicData.Binding; using PropertyChanged.SourceGenerator; diff --git a/src/Artemis.UI/Screens/Settings/Tabs/ReleasesTabView.axaml.cs b/src/Artemis.UI/Screens/Settings/Tabs/ReleasesTabView.axaml.cs index aadd8b4a6..efb50afeb 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/ReleasesTabView.axaml.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/ReleasesTabView.axaml.cs @@ -1,8 +1,7 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.UI.Shared; -using Avalonia.ReactiveUI; -using Avalonia.Threading; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Settings; diff --git a/src/Artemis.UI/Screens/Settings/Tabs/ReleasesTabViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/ReleasesTabViewModel.cs index 10e9d5f59..fac6c08b6 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/ReleasesTabViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/ReleasesTabViewModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.ObjectModel; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Reactive.Threading.Tasks; using System.Threading; @@ -13,7 +13,7 @@ using Artemis.UI.Shared.Routing; using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services.Builders; using Artemis.WebClient.Updating; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using DynamicData; using DynamicData.Binding; using PropertyChanged.SourceGenerator; diff --git a/src/Artemis.UI/Screens/Settings/Updating/ReleaseDetailsView.axaml.cs b/src/Artemis.UI/Screens/Settings/Updating/ReleaseDetailsView.axaml.cs index 56174c663..f3383fb6d 100644 --- a/src/Artemis.UI/Screens/Settings/Updating/ReleaseDetailsView.axaml.cs +++ b/src/Artemis.UI/Screens/Settings/Updating/ReleaseDetailsView.axaml.cs @@ -1,6 +1,5 @@ using Avalonia.Input; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Settings.Updating; diff --git a/src/Artemis.UI/Screens/Settings/Updating/ReleaseDetailsViewModel.cs b/src/Artemis.UI/Screens/Settings/Updating/ReleaseDetailsViewModel.cs index 23d3b9fbb..a8049f145 100644 --- a/src/Artemis.UI/Screens/Settings/Updating/ReleaseDetailsViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Updating/ReleaseDetailsViewModel.cs @@ -2,12 +2,12 @@ using System; using System.Linq; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading; using System.Threading.Tasks; using Artemis.Core; using Artemis.UI.Services.Updating; -using Artemis.UI.Shared; using Artemis.UI.Shared.Routing; using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services.Builders; diff --git a/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditView.axaml.cs b/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditView.axaml.cs index ac9c1d71a..228366627 100644 --- a/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditView.axaml.cs +++ b/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditView.axaml.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Artemis.UI.Shared.Extensions; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Threading; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/Sidebar/Dialogs/ModuleActivationRequirementView.axaml.cs b/src/Artemis.UI/Screens/Sidebar/Dialogs/ModuleActivationRequirementView.axaml.cs index 17a674bb7..7c67d891f 100644 --- a/src/Artemis.UI/Screens/Sidebar/Dialogs/ModuleActivationRequirementView.axaml.cs +++ b/src/Artemis.UI/Screens/Sidebar/Dialogs/ModuleActivationRequirementView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Sidebar; diff --git a/src/Artemis.UI/Screens/Sidebar/Dialogs/ModuleActivationRequirementViewModel.cs b/src/Artemis.UI/Screens/Sidebar/Dialogs/ModuleActivationRequirementViewModel.cs index afac99040..6edc47446 100644 --- a/src/Artemis.UI/Screens/Sidebar/Dialogs/ModuleActivationRequirementViewModel.cs +++ b/src/Artemis.UI/Screens/Sidebar/Dialogs/ModuleActivationRequirementViewModel.cs @@ -1,5 +1,5 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Timers; using Artemis.Core.Modules; using Artemis.UI.Shared; diff --git a/src/Artemis.UI/Screens/Sidebar/Dialogs/ModuleActivationRequirementsView.axaml.cs b/src/Artemis.UI/Screens/Sidebar/Dialogs/ModuleActivationRequirementsView.axaml.cs index 35dfc0b91..bd9987e0e 100644 --- a/src/Artemis.UI/Screens/Sidebar/Dialogs/ModuleActivationRequirementsView.axaml.cs +++ b/src/Artemis.UI/Screens/Sidebar/Dialogs/ModuleActivationRequirementsView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.Sidebar; diff --git a/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditView.axaml.cs b/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditView.axaml.cs index 8c3b4d395..30a6db246 100644 --- a/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditView.axaml.cs +++ b/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditView.axaml.cs @@ -1,8 +1,7 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.UI.Shared; using Avalonia; -using Avalonia.Markup.Xaml; using ReactiveUI; namespace Artemis.UI.Screens.Sidebar; diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarCategoryView.axaml.cs b/src/Artemis.UI/Screens/Sidebar/SidebarCategoryView.axaml.cs index 411340c66..3687f77f6 100644 --- a/src/Artemis.UI/Screens/Sidebar/SidebarCategoryView.axaml.cs +++ b/src/Artemis.UI/Screens/Sidebar/SidebarCategoryView.axaml.cs @@ -6,10 +6,9 @@ using Avalonia.Input; using Avalonia.Interactivity; using Avalonia.Layout; using Avalonia.LogicalTree; -using Avalonia.Markup.Xaml; using Avalonia.Media; using Avalonia.Media.Imaging; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.VisualTree; namespace Artemis.UI.Screens.Sidebar; diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarCategoryViewModel.cs b/src/Artemis.UI/Screens/Sidebar/SidebarCategoryViewModel.cs index 96805d293..eec34a018 100644 --- a/src/Artemis.UI/Screens/Sidebar/SidebarCategoryViewModel.cs +++ b/src/Artemis.UI/Screens/Sidebar/SidebarCategoryViewModel.cs @@ -4,7 +4,7 @@ using System.Collections.ObjectModel; using System.IO; using System.Linq; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarProfileConfigurationView.axaml.cs b/src/Artemis.UI/Screens/Sidebar/SidebarProfileConfigurationView.axaml.cs index 099fab255..4eece8789 100644 --- a/src/Artemis.UI/Screens/Sidebar/SidebarProfileConfigurationView.axaml.cs +++ b/src/Artemis.UI/Screens/Sidebar/SidebarProfileConfigurationView.axaml.cs @@ -1,6 +1,5 @@ using Avalonia.Input; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Sidebar; diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarProfileConfigurationViewModel.cs b/src/Artemis.UI/Screens/Sidebar/SidebarProfileConfigurationViewModel.cs index 5596c3e9f..90be98327 100644 --- a/src/Artemis.UI/Screens/Sidebar/SidebarProfileConfigurationViewModel.cs +++ b/src/Artemis.UI/Screens/Sidebar/SidebarProfileConfigurationViewModel.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarScreenView.axaml.cs b/src/Artemis.UI/Screens/Sidebar/SidebarScreenView.axaml.cs index 67146502a..df315f202 100644 --- a/src/Artemis.UI/Screens/Sidebar/SidebarScreenView.axaml.cs +++ b/src/Artemis.UI/Screens/Sidebar/SidebarScreenView.axaml.cs @@ -1,5 +1,5 @@ using Avalonia.Input; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Sidebar; diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml.cs b/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml.cs index ab6b2ea40..ee76711e0 100644 --- a/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml.cs +++ b/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml.cs @@ -1,8 +1,6 @@ -using System; -using Avalonia; +using Avalonia; using Avalonia.Input; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Sidebar; diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs b/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs index d2f8e9a23..f0f13560c 100644 --- a/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs +++ b/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.ObjectModel; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; @@ -11,7 +11,7 @@ using Artemis.UI.Shared; using Artemis.UI.Shared.Routing; using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services.Builders; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Threading; using DynamicData; using DynamicData.Binding; diff --git a/src/Artemis.UI/Screens/StartupWizard/StartupWizardView.axaml.cs b/src/Artemis.UI/Screens/StartupWizard/StartupWizardView.axaml.cs index 21a17eff0..fc600a346 100644 --- a/src/Artemis.UI/Screens/StartupWizard/StartupWizardView.axaml.cs +++ b/src/Artemis.UI/Screens/StartupWizard/StartupWizardView.axaml.cs @@ -1,10 +1,7 @@ using System; -using System.Reactive.Disposables; -using Artemis.UI.Screens.StartupWizard.Steps; +using System.Reactive.Disposables.Fluent; using Artemis.UI.Shared; using Avalonia; -using Avalonia.Markup.Xaml; -using FluentAvalonia.UI.Navigation; using ReactiveUI; namespace Artemis.UI.Screens.StartupWizard; diff --git a/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntriesStepView.axaml.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntriesStepView.axaml.cs index 1050a6b30..1d2fa526d 100644 --- a/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntriesStepView.axaml.cs +++ b/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntriesStepView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.StartupWizard.Steps; diff --git a/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntriesStepViewModel.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntriesStepViewModel.cs index 5b631e1f9..ad2b4d043 100644 --- a/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntriesStepViewModel.cs +++ b/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntriesStepViewModel.cs @@ -7,8 +7,6 @@ using System.Threading; using System.Threading.Tasks; using Artemis.Core.Services; using Artemis.UI.Extensions; -using Artemis.UI.Shared.Services; -using Artemis.UI.Shared.Utilities; using Artemis.WebClient.Workshop; using Artemis.WebClient.Workshop.Services; using PropertyChanged.SourceGenerator; diff --git a/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntryItemView.axaml.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntryItemView.axaml.cs index 3de435785..7b34b1e89 100644 --- a/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntryItemView.axaml.cs +++ b/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntryItemView.axaml.cs @@ -1,5 +1,5 @@ using Avalonia.Input; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.StartupWizard.Steps; diff --git a/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntryItemViewModel.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntryItemViewModel.cs index 44b59b947..bae8b8678 100644 --- a/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntryItemViewModel.cs +++ b/src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntryItemViewModel.cs @@ -5,9 +5,6 @@ using System.Threading; using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.Services; -using Artemis.UI.Exceptions; -using Artemis.UI.Screens.Plugins; -using Artemis.UI.Services; using Artemis.UI.Services.Interfaces; using Artemis.UI.Shared; using Artemis.UI.Shared.Services; diff --git a/src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepView.axaml.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepView.axaml.cs index 338263d3e..a2e4c1d41 100644 --- a/src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepView.axaml.cs +++ b/src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepView.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.StartupWizard.Steps; diff --git a/src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepViewModel.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepViewModel.cs index b877d4a00..dd74b079d 100644 --- a/src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepViewModel.cs +++ b/src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepViewModel.cs @@ -1,5 +1,4 @@ -using Artemis.UI.Shared; -using ReactiveUI; +using ReactiveUI; namespace Artemis.UI.Screens.StartupWizard.Steps; diff --git a/src/Artemis.UI/Screens/StartupWizard/Steps/LayoutsStepView.axaml.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/LayoutsStepView.axaml.cs index f4b37597a..322e46249 100644 --- a/src/Artemis.UI/Screens/StartupWizard/Steps/LayoutsStepView.axaml.cs +++ b/src/Artemis.UI/Screens/StartupWizard/Steps/LayoutsStepView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.StartupWizard.Steps; diff --git a/src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepView.axaml.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepView.axaml.cs index 3fab97fe7..c9b44e7a9 100644 --- a/src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepView.axaml.cs +++ b/src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepView.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.StartupWizard.Steps; diff --git a/src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepViewModel.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepViewModel.cs index 598bcf9d6..685f3c4e5 100644 --- a/src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepViewModel.cs +++ b/src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepViewModel.cs @@ -1,20 +1,12 @@ using System; -using System.Collections.ObjectModel; -using System.Linq; -using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading.Tasks; using Artemis.Core; -using Artemis.Core.DeviceProviders; using Artemis.Core.Services; -using Artemis.UI.DryIoc.Factories; -using Artemis.UI.Screens.Plugins; -using Artemis.UI.Screens.Workshop.LayoutFinder; -using Artemis.UI.Shared; using Artemis.UI.Shared.Providers; using Artemis.UI.Shared.Services; using DryIoc; -using PropertyChanged.SourceGenerator; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/StartupWizard/Steps/SurfaceStepView.axaml.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/SurfaceStepView.axaml.cs index 93041439f..576bbbec1 100644 --- a/src/Artemis.UI/Screens/StartupWizard/Steps/SurfaceStepView.axaml.cs +++ b/src/Artemis.UI/Screens/StartupWizard/Steps/SurfaceStepView.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.StartupWizard.Steps; diff --git a/src/Artemis.UI/Screens/StartupWizard/Steps/SurfaceStepViewModel.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/SurfaceStepViewModel.cs index ccdcdac00..ba89b1029 100644 --- a/src/Artemis.UI/Screens/StartupWizard/Steps/SurfaceStepViewModel.cs +++ b/src/Artemis.UI/Screens/StartupWizard/Steps/SurfaceStepViewModel.cs @@ -1,11 +1,5 @@ using System.Reactive; -using Artemis.UI.Shared; using ReactiveUI; -using System; -using System.Collections.ObjectModel; -using System.Linq; -using Artemis.Core; -using Artemis.Core.DeviceProviders; using Artemis.Core.Services; namespace Artemis.UI.Screens.StartupWizard.Steps; diff --git a/src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStepView.axaml.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStepView.axaml.cs index 7a65985e7..33ec96524 100644 --- a/src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStepView.axaml.cs +++ b/src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStepView.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.StartupWizard.Steps; diff --git a/src/Artemis.UI/Screens/StartupWizard/Steps/WorkshopUnreachableStepView.axaml.cs b/src/Artemis.UI/Screens/StartupWizard/Steps/WorkshopUnreachableStepView.axaml.cs index c4162a875..dedee1883 100644 --- a/src/Artemis.UI/Screens/StartupWizard/Steps/WorkshopUnreachableStepView.axaml.cs +++ b/src/Artemis.UI/Screens/StartupWizard/Steps/WorkshopUnreachableStepView.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.StartupWizard.Steps; diff --git a/src/Artemis.UI/Screens/StartupWizard/WizardPluginFeatureView.axaml.cs b/src/Artemis.UI/Screens/StartupWizard/WizardPluginFeatureView.axaml.cs index 5ff8c58e8..1eb83b41d 100644 --- a/src/Artemis.UI/Screens/StartupWizard/WizardPluginFeatureView.axaml.cs +++ b/src/Artemis.UI/Screens/StartupWizard/WizardPluginFeatureView.axaml.cs @@ -1,8 +1,5 @@ -using Avalonia; -using Avalonia.Controls; using Avalonia.Interactivity; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Threading; namespace Artemis.UI.Screens.StartupWizard; diff --git a/src/Artemis.UI/Screens/StartupWizard/WizardPluginFeatureViewModel.cs b/src/Artemis.UI/Screens/StartupWizard/WizardPluginFeatureViewModel.cs index 7245809ff..18b53a16f 100644 --- a/src/Artemis.UI/Screens/StartupWizard/WizardPluginFeatureViewModel.cs +++ b/src/Artemis.UI/Screens/StartupWizard/WizardPluginFeatureViewModel.cs @@ -4,6 +4,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.Services; diff --git a/src/Artemis.UI/Screens/SurfaceEditor/ListDeviceView.axaml.cs b/src/Artemis.UI/Screens/SurfaceEditor/ListDeviceView.axaml.cs index ffc3421bf..d9eb9542c 100644 --- a/src/Artemis.UI/Screens/SurfaceEditor/ListDeviceView.axaml.cs +++ b/src/Artemis.UI/Screens/SurfaceEditor/ListDeviceView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.SurfaceEditor; diff --git a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceView.axaml.cs b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceView.axaml.cs index 886c6818a..ec8c4a2aa 100644 --- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceView.axaml.cs +++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceView.axaml.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using Avalonia.Controls; using Avalonia.Input; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.VisualTree; namespace Artemis.UI.Screens.SurfaceEditor; diff --git a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceViewModel.cs b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceViewModel.cs index be21aeb89..7581dccd1 100644 --- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceViewModel.cs +++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceViewModel.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using System.Linq; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.Services; diff --git a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs index 797cad4d5..01e5ce71b 100644 --- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs +++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs @@ -6,7 +6,7 @@ using Avalonia.Controls; using Avalonia.Controls.PanAndZoom; using Avalonia.Input; using Avalonia.Media; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.SurfaceEditor; diff --git a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs index f596e0f23..7324f0972 100644 --- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs +++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs @@ -4,6 +4,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.Services; diff --git a/src/Artemis.UI/Screens/VisualScripting/CableView.axaml.cs b/src/Artemis.UI/Screens/VisualScripting/CableView.axaml.cs index e6465474e..e406c2f46 100644 --- a/src/Artemis.UI/Screens/VisualScripting/CableView.axaml.cs +++ b/src/Artemis.UI/Screens/VisualScripting/CableView.axaml.cs @@ -1,12 +1,10 @@ using System; -using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Avalonia; using Avalonia.Controls; using Avalonia.Input; -using Avalonia.Markup.Xaml; using Avalonia.Media; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.VisualScripting; diff --git a/src/Artemis.UI/Screens/VisualScripting/CableViewModel.cs b/src/Artemis.UI/Screens/VisualScripting/CableViewModel.cs index ccc046d86..b2f8399ee 100644 --- a/src/Artemis.UI/Screens/VisualScripting/CableViewModel.cs +++ b/src/Artemis.UI/Screens/VisualScripting/CableViewModel.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Services; diff --git a/src/Artemis.UI/Screens/VisualScripting/DragCableView.axaml.cs b/src/Artemis.UI/Screens/VisualScripting/DragCableView.axaml.cs index 885ba1996..9f37180eb 100644 --- a/src/Artemis.UI/Screens/VisualScripting/DragCableView.axaml.cs +++ b/src/Artemis.UI/Screens/VisualScripting/DragCableView.axaml.cs @@ -1,10 +1,8 @@ using System; -using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Avalonia; -using Avalonia.Markup.Xaml; using Avalonia.Media; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.VisualScripting; diff --git a/src/Artemis.UI/Screens/VisualScripting/DragCableViewModel.cs b/src/Artemis.UI/Screens/VisualScripting/DragCableViewModel.cs index 4e1684bde..769c61ca5 100644 --- a/src/Artemis.UI/Screens/VisualScripting/DragCableViewModel.cs +++ b/src/Artemis.UI/Screens/VisualScripting/DragCableViewModel.cs @@ -1,4 +1,4 @@ -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.Core; using Artemis.UI.Screens.VisualScripting.Pins; using Artemis.UI.Shared; diff --git a/src/Artemis.UI/Screens/VisualScripting/NodePickerView.axaml.cs b/src/Artemis.UI/Screens/VisualScripting/NodePickerView.axaml.cs index ce2413a3c..75d37be01 100644 --- a/src/Artemis.UI/Screens/VisualScripting/NodePickerView.axaml.cs +++ b/src/Artemis.UI/Screens/VisualScripting/NodePickerView.axaml.cs @@ -1,13 +1,12 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Avalonia; using Avalonia.Controls.PanAndZoom; using Avalonia.Input; using Avalonia.LogicalTree; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.VisualScripting; diff --git a/src/Artemis.UI/Screens/VisualScripting/NodePickerViewModel.cs b/src/Artemis.UI/Screens/VisualScripting/NodePickerViewModel.cs index 582ac7bfb..93ae36c1e 100644 --- a/src/Artemis.UI/Screens/VisualScripting/NodePickerViewModel.cs +++ b/src/Artemis.UI/Screens/VisualScripting/NodePickerViewModel.cs @@ -2,6 +2,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Services; diff --git a/src/Artemis.UI/Screens/VisualScripting/NodeScriptView.axaml.cs b/src/Artemis.UI/Screens/VisualScripting/NodeScriptView.axaml.cs index 0ebcc26f3..7c85f978a 100644 --- a/src/Artemis.UI/Screens/VisualScripting/NodeScriptView.axaml.cs +++ b/src/Artemis.UI/Screens/VisualScripting/NodeScriptView.axaml.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.UI.Shared.Events; using Avalonia; using Avalonia.Controls; @@ -9,9 +10,8 @@ using Avalonia.Controls.PanAndZoom; using Avalonia.Controls.Primitives; using Avalonia.Input; using Avalonia.Interactivity; -using Avalonia.Markup.Xaml; using Avalonia.Media; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Threading; using DynamicData.Binding; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/VisualScripting/NodeScriptViewModel.cs b/src/Artemis.UI/Screens/VisualScripting/NodeScriptViewModel.cs index bcf74f587..999bda63e 100644 --- a/src/Artemis.UI/Screens/VisualScripting/NodeScriptViewModel.cs +++ b/src/Artemis.UI/Screens/VisualScripting/NodeScriptViewModel.cs @@ -3,10 +3,9 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Reactive.Subjects; -using System.Text; using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.Events; diff --git a/src/Artemis.UI/Screens/VisualScripting/NodeScriptWindowView.axaml.cs b/src/Artemis.UI/Screens/VisualScripting/NodeScriptWindowView.axaml.cs index c58c4eade..7ddcfed6e 100644 --- a/src/Artemis.UI/Screens/VisualScripting/NodeScriptWindowView.axaml.cs +++ b/src/Artemis.UI/Screens/VisualScripting/NodeScriptWindowView.axaml.cs @@ -1,6 +1,5 @@ using Artemis.UI.Shared; using Avalonia; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.VisualScripting; diff --git a/src/Artemis.UI/Screens/VisualScripting/NodeScriptWindowViewModel.cs b/src/Artemis.UI/Screens/VisualScripting/NodeScriptWindowViewModel.cs index aeab47450..6494a0450 100644 --- a/src/Artemis.UI/Screens/VisualScripting/NodeScriptWindowViewModel.cs +++ b/src/Artemis.UI/Screens/VisualScripting/NodeScriptWindowViewModel.cs @@ -3,7 +3,7 @@ using System.Collections.ObjectModel; using System.Diagnostics; using System.IO; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading.Tasks; using System.Timers; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/VisualScripting/NodeView.axaml.cs b/src/Artemis.UI/Screens/VisualScripting/NodeView.axaml.cs index 7902dbf69..0e33b0d56 100644 --- a/src/Artemis.UI/Screens/VisualScripting/NodeView.axaml.cs +++ b/src/Artemis.UI/Screens/VisualScripting/NodeView.axaml.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using Avalonia; using Avalonia.Controls; using Avalonia.Input; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.VisualTree; namespace Artemis.UI.Screens.VisualScripting; diff --git a/src/Artemis.UI/Screens/VisualScripting/NodeViewModel.cs b/src/Artemis.UI/Screens/VisualScripting/NodeViewModel.cs index f1ff6dbb3..84eb9f66a 100644 --- a/src/Artemis.UI/Screens/VisualScripting/NodeViewModel.cs +++ b/src/Artemis.UI/Screens/VisualScripting/NodeViewModel.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Events; diff --git a/src/Artemis.UI/Screens/VisualScripting/Pins/InputPinCollectionView.axaml.cs b/src/Artemis.UI/Screens/VisualScripting/Pins/InputPinCollectionView.axaml.cs index f23901ca1..4c2c50812 100644 --- a/src/Artemis.UI/Screens/VisualScripting/Pins/InputPinCollectionView.axaml.cs +++ b/src/Artemis.UI/Screens/VisualScripting/Pins/InputPinCollectionView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.VisualScripting.Pins; diff --git a/src/Artemis.UI/Screens/VisualScripting/Pins/InputPinView.axaml.cs b/src/Artemis.UI/Screens/VisualScripting/Pins/InputPinView.axaml.cs index 1100cec9d..f0dccccd2 100644 --- a/src/Artemis.UI/Screens/VisualScripting/Pins/InputPinView.axaml.cs +++ b/src/Artemis.UI/Screens/VisualScripting/Pins/InputPinView.axaml.cs @@ -1,7 +1,5 @@ using System; -using Avalonia.Controls; using Avalonia.Input; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.VisualScripting.Pins; diff --git a/src/Artemis.UI/Screens/VisualScripting/Pins/OutputPinCollectionView.axaml.cs b/src/Artemis.UI/Screens/VisualScripting/Pins/OutputPinCollectionView.axaml.cs index 765a43cfe..d39424ff0 100644 --- a/src/Artemis.UI/Screens/VisualScripting/Pins/OutputPinCollectionView.axaml.cs +++ b/src/Artemis.UI/Screens/VisualScripting/Pins/OutputPinCollectionView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.VisualScripting.Pins; diff --git a/src/Artemis.UI/Screens/VisualScripting/Pins/OutputPinView.axaml.cs b/src/Artemis.UI/Screens/VisualScripting/Pins/OutputPinView.axaml.cs index ed186c039..e87969244 100644 --- a/src/Artemis.UI/Screens/VisualScripting/Pins/OutputPinView.axaml.cs +++ b/src/Artemis.UI/Screens/VisualScripting/Pins/OutputPinView.axaml.cs @@ -1,7 +1,5 @@ using System; -using Avalonia.Controls; using Avalonia.Input; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.VisualScripting.Pins; diff --git a/src/Artemis.UI/Screens/VisualScripting/Pins/PinCollectionViewModel.cs b/src/Artemis.UI/Screens/VisualScripting/Pins/PinCollectionViewModel.cs index a956380e1..f48888ec5 100644 --- a/src/Artemis.UI/Screens/VisualScripting/Pins/PinCollectionViewModel.cs +++ b/src/Artemis.UI/Screens/VisualScripting/Pins/PinCollectionViewModel.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Events; diff --git a/src/Artemis.UI/Screens/VisualScripting/Pins/PinView.cs b/src/Artemis.UI/Screens/VisualScripting/Pins/PinView.cs index 391941487..282cc4bfa 100644 --- a/src/Artemis.UI/Screens/VisualScripting/Pins/PinView.cs +++ b/src/Artemis.UI/Screens/VisualScripting/Pins/PinView.cs @@ -2,7 +2,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Input; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using Avalonia.Threading; using Avalonia.VisualTree; diff --git a/src/Artemis.UI/Screens/VisualScripting/Pins/PinViewModel.cs b/src/Artemis.UI/Screens/VisualScripting/Pins/PinViewModel.cs index e45649e09..bf72726f5 100644 --- a/src/Artemis.UI/Screens/VisualScripting/Pins/PinViewModel.cs +++ b/src/Artemis.UI/Screens/VisualScripting/Pins/PinViewModel.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Events; diff --git a/src/Artemis.UI/Screens/Workshop/Categories/CategoriesView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Categories/CategoriesView.axaml.cs index 8cb505ab9..52da976c7 100644 --- a/src/Artemis.UI/Screens/Workshop/Categories/CategoriesView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Categories/CategoriesView.axaml.cs @@ -1,6 +1,6 @@ using Avalonia; using Avalonia.Input; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Categories; diff --git a/src/Artemis.UI/Screens/Workshop/Categories/CategoriesViewModel.cs b/src/Artemis.UI/Screens/Workshop/Categories/CategoriesViewModel.cs index 40f68116f..af0d73699 100644 --- a/src/Artemis.UI/Screens/Workshop/Categories/CategoriesViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Categories/CategoriesViewModel.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.UI.Shared; using Artemis.WebClient.Workshop; diff --git a/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserView.axaml.cs b/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserView.axaml.cs index 63fe16098..1fb2cfe67 100644 --- a/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserView.axaml.cs @@ -1,8 +1,5 @@ -using Avalonia; -using Avalonia.Controls; using Avalonia.Interactivity; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.CurrentUser; diff --git a/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserViewModel.cs b/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserViewModel.cs index 8a782486c..4c039244c 100644 --- a/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserViewModel.cs @@ -1,8 +1,7 @@ using System; using System.Linq; -using System.Net.Http; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading; using System.Threading.Tasks; using Artemis.UI.Shared; diff --git a/src/Artemis.UI/Screens/Workshop/CurrentUser/WorkshopLoginView.axaml.cs b/src/Artemis.UI/Screens/Workshop/CurrentUser/WorkshopLoginView.axaml.cs index 9d6092a7f..265d2e214 100644 --- a/src/Artemis.UI/Screens/Workshop/CurrentUser/WorkshopLoginView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/CurrentUser/WorkshopLoginView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.CurrentUser; diff --git a/src/Artemis.UI/Screens/Workshop/CurrentUser/WorkshopLoginViewModel.cs b/src/Artemis.UI/Screens/Workshop/CurrentUser/WorkshopLoginViewModel.cs index 793fedc6d..ad333d39f 100644 --- a/src/Artemis.UI/Screens/Workshop/CurrentUser/WorkshopLoginViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/CurrentUser/WorkshopLoginViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading; using System.Threading.Tasks; using Artemis.UI.Shared; diff --git a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImageView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImageView.axaml.cs index c7759c110..3a3f094a6 100644 --- a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImageView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImageView.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; +using Avalonia.Controls; namespace Artemis.UI.Screens.Workshop.Entries.Details; diff --git a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImagesDialogView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImagesDialogView.axaml.cs index 5da316d40..586c4e348 100644 --- a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImagesDialogView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImagesDialogView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Entries.Details; diff --git a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImagesDialogViewModel.cs b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImagesDialogViewModel.cs index 4fd125a8a..b331afc13 100644 --- a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImagesDialogViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImagesDialogViewModel.cs @@ -2,6 +2,7 @@ using System; using System.Collections.ObjectModel; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.Core.Services; using Artemis.UI.Shared; using FluentAvalonia.UI.Controls; diff --git a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImagesView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImagesView.axaml.cs index 38013a59a..4dd20c617 100644 --- a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImagesView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryImagesView.axaml.cs @@ -1,6 +1,6 @@ using Avalonia; using Avalonia.Input; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Entries.Details; diff --git a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoView.axaml.cs index 2d9a96dc7..b940de61b 100644 --- a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Entries.Details; diff --git a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoViewModel.cs b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoViewModel.cs index 6700f0bd3..13703c684 100644 --- a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoViewModel.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntrySpecificationsView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntrySpecificationsView.axaml.cs index 1374349e9..259587fd0 100644 --- a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntrySpecificationsView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntrySpecificationsView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Entries.Details; diff --git a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntrySpecificationsViewModel.cs b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntrySpecificationsViewModel.cs index aee4bb5b9..c609531b3 100644 --- a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntrySpecificationsViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntrySpecificationsViewModel.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Reactive; -using System.Reactive.Disposables; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.UI.Extensions; @@ -13,7 +12,6 @@ using Artemis.UI.Shared.Services; using Artemis.WebClient.Workshop; using Artemis.WebClient.Workshop.Services; using Avalonia.Media.Imaging; -using AvaloniaEdit.Document; using DynamicData; using DynamicData.Aggregation; using DynamicData.Binding; diff --git a/src/Artemis.UI/Screens/Workshop/Entries/EntriesView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Entries/EntriesView.axaml.cs index 1299973d2..f83c7280a 100644 --- a/src/Artemis.UI/Screens/Workshop/Entries/EntriesView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Entries/EntriesView.axaml.cs @@ -1,10 +1,9 @@ -using System.Reactive.Disposables; using Artemis.UI.Shared; -using Avalonia.ReactiveUI; -using Avalonia.Threading; +using ReactiveUI.Avalonia; using FluentAvalonia.UI.Controls; using ReactiveUI; using System; +using System.Reactive.Disposables.Fluent; namespace Artemis.UI.Screens.Workshop.Entries; diff --git a/src/Artemis.UI/Screens/Workshop/Entries/EntriesViewModel.cs b/src/Artemis.UI/Screens/Workshop/Entries/EntriesViewModel.cs index 760193832..e1b542135 100644 --- a/src/Artemis.UI/Screens/Workshop/Entries/EntriesViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Entries/EntriesViewModel.cs @@ -1,12 +1,12 @@ using System.Collections.ObjectModel; using System.Linq; -using System.Reactive.Disposables; using System.Threading; using System.Threading.Tasks; using Artemis.UI.Routing; using Artemis.UI.Shared.Routing; using ReactiveUI; using System; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using PropertyChanged.SourceGenerator; diff --git a/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListItemVerticalView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListItemVerticalView.axaml.cs index 9068394b0..f023ad840 100644 --- a/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListItemVerticalView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListItemVerticalView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Entries.List; diff --git a/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListItemView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListItemView.axaml.cs index 364af9252..29b47ff5e 100644 --- a/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListItemView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListItemView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Entries.List; diff --git a/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListView.axaml.cs index e4a15ed77..aea597180 100644 --- a/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListView.axaml.cs @@ -1,6 +1,6 @@ using System.Threading; using Avalonia.Controls; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Workshop.Entries.List; diff --git a/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListViewModel.cs b/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListViewModel.cs index fd29fcd46..38da1be90 100644 --- a/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Entries/List/EntryListViewModel.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/src/Artemis.UI/Screens/Workshop/EntryReleases/Dialogs/DependenciesDialogView.axaml.cs b/src/Artemis.UI/Screens/Workshop/EntryReleases/Dialogs/DependenciesDialogView.axaml.cs index 592d73ea4..5d8ba69a5 100644 --- a/src/Artemis.UI/Screens/Workshop/EntryReleases/Dialogs/DependenciesDialogView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/EntryReleases/Dialogs/DependenciesDialogView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.EntryReleases.Dialogs; diff --git a/src/Artemis.UI/Screens/Workshop/EntryReleases/Dialogs/DependenciesDialogViewModel.cs b/src/Artemis.UI/Screens/Workshop/EntryReleases/Dialogs/DependenciesDialogViewModel.cs index 65db4712d..04fed9c7c 100644 --- a/src/Artemis.UI/Screens/Workshop/EntryReleases/Dialogs/DependenciesDialogViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/EntryReleases/Dialogs/DependenciesDialogViewModel.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.UI.Screens.Workshop.Entries.List; using Artemis.UI.Shared; diff --git a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseInfoView.axaml.cs b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseInfoView.axaml.cs index f216c9ea7..2d24dc435 100644 --- a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseInfoView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseInfoView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.EntryReleases; diff --git a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseInfoViewModel.cs b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseInfoViewModel.cs index d077e8fae..8d29dc48a 100644 --- a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseInfoViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseInfoViewModel.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading; using System.Threading.Tasks; using Artemis.Core; diff --git a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseItemView.axaml.cs b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseItemView.axaml.cs index ffc325a79..f19070d80 100644 --- a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseItemView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseItemView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.EntryReleases; diff --git a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseItemViewModel.cs b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseItemViewModel.cs index 40d9ccae3..333f07d06 100644 --- a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseItemViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseItemViewModel.cs @@ -1,4 +1,5 @@ using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.UI.Shared; using Artemis.WebClient.Workshop; using Artemis.WebClient.Workshop.Models; diff --git a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseView.axaml.cs b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseView.axaml.cs index ea7532c70..4b3193aa0 100644 --- a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleaseView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.EntryReleases; diff --git a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesView.axaml.cs b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesView.axaml.cs index 39b603187..64d268ef8 100644 --- a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesView.axaml.cs @@ -1,5 +1,4 @@ -using Avalonia.Controls; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.EntryReleases; diff --git a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesViewModel.cs b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesViewModel.cs index a478318e3..9b9a0ff7b 100644 --- a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesViewModel.cs @@ -1,8 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reactive.Disposables; -using System.Threading.Tasks; +using System.Reactive.Disposables.Fluent; using Artemis.UI.Shared; using Artemis.UI.Shared.Routing; using Artemis.WebClient.Workshop; diff --git a/src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeView.axaml.cs index 4a143850a..15479da8a 100644 --- a/src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Home; diff --git a/src/Artemis.UI/Screens/Workshop/Home/WorkshopOfflineView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Home/WorkshopOfflineView.axaml.cs index a7d5eebdb..789e97904 100644 --- a/src/Artemis.UI/Screens/Workshop/Home/WorkshopOfflineView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Home/WorkshopOfflineView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Home; diff --git a/src/Artemis.UI/Screens/Workshop/Home/WorkshopOfflineViewModel.cs b/src/Artemis.UI/Screens/Workshop/Home/WorkshopOfflineViewModel.cs index 71ca2508f..df9607f76 100644 --- a/src/Artemis.UI/Screens/Workshop/Home/WorkshopOfflineViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Home/WorkshopOfflineViewModel.cs @@ -1,4 +1,3 @@ -using System; using System.Reactive; using System.Threading; using System.Threading.Tasks; diff --git a/src/Artemis.UI/Screens/Workshop/Image/ImagePropertiesDialogView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Image/ImagePropertiesDialogView.axaml.cs index 5fff5fc55..44fc02df6 100644 --- a/src/Artemis.UI/Screens/Workshop/Image/ImagePropertiesDialogView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Image/ImagePropertiesDialogView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Image; diff --git a/src/Artemis.UI/Screens/Workshop/Image/ImagePropertiesDialogViewModel.cs b/src/Artemis.UI/Screens/Workshop/Image/ImagePropertiesDialogViewModel.cs index 9074035b8..4f595d7d6 100644 --- a/src/Artemis.UI/Screens/Workshop/Image/ImagePropertiesDialogViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Image/ImagePropertiesDialogViewModel.cs @@ -1,6 +1,5 @@ using System.Reactive; using Artemis.UI.Shared; -using Artemis.WebClient.Workshop.Handlers.UploadHandlers; using FluentAvalonia.UI.Controls; using PropertyChanged.SourceGenerator; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/Workshop/Image/ImageSubmissionView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Image/ImageSubmissionView.axaml.cs index 5fa82a6c2..91a62222b 100644 --- a/src/Artemis.UI/Screens/Workshop/Image/ImageSubmissionView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Image/ImageSubmissionView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Image; diff --git a/src/Artemis.UI/Screens/Workshop/Image/ImageSubmissionViewModel.cs b/src/Artemis.UI/Screens/Workshop/Image/ImageSubmissionViewModel.cs index f0cdee4a0..b43252819 100644 --- a/src/Artemis.UI/Screens/Workshop/Image/ImageSubmissionViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Image/ImageSubmissionViewModel.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Net.Http; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading.Tasks; using System.Windows.Input; using Artemis.UI.Shared; diff --git a/src/Artemis.UI/Screens/Workshop/Layout/Dialogs/DeviceProviderPickerDialogView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Layout/Dialogs/DeviceProviderPickerDialogView.axaml.cs index 7758ce344..5e811409f 100644 --- a/src/Artemis.UI/Screens/Workshop/Layout/Dialogs/DeviceProviderPickerDialogView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Layout/Dialogs/DeviceProviderPickerDialogView.axaml.cs @@ -1,9 +1,7 @@ using Artemis.Core.DeviceProviders; using Avalonia; -using Avalonia.Controls; using Avalonia.Input; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Layout.Dialogs; diff --git a/src/Artemis.UI/Screens/Workshop/Layout/LayoutDescriptionView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Layout/LayoutDescriptionView.axaml.cs index 5276e422f..b98391a53 100644 --- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutDescriptionView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutDescriptionView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Layout; diff --git a/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsView.axaml.cs index c97e73859..8db4231fa 100644 --- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsView.axaml.cs @@ -1,6 +1,6 @@ using System; -using System.Reactive.Disposables; -using Avalonia.ReactiveUI; +using System.Reactive.Disposables.Fluent; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Workshop.Layout; diff --git a/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsViewModel.cs b/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsViewModel.cs index 20f4cd286..44d6b42df 100644 --- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsViewModel.cs @@ -1,5 +1,4 @@ using System; -using System.Reactive.Linq; using System.Threading; using System.Threading.Tasks; using Artemis.UI.Screens.Workshop.Entries.Details; @@ -8,7 +7,6 @@ using Artemis.UI.Screens.Workshop.Parameters; using Artemis.UI.Shared.Routing; using Artemis.WebClient.Workshop; using PropertyChanged.SourceGenerator; -using ReactiveUI; using StrawberryShake; namespace Artemis.UI.Screens.Workshop.Layout; diff --git a/src/Artemis.UI/Screens/Workshop/Layout/LayoutInfoView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Layout/LayoutInfoView.axaml.cs index 57092f2aa..c62db76a5 100644 --- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutInfoView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutInfoView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Layout; diff --git a/src/Artemis.UI/Screens/Workshop/Layout/LayoutListDefaultView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Layout/LayoutListDefaultView.axaml.cs index bc7603a0d..2227c86bd 100644 --- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutListDefaultView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutListDefaultView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Layout; diff --git a/src/Artemis.UI/Screens/Workshop/Layout/LayoutListView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Layout/LayoutListView.axaml.cs index cb60c4707..f10d79bc9 100644 --- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutListView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutListView.axaml.cs @@ -1,8 +1,6 @@ using System; -using System.Reactive.Disposables; -using Artemis.UI.Shared.Routing; -using Avalonia.ReactiveUI; -using Avalonia.Threading; +using System.Reactive.Disposables.Fluent; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Workshop.Layout; diff --git a/src/Artemis.UI/Screens/Workshop/Layout/LayoutListViewModel.cs b/src/Artemis.UI/Screens/Workshop/Layout/LayoutListViewModel.cs index 93aad1f59..28a1dddbe 100644 --- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutListViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutListViewModel.cs @@ -1,5 +1,4 @@ using Artemis.UI.Shared.Routing; -using Artemis.WebClient.Workshop; namespace Artemis.UI.Screens.Workshop.Layout; diff --git a/src/Artemis.UI/Screens/Workshop/Layout/LayoutManageView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Layout/LayoutManageView.axaml.cs index bc26260c9..61182d8ff 100644 --- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutManageView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutManageView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Layout; diff --git a/src/Artemis.UI/Screens/Workshop/LayoutFinder/LayoutFinderDeviceView.axaml.cs b/src/Artemis.UI/Screens/Workshop/LayoutFinder/LayoutFinderDeviceView.axaml.cs index b974af5a8..a45d1e227 100644 --- a/src/Artemis.UI/Screens/Workshop/LayoutFinder/LayoutFinderDeviceView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/LayoutFinder/LayoutFinderDeviceView.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.Workshop.LayoutFinder; diff --git a/src/Artemis.UI/Screens/Workshop/LayoutFinder/LayoutFinderView.axaml.cs b/src/Artemis.UI/Screens/Workshop/LayoutFinder/LayoutFinderView.axaml.cs index fa16aa052..fd7db52be 100644 --- a/src/Artemis.UI/Screens/Workshop/LayoutFinder/LayoutFinderView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/LayoutFinder/LayoutFinderView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.LayoutFinder; diff --git a/src/Artemis.UI/Screens/Workshop/LayoutFinder/LayoutFinderViewModel.cs b/src/Artemis.UI/Screens/Workshop/LayoutFinder/LayoutFinderViewModel.cs index e5e162216..24c316dbe 100644 --- a/src/Artemis.UI/Screens/Workshop/LayoutFinder/LayoutFinderViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/LayoutFinder/LayoutFinderViewModel.cs @@ -8,10 +8,8 @@ using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.Services; using Artemis.UI.Shared; -using DynamicData; using PropertyChanged.SourceGenerator; using ReactiveUI; -using RGB.NET.Core; using Serilog; namespace Artemis.UI.Screens.Workshop.LayoutFinder; diff --git a/src/Artemis.UI/Screens/Workshop/Library/SubmissionDetailsView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Library/SubmissionDetailsView.axaml.cs index 77a1f67ec..2d8d42ad9 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/SubmissionDetailsView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Library/SubmissionDetailsView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Library; diff --git a/src/Artemis.UI/Screens/Workshop/Library/SubmissionDetailsViewModel.cs b/src/Artemis.UI/Screens/Workshop/Library/SubmissionDetailsViewModel.cs index 1c500fc7c..acadcf1bd 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/SubmissionDetailsViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Library/SubmissionDetailsViewModel.cs @@ -8,7 +8,6 @@ using System.Reactive; using System.Threading; using System.Threading.Tasks; using Artemis.UI.Screens.Workshop.Image; -using Artemis.UI.Shared; using Artemis.UI.Shared.Routing; using Artemis.UI.Shared.Services; using Artemis.WebClient.Workshop; diff --git a/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementView.axaml.cs index 3e14dacb8..e314d9b8f 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementView.axaml.cs @@ -1,6 +1,6 @@ using System; -using System.Reactive.Disposables; -using Avalonia.ReactiveUI; +using System.Reactive.Disposables.Fluent; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Workshop.Library; diff --git a/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementViewModel.cs b/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementViewModel.cs index 2f7a67147..6518e049e 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementViewModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Threading; using System.Threading.Tasks; using Artemis.UI.Screens.Workshop.Parameters; diff --git a/src/Artemis.UI/Screens/Workshop/Library/SubmissionReleaseView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Library/SubmissionReleaseView.axaml.cs index de58a90f6..6a10db098 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/SubmissionReleaseView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Library/SubmissionReleaseView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Library; diff --git a/src/Artemis.UI/Screens/Workshop/Library/SubmissionReleaseViewModel.cs b/src/Artemis.UI/Screens/Workshop/Library/SubmissionReleaseViewModel.cs index 025d2ce5a..a723e1546 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/SubmissionReleaseViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Library/SubmissionReleaseViewModel.cs @@ -1,6 +1,5 @@ using System; using System.Reactive; -using System.Reactive.Disposables; using System.Threading; using System.Threading.Tasks; using Artemis.UI.Screens.Workshop.Parameters; @@ -9,7 +8,6 @@ using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services.Builders; using Artemis.WebClient.Workshop; using Avalonia.Layout; -using AvaloniaEdit.Document; using PropertyChanged.SourceGenerator; using ReactiveUI; using StrawberryShake; diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabItemView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabItemView.axaml.cs index 54504c0c8..0ef799616 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabItemView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabItemView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Library.Tabs; diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabItemViewModel.cs b/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabItemViewModel.cs index 665129c0c..2088b4b1a 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabItemViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabItemViewModel.cs @@ -1,7 +1,5 @@ using System; using System.Linq; -using System.Reactive; -using System.Reactive.Disposables; using System.Reactive.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabView.axaml.cs index 8a9a8b444..cd14cb150 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Library.Tabs; diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabViewModel.cs b/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabViewModel.cs index 670c19e04..a2e70990d 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabViewModel.cs @@ -2,9 +2,9 @@ using System.Collections.ObjectModel; using System.Reactive; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.UI.Shared.Routing; -using Artemis.WebClient.Workshop; using Artemis.WebClient.Workshop.Models; using Artemis.WebClient.Workshop.Services; using DynamicData; diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabItemView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabItemView.axaml.cs index 8bf14a3bf..a9411e270 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabItemView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabItemView.axaml.cs @@ -1,6 +1,4 @@ -using Avalonia; using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.Workshop.Library.Tabs; diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml.cs index cedd6574c..478ff87d2 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Library.Tabs; diff --git a/src/Artemis.UI/Screens/Workshop/Library/WorkshopLibraryVIew.axaml.cs b/src/Artemis.UI/Screens/Workshop/Library/WorkshopLibraryVIew.axaml.cs index 5fa303000..537eac120 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/WorkshopLibraryVIew.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Library/WorkshopLibraryVIew.axaml.cs @@ -1,8 +1,7 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.UI.Shared; -using Avalonia.ReactiveUI; -using Avalonia.Threading; +using ReactiveUI.Avalonia; using FluentAvalonia.UI.Controls; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/Workshop/Library/WorkshopLibraryViewModel.cs b/src/Artemis.UI/Screens/Workshop/Library/WorkshopLibraryViewModel.cs index af02fa985..e3459969f 100644 --- a/src/Artemis.UI/Screens/Workshop/Library/WorkshopLibraryViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Library/WorkshopLibraryViewModel.cs @@ -1,12 +1,12 @@ using System.Collections.ObjectModel; using System.Linq; -using System.Reactive.Disposables; using System.Threading; using System.Threading.Tasks; using Artemis.UI.Routing; using Artemis.UI.Shared.Routing; using ReactiveUI; using System; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using PropertyChanged.SourceGenerator; diff --git a/src/Artemis.UI/Screens/Workshop/Plugins/PluginDescriptionView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Plugins/PluginDescriptionView.axaml.cs index bffef29b2..2b93ff5c3 100644 --- a/src/Artemis.UI/Screens/Workshop/Plugins/PluginDescriptionView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Plugins/PluginDescriptionView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Plugins; diff --git a/src/Artemis.UI/Screens/Workshop/Plugins/PluginDescriptionViewModel.cs b/src/Artemis.UI/Screens/Workshop/Plugins/PluginDescriptionViewModel.cs index 99a474583..eb98f7823 100644 --- a/src/Artemis.UI/Screens/Workshop/Plugins/PluginDescriptionViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Plugins/PluginDescriptionViewModel.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsView.axaml.cs index fe248c549..d3bd7a434 100644 --- a/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsView.axaml.cs @@ -1,6 +1,6 @@ using System; -using System.Reactive.Disposables; -using Avalonia.ReactiveUI; +using System.Reactive.Disposables.Fluent; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Workshop.Plugins; diff --git a/src/Artemis.UI/Screens/Workshop/Plugins/PluginListView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Plugins/PluginListView.axaml.cs index f5d9d54c1..8be9c7734 100644 --- a/src/Artemis.UI/Screens/Workshop/Plugins/PluginListView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Plugins/PluginListView.axaml.cs @@ -1,6 +1,6 @@ using System; -using System.Reactive.Disposables; -using Avalonia.ReactiveUI; +using System.Reactive.Disposables.Fluent; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Workshop.Plugins; diff --git a/src/Artemis.UI/Screens/Workshop/Plugins/PluginManageView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Plugins/PluginManageView.axaml.cs index d5136c54e..db3627a8b 100644 --- a/src/Artemis.UI/Screens/Workshop/Plugins/PluginManageView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Plugins/PluginManageView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Plugins; diff --git a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDescriptionView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDescriptionView.axaml.cs index 5fed996a6..6cfa074b3 100644 --- a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDescriptionView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDescriptionView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Profile; diff --git a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDescriptionViewModel.cs b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDescriptionViewModel.cs index aec502c40..60b676dcf 100644 --- a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDescriptionViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDescriptionViewModel.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml.cs index 38b60575c..3e768296a 100644 --- a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml.cs @@ -1,6 +1,6 @@ using System; -using System.Reactive.Disposables; -using Avalonia.ReactiveUI; +using System.Reactive.Disposables.Fluent; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Workshop.Profile; diff --git a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsViewModel.cs b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsViewModel.cs index 1d4987fb7..fd5f4a525 100644 --- a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsViewModel.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; using System.Threading; using System.Threading.Tasks; using Artemis.UI.Screens.Workshop.Entries.Details; diff --git a/src/Artemis.UI/Screens/Workshop/Profile/ProfileListView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Profile/ProfileListView.axaml.cs index 1d7abe1ce..3cd779068 100644 --- a/src/Artemis.UI/Screens/Workshop/Profile/ProfileListView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Profile/ProfileListView.axaml.cs @@ -1,6 +1,6 @@ using System; -using System.Reactive.Disposables; -using Avalonia.ReactiveUI; +using System.Reactive.Disposables.Fluent; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Workshop.Profile; diff --git a/src/Artemis.UI/Screens/Workshop/Profile/ProfilePreviewView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Profile/ProfilePreviewView.axaml.cs index b956e6ecf..37dc44f8a 100644 --- a/src/Artemis.UI/Screens/Workshop/Profile/ProfilePreviewView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Profile/ProfilePreviewView.axaml.cs @@ -5,7 +5,7 @@ using Avalonia; using Avalonia.Controls.PanAndZoom; using Avalonia.Input; using Avalonia.Media; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Workshop.Profile; diff --git a/src/Artemis.UI/Screens/Workshop/Profile/ProfilePreviewViewModel.cs b/src/Artemis.UI/Screens/Workshop/Profile/ProfilePreviewViewModel.cs index 9ee71a0dc..6d84092b1 100644 --- a/src/Artemis.UI/Screens/Workshop/Profile/ProfilePreviewViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Profile/ProfilePreviewViewModel.cs @@ -2,6 +2,7 @@ using System; using System.Collections.ObjectModel; using System.Linq; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.Core; using Artemis.Core.Services; using Artemis.UI.Shared; diff --git a/src/Artemis.UI/Screens/Workshop/Search/SearchResultView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Search/SearchResultView.axaml.cs index 8490b69b2..dd5092024 100644 --- a/src/Artemis.UI/Screens/Workshop/Search/SearchResultView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/Search/SearchResultView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.Search; diff --git a/src/Artemis.UI/Screens/Workshop/Search/SearchViewModel.cs b/src/Artemis.UI/Screens/Workshop/Search/SearchViewModel.cs index d6e0aa15f..4539370f6 100644 --- a/src/Artemis.UI/Screens/Workshop/Search/SearchViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/Search/SearchViewModel.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using Artemis.UI.Screens.Root; -using Artemis.UI.Screens.Workshop.CurrentUser; using Artemis.UI.Services.Interfaces; using Artemis.UI.Shared; using Artemis.WebClient.Workshop; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Models/SubmissionWizardState.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Models/SubmissionWizardState.cs index d64e7f691..bdd8fe32f 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Models/SubmissionWizardState.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Models/SubmissionWizardState.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.IO; -using Artemis.Core; using Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Layout; using Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Plugin; using Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Profile; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/ReleaseWizardView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/ReleaseWizardView.axaml.cs index ca6667b66..ac38972e9 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/ReleaseWizardView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/ReleaseWizardView.axaml.cs @@ -1,9 +1,8 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.UI.Shared; using Avalonia; -using Avalonia.Threading; using ReactiveUI; namespace Artemis.UI.Screens.Workshop.SubmissionWizard; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ChangelogStepView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ChangelogStepView.axaml.cs index 2733746f7..f140d9fa2 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ChangelogStepView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ChangelogStepView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ChangelogStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ChangelogStepViewModel.cs index e84d4a69a..119c84543 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ChangelogStepViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ChangelogStepViewModel.cs @@ -1,4 +1,3 @@ -using System.ComponentModel.DataAnnotations; using System.Reactive.Disposables; using Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Layout; using Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Plugin; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepView.axaml.cs index 087084ca5..a7c43280b 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ImagesStepView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ImagesStepView.axaml.cs index f8c499a2d..e48634a36 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ImagesStepView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ImagesStepView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutInfoStepView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutInfoStepView.axaml.cs index 85dbd1e6e..9ba649de4 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutInfoStepView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutInfoStepView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Layout; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutInfoStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutInfoStepViewModel.cs index 3ebe3b748..d0f1b568f 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutInfoStepViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutInfoStepViewModel.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.Screens.Workshop.Layout; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutSelectionStepView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutSelectionStepView.axaml.cs index a39c14a14..93e7a39e0 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutSelectionStepView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutSelectionStepView.axaml.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Layout; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutSelectionStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutSelectionStepViewModel.cs index d38a9b5b4..9605a2d5b 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutSelectionStepViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutSelectionStepViewModel.cs @@ -10,7 +10,6 @@ using System.Reactive.Disposables; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.UI.Exceptions; -using Artemis.UI.Screens.Workshop.SubmissionWizard.Models; using Artemis.UI.Shared.Extensions; using Artemis.UI.Shared.Services; using Artemis.WebClient.Workshop.Handlers.UploadHandlers; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/LoginStepView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/LoginStepView.axaml.cs index 3b4ec4b2b..b70d7e4cd 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/LoginStepView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/LoginStepView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/LoginStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/LoginStepViewModel.cs index 4c9e67e07..55b3c4e5f 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/LoginStepViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/LoginStepViewModel.cs @@ -1,12 +1,9 @@ -using System.Linq; -using System.Security.Claims; using System.Threading; using System.Threading.Tasks; using Artemis.UI.Screens.Workshop.CurrentUser; using Artemis.UI.Shared.Services; using Artemis.WebClient.Workshop.Services; using FluentAvalonia.UI.Controls; -using IdentityModel; using ReactiveUI; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Plugin/PluginSelectionStepView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Plugin/PluginSelectionStepView.axaml.cs index 79866d0e5..a527078bb 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Plugin/PluginSelectionStepView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Plugin/PluginSelectionStepView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Plugin; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Plugin/PluginSelectionStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Plugin/PluginSelectionStepViewModel.cs index 4008c5f57..b09592e43 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Plugin/PluginSelectionStepViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Plugin/PluginSelectionStepViewModel.cs @@ -6,7 +6,6 @@ using System.Reactive.Disposables; using System.Reactive.Linq; using System.Threading.Tasks; using Artemis.Core; -using Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Profile; using Artemis.UI.Shared.Services; using Artemis.WebClient.Workshop.Handlers.UploadHandlers; using PropertyChanged.SourceGenerator; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsStepView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsStepView.axaml.cs index a5f7815d7..fe86f5ba1 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsStepView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsStepView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Profile; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileSelectionStepView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileSelectionStepView.axaml.cs index 84cb5bf27..5f560a356 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileSelectionStepView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileSelectionStepView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Profile; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileSelectionStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileSelectionStepViewModel.cs index 5afebcf4b..4c6e70e02 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileSelectionStepViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileSelectionStepViewModel.cs @@ -8,7 +8,6 @@ using Artemis.Core; using Artemis.Core.Services; using Artemis.UI.Extensions; using Artemis.UI.Screens.Workshop.Profile; -using Artemis.UI.Screens.Workshop.SubmissionWizard.Models; using Artemis.WebClient.Workshop.Handlers.UploadHandlers; using Material.Icons; using PropertyChanged.SourceGenerator; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SpecificationsStepView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SpecificationsStepView.axaml.cs index 6d05e97a1..7b35c5bf5 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SpecificationsStepView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SpecificationsStepView.axaml.cs @@ -1,5 +1,5 @@ using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SpecificationsStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SpecificationsStepViewModel.cs index 1b8c2a35c..4c1f25591 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SpecificationsStepViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SpecificationsStepViewModel.cs @@ -4,7 +4,6 @@ using System.IO; using System.Linq; using System.Reactive.Disposables; using Artemis.UI.Extensions; -using Artemis.UI.Screens.Workshop.Entries; using Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Layout; using Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Plugin; using Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Profile; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SubmitStepView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SubmitStepView.axaml.cs index ba64d1d7d..6653e6015 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SubmitStepView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SubmitStepView.axaml.cs @@ -1,5 +1,5 @@ using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SubmitStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SubmitStepViewModel.cs index 111b9bb36..058b6cf2e 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SubmitStepViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SubmitStepViewModel.cs @@ -2,7 +2,7 @@ using System; using System.Collections.ObjectModel; using System.IO; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.UI.Screens.Workshop.Categories; using Artemis.WebClient.Workshop; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepView.axaml.cs index 21d6bb439..1de020d26 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepView.axaml.cs @@ -1,5 +1,5 @@ using Avalonia.Markup.Xaml; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepViewModel.cs index ffb7cdd87..0adcba8ad 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepViewModel.cs @@ -1,14 +1,11 @@ using System; -using System.IO; using System.Linq; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Threading; using System.Threading.Tasks; -using Artemis.Core; using Artemis.UI.Shared.Routing; using Artemis.UI.Shared.Services; -using Artemis.UI.Shared.Utilities; using Artemis.WebClient.Workshop; using Artemis.WebClient.Workshop.Exceptions; using Artemis.WebClient.Workshop.Handlers.UploadHandlers; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ValidateEmailStepView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ValidateEmailStepView.axaml.cs index a5899731e..f7d73a409 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ValidateEmailStepView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ValidateEmailStepView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ValidateEmailStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ValidateEmailStepViewModel.cs index b07414ce4..72da11ff8 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ValidateEmailStepViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ValidateEmailStepViewModel.cs @@ -1,7 +1,7 @@ using System; using System.Diagnostics; using System.Reactive; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using System.Security.Claims; using System.Threading; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/WelcomeStepView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/WelcomeStepView.axaml.cs index cfeea65f8..a970c1f1c 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/WelcomeStepView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/WelcomeStepView.axaml.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/WelcomeStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/WelcomeStepViewModel.cs index c65bb4de6..54c73da25 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/WelcomeStepViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/WelcomeStepViewModel.cs @@ -1,7 +1,5 @@ -using System.Linq; using System.Threading.Tasks; using Artemis.WebClient.Workshop.Services; -using IdentityModel; using ReactiveUI; namespace Artemis.UI.Screens.Workshop.SubmissionWizard.Steps; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/SubmissionWizardView.axaml.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/SubmissionWizardView.axaml.cs index 377bc17cb..e722c1f4e 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/SubmissionWizardView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/SubmissionWizardView.axaml.cs @@ -1,9 +1,8 @@ using System; -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using System.Reactive.Linq; using Artemis.UI.Shared; using Avalonia; -using Avalonia.Threading; using ReactiveUI; namespace Artemis.UI.Screens.Workshop.SubmissionWizard; diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/SubmissionWizardViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/SubmissionWizardViewModel.cs index efb87b34d..96d106e2b 100644 --- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/SubmissionWizardViewModel.cs +++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/SubmissionWizardViewModel.cs @@ -1,4 +1,4 @@ -using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using Artemis.UI.Screens.Workshop.CurrentUser; using Artemis.UI.Screens.Workshop.SubmissionWizard.Models; using Artemis.UI.Screens.Workshop.SubmissionWizard.Steps; diff --git a/src/Artemis.UI/Screens/Workshop/WorkshopView.axaml.cs b/src/Artemis.UI/Screens/Workshop/WorkshopView.axaml.cs index c013afa8e..55bb97461 100644 --- a/src/Artemis.UI/Screens/Workshop/WorkshopView.axaml.cs +++ b/src/Artemis.UI/Screens/Workshop/WorkshopView.axaml.cs @@ -1,7 +1,6 @@ using System; -using System.Reactive.Disposables; -using Avalonia.ReactiveUI; -using Avalonia.Threading; +using System.Reactive.Disposables.Fluent; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI.Screens.Workshop; diff --git a/src/Artemis.UI/Services/DeviceLayoutService.cs b/src/Artemis.UI/Services/DeviceLayoutService.cs index 07f1c4d7a..c471273be 100644 --- a/src/Artemis.UI/Services/DeviceLayoutService.cs +++ b/src/Artemis.UI/Services/DeviceLayoutService.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.Services; -using Artemis.UI.Screens.Device; using Artemis.UI.Screens.Device.Layout; using Artemis.UI.Services.Interfaces; using Artemis.UI.Shared.Services; diff --git a/src/Artemis.UI/Services/Updating/UpdateService.cs b/src/Artemis.UI/Services/Updating/UpdateService.cs index 633e0c69e..e80ae10ae 100644 --- a/src/Artemis.UI/Services/Updating/UpdateService.cs +++ b/src/Artemis.UI/Services/Updating/UpdateService.cs @@ -5,13 +5,11 @@ using System.Threading; using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.Services; -using Artemis.Storage.Repositories; using Artemis.Storage.Repositories.Interfaces; using Artemis.UI.Exceptions; using Artemis.UI.Services.Interfaces; using Artemis.UI.Shared.Services.MainWindow; using Artemis.WebClient.Updating; -using Artemis.WebClient.Workshop.Services; using Serilog; using StrawberryShake; using Timer = System.Timers.Timer; diff --git a/src/Artemis.UI/ViewLocator.cs b/src/Artemis.UI/ViewLocator.cs index 9518edd8d..ab57e27a6 100644 --- a/src/Artemis.UI/ViewLocator.cs +++ b/src/Artemis.UI/ViewLocator.cs @@ -2,10 +2,9 @@ using System; using System.Diagnostics; using Artemis.Core; using Artemis.UI.Exceptions; -using Artemis.UI.Screens.Root; using Avalonia.Controls; using Avalonia.Controls.Templates; -using Avalonia.ReactiveUI; +using ReactiveUI.Avalonia; using ReactiveUI; namespace Artemis.UI; diff --git a/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj b/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj index 4ca738864..594393346 100644 --- a/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj +++ b/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 enable enable x64 diff --git a/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj b/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj index c3c32e403..83be6f9d5 100644 --- a/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj +++ b/src/Artemis.WebClient.Workshop/Artemis.WebClient.Workshop.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 enable enable x64 diff --git a/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/EntryInstallResult.cs b/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/EntryInstallResult.cs index 2f1cca251..7e05fe28b 100644 --- a/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/EntryInstallResult.cs +++ b/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/EntryInstallResult.cs @@ -1,6 +1,5 @@ using Artemis.Core; using Artemis.WebClient.Workshop.Models; -using Artemis.WebClient.Workshop.Services; namespace Artemis.WebClient.Workshop.Handlers.InstallationHandlers; diff --git a/src/Artemis.WebClient.Workshop/Services/WorkshopService.cs b/src/Artemis.WebClient.Workshop/Services/WorkshopService.cs index 68698cec2..17ad95888 100644 --- a/src/Artemis.WebClient.Workshop/Services/WorkshopService.cs +++ b/src/Artemis.WebClient.Workshop/Services/WorkshopService.cs @@ -1,7 +1,6 @@ using System.Net.Http.Headers; using Artemis.Core; using Artemis.Core.Services; -using Artemis.Storage.Entities.Plugins; using Artemis.Storage.Entities.Workshop; using Artemis.Storage.Repositories.Interfaces; using Artemis.UI.Shared.Routing; @@ -11,7 +10,6 @@ using Artemis.WebClient.Workshop.Handlers.InstallationHandlers; using Artemis.WebClient.Workshop.Handlers.UploadHandlers; using Artemis.WebClient.Workshop.Models; using Serilog; -using StrawberryShake; namespace Artemis.WebClient.Workshop.Services; diff --git a/src/Artemis.WebClient.Workshop/WorkshopConstants.cs b/src/Artemis.WebClient.Workshop/WorkshopConstants.cs index 10807064c..9899d65a7 100644 --- a/src/Artemis.WebClient.Workshop/WorkshopConstants.cs +++ b/src/Artemis.WebClient.Workshop/WorkshopConstants.cs @@ -2,10 +2,17 @@ namespace Artemis.WebClient.Workshop; public static class WorkshopConstants { + // This is so I can never accidentally release with localhost +#if DEBUG // public const string AUTHORITY_URL = "https://localhost:5001"; // public const string WORKSHOP_URL = "https://localhost:7281"; public const string AUTHORITY_URL = "https://identity.artemis-rgb.com"; public const string WORKSHOP_URL = "https://workshop.artemis-rgb.com"; +#else + public const string AUTHORITY_URL = "https://identity.artemis-rgb.com"; + public const string WORKSHOP_URL = "https://workshop.artemis-rgb.com"; +#endif + public const string IDENTITY_CLIENT_NAME = "IdentityApiClient"; public const string WORKSHOP_CLIENT_NAME = "WorkshopApiClient"; } \ No newline at end of file diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 9a18d7209..d3c4380f6 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -4,68 +4,68 @@ false - - + + - + - - - - + + + - + - + - - + + - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + + - - + + - + - - - - - - - - + + + + + + + + \ No newline at end of file From e2cb73e327c9f3499bc376cb9bde6bae315728df Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 16 Dec 2025 22:37:10 +0100 Subject: [PATCH 2/4] Don't log so much Avalonia stuff even when debugging tyvm --- src/Artemis.UI/SerilogAvaloniaSink.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Artemis.UI/SerilogAvaloniaSink.cs b/src/Artemis.UI/SerilogAvaloniaSink.cs index b8dea3fcd..f590c4b06 100644 --- a/src/Artemis.UI/SerilogAvaloniaSink.cs +++ b/src/Artemis.UI/SerilogAvaloniaSink.cs @@ -22,13 +22,8 @@ public class SerilogAvaloniaSink : ILogSink { SerilogLogLevel logLevel = GetSerilogLogLevel(level, area); - #if DEBUG // Except with binding errors, ignore anything that is information or lower - return true; -#else - // Ignore binding errors in release builds, shoo return area != "Binding" && logLevel > SerilogLogLevel.Information && _logger.IsEnabled(logLevel); -#endif } /// From 86f2426f37405babb2e6c6aa1fbae9f705cabc63 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 19 Dec 2025 23:11:27 +0100 Subject: [PATCH 3/4] Core - Remove API versioning, we have MinimumVersion to achieve the same thing --- src/Artemis.Core/Artemis.Core.csproj | 1 - .../Quantization/ColorQuantizer.cs | 8 +- src/Artemis.Core/Constants.cs | 8 +- .../Properties/ColorGradientLayerProperty.cs | 2 +- .../DryIoc/ContainerExtensions.cs | 2 +- .../DryIoc/Factories/PluginSettingsFactory.cs | 2 +- src/Artemis.Core/Extensions/TypeExtensions.cs | 18 ++-- .../Models/Profile/Colors/ColorGradient.cs | 22 ++--- .../Profile/Conditions/EventCondition.cs | 6 +- .../Profile/DataBindings/DataBinding.cs | 2 +- .../Models/Profile/DataModel/DataModelPath.cs | 8 +- .../Profile/DataModel/DataModelPathSegment.cs | 2 +- src/Artemis.Core/Models/Profile/Folder.cs | 2 +- src/Artemis.Core/Models/Profile/Layer.cs | 14 +-- .../Models/Profile/LayerAdapter.cs | 6 +- .../Profile/LayerProperties/LayerProperty.cs | 2 +- .../Models/Profile/LayerPropertyGroup.cs | 4 +- src/Artemis.Core/Models/Profile/Profile.cs | 2 +- .../Models/Profile/ProfileElement.cs | 8 +- .../Models/Profile/RenderProfileElement.cs | 2 +- .../ProfileConfigurationIcon.cs | 2 +- .../Models/Surface/ArtemisDevice.cs | 8 +- .../Models/Surface/Layout/ArtemisLayout.cs | 4 +- .../LayerBrushes/LayerBrushProvider.cs | 2 +- .../LayerEffects/LayerEffectProvider.cs | 2 +- src/Artemis.Core/Plugins/Modules/DataModel.cs | 2 +- src/Artemis.Core/Plugins/Modules/Module.cs | 6 +- .../Plugins/Nodes/NodeProvider.cs | 2 +- src/Artemis.Core/Plugins/Plugin.cs | 4 +- src/Artemis.Core/Plugins/PluginFeatureInfo.cs | 2 +- src/Artemis.Core/Plugins/PluginInfo.cs | 22 ++--- .../Services/Core/SurfaceManager.cs | 6 +- .../Services/Input/InputService.cs | 8 +- .../Interfaces/IPluginManagementService.cs | 16 ++- .../Services/PluginManagementService.cs | 29 +++++- .../ProcessMonitoring/ProcessMonitor.cs | 2 +- src/Artemis.Core/Services/RenderService.cs | 2 +- .../Storage/Models/SurfaceArrangement.cs | 4 +- .../Storage/Models/SurfaceArrangementType.cs | 2 +- .../Services/Storage/ProfileService.cs | 6 +- .../WebServer/EndPoints/PluginEndPoint.cs | 2 +- .../Services/WebServer/WebServerService.cs | 2 +- src/Artemis.Core/Stores/DataModelStore.cs | 4 +- src/Artemis.Core/Stores/LayerBrushStore.cs | 4 +- src/Artemis.Core/Stores/LayerEffectStore.cs | 4 +- src/Artemis.Core/Stores/LogStore.cs | 2 +- src/Artemis.Core/Stores/NodeTypeStore.cs | 6 +- .../Extensions/NodeExtension.cs | 2 +- .../VisualScripting/NodeScript.cs | 2 +- .../VisualScripting/Nodes/Node.cs | 8 +- .../Nodes/NodeTStorageTViewModel.cs | 2 +- src/Artemis.Core/VisualScripting/Pins/Pin.cs | 2 +- .../VisualScripting/Pins/PinCollection.cs | 2 +- .../Entities/Plugins/PluginEntity.cs | 2 +- .../Profile/Abstract/RenderElementEntity.cs | 2 +- .../Entities/Profile/LayerEntity.cs | 4 +- .../Entities/Profile/Nodes/NodeEntity.cs | 2 +- .../Profile/Nodes/NodeScriptEntity.cs | 4 +- .../Entities/Profile/ProfileCategoryEntity.cs | 2 +- .../Entities/Profile/ProfileEntity.cs | 6 +- .../Entities/Profile/PropertyEntity.cs | 2 +- .../Entities/Profile/PropertyGroupEntity.cs | 4 +- .../Entities/Surface/DeviceEntity.cs | 6 +- .../Storage/M0023LayoutProviders.cs | 2 +- .../Migrations/Storage/M0024NodeProviders.cs | 4 +- .../M0025NodeProvidersProfileConfig.cs | 2 +- .../Migrations/Storage/M0026NodeStorage.cs | 4 +- .../Migrations/Storage/M0027Namespace.cs | 2 +- .../Entities/Plugins/PluginEntity.cs | 2 +- .../Profile/Abstract/RenderElementEntity.cs | 2 +- .../Entities/Profile/LayerEntity.cs | 4 +- .../Entities/Profile/Nodes/NodeEntity.cs | 2 +- .../Profile/Nodes/NodeScriptEntity.cs | 4 +- .../Entities/Profile/ProfileCategoryEntity.cs | 2 +- .../Profile/ProfileContainerEntity.cs | 2 +- .../Entities/Profile/ProfileEntity.cs | 4 +- .../Entities/Profile/PropertyEntity.cs | 2 +- .../Entities/Profile/PropertyGroupEntity.cs | 4 +- .../Entities/Surface/DeviceEntity.cs | 6 +- src/Artemis.UI.Linux/App.axaml.cs | 2 +- .../ApplicationStateManager.cs | 4 +- .../Providers/Input/LinuxInputProvider.cs | 2 +- .../DataModelPicker/DataModelPicker.cs | 6 +- .../DataModelPicker/DataModelPickerButton.cs | 4 +- .../Controls/DeviceVisualizer.cs | 4 +- .../Controls/DeviceVisualizerLed.cs | 6 +- .../Controls/EnumComboBox.axaml.cs | 2 +- .../Controls/GradientPicker/GradientPicker.cs | 2 +- .../GradientPicker/GradientPickerButton.cs | 2 +- .../TagsInput/TagsInput.properties.cs | 2 +- .../ColorGradientToGradientStopsConverter.cs | 4 +- .../Shared/DataModelListViewModel.cs | 2 +- .../Shared/DataModelVisualizationViewModel.cs | 2 +- .../DryIoc/ContainerExtensions.cs | 2 +- .../Extensions/ArtemisLayoutExtensions.cs | 6 +- .../Extensions/VisualExtensions.cs | 4 +- src/Artemis.UI.Shared/ReactiveAppWindow.cs | 2 +- .../Routable/RoutableScreenOfTParam.cs | 2 +- .../Routing/Route/RouteRegistration.cs | 2 +- .../Routing/Route/RouteResolution.cs | 4 +- .../Routing/Router/Navigation.cs | 2 +- .../Routing/Router/NavigationArguments.cs | 2 +- .../Routing/Router/Router.cs | 2 +- .../Builders/FileDialogFilterBuilder.cs | 2 +- .../Builders/OpenFileDialogBuilder.cs | 2 +- .../Builders/SaveFileDialogBuilder.cs | 2 +- .../Services/DataModelUIService.cs | 4 +- .../NodeEditor/NodeConnectionStore.cs | 4 +- .../NodeEditor/NodeEditorCommandScope.cs | 2 +- .../ProfileEditorCommandScope.cs | 2 +- .../PropertyInput/PropertyInputService.cs | 4 +- .../Services/Window/ExceptionDialogView.axaml | 4 +- src/Artemis.UI.Windows/App.axaml.cs | 2 +- .../ApplicationStateManager.cs | 2 +- .../SkiaSharp/Vulkan/Win32VkContext.cs | 8 +- src/Artemis.UI/Artemis.UI.csproj | 11 --- src/Artemis.UI/Controls/TimelineHeader.cs | 30 +++--- src/Artemis.UI/DryIoc/ContainerExtensions.cs | 2 +- src/Artemis.UI/DryIoc/Factories/IVMFactory.cs | 98 +++++++++---------- .../LayerPropertyViewModelInstanceProvider.cs | 4 +- src/Artemis.UI/Models/FolderClipboardModel.cs | 8 +- src/Artemis.UI/Models/NodesClipboardModel.cs | 6 +- .../Screens/Debugger/DebugViewModel.cs | 2 +- .../Tabs/DataModel/DataModelDebugViewModel.cs | 4 +- .../PerformanceDebugPluginViewModel.cs | 2 +- .../PerformanceDebugProfilerViewModel.cs | 2 +- .../Performance/PerformanceDebugViewModel.cs | 2 +- .../Device/DevicePropertiesViewModel.cs | 4 +- .../InputMappingsTabViewModel.cs | 2 +- ...uginPrerequisitesInstallDialogViewModel.cs | 2 +- ...inPrerequisitesUninstallDialogViewModel.cs | 4 +- .../Plugins/Features/PluginFeatureView.axaml | 2 +- .../Features/PluginFeatureViewModel.cs | 6 +- .../Screens/Plugins/PluginSettingsView.axaml | 17 +++- .../Plugins/PluginSettingsViewModel.cs | 31 ++++-- .../Screens/Plugins/PluginView.axaml | 34 +++---- .../Screens/Plugins/PluginViewModel.cs | 61 ++++++++---- .../DisplayConditionScriptViewModel.cs | 16 +-- .../Behaviors/ProfileTreeViewDropHandler.cs | 2 +- .../SingleLedAdaptionHintViewModel.cs | 2 +- .../Dialogs/LayerHintsDialogViewModel.cs | 2 +- .../ProfileTree/ProfileTreeViewModel.cs | 2 +- .../Panels/ProfileTree/TreeItemViewModel.cs | 2 +- .../Panels/Properties/PropertiesViewModel.cs | 4 +- .../Properties/PropertyGroupViewModel.cs | 6 +- .../Keyframes/TimelineEasingViewModel.cs | 2 +- .../Keyframes/TimelineKeyframeViewModel.cs | 4 +- .../Timeline/TimelineGroupViewModel.cs | 2 +- .../Timeline/TimelinePropertyViewModel.cs | 2 +- .../Properties/Tree/TreeGroupViewModel.cs | 4 +- .../Tools/TransformToolView.axaml.cs | 2 +- .../Tools/TransformToolViewModel.cs | 2 +- .../Screens/Settings/SettingsViewModel.cs | 18 ++-- .../Settings/Tabs/AccountTabViewModel.cs | 2 +- .../Settings/Tabs/DevicesTabViewModel.cs | 2 +- .../Settings/Tabs/GeneralTabViewModel.cs | 14 +-- .../Settings/Tabs/PluginsTabViewModel.cs | 32 +++--- .../ModuleActivationRequirementsViewModel.cs | 2 +- .../Screens/Sidebar/SidebarScreenViewModel.cs | 2 +- .../Screens/Sidebar/SidebarViewModel.cs | 27 +++-- .../WizardPluginFeatureViewModel.cs | 6 +- .../SurfaceEditor/SurfaceDeviceView.axaml.cs | 4 +- .../VisualScripting/CableView.axaml.cs | 8 +- .../VisualScripting/DragCableView.axaml.cs | 8 +- .../VisualScripting/NodeMenuItemViewModel.cs | 2 +- .../Screens/VisualScripting/NodeView.axaml.cs | 4 +- .../Pins/PinCollectionViewModel.cs | 2 +- .../Categories/CategoriesViewModel.cs | 2 +- .../Details/EntrySpecificationsViewModel.cs | 6 +- .../Workshop/Entries/EntriesViewModel.cs | 12 +-- .../Entries/List/EntryListViewModel.cs | 10 +- .../Library/SubmissionDetailsViewModel.cs | 4 +- .../Library/Tabs/InstalledTabItemViewModel.cs | 6 +- .../Library/WorkshopLibraryViewModel.cs | 10 +- .../Workshop/Plugins/PluginManageView.axaml | 20 ++-- .../Workshop/Plugins/PluginManageViewModel.cs | 14 ++- .../Models/SubmissionWizardState.cs | 6 +- .../Steps/Layout/LayoutInfoStepViewModel.cs | 4 +- .../Services/DeviceLayoutService.cs | 2 +- .../ProfileEditor/Commands/PasteKeyframes.cs | 2 +- .../DryIoc/ContainerExtensions.cs | 2 +- .../Implementations/LayoutEntrySource.cs | 2 +- src/Artemis.sln | 2 +- src/Directory.Packages.props | 10 +- 184 files changed, 598 insertions(+), 523 deletions(-) diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj index 3ebf067a5..e61ffec1e 100644 --- a/src/Artemis.Core/Artemis.Core.csproj +++ b/src/Artemis.Core/Artemis.Core.csproj @@ -10,7 +10,6 @@ x64 true ArtemisRGB.Core - 1 enable true diff --git a/src/Artemis.Core/ColorScience/Quantization/ColorQuantizer.cs b/src/Artemis.Core/ColorScience/Quantization/ColorQuantizer.cs index b2bf6f797..322ecdbea 100644 --- a/src/Artemis.Core/ColorScience/Quantization/ColorQuantizer.cs +++ b/src/Artemis.Core/ColorScience/Quantization/ColorQuantizer.cs @@ -151,19 +151,19 @@ public static class ColorQuantizer { SKColor[] colors = QuantizeSplit(bitmap.Pixels, 8); ColorSwatch swatch = FindAllColorVariations(colors); - SKColor[] swatchArray = new SKColor[] - { + SKColor[] swatchArray = + [ swatch.Muted, swatch.Vibrant, swatch.DarkMuted, swatch.DarkVibrant, swatch.LightMuted, swatch.LightVibrant - }; + ]; ColorSorter.Sort(swatchArray, SKColors.Black); - ColorGradient gradient = new(); + ColorGradient gradient = []; for (int i = 0; i < swatchArray.Length; i++) gradient.Add(new ColorGradientStop(swatchArray[i], (float)i / (swatchArray.Length - 1))); diff --git a/src/Artemis.Core/Constants.cs b/src/Artemis.Core/Constants.cs index 5699dbac4..21e819b2d 100644 --- a/src/Artemis.Core/Constants.cs +++ b/src/Artemis.Core/Constants.cs @@ -70,13 +70,7 @@ public static class Constants /// The full path to the Artemis user layouts folder /// public static readonly string WorkshopFolder = Path.Combine(DataFolder, "workshop"); - - /// - /// The current API version for plugins - /// - public static readonly int PluginApiVersion = int.Parse(CoreAssembly.GetCustomAttributes().FirstOrDefault(a => a.Key == "PluginApiVersion")?.Value ?? - throw new InvalidOperationException("Cannot find PluginApiVersion metadata in assembly")); - + /// /// The current version of the application /// diff --git a/src/Artemis.Core/DefaultTypes/Properties/ColorGradientLayerProperty.cs b/src/Artemis.Core/DefaultTypes/Properties/ColorGradientLayerProperty.cs index b108d81f1..7cd5476b7 100644 --- a/src/Artemis.Core/DefaultTypes/Properties/ColorGradientLayerProperty.cs +++ b/src/Artemis.Core/DefaultTypes/Properties/ColorGradientLayerProperty.cs @@ -6,7 +6,7 @@ public class ColorGradientLayerProperty : LayerProperty internal ColorGradientLayerProperty() { KeyframesSupported = false; - DefaultValue = new ColorGradient(); + DefaultValue = []; } /// diff --git a/src/Artemis.Core/DryIoc/ContainerExtensions.cs b/src/Artemis.Core/DryIoc/ContainerExtensions.cs index eaa2282a8..46cf80a6a 100644 --- a/src/Artemis.Core/DryIoc/ContainerExtensions.cs +++ b/src/Artemis.Core/DryIoc/ContainerExtensions.cs @@ -54,7 +54,7 @@ public static class ContainerExtensions // Bind plugin service interfaces, DryIoc expects at least one match when calling RegisterMany so ensure there is something to register first if (plugin.Assembly != null && plugin.Assembly.GetTypes().Any(t => t.IsAssignableTo())) - container.RegisterMany(new[] {plugin.Assembly}, type => type.IsAssignableTo(), Reuse.Singleton, ifAlreadyRegistered: IfAlreadyRegistered.Keep); + container.RegisterMany([plugin.Assembly], type => type.IsAssignableTo(), Reuse.Singleton, ifAlreadyRegistered: IfAlreadyRegistered.Keep); } private static bool HasAccessToProtectedService(Request request) diff --git a/src/Artemis.Core/DryIoc/Factories/PluginSettingsFactory.cs b/src/Artemis.Core/DryIoc/Factories/PluginSettingsFactory.cs index 7684b2b43..aa8d3564f 100644 --- a/src/Artemis.Core/DryIoc/Factories/PluginSettingsFactory.cs +++ b/src/Artemis.Core/DryIoc/Factories/PluginSettingsFactory.cs @@ -8,7 +8,7 @@ namespace Artemis.Core.DryIoc.Factories; internal class PluginSettingsFactory : IPluginSettingsFactory { - private static readonly List PluginSettings = new(); + private static readonly List PluginSettings = []; private readonly IPluginManagementService _pluginManagementService; private readonly IPluginRepository _pluginRepository; diff --git a/src/Artemis.Core/Extensions/TypeExtensions.cs b/src/Artemis.Core/Extensions/TypeExtensions.cs index 9e6ba83e3..2972c79ec 100644 --- a/src/Artemis.Core/Extensions/TypeExtensions.cs +++ b/src/Artemis.Core/Extensions/TypeExtensions.cs @@ -14,15 +14,15 @@ public static class TypeExtensions { private static readonly Dictionary> PrimitiveTypeConversions = new() { - {typeof(decimal), new List {typeof(sbyte), typeof(byte), typeof(short), typeof(ushort), typeof(int), typeof(uint), typeof(long), typeof(ulong), typeof(char)}}, - {typeof(double), new List {typeof(sbyte), typeof(byte), typeof(short), typeof(ushort), typeof(int), typeof(uint), typeof(long), typeof(ulong), typeof(char), typeof(float)}}, - {typeof(float), new List {typeof(sbyte), typeof(byte), typeof(short), typeof(ushort), typeof(int), typeof(uint), typeof(long), typeof(ulong), typeof(char), typeof(float)}}, - {typeof(ulong), new List {typeof(byte), typeof(ushort), typeof(uint), typeof(char)}}, - {typeof(long), new List {typeof(sbyte), typeof(byte), typeof(short), typeof(ushort), typeof(int), typeof(uint), typeof(char)}}, - {typeof(uint), new List {typeof(byte), typeof(ushort), typeof(char)}}, - {typeof(int), new List {typeof(sbyte), typeof(byte), typeof(short), typeof(ushort), typeof(char)}}, - {typeof(ushort), new List {typeof(byte), typeof(char)}}, - {typeof(short), new List {typeof(byte)}} + {typeof(decimal), [typeof(sbyte), typeof(byte), typeof(short), typeof(ushort), typeof(int), typeof(uint), typeof(long), typeof(ulong), typeof(char)]}, + {typeof(double), [typeof(sbyte), typeof(byte), typeof(short), typeof(ushort), typeof(int), typeof(uint), typeof(long), typeof(ulong), typeof(char), typeof(float)]}, + {typeof(float), [typeof(sbyte), typeof(byte), typeof(short), typeof(ushort), typeof(int), typeof(uint), typeof(long), typeof(ulong), typeof(char), typeof(float)]}, + {typeof(ulong), [typeof(byte), typeof(ushort), typeof(uint), typeof(char)]}, + {typeof(long), [typeof(sbyte), typeof(byte), typeof(short), typeof(ushort), typeof(int), typeof(uint), typeof(char)]}, + {typeof(uint), [typeof(byte), typeof(ushort), typeof(char)]}, + {typeof(int), [typeof(sbyte), typeof(byte), typeof(short), typeof(ushort), typeof(char)]}, + {typeof(ushort), [typeof(byte), typeof(char)]}, + {typeof(short), [typeof(byte)]} }; private static readonly Dictionary TypeKeywords = new() diff --git a/src/Artemis.Core/Models/Profile/Colors/ColorGradient.cs b/src/Artemis.Core/Models/Profile/Colors/ColorGradient.cs index a4ea63a11..d36a07a4c 100644 --- a/src/Artemis.Core/Models/Profile/Colors/ColorGradient.cs +++ b/src/Artemis.Core/Models/Profile/Colors/ColorGradient.cs @@ -14,7 +14,7 @@ namespace Artemis.Core; public class ColorGradient : IList, IList, INotifyCollectionChanged { private static readonly SKColor[] FAST_LED_RAINBOW = - { + [ new(0xFFFF0000), // Red new(0xFFFF9900), // Orange new(0xFFFFFF00), // Yellow @@ -24,11 +24,11 @@ public class ColorGradient : IList, IList, INotifyCollectionC new(0xFF9E22FF), // Purple new(0xFFFF34AE), // Pink new(0xFFFF0000) // and back to Red - }; + ]; private readonly List _stops; - private SKColor[] _colors = Array.Empty(); - private float[] _positions = Array.Empty(); + private SKColor[] _colors = []; + private float[] _positions = []; private bool _dirty = true; private bool _updating; @@ -51,7 +51,7 @@ public class ColorGradient : IList, IList, INotifyCollectionC /// public ColorGradient() { - _stops = new List(); + _stops = []; } /// @@ -60,7 +60,7 @@ public class ColorGradient : IList, IList, INotifyCollectionC /// The color gradient to copy public ColorGradient(ColorGradient? colorGradient) { - _stops = new List(); + _stops = []; if (colorGradient == null) return; @@ -79,7 +79,7 @@ public class ColorGradient : IList, IList, INotifyCollectionC /// The stops to copy public ColorGradient(List stops) { - _stops = new List(); + _stops = []; foreach (ColorGradientStop colorGradientStop in stops) { ColorGradientStop stop = new(colorGradientStop.Color, colorGradientStop.Position); @@ -104,7 +104,7 @@ public class ColorGradient : IList, IList, INotifyCollectionC if (timesToRepeat == 0 && !seamless) return Colors; - List result = new(); + List result = []; if (timesToRepeat == 0) result = this.Select(c => c.Color).ToList(); else @@ -132,7 +132,7 @@ public class ColorGradient : IList, IList, INotifyCollectionC if (timesToRepeat == 0 && seamless) return Positions; - List result = new(); + List result = []; if (timesToRepeat == 0) { result = this.Select(c => c.Position).ToList(); @@ -456,7 +456,7 @@ public class ColorGradient : IList, IList, INotifyCollectionC /// public static ColorGradient GetUnicornBarf() { - ColorGradient gradient = new(); + ColorGradient gradient = []; for (int index = 0; index < FAST_LED_RAINBOW.Length; index++) { SKColor skColor = FAST_LED_RAINBOW[index]; @@ -473,7 +473,7 @@ public class ColorGradient : IList, IList, INotifyCollectionC /// The amount of stops to add public static ColorGradient GetRandom(int stops) { - ColorGradient gradient = new(); + ColorGradient gradient = []; gradient.Randomize(stops); return gradient; } diff --git a/src/Artemis.Core/Models/Profile/Conditions/EventCondition.cs b/src/Artemis.Core/Models/Profile/Conditions/EventCondition.cs index 826634d67..bbe50bdc1 100644 --- a/src/Artemis.Core/Models/Profile/Conditions/EventCondition.cs +++ b/src/Artemis.Core/Models/Profile/Conditions/EventCondition.cs @@ -34,7 +34,7 @@ public class EventCondition : CorePropertyChanged, INodeScriptCondition _entity = new EventConditionEntity(); _displayName = profileElement.GetType().Name; _startNode = new EventConditionEventStartNode {X = -300}; - _script = new NodeScript($"Activate {_displayName}", $"Whether or not the event should activate the {_displayName}", ProfileElement.Profile, new List {_startNode}); + _script = new NodeScript($"Activate {_displayName}", $"Whether or not the event should activate the {_displayName}", ProfileElement.Profile, [_startNode]); } internal EventCondition(EventConditionEntity entity, RenderProfileElement profileElement) @@ -288,8 +288,8 @@ public class EventCondition : CorePropertyChanged, INodeScriptCondition string name = $"Activate {_displayName}"; string description = $"Whether or not the event should activate the {_displayName}"; Script = _entity.Script != null - ? new NodeScript(name, description, _entity.Script, ProfileElement.Profile, new List {_startNode}) - : new NodeScript(name, description, ProfileElement.Profile, new List {_startNode}); + ? new NodeScript(name, description, _entity.Script, ProfileElement.Profile, [_startNode]) + : new NodeScript(name, description, ProfileElement.Profile, [_startNode]); } /// diff --git a/src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs b/src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs index 9bf8e94e6..1b1175a78 100644 --- a/src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs +++ b/src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs @@ -9,7 +9,7 @@ namespace Artemis.Core; /// public class DataBinding : IDataBinding { - private readonly List _properties = new(); + private readonly List _properties = []; private bool _disposed; private bool _isEnabled; private DataBindingNodeScript _script; diff --git a/src/Artemis.Core/Models/Profile/DataModel/DataModelPath.cs b/src/Artemis.Core/Models/Profile/DataModel/DataModelPath.cs index 8440e8016..62ebd93bb 100644 --- a/src/Artemis.Core/Models/Profile/DataModel/DataModelPath.cs +++ b/src/Artemis.Core/Models/Profile/DataModel/DataModelPath.cs @@ -27,7 +27,7 @@ public class DataModelPath : IStorageModel, IDisposable, IPluginFeatureDependent Path = ""; Entity = new DataModelPathEntity(); - _segments = new LinkedList(); + _segments = []; Save(); Initialize(); @@ -45,7 +45,7 @@ public class DataModelPath : IStorageModel, IDisposable, IPluginFeatureDependent Path = path ?? throw new ArgumentNullException(nameof(path)); Entity = new DataModelPathEntity(); - _segments = new LinkedList(); + _segments = []; Save(); Initialize(); @@ -65,7 +65,7 @@ public class DataModelPath : IStorageModel, IDisposable, IPluginFeatureDependent Path = dataModelPath.Path; Entity = new DataModelPathEntity(); - _segments = new LinkedList(); + _segments = []; Save(); Initialize(); @@ -81,7 +81,7 @@ public class DataModelPath : IStorageModel, IDisposable, IPluginFeatureDependent Path = entity.Path; Entity = entity; - _segments = new LinkedList(); + _segments = []; Load(); Initialize(); diff --git a/src/Artemis.Core/Models/Profile/DataModel/DataModelPathSegment.cs b/src/Artemis.Core/Models/Profile/DataModel/DataModelPathSegment.cs index 464bbb58c..f1c71bd34 100644 --- a/src/Artemis.Core/Models/Profile/DataModel/DataModelPathSegment.cs +++ b/src/Artemis.Core/Models/Profile/DataModel/DataModelPathSegment.cs @@ -242,7 +242,7 @@ public class DataModelPathSegment : IDisposable accessorExpression = Expression.Call( expression, nameof(DataModel.GetDynamicChildValue), - _dynamicDataModelType != null ? new[] {_dynamicDataModelType} : null, + _dynamicDataModelType != null ? [_dynamicDataModelType] : null, Expression.Constant(Identifier) ); diff --git a/src/Artemis.Core/Models/Profile/Folder.cs b/src/Artemis.Core/Models/Profile/Folder.cs index 99ea6f0e1..548931484 100644 --- a/src/Artemis.Core/Models/Profile/Folder.cs +++ b/src/Artemis.Core/Models/Profile/Folder.cs @@ -77,7 +77,7 @@ public sealed class Folder : RenderProfileElement /// public override List GetAllLayerProperties() { - List result = new(); + List result = []; foreach (BaseLayerEffect layerEffect in LayerEffects) { if (layerEffect.BaseProperties != null) diff --git a/src/Artemis.Core/Models/Profile/Layer.cs b/src/Artemis.Core/Models/Profile/Layer.cs index bed5609f5..88f605584 100644 --- a/src/Artemis.Core/Models/Profile/Layer.cs +++ b/src/Artemis.Core/Models/Profile/Layer.cs @@ -19,13 +19,13 @@ public sealed class Layer : RenderProfileElement private const string BROKEN_STATE_BRUSH_NOT_FOUND = "Failed to load layer brush, ensure the plugin is enabled"; private const string BROKEN_STATE_INIT_FAILED = "Failed to initialize layer brush"; - private readonly List _renderCopies = new(); + private readonly List _renderCopies = []; private LayerGeneralProperties _general = new(); private LayerTransformProperties _transform = new(); private BaseLayerBrush? _layerBrush; private LayerShape? _layerShape; - private List _leds = new(); - private List _missingLeds = new(); + private List _leds = []; + private List _missingLeds = []; /// /// Creates a new instance of the class and adds itself to the child collection of the provided @@ -82,11 +82,11 @@ public sealed class Layer : RenderProfileElement Parent = source; // TODO: move to top - _renderCopies = new List(); + _renderCopies = []; _general = new LayerGeneralProperties(); _transform = new LayerTransformProperties(); - _leds = new List(); + _leds = []; Leds = new ReadOnlyCollection(_leds); Adapter = new LayerAdapter(this); @@ -169,7 +169,7 @@ public sealed class Layer : RenderProfileElement /// public override List GetAllLayerProperties() { - List result = new(); + List result = []; result.AddRange(General.GetAllLayerProperties()); result.AddRange(Transform.GetAllLayerProperties()); if (LayerBrush?.BaseProperties != null) @@ -801,7 +801,7 @@ public sealed class Layer : RenderProfileElement if (Disposed) throw new ObjectDisposedException("Layer"); - List leds = new(); + List leds = []; // Get the surface LEDs for this layer List availableLeds = devices.SelectMany(d => d.Leds).ToList(); diff --git a/src/Artemis.Core/Models/Profile/LayerAdapter.cs b/src/Artemis.Core/Models/Profile/LayerAdapter.cs index 72b29719c..044291e13 100644 --- a/src/Artemis.Core/Models/Profile/LayerAdapter.cs +++ b/src/Artemis.Core/Models/Profile/LayerAdapter.cs @@ -17,7 +17,7 @@ public class LayerAdapter : IStorageModel internal LayerAdapter(Layer layer) { - _adaptionHints = new List(); + _adaptionHints = []; Layer = layer; AdaptionHints = new ReadOnlyCollection(_adaptionHints); } @@ -48,7 +48,7 @@ public class LayerAdapter : IStorageModel else { List availableLeds = devices.SelectMany(d => d.Leds).ToList(); - List usedLeds = new(); + List usedLeds = []; foreach (LedEntity ledEntity in Layer.LayerEntity.Leds) { @@ -73,7 +73,7 @@ public class LayerAdapter : IStorageModel /// public List DetermineHints(IEnumerable devices) { - List newHints = new(); + List newHints = []; if (devices.All(DoesLayerCoverDevice)) { DeviceAdaptionHint hint = new() {DeviceType = RGBDeviceType.All}; diff --git a/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs b/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs index 85dcba517..bff1f32b6 100644 --- a/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs +++ b/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs @@ -44,7 +44,7 @@ public class LayerProperty : CorePropertyChanged, ILayerProperty else _baseValue = default!; - _keyframes = new List>(); + _keyframes = []; Keyframes = new ReadOnlyCollection>(_keyframes); } diff --git a/src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs b/src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs index 84de5c444..b8fc40c5c 100644 --- a/src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs +++ b/src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs @@ -32,8 +32,8 @@ public abstract class LayerPropertyGroup : IDisposable, IPluginFeatureDependent GroupDescription = null!; Path = ""; - _layerProperties = new List(); - _layerPropertyGroups = new List(); + _layerProperties = []; + _layerPropertyGroups = []; LayerProperties = new ReadOnlyCollection(_layerProperties); LayerPropertyGroups = new ReadOnlyCollection(_layerPropertyGroups); diff --git a/src/Artemis.Core/Models/Profile/Profile.cs b/src/Artemis.Core/Models/Profile/Profile.cs index 187d9c423..c6db0e4f3 100644 --- a/src/Artemis.Core/Models/Profile/Profile.cs +++ b/src/Artemis.Core/Models/Profile/Profile.cs @@ -23,7 +23,7 @@ public sealed class Profile : ProfileElement ProfileEntity = profileEntity; EntityId = profileEntity.Id; - Exceptions = new List(); + Exceptions = []; Load(); } diff --git a/src/Artemis.Core/Models/Profile/ProfileElement.cs b/src/Artemis.Core/Models/Profile/ProfileElement.cs index 921910db5..9e05db16f 100644 --- a/src/Artemis.Core/Models/Profile/ProfileElement.cs +++ b/src/Artemis.Core/Models/Profile/ProfileElement.cs @@ -22,7 +22,7 @@ public abstract class ProfileElement : BreakableModel, IDisposable, IPluginFeatu internal ProfileElement(Profile profile) { _profile = profile; - ChildrenList = new List(); + ChildrenList = []; Children = new ReadOnlyCollection(ChildrenList); } @@ -280,7 +280,7 @@ public abstract class ProfileElement : BreakableModel, IDisposable, IPluginFeatu if (Disposed) throw new ObjectDisposedException(GetType().Name); - List elements = new(); + List elements = []; foreach (RenderProfileElement childElement in Children.Where(c => c is RenderProfileElement).Cast()) { // Add all folders in this element @@ -301,7 +301,7 @@ public abstract class ProfileElement : BreakableModel, IDisposable, IPluginFeatu if (Disposed) throw new ObjectDisposedException(GetType().Name); - List folders = new(); + List folders = []; foreach (Folder childFolder in Children.Where(c => c is Folder).Cast()) { // Add all folders in this element @@ -322,7 +322,7 @@ public abstract class ProfileElement : BreakableModel, IDisposable, IPluginFeatu if (Disposed) throw new ObjectDisposedException(GetType().Name); - List layers = new(); + List layers = []; // Add all layers in this element layers.AddRange(Children.Where(c => c is Layer).Cast()); diff --git a/src/Artemis.Core/Models/Profile/RenderProfileElement.cs b/src/Artemis.Core/Models/Profile/RenderProfileElement.cs index 9a87edc67..5394a4c53 100644 --- a/src/Artemis.Core/Models/Profile/RenderProfileElement.cs +++ b/src/Artemis.Core/Models/Profile/RenderProfileElement.cs @@ -21,7 +21,7 @@ public abstract class RenderProfileElement : ProfileElement internal RenderProfileElement(ProfileElement parent, Profile profile) : base(profile) { - _layerEffects = new List(); + _layerEffects = []; _displayCondition = new AlwaysOnCondition(this); Timeline = new Timeline(); LayerEffects = new ReadOnlyCollection(_layerEffects); diff --git a/src/Artemis.Core/Models/ProfileConfiguration/ProfileConfigurationIcon.cs b/src/Artemis.Core/Models/ProfileConfiguration/ProfileConfigurationIcon.cs index c935836db..d1cff7a19 100644 --- a/src/Artemis.Core/Models/ProfileConfiguration/ProfileConfigurationIcon.cs +++ b/src/Artemis.Core/Models/ProfileConfiguration/ProfileConfigurationIcon.cs @@ -130,7 +130,7 @@ public class ProfileConfigurationIcon : CorePropertyChanged, IStorageModel _entity.ProfileConfiguration.IconType = (int) IconType; _entity.ProfileConfiguration.MaterialIcon = IconType == ProfileConfigurationIconType.MaterialIcon ? IconName : null; _entity.ProfileConfiguration.IconFill = Fill; - _entity.Icon = IconBytes ?? Array.Empty(); + _entity.Icon = IconBytes ?? []; } #endregion diff --git a/src/Artemis.Core/Models/Surface/ArtemisDevice.cs b/src/Artemis.Core/Models/Surface/ArtemisDevice.cs index 40482de47..3874d3469 100644 --- a/src/Artemis.Core/Models/Surface/ArtemisDevice.cs +++ b/src/Artemis.Core/Models/Surface/ArtemisDevice.cs @@ -43,9 +43,9 @@ public class ArtemisDevice : CorePropertyChanged LedIds = new ReadOnlyDictionary(new Dictionary()); Leds = new ReadOnlyCollection(new List()); - InputIdentifiers = new List(); + InputIdentifiers = []; InputMappings = new Dictionary(); - Categories = new HashSet(); + Categories = []; LayoutSelection = new LayoutSelection {Type = DefaultLayoutProvider.LAYOUT_TYPE}; RgbDevice.ColorCorrections.Clear(); @@ -72,9 +72,9 @@ public class ArtemisDevice : CorePropertyChanged LedIds = new ReadOnlyDictionary(new Dictionary()); Leds = new ReadOnlyCollection(new List()); - InputIdentifiers = new List(); + InputIdentifiers = []; InputMappings = new Dictionary(); - Categories = new HashSet(); + Categories = []; LayoutSelection = new LayoutSelection {Type = DefaultLayoutProvider.LAYOUT_TYPE}; foreach (DeviceInputIdentifierEntity identifierEntity in DeviceEntity.InputIdentifiers) diff --git a/src/Artemis.Core/Models/Surface/Layout/ArtemisLayout.cs b/src/Artemis.Core/Models/Surface/Layout/ArtemisLayout.cs index 44ddbf082..20309d906 100644 --- a/src/Artemis.Core/Models/Surface/Layout/ArtemisLayout.cs +++ b/src/Artemis.Core/Models/Surface/Layout/ArtemisLayout.cs @@ -21,7 +21,7 @@ public class ArtemisLayout public ArtemisLayout(string filePath) { FilePath = filePath; - Leds = new List(); + Leds = []; IsDefaultLayout = filePath.StartsWith(DefaultLayoutPath); LoadLayout(); @@ -70,7 +70,7 @@ public class ArtemisLayout device.Size = new Size(MathF.Round(RgbLayout.Width), MathF.Round(RgbLayout.Height)); device.DeviceInfo.LayoutMetadata = RgbLayout.CustomData; - HashSet ledIds = new(); + HashSet ledIds = []; foreach (ILedLayout layoutLed in RgbLayout.Leds) { if (Enum.TryParse(layoutLed.Id, true, out LedId ledId)) diff --git a/src/Artemis.Core/Plugins/LayerBrushes/LayerBrushProvider.cs b/src/Artemis.Core/Plugins/LayerBrushes/LayerBrushProvider.cs index 5ef30246c..fce7eb3b2 100644 --- a/src/Artemis.Core/Plugins/LayerBrushes/LayerBrushProvider.cs +++ b/src/Artemis.Core/Plugins/LayerBrushes/LayerBrushProvider.cs @@ -16,7 +16,7 @@ public abstract class LayerBrushProvider : PluginFeature /// protected LayerBrushProvider() { - _layerBrushDescriptors = new List(); + _layerBrushDescriptors = []; LayerBrushDescriptors = new ReadOnlyCollection(_layerBrushDescriptors); Disabled += OnDisabled; } diff --git a/src/Artemis.Core/Plugins/LayerEffects/LayerEffectProvider.cs b/src/Artemis.Core/Plugins/LayerEffects/LayerEffectProvider.cs index 4c307acd3..95b2c055b 100644 --- a/src/Artemis.Core/Plugins/LayerEffects/LayerEffectProvider.cs +++ b/src/Artemis.Core/Plugins/LayerEffects/LayerEffectProvider.cs @@ -16,7 +16,7 @@ public abstract class LayerEffectProvider : PluginFeature /// protected LayerEffectProvider() { - _layerEffectDescriptors = new List(); + _layerEffectDescriptors = []; LayerEffectDescriptors = new ReadOnlyCollection(_layerEffectDescriptors); Disabled += OnDisabled; } diff --git a/src/Artemis.Core/Plugins/Modules/DataModel.cs b/src/Artemis.Core/Plugins/Modules/DataModel.cs index 1bdf68094..2d82d8037 100644 --- a/src/Artemis.Core/Plugins/Modules/DataModel.cs +++ b/src/Artemis.Core/Plugins/Modules/DataModel.cs @@ -15,7 +15,7 @@ namespace Artemis.Core.Modules; public abstract class DataModel { private const StringComparison PathsStringComparison = StringComparison.OrdinalIgnoreCase; - private readonly List _activePaths = new(); + private readonly List _activePaths = []; private readonly HashSet _activePathsHashSet = new(StringComparer.FromComparison(PathsStringComparison)); private readonly Dictionary _dynamicChildren = new(); diff --git a/src/Artemis.Core/Plugins/Modules/Module.cs b/src/Artemis.Core/Plugins/Modules/Module.cs index 94f73228b..4526090e0 100644 --- a/src/Artemis.Core/Plugins/Modules/Module.cs +++ b/src/Artemis.Core/Plugins/Modules/Module.cs @@ -111,13 +111,13 @@ public abstract class Module : Module where T : DataModel, new() /// public abstract class Module : PluginFeature { - private readonly List<(DefaultCategoryName, string)> _defaultProfilePaths = new(); - private readonly List<(DefaultCategoryName, string)> _pendingDefaultProfilePaths = new(); + private readonly List<(DefaultCategoryName, string)> _defaultProfilePaths = []; + private readonly List<(DefaultCategoryName, string)> _pendingDefaultProfilePaths = []; /// /// Gets a list of all properties ignored at runtime using IgnoreProperty(x => x.y) /// - protected internal readonly List HiddenPropertiesList = new(); + protected internal readonly List HiddenPropertiesList = []; /// /// The base constructor of the class. diff --git a/src/Artemis.Core/Plugins/Nodes/NodeProvider.cs b/src/Artemis.Core/Plugins/Nodes/NodeProvider.cs index 24506297e..a60469a05 100644 --- a/src/Artemis.Core/Plugins/Nodes/NodeProvider.cs +++ b/src/Artemis.Core/Plugins/Nodes/NodeProvider.cs @@ -18,7 +18,7 @@ public abstract class NodeProvider : PluginFeature /// public NodeProvider() { - _nodeDescriptors = new List(); + _nodeDescriptors = []; NodeDescriptors = new ReadOnlyCollection(_nodeDescriptors); Disabled += OnDisabled; } diff --git a/src/Artemis.Core/Plugins/Plugin.cs b/src/Artemis.Core/Plugins/Plugin.cs index 6f2d2b4d4..9b6e3a644 100644 --- a/src/Artemis.Core/Plugins/Plugin.cs +++ b/src/Artemis.Core/Plugins/Plugin.cs @@ -31,8 +31,8 @@ public class Plugin : CorePropertyChanged, IDisposable Info.Plugin = this; _loadedFromStorage = loadedFromStorage; - _features = new List(); - _profilers = new List(); + _features = []; + _profilers = []; Features = new ReadOnlyCollection(_features); Profilers = new ReadOnlyCollection(_profilers); diff --git a/src/Artemis.Core/Plugins/PluginFeatureInfo.cs b/src/Artemis.Core/Plugins/PluginFeatureInfo.cs index 77cfb84e7..56a836fda 100644 --- a/src/Artemis.Core/Plugins/PluginFeatureInfo.cs +++ b/src/Artemis.Core/Plugins/PluginFeatureInfo.cs @@ -78,7 +78,7 @@ public class PluginFeatureInfo : IPrerequisitesSubject public PluginFeature? Instance { get; internal set; } /// - public List Prerequisites { get; } = new(); + public List Prerequisites { get; } = []; /// public IEnumerable PlatformPrerequisites => Prerequisites.Where(p => p.AppliesToPlatform()); diff --git a/src/Artemis.Core/Plugins/PluginInfo.cs b/src/Artemis.Core/Plugins/PluginInfo.cs index 5f668f506..279ea6c43 100644 --- a/src/Artemis.Core/Plugins/PluginInfo.cs +++ b/src/Artemis.Core/Plugins/PluginInfo.cs @@ -109,13 +109,7 @@ public class PluginInfo : IPrerequisitesSubject /// [JsonInclude] public PluginPlatform? Platforms { get; internal init; } - - /// - /// Gets the API version the plugin was built for - /// - [JsonInclude] - public Version? Api { get; internal init; } = new(1, 0, 0); - + /// /// Gets the minimum version of Artemis required by this plugin /// @@ -125,27 +119,33 @@ public class PluginInfo : IPrerequisitesSubject /// Gets the plugin this info is associated with /// [JsonIgnore] - public Plugin Plugin { get; internal set; } = null!; + public Plugin? Plugin { get; internal set; } /// /// Gets a string representing either a full path pointing to an svg or the markdown icon /// [JsonIgnore] - public string? ResolvedIcon => Icon == null ? null : Icon.Contains('.') ? Plugin.ResolveRelativePath(Icon) : Icon; + public string? ResolvedIcon => Icon == null ? null : Icon.Contains('.') ? Plugin?.ResolveRelativePath(Icon) : Icon; /// /// Gets a boolean indicating whether this plugin is compatible with the current operating system and API version /// [JsonIgnore] - public bool IsCompatible => Platforms.MatchesCurrentOperatingSystem() && Api != null && Api.Major >= Constants.PluginApiVersion && MatchesMinimumVersion(); + public bool IsCompatible => Platforms.MatchesCurrentOperatingSystem() && MatchesMinimumVersion(); /// [JsonIgnore] - public List Prerequisites { get; } = new(); + public List Prerequisites { get; } = []; /// [JsonIgnore] public IEnumerable PlatformPrerequisites => Prerequisites.Where(p => p.AppliesToPlatform()); + + /// + /// Gets the exception thrown while loading + /// + [JsonIgnore] + public Exception? LoadException { get; internal set; } [JsonIgnore] internal string PreferredPluginDirectory => $"{Main.Split(".dll")[0].Replace("/", "").Replace("\\", "")}-{Guid.ToString().Substring(0, 8)}"; diff --git a/src/Artemis.Core/Services/Core/SurfaceManager.cs b/src/Artemis.Core/Services/Core/SurfaceManager.cs index 7fb7a044c..31c6b697d 100644 --- a/src/Artemis.Core/Services/Core/SurfaceManager.cs +++ b/src/Artemis.Core/Services/Core/SurfaceManager.cs @@ -14,7 +14,7 @@ internal sealed class SurfaceManager : IDisposable { private readonly IRenderer _renderer; private readonly TimerUpdateTrigger _updateTrigger; - private readonly List _devices = new(); + private readonly List _devices = []; private readonly SKTextureBrush _textureBrush = new(null) {CalculationMode = RenderMode.Absolute}; private ListLedGroup? _surfaceLedGroup; @@ -44,7 +44,7 @@ internal sealed class SurfaceManager : IDisposable public void AddDevices(IEnumerable devices) { - List newDevices = new(); + List newDevices = []; lock (_devices) { foreach (ArtemisDevice artemisDevice in devices) @@ -66,7 +66,7 @@ internal sealed class SurfaceManager : IDisposable public void RemoveDevices(IEnumerable devices) { - List removedDevices = new(); + List removedDevices = []; lock (_devices) { foreach (ArtemisDevice artemisDevice in devices) diff --git a/src/Artemis.Core/Services/Input/InputService.cs b/src/Artemis.Core/Services/Input/InputService.cs index 179c6641d..abf0487d9 100644 --- a/src/Artemis.Core/Services/Input/InputService.cs +++ b/src/Artemis.Core/Services/Input/InputService.cs @@ -100,7 +100,7 @@ internal class InputService : IInputService #region Providers - private readonly List _inputProviders = new(); + private readonly List _inputProviders = []; public KeyboardToggleStatus KeyboardToggleStatus { get; private set; } = new(false, false, false); @@ -137,7 +137,7 @@ internal class InputService : IInputService #region Identification private readonly Dictionary, ArtemisDevice> _deviceCache = new(); - private List _devices = new(); + private List _devices = []; private ArtemisDevice? _identifyingDevice; public void IdentifyDevice(ArtemisDevice device) @@ -308,7 +308,7 @@ internal class InputService : IInputService if (device != null) { // Ensure the device is in the dictionary - _pressedKeys.TryAdd(device, new HashSet()); + _pressedKeys.TryAdd(device, []); // Get the hash set of the device HashSet pressedDeviceKeys = _pressedKeys[device]; // See if the key is already pressed @@ -389,7 +389,7 @@ internal class InputService : IInputService #region Mouse - private readonly HashSet _pressedButtons = new(); + private readonly HashSet _pressedButtons = []; private void InputProviderOnMouseButtonDataReceived(object? sender, InputProviderMouseButtonEventArgs e) diff --git a/src/Artemis.Core/Services/Interfaces/IPluginManagementService.cs b/src/Artemis.Core/Services/Interfaces/IPluginManagementService.cs index b6017a5c6..c861d491f 100644 --- a/src/Artemis.Core/Services/Interfaces/IPluginManagementService.cs +++ b/src/Artemis.Core/Services/Interfaces/IPluginManagementService.cs @@ -21,12 +21,12 @@ public interface IPluginManagementService : IArtemisService, IDisposable /// Indicates whether or not plugins are currently being loaded /// bool LoadingPlugins { get; } - + /// /// Indicates whether or not plugins are currently loaded /// bool LoadedPlugins { get; } - + /// /// Loads all installed plugins. If plugins already loaded this will reload them all /// @@ -108,7 +108,13 @@ public interface IPluginManagementService : IArtemisService, IDisposable void DisablePluginFeature(PluginFeature pluginFeature, bool saveState); /// - /// Gets the plugin info of all loaded plugins + /// Gets the plugin info of all plugins, regardless of whether they are currently loaded + /// + /// A list containing all the plugin info + List GetAllPluginInfo(); + + /// + /// Returns a list of all loaded plugins /// /// A list containing all the plugin info List GetAllPlugins(); @@ -149,7 +155,7 @@ public interface IPluginManagementService : IArtemisService, IDisposable /// /// DeviceProvider GetDeviceProviderByDevice(IRGBDevice device); - + /// /// Occurs when a plugin has started loading /// @@ -183,7 +189,7 @@ public interface IPluginManagementService : IArtemisService, IDisposable /// /// Occurs when a plugin is removed /// - event EventHandler PluginRemoved; + event EventHandler PluginRemoved; /// /// Occurs when a plugin feature is being enabled diff --git a/src/Artemis.Core/Services/PluginManagementService.cs b/src/Artemis.Core/Services/PluginManagementService.cs index d0827b7cd..d1e2d7245 100644 --- a/src/Artemis.Core/Services/PluginManagementService.cs +++ b/src/Artemis.Core/Services/PluginManagementService.cs @@ -28,6 +28,7 @@ internal class PluginManagementService : IPluginManagementService private readonly IContainer _container; private readonly ILogger _logger; private readonly IPluginRepository _pluginRepository; + private readonly List _pluginInfos; private readonly List _plugins; private FileSystemWatcher? _hotReloadWatcher; private bool _disposed; @@ -39,20 +40,29 @@ internal class PluginManagementService : IPluginManagementService _logger = logger; _pluginRepository = pluginRepository; _deviceRepository = deviceRepository; - _plugins = new List(); + _pluginInfos = []; + _plugins = []; } - public List AdditionalPluginDirectories { get; } = new(); + public List AdditionalPluginDirectories { get; } = []; public bool LoadingPlugins { get; private set; } public bool LoadedPlugins { get; private set; } + public List GetAllPluginInfo() + { + lock (_pluginInfos) + { + return [.._pluginInfos]; + } + } + public List GetAllPlugins() { lock (_plugins) { - return new List(_plugins); + return [.._plugins]; } } @@ -263,6 +273,13 @@ internal class PluginManagementService : IPluginManagementService if (_plugins.Any(p => p.Guid == pluginInfo.Guid)) throw new ArtemisCoreException($"Cannot load plugin {pluginInfo} because it is using a GUID already used by another plugin"); } + + // There may be info on a plugin that previously failed to load, remove that + lock (_pluginInfos) + { + _pluginInfos.RemoveAll(i => i.Guid == pluginInfo.Guid); + _pluginInfos.Add(pluginInfo); + } // Load the entity and fall back on creating a new one PluginEntity? entity = _pluginRepository.GetPluginByPluginGuid(pluginInfo.Guid); @@ -301,6 +318,7 @@ internal class PluginManagementService : IPluginManagementService } catch (Exception e) { + pluginInfo.LoadException = e; throw new ArtemisPluginException(plugin, "Failed to load the plugins assembly", e); } @@ -312,6 +330,7 @@ internal class PluginManagementService : IPluginManagementService } catch (ReflectionTypeLoadException e) { + pluginInfo.LoadException = e; throw new ArtemisPluginException( plugin, "Failed to initialize the plugin assembly", @@ -471,6 +490,10 @@ internal class PluginManagementService : IPluginManagementService } plugin.Dispose(); + lock (_pluginInfos) + { + _pluginInfos.Remove(plugin.Info); + } lock (_plugins) { _plugins.Remove(plugin); diff --git a/src/Artemis.Core/Services/ProcessMonitoring/ProcessMonitor.cs b/src/Artemis.Core/Services/ProcessMonitoring/ProcessMonitor.cs index aa0cf8d5b..69e0c38b3 100644 --- a/src/Artemis.Core/Services/ProcessMonitoring/ProcessMonitor.cs +++ b/src/Artemis.Core/Services/ProcessMonitoring/ProcessMonitor.cs @@ -28,7 +28,7 @@ public static partial class ProcessMonitor get { lock (LOCK) - return _processes.Values.ToImmutableArray(); + return [.._processes.Values]; } } diff --git a/src/Artemis.Core/Services/RenderService.cs b/src/Artemis.Core/Services/RenderService.cs index 25c6e6185..bf2138dcb 100644 --- a/src/Artemis.Core/Services/RenderService.cs +++ b/src/Artemis.Core/Services/RenderService.cs @@ -15,7 +15,7 @@ namespace Artemis.Core.Services; internal class RenderService : IRenderService, IRenderer, IDisposable { private readonly Stopwatch _frameStopWatch; - private readonly List _updateExceptions = new(); + private readonly List _updateExceptions = []; private readonly ILogger _logger; private readonly IDeviceService _deviceService; diff --git a/src/Artemis.Core/Services/Storage/Models/SurfaceArrangement.cs b/src/Artemis.Core/Services/Storage/Models/SurfaceArrangement.cs index 24cf3ba1d..1d29bc531 100644 --- a/src/Artemis.Core/Services/Storage/Models/SurfaceArrangement.cs +++ b/src/Artemis.Core/Services/Storage/Models/SurfaceArrangement.cs @@ -8,8 +8,8 @@ internal class SurfaceArrangement { public SurfaceArrangement() { - Types = new List(); - ArrangedDevices = new List(); + Types = []; + ArrangedDevices = []; } public List Types { get; } diff --git a/src/Artemis.Core/Services/Storage/Models/SurfaceArrangementType.cs b/src/Artemis.Core/Services/Storage/Models/SurfaceArrangementType.cs index d855b720b..b2a3e24d8 100644 --- a/src/Artemis.Core/Services/Storage/Models/SurfaceArrangementType.cs +++ b/src/Artemis.Core/Services/Storage/Models/SurfaceArrangementType.cs @@ -12,7 +12,7 @@ internal class SurfaceArrangementType SurfaceArrangement = surfaceArrangement; DeviceType = deviceType; ZIndex = zIndex; - Configurations = new List(); + Configurations = []; } public SurfaceArrangement SurfaceArrangement { get; } diff --git a/src/Artemis.Core/Services/Storage/ProfileService.cs b/src/Artemis.Core/Services/Storage/ProfileService.cs index 2c87b52ff..a712c4ae7 100644 --- a/src/Artemis.Core/Services/Storage/ProfileService.cs +++ b/src/Artemis.Core/Services/Storage/ProfileService.cs @@ -23,9 +23,9 @@ internal class ProfileService : IProfileService private readonly IProfileRepository _profileRepository; private readonly IPluginManagementService _pluginManagementService; private readonly IDeviceService _deviceService; - private readonly List _pendingKeyboardEvents = new(); - private readonly List _renderExceptions = new(); - private readonly List _updateExceptions = new(); + private readonly List _pendingKeyboardEvents = []; + private readonly List _renderExceptions = []; + private readonly List _updateExceptions = []; private DateTime _lastRenderExceptionLog; private DateTime _lastUpdateExceptionLog; diff --git a/src/Artemis.Core/Services/WebServer/EndPoints/PluginEndPoint.cs b/src/Artemis.Core/Services/WebServer/EndPoints/PluginEndPoint.cs index 9da53c1c8..62914222b 100644 --- a/src/Artemis.Core/Services/WebServer/EndPoints/PluginEndPoint.cs +++ b/src/Artemis.Core/Services/WebServer/EndPoints/PluginEndPoint.cs @@ -55,7 +55,7 @@ public abstract class PluginEndPoint public FlexibleContentType Returns { get; protected set; } /// - /// Occurs whenever a request threw an unhandled exception + /// Occurs whenever a request threw an Unhandled error /// public event EventHandler? RequestException; diff --git a/src/Artemis.Core/Services/WebServer/WebServerService.cs b/src/Artemis.Core/Services/WebServer/WebServerService.cs index 24f851e83..c57d0bb52 100644 --- a/src/Artemis.Core/Services/WebServer/WebServerService.cs +++ b/src/Artemis.Core/Services/WebServer/WebServerService.cs @@ -42,7 +42,7 @@ internal class WebServerService : IWebServerService, IDisposable { _logger = logger; _coreService = coreService; - _controllers = new List(); + _controllers = []; _webServerEnabledSetting = settingsService.GetSetting("WebServer.Enabled", true); _webServerRemoteAccessSetting = settingsService.GetSetting("WebServer.RemoteAccess", false); diff --git a/src/Artemis.Core/Stores/DataModelStore.cs b/src/Artemis.Core/Stores/DataModelStore.cs index 9bce76bd3..13a5b6260 100644 --- a/src/Artemis.Core/Stores/DataModelStore.cs +++ b/src/Artemis.Core/Stores/DataModelStore.cs @@ -7,7 +7,7 @@ namespace Artemis.Core; internal class DataModelStore { - private static readonly List Registrations = new(); + private static readonly List Registrations = []; public static DataModelRegistration Add(DataModel dataModel) { @@ -43,7 +43,7 @@ internal class DataModelStore { lock (Registrations) { - return new List(Registrations); + return [..Registrations]; } } diff --git a/src/Artemis.Core/Stores/LayerBrushStore.cs b/src/Artemis.Core/Stores/LayerBrushStore.cs index 0828c2b9a..20a26ffe0 100644 --- a/src/Artemis.Core/Stores/LayerBrushStore.cs +++ b/src/Artemis.Core/Stores/LayerBrushStore.cs @@ -7,7 +7,7 @@ namespace Artemis.Core; internal class LayerBrushStore { - private static readonly List Registrations = new(); + private static readonly List Registrations = []; public static LayerBrushRegistration Add(LayerBrushDescriptor descriptor) { @@ -43,7 +43,7 @@ internal class LayerBrushStore { lock (Registrations) { - return new List(Registrations); + return [..Registrations]; } } diff --git a/src/Artemis.Core/Stores/LayerEffectStore.cs b/src/Artemis.Core/Stores/LayerEffectStore.cs index 5656ec894..cd170e105 100644 --- a/src/Artemis.Core/Stores/LayerEffectStore.cs +++ b/src/Artemis.Core/Stores/LayerEffectStore.cs @@ -7,7 +7,7 @@ namespace Artemis.Core; internal class LayerEffectStore { - private static readonly List Registrations = new(); + private static readonly List Registrations = []; public static LayerEffectRegistration Add(LayerEffectDescriptor descriptor) { @@ -43,7 +43,7 @@ internal class LayerEffectStore { lock (Registrations) { - return new List(Registrations); + return [..Registrations]; } } diff --git a/src/Artemis.Core/Stores/LogStore.cs b/src/Artemis.Core/Stores/LogStore.cs index a4a3e66ed..f2ac53628 100644 --- a/src/Artemis.Core/Stores/LogStore.cs +++ b/src/Artemis.Core/Stores/LogStore.cs @@ -12,7 +12,7 @@ public static class LogStore { private static readonly object _lock = new(); - private static readonly LinkedList LinkedList = new(); + private static readonly LinkedList LinkedList = []; /// /// Gets a list containing the last 500 log events. diff --git a/src/Artemis.Core/Stores/NodeTypeStore.cs b/src/Artemis.Core/Stores/NodeTypeStore.cs index 05c31519b..6f5a071a2 100644 --- a/src/Artemis.Core/Stores/NodeTypeStore.cs +++ b/src/Artemis.Core/Stores/NodeTypeStore.cs @@ -8,8 +8,8 @@ namespace Artemis.Core; internal class NodeTypeStore { - private static readonly List Registrations = new(); - private static readonly List ColorRegistrations = new(); + private static readonly List Registrations = []; + private static readonly List ColorRegistrations = []; public static NodeTypeRegistration Add(NodeData nodeData) { @@ -85,7 +85,7 @@ internal class NodeTypeStore { lock (ColorRegistrations) { - return new List(ColorRegistrations); + return [..ColorRegistrations]; } } diff --git a/src/Artemis.Core/VisualScripting/Extensions/NodeExtension.cs b/src/Artemis.Core/VisualScripting/Extensions/NodeExtension.cs index 8d6d8424d..9e074497a 100644 --- a/src/Artemis.Core/VisualScripting/Extensions/NodeExtension.cs +++ b/src/Artemis.Core/VisualScripting/Extensions/NodeExtension.cs @@ -48,7 +48,7 @@ public static class NodeExtension /// if there would be a loop; otherwise . public static bool IsInLoop(this INode node, INode pendingConnection) { - HashSet checkedNodes = new(); + HashSet checkedNodes = []; bool CheckNode(INode checkNode, INode? pending) { diff --git a/src/Artemis.Core/VisualScripting/NodeScript.cs b/src/Artemis.Core/VisualScripting/NodeScript.cs index edf08cdb0..7864300d0 100644 --- a/src/Artemis.Core/VisualScripting/NodeScript.cs +++ b/src/Artemis.Core/VisualScripting/NodeScript.cs @@ -46,7 +46,7 @@ public abstract class NodeScript : CorePropertyChanged, INodeScript /// public string Description { get; } - private readonly List _nodes = new(); + private readonly List _nodes = []; /// public IEnumerable Nodes => new ReadOnlyCollection(_nodes); diff --git a/src/Artemis.Core/VisualScripting/Nodes/Node.cs b/src/Artemis.Core/VisualScripting/Nodes/Node.cs index 97254c03d..90ca8da13 100644 --- a/src/Artemis.Core/VisualScripting/Nodes/Node.cs +++ b/src/Artemis.Core/VisualScripting/Nodes/Node.cs @@ -28,8 +28,8 @@ public abstract class Node : BreakableModel, INode #region Properties & Fields - private readonly List _outputPinBucket = new(); - private readonly List _inputPinBucket = new(); + private readonly List _outputPinBucket = []; + private readonly List _inputPinBucket = []; private Guid _id; @@ -95,12 +95,12 @@ public abstract class Node : BreakableModel, INode /// public bool IsLoading { get; set; } - private readonly List _pins = new(); + private readonly List _pins = []; /// public IReadOnlyCollection Pins => new ReadOnlyCollection(_pins); - private readonly List _pinCollections = new(); + private readonly List _pinCollections = []; private string _helpUrl; /// diff --git a/src/Artemis.Core/VisualScripting/Nodes/NodeTStorageTViewModel.cs b/src/Artemis.Core/VisualScripting/Nodes/NodeTStorageTViewModel.cs index 79e858644..5f8eedaee 100644 --- a/src/Artemis.Core/VisualScripting/Nodes/NodeTStorageTViewModel.cs +++ b/src/Artemis.Core/VisualScripting/Nodes/NodeTStorageTViewModel.cs @@ -27,7 +27,7 @@ public abstract class Node : Node, ICustomViewMo { if (NodeData == null) throw new ArtemisCoreException("Nodes without node data (default nodes or exit nodes) cannot have custom view models"); - return NodeData.Provider.Plugin.Container.Resolve(args: new object[] {this, nodeScript}); + return NodeData.Provider.Plugin.Container.Resolve(args: [this, nodeScript]); } /// diff --git a/src/Artemis.Core/VisualScripting/Pins/Pin.cs b/src/Artemis.Core/VisualScripting/Pins/Pin.cs index 742e0e4b7..f82799e2c 100644 --- a/src/Artemis.Core/VisualScripting/Pins/Pin.cs +++ b/src/Artemis.Core/VisualScripting/Pins/Pin.cs @@ -60,7 +60,7 @@ public abstract class Pin : CorePropertyChanged, IPin protected set => SetAndNotify(ref _isNumeric, value); } - private readonly List _connectedTo = new(); + private readonly List _connectedTo = []; private string _name; /// diff --git a/src/Artemis.Core/VisualScripting/Pins/PinCollection.cs b/src/Artemis.Core/VisualScripting/Pins/PinCollection.cs index d2ea74a69..801270b90 100644 --- a/src/Artemis.Core/VisualScripting/Pins/PinCollection.cs +++ b/src/Artemis.Core/VisualScripting/Pins/PinCollection.cs @@ -45,7 +45,7 @@ public abstract class PinCollection : CorePropertyChanged, IPinCollection /// public abstract Type Type { get; } - private readonly List _pins = new(); + private readonly List _pins = []; /// /// Gets a read only observable collection of the pins diff --git a/src/Artemis.Storage.Legacy/Entities/Plugins/PluginEntity.cs b/src/Artemis.Storage.Legacy/Entities/Plugins/PluginEntity.cs index 47e2ba74b..3e25cc64e 100644 --- a/src/Artemis.Storage.Legacy/Entities/Plugins/PluginEntity.cs +++ b/src/Artemis.Storage.Legacy/Entities/Plugins/PluginEntity.cs @@ -7,7 +7,7 @@ internal class PluginEntity { public PluginEntity() { - Features = new List(); + Features = []; } public Guid Id { get; set; } diff --git a/src/Artemis.Storage.Legacy/Entities/Profile/Abstract/RenderElementEntity.cs b/src/Artemis.Storage.Legacy/Entities/Profile/Abstract/RenderElementEntity.cs index 56b4e97fd..028cac090 100644 --- a/src/Artemis.Storage.Legacy/Entities/Profile/Abstract/RenderElementEntity.cs +++ b/src/Artemis.Storage.Legacy/Entities/Profile/Abstract/RenderElementEntity.cs @@ -7,7 +7,7 @@ internal abstract class RenderElementEntity public Guid Id { get; set; } public Guid ParentId { get; set; } - public List LayerEffects { get; set; } = new(); + public List LayerEffects { get; set; } = []; public IConditionEntity? DisplayCondition { get; set; } public TimelineEntity? Timeline { get; set; } diff --git a/src/Artemis.Storage.Legacy/Entities/Profile/LayerEntity.cs b/src/Artemis.Storage.Legacy/Entities/Profile/LayerEntity.cs index d00a62c20..d4ddf7696 100644 --- a/src/Artemis.Storage.Legacy/Entities/Profile/LayerEntity.cs +++ b/src/Artemis.Storage.Legacy/Entities/Profile/LayerEntity.cs @@ -8,8 +8,8 @@ internal class LayerEntity : RenderElementEntity { public LayerEntity() { - Leds = new List(); - AdaptionHints = new List(); + Leds = []; + AdaptionHints = []; } public int Order { get; set; } diff --git a/src/Artemis.Storage.Legacy/Entities/Profile/Nodes/NodeEntity.cs b/src/Artemis.Storage.Legacy/Entities/Profile/Nodes/NodeEntity.cs index 314964430..1aa4e2ef7 100644 --- a/src/Artemis.Storage.Legacy/Entities/Profile/Nodes/NodeEntity.cs +++ b/src/Artemis.Storage.Legacy/Entities/Profile/Nodes/NodeEntity.cs @@ -4,7 +4,7 @@ internal class NodeEntity { public NodeEntity() { - PinCollections = new List(); + PinCollections = []; } public NodeEntity(NodeEntity nodeEntity) diff --git a/src/Artemis.Storage.Legacy/Entities/Profile/Nodes/NodeScriptEntity.cs b/src/Artemis.Storage.Legacy/Entities/Profile/Nodes/NodeScriptEntity.cs index 8da434571..1b2ce986a 100644 --- a/src/Artemis.Storage.Legacy/Entities/Profile/Nodes/NodeScriptEntity.cs +++ b/src/Artemis.Storage.Legacy/Entities/Profile/Nodes/NodeScriptEntity.cs @@ -4,8 +4,8 @@ internal class NodeScriptEntity { public NodeScriptEntity() { - Nodes = new List(); - Connections = new List(); + Nodes = []; + Connections = []; } public string Name { get; set; } = string.Empty; diff --git a/src/Artemis.Storage.Legacy/Entities/Profile/ProfileCategoryEntity.cs b/src/Artemis.Storage.Legacy/Entities/Profile/ProfileCategoryEntity.cs index c5b61012b..6a24d666e 100644 --- a/src/Artemis.Storage.Legacy/Entities/Profile/ProfileCategoryEntity.cs +++ b/src/Artemis.Storage.Legacy/Entities/Profile/ProfileCategoryEntity.cs @@ -14,7 +14,7 @@ internal class ProfileCategoryEntity public bool IsSuspended { get; set; } public int Order { get; set; } - public List ProfileConfigurations { get; set; } = new(); + public List ProfileConfigurations { get; set; } = []; public Storage.Entities.Profile.ProfileCategoryEntity Migrate(ILogger logger, List legacyProfiles, ILiteStorage profileIcons) { diff --git a/src/Artemis.Storage.Legacy/Entities/Profile/ProfileEntity.cs b/src/Artemis.Storage.Legacy/Entities/Profile/ProfileEntity.cs index dbbbfee9d..bd7b3d46a 100644 --- a/src/Artemis.Storage.Legacy/Entities/Profile/ProfileEntity.cs +++ b/src/Artemis.Storage.Legacy/Entities/Profile/ProfileEntity.cs @@ -6,9 +6,9 @@ internal class ProfileEntity { public ProfileEntity() { - Folders = new List(); - Layers = new List(); - ScriptConfigurations = new List(); + Folders = []; + Layers = []; + ScriptConfigurations = []; } public Guid Id { get; set; } diff --git a/src/Artemis.Storage.Legacy/Entities/Profile/PropertyEntity.cs b/src/Artemis.Storage.Legacy/Entities/Profile/PropertyEntity.cs index 44a4406ab..c9f9c42cf 100644 --- a/src/Artemis.Storage.Legacy/Entities/Profile/PropertyEntity.cs +++ b/src/Artemis.Storage.Legacy/Entities/Profile/PropertyEntity.cs @@ -9,5 +9,5 @@ internal class PropertyEntity public bool KeyframesEnabled { get; set; } public DataBindingEntity? DataBinding { get; set; } - public List KeyframeEntities { get; set; } = new(); + public List KeyframeEntities { get; set; } = []; } \ No newline at end of file diff --git a/src/Artemis.Storage.Legacy/Entities/Profile/PropertyGroupEntity.cs b/src/Artemis.Storage.Legacy/Entities/Profile/PropertyGroupEntity.cs index 2c7f316bb..e32e895d4 100644 --- a/src/Artemis.Storage.Legacy/Entities/Profile/PropertyGroupEntity.cs +++ b/src/Artemis.Storage.Legacy/Entities/Profile/PropertyGroupEntity.cs @@ -3,6 +3,6 @@ internal class PropertyGroupEntity { public string Identifier { get; set; } = string.Empty; - public List Properties { get; set; } = new(); - public List PropertyGroups { get; set; } = new(); + public List Properties { get; set; } = []; + public List PropertyGroups { get; set; } = []; } \ No newline at end of file diff --git a/src/Artemis.Storage.Legacy/Entities/Surface/DeviceEntity.cs b/src/Artemis.Storage.Legacy/Entities/Surface/DeviceEntity.cs index fc3988dba..43b9f85f6 100644 --- a/src/Artemis.Storage.Legacy/Entities/Surface/DeviceEntity.cs +++ b/src/Artemis.Storage.Legacy/Entities/Surface/DeviceEntity.cs @@ -4,9 +4,9 @@ internal class DeviceEntity { public DeviceEntity() { - InputIdentifiers = new List(); - InputMappings = new List(); - Categories = new List(); + InputIdentifiers = []; + InputMappings = []; + Categories = []; } public string Id { get; set; } = string.Empty; diff --git a/src/Artemis.Storage.Legacy/Migrations/Storage/M0023LayoutProviders.cs b/src/Artemis.Storage.Legacy/Migrations/Storage/M0023LayoutProviders.cs index 1a8d7500b..4668200d7 100644 --- a/src/Artemis.Storage.Legacy/Migrations/Storage/M0023LayoutProviders.cs +++ b/src/Artemis.Storage.Legacy/Migrations/Storage/M0023LayoutProviders.cs @@ -9,7 +9,7 @@ internal class M0023LayoutProviders : IStorageMigration public void Apply(LiteRepository repository) { ILiteCollection deviceEntities = repository.Database.GetCollection("DeviceEntity"); - List toUpdate = new(); + List toUpdate = []; foreach (BsonDocument bsonDocument in deviceEntities.FindAll()) { diff --git a/src/Artemis.Storage.Legacy/Migrations/Storage/M0024NodeProviders.cs b/src/Artemis.Storage.Legacy/Migrations/Storage/M0024NodeProviders.cs index 4617ae6d1..4eadb4fa9 100644 --- a/src/Artemis.Storage.Legacy/Migrations/Storage/M0024NodeProviders.cs +++ b/src/Artemis.Storage.Legacy/Migrations/Storage/M0024NodeProviders.cs @@ -9,7 +9,7 @@ internal class M0024NodeProviders : IStorageMigration public void Apply(LiteRepository repository) { ILiteCollection categoryCollection = repository.Database.GetCollection("ProfileCategoryEntity"); - List categoriesToUpdate = new(); + List categoriesToUpdate = []; foreach (BsonDocument profileCategoryBson in categoryCollection.FindAll()) { BsonArray? profiles = profileCategoryBson["ProfileConfigurations"]?.AsArray; @@ -24,7 +24,7 @@ internal class M0024NodeProviders : IStorageMigration categoryCollection.Update(categoriesToUpdate); ILiteCollection collection = repository.Database.GetCollection("ProfileEntity"); - List profilesToUpdate = new(); + List profilesToUpdate = []; foreach (BsonDocument profileBson in collection.FindAll()) { BsonArray? folders = profileBson["Folders"]?.AsArray; diff --git a/src/Artemis.Storage.Legacy/Migrations/Storage/M0025NodeProvidersProfileConfig.cs b/src/Artemis.Storage.Legacy/Migrations/Storage/M0025NodeProvidersProfileConfig.cs index bff6ff6ff..a166aaa65 100644 --- a/src/Artemis.Storage.Legacy/Migrations/Storage/M0025NodeProvidersProfileConfig.cs +++ b/src/Artemis.Storage.Legacy/Migrations/Storage/M0025NodeProvidersProfileConfig.cs @@ -9,7 +9,7 @@ internal class M0025NodeProvidersProfileConfig : IStorageMigration public void Apply(LiteRepository repository) { ILiteCollection categoryCollection = repository.Database.GetCollection("ProfileCategoryEntity"); - List toUpdate = new(); + List toUpdate = []; foreach (BsonDocument profileCategoryBson in categoryCollection.FindAll()) { BsonArray? profiles = profileCategoryBson["ProfileConfigurations"]?.AsArray; diff --git a/src/Artemis.Storage.Legacy/Migrations/Storage/M0026NodeStorage.cs b/src/Artemis.Storage.Legacy/Migrations/Storage/M0026NodeStorage.cs index cbea0db8d..875a29c0b 100644 --- a/src/Artemis.Storage.Legacy/Migrations/Storage/M0026NodeStorage.cs +++ b/src/Artemis.Storage.Legacy/Migrations/Storage/M0026NodeStorage.cs @@ -19,7 +19,7 @@ internal class M0026NodeStorage : IStorageMigration public void Apply(LiteRepository repository) { ILiteCollection categoryCollection = repository.Database.GetCollection("ProfileCategoryEntity"); - List toUpdate = new(); + List toUpdate = []; foreach (BsonDocument profileCategoryBson in categoryCollection.FindAll()) { BsonArray? profiles = profileCategoryBson["ProfileConfigurations"]?.AsArray; @@ -38,7 +38,7 @@ internal class M0026NodeStorage : IStorageMigration categoryCollection.Update(toUpdate); ILiteCollection collection = repository.Database.GetCollection("ProfileEntity"); - List profilesToUpdate = new(); + List profilesToUpdate = []; foreach (BsonDocument profileBson in collection.FindAll()) { BsonArray? folders = profileBson["Folders"]?.AsArray; diff --git a/src/Artemis.Storage.Legacy/Migrations/Storage/M0027Namespace.cs b/src/Artemis.Storage.Legacy/Migrations/Storage/M0027Namespace.cs index b0bee99a1..6aa1cb161 100644 --- a/src/Artemis.Storage.Legacy/Migrations/Storage/M0027Namespace.cs +++ b/src/Artemis.Storage.Legacy/Migrations/Storage/M0027Namespace.cs @@ -9,7 +9,7 @@ internal class M0027Namespace : IStorageMigration public void Apply(LiteRepository repository) { ILiteCollection collection = repository.Database.GetCollection("ProfileEntity"); - List profilesToUpdate = new(); + List profilesToUpdate = []; foreach (BsonDocument profileBson in collection.FindAll()) { diff --git a/src/Artemis.Storage/Entities/Plugins/PluginEntity.cs b/src/Artemis.Storage/Entities/Plugins/PluginEntity.cs index fe9dbe442..bc44e9107 100644 --- a/src/Artemis.Storage/Entities/Plugins/PluginEntity.cs +++ b/src/Artemis.Storage/Entities/Plugins/PluginEntity.cs @@ -12,7 +12,7 @@ public class PluginEntity { public PluginEntity() { - Features = new List(); + Features = []; } public Guid Id { get; set; } diff --git a/src/Artemis.Storage/Entities/Profile/Abstract/RenderElementEntity.cs b/src/Artemis.Storage/Entities/Profile/Abstract/RenderElementEntity.cs index f31ca23ef..f07e81504 100644 --- a/src/Artemis.Storage/Entities/Profile/Abstract/RenderElementEntity.cs +++ b/src/Artemis.Storage/Entities/Profile/Abstract/RenderElementEntity.cs @@ -8,7 +8,7 @@ public abstract class RenderElementEntity public Guid Id { get; set; } public Guid ParentId { get; set; } - public List LayerEffects { get; set; } = new(); + public List LayerEffects { get; set; } = []; public IConditionEntity? DisplayCondition { get; set; } public TimelineEntity? Timeline { get; set; } diff --git a/src/Artemis.Storage/Entities/Profile/LayerEntity.cs b/src/Artemis.Storage/Entities/Profile/LayerEntity.cs index bc47ca40d..2ed48f175 100644 --- a/src/Artemis.Storage/Entities/Profile/LayerEntity.cs +++ b/src/Artemis.Storage/Entities/Profile/LayerEntity.cs @@ -8,8 +8,8 @@ public class LayerEntity : RenderElementEntity { public LayerEntity() { - Leds = new List(); - AdaptionHints = new List(); + Leds = []; + AdaptionHints = []; } public int Order { get; set; } diff --git a/src/Artemis.Storage/Entities/Profile/Nodes/NodeEntity.cs b/src/Artemis.Storage/Entities/Profile/Nodes/NodeEntity.cs index cec7d2601..dc2ac64ff 100644 --- a/src/Artemis.Storage/Entities/Profile/Nodes/NodeEntity.cs +++ b/src/Artemis.Storage/Entities/Profile/Nodes/NodeEntity.cs @@ -8,7 +8,7 @@ public class NodeEntity { public NodeEntity() { - PinCollections = new List(); + PinCollections = []; } public NodeEntity(NodeEntity nodeEntity) diff --git a/src/Artemis.Storage/Entities/Profile/Nodes/NodeScriptEntity.cs b/src/Artemis.Storage/Entities/Profile/Nodes/NodeScriptEntity.cs index ac53e8494..83478efb3 100644 --- a/src/Artemis.Storage/Entities/Profile/Nodes/NodeScriptEntity.cs +++ b/src/Artemis.Storage/Entities/Profile/Nodes/NodeScriptEntity.cs @@ -6,8 +6,8 @@ public class NodeScriptEntity { public NodeScriptEntity() { - Nodes = new List(); - Connections = new List(); + Nodes = []; + Connections = []; } public string Name { get; set; } = string.Empty; diff --git a/src/Artemis.Storage/Entities/Profile/ProfileCategoryEntity.cs b/src/Artemis.Storage/Entities/Profile/ProfileCategoryEntity.cs index b7a3c15f4..553c265f0 100644 --- a/src/Artemis.Storage/Entities/Profile/ProfileCategoryEntity.cs +++ b/src/Artemis.Storage/Entities/Profile/ProfileCategoryEntity.cs @@ -16,5 +16,5 @@ public class ProfileCategoryEntity public bool IsSuspended { get; set; } public int Order { get; set; } - public List ProfileConfigurations { get; set; } = new(); + public List ProfileConfigurations { get; set; } = []; } \ No newline at end of file diff --git a/src/Artemis.Storage/Entities/Profile/ProfileContainerEntity.cs b/src/Artemis.Storage/Entities/Profile/ProfileContainerEntity.cs index b6360ab76..b0b064712 100644 --- a/src/Artemis.Storage/Entities/Profile/ProfileContainerEntity.cs +++ b/src/Artemis.Storage/Entities/Profile/ProfileContainerEntity.cs @@ -5,7 +5,7 @@ namespace Artemis.Storage.Entities.Profile; public class ProfileContainerEntity { public Guid Id { get; set; } - public byte[] Icon { get; set; } = Array.Empty(); + public byte[] Icon { get; set; } = []; public ProfileCategoryEntity ProfileCategory { get; set; } = null!; diff --git a/src/Artemis.Storage/Entities/Profile/ProfileEntity.cs b/src/Artemis.Storage/Entities/Profile/ProfileEntity.cs index 459bbdf06..d775fd967 100644 --- a/src/Artemis.Storage/Entities/Profile/ProfileEntity.cs +++ b/src/Artemis.Storage/Entities/Profile/ProfileEntity.cs @@ -8,8 +8,8 @@ public class ProfileEntity { public ProfileEntity() { - Folders = new List(); - Layers = new List(); + Folders = []; + Layers = []; } public Guid Id { get; set; } diff --git a/src/Artemis.Storage/Entities/Profile/PropertyEntity.cs b/src/Artemis.Storage/Entities/Profile/PropertyEntity.cs index 3b4f8e833..56c006eeb 100644 --- a/src/Artemis.Storage/Entities/Profile/PropertyEntity.cs +++ b/src/Artemis.Storage/Entities/Profile/PropertyEntity.cs @@ -10,5 +10,5 @@ public class PropertyEntity public bool KeyframesEnabled { get; set; } public DataBindingEntity? DataBinding { get; set; } - public List KeyframeEntities { get; set; } = new(); + public List KeyframeEntities { get; set; } = []; } \ No newline at end of file diff --git a/src/Artemis.Storage/Entities/Profile/PropertyGroupEntity.cs b/src/Artemis.Storage/Entities/Profile/PropertyGroupEntity.cs index e01047ee3..afeb67512 100644 --- a/src/Artemis.Storage/Entities/Profile/PropertyGroupEntity.cs +++ b/src/Artemis.Storage/Entities/Profile/PropertyGroupEntity.cs @@ -5,6 +5,6 @@ namespace Artemis.Storage.Entities.Profile; public class PropertyGroupEntity { public string Identifier { get; set; } = string.Empty; - public List Properties { get; set; } = new(); - public List PropertyGroups { get; set; } = new(); + public List Properties { get; set; } = []; + public List PropertyGroups { get; set; } = []; } \ No newline at end of file diff --git a/src/Artemis.Storage/Entities/Surface/DeviceEntity.cs b/src/Artemis.Storage/Entities/Surface/DeviceEntity.cs index 6500b9b1d..6292e3abe 100644 --- a/src/Artemis.Storage/Entities/Surface/DeviceEntity.cs +++ b/src/Artemis.Storage/Entities/Surface/DeviceEntity.cs @@ -7,9 +7,9 @@ public class DeviceEntity { public DeviceEntity() { - InputIdentifiers = new List(); - InputMappings = new List(); - Categories = new List(); + InputIdentifiers = []; + InputMappings = []; + Categories = []; } [MaxLength(512)] diff --git a/src/Artemis.UI.Linux/App.axaml.cs b/src/Artemis.UI.Linux/App.axaml.cs index ef163019f..5d9fdf95a 100644 --- a/src/Artemis.UI.Linux/App.axaml.cs +++ b/src/Artemis.UI.Linux/App.axaml.cs @@ -34,7 +34,7 @@ public class App : Application if (ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop || Design.IsDesignMode) return; - _applicationStateManager = new ApplicationStateManager(_container!, desktop.Args ?? Array.Empty()); + _applicationStateManager = new ApplicationStateManager(_container!, desktop.Args ?? []); ArtemisBootstrapper.Initialize(); RegisterProviders(); } diff --git a/src/Artemis.UI.Linux/ApplicationStateManager.cs b/src/Artemis.UI.Linux/ApplicationStateManager.cs index 4d3b1e2cd..7bae51aaf 100644 --- a/src/Artemis.UI.Linux/ApplicationStateManager.cs +++ b/src/Artemis.UI.Linux/ApplicationStateManager.cs @@ -57,7 +57,7 @@ public class ApplicationStateManager { try { - _windowService.ShowExceptionDialog("An unhandled exception occured", e); + _windowService.ShowExceptionDialog("An unhandled error occured", e); } catch { @@ -112,7 +112,7 @@ public class ApplicationStateManager private void UtilitiesOnRestartRequested(object? sender, RestartEventArgs e) { - List argsList = new(); + List argsList = []; argsList.AddRange(StartupArguments); if (e.ExtraArgs != null) argsList.AddRange(e.ExtraArgs.Except(argsList)); diff --git a/src/Artemis.UI.Linux/Providers/Input/LinuxInputProvider.cs b/src/Artemis.UI.Linux/Providers/Input/LinuxInputProvider.cs index 48af97dbf..e4d7ec2a6 100644 --- a/src/Artemis.UI.Linux/Providers/Input/LinuxInputProvider.cs +++ b/src/Artemis.UI.Linux/Providers/Input/LinuxInputProvider.cs @@ -17,7 +17,7 @@ public class LinuxInputProvider : InputProvider { _logger = logger; _inputService = inputService; - _readers = new List(); + _readers = []; foreach (LinuxInputDevice deviceDefinition in LinuxInputDeviceFinder.Find()) { diff --git a/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPicker.cs b/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPicker.cs index 21f9514e6..9b555541b 100644 --- a/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPicker.cs +++ b/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPicker.cs @@ -47,7 +47,7 @@ public class DataModelPicker : TemplatedControl /// A list of extra modules to show data models of. /// public static readonly StyledProperty?> ModulesProperty = - AvaloniaProperty.Register?>(nameof(Modules), new ObservableCollection()); + AvaloniaProperty.Register?>(nameof(Modules), []); /// /// The data model view model to show, if not provided one will be retrieved by the control. @@ -59,7 +59,7 @@ public class DataModelPicker : TemplatedControl /// A list of types to filter the selectable paths on. /// public static readonly StyledProperty?> FilterTypesProperty = - AvaloniaProperty.Register?>(nameof(FilterTypes), new ObservableCollection()); + AvaloniaProperty.Register?>(nameof(FilterTypes), []); /// /// Gets or sets a boolean indicating whether the picker is in event picker mode. @@ -222,7 +222,7 @@ public class DataModelPicker : TemplatedControl if (DataModelUIService == null) return; - ChangeDataModel(DataModelUIService.GetPluginDataModelVisualization(Modules?.ToList() ?? new List(), true)); + ChangeDataModel(DataModelUIService.GetPluginDataModelVisualization(Modules?.ToList() ?? [], true)); } private void ChangeDataModel(DataModelPropertiesViewModel? dataModel) diff --git a/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs b/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs index 742e64458..a54e13f28 100644 --- a/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs +++ b/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs @@ -65,13 +65,13 @@ public class DataModelPickerButton : TemplatedControl /// A list of extra modules to show data models of. /// public static readonly StyledProperty?> ModulesProperty = - AvaloniaProperty.Register?>(nameof(Modules), new ObservableCollection()); + AvaloniaProperty.Register?>(nameof(Modules), []); /// /// A list of types to filter the selectable paths on. /// public static readonly StyledProperty?> FilterTypesProperty = - AvaloniaProperty.Register?>(nameof(FilterTypes), new ObservableCollection()); + AvaloniaProperty.Register?>(nameof(FilterTypes), []); /// /// Gets or sets a boolean indicating whether the picker is in event picker mode. diff --git a/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs b/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs index 9eae5804d..60397e274 100644 --- a/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs +++ b/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs @@ -34,13 +34,13 @@ public class DeviceVisualizer : Control private RenderTargetBitmap? _deviceImage; private ArtemisDevice? _oldDevice; private bool _loading; - private Color[] _previousState = Array.Empty(); + private Color[] _previousState = []; /// public DeviceVisualizer() { _renderService = UI.Locator.Resolve(); - _deviceVisualizerLeds = new List(); + _deviceVisualizerLeds = []; PointerReleased += OnPointerReleased; PropertyChanged += OnPropertyChanged; diff --git a/src/Artemis.UI.Shared/Controls/DeviceVisualizerLed.cs b/src/Artemis.UI.Shared/Controls/DeviceVisualizerLed.cs index 0001c17f8..39be848ae 100644 --- a/src/Artemis.UI.Shared/Controls/DeviceVisualizerLed.cs +++ b/src/Artemis.UI.Shared/Controls/DeviceVisualizerLed.cs @@ -105,11 +105,11 @@ internal class DeviceVisualizerLed Geometry geometry = Geometry.Parse(Led.RgbLed.ShapeData); geometry.Transform = new TransformGroup { - Children = new Transforms - { + Children = + [ new ScaleTransform(width, height), new TranslateTransform(Led.RgbLed.Location.X + deflateAmount / 2, Led.RgbLed.Location.Y + deflateAmount / 2) - } + ] }; DisplayGeometry = geometry; } diff --git a/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml.cs b/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml.cs index b5e538b62..bd8f529e3 100644 --- a/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml.cs +++ b/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml.cs @@ -19,7 +19,7 @@ public partial class EnumComboBox : UserControl /// public static readonly StyledProperty ValueProperty = AvaloniaProperty.Register(nameof(Value), defaultBindingMode: BindingMode.TwoWay); - private readonly ObservableCollection _currentValues = new(); + private readonly ObservableCollection _currentValues = []; private Type? _currentType; /// diff --git a/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPicker.cs b/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPicker.cs index 11215c7f0..a8286a68e 100644 --- a/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPicker.cs +++ b/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPicker.cs @@ -269,7 +269,7 @@ public class GradientPicker : TemplatedControl private void UpdateGradient() { // Update the display gradient - GradientStops collection = new(); + GradientStops collection = []; foreach (ColorGradientStop c in EditingColorGradient.OrderBy(s => s.Position)) collection.Add(new GradientStop(Color.FromArgb(c.Color.Alpha, c.Color.Red, c.Color.Green, c.Color.Blue), c.Position)); diff --git a/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPickerButton.cs b/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPickerButton.cs index 407f7ed11..e2a6ed065 100644 --- a/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPickerButton.cs +++ b/src/Artemis.UI.Shared/Controls/GradientPicker/GradientPickerButton.cs @@ -169,7 +169,7 @@ public class GradientPickerButton : TemplatedControl private void UpdateGradient() { // Update the display gradient - GradientStops collection = new(); + GradientStops collection = []; if (ColorGradient != null) foreach (ColorGradientStop c in ColorGradient.OrderBy(s => s.Position)) collection.Add(new GradientStop(Color.FromArgb(c.Color.Alpha, c.Color.Red, c.Color.Green, c.Color.Blue), c.Position)); diff --git a/src/Artemis.UI.Shared/Controls/TagsInput/TagsInput.properties.cs b/src/Artemis.UI.Shared/Controls/TagsInput/TagsInput.properties.cs index 6359c0260..11a10dbb9 100644 --- a/src/Artemis.UI.Shared/Controls/TagsInput/TagsInput.properties.cs +++ b/src/Artemis.UI.Shared/Controls/TagsInput/TagsInput.properties.cs @@ -10,7 +10,7 @@ public partial class TagsInput : TemplatedControl /// Defines the property /// public static readonly StyledProperty> TagsProperty = - AvaloniaProperty.Register>(nameof(Tags), new ObservableCollection()); + AvaloniaProperty.Register>(nameof(Tags), []); /// /// Gets or sets the selected tags. diff --git a/src/Artemis.UI.Shared/Converters/ColorGradientToGradientStopsConverter.cs b/src/Artemis.UI.Shared/Converters/ColorGradientToGradientStopsConverter.cs index 29f562d47..d34498c4f 100644 --- a/src/Artemis.UI.Shared/Converters/ColorGradientToGradientStopsConverter.cs +++ b/src/Artemis.UI.Shared/Converters/ColorGradientToGradientStopsConverter.cs @@ -17,7 +17,7 @@ public class ColorGradientToGradientStopsConverter : IValueConverter public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) { ColorGradient? colorGradient = value as ColorGradient; - GradientStops collection = new(); + GradientStops collection = []; if (colorGradient == null) return collection; @@ -30,7 +30,7 @@ public class ColorGradientToGradientStopsConverter : IValueConverter public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) { GradientStops? collection = value as GradientStops; - ColorGradient colorGradients = new(); + ColorGradient colorGradients = []; if (collection == null) return colorGradients; diff --git a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs index b04d61d2b..5eb02d346 100644 --- a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs +++ b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs @@ -24,7 +24,7 @@ public class DataModelListViewModel : DataModelVisualizationViewModel : base(dataModel, parent, dataModelPath) { _countDisplay = "0 items"; - _listChildren = new ObservableCollection(); + _listChildren = []; } /// diff --git a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs index 95d07a35b..0896619c6 100644 --- a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs +++ b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs @@ -29,7 +29,7 @@ public abstract class DataModelVisualizationViewModel : ReactiveObject, IDisposa internal DataModelVisualizationViewModel(DataModel? dataModel, DataModelVisualizationViewModel? parent, DataModelPath? dataModelPath) { _dataModel = dataModel; - _children = new ObservableCollection(); + _children = []; _parent = parent; DataModelPath = dataModelPath; IsMatchingFilteredTypes = true; diff --git a/src/Artemis.UI.Shared/DryIoc/ContainerExtensions.cs b/src/Artemis.UI.Shared/DryIoc/ContainerExtensions.cs index 94190e2d4..97a461344 100644 --- a/src/Artemis.UI.Shared/DryIoc/ContainerExtensions.cs +++ b/src/Artemis.UI.Shared/DryIoc/ContainerExtensions.cs @@ -18,7 +18,7 @@ public static class ContainerExtensions { container.Register(Reuse.Singleton); Assembly artemisShared = typeof(IArtemisSharedUIService).GetAssembly(); - container.RegisterMany(new[] {artemisShared}, type => type.IsAssignableTo(), Reuse.Singleton); + container.RegisterMany([artemisShared], type => type.IsAssignableTo(), Reuse.Singleton); UI.Locator = container; } diff --git a/src/Artemis.UI.Shared/Extensions/ArtemisLayoutExtensions.cs b/src/Artemis.UI.Shared/Extensions/ArtemisLayoutExtensions.cs index b356e8c24..38047c541 100644 --- a/src/Artemis.UI.Shared/Extensions/ArtemisLayoutExtensions.cs +++ b/src/Artemis.UI.Shared/Extensions/ArtemisLayoutExtensions.cs @@ -125,11 +125,11 @@ public static class ArtemisLayoutExtensions Geometry geometry = Geometry.Parse(led.RgbLayout.ShapeData); geometry.Transform = new TransformGroup { - Children = new Transforms - { + Children = + [ new ScaleTransform(width, height), new TranslateTransform(led.RgbLayout.X + deflateAmount / 2, led.RgbLayout.Y + deflateAmount / 2) - } + ] }; return geometry; } diff --git a/src/Artemis.UI.Shared/Extensions/VisualExtensions.cs b/src/Artemis.UI.Shared/Extensions/VisualExtensions.cs index 45e97e130..560323921 100644 --- a/src/Artemis.UI.Shared/Extensions/VisualExtensions.cs +++ b/src/Artemis.UI.Shared/Extensions/VisualExtensions.cs @@ -18,7 +18,7 @@ public static class VisualExtensions /// A recursive list of all visual children of type . public static List GetVisualChildrenOfType(this Visual root) { - List result = new(); + List result = []; List? visualChildren = root.GetVisualChildren()?.ToList(); if (visualChildren == null || !visualChildren.Any()) @@ -43,7 +43,7 @@ public static class VisualExtensions /// A recursive list of all visual children with a data context of type . public static List GetVisualChildrenOfDataContextType(this Visual root) { - List result = new(); + List result = []; List? visualChildren = root.GetVisualChildren()?.ToList(); if (visualChildren == null || !visualChildren.Any()) diff --git a/src/Artemis.UI.Shared/ReactiveAppWindow.cs b/src/Artemis.UI.Shared/ReactiveAppWindow.cs index 038e0fe05..95e8a9e33 100644 --- a/src/Artemis.UI.Shared/ReactiveAppWindow.cs +++ b/src/Artemis.UI.Shared/ReactiveAppWindow.cs @@ -49,7 +49,7 @@ public class ReactiveAppWindow : AppWindow, IViewFor whe return; // TransparencyBackgroundFallback = Brushes.Transparent; - TransparencyLevelHint = new[] {WindowTransparencyLevel.Mica}; + TransparencyLevelHint = [WindowTransparencyLevel.Mica]; Background = new SolidColorBrush(new Color(80, 0,0,0)); } diff --git a/src/Artemis.UI.Shared/Routing/Routable/RoutableScreenOfTParam.cs b/src/Artemis.UI.Shared/Routing/Routable/RoutableScreenOfTParam.cs index 52e8a5e48..db6e361f3 100644 --- a/src/Artemis.UI.Shared/Routing/Routable/RoutableScreenOfTParam.cs +++ b/src/Artemis.UI.Shared/Routing/Routable/RoutableScreenOfTParam.cs @@ -88,7 +88,7 @@ public abstract class RoutableScreen : RoutableScreen, IRoutableScreen w Expression> lambda = Expression.Lambda>( Expression.Block( - new[] {parameterExpression}, + [parameterExpression], Expression.Assign(parameterExpression, Expression.New(parameterType)), Expression.Block(propertyAssignments), parameterExpression diff --git a/src/Artemis.UI.Shared/Routing/Route/RouteRegistration.cs b/src/Artemis.UI.Shared/Routing/Route/RouteRegistration.cs index 22246b3f0..62f3a54d8 100644 --- a/src/Artemis.UI.Shared/Routing/Route/RouteRegistration.cs +++ b/src/Artemis.UI.Shared/Routing/Route/RouteRegistration.cs @@ -44,5 +44,5 @@ public class RouteRegistration : IRouterRegistration where TViewMode public Type ViewModel => typeof(TViewModel); /// - public List Children { get; set; } = new(); + public List Children { get; set; } = []; } \ No newline at end of file diff --git a/src/Artemis.UI.Shared/Routing/Route/RouteResolution.cs b/src/Artemis.UI.Shared/Routing/Route/RouteResolution.cs index b80bad548..f7634837b 100644 --- a/src/Artemis.UI.Shared/Routing/Route/RouteResolution.cs +++ b/src/Artemis.UI.Shared/Routing/Route/RouteResolution.cs @@ -25,7 +25,7 @@ internal class RouteResolution return AsFailure(path); // Ensure self is a match - List parameters = new(); + List parameters = []; int currentSegment = 0; foreach (RouteSegment routeSegment in registration.Route.Segments) { @@ -95,7 +95,7 @@ internal class RouteResolution public object[] GetAllParameters() { - List result = new(); + List result = []; if (Parameters != null) result.AddRange(Parameters); object[]? childParameters = Child?.GetAllParameters(); diff --git a/src/Artemis.UI.Shared/Routing/Router/Navigation.cs b/src/Artemis.UI.Shared/Routing/Router/Navigation.cs index 23c0e906b..f30d2dac6 100644 --- a/src/Artemis.UI.Shared/Routing/Router/Navigation.cs +++ b/src/Artemis.UI.Shared/Routing/Router/Navigation.cs @@ -86,7 +86,7 @@ internal class Navigation return; // Navigate on the screen - args.SegmentParameters = resolution.Parameters ?? Array.Empty(); + args.SegmentParameters = resolution.Parameters ?? []; try { await screen.InternalOnNavigating(args, _cts.Token); diff --git a/src/Artemis.UI.Shared/Routing/Router/NavigationArguments.cs b/src/Artemis.UI.Shared/Routing/Router/NavigationArguments.cs index 799ecd8b2..a064e3f69 100644 --- a/src/Artemis.UI.Shared/Routing/Router/NavigationArguments.cs +++ b/src/Artemis.UI.Shared/Routing/Router/NavigationArguments.cs @@ -13,7 +13,7 @@ public class NavigationArguments Options = options; Path = path; RouteParameters = routeParameters; - SegmentParameters = Array.Empty(); + SegmentParameters = []; } /// diff --git a/src/Artemis.UI.Shared/Routing/Router/Router.cs b/src/Artemis.UI.Shared/Routing/Router/Router.cs index d10cd2ede..8358c6fcc 100644 --- a/src/Artemis.UI.Shared/Routing/Router/Router.cs +++ b/src/Artemis.UI.Shared/Routing/Router/Router.cs @@ -68,7 +68,7 @@ internal class Router : CorePropertyChanged, IRouter, IDisposable public IObservable CurrentPath => _currentRouteSubject; /// - public List Routes { get; } = new(); + public List Routes { get; } = []; /// public async Task Navigate(string path, RouterNavigationOptions? options = null) diff --git a/src/Artemis.UI.Shared/Services/Builders/FileDialogFilterBuilder.cs b/src/Artemis.UI.Shared/Services/Builders/FileDialogFilterBuilder.cs index c3c420a64..6e8a1cce3 100644 --- a/src/Artemis.UI.Shared/Services/Builders/FileDialogFilterBuilder.cs +++ b/src/Artemis.UI.Shared/Services/Builders/FileDialogFilterBuilder.cs @@ -11,7 +11,7 @@ namespace Artemis.UI.Shared.Services.Builders; public class FileDialogFilterBuilder { private string _name; - private readonly List _extensions = new(); + private readonly List _extensions = []; internal FileDialogFilterBuilder() { diff --git a/src/Artemis.UI.Shared/Services/Builders/OpenFileDialogBuilder.cs b/src/Artemis.UI.Shared/Services/Builders/OpenFileDialogBuilder.cs index c9ef09d65..e0a76533a 100644 --- a/src/Artemis.UI.Shared/Services/Builders/OpenFileDialogBuilder.cs +++ b/src/Artemis.UI.Shared/Services/Builders/OpenFileDialogBuilder.cs @@ -61,7 +61,7 @@ public class OpenFileDialogBuilder FileDialogFilterBuilder builder = new(); configure(builder); - _fileTypeFilters ??= new List(); + _fileTypeFilters ??= []; _fileTypeFilters.Add(builder.Build()); _options.FileTypeFilter = _fileTypeFilters; diff --git a/src/Artemis.UI.Shared/Services/Builders/SaveFileDialogBuilder.cs b/src/Artemis.UI.Shared/Services/Builders/SaveFileDialogBuilder.cs index c246e052f..707c2e2ed 100644 --- a/src/Artemis.UI.Shared/Services/Builders/SaveFileDialogBuilder.cs +++ b/src/Artemis.UI.Shared/Services/Builders/SaveFileDialogBuilder.cs @@ -60,7 +60,7 @@ public class SaveFileDialogBuilder FileDialogFilterBuilder builder = new(); configure(builder); - _fileTypeFilters ??= new List(); + _fileTypeFilters ??= []; _fileTypeFilters.Add(builder.Build()); _options.FileTypeChoices = _fileTypeFilters; diff --git a/src/Artemis.UI.Shared/Services/DataModelUIService.cs b/src/Artemis.UI.Shared/Services/DataModelUIService.cs index fc8569711..07a096d84 100644 --- a/src/Artemis.UI.Shared/Services/DataModelUIService.cs +++ b/src/Artemis.UI.Shared/Services/DataModelUIService.cs @@ -25,8 +25,8 @@ internal class DataModelUIService : IDataModelUIService { _dataModelService = dataModelService; _container = container; - _registeredDataModelEditors = new List(); - _registeredDataModelDisplays = new List(); + _registeredDataModelEditors = []; + _registeredDataModelDisplays = []; RegisteredDataModelEditors = new ReadOnlyCollection(_registeredDataModelEditors); RegisteredDataModelDisplays = new ReadOnlyCollection(_registeredDataModelDisplays); diff --git a/src/Artemis.UI.Shared/Services/NodeEditor/NodeConnectionStore.cs b/src/Artemis.UI.Shared/Services/NodeEditor/NodeConnectionStore.cs index 8182aec2b..9f29455d6 100644 --- a/src/Artemis.UI.Shared/Services/NodeEditor/NodeConnectionStore.cs +++ b/src/Artemis.UI.Shared/Services/NodeEditor/NodeConnectionStore.cs @@ -34,9 +34,9 @@ public class NodeConnectionStore // Iterate to save foreach (IPin nodePin in Node.Pins.ToList()) - _pinConnections.Add(nodePin, new List(nodePin.ConnectedTo)); + _pinConnections.Add(nodePin, [..nodePin.ConnectedTo]); foreach (IPin nodePin in Node.PinCollections.ToList().SelectMany(nodePinCollection => nodePinCollection)) - _pinConnections.Add(nodePin, new List(nodePin.ConnectedTo)); + _pinConnections.Add(nodePin, [..nodePin.ConnectedTo]); // Iterate to disconnect foreach (IPin nodePin in Node.Pins.ToList()) diff --git a/src/Artemis.UI.Shared/Services/NodeEditor/NodeEditorCommandScope.cs b/src/Artemis.UI.Shared/Services/NodeEditor/NodeEditorCommandScope.cs index fbd40520c..b2f181794 100644 --- a/src/Artemis.UI.Shared/Services/NodeEditor/NodeEditorCommandScope.cs +++ b/src/Artemis.UI.Shared/Services/NodeEditor/NodeEditorCommandScope.cs @@ -20,7 +20,7 @@ public class NodeEditorCommandScope : IDisposable Name = name; _nodeEditorService = nodeEditorService; _nodeScript = nodeScript; - _commands = new List(); + _commands = []; } /// diff --git a/src/Artemis.UI.Shared/Services/ProfileEditor/ProfileEditorCommandScope.cs b/src/Artemis.UI.Shared/Services/ProfileEditor/ProfileEditorCommandScope.cs index aa760b121..72a639d31 100644 --- a/src/Artemis.UI.Shared/Services/ProfileEditor/ProfileEditorCommandScope.cs +++ b/src/Artemis.UI.Shared/Services/ProfileEditor/ProfileEditorCommandScope.cs @@ -17,7 +17,7 @@ public class ProfileEditorCommandScope : IDisposable { Name = name; _profileEditorService = profileEditorService; - _commands = new List(); + _commands = []; } /// diff --git a/src/Artemis.UI.Shared/Services/PropertyInput/PropertyInputService.cs b/src/Artemis.UI.Shared/Services/PropertyInput/PropertyInputService.cs index 9ed8048c1..b1d419e61 100644 --- a/src/Artemis.UI.Shared/Services/PropertyInput/PropertyInputService.cs +++ b/src/Artemis.UI.Shared/Services/PropertyInput/PropertyInputService.cs @@ -15,7 +15,7 @@ internal class PropertyInputService : IPropertyInputService public PropertyInputService(IContainer container) { _container = container; - _registeredPropertyEditors = new List(); + _registeredPropertyEditors = []; RegisteredPropertyEditors = new ReadOnlyCollection(_registeredPropertyEditors); } @@ -113,6 +113,6 @@ internal class PropertyInputService : IPropertyInputService // ReSharper disable once InconsistentlySynchronizedField // When you've just spent the last 2 hours trying to figure out a deadlock and reach this line, I'm so, so sorry. I thought this would be fine. IContainer container = registration?.Plugin.Container ?? _container; - return (PropertyInputViewModel) container.Resolve(viewModelType, args: new object[] { layerProperty }); + return (PropertyInputViewModel) container.Resolve(viewModelType, args: [layerProperty]); } } \ No newline at end of file diff --git a/src/Artemis.UI.Shared/Services/Window/ExceptionDialogView.axaml b/src/Artemis.UI.Shared/Services/Window/ExceptionDialogView.axaml index b228ebe2f..871d01354 100644 --- a/src/Artemis.UI.Shared/Services/Window/ExceptionDialogView.axaml +++ b/src/Artemis.UI.Shared/Services/Window/ExceptionDialogView.axaml @@ -23,7 +23,7 @@ Awww :( - It looks like Artemis ran into an unhandled exception. If this keeps happening feel free to hit us up on Discord. + It looks like Artemis ran into an unexpected error. If this keeps happening feel free to hit us up on Discord. @@ -42,7 +42,7 @@